diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 85ad97ce2ab8..c05d84e8122d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -5,7 +5,7 @@ - [Introduction](#introduction) - [Getting Started](#getting-started) - [Meet the Team](#meet-the-team) - - [Head Maintainer and Project Manager](#head-maintainer-and-project-manager) + - [Head Maintainer and Maintainer Managers](#head-maintainer-and-maintainer-managers) - [Maintainers](#maintainers) - [Staff Tools and Major Rule changing PR’s](#staff-tools-and-major-rule-changing-prs) - [Issue Managers](#issue-managers) @@ -16,6 +16,7 @@ - [Writing understandable code](#writing-understandable-code) - [Misc](#misc) - [Pull Request Process](#pull-request-process) + - [A note on balance impacting PRs](#a-note-on-balance-impacting-prs) - [Good Boy Points](#good-boy-points) - [Porting features/sprites/sounds/tools from other codebases](#porting-featuresspritessoundstools-from-other-codebases) - [Things you can work on](#things-you-can-work-on) @@ -52,9 +53,9 @@ You can of course, as always, ask for help on the Discord channels or the forums ## Meet the Team -### Head Maintainer and Project Manager +### Head Maintainer and Maintainer Managers -The Head Maintainer and Project Manager are responsible for controlling, adding, and removing maintainers from the project. In addition to filling the role of a normal maintainer, they have sole authority on who becomes a maintainer, as well as who remains a maintainer and who does not. +The Head Maintainer and Maintainer Managers are responsible for controlling, adding, and removing maintainers from the project. In addition to filling the role of a normal maintainer, they have sole authority on who becomes a maintainer, as well as who remains a maintainer and who does not. ### Maintainers @@ -162,7 +163,7 @@ There is no strict process when it comes to merging pull requests. Pull requests Certain PRs, such as those which directly change number values (i.e. health, recoil, damage) or add large pieces of content to the game (i.e. a new gun, a new dropship weapon, or a new xeno structure) can have the potential to highly impact game balance or gameflow. -* If a Project Manager or Head Maintainer has not reviewed a pull request that impacts balance in 7 days, maintainers may review and merge the PR themselves. +* If a Maintainer Manager or Head Maintainer has not reviewed a pull request that impacts balance in 7 days, maintainers may review and merge the PR themselves. * We understand that having something you have worked on for quite some time being denied can be frustrating. Therefore, it is recommended that you check with a maintainer before beginning to code your PR if you have any doubts that it will be accepted. This will save everyone's time and energy. diff --git a/.github/alternate_byond_versions.txt b/.github/alternate_byond_versions.txt new file mode 100644 index 000000000000..f25861c46714 --- /dev/null +++ b/.github/alternate_byond_versions.txt @@ -0,0 +1,9 @@ +# This file contains extra tests to run for specific BYOND versions. +# This is useful for making sure we maintain compatibility with both older and newer versions, +# while still having our main tests run on a guaranteed pinned version. + +# Format is version: map +# Example: +# 500.1337: runtimestation + +515.1603: lv624 diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index cf035079f1ce..8f66dc14ad6f 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -83,6 +83,7 @@ jobs: runs-on: ubuntu-20.04 outputs: maps: ${{ steps.map_finder.outputs.maps }} + alternate_tests: ${{ steps.alternate_test_finder.outputs.alternate_tests }} concurrency: group: find_all_maps-${{ github.head_ref || github.run_id }} cancel-in-progress: true @@ -95,6 +96,11 @@ jobs: sed -i -e s+maps/+\"+g -e s+.json+\"+g maps_output.txt echo "Maps: $(cat maps_output.txt)" echo "maps={\"paths\":[$(cat maps_output.txt)]}" >> $GITHUB_OUTPUT + - name: Find Alternate Tests + id: alternate_test_finder + run: | + 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]')" name: Unit Tests @@ -110,6 +116,31 @@ jobs: with: map: ${{ matrix.map }} + run_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: + fail-fast: false + matrix: + setup: ${{ fromJSON(needs.find_all_maps.outputs.alternate_tests) }} + concurrency: + group: run_all_tests-${{ github.head_ref || github.run_id }}-${{ matrix.setup.major }}.${{ matrix.setup.minor }}-${{ matrix.setup.map }} + cancel-in-progress: true + uses: ./.github/workflows/run_unit_tests.yml + with: + map: ${{ matrix.setup.map }} + major: ${{ matrix.setup.major }} + minor: ${{ matrix.setup.minor }} + + check_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-20.04 + steps: + - run: echo Alternate tests passed. + test_windows: if: "!contains(github.event.head_commit.message, '[ci skip]')" name: Windows Build diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml index 6e2b2188eb52..8c2e7421b6a5 100644 --- a/.github/workflows/run_unit_tests.yml +++ b/.github/workflows/run_unit_tests.yml @@ -38,7 +38,7 @@ jobs: run: | bash tools/ci/install_byond.sh source $HOME/BYOND/byond/bin/byondsetup - tools/build/build --ci dm -DCIBUILDING -DANSICOLORS + tools/build/build --ci dm -DCIBUILDING -DANSICOLORS -Werror - name: Run Tests run: | source $HOME/BYOND/byond/bin/byondsetup diff --git a/.tgs.yml b/.tgs.yml new file mode 100644 index 000000000000..ba3fc6b26c66 --- /dev/null +++ b/.tgs.yml @@ -0,0 +1,12 @@ +version: 1 +byond: "514.1588" +static_files: + - name: config + - name: data +linux_scripts: + PreCompile.sh: tools/tgs_scripts/PreCompile.sh + WatchdogLaunch.sh: tools/tgs_scripts/WatchdogLaunch.sh + InstallDeps.sh: tools/tgs_scripts/InstallDeps.sh +windows_scripts: + PreCompile.bat: tools/tgs_scripts/PreCompile.bat +security: Trusted diff --git a/.vscode/extensions.json b/.vscode/extensions.json index e5693c495c9f..6f4cf3dd8d31 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,13 +1,5 @@ { "recommendations": [ - "gbasood.byond-dm-language-support", - "platymuus.dm-langclient", - "arcanis.vscode-zipfs", - "EditorConfig.EditorConfig", - "stylemistake.auto-comment-blocks", - "anturk.dmi-editor", - "dbaeumer.vscode-eslint", - "esbenp.prettier-vscode", - "donkie.vscode-tgstation-test-adapter" + "cmss13-devs.cm-extpack" ] } diff --git a/code/__DEFINES/_macros.dm b/code/__DEFINES/_macros.dm index 9f1dbd932cde..31f4b2aca084 100644 --- a/code/__DEFINES/_macros.dm +++ b/code/__DEFINES/_macros.dm @@ -8,12 +8,17 @@ #define subtypesof(A) (typesof(A) - A) +#ifdef EXPERIMENT_515_DONT_CACHE_REF +/// Takes a datum as input, returns its ref string +#define text_ref(datum) ref(datum) +#else /// Takes a datum as input, returns its ref string, or a cached version of it /// This allows us to cache \ref creation, which ensures it'll only ever happen once per datum, saving string tree time /// It is slightly less optimal then a []'d datum, but the cost is massively outweighed by the potential savings /// It will only work for datums mind, for datum reasons /// : because of the embedded typecheck #define text_ref(datum) (isdatum(datum) ? (datum:cached_ref ||= "\ref[datum]") : ("\ref[datum]")) +#endif #define addToListNoDupe(L, index) if(L) L[index] = null; else L = list(index) diff --git a/code/__DEFINES/blood.dm b/code/__DEFINES/blood.dm index 8f63521caac7..b0d7ce2daf43 100644 --- a/code/__DEFINES/blood.dm +++ b/code/__DEFINES/blood.dm @@ -4,3 +4,16 @@ #define BLOOD_FEET (1<<2) #define BLOOD_ALL (BLOOD_BODY|BLOOD_HANDS|BLOOD_FEET) + +#define BLOOD_COLOR_HUMAN "#A10808" +#define BLOOD_COLOR_SYNTHETIC "#EEEEEE" + +#define BLOOD_COLOR_NEAERA "#1d2cbf" + +#define BLOOD_COLOR_XENO "#dffc00" +#define BLOOD_COLOR_XENO_ROYAL "#bbb900" + +#define BLOOD_COLOR_YAUTJA "#20d450" +#define BLOOD_COLOR_YAUTJA_DARK "#5A934A" + +#define BLOOD_COLOR_ZOMBIE "#333333" diff --git a/code/__DEFINES/chat.dm b/code/__DEFINES/chat.dm index c21cb94b0140..85966e4032e2 100644 --- a/code/__DEFINES/chat.dm +++ b/code/__DEFINES/chat.dm @@ -15,6 +15,7 @@ #define MESSAGE_TYPE_ADMINCHAT "adminchat" #define MESSAGE_TYPE_MODCHAT "modchat" #define MESSAGE_TYPE_MENTOR "mentor" +#define MESSAGE_TYPE_STAFF_IC "staff_ic" #define MESSAGE_TYPE_EVENTCHAT "eventchat" #define MESSAGE_TYPE_ADMINLOG "adminlog" #define MESSAGE_TYPE_ATTACKLOG "attacklog" diff --git a/code/__DEFINES/client_prefs.dm b/code/__DEFINES/client_prefs.dm new file mode 100644 index 000000000000..ef5ff00e4ed6 --- /dev/null +++ b/code/__DEFINES/client_prefs.dm @@ -0,0 +1,33 @@ +#define BE_ALIEN_AFTER_DEATH (1<<0) +#define BE_AGENT (1<<1) + +#define TOGGLE_IGNORE_SELF (1<<0) // Determines whether you will not hurt yourself when clicking yourself +#define TOGGLE_HELP_INTENT_SAFETY (1<<1) // Determines whether help intent will be completely harmless +#define TOGGLE_MIDDLE_MOUSE_CLICK (1<<2) // This toggles whether selected ability for xeno uses middle mouse clicking or shift clicking +#define TOGGLE_DIRECTIONAL_ATTACK (1<<3) // This toggles whether attacks for xeno use directional attacks +#define TOGGLE_AUTO_EJECT_MAGAZINE_OFF (1<<4) // This toggles whether guns with auto ejectors will not auto eject their magazines + // MUTUALLY EXCLUSIVE TO TOGGLE_AUTO_EJECT_MAGAZINE_TO_HAND +#define TOGGLE_AUTO_EJECT_MAGAZINE_TO_HAND (1<<5) // This toggles whether guns with auto ejectors will cause you to unwield your gun and put the empty magazine in your hand + // MUTUALLY EXCLUSIVE TO TOGGLE_AUTO_EJECT_MAGAZINE +#define TOGGLE_EJECT_MAGAZINE_TO_HAND (1<<6) // This toggles whether manuallye jecting magazines from guns will cause you to unwield your gun + // and put the empty magazine in your hand +#define TOGGLE_AUTOMATIC_PUNCTUATION (1<<7) // Whether your sentences will automatically be punctuated with a period +#define TOGGLE_COMBAT_CLICKDRAG_OVERRIDE (1<<8) // Whether disarm/harm intents cause clicks to trigger immediately when the mouse button is depressed. +#define TOGGLE_ALTERNATING_DUAL_WIELD (1<<9) // Whether dual-wielding fires both guns at once or swaps between them. +#define TOGGLE_FULLSCREEN (1<<10) // See /client/proc/toggle_fullscreen in client_procs.dm +#define TOGGLE_MEMBER_PUBLIC (1<<11) //determines if you get a byond logo by your name in ooc if you're a member or not +#define TOGGLE_OOC_FLAG (1<<12) // determines if your country flag appears by your name in ooc chat +#define TOGGLE_MIDDLE_MOUSE_SWAP_HANDS (1<<13) //Toggle whether middle click swaps your hands +#define TOGGLE_AMBIENT_OCCLUSION (1<<14) // toggles if ambient occlusion is turned on or off +#define TOGGLE_VEND_ITEM_TO_HAND (1<<15) // This toggles whether items from vendors will be automatically put into your hand. +#define TOGGLE_START_JOIN_CURRENT_SLOT (1<<16) // Whether joining at roundstart ignores assigned character slot for the job and uses currently selected slot. +#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 JOB_SLOT_RANDOMISED_SLOT -1 +#define JOB_SLOT_CURRENT_SLOT 0 +#define JOB_SLOT_RANDOMISED_TEXT "Randomise name and appearance" +#define JOB_SLOT_CURRENT_TEXT "Current character" + +#define AGE_MIN 19 //youngest a character can be +#define AGE_MAX 90 //oldest a character can be //no. you are not allowed to be 160. +#define MAX_GEAR_COST 7 //Used in chargen for loadout limit. diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm index 65511df13beb..e1f221dccbde 100644 --- a/code/__DEFINES/cooldowns.dm +++ b/code/__DEFINES/cooldowns.dm @@ -1,6 +1,7 @@ #define COOLDOWN_MOB_AUDIO "mob_audio_cooldown" #define COOLDOWN_IDLOCK_TEXTALERT "mob_idlock_textalert" #define COOLDOWN_HIJACK_BARRAGE "gamemode_explosive_barrage" +#define COOLDOWN_HIJACK_GROUND_CHECK "gamemode_ground_check" #define COOLDOWN_ITEM_HOOD_SOUND "item_hood_sound" //Define for ship alt diff --git a/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm b/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm index 617ee135a4c0..377a2ededc82 100644 --- a/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm +++ b/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm @@ -28,6 +28,8 @@ #define COMSIG_HUMAN_OVERLAY_APPLIED "human_overlay_applied" /// From /mob/living/carbon/human/remove_overlay(): (cache_index, overlay_image) #define COMSIG_HUMAN_OVERLAY_REMOVED "human_overlay_removed" +/// From /datum/flaying_datum +#define COMSIG_HUMAN_FLAY_ATTEMPT "human_flay_attempt" #define COMSIG_HUMAN_BONEBREAK_PROBABILITY "human_bonebreak_probability" @@ -52,3 +54,8 @@ //from /mob/living/carbon/human/Life() #define COMSIG_HUMAN_SET_UNDEFIBBABLE "human_set_undefibbable" + +/// from /datum/surgery_step/proc/attempt_step() +#define COMSIG_HUMAN_SURGERY_APPLY_MODIFIERS "human_surgery_apply_modifiers" +/// From /mob/living/carbon/human/proc/get_flags_cold_protection() +#define COMSIG_HUMAN_COLD_PROTECTION_APPLY_MODIFIERS "human_cold_protection_apply_modifiers" diff --git a/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm b/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm index bdae2114ff23..37991ff9f9dc 100644 --- a/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm +++ b/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm @@ -105,3 +105,5 @@ #define COMSIG_MOB_STAT_SET_ALIVE "mob_stat_set_alive" //from /mob/living/set_stat() #define COMSIG_MOB_STAT_SET_DEAD "mob_stat_set_dead" + +#define COMSIG_GHOST_MOVED "ghost_moved" diff --git a/code/__DEFINES/dcs/signals/atom/signals_item.dm b/code/__DEFINES/dcs/signals/atom/signals_item.dm index 676bf3580821..9c2f3b92ba05 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_item.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_item.dm @@ -2,6 +2,8 @@ #define COMSIG_ITEM_ATTEMPT_ATTACK "item_attempt_attack" //Triggered on the target mob. #define COMPONENT_CANCEL_ATTACK (1<<0) +#define COMSIG_ITEM_ATTACK_AIRLOCK "item_attack_airlocK" + #define COMPONENT_CANCEL_AIRLOCK_ATTACK (1<<0) /// from /obj/item/attackby() : (obj/item, mob/user) #define COMSIG_ITEM_ATTACKED "item_attacked" diff --git a/code/__DEFINES/dcs/signals/atom/signals_obj.dm b/code/__DEFINES/dcs/signals/atom/signals_obj.dm index f52ec6eccf52..df53558834f6 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_obj.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_obj.dm @@ -22,3 +22,5 @@ /// from /obj/structure/transmitter/update_icon() #define COMSIG_TRANSMITTER_UPDATE_ICON "transmitter_update_icon" + +#define COMSIG_TENT_COLLAPSING "tent_collapsing" diff --git a/code/__DEFINES/dcs/signals/atom/signals_turf.dm b/code/__DEFINES/dcs/signals/atom/signals_turf.dm index f76abcda681a..6a0788bcf871 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_turf.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_turf.dm @@ -4,6 +4,7 @@ #define COMSIG_TURF_ENTER "turf_enter" #define COMPONENT_TURF_ALLOW_MOVEMENT (1<<0) #define COMPONENT_TURF_DENY_MOVEMENT (1<<1) +#define COMSIG_TURF_ENTERED "turf_entered" /// Called when a bullet hits a turf #define COMSIG_TURF_BULLET_ACT "turf_bullet_act" diff --git a/code/__DEFINES/dropships.dm b/code/__DEFINES/dropships.dm index 56a865309456..f7df570a2864 100644 --- a/code/__DEFINES/dropships.dm +++ b/code/__DEFINES/dropships.dm @@ -9,3 +9,4 @@ #define DROPSHIP_MAX_AUTO_DELAY 60 SECONDS #define DROPSHIP_MIN_AUTO_DELAY 10 SECONDS #define DROPSHIP_AUTO_RETRY_COOLDOWN 20 SECONDS +#define DROPSHIP_MEDEVAC_COOLDOWN 20 SECONDS diff --git a/code/__DEFINES/human.dm b/code/__DEFINES/human.dm index 6e2d82d5cc4f..846119d6b55d 100644 --- a/code/__DEFINES/human.dm +++ b/code/__DEFINES/human.dm @@ -213,8 +213,3 @@ #define RELIGION_AGNOSTICISM "Agnostic" #define MAXIMUM_DROPPED_OBJECTS_REMEMBERED 2 - -///////////////////MISC HUMAN FLAGS (LINKED TO VAR: FLAGS_HUMAN_MISC)/////////////////// - -#define HUMAN_FLAG_CHANGED (1<<0) - diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 40023dcd9ec1..3cbd0d6dac44 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -124,12 +124,15 @@ #define FACEHUGGER_LAYER 4.13 /// For WEATHER #define WEATHER_LAYER 4.14 -#define INTERIOR_WALL_SOUTH_LAYER 5.2 -#define INTERIOR_DOOR_LAYER 5.21 //#define FLY_LAYER 5 #define RIPPLE_LAYER 5.1 +#define INTERIOR_DOOR_INSIDE_LAYER 5.19 +#define INTERIOR_WALL_SOUTH_LAYER 5.2 +#define INTERIOR_DOOR_LAYER 5.21 +#define INTERIOR_WALLMOUNT_LAYER 5.3 +#define INTERIOR_ROOF_LAYER 5.5 #define ABOVE_FLY_LAYER 6 @@ -174,9 +177,12 @@ /// NEVER HAVE ANYTHING BELOW THIS PLANE ADJUST IF YOU NEED MORE SPACE #define LOWEST_EVER_PLANE -200 +/// Floor plane, self explanatory. Used for Ambient Occlusion filter #define FLOOR_PLANE -7 +/// Game Plane, where most of the game objects reside #define GAME_PLANE -6 -#define ABOVE_GAME_PLANE -5 +/// Roof plane, disappearing when entering buildings +#define ROOF_PLANE -4 /// To keep from conflicts with SEE_BLACKNESS internals #define BLACKNESS_PLANE 0 diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index 053dd58cabca..3f6a4a44ee07 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -104,8 +104,10 @@ require only minor tweaks. #define GROUND_MAP "ground_map" #define SHIP_MAP "ship_map" #define ALL_MAPTYPES list(GROUND_MAP, SHIP_MAP) +#define OVERRIDE_MAPS_TO_FILENAME list(GROUND_MAP = "next_map_override.dmm", SHIP_MAP = "next_ship_override.dmm") #define MAP_TO_FILENAME list(GROUND_MAP = "data/next_map.json", SHIP_MAP = "data/next_ship.json") #define HUNTERSHIPS_TEMPLATE_PATH "maps/predship/huntership.dmm" +#define OVERRIDE_DEFAULT_MAP_CONFIG list(GROUND_MAP = "maps/override_ground.json", SHIP_MAP = "maps/override_ship.json") // traity things #define MAP_COLD "COLD" diff --git a/code/__DEFINES/mob_hud.dm b/code/__DEFINES/mob_hud.dm index e6e8212e0826..2704e52d2f85 100644 --- a/code/__DEFINES/mob_hud.dm +++ b/code/__DEFINES/mob_hud.dm @@ -63,3 +63,5 @@ //for tracking the queen/hivecore on xeno locator huds #define TRACKER_QUEEN "Queen" #define TRACKER_HIVE "Hive Core" +#define TRACKER_LEADER "Leader" +#define TRACKER_TUNNEL "Tunnel" diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 3c98c20977dc..1f3c4ad22bf1 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -75,29 +75,6 @@ #define LATEJOIN_MARINES_PER_LATEJOIN_LARVA 3 -#define BE_ALIEN_AFTER_DEATH 1 -#define BE_AGENT 2 - -#define TOGGLE_IGNORE_SELF (1<<0) // Determines whether you will not hurt yourself when clicking yourself -#define TOGGLE_HELP_INTENT_SAFETY (1<<1) // Determines whether help intent will be completely harmless -#define TOGGLE_MIDDLE_MOUSE_CLICK (1<<2) // This toggles whether selected ability for xeno uses middle mouse clicking or shift clicking -#define TOGGLE_DIRECTIONAL_ATTACK (1<<3) // This toggles whether attacks for xeno use directional attacks -#define TOGGLE_AUTO_EJECT_MAGAZINE_OFF (1<<4) // This toggles whether guns with auto ejectors will not auto eject their magazines - // MUTUALLY EXCLUSIVE TO TOGGLE_AUTO_EJECT_MAGAZINE_TO_HAND -#define TOGGLE_AUTO_EJECT_MAGAZINE_TO_HAND (1<<5) // This toggles whether guns with auto ejectors will cause you to unwield your gun and put the empty magazine in your hand - // MUTUALLY EXCLUSIVE TO TOGGLE_AUTO_EJECT_MAGAZINE -#define TOGGLE_EJECT_MAGAZINE_TO_HAND (1<<6) // This toggles whether manuallyejecting magazines from guns will cause you to unwield your gun - // and put the empty magazine in your hand -#define TOGGLE_AUTOMATIC_PUNCTUATION (1<<7) // Whether your sentences will automatically be punctuated with a period -#define TOGGLE_COMBAT_CLICKDRAG_OVERRIDE (1<<8) // Whether disarm/harm intents cause clicks to trigger immediately when the mouse button is depressed. -#define TOGGLE_ALTERNATING_DUAL_WIELD (1<<9) // Whether dual-wielding fires both guns at once or swaps between them. -#define TOGGLE_FULLSCREEN (1<<10) // See /client/proc/toggle_fullscreen in client_procs.dm -#define TOGGLE_MEMBER_PUBLIC (1<<11) //determines if you get a byond logo by your name in ooc if you're a member or not -#define TOGGLE_OOC_FLAG (1<<12) // determines if your country flag appears by your name in ooc chat -#define TOGGLE_MIDDLE_MOUSE_SWAP_HANDS (1<<13) //Toggle whether middle click swaps your hands -#define TOGGLE_AMBIENT_OCCLUSION (1<<14) // toggles if ambient occlusion is turned on or off -#define TOGGLE_VEND_ITEM_TO_HAND (1<<15) // This toggles whether items from vendors will be automatically put into your hand. - //================================================= #define SHOW_ITEM_ANIMATIONS_NONE 0 //Do not show any item pickup animations #define SHOW_ITEM_ANIMATIONS_HALF 1 //Toggles tg-style item animations on and off, default on. @@ -111,16 +88,8 @@ //================================================= -var/list/be_special_flags = list( - "Xenomorph after unrevivable death" = BE_ALIEN_AFTER_DEATH, - "Agent" = BE_AGENT, -) - -#define AGE_MIN 19 //youngest a character can be -#define AGE_MAX 90 //oldest a character can be //no. you are not allowed to be 160. //Number of marine players against which the Marine's gear scales #define MARINE_GEAR_SCALING_NORMAL 30 -#define MAX_GEAR_COST 7 //Used in chargen for loadout limit. #define RESOURCE_NODE_SCALE 95 //How many players minimum per extra set of resource nodes #define RESOURCE_NODE_QUANTITY_PER_POP 11 //How many resources total per pop @@ -286,6 +255,9 @@ var/global/list/whitelist_hierarchy = list(WHITELIST_NORMAL, WHITELIST_COUNCIL, #define FACTION_LIST_XENOMORPH list(FACTION_XENOMORPH, FACTION_XENOMORPH_CORRPUTED, FACTION_XENOMORPH_ALPHA, FACTION_XENOMORPH_BRAVO, FACTION_XENOMORPH_CHARLIE, FACTION_XENOMORPH_DELTA) +// Faction allegiances within a certain faction. + +#define FACTION_ALLEGIANCE_USCM_COMMANDER list("Doves", "Hawks", "Magpies", "Unaligned") // global vars to prevent spam of the "one xyz alive" messages diff --git a/code/__DEFINES/objects.dm b/code/__DEFINES/objects.dm index 6a3e32e743c6..5617a2b47ec6 100644 --- a/code/__DEFINES/objects.dm +++ b/code/__DEFINES/objects.dm @@ -108,7 +108,6 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse #define IS_PRY_CAPABLE_CROWBAR 2 //actual crowbar #define IS_PRY_CAPABLE_FORCE 3 //can force open even powered airlocks - #define SELF_DESTRUCT_MACHINE_INACTIVE 0 #define SELF_DESTRUCT_MACHINE_ACTIVE 1 #define SELF_DESTRUCT_MACHINE_ARMED 2 diff --git a/code/__DEFINES/qdel.dm b/code/__DEFINES/qdel.dm index 5ba530274389..2093f80be50e 100644 --- a/code/__DEFINES/qdel.dm +++ b/code/__DEFINES/qdel.dm @@ -30,6 +30,13 @@ #define GC_QUEUE_HARDDELETE 3 //! short queue for things that hard delete instead of going thru the gc subsystem, this is purely so if they *can* softdelete, they will soft delete rather then wasting time with a hard delete. #define GC_QUEUE_COUNT 3 //! Number of queues, used for allocating the nested lists. Don't forget to increase this if you add a new queue stage + +// Defines for the ssgarbage queue items +#define GC_QUEUE_ITEM_QUEUE_TIME 1 //! Time this item entered the queue +#define GC_QUEUE_ITEM_REF 2 //! Ref to the item +#define GC_QUEUE_ITEM_GCD_DESTROYED 3 //! Item's gc_destroyed var value. Used to detect ref reuse. +#define GC_QUEUE_ITEM_INDEX_COUNT 3 //! Number of item indexes, used for allocating the nested lists. Don't forget to increase this if you add a new queue item index + // Defines for the time an item has to get its reference cleaned before it fails the queue and moves to the next. #define GC_FILTER_QUEUE (1 SECONDS) #define GC_CHECK_QUEUE (5 MINUTES) diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm index 47c9e1882d3f..126a8f82ece8 100644 --- a/code/__DEFINES/shuttles.dm +++ b/code/__DEFINES/shuttles.dm @@ -36,7 +36,7 @@ #define GAMEMODE_IMMUNE (1<<0) // Ripples, effects that signal a shuttle's arrival -#define SHUTTLE_RIPPLE_TIME 100 +#define SHUTTLE_RIPPLE_TIME 5 SECONDS #define TRANSIT_REQUEST 1 #define TRANSIT_READY 2 diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 2da7dec66978..3c2527136ed6 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -119,6 +119,7 @@ #define SS_INIT_EVENTS 23.5 #define SS_INIT_JOB 23 #define SS_INIT_REDIS 22.5 +#define SS_INIT_REAGENTS 22.1 #define SS_INIT_MAPPING 22 #define SS_INIT_NIGHTMARE 21.5 #define SS_INIT_TIMETRACK 21.1 diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index c8ef71112b33..89976c498422 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,6 +1,6 @@ // tgstation-server DMAPI -#define TGS_DMAPI_VERSION "6.4.2" +#define TGS_DMAPI_VERSION "6.5.0" // All functions and datums outside this document are subject to change with any version and should not be relied on. @@ -12,8 +12,8 @@ // Comment this out once you've filled in the below. #error TGS API unconfigured -// Uncomment this if you wish to allow the game to interact with TGS 3. -// This will raise the minimum required security level of your game to TGS_SECURITY_TRUSTED due to it utilizing call()() +// Uncomment this if you wish to allow the game to interact with TGS 3.. +// This will raise the minimum required security level of your game to TGS_SECURITY_TRUSTED due to it utilizing call()(). //#define TGS_V3_API // Required interfaces (fill in with your codebase equivalent): @@ -52,44 +52,46 @@ // EVENT CODES -/// Before a reboot mode change, extras parameters are the current and new reboot mode enums +/// Before a reboot mode change, extras parameters are the current and new reboot mode enums. #define TGS_EVENT_REBOOT_MODE_CHANGE -1 -/// Before a port change is about to happen, extra parameters is new port +/// Before a port change is about to happen, extra parameters is new port. #define TGS_EVENT_PORT_SWAP -2 -/// Before the instance is renamed, extra parameter is the new name +/// Before the instance is renamed, extra parameter is the new name. #define TGS_EVENT_INSTANCE_RENAMED -3 -/// After the watchdog reattaches to DD, extra parameter is the new [/datum/tgs_version] of the server +/// After the watchdog reattaches to DD, extra parameter is the new [/datum/tgs_version] of the server. #define TGS_EVENT_WATCHDOG_REATTACH -4 +/// When the watchdog sends a health check to DD. No parameters. +#define TGS_EVENT_HEALTH_CHECK -5 -/// When the repository is reset to its origin reference. Parameters: Reference name, Commit SHA +/// When the repository is reset to its origin reference. Parameters: Reference name, Commit SHA. #define TGS_EVENT_REPO_RESET_ORIGIN 0 -/// When the repository performs a checkout. Parameters: Checkout git object +/// When the repository performs a checkout. Parameters: Checkout git object. #define TGS_EVENT_REPO_CHECKOUT 1 -/// When the repository performs a fetch operation. No parameters +/// When the repository performs a fetch operation. No parameters. #define TGS_EVENT_REPO_FETCH 2 -/// When the repository test merges. Parameters: PR Number, PR Sha, (Nullable) Comment made by TGS user +/// When the repository test merges. Parameters: PR Number, PR Sha, (Nullable) Comment made by TGS user. #define TGS_EVENT_REPO_MERGE_PULL_REQUEST 3 -/// Before the repository makes a sychronize operation. Parameters: Absolute repostiory path +/// Before the repository makes a sychronize operation. Parameters: Absolute repostiory path. #define TGS_EVENT_REPO_PRE_SYNCHRONIZE 4 -/// Before a BYOND install operation begins. Parameters: [/datum/tgs_version] of the installing BYOND +/// Before a BYOND install operation begins. Parameters: [/datum/tgs_version] of the installing BYOND. #define TGS_EVENT_BYOND_INSTALL_START 5 /// When a BYOND install operation fails. Parameters: Error message #define TGS_EVENT_BYOND_INSTALL_FAIL 6 -/// When the active BYOND version changes. Parameters: (Nullable) [/datum/tgs_version] of the current BYOND, [/datum/tgs_version] of the new BYOND +/// When the active BYOND version changes. Parameters: (Nullable) [/datum/tgs_version] of the current BYOND, [/datum/tgs_version] of the new BYOND. #define TGS_EVENT_BYOND_ACTIVE_VERSION_CHANGE 7 -/// When the compiler starts running. Parameters: Game directory path, origin commit SHA +/// When the compiler starts running. Parameters: Game directory path, origin commit SHA. #define TGS_EVENT_COMPILE_START 8 -/// When a compile is cancelled. No parameters +/// When a compile is cancelled. No parameters. #define TGS_EVENT_COMPILE_CANCELLED 9 -/// When a compile fails. Parameters: Game directory path, [TRUE]/[FALSE] based on if the cause for failure was DMAPI validation +/// When a compile fails. Parameters: Game directory path, [TRUE]/[FALSE] based on if the cause for failure was DMAPI validation. #define TGS_EVENT_COMPILE_FAILURE 10 -/// When a compile operation completes. Note, this event fires before the new .dmb is loaded into the watchdog. Consider using the [TGS_EVENT_DEPLOYMENT_COMPLETE] instead. Parameters: Game directory path +/// When a compile operation completes. Note, this event fires before the new .dmb is loaded into the watchdog. Consider using the [TGS_EVENT_DEPLOYMENT_COMPLETE] instead. Parameters: Game directory path. #define TGS_EVENT_COMPILE_COMPLETE 11 -/// When an automatic update for the current instance begins. No parameters +/// When an automatic update for the current instance begins. No parameters. #define TGS_EVENT_INSTANCE_AUTO_UPDATE_START 12 -/// When the repository encounters a merge conflict: Parameters: Base SHA, target SHA, base reference, target reference +/// When the repository encounters a merge conflict: Parameters: Base SHA, target SHA, base reference, target reference. #define TGS_EVENT_REPO_MERGE_CONFLICT 13 -/// When a deployment completes. No Parameters +/// When a deployment completes. No Parameters. #define TGS_EVENT_DEPLOYMENT_COMPLETE 14 /// Before the watchdog shuts down. Not sent for graceful shutdowns. No parameters. #define TGS_EVENT_WATCHDOG_SHUTDOWN 15 @@ -104,6 +106,12 @@ #define TGS_EVENT_WORLD_PRIME 21 // DMAPI also doesnt implement this // #define TGS_EVENT_DREAM_DAEMON_LAUNCH 22 +/// After a single submodule update is performed. Parameters: Updated submodule name. +#define TGS_EVENT_REPO_SUBMODULE_UPDATE 23 +/// After CodeModifications are applied, before DreamMaker is run. Parameters: Game directory path, origin commit sha, byond version. +#define TGS_EVENT_PRE_DREAM_MAKER 24 +/// Whenever a deployment folder is deleted from disk. Parameters: Game directory path. +#define TGS_EVENT_DEPLOYMENT_CLEANUP 25 // OTHER ENUMS @@ -158,28 +166,28 @@ /datum/tgs_revision_information /// Full SHA of the commit. var/commit - /// ISO 8601 timestamp of when the commit was created + /// ISO 8601 timestamp of when the commit was created. var/timestamp /// Full sha of last known remote commit. This may be null if the TGS repository is not currently tracking a remote branch. var/origin_commit /// Represents a version. /datum/tgs_version - /// The suite/major version number + /// The suite/major version number. var/suite - // This group of variables can be null to represent a wild card - /// The minor version number. null for wildcards + // This group of variables can be null to represent a wild card. + /// The minor version number. null for wildcards. var/minor - /// The patch version number. null for wildcards + /// The patch version number. null for wildcards. var/patch - /// Legacy version number. Generally null + /// Legacy version number. Generally null. var/deprecated_patch - /// Unparsed string value + /// Unparsed string value. var/raw_parameter - /// String value minus prefix + /// String value minus prefix. var/deprefixed_parameter /** @@ -225,38 +233,43 @@ var/is_admin_channel /// [TRUE]/[FALSE] if the channel is a private message channel for a [/datum/tgs_chat_user]. var/is_private_channel - /// Tag string associated with the channel in TGS + /// Tag string associated with the channel in TGS. var/custom_tag - /// [TRUE]/[FALSE] if the channel supports embeds + /// [TRUE]/[FALSE] if the channel supports embeds. var/embeds_supported // Represents a chat user /datum/tgs_chat_user /// TGS internal user ID. var/id - // The user's display name. + /// The user's display name. var/friendly_name - // The string to use to ping this user in a message. + /// The string to use to ping this user in a message. var/mention - /// The [/datum/tgs_chat_channel] the user was from + /// The [/datum/tgs_chat_channel] the user was from. var/datum/tgs_chat_channel/channel +/// User definable handler for TGS events. +/datum/tgs_event_handler + /// If the handler receieves [TGS_EVENT_HEALTH_CHECK] events. + var/receive_health_checks = FALSE + /** * User definable callback for handling TGS events. * - * event_code - One of the TGS_EVENT_ defines. Extra parameters will be documented in each + * event_code - One of the TGS_EVENT_ defines. Extra parameters will be documented in each. */ /datum/tgs_event_handler/proc/HandleEvent(event_code, ...) set waitfor = FALSE return -/// User definable chat command +/// User definable chat command. /datum/tgs_chat_command - /// The string to trigger this command on a chat bot. e.g `@bot name ...` or `!tgs name ...` + /// The string to trigger this command on a chat bot. e.g `@bot name ...` or `!tgs name ...`. var/name = "" - /// The help text displayed for this command + /// The help text displayed for this command. var/help_text = "" - /// If this command should be available to game administrators only + /// If this command should be available to game administrators only. var/admin_only = FALSE /// A subtype of [/datum/tgs_chat_command] that is ignored when enumerating available commands. Use this to create shared base /datums for commands. var/ignore_type @@ -270,7 +283,7 @@ /datum/tgs_chat_command/proc/Run(datum/tgs_chat_user/sender, params) CRASH("[type] has no implementation for Run()") -/// User definable chat message +/// User definable chat message. /datum/tgs_message_content /// The tring content of the message. Must be provided in New(). var/text @@ -294,7 +307,7 @@ /// Timestamp must be encoded as: time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss"). Use the active timezone. var/timestamp - /// Colour must be #AARRGGBB or #RRGGBB hex string + /// Colour must be #AARRGGBB or #RRGGBB hex string. var/colour /// See https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure for details. @@ -312,7 +325,7 @@ var/list/datum/tgs_chat_embed/field/fields -/// Common datum for similar discord embed medias +/// Common datum for similar discord embed medias. /datum/tgs_chat_embed/media /// Must be set in New(). var/url @@ -390,16 +403,16 @@ // No function below this succeeds if it TgsAvailable() returns FALSE or if TgsNew() has yet to be called. /** - * Forces a hard reboot of DreamDaemon by ending the process. + * Forces a hard reboot of DreamDaemon by ending the process. This function may sleep! * * Unlike del(world) clients will try to reconnect. - * If TGS has not requested a [TGS_REBOOT_MODE_SHUTDOWN] DreamDaemon will be launched again + * If TGS has not requested a [TGS_REBOOT_MODE_SHUTDOWN] DreamDaemon will be launched again. */ /world/proc/TgsEndProcess() return /** - * Send a message to connected chats. + * Send a message to connected chats. This function may sleep! * * message - The [/datum/tgs_message_content] to send. * admin_only: If [TRUE], message will be sent to admin connected chats. Vice-versa applies. @@ -408,7 +421,7 @@ return /** - * Send a private message to a specific user. + * Send a private message to a specific user. This function may sleep! * * message - The [/datum/tgs_message_content] to send. * user: The [/datum/tgs_chat_user] to PM. @@ -416,10 +429,8 @@ /world/proc/TgsChatPrivateMessage(datum/tgs_message_content/message, datum/tgs_chat_user/user) return -// The following functions will sleep if a call to TgsNew() is sleeping - /** - * Send a message to connected chats that are flagged as game-related in TGS. + * Send a message to connected chats that are flagged as game-related in TGS. This function may sleep! * * message - The [/datum/tgs_message_content] to send. * channels - Optional list of [/datum/tgs_chat_channel]s to restrict the message to. @@ -427,38 +438,38 @@ /world/proc/TgsChatBroadcast(datum/tgs_message_content/message, list/channels = null) return -/// Returns the current [/datum/tgs_version] of TGS if it is running the server, null otherwise. +/// Returns the current [/datum/tgs_version] of TGS if it is running the server, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsVersion() return -/// Returns the current [/datum/tgs_version] of the DMAPI being used if it was activated, null otherwise. +/// Returns the current [/datum/tgs_version] of the DMAPI being used if it was activated, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsApiVersion() return -/// Returns the name of the TGS instance running the game if TGS is present, null otherwise. +/// Returns the name of the TGS instance running the game if TGS is present, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsInstanceName() return -/// Return the current [/datum/tgs_revision_information] of the running server if TGS is present, null otherwise. +/// Return the current [/datum/tgs_revision_information] of the running server if TGS is present, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsRevision() return -/// Returns the current BYOND security level as a TGS_SECURITY_ define if TGS is present, null otherwise. +/// Returns the current BYOND security level as a TGS_SECURITY_ define if TGS is present, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsSecurityLevel() return -/// Returns a list of active [/datum/tgs_revision_information/test_merge]s if TGS is present, null otherwise. +/// Returns a list of active [/datum/tgs_revision_information/test_merge]s if TGS is present, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsTestMerges() return -/// Returns a list of connected [/datum/tgs_chat_channel]s if TGS is present, null otherwise. +/// Returns a list of connected [/datum/tgs_chat_channel]s if TGS is present, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsChatChannelInfo() return /* The MIT License -Copyright (c) 2017 Jordan Brown +Copyright (c) 2017-2023 Jordan Brown Permission is hereby granted, free of charge, to any person obtaining a copy of this software and diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index e5441090d60c..cf0eb9fea86c 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -192,6 +192,7 @@ #define TRAIT_TOOL_SIMPLE_BLOWTORCH "t_tool_simple_blowtorch" #define TRAIT_TOOL_PEN "t_tool_pen" +#define TRAIT_TOOL_SHOVEL "t_tool_shovel" // CLOTHING TRAITS #define TRAIT_CLOTHING_HOOD "t_clothing_hood" diff --git a/code/__DEFINES/vendors.dm b/code/__DEFINES/vendors.dm index 1011bad11a58..04ee5ffef2b6 100644 --- a/code/__DEFINES/vendors.dm +++ b/code/__DEFINES/vendors.dm @@ -1,30 +1,26 @@ -#define MARINE_CAN_BUY_UNIFORM (1<<0) -#define MARINE_CAN_BUY_SHOES (1<<1) -#define MARINE_CAN_BUY_HELMET (1<<2) -#define MARINE_CAN_BUY_ARMOR (1<<3) -#define MARINE_CAN_BUY_GLOVES (1<<4) -#define MARINE_CAN_BUY_EAR (1<<5) -#define MARINE_CAN_BUY_BACKPACK (1<<6) -#define MARINE_CAN_BUY_R_POUCH (1<<7) -#define MARINE_CAN_BUY_L_POUCH (1<<8) -#define MARINE_CAN_BUY_BELT (1<<9) -#define MARINE_CAN_BUY_GLASSES (1<<10) -#define MARINE_CAN_BUY_MASK (1<<11) -#define MARINE_CAN_BUY_ESSENTIALS (1<<12) -#define MARINE_CAN_BUY_SECONDARY (1<<13) -#define MARINE_CAN_BUY_ATTACHMENT (1<<14) -#define MARINE_CAN_BUY_MRE (1<<15) -#define MARINE_CAN_BUY_ACCESSORY (1<<16) +#define MARINE_CAN_BUY_UNIFORM "uniform" +#define MARINE_CAN_BUY_SHOES "shoes" +#define MARINE_CAN_BUY_HELMET "helmet" +#define MARINE_CAN_BUY_ARMOR "armor" +#define MARINE_CAN_BUY_GLOVES "gloves" +#define MARINE_CAN_BUY_EAR "ear" +#define MARINE_CAN_BUY_BACKPACK "backpack" +#define MARINE_CAN_BUY_POUCH "pouch" +#define MARINE_CAN_BUY_BELT "belt" +#define MARINE_CAN_BUY_GLASSES "glasses" +#define MARINE_CAN_BUY_MASK "mask" +#define MARINE_CAN_BUY_ESSENTIALS "essentials" +#define MARINE_CAN_BUY_SECONDARY "secondary" +#define MARINE_CAN_BUY_ATTACHMENT "attachment" +#define MARINE_CAN_BUY_MRE "mre" +#define MARINE_CAN_BUY_ACCESSORY "accessory" +#define MARINE_CAN_BUY_COMBAT_SHOES "combat_shoes" +#define MARINE_CAN_BUY_COMBAT_HELMET "combat_helmet" +#define MARINE_CAN_BUY_COMBAT_ARMOR "combat_armor" +#define MARINE_CAN_BUY_KIT "kit" +#define MARINE_CAN_BUY_DRESS "dress" -#define MARINE_CAN_BUY_COMBAT_SHOES (1<<17) -#define MARINE_CAN_BUY_COMBAT_HELMET (1<<18) -#define MARINE_CAN_BUY_COMBAT_ARMOR (1<<19) -#define MARINE_CAN_BUY_COMBAT_R_POUCH (1<<20) -#define MARINE_CAN_BUY_COMBAT_L_POUCH (1<<21) - -#define MARINE_CAN_BUY_KIT (1<<22) - -#define MARINE_CAN_BUY_ALL ((1<<23) - 1) +#define MARINE_CAN_BUY_ALL list(MARINE_CAN_BUY_UNIFORM = 1, MARINE_CAN_BUY_SHOES = 1, MARINE_CAN_BUY_HELMET = 1, MARINE_CAN_BUY_ARMOR = 1, MARINE_CAN_BUY_GLOVES = 1, MARINE_CAN_BUY_EAR = 1, MARINE_CAN_BUY_BACKPACK = 1, MARINE_CAN_BUY_POUCH = 2, MARINE_CAN_BUY_BELT = 1, MARINE_CAN_BUY_GLASSES = 1, MARINE_CAN_BUY_MASK = 1, MARINE_CAN_BUY_ESSENTIALS = 1, MARINE_CAN_BUY_SECONDARY = 1, MARINE_CAN_BUY_ATTACHMENT = 1, MARINE_CAN_BUY_MRE = 1, MARINE_CAN_BUY_ACCESSORY = 1, MARINE_CAN_BUY_COMBAT_SHOES = 1, MARINE_CAN_BUY_COMBAT_HELMET = 1, MARINE_CAN_BUY_COMBAT_ARMOR = 1, MARINE_CAN_BUY_KIT = 1, MARINE_CAN_BUY_DRESS = 99) #define MARINE_TOTAL_BUY_POINTS 45 #define MARINE_TOTAL_SNOWFLAKE_POINTS 120 diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 5d25df2150c0..3b0a2601bbb0 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1781,14 +1781,30 @@ var/list/WALLITEMS = list( user.face_atom(src) return TRUE +#define VARSET_LIST_CALLBACK(target, var_name, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##target, ##var_name, ##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. +/// Use this if the timer is exceptionally long. +#define VARSET_WEAK_CALLBACK(datum, var, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), WEAKREF(##datum), NAMEOF(##datum, ##var), ##var_value) /proc/___callbackvarset(list_or_datum, var_name, var_value) if(length(list_or_datum)) list_or_datum[var_name] = var_value return - var/datum/D = list_or_datum - D.vars[var_name] = var_value + + var/datum/datum = list_or_datum + + if (isweakref(datum)) + var/datum/weakref/datum_weakref = datum + datum = datum_weakref.resolve() + if (isnull(datum)) + return + + if(IsAdminAdvancedProcCall()) + datum.vv_edit_var(var_name, var_value) //same result generally, unless badmemes + else + datum.vars[var_name] = var_value //don't question just accept /proc/pass(...) diff --git a/code/_experiments.dm b/code/_experiments.dm new file mode 100644 index 000000000000..6e5addb5f992 --- /dev/null +++ b/code/_experiments.dm @@ -0,0 +1,34 @@ +// This file contains experimental flags that may not be production ready yet, +// but that we want to be able to easily flip as well as run on CI. +// Any flag you see here can be flipped with the `-D` CLI argument. +// For example, if you want to enable EXPERIMENT_MY_COOL_FEATURE, compile with -DEXPERIMENT_MY_COOL_FEATURE + +// EXPERIMENT_515_QDEL_HARD_REFERENCE +// - Hold a hard reference for qdeleted items, and check ref_count, rather than using refs. Requires 515+. + +// EXPERIMENT_515_DONT_CACHE_REF +// - Avoids `text_ref` caching, aided by improvements to ref() speed in 515. + +#if DM_VERSION < 515 + +// You can't X-macro custom names :( +#ifdef EXPERIMENT_515_QDEL_HARD_REFERENCE +#warn EXPERIMENT_515_QDEL_HARD_REFERENCE is only available on 515+ +#undef EXPERIMENT_515_QDEL_HARD_REFERENCE +#endif + +#ifdef EXPERIMENT_515_DONT_CACHE_REF +#warn EXPERIMENT_515_DONT_CACHE_REF is only available on 515+ +#undef EXPERIMENT_515_DONT_CACHE_REF +#endif + +#elif defined(UNIT_TESTS) + +//#define EXPERIMENT_515_QDEL_HARD_REFERENCE +#define EXPERIMENT_515_DONT_CACHE_REF + +#endif + +#if DM_VERSION >= 516 +#error "Remove all 515 experiments" +#endif diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm index 12776aebc46b..f0279907f635 100644 --- a/code/_globalvars/global_lists.dm +++ b/code/_globalvars/global_lists.dm @@ -197,6 +197,9 @@ GLOBAL_REFERENCE_LIST_INDEXED(yautja_hair_styles_list, /datum/sprite_accessory/y //Backpacks var/global/list/backbaglist = list("Backpack", "Satchel") + //Armor styles +GLOBAL_LIST_INIT(armor_style_list, list("Padded" = 1, "Padless" = 2, "Ridged" = 3, "Carrier" = 4, "Skull" = 5, "Smooth" = 6, "Random")) + // var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg) var/global/round_should_check_for_win = TRUE diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 8c9d16841965..ad2f305790d2 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -71,7 +71,7 @@ return // Click handled elsewhere. (These clicks are not affected by the next_move cooldown) - if (click(A, mods) | A.clicked(src, mods, location, params)) + if (click(A, mods) || A.clicked(src, mods, location, params)) return // Default click functions from here on. @@ -80,7 +80,8 @@ return face_atom(A) - + if(mods["middle"]) + return // Special type of click. if (is_mob_restrained()) RestrainedClickOn(A) @@ -99,10 +100,6 @@ throw_buffer++ return - // Last thing clicked is tracked for something somewhere. - if(!isgun(A) && !isturf(A) && !istype(A,/atom/movable/screen)) - last_target_click = world.time - var/obj/item/W = get_active_hand() // Special gun mode stuff. @@ -332,9 +329,29 @@ apply_clickcatcher() mob.reload_fullscreens() - if(prefs.auto_fit_viewport) + if(prefs.adaptive_zoom) + INVOKE_ASYNC(src, PROC_REF(adaptive_zoom)) + else if(prefs.auto_fit_viewport) INVOKE_ASYNC(src, .verb/fit_viewport) +/client/proc/get_adaptive_zoom_factor() + if(!prefs.adaptive_zoom) + return 0 + var/zoom = prefs.adaptive_zoom + if(view <= 8) + return zoom * 2 + else if(view <= 15) + return zoom * 1 + else + return 0 + +/// Attempts to scale client zoom automatically to fill 1080p multiples. Best used with auto fit viewport. +/client/proc/adaptive_zoom() + var/icon_size = world.icon_size * get_adaptive_zoom_factor() + winset(src, "mapwindow.map", "icon-size=[icon_size]") + if(prefs.auto_fit_viewport) + fit_viewport() + /client/proc/create_clickcatcher() if(!void) void = new() diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 6f3d6de5cadb..7f9ad85e154e 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -108,6 +108,7 @@ qdel(thing) infodisplay.Cut() + mymob = null qdel(hide_actions_toggle) hide_actions_toggle = null diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index b277c067683b..6cf43dc343b7 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -332,31 +332,6 @@ unique_action.screen_loc = ui_datum.ui_gun_unique static_inventory += unique_action - //Handle the gun settings buttons - gun_setting_icon = new /atom/movable/screen/gun/mode() - gun_setting_icon.alpha = ui_alpha - gun_setting_icon.screen_loc = ui_datum.ui_gun_select - gun_setting_icon.update_icon(mymob) - static_inventory += gun_setting_icon - - gun_item_use_icon = new /atom/movable/screen/gun/item() - gun_item_use_icon.alpha = ui_alpha - gun_item_use_icon.screen_loc = ui_datum.ui_gun1 - gun_item_use_icon.update_icon(mymob) - static_inventory += gun_item_use_icon - - gun_move_icon = new /atom/movable/screen/gun/move() - gun_move_icon.alpha = ui_alpha - gun_move_icon.screen_loc = ui_datum.ui_gun2 - gun_move_icon.update_icon(mymob) - static_inventory += gun_move_icon - - gun_run_icon = new /atom/movable/screen/gun/run() - gun_run_icon.alpha = ui_alpha - gun_run_icon.screen_loc = ui_datum.ui_gun3 - gun_run_icon.update_icon(mymob) - static_inventory += gun_run_icon - /datum/hud/human/proc/draw_status_effects(datum/custom_hud/ui_datum) slowed_icon = new /atom/movable/screen() slowed_icon.icon = ui_datum.ui_style_icon diff --git a/code/_onclick/hud/map_popups.dm b/code/_onclick/hud/map_popups.dm index 21d9a9414bbc..b5ee41e6d54c 100644 --- a/code/_onclick/hud/map_popups.dm +++ b/code/_onclick/hud/map_popups.dm @@ -41,6 +41,11 @@ /// If FALSE, this will not be cleared when calling /client/clear_screen() var/clear_with_screen = TRUE +/atom/movable/screen/Destroy() + master = null + hud = null // Not currently ever used + return ..() + /** * A screen object, which acts as a container for turfs and other things * you want to show on the map, which you usually attach to "vis_contents". diff --git a/code/_onclick/hud/rendering/plane_master.dm b/code/_onclick/hud/rendering/plane_master.dm index 9e6ff21aac18..d29228f4c16e 100644 --- a/code/_onclick/hud/rendering/plane_master.dm +++ b/code/_onclick/hud/rendering/plane_master.dm @@ -56,6 +56,13 @@ blend_mode = BLEND_OVERLAY render_relay_plane = RENDER_PLANE_NON_GAME +/// Plane master handling display of building roofs. They're meant to become invisible when inside a building. +/atom/movable/screen/plane_master/roof + name = "roof plane master" + plane = ROOF_PLANE + appearance_flags = PLANE_MASTER + blend_mode = BLEND_OVERLAY + /** * Plane master handling byond internal blackness * vars are set as to replicate behavior when rendering to other planes diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 394cff7271bb..565a23d1bbeb 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -121,29 +121,6 @@ zone_sel.update_icon(owner) static_inventory += zone_sel - //Handle the gun settings buttons - gun_setting_icon = new /atom/movable/screen/gun/mode() - gun_setting_icon.screen_loc = ui_robot_datum.ui_gun_select - gun_setting_icon.update_icon(owner) - static_inventory += gun_setting_icon - - gun_item_use_icon = new /atom/movable/screen/gun/item() - gun_item_use_icon.screen_loc = ui_robot_datum.ui_gun1 - gun_item_use_icon.update_icon(owner) - static_inventory += gun_item_use_icon - - gun_move_icon = new /atom/movable/screen/gun/move() - gun_move_icon.screen_loc = ui_robot_datum.ui_gun2 - gun_move_icon.update_icon(owner) - static_inventory += gun_move_icon - - gun_run_icon = new /atom/movable/screen/gun/run() - gun_run_icon.screen_loc = ui_robot_datum.ui_gun3 - gun_run_icon.update_icon(owner) - static_inventory += gun_run_icon - - - /mob/living/silicon/robot/create_hud() if(!hud_used) hud_used = new /datum/hud/robot(src) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 22e087f96b5f..9643d0f652ae 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -132,121 +132,6 @@ else color = null - - -/atom/movable/screen/gun - name = "gun" - dir = SOUTH - var/gun_click_time = -100 - -/atom/movable/screen/gun/move - name = "Allow Walking" - icon_state = "no_walk0" - -/atom/movable/screen/gun/move/update_icon(mob/user) - if(user.gun_mode) - if(user.target_can_move) - icon_state = "no_walk1" - name = "Disallow Walking" - else - icon_state = "no_walk0" - name = "Allow Walking" - screen_loc = initial(screen_loc) - return - screen_loc = null - -/atom/movable/screen/gun/move/clicked(mob/user) - if (..()) - return 1 - - if(gun_click_time > world.time - 30) //give them 3 seconds between mode changes. - return 1 - if(!isgun(user.get_held_item())) - to_chat(user, "You need your gun in your active hand to do that!") - return 1 - user.AllowTargetMove() - gun_click_time = world.time - return 1 - - -/atom/movable/screen/gun/run - name = "Allow Running" - icon_state = "no_run0" - -/atom/movable/screen/gun/run/update_icon(mob/user) - if(user.gun_mode) - if(user.target_can_move) - if(user.target_can_run) - icon_state = "no_run1" - name = "Disallow Running" - else - icon_state = "no_run0" - name = "Allow Running" - screen_loc = initial(screen_loc) - return - screen_loc = null - -/atom/movable/screen/gun/run/clicked(mob/user) - if (..()) - return 1 - - if(gun_click_time > world.time - 30) //give them 3 seconds between mode changes. - return 1 - if(!isgun(user.get_held_item())) - to_chat(user, "You need your gun in your active hand to do that!") - return 1 - user.AllowTargetRun() - gun_click_time = world.time - return 1 - - -/atom/movable/screen/gun/item - name = "Allow Item Use" - icon_state = "no_item0" - -/atom/movable/screen/gun/item/update_icon(mob/user) - if(user.gun_mode) - if(user.target_can_click) - icon_state = "no_item1" - name = "Allow Item Use" - else - icon_state = "no_item0" - name = "Disallow Item Use" - screen_loc = initial(screen_loc) - return - screen_loc = null - -/atom/movable/screen/gun/item/clicked(mob/user) - if (..()) - return 1 - - if(gun_click_time > world.time - 30) //give them 3 seconds between mode changes. - return 1 - if(!isgun(user.get_held_item())) - to_chat(user, "You need your gun in your active hand to do that!") - return 1 - user.AllowTargetClick() - gun_click_time = world.time - return 1 - - -/atom/movable/screen/gun/mode - name = "Toggle Gun Mode" - icon_state = "gun0" - -/atom/movable/screen/gun/mode/update_icon(mob/user) - if(user.gun_mode) - icon_state = "gun1" - else - icon_state = "gun0" - -/atom/movable/screen/gun/mode/clicked(mob/user) - if (..()) - return 1 - user.ToggleGunMode() - return 1 - - /atom/movable/screen/zone_sel name = "damage zone" icon_state = "zone_sel" @@ -633,7 +518,7 @@ name = "queen locator" icon = 'icons/mob/hud/alien_standard.dmi' icon_state = "trackoff" - var/track_state = TRACKER_QUEEN + var/list/track_state = list(TRACKER_QUEEN, 0) /atom/movable/screen/queen_locator/clicked(mob/living/carbon/xenomorph/user, mods) if(!istype(user)) @@ -648,15 +533,23 @@ if(mods["alt"]) var/list/options = list() if(user.hive.living_xeno_queen) - options["Queen"] = TRACKER_QUEEN + options["Queen"] = list(TRACKER_QUEEN, 0) + if(user.hive.hive_location) - options["Hive Core"] = TRACKER_HIVE + options["Hive Core"] = list(TRACKER_HIVE, 0) + var/xeno_leader_index = 1 for(var/xeno in user.hive.xeno_leader_list) var/mob/living/carbon/xenomorph/xeno_lead = user.hive.xeno_leader_list[xeno_leader_index] if(xeno_lead) - options["Xeno Leader [xeno_lead]"] = "[xeno_leader_index]" + options["Xeno Leader [xeno_lead]"] = list(TRACKER_LEADER, xeno_leader_index) xeno_leader_index++ + + var/tunnel_index = 1 + for(var/obj/structure/tunnel/tracked_tunnel in user.hive.tunnels) + options["Tunnel [tracked_tunnel.tunnel_desc]"] = list(TRACKER_TUNNEL, tunnel_index) + tunnel_index++ + var/selected = tgui_input_list(user, "Select what you want the locator to track.", "Locator Options", options) if(selected) track_state = options[selected] diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index ce942c81aa52..21ac66e5f222 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -10,38 +10,38 @@ else to_chat(src, SPAN_NOTICE(" You will no longer examine things you click on.")) -/mob/dead/observer/click(atom/A, list/mods) +/mob/dead/observer/click(atom/target, list/mods) if(..()) - return 1 + return TRUE if (mods["shift"] && mods["middle"]) - point_to(A) + point_to(target) return TRUE if(mods["ctrl"]) - if(A == src) + if(target == src) if(!can_reenter_corpse || !mind || !mind.current) return if(alert(src, "Are you sure you want to re-enter your corpse?", "Confirm", "Yes", "No") == "Yes") reenter_corpse() return TRUE - if(ismob(A) || isVehicle(A)) - if(isxeno(A) && SSticker.mode.check_xeno_late_join(src)) //if it's a xeno and all checks are alright, we are gonna try to take their body - var/mob/living/carbon/xenomorph/X = A - if(X.stat == DEAD || is_admin_level(X.z) || X.aghosted) - to_chat(src, SPAN_WARNING("You cannot join as [X].")) - ManualFollow(X) - return + if(ismob(target) || isVehicle(target)) + if(isxeno(target) && SSticker.mode.check_xeno_late_join(src)) //if it's a xeno and all checks are alright, we are gonna try to take their body + var/mob/living/carbon/xenomorph/xeno = target + if(xeno.stat == DEAD || is_admin_level(xeno.z) || xeno.aghosted) + to_chat(src, SPAN_WARNING("You cannot join as [xeno].")) + ManualFollow(xeno) + return FALSE if(!SSticker.mode.xeno_bypass_timer) - if((!islarva(X) && X.away_timer < XENO_LEAVE_TIMER) || (islarva(X) && X.away_timer < XENO_LEAVE_TIMER_LARVA)) - var/to_wait = XENO_LEAVE_TIMER - X.away_timer - if(islarva(X)) - to_wait = XENO_LEAVE_TIMER_LARVA - X.away_timer + if((!islarva(xeno) && xeno.away_timer < XENO_LEAVE_TIMER) || (islarva(xeno) && xeno.away_timer < XENO_LEAVE_TIMER_LARVA)) + var/to_wait = XENO_LEAVE_TIMER - xeno.away_timer + if(islarva(xeno)) + to_wait = XENO_LEAVE_TIMER_LARVA - xeno.away_timer if(to_wait > 60 SECONDS) // don't spam for clearly non-AFK xenos to_chat(src, SPAN_WARNING("That player hasn't been away long enough. Please wait [to_wait] second\s longer.")) - ManualFollow(A) + ManualFollow(target) return FALSE var/deathtime = world.time - timeofdeath @@ -50,32 +50,33 @@ message = SPAN_WARNING("[message]") to_chat(src, message) to_chat(src, SPAN_WARNING("You must wait 2.5 minutes before rejoining the game!")) - ManualFollow(A) + ManualFollow(target) return FALSE - if(alert(src, "Are you sure you want to transfer yourself into [X]?", "Confirm Transfer", "Yes", "No") != "Yes") + if(alert(src, "Are you sure you want to transfer yourself into [xeno]?", "Confirm Transfer", "Yes", "No") != "Yes") return FALSE - if(((!islarva(X) && X.away_timer < XENO_LEAVE_TIMER) || (islarva(X) && X.away_timer < XENO_LEAVE_TIMER_LARVA)) || X.stat == DEAD) // Do it again, just in case + if(((!islarva(xeno) && xeno.away_timer < XENO_LEAVE_TIMER) || (islarva(xeno) && xeno.away_timer < XENO_LEAVE_TIMER_LARVA)) || xeno.stat == DEAD) // Do it again, just in case to_chat(src, SPAN_WARNING("That xenomorph can no longer be controlled. Please try another.")) return FALSE - SSticker.mode.transfer_xeno(src, X) + SSticker.mode.transfer_xeno(src, xeno) return TRUE - ManualFollow(A) + ManualFollow(target) return TRUE - following = null - abstract_move(get_turf(A)) - return 1 + if(!istype(target, /atom/movable/screen)) + following = null + abstract_move(get_turf(target)) + return TRUE if(world.time <= next_move) - return 1 + return TRUE next_move = world.time + 8 // You are responsible for checking config.ghost_interaction when you override this function // Not all of them require checking, see below if(!mods["shift"]) - A.attack_ghost(src) - return 1 + target.attack_ghost(src) + return FALSE // Oh by the way this didn't work with old click code which is why clicking shit didn't spam you /atom/proc/attack_ghost(mob/dead/observer/user) diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index c53d58185753..a8ed20f5c4b3 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -12,9 +12,10 @@ if (isStructure(A) && get_dist(src, A) <= 1) var/obj/structure/S = A S.do_climb(src, mods) + return TRUE else if(!(isitem(A) && get_dist(src, A) <= 1) && client.prefs.toggle_prefs & TOGGLE_MIDDLE_MOUSE_SWAP_HANDS) swap_hand() - return TRUE + return TRUE return ..() diff --git a/code/_onclick/xeno.dm b/code/_onclick/xeno.dm index 379b4746c858..bb7b8cf41aca 100644 --- a/code/_onclick/xeno.dm +++ b/code/_onclick/xeno.dm @@ -2,7 +2,7 @@ Xenomorph */ -/mob/living/carbon/xenomorph/UnarmedAttack(atom/target, proximity, click_parameters, tile_attack = FALSE) +/mob/living/carbon/xenomorph/UnarmedAttack(atom/target, proximity, click_parameters, tile_attack = FALSE, ignores_resin = FALSE) if(lying || burrow) //No attacks while laying down return FALSE var/mob/alt @@ -28,6 +28,16 @@ break if (target == T && alt) target = alt + if (T && ignores_resin) // Will not target resin walls and doors if this is set to true. This is normally only set to true through a directional attack. + if(istype(T, /obj/structure/mineral_door/resin)) + var/obj/structure/mineral_door/resin/attacked_door = T + if(hivenumber == attacked_door.hivenumber) + return FALSE + if(istype(T, /turf/closed/wall/resin)) + var/turf/closed/wall/resin/attacked_wall = T + if(hivenumber == attacked_wall.hivenumber) + return FALSE + target = target.handle_barriers(src, , (PASS_MOB_THRU_XENO|PASS_TYPE_CRAWLER)) // Checks if target will be attacked by the current alien OR if the blocker will be attacked switch(target.attack_alien(src)) if(XENO_ATTACK_ACTION) @@ -75,7 +85,7 @@ return if (client && client.prefs && client.prefs.toggle_prefs & TOGGLE_DIRECTIONAL_ATTACK) next_move += 0.25 SECONDS //Slight delay on missed directional attacks. If it finds a mob in the target tile, this will be overwritten by the attack delay. - return UnarmedAttack(get_step(src, Get_Compass_Dir(src, A)), tile_attack = TRUE) + return UnarmedAttack(get_step(src, Get_Compass_Dir(src, A)), tile_attack = TRUE, ignores_resin = TRUE) return FALSE /**The parent proc, will default to UnarmedAttack behaviour unless overriden @@ -89,39 +99,31 @@ so that it doesn't double up on the delays) so that it applies the delay immedia /atom/proc/attack_alien(mob/user as mob) return -/mob/living/carbon/xenomorph/click(atom/A, list/mods) - if (queued_action) - handle_queued_action(A) +/mob/living/carbon/xenomorph/click(atom/target, list/mods) + if(queued_action) + handle_queued_action(target) return TRUE - if (mods["alt"] && mods["shift"]) - if (istype(A, /mob/living/carbon/xenomorph)) - var/mob/living/carbon/xenomorph/X = A - - if (X && !QDELETED(X) && X != observed_xeno && X.stat != DEAD && !is_admin_level(X.z) && X.check_state(1) && X.hivenumber == hivenumber) - if (caste && istype(caste, /datum/caste_datum/queen)) - var/mob/living/carbon/xenomorph/oldXeno = observed_xeno - overwatch(X, FALSE) - - if (oldXeno) - oldXeno.hud_set_queen_overwatch() - if (X && !QDELETED(X)) - X.hud_set_queen_overwatch() - - else - overwatch(X) + var/alt_pressed = mods["alt"] == "1" + var/shift_pressed = mods["shift"] == "1" + var/middle_pressed = mods["middle"] == "1" + if(alt_pressed && shift_pressed) + if(istype(target, /mob/living/carbon/xenomorph)) + var/mob/living/carbon/xenomorph/xeno = target + if(!QDELETED(xeno) && xeno.stat != DEAD && !is_admin_level(xeno.z) && xeno.check_state(TRUE) && xeno.hivenumber == hivenumber) + overwatch(xeno) next_move = world.time + 3 // Some minimal delay so this isn't crazy spammy - return 1 - - if(mods["shift"] && !mods["middle"]) - if(selected_ability && client && client.prefs && !(client.prefs.toggle_prefs & TOGGLE_MIDDLE_MOUSE_CLICK)) - selected_ability.use_ability_wrapper(A, mods) - return TRUE - - if(mods["middle"] && !mods["shift"]) - if(selected_ability && client && client.prefs && client.prefs.toggle_prefs & TOGGLE_MIDDLE_MOUSE_CLICK) - selected_ability.use_ability_wrapper(A, mods) + return TRUE + + var/middle_pref = client.prefs && (client.prefs.toggle_prefs & TOGGLE_MIDDLE_MOUSE_CLICK) != 0 // client is already tested to be non-null by caller + if(selected_ability && shift_pressed == !middle_pref && middle_pressed == middle_pref) + if(istype(target, /atom/movable/screen)) + // Click through the UI: Currently this won't attempt to sprite click any mob there, just the turf + var/turf/turf = params2turf(mods["screen-loc"], get_turf(client.eye), client) + if(turf) + target = turf + if(selected_ability.use_ability_wrapper(target, mods)) return TRUE if(next_move >= world.time) diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index 833ae334ab7a..23da8cc8c9eb 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -9,15 +9,24 @@ SUBSYSTEM_DEF(atoms) flags = SS_NO_FIRE var/old_initialized + /// A count of how many initalize changes we've made. We want to prevent old_initialize being overriden by some other value, breaking init code + var/initialized_changed = 0 + var/init_start_time + var/processing_late_loaders = FALSE var/list/late_loaders = list() var/list/roundstart_loaders = list() var/list/BadInitializeCalls = list() + initialized = INITIALIZATION_INSSATOMS + /datum/controller/subsystem/atoms/Initialize(timeofday) + init_start_time = world.time initialized = INITIALIZATION_INNEW_MAPLOAD InitializeAtoms() + initialized = INITIALIZATION_INNEW_REGULAR + old_initialized = initialized // Set up roundstart seed list. This is here because vendors were // bugging out and not populating with the correct packet names @@ -29,46 +38,84 @@ SUBSYSTEM_DEF(atoms) if(initialized == INITIALIZATION_INSSATOMS) return - initialized = INITIALIZATION_INNEW_MAPLOAD + set_tracked_initalized(INITIALIZATION_INNEW_MAPLOAD) fix_atoms_locs(atoms) + // This may look a bit odd, but if the actual atom creation runtimes for some reason, we absolutely need to set initialized BACK + CreateAtoms(atoms) + clear_tracked_initalize() + + InitializeLateLoaders() + +/// Processes all late_loaders, checking the length each iteration and prevents duplicate calls +/// This is necessary because of an edge case where there might be simultanious calls to InitializeAtoms +/datum/controller/subsystem/atoms/proc/InitializeLateLoaders() + if(processing_late_loaders) // If we still manage to double this proc, try a ++ here, or solve the root of the problem + #ifdef TESTING + testing("Ignoring duplicate request to InitializeLateLoaders") + #endif + return + + processing_late_loaders = TRUE + + for(var/I = 1; I <= late_loaders.len; I++) + var/atom/A = late_loaders[I] + //I hate that we need this + if(QDELETED(A)) + continue + A.LateInitialize() + + #ifdef TESTING + testing("Late initialized [late_loaders.len] atoms") + #endif + late_loaders.Cut() + processing_late_loaders = FALSE + +/// Actually creates the list of atoms. Exists soley so a runtime in the creation logic doesn't cause initalized to totally break +/datum/controller/subsystem/atoms/proc/CreateAtoms(list/atoms) + #ifdef TESTING var/count + #endif + var/list/mapload_arg = list(TRUE) if(atoms) + #ifdef TESTING count = atoms.len - for(var/I in atoms) - var/atom/A = I + #endif + + for(var/I in 1 to atoms.len) + var/atom/A = atoms[I] if(!(A.flags_atom & INITIALIZED)) - InitAtom(I, TRUE, mapload_arg) CHECK_TICK + InitAtom(A, TRUE, mapload_arg) else + #ifdef TESTING count = 0 - for(var/atom/A in world) + #endif + + for(var/atom/A as anything in world) if(!(A.flags_atom & INITIALIZED)) InitAtom(A, FALSE, mapload_arg) + #ifdef TESTING ++count + #endif CHECK_TICK + #ifdef TESTING testing("Initialized [count] atoms") - pass(count) - - initialized = INITIALIZATION_INNEW_REGULAR - - if(late_loaders.len) - for(var/I in late_loaders) - var/atom/A = I - A.LateInitialize() - testing("Late initialized [late_loaders.len] atoms") - late_loaders.Cut() + #endif /// Init this specific atom /datum/controller/subsystem/atoms/proc/InitAtom(atom/A, from_template = FALSE, list/arguments) var/the_type = A.type if(QDELING(A)) - BadInitializeCalls[the_type] |= BAD_INIT_QDEL_BEFORE + // Check init_start_time to not worry about atoms created before the atoms SS that are cleaned up before this + if (A.gc_destroyed > init_start_time) + BadInitializeCalls[the_type] |= BAD_INIT_QDEL_BEFORE return TRUE + // This is handled and battle tested by dreamchecker. Limit to UNIT_TESTS just in case that ever fails. #ifdef UNIT_TESTS var/start_tick = world.time #endif @@ -82,23 +129,24 @@ SUBSYSTEM_DEF(atoms) var/qdeleted = FALSE - if(result != INITIALIZE_HINT_NORMAL) - switch(result) - if(INITIALIZE_HINT_LATELOAD) - if(arguments[1]) //mapload - late_loaders += A - else - A.LateInitialize() - if(INITIALIZE_HINT_QDEL) - qdel(A) - qdeleted = TRUE - if(INITIALIZE_HINT_ROUNDSTART) - if(SSticker.current_state >= GAME_STATE_PLAYING) - A.LateInitialize() - else - roundstart_loaders += A + switch(result) + if (INITIALIZE_HINT_NORMAL) + // pass + if(INITIALIZE_HINT_LATELOAD) + if(arguments[1]) //mapload + late_loaders += A else - BadInitializeCalls[the_type] |= BAD_INIT_NO_HINT + A.LateInitialize() + if(INITIALIZE_HINT_ROUNDSTART) + if(SSticker.current_state >= GAME_STATE_PLAYING) + A.LateInitialize() + else + roundstart_loaders += A + if(INITIALIZE_HINT_QDEL) + qdel(A) + qdeleted = TRUE + else + BadInitializeCalls[the_type] |= BAD_INIT_NO_HINT if(!A) //possible harddel qdeleted = TRUE @@ -130,11 +178,29 @@ SUBSYSTEM_DEF(atoms) A.loc = A.loc /datum/controller/subsystem/atoms/proc/map_loader_begin() - old_initialized = initialized - initialized = INITIALIZATION_INSSATOMS + set_tracked_initalized(INITIALIZATION_INSSATOMS) /datum/controller/subsystem/atoms/proc/map_loader_stop() - initialized = old_initialized + clear_tracked_initalize() + +/// Use this to set initialized to prevent error states where old_initialized is overriden. It keeps happening and it's cheesing me off +/datum/controller/subsystem/atoms/proc/set_tracked_initalized(value) + if(!initialized_changed) + old_initialized = initialized + initialized = value + else + // TG has this as a stack_trace, but currently is a non-issue so lets not escalate it to be a runtime + debug_log("We started maploading while we were already maploading. You doing something odd?") + initialized_changed += 1 + +/datum/controller/subsystem/atoms/proc/clear_tracked_initalize() + initialized_changed -= 1 + if(!initialized_changed) + initialized = old_initialized + +/// Returns TRUE if anything is currently being initialized +/datum/controller/subsystem/atoms/proc/initializing_something() + return initialized_changed > 0 /datum/controller/subsystem/atoms/Recover() initialized = SSatoms.initialized @@ -160,4 +226,4 @@ SUBSYSTEM_DEF(atoms) /datum/controller/subsystem/atoms/Shutdown() var/initlog = InitLog() if(initlog) - text2file(initlog, "data/initialize.log") + text2file(initlog, "[GLOB.log_directory]/initialize.log") diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm index 1fbc92f73d84..a98eaa0f7876 100644 --- a/code/controllers/subsystem/communications.dm +++ b/code/controllers/subsystem/communications.dm @@ -216,6 +216,7 @@ var/const/RADIO_DEFAULT = "radio_default" var/const/RADIO_TO_AIRALARM = "radio_airalarm" //air alarms var/const/RADIO_FROM_AIRALARM = "radio_airalarm_rcvr" //devices interested in receiving signals from air alarms var/const/RADIO_CHAT = "radio_telecoms" +var/const/RADIO_SIGNALS = "radio_signals" var/const/RADIO_ATMOSIA = "radio_atmos" var/const/RADIO_NAVBEACONS = "radio_navbeacon" var/const/RADIO_AIRLOCK = "radio_airlock" @@ -368,6 +369,9 @@ SUBSYSTEM_DEF(radio) for(var/datum/weakref/device_ref as anything in devices[filter]) var/obj/device = device_ref.resolve() + if(!device) + continue + if(device == source) continue @@ -400,12 +404,9 @@ SUBSYSTEM_DEF(radio) /datum/radio_frequency/proc/remove_listener(obj/device) for (var/devices_filter in devices) var/list/devices_line = devices[devices_filter] - devices_line -= WEAKREF(device) - while (null in devices_line) - devices_line -= null - if (devices_line.len==0) + devices_line -= device.weak_reference + if (!length(devices_line)) devices -= devices_filter - qdel(devices_line) /datum/signal var/obj/source diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 100cf0835e76..e94d6b1aff1d 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -139,6 +139,13 @@ SUBSYSTEM_DEF(garbage) pass_counts[i] = 0 fail_counts[i] = 0 +#ifdef EXPERIMENT_515_QDEL_HARD_REFERENCE +// 1 from the hard reference in the queue, and 1 from the variable used before this +#define IS_DELETED(datum, _) (refcount(##datum) == 2) +#else +#define IS_DELETED(datum, gcd_at_time) (isnull(##datum) || ##datum.gc_destroyed != gcd_at_time) +#endif + /datum/controller/subsystem/garbage/proc/HandleQueue(level = GC_QUEUE_FILTER) if (level == GC_QUEUE_FILTER) delslasttick = 0 @@ -159,26 +166,33 @@ SUBSYSTEM_DEF(garbage) //Normally this isn't expensive, but the gc queue can grow to 40k items, and that gets costly/causes overrun. for (var/i in 1 to length(queue)) var/list/L = queue[i] - if (length(L) < 2) + if (length(L) < GC_QUEUE_ITEM_INDEX_COUNT) count++ if (MC_TICK_CHECK) return continue - var/GCd_at_time = L[1] - if(GCd_at_time > cut_off_time) + var/queued_at_time = L[GC_QUEUE_ITEM_QUEUE_TIME] + + if(queued_at_time > cut_off_time) break // Everything else is newer, skip them count++ - var/refID = L[2] + +#ifdef EXPERIMENT_515_QDEL_HARD_REFERENCE + var/datum/D = L[GC_QUEUE_ITEM_REF] +#else + var/GCd_at_time = L[GC_QUEUE_ITEM_GCD_DESTROYED] + var/refID = L[GC_QUEUE_ITEM_REF] var/datum/D D = locate(refID) +#endif - if (!D || D.gc_destroyed != GCd_at_time) // So if something else coincidently gets the same ref, it's not deleted by mistake + if (IS_DELETED(D, GCd_at_time)) // So if something else coincidently gets the same ref, it's not deleted by mistake ++gcedlasttick ++totalgcs pass_counts[level]++ #ifdef REFERENCE_TRACKING - reference_find_on_fail -= refID //It's deleted we don't care anymore. + reference_find_on_fail -= text_ref(D) //It's deleted we don't care anymore. #endif if (MC_TICK_CHECK) return @@ -194,7 +208,7 @@ SUBSYSTEM_DEF(garbage) switch (level) if (GC_QUEUE_CHECK) #ifdef REFERENCE_TRACKING - if(reference_find_on_fail[refID]) + if(reference_find_on_fail[text_ref(D)]) INVOKE_ASYNC(D, TYPE_PROC_REF(/datum,find_references)) ref_searching = TRUE #ifdef GC_FAILURE_HARD_LOOKUP @@ -202,12 +216,17 @@ SUBSYSTEM_DEF(garbage) INVOKE_ASYNC(D, TYPE_PROC_REF(/datum,find_references)) ref_searching = TRUE #endif - reference_find_on_fail -= refID + reference_find_on_fail -= text_ref(D) #endif var/type = D.type var/datum/qdel_item/I = items[type] - //log_world("## TESTING: GC: -- [text_ref(D)] | [type] was unable to be GC'd --") + var/message = "## TESTING: GC: -- [text_ref(D)] | [type] was unable to be GC'd --" +#if DM_VERSION >= 515 + message = "[message] (ref count of [refcount(D)])" +#endif + log_world(message) + #ifdef TESTING for(var/c in GLOB.admins) //Using testing() here would fill the logs with ADMIN_VV garbage var/client/admin = c @@ -242,19 +261,30 @@ SUBSYSTEM_DEF(garbage) queue.Cut(1,count+1) count = 0 +#undef IS_DELETED + /datum/controller/subsystem/garbage/proc/Queue(datum/D, level = GC_QUEUE_FILTER) if (isnull(D)) return if (level > GC_QUEUE_COUNT) HardDelete(D) return - var/gctime = world.time + var/queue_time = world.time + +#ifdef EXPERIMENT_515_QDEL_HARD_REFERENCE + var/refid = D +#else var/refid = text_ref(D) +#endif + + var/static/uid = 0 + uid = WRAP(uid+1, 1, SHORT_REAL_LIMIT - 1) + if (D.gc_destroyed <= 0) + D.gc_destroyed = uid - D.gc_destroyed = gctime var/list/queue = queues[level] - queue[++queue.len] = list(gctime, refid) // not += for byond reasons + queue[++queue.len] = list(queue_time, refid, D.gc_destroyed) // not += for byond reasons //this is mainly to separate things profile wise. /datum/controller/subsystem/garbage/proc/HardDelete(datum/D, force) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index b05863b418b7..ed6e3cda15f5 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -85,7 +85,7 @@ SUBSYSTEM_DEF(mapping) z_list = SSmapping.z_list #define INIT_ANNOUNCE(X) to_chat(world, "[X]"); log_world(X) -/datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE) +/datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE, override_map_path = "maps/") . = list() var/start_time = REALTIMEOFDAY @@ -96,7 +96,7 @@ SUBSYSTEM_DEF(mapping) var/total_z = 0 var/list/parsed_maps = list() for (var/file in files) - var/full_path = "maps/[path]/[file]" + var/full_path = "[override_map_path]/[path]/[file]" var/datum/parsed_map/pm = new(file(full_path)) var/bounds = pm?.bounds if (!bounds) @@ -131,11 +131,11 @@ SUBSYSTEM_DEF(mapping) INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!") return parsed_maps -/datum/controller/subsystem/mapping/proc/Loadship(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE) - LoadGroup(errorList, name, path, files, traits, default_traits, silent) +/datum/controller/subsystem/mapping/proc/Loadship(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE, override_map_path = "maps/") + LoadGroup(errorList, name, path, files, traits, default_traits, silent, override_map_path = override_map_path) -/datum/controller/subsystem/mapping/proc/Loadground(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE) - LoadGroup(errorList, name, path, files, traits, default_traits, silent) +/datum/controller/subsystem/mapping/proc/Loadground(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE, override_map_path = "maps/") + LoadGroup(errorList, name, path, files, traits, default_traits, silent, override_map_path = override_map_path) /datum/controller/subsystem/mapping/proc/loadWorld() //if any of these fail, something has gone horribly, HORRIBLY, wrong @@ -149,12 +149,18 @@ SUBSYSTEM_DEF(mapping) var/datum/map_config/ground_map = configs[GROUND_MAP] INIT_ANNOUNCE("Loading [ground_map.map_name]...") - Loadground(FailedZs, ground_map.map_name, ground_map.map_path, ground_map.map_file, ground_map.traits, ZTRAITS_GROUND) + var/ground_base_path = "maps/" + if(ground_map.override_map) + ground_base_path = "data/" + Loadground(FailedZs, ground_map.map_name, ground_map.map_path, ground_map.map_file, ground_map.traits, ZTRAITS_GROUND, override_map_path = ground_base_path) if(!ground_map.disable_ship_map) var/datum/map_config/ship_map = configs[SHIP_MAP] + var/ship_base_path = "maps/" + if(ship_map.override_map) + ship_base_path = "data/" INIT_ANNOUNCE("Loading [ship_map.map_name]...") - Loadship(FailedZs, ship_map.map_name, ship_map.map_path, ship_map.map_file, ship_map.traits, ZTRAITS_MAIN_SHIP) + Loadship(FailedZs, ship_map.map_name, ship_map.map_path, ship_map.map_file, ship_map.traits, ZTRAITS_MAIN_SHIP, override_map_path = ship_base_path) if(LAZYLEN(FailedZs)) //but seriously, unless the server's filesystem is messed up this will never happen var/msg = "RED ALERT! The following map files failed to load: [FailedZs[1]]" diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm index 77eb5147ab3c..e365a9b60781 100644 --- a/code/controllers/subsystem/minimap.dm +++ b/code/controllers/subsystem/minimap.dm @@ -296,13 +296,17 @@ SUBSYSTEM_DEF(minimaps) pixel_y = MINIMAP_PIXEL_FROM_WORLD(source.y) + SSminimaps.minimaps_by_z["[source_z]"].y_offset /** - * Removes an atom and it's blip from the subsystem + * Removes an atom and it's blip from the subsystem. + * Force has no effect on this proc, but is here because we are a COMSIG_PARENT_QDELETING handler. */ -/datum/controller/subsystem/minimaps/proc/remove_marker(atom/source, minimap_flag) +/datum/controller/subsystem/minimaps/proc/remove_marker(atom/source, force, minimap_flag) SIGNAL_HANDLER if(!removal_cbs[source]) //already removed return UnregisterSignal(source, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_Z_CHANGED)) + images_by_source -= source + removal_cbs[source].Invoke() + removal_cbs -= source var/turf/turf_gotten = get_turf(source) if(!turf_gotten) return @@ -312,10 +316,6 @@ SUBSYSTEM_DEF(minimaps) else for(var/flag in GLOB.all_minimap_flags) minimaps_by_z["[z_level]"].images_assoc["[flag]"] -= source - images_by_source -= source - removal_cbs[source].Invoke() - removal_cbs -= source - /** * Fetches a /atom/movable/screen/minimap instance or creates on if none exists diff --git a/code/controllers/subsystem/nightmare.dm b/code/controllers/subsystem/nightmare.dm index fd0828329388..e963653b54a0 100644 --- a/code/controllers/subsystem/nightmare.dm +++ b/code/controllers/subsystem/nightmare.dm @@ -42,6 +42,9 @@ SUBSYSTEM_DEF(nightmare) // this is the only way i've found to make this work, other than going // full cooperative scheduling with the tasks / a ticking SS + if(!initialized) + message_admins("Nightmare subsystem is performing prepare_game prior to initialization! No nightmare inserts will be loaded.") + if(stat == NIGHTMARE_STATUS_DONE) return TRUE if(stat == NIGHTMARE_STATUS_RUNNING) diff --git a/code/controllers/subsystem/reagents.dm b/code/controllers/subsystem/reagents.dm new file mode 100644 index 000000000000..5a310801b191 --- /dev/null +++ b/code/controllers/subsystem/reagents.dm @@ -0,0 +1,73 @@ +SUBSYSTEM_DEF(reagents) + name = "Reagents" + init_order = SS_INIT_REAGENTS + flags = SS_NO_FIRE + +/datum/controller/subsystem/reagents/Initialize() + // Initalize to create the global chemistry lists: + // Must be before SSatoms.InitializeAtoms and SSmapping + prepare_properties() + prepare_reagents() + + return SS_INIT_SUCCESS + +/datum/controller/subsystem/reagents/Recover() + initialized = SSreagents.initialized + +/datum/controller/subsystem/reagents/proc/prepare_properties() + //Chemical Properties - Initialises all /datum/chem_property into a list indexed by property name + var/paths = typesof(/datum/chem_property) + chemical_properties_list = list() + //Some filters + chemical_properties_list["negative"] = list() + chemical_properties_list["neutral"] = list() + chemical_properties_list["positive"] = list() + chemical_properties_list["rare"] = list() + //Save + for(var/path in paths) + var/datum/chem_property/prop = new path() + if(!prop.name) + continue + chemical_properties_list[prop.name] = prop + if(prop.starter) + //Add a separate instance to the chemical property database + var/datum/chem_property/chem = new path() + chem.level = 0 + chemical_data.research_property_data += chem + if(prop.rarity > PROPERTY_DISABLED) + //Filters for the generator picking properties + if(prop.rarity == PROPERTY_RARE || prop.rarity == PROPERTY_LEGENDARY) + chemical_properties_list["rare"][prop.name] = prop + else if(isNegativeProperty(prop)) + chemical_properties_list["negative"][prop.name] = prop + else if(isNeutralProperty(prop)) + chemical_properties_list["neutral"][prop.name] = prop + else if(isPositiveProperty(prop)) + chemical_properties_list["positive"][prop.name] = prop + +/datum/controller/subsystem/reagents/proc/prepare_reagents() + //I dislike having these here but map-objects are initialised before world/New() is called. >_> + set waitfor = FALSE + //Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id + //Generated chemicals should be initialized last, hence the substract then readd. + var/list/paths = subtypesof(/datum/reagent) - typesof(/datum/reagent/generated) - subtypesof(/datum/reagent/generated) + subtypesof(/datum/reagent/generated) + chemical_reagents_list = list() + for(var/path in paths) + var/datum/reagent/chem = new path() + chem.save_chemclass() + chemical_reagents_list[chem.id] = chem + + //Chemical Reactions - Initialises all /datum/chemical_reaction into a list + // It is filtered into multiple lists within a list. + // For example: + // chemical_reaction_list["phoron"] is a list of all reactions relating to phoron + var/list/regular_paths = subtypesof(/datum/chemical_reaction) - typesof(/datum/chemical_reaction/generated) + var/list/generated_paths = subtypesof(/datum/chemical_reaction/generated) //Generated chemicals should be initialized last + chemical_reactions_filtered_list = list() + chemical_reactions_list = list() + + for(paths in list(regular_paths, generated_paths)) + for(var/path in paths) + var/datum/chemical_reaction/react = new path() + chemical_reactions_list[react.id] = react + react.add_to_filtered_list() diff --git a/code/datums/agents/tools.dm b/code/datums/agents/tools.dm index 787784729b52..be753f30abce 100644 --- a/code/datums/agents/tools.dm +++ b/code/datums/agents/tools.dm @@ -7,28 +7,28 @@ req_access = list() req_role = null listed_products = list( - list("

WEAPONS

", -1, null, null, null), + list("WEAPONS", 0, null, null, null), list("Configured Stunbaton", 25, /obj/item/weapon/baton/antag, "white", "A stun baton with more charge, tuned to work only for agents."), list("Tranquilizer Gun", 25, /obj/item/weapon/gun/pistol/tranquilizer, "white", "A tranquilizer gun. Comes with 5 darts. Deals no damage, knockout guaranteed."), list("Chloroform Cloth", 18, /obj/item/weapon/chloroform, "white", "A cloth dosed with chloroform. Has 8 effective uses and can only be used whilst behind a target. You must be in disarm intent to use."), - list("

ONE-USE TOOLS

", -1, null, null, null), + list("ONE-USE TOOLS", 0, null, null, null), list("Experimental Stimulant Pills", 20, /obj/item/storage/pill_bottle/ultrazine/antag, "white", "Useful stimulants that allow you to resist stamina damage. Lasts for approximately 2 minutes. Take only 1 pill. Use with care."), list("Decoy", 14, /obj/item/explosive/grenade/decoy, "white", "A decoy grenade. Emits a loud explosion that can be heard from very far away, keep away from ears. Can be used 3 times."), - list("

UTILITY

", -1, null, null, null), + list("UTILITY", 0, null, null, null), list("Security Access Tuner v2", 25, /obj/item/device/multitool/antag, "white", "An upgraded access tuner, able to rapidly hack various machinery. Disguised as a regular multitool"), list("OoI Tracker", 20, /obj/item/device/tracker, "white", "A tracker that tracks different objects of interest in a nearby range."), - list("

KITS

", -1, null, null, null), + list("KITS", 0, null, null, null), list("Badass Kit", 12, /obj/item/storage/box/badass_kit, "white", "Contains MP private comms encryption key, for snooping into enemy communications and sunglasses that protect you from flashbangs"), list("Tools Kit", 15, /obj/item/storage/toolbox/antag, "white", "A toolbox containing general tools and an engineering pamphlet to help you break into places of interest."), list("Hacking Kit", 15, /obj/item/storage/box/antag_signaller, "white", "A box containing a screwdriver, a multi-tool and an engineering pamphlet, as well as 5 signallers to help you hack doors."), - list("

TRANSFER POINTS

", -1, null, null, "A method of transferring points between agents."), - list("1 point", 1, /obj/item/stack/points/p1, "white", null), - list("5 points", 5, /obj/item/stack/points/p5, "white", null), - list("20 points", 20, /obj/item/stack/points/p20, "white", null), + list("TRANSFER POINTS", 0, null, null, null), + list("1 point", 1, /obj/item/stack/points/p1, "white", "A method of transferring points between agents."), + list("5 points", 5, /obj/item/stack/points/p5, "white", "A method of transferring points between agents."), + list("20 points", 20, /obj/item/stack/points/p20, "white", "A method of transferring points between agents."), ) points = 40 diff --git a/code/datums/callback.dm b/code/datums/callback.dm index 2c7326060a1c..4fbb16c3d259 100644 --- a/code/datums/callback.dm +++ b/code/datums/callback.dm @@ -50,6 +50,13 @@ HELP TO PROC TYPEPATH SHORTCUTS (Purely based on the path in the code) if (length(args) > 2) arguments = args.Copy(3) +/datum/callback/Destroy(force, ...) + delegate = null + if(arguments) + arguments.Cut() + arguments = null + return ..() + /proc/ImmediateInvokeAsync(thingtocall, proctocall, ...) set waitfor = FALSE diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 312a133f8724..b60b20bc9026 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -305,8 +305,14 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new) S.fields["criminal"] = "None" S.fields["incident"] = "" S.fields["ref"] = WEAKREF(H) + + if(H.sec_record && !jobban_isbanned(H, "Records")) + var/new_comment = list("entry" = H.sec_record, "created_by" = list("name" = "\[REDACTED\]", "rank" = "Military Police"), "deleted_by" = null, "deleted_at" = null, "created_at" = "Pre-Deployment") + S.fields["comments"] = list("1" = new_comment) + S.fields["notes"] = H.sec_record security += S + //Locked Record var/datum/data/record/L = new() L.fields["id"] = md5("[H.real_name][H.job]") diff --git a/code/datums/datum.dm b/code/datums/datum.dm index a6f567f17176..b26c6afe4d91 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -54,10 +54,12 @@ */ var/list/cooldowns +#ifndef EXPERIMENT_515_DONT_CACHE_REF /// A cached version of our \ref /// The brunt of \ref costs are in creating entries in the string tree (a tree of immutable strings) /// This avoids doing that more then once per datum by ensuring ref strings always have a reference to them after they're first pulled var/cached_ref +#endif /// A weak reference to another datum var/datum/weakref/weak_reference @@ -93,40 +95,46 @@ */ /datum/proc/Destroy(force=FALSE, ...) SHOULD_CALL_PARENT(TRUE) + SHOULD_NOT_SLEEP(TRUE) tag = null datum_flags &= ~DF_USE_TAG //In case something tries to REF us weak_reference = null //ensure prompt GCing of weakref. - var/list/timers = active_timers - active_timers = null - for(var/thing in timers) - var/datum/timedevent/timer = thing - if (timer.spent) - continue - qdel(timer) + if(cooldowns) + for(var/cooldown as anything in cooldowns) + var/cd_id = cooldowns[cooldown] + if(cd_id != -1) + deltimer(cd_id) + + if(active_timers) + var/list/timers = active_timers + active_timers = null + for(var/datum/timedevent/timer as anything in timers) + if (timer.spent && !(timer.flags & TIMER_DELETE_ME)) + continue + qdel(timer) //BEGIN: ECS SHIT signal_enabled = FALSE - var/list/dc = datum_components - if(dc) - var/all_components = dc[/datum/component] + if(datum_components) + var/all_components = datum_components[/datum/component] if(length(all_components)) - for(var/I in all_components) - var/datum/component/C = I - qdel(C, FALSE, TRUE) + for(var/datum/component/component as anything in all_components) + qdel(component, FALSE, TRUE) else var/datum/component/C = all_components qdel(C, FALSE, TRUE) - dc.Cut() + if(datum_components) + debug_log("'[src]' datum_components was not null after removing all components! [datum_components.len] entries remained...") + datum_components.Cut() var/list/lookup = comp_lookup if(lookup) for(var/sig in lookup) var/list/comps = lookup[sig] if(length(comps)) - for(var/i in comps) - var/datum/component/comp = i + for(var/datum/component/comp as anything in comps) comp.UnregisterSignal(src, sig) else var/datum/component/comp = comps diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 61c67d43d49c..97aec074d2d3 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -17,6 +17,7 @@ stage_prob = 4 stage_minimum_age = 150 survive_mob_death = TRUE //FALSE //switch to true to make dead infected humans still transform + longevity = 500 //should allow the dead to rise var/zombie_transforming = 0 //whether we're currently transforming the host into a zombie. var/goo_message_cooldown = 0 //to make sure we don't spam messages too often. var/stage_counter = 0 // tells a dead infectee their stage, so they can know when-abouts they'll revive @@ -106,6 +107,7 @@ if(human && human.loc) if(human.stat == DEAD) human.revive(TRUE) + human.remove_language(LANGUAGE_ENGLISH) // You lose the ability to understand english. Language processing is handled in the mind not the body. var/datum/species/zombie/zombie_species = GLOB.all_species[SPECIES_ZOMBIE] zombie_species.handle_alert_ghost(human) playsound(human.loc, 'sound/hallucinations/wail.ogg', 25, 1) @@ -213,16 +215,16 @@ /datum/language/zombie name = "Zombie" - desc = "If you select this from the language screen, expect a ban." - color = "zombie" - - speech_verb = "groans" - ask_verb = "groans" - exclaim_verb = "groans" - - key = "4" + desc = "A growling, guttural method of communication, only Zombies seem to be capable of producing these sounds." + speech_verb = "growls" + ask_verb = "grumbles" + exclaim_verb = "snarls" + color = "monkey" + key = "h" flags = RESTRICTED +/datum/language/zombie/scramble(input) + return pick("Urrghh...", "Rrraaahhh...", "Aaaarghhh...", "Mmmrrrgggghhh...", "Huuuuhhhh...", "Sssssgrrrr...") /obj/item/clothing/glasses/zombie_eyes name = "zombie eyes" diff --git a/code/datums/emergency_calls/big_game_hunter.dm b/code/datums/emergency_calls/big_game_hunter.dm index 16a0b0b5da6a..e749b6654355 100644 --- a/code/datums/emergency_calls/big_game_hunter.dm +++ b/code/datums/emergency_calls/big_game_hunter.dm @@ -10,7 +10,7 @@ /datum/emergency_call/van_bandolier/New() . = ..() - arrival_message = "Incoming Transmission: 'Heard your distress call, [MAIN_SHIP_NAME]. It had best be something which will look good on my wall, eh? Tally ho!'" + arrival_message = "'Heard your distress call, [MAIN_SHIP_NAME]. It had best be something which will look good on my wall, eh? Tally ho!'" /datum/emergency_call/van_bandolier/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/clf.dm b/code/datums/emergency_calls/clf.dm index 75ce93a4f680..0a5f09e2a2f2 100644 --- a/code/datums/emergency_calls/clf.dm +++ b/code/datums/emergency_calls/clf.dm @@ -4,7 +4,7 @@ /datum/emergency_call/clf name = "Colonial Liberation Front (Squad)" mob_max = 10 - arrival_message = "Incoming Transmission: 'Attention, you are tresspassing on our soverign territory. Expect no forgiveness.'" + arrival_message = "'Attention, you are tresspassing on our soverign territory. Expect no forgiveness.'" objectives = "Assault the USCM, and sabotage as much as you can. Ensure any survivors escape in your custody." probability = 20 hostility = TRUE diff --git a/code/datums/emergency_calls/cmb.dm b/code/datums/emergency_calls/cmb.dm index 5cb89756fff1..fcd301158b8f 100644 --- a/code/datums/emergency_calls/cmb.dm +++ b/code/datums/emergency_calls/cmb.dm @@ -112,7 +112,7 @@ /datum/emergency_call/cmb/anchorpoint/New() ..() - arrival_message = "Incoming Transmission: [MAIN_SHIP_NAME], this is Anchorpoint Station. Be advised, a QRF Team of our Colonial Marines is currently attempting to board you. Open your ports, transmitting docking codes now. Standby." + arrival_message = "[MAIN_SHIP_NAME], this is Anchorpoint Station. Be advised, a QRF Team of our Colonial Marines is currently attempting to board you. Open your ports, transmitting docking codes now. Standby." objectives = "QRF Team. You are here to reinforce the cmb team we deployed earlier. Make contact and work with the CMB Marshal and their deputies. Facilitate their protection and evacuation if necessary. Secondary Objective: Investigate the reason for distress aboard the [MAIN_SHIP_NAME], and assist the crew if possible." /datum/emergency_call/cmb/anchorpoint/create_member(datum/mind/M, turf/override_spawn_loc) diff --git a/code/datums/emergency_calls/colonist.dm b/code/datums/emergency_calls/colonist.dm index 7430cf6c6bc5..8b39ca12a01e 100644 --- a/code/datums/emergency_calls/colonist.dm +++ b/code/datums/emergency_calls/colonist.dm @@ -5,7 +5,7 @@ name = "Colonists" mob_max = 8 mob_min = 1 - arrival_message = "Incoming Transmission: 'This is the *static*. We are *static*.'" + arrival_message = "'This is the *static*. We are *static*.'" objectives = "Follow the orders given to you." probability = 0 var/preset = /datum/equipment_preset/colonist diff --git a/code/datums/emergency_calls/deathsquad.dm b/code/datums/emergency_calls/deathsquad.dm index 10d1e7e12c35..0bfab8fbf2b7 100644 --- a/code/datums/emergency_calls/deathsquad.dm +++ b/code/datums/emergency_calls/deathsquad.dm @@ -6,7 +6,7 @@ name = "Weyland Whiteout Operators" mob_max = 8 mob_min = 5 - arrival_message = "Intercepted Transmission: '!`2*%slau#*jer t*h$em a!l%. le&*ve n(o^ w&*nes%6es.*v$e %#d ou^'" + arrival_message = "'!`2*%slau#*jer t*h$em a!l%. le&*ve n(o^ w&*nes%6es.*v$e %#d ou^'" objectives = "Whiteout protocol is in effect for the target. Ensure there are no traces of the infestation or any witnesses." probability = 0 shuttle_id = "Distress_PMC" diff --git a/code/datums/emergency_calls/deus_vult.dm b/code/datums/emergency_calls/deus_vult.dm index eddf2f5468c4..a5ba948c767e 100644 --- a/code/datums/emergency_calls/deus_vult.dm +++ b/code/datums/emergency_calls/deus_vult.dm @@ -5,7 +5,7 @@ mob_max = 35 mob_min = 10 max_heavies = 10 - arrival_message = "Intercepted Transmission: 'Deus le volt. Deus le volt! DEUS LE VOLT!!'" + arrival_message = "'Deus le volt. Deus le volt! DEUS LE VOLT!!'" objectives = "Clense the place of all that is unholy! Die in glory!" probability = 0 hostility = TRUE diff --git a/code/datums/emergency_calls/dutch.dm b/code/datums/emergency_calls/dutch.dm index e6e8632c4155..32620fa43014 100644 --- a/code/datums/emergency_calls/dutch.dm +++ b/code/datums/emergency_calls/dutch.dm @@ -9,7 +9,7 @@ max_heavies = 1 max_medics = 1 - arrival_message = "Intercepted Transmission: 'We're here to kick ass and kill Yautja. Mainly kill Yautja." + arrival_message = "'We're here to kick ass and kill Yautja. Mainly kill Yautja." objectives = "Hunt down and kill all Yautja without mercy. Retrieve the gear and leave." probability = 0 @@ -44,6 +44,6 @@ mob_min = 8 max_heavies = 2 max_medics = 2 - arrival_message = "Intercepted Transmission: 'We're here to kick ass and kill Yautja. Mainly kill Yautja." + arrival_message = "'We're here to kick ass and kill Yautja. Mainly kill Yautja." objectives = "Hunt down and kill all Yautja without mercy. Retrieve the gear and leave." probability = 0 diff --git a/code/datums/emergency_calls/emergency_call.dm b/code/datums/emergency_calls/emergency_call.dm index d4eaa5c780fc..5b8ec289ded9 100644 --- a/code/datums/emergency_calls/emergency_call.dm +++ b/code/datums/emergency_calls/emergency_call.dm @@ -292,6 +292,8 @@ create_member(null, override_spawn_loc) candidates = list() + if(arrival_message && announce) + marine_announcement(arrival_message, "Intercepted Tranmission:") /datum/emergency_call/proc/add_candidate(mob/M) if(!M.client || (M.mind && (M.mind in candidates)) || istype(M, /mob/living/carbon/xenomorph)) diff --git a/code/datums/emergency_calls/forsaken_xenos.dm b/code/datums/emergency_calls/forsaken_xenos.dm new file mode 100644 index 000000000000..d089830658d9 --- /dev/null +++ b/code/datums/emergency_calls/forsaken_xenos.dm @@ -0,0 +1,26 @@ +/datum/emergency_call/forsaken_xenos + name = "Xenomorphs Groundside (Forsaken)" + mob_min = 1 + mob_max = 4 + hostility = TRUE + name_of_spawn = /obj/effect/landmark/ert_spawns/groundside_xeno + objectives = "You have been left behind to safeguard the abandoned colony. Do not allow trespassers." + +/datum/emergency_call/forsaken_xenos/create_member(datum/mind/new_member, turf/override_spawn_loc) + var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point() + + if(!istype(spawn_loc)) + return //Didn't find a useable spawn point. + + var/mob/current_mob = new_member.current + + var/picked = pick_weight(list(/mob/living/carbon/xenomorph/warrior = 2, /mob/living/carbon/xenomorph/lurker = 2, /mob/living/carbon/xenomorph/spitter = 2, /mob/living/carbon/xenomorph/drone = 5, /mob/living/carbon/xenomorph/runner = 5)) + + var/mob/living/carbon/xenomorph/new_xeno = new picked(spawn_loc) + + new_member.transfer_to(new_xeno, TRUE) + + new_xeno.set_hive_and_update(XENO_HIVE_FORSAKEN) + new_xeno.lock_evolve = TRUE + + QDEL_NULL(current_mob) diff --git a/code/datums/emergency_calls/hefa_knight.dm b/code/datums/emergency_calls/hefa_knight.dm index 5109db2f99fb..2af2f99f443e 100644 --- a/code/datums/emergency_calls/hefa_knight.dm +++ b/code/datums/emergency_calls/hefa_knight.dm @@ -3,7 +3,7 @@ name = "HEFA knights" mob_max = 15 mob_min = 3 - arrival_message = "Intercepted Transmission: 'Prepaerth to surrender thine HEFAs unto the order!'" + arrival_message = "'Prepaerth to surrender thine HEFAs unto the order!'" objectives = "You are a Brother of the Order of HEFA! You and your fellow brothers must retrieve as many HEFAs as possible!" probability = 0 hostility = TRUE diff --git a/code/datums/emergency_calls/inspection.dm b/code/datums/emergency_calls/inspection.dm index 1224818d40e4..72926666ace5 100644 --- a/code/datums/emergency_calls/inspection.dm +++ b/code/datums/emergency_calls/inspection.dm @@ -183,7 +183,7 @@ /datum/emergency_call/inspection_cmb/New() ..() - arrival_message = "Incoming Transmission: [MAIN_SHIP_NAME], This is Anchorpoint Station with the Colonial Marshal Bureau. Be advised, a CMB transport vessel is preparing to board you, submitting Federal docking clearances now. Standby." + arrival_message = "[MAIN_SHIP_NAME], This is Anchorpoint Station with the Colonial Marshal Bureau. Be advised, a CMB transport vessel is preparing to board you, submitting Federal docking clearances now. Standby." objectives = "Get your instructions from the CMB Office at Anchorpoint Station, and carry out your orders. Ensure that Colonial assets are safe and in your custody. Do not enforce or override Marine Law on a Marine Ship unless requested, as it's outside of your juristiction." will_spawn_icc_liaison = prob(90) diff --git a/code/datums/emergency_calls/pirates.dm b/code/datums/emergency_calls/pirates.dm index bb88261c9be5..7a9d333de970 100644 --- a/code/datums/emergency_calls/pirates.dm +++ b/code/datums/emergency_calls/pirates.dm @@ -4,7 +4,7 @@ name = "Fun - Pirates" mob_max = 35 mob_min = 10 - arrival_message = "Intercepted Transmission: 'What shall we do with a drunken sailor? What shall we do with a drunken sailor? What shall we do with a drunken sailor early in the morning?'" + arrival_message = "'What shall we do with a drunken sailor? What shall we do with a drunken sailor? What shall we do with a drunken sailor early in the morning?'" objectives = "Pirate! Loot! Ransom!" probability = 0 hostility = TRUE diff --git a/code/datums/emergency_calls/pizza.dm b/code/datums/emergency_calls/pizza.dm index ea5065dafc29..a35ce584c68d 100644 --- a/code/datums/emergency_calls/pizza.dm +++ b/code/datums/emergency_calls/pizza.dm @@ -4,7 +4,7 @@ name = "Pizza Delivery" mob_max = 1 mob_min = 1 - arrival_message = "Incoming Transmission: 'That'll be... sixteen orders of cheesy fries, eight large double topping pizzas, nine bottles of Four Loko... hello? Is anyone on this ship? Your pizzas are getting cold.'" + arrival_message = "'That'll be... sixteen orders of cheesy fries, eight large double topping pizzas, nine bottles of Four Loko... hello? Is anyone on this ship? Your pizzas are getting cold.'" objectives = "Make sure you get a tip!" shuttle_id = "Distress_Small" name_of_spawn = /obj/effect/landmark/ert_spawns/distress_pizza diff --git a/code/datums/emergency_calls/souto.dm b/code/datums/emergency_calls/souto.dm index c41049624bf2..4ff4b03076fc 100644 --- a/code/datums/emergency_calls/souto.dm +++ b/code/datums/emergency_calls/souto.dm @@ -4,7 +4,7 @@ name = "Souto Man" mob_max = 1 mob_min = 1 - arrival_message = "Incoming Transmission: Give a round of applause for the marine who sent in ten-thousand Souto tabs to get me here! USS Almayer, Souto Man's here to party with YOU!" + arrival_message = "Give a round of applause for the marine who sent in ten-thousand Souto tabs to get me here! USS Almayer, Souto Man's here to party with YOU!" objectives = "Party like it's 1999!" probability = 0 diff --git a/code/datums/emergency_calls/xeno_cultists.dm b/code/datums/emergency_calls/xeno_cultists.dm index 247b6b3a1881..e5ebf089a9c2 100644 --- a/code/datums/emergency_calls/xeno_cultists.dm +++ b/code/datums/emergency_calls/xeno_cultists.dm @@ -2,7 +2,7 @@ /datum/emergency_call/xeno_cult name = "Xeno Cultists" mob_max = 6 - arrival_message = "Incoming Transmission: 'Ia! Ia!'" + arrival_message = "'Ia! Ia!'" objectives = "Support the Xenomorphs in any way, up to and including giving your life for them!" probability = 0 hostility = TRUE diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index 5544ab0807d0..b691d87a2169 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -101,7 +101,7 @@ return if(!HAS_TRAIT(user, TRAIT_EMOTE_CD_EXEMPT)) TIMER_COOLDOWN_START(user, type, audio_cooldown) - TIMER_COOLDOWN_START(user, COOLDOWN_MOB_AUDIO, 20 SECONDS) + S_TIMER_COOLDOWN_START(user, COOLDOWN_MOB_AUDIO, 20 SECONDS) // We won't ever want to stop this except during qdel playsound(user, tmp_sound, volume, vary) log_emote("[user.name]/[user.key] : [msg ? msg : key]") diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 65133a93d155..c37bf802f12b 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -23,9 +23,10 @@ var/traits = null var/space_empty_levels = 1 var/list/environment_traits = list() - var/armor_style = "default" var/list/gamemodes = list() + var/camouflage_type = "classic" + var/allow_custom_shuttles = TRUE var/shuttles = list() @@ -63,6 +64,9 @@ var/nightmare_path + /// If truthy this is config for a round overriden map: search for override maps in data/, instead of using a path in maps/ + var/override_map + /datum/map_config/New() survivor_types = list( /datum/equipment_preset/survivor/scientist, @@ -147,24 +151,35 @@ config_filename = filename + override_map = json["override_map"] + CHECK_EXISTS("map_name") map_name = json["map_name"] - CHECK_EXISTS("map_path") - map_path = json["map_path"] webmap_url = json["webmap_url"] short_name = json["short_name"] map_file = json["map_file"] + + var/dirpath = "maps/" + if(override_map) + dirpath = "data/" + map_path = "/" + map_file = OVERRIDE_MAPS_TO_FILENAME[maptype] + else + CHECK_EXISTS("map_path") + map_path = json["map_path"] + dirpath = "[dirpath]/[map_path]" + // "map_file": "BoxStation.dmm" if (istext(map_file)) - if (!fexists("maps/[map_path]/[map_file]")) + if (!fexists("[dirpath]/[map_file]")) log_world("Map file ([map_file]) does not exist!") return // "map_file": ["Lower.dmm", "Upper.dmm"] else if (islist(map_file)) for (var/file in map_file) - if (!fexists("maps/[map_path]/[file]")) + if (!fexists("[dirpath]/[file]")) log_world("Map file ([file]) does not exist!") return else @@ -303,8 +318,8 @@ allow_custom_shuttles = json["allow_custom_shuttles"] != FALSE - if(json["armor"]) - armor_style = json["armor"] + if(json["camouflage"]) + camouflage_type = json["camouflage"] if(json["survivor_message"]) survivor_message = json["survivor_message"] @@ -372,11 +387,14 @@ #undef CHECK_EXISTS /datum/map_config/proc/GetFullMapPaths() + var/dirpath = "maps/[map_path]" + if(override_map) + dirpath = "data/[map_path]" if (istext(map_file)) - return list("maps/[map_path]/[map_file]") + return list("[dirpath]/[map_file]") . = list() for (var/file in map_file) - . += "maps/[map_path]/[file]" + . += "[dirpath]/[file]" /datum/map_config/proc/MakeNextMap(maptype = GROUND_MAP) diff --git a/code/datums/medal_awards.dm b/code/datums/medal_awards.dm index ba2ef283b03f..a7db6f7bd6e3 100644 --- a/code/datums/medal_awards.dm +++ b/code/datums/medal_awards.dm @@ -201,7 +201,7 @@ GLOBAL_LIST_EMPTY(jelly_awards) recipient_castes[recipient_name] = xeno.caste_type recipient_mobs[recipient_name] = xeno possible_recipients += recipient_name - for(var/mob/living/carbon/xenomorph/xeno in hive.totalDeadXenos) + for(var/mob/living/carbon/xenomorph/xeno in hive.total_dead_xenos) if (xeno.persistent_ckey == usr.persistent_ckey) // Don't award previous selves continue if (xeno.tier == 0) // Don't award larva or facehuggers diff --git a/code/datums/mob_hud.dm b/code/datums/mob_hud.dm index b1d9a9c2fade..c1f67e93a53c 100644 --- a/code/datums/mob_hud.dm +++ b/code/datums/mob_hud.dm @@ -232,7 +232,10 @@ var/list/datum/mob_hud/huds = list( hud.remove_hud_from(src) else if (istype(hud, /datum/mob_hud/xeno_infection)) hud.remove_hud_from(src) - + if (xeno_hostile_hud) + xeno_hostile_hud = FALSE + var/datum/mob_hud/hostile_hud = huds[MOB_HUD_XENO_HOSTILE] + hostile_hud.remove_hud_from(src) diff --git a/code/datums/pain/pain_yautja.dm b/code/datums/pain/pain_yautja.dm index 6b174d228268..94f5e8d33650 100644 --- a/code/datums/pain/pain_yautja.dm +++ b/code/datums/pain/pain_yautja.dm @@ -1,5 +1,5 @@ /datum/pain/yautja - max_pain = 200 + max_pain = 225 threshold_mild = null threshold_discomforting = null diff --git a/code/datums/paygrades/factions/uscm/marine.dm b/code/datums/paygrades/factions/uscm/marine.dm index 298be5fb089f..e351311e65ee 100644 --- a/code/datums/paygrades/factions/uscm/marine.dm +++ b/code/datums/paygrades/factions/uscm/marine.dm @@ -1,7 +1,7 @@ /datum/paygrade/marine name = "Marine Paygrade" rank_pin = /obj/item/clothing/accessory/ranks/marine - pay_multiplier = 1 + pay_multiplier = 1.6 // ENLISTED PAYGRADES @@ -11,7 +11,7 @@ prefix = "PVT" rank_pin = /obj/item/clothing/accessory/ranks/marine/e1 ranking = 0 - pay_multiplier = 0.8 + pay_multiplier = 1.6 /datum/paygrade/marine/e2 paygrade = "ME2" @@ -19,7 +19,7 @@ prefix = "PFC" rank_pin = /obj/item/clothing/accessory/ranks/marine/e2 ranking = 1 - pay_multiplier = 1 // the default. + pay_multiplier = 1.7 /datum/paygrade/marine/e3 paygrade = "ME3" @@ -27,7 +27,7 @@ prefix = "LCpl" rank_pin = /obj/item/clothing/accessory/ranks/marine/e3 ranking = 2 - pay_multiplier = 1.4 + pay_multiplier = 1.9 /datum/paygrade/marine/e4 paygrade = "ME4" @@ -35,7 +35,7 @@ prefix = "Cpl" rank_pin = /obj/item/clothing/accessory/ranks/marine/e4 ranking = 3 - pay_multiplier = 1.6 + pay_multiplier = 2.1 /datum/paygrade/marine/e5 paygrade = "ME5" @@ -43,7 +43,7 @@ prefix = "Sgt" rank_pin = /obj/item/clothing/accessory/ranks/marine/e5 ranking = 4 - pay_multiplier = 1.8 + pay_multiplier = 2.2 /datum/paygrade/marine/e6 paygrade = "ME6" @@ -51,7 +51,7 @@ prefix = "SSgt" rank_pin = /obj/item/clothing/accessory/ranks/marine/e6 ranking = 5 - pay_multiplier = 2 + pay_multiplier = 2.4 /datum/paygrade/marine/e7 paygrade = "ME7" diff --git a/code/datums/skills.dm b/code/datums/skills.dm index a3fd1e42bc44..986b449f5ea9 100644 --- a/code/datums/skills.dm +++ b/code/datums/skills.dm @@ -837,7 +837,7 @@ SYNTHETIC SKILL_SURGERY = SKILL_SURGERY_EXPERT, SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, - SKILL_PILOT = SKILL_PILOT_TRAINED, + SKILL_PILOT = SKILL_PILOT_EXPERT, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_MAX, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, @@ -860,7 +860,7 @@ SYNTHETIC SKILL_SURGERY = SKILL_SURGERY_TRAINED, SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, - SKILL_PILOT = SKILL_PILOT_TRAINED, + SKILL_PILOT = SKILL_PILOT_EXPERT, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, diff --git a/code/datums/statistics/entities/death_stats.dm b/code/datums/statistics/entities/death_stats.dm index cba83968a9d6..7e26e92ae135 100644 --- a/code/datums/statistics/entities/death_stats.dm +++ b/code/datums/statistics/entities/death_stats.dm @@ -19,6 +19,7 @@ var/time_of_death var/total_time_alive var/total_damage_taken + var/total_revives_done = 0 var/total_brute = 0 var/total_burn = 0 @@ -51,6 +52,7 @@ "time_of_death" = DB_FIELDTYPE_BIGINT, "total_time_alive" = DB_FIELDTYPE_BIGINT, "total_damage_taken" = DB_FIELDTYPE_INT, + "total_revives_done" = DB_FIELDTYPE_INT, "total_brute" = DB_FIELDTYPE_INT, "total_burn" = DB_FIELDTYPE_INT, @@ -117,6 +119,7 @@ new_death.total_kills = life_kills_total new_death.total_time_alive = life_time_total new_death.total_damage_taken = life_damage_taken_total + new_death.total_revives_done = life_revives_total handle_observer_message(cause_data, cause_mob, death_loc, A) diff --git a/code/datums/statistics/random_facts/damage_fact.dm b/code/datums/statistics/random_facts/damage_fact.dm index def2d74f66c1..2fa8a5d06491 100644 --- a/code/datums/statistics/random_facts/damage_fact.dm +++ b/code/datums/statistics/random_facts/damage_fact.dm @@ -1,57 +1,9 @@ -/datum/random_fact/damage/announce() - var/death_damage_taken = 0 - var/living_damage_taken = 0 - var/datum/entity/statistic/death/death_to_report = null - var/mob/mob_to_report = null +/datum/random_fact/damage + statistic_name = "damage" + statistic_verb = "took" - if(round_statistics && length(round_statistics.death_stats_list)) - for(var/datum/entity/statistic/death/death in round_statistics.death_stats_list) - if(!check_human && !death.is_xeno) - continue - if(!check_xeno && death.is_xeno) - continue - if(death_damage_taken < death.total_damage_taken) - death_to_report = death - death_damage_taken = death.total_damage_taken +/datum/random_fact/damage/life_grab_stat(mob/fact_mob) + return fact_mob.life_damage_taken_total - var/list/list_to_check = list() - if(check_human) list_to_check += GLOB.alive_human_list - if(check_xeno) list_to_check += GLOB.living_xeno_list - for(var/mob/M as anything in list_to_check) - if(living_damage_taken < M.life_damage_taken_total) - mob_to_report = M - living_damage_taken = M.life_damage_taken_total - - if(!death_to_report && !mob_to_report) - return - - var/name = "" - var/damage_taken = 0 - var/additional_message = "" - if(death_to_report && mob_to_report) - if(living_damage_taken > death_damage_taken) - name = mob_to_report.real_name - damage_taken = living_damage_taken - additional_message = "and survived! Great work!" - else - name = death_to_report.mob_name - damage_taken = death_damage_taken - additional_message = "before dying" - if(death_to_report.cause_name) - additional_message += " to [death_to_report.cause_name]" - additional_message += ". Good work!" - else if(death_to_report) - name = death_to_report.mob_name - damage_taken = death_damage_taken - additional_message = "before dying" - if(death_to_report.cause_name) - additional_message += " to [death_to_report.cause_name]" - additional_message += ". Good work!" - else - name = mob_to_report.real_name - damage_taken = living_damage_taken - additional_message = "and survived! Great work!" - - message = "[name] took a whopping [damage_taken] damage [additional_message]" - - return ..() +/datum/random_fact/damage/death_grab_stat(datum/entity/statistic/death/fact_death) + return fact_death.total_damage_taken diff --git a/code/datums/statistics/random_facts/kills_fact.dm b/code/datums/statistics/random_facts/kills_fact.dm index 22ad0ba27b01..7ef1c2b238de 100644 --- a/code/datums/statistics/random_facts/kills_fact.dm +++ b/code/datums/statistics/random_facts/kills_fact.dm @@ -1,56 +1,9 @@ -/datum/random_fact/kills/announce() - var/death_kills_gotten = 0 - var/living_kills_gotten = 0 - var/datum/entity/statistic/death/death_to_report = null - var/mob/mob_to_report = null +/datum/random_fact/kills + statistic_name = "kills" + statistic_verb = "earned" - if(round_statistics && length(round_statistics.death_stats_list)) - for(var/datum/entity/statistic/death/death in round_statistics.death_stats_list) - if(!check_human && !death.is_xeno) - continue - if(!check_xeno && death.is_xeno) - continue - if(death_kills_gotten < death.total_kills) - death_to_report = death - death_kills_gotten = death.total_kills +/datum/random_fact/kills/life_grab_stat(mob/fact_mob) + return fact_mob.life_kills_total - var/list/list_to_check = list() - if(check_human) list_to_check += GLOB.alive_human_list - if(check_xeno) list_to_check += GLOB.living_xeno_list - for(var/mob/M as anything in list_to_check) - if(living_kills_gotten < M.life_kills_total) - mob_to_report = M - living_kills_gotten = M.life_kills_total - - if(!death_to_report && !mob_to_report) - return - - var/name = "" - var/kills_gotten = 0 - var/additional_message = "" - if(death_to_report && mob_to_report) - if(living_kills_gotten > death_kills_gotten) - name = mob_to_report.real_name - kills_gotten = living_kills_gotten - additional_message = "and survived! Great work!" - else - name = death_to_report.mob_name - kills_gotten = death_kills_gotten - additional_message = "before dying" - if(death_to_report.cause_name) - additional_message += " to [death_to_report.cause_name]" - additional_message += ". Good work!" - else if(death_to_report) - name = death_to_report.mob_name - kills_gotten = death_kills_gotten - additional_message = "before dying" - if(death_to_report.cause_name) - additional_message += " to [death_to_report.cause_name]" - additional_message += ". Good work!" - else - name = mob_to_report.real_name - kills_gotten = living_kills_gotten - additional_message = "and survived! Great work!" - - message = "[name] earned [kills_gotten] kill\s [additional_message]" - . = ..() +/datum/random_fact/kills/death_grab_stat(datum/entity/statistic/death/fact_death) + return fact_death.total_kills diff --git a/code/datums/statistics/random_facts/random_fact.dm b/code/datums/statistics/random_facts/random_fact.dm index f5f166c367a7..2a83c7b2c1ad 100644 --- a/code/datums/statistics/random_facts/random_fact.dm +++ b/code/datums/statistics/random_facts/random_fact.dm @@ -1,5 +1,7 @@ /datum/random_fact var/message = null + var/statistic_name = null + var/statistic_verb = null var/check_human = TRUE var/check_xeno = TRUE @@ -10,7 +12,73 @@ check_xeno = set_check_xeno /datum/random_fact/proc/announce() + calculate_announcement_message() if(message) to_world(SPAN_CENTERBOLD(message)) return TRUE return FALSE + +/datum/random_fact/proc/calculate_announcement_message() + var/death_stat_gotten = 0 + var/living_stat_gotten = 0 + var/datum/entity/statistic/death/death_to_report = null + var/mob/mob_to_report = null + + if(round_statistics && length(round_statistics.death_stats_list)) + for(var/datum/entity/statistic/death/death in round_statistics.death_stats_list) + if(!check_human && !death.is_xeno) + continue + if(!check_xeno && death.is_xeno) + continue + if(death_stat_gotten < death_grab_stat(death)) + death_to_report = death + death_stat_gotten = death_grab_stat(death) + + var/list/list_to_check = list() + if(check_human) + list_to_check += GLOB.alive_human_list + if(check_xeno) + list_to_check += GLOB.living_xeno_list + + for(var/mob/checked_mob as anything in list_to_check) + if(living_stat_gotten < life_grab_stat(checked_mob)) + mob_to_report = checked_mob + living_stat_gotten = life_grab_stat(checked_mob) + + if(!death_to_report && !mob_to_report) + return + + var/name = "" + var/stat_gotten = 0 + var/additional_message = "" + if(death_to_report && mob_to_report) + if(living_stat_gotten > death_stat_gotten) + name = mob_to_report.real_name + stat_gotten = living_stat_gotten + additional_message = "and survived! Great work!" + else + name = death_to_report.mob_name + stat_gotten = death_stat_gotten + additional_message = "before dying" + if(death_to_report.cause_name) + additional_message += " to [death_to_report.cause_name]" + additional_message += ". Good work!" + else if(death_to_report) + name = death_to_report.mob_name + stat_gotten = death_stat_gotten + additional_message = "before dying" + if(death_to_report.cause_name) + additional_message += " to [death_to_report.cause_name]" + additional_message += ". Good work!" + else + name = mob_to_report.real_name + stat_gotten = living_stat_gotten + additional_message = "and survived! Great work!" + + message = "[name] [statistic_verb] [stat_gotten] [statistic_name] [additional_message]" + +/datum/random_fact/proc/life_grab_stat(mob/fact_mob) + return 0 + +/datum/random_fact/proc/death_grab_stat(datum/entity/statistic/death/fact_death) + return 0 diff --git a/code/datums/statistics/random_facts/revives_fact.dm b/code/datums/statistics/random_facts/revives_fact.dm new file mode 100644 index 000000000000..60b6daa896d2 --- /dev/null +++ b/code/datums/statistics/random_facts/revives_fact.dm @@ -0,0 +1,9 @@ +/datum/random_fact/revives + statistic_name = "people" + statistic_verb = "revived" + +/datum/random_fact/revives/life_grab_stat(mob/fact_mob) + return fact_mob.life_revives_total + +/datum/random_fact/revives/death_grab_stat(datum/entity/statistic/death/fact_death) + return fact_death.total_revives_done diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm index 747aaee9e23d..7b036d592675 100644 --- a/code/datums/supply_packs/black_market.dm +++ b/code/datums/supply_packs/black_market.dm @@ -550,7 +550,6 @@ Primarily made up of things that would be best utilized, well, shipside. Recreat /obj/item/reagent_container/food/drinks/flask/weylandyutani/poison, /obj/item/reagent_container/food/drinks/bottle/holywater/bong, /obj/item/storage/pill_bottle/paracetamol, - /obj/item/storage/pill_bottle/zombie_powder, ) dollar_cost = 25 containertype = /obj/structure/largecrate/black_market @@ -1162,7 +1161,7 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro new /obj/effect/essentials_set/random/clf_bonus_item(loc) new /obj/effect/essentials_set/random/clf_bonus_item(loc) loot_message = SPAN_NOTICE("It's a bunch of random junk...") - if(51 to 60) + if(51 to 70) new /obj/effect/spawner/random/bomb_supply(loc) new /obj/effect/spawner/random/bomb_supply(loc) new /obj/effect/spawner/random/toolbox(loc) @@ -1174,15 +1173,7 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro else new /obj/effect/spawner/random/attachment(loc) loot_message = SPAN_NOTICE("Just some old equipment and parts.") - if(61 to 65) - // backpacks - for(var/i in 1 to rand(3, 6)) - var/pack_type = pick(subtypesof(/obj/item/storage/backpack)) - var/obj/item/storage/backpack/pack = new pack_type(loc) - if(pack.max_storage_space > 15) - pack.max_storage_space = 15 - loot_message = SPAN_NOTICE("Some backpacks. They all look empty though...") - if(66 to 70) + if(71 to 75) // CLF corpse!! Why is this here? Don't ask. var/mob/living/carbon/human/corpse = new (loc) corpse.create_hud() //Need to generate hud before we can equip anything apparently... @@ -1191,12 +1182,6 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro arm_equipment(corpse, corpse_type, TRUE, FALSE) // I didn't choose the shitcode life, the shitcode life chose me loot_message = SPAN_HIGHDANGER("IT'S A CORPSE!!") - if(71 to 75) - // Costumes. - new /obj/effect/landmark/costume/random(loc) - new /obj/effect/landmark/costume/random(loc) - new /obj/effect/landmark/costume/random(loc) - loot_message = SPAN_NOTICE("What the hell is this..?") if(76 to 90) // Random supply garbage. new /obj/effect/spawner/random/tool(loc) diff --git a/code/game/area/BigRed.dm b/code/game/area/BigRed.dm index cf1b235842cb..59d7c40cd56f 100644 --- a/code/game/area/BigRed.dm +++ b/code/game/area/BigRed.dm @@ -325,6 +325,9 @@ is_resin_allowed = FALSE soundscape_playlist = SCAPE_PL_DESERT_STORM +/area/bigredv2/outside/nw/ceiling + ceiling = CEILING_GLASS + /area/bigredv2/outside/c name = "\improper Central Colony Grounds" icon_state = "purple" @@ -485,7 +488,7 @@ /area/bigredv2/outside/space_port name = "\improper Space Port" icon_state = "green" - ceiling = CEILING_NONE + ceiling = CEILING_GLASS is_resin_allowed = FALSE is_landing_zone = TRUE diff --git a/code/game/area/IceColony.dm b/code/game/area/IceColony.dm index 2582bf3a0350..2c7bbee2969c 100644 --- a/code/game/area/IceColony.dm +++ b/code/game/area/IceColony.dm @@ -46,7 +46,6 @@ /area/ice_colony/exterior/surface name = "\improper Ice Colony - Exterior Surface" - fake_zlevel = 1 // above ground soundscape_playlist = SCAPE_PL_WIND //Equivalent of space. None of this area should be accessible. If these are valleys, make separate areas @@ -153,7 +152,6 @@ name = "\improper Ice Colony - Exterior Underground" icon_state = "cave" ceiling = CEILING_DEEP_UNDERGROUND - fake_zlevel = 2 // underground ambience_exterior = null // // Caves @@ -189,7 +187,6 @@ name = "\improper Ice Colony - Built Surface" icon_state = "clear" ceiling = CEILING_METAL - fake_zlevel = 1 // above ground /* * Surface - Bar @@ -485,7 +482,6 @@ name = "\improper Ice Colony - Built Underground" icon_state = "explored" ceiling = CEILING_DEEP_UNDERGROUND_METAL - fake_zlevel = 2 // underground ambience_exterior = AMBIENCE_ALMAYER ceiling_muffle = FALSE sound_environment = SOUND_ENVIRONMENT_ROOM diff --git a/code/game/area/LV522_Chances_Claim.dm b/code/game/area/LV522_Chances_Claim.dm index f2838f6ffb3b..c19a13d26204 100644 --- a/code/game/area/LV522_Chances_Claim.dm +++ b/code/game/area/LV522_Chances_Claim.dm @@ -409,10 +409,12 @@ /area/lv522/atmos/east_reactor/north name = "Atmospheric Processor - Outer East Reactor - North" icon_state = "yellow" + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS /area/lv522/atmos/east_reactor/south name = "Atmospheric Processor - Outer East Reactor - south" icon_state = "red" + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS /area/lv522/atmos/east_reactor/south/cas ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS @@ -420,10 +422,13 @@ /area/lv522/atmos/east_reactor/east name = "Atmospheric Processor - Outer East Reactor - east" icon_state = "green" + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS /area/lv522/atmos/east_reactor/west name = "Atmospheric Processor - Outer East Reactor - west" icon_state = "purple" + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS + /area/lv522/atmos/west_reactor name = "Atmospheric Processor - Western Reactor" icon_state = "blue" @@ -441,6 +446,7 @@ /area/lv522/atmos/north_command_centre name = "Atmospheric Processor - North Command Centre Checkpoint" icon_state = "green" + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS /area/lv522/atmos/filt name = "Atmospheric Processor - Filtration System" diff --git a/code/game/area/LV624.dm b/code/game/area/LV624.dm index 0b839bca98a3..505387f8e52b 100644 --- a/code/game/area/LV624.dm +++ b/code/game/area/LV624.dm @@ -30,11 +30,17 @@ icon_state = "southwest" //ambience = list('sound/ambience/jungle_amb1.ogg') +/area/lv624/ground/jungle/south_west_jungle/ceiling + ceiling = CEILING_GLASS + /area/lv624/ground/jungle/west_jungle name ="\improper Western Jungle" icon_state = "west" //ambience = list('sound/ambience/jungle_amb1.ogg') +/area/lv624/ground/jungle/west_jungle/ceiling + ceiling = CEILING_GLASS + /area/lv624/ground/jungle/east_jungle name ="\improper Eastern Jungle" icon_state = "east" @@ -82,11 +88,17 @@ icon_state = "west" //ambience = list('sound/ambience/ambimine.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambisin4.ogg') +/area/lv624/ground/barrens/west_barrens/ceiling + ceiling = CEILING_GLASS + /area/lv624/ground/barrens/east_barrens name = "\improper Eastern Barrens" icon_state = "east" //ambience = list('sound/ambience/ambimine.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambisin4.ogg') +/area/lv624/ground/barrens/east_barrens/ceiling + ceiling = CEILING_GLASS + /area/lv624/ground/barrens/containers name = "\improper Containers" icon_state = "blue-red" @@ -97,6 +109,9 @@ icon_state = "northeast" //ambience = list('sound/ambience/ambimine.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambisin4.ogg') +/area/lv624/ground/barrens/north_east_barrens/ceiling + ceiling = CEILING_GLASS + /area/lv624/ground/barrens/south_west_barrens name = "\improper South Western Barrens" icon_state = "southwest" diff --git a/code/game/area/strata.dm b/code/game/area/strata.dm index 3049a28c15aa..91bdff277c3d 100644 --- a/code/game/area/strata.dm +++ b/code/game/area/strata.dm @@ -27,16 +27,9 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed lighting_use_dynamic = 0 minimap_color = MINIMAP_AREA_LZ - -/*A WHOLE BUNCH OF PARENT ENTITIES -fake_zlevel = 1 or 2. 1 is 'above' 2 is 'below', however ladders are flipped and think that 1 is below, and 2 is above. -But, players don't actually care where they are so long as the ladders look correct going up and down. They shouldn't notice. -However, this might break the tacmap. This entire system might be replaced by Slywater's fake-Z smooth transition anyway.*/ - /area/strata/ag name = "Above Ground Area" icon_state = "ag" - fake_zlevel = 1 //'Above' ground fake Z /area/strata/ag/exterior name = "Exterior Above Ground Area" @@ -67,7 +60,6 @@ However, this might break the tacmap. This entire system might be replaced by Sl /area/strata/ug name = "Under Ground Area" icon_state = "ug" - fake_zlevel = 2 //'Underground', because numbers are fun ceiling = CEILING_UNDERGROUND_ALLOW_CAS /area/strata/ug/interior diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 52346847728d..937c19b4512b 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -660,7 +660,7 @@ Parameters are passed from New. SEND_SIGNAL(src, COMSIG_ATOM_VV_MODIFY_TRANSFORM) if(href_list[VV_HK_AUTO_RENAME] && check_rights(R_VAREDIT)) - var/newname = tgui_input_text(usr, "What do you want to rename this to?", "Automatic Rename", name) + var/newname = tgui_input_text(usr, "What do you want to rename this to?", "Automatic Rename", name, encode = FALSE) if(newname) name = newname diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index e0464be1250e..8237fc63b7e2 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -214,6 +214,8 @@ Additional game mode variables. log_debug("Null client attempted to transform_predator") return + pred_candidate.client.prefs.find_assigned_slot(JOB_PREDATOR) // Probably does not do anything relevant, predator preferences are not tied to specific slot. + var/clan_id = CLAN_SHIP_PUBLIC var/datum/entity/clan_player/clan_info = pred_candidate?.client?.clan_info clan_info?.sync() diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm index 874f72240600..6fae17b6aac9 100644 --- a/code/game/gamemodes/colonialmarines/colonialmarines.dm +++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm @@ -153,6 +153,11 @@ var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].announce_text, "###SHIPNAME###", MAIN_SHIP_NAME) marine_announcement(rendered_announce_text, "[MAIN_SHIP_NAME]") +/datum/game_mode/colonialmarines/proc/ares_conclude() + ai_silent_announcement("Bioscan complete. No unknown lifeform signature detected.", ".V") + ai_silent_announcement("Saving operational report to archive.", ".V") + ai_silent_announcement("Commencing final systems scan in 3 minutes.", ".V") + //////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////// @@ -166,6 +171,7 @@ if(is_in_endgame) check_hijack_explosions() + check_ground_humans() if(next_research_allocation < world.time) chemical_data.update_credits(chemical_data.research_allocation_amount) @@ -243,6 +249,35 @@ addtimer(CALLBACK(src, PROC_REF(shake_ship)), 5 SECONDS) TIMER_COOLDOWN_START(src, COOLDOWN_HIJACK_BARRAGE, 15 SECONDS) +#define GROUNDSIDE_XENO_MULTIPLIER 1.0 + +///Checks for humans groundside after hijack, spawns forsaken if requirements met +/datum/game_mode/colonialmarines/proc/check_ground_humans() + if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_HIJACK_GROUND_CHECK)) + return + + var/groundside_humans = 0 + var/groundside_xenos = 0 + + for(var/mob/current_mob in GLOB.player_list) + if(!is_ground_level(current_mob.z) || !current_mob.client || current_mob.stat == DEAD) + continue + + if(ishuman_strict(current_mob)) + groundside_humans++ + continue + + if(isxeno(current_mob)) + groundside_xenos++ + continue + + if(groundside_humans > (groundside_xenos * GROUNDSIDE_XENO_MULTIPLIER)) + SSticker.mode.get_specific_call("Xenomorphs Groundside (Forsaken)", FALSE, FALSE) + + TIMER_COOLDOWN_START(src, COOLDOWN_HIJACK_GROUND_CHECK, 1 MINUTES) + +#undef GROUNDSIDE_XENO_MULTIPLIER + /** * Makes the mainship shake, along with playing a klaxon sound effect. */ @@ -288,6 +323,7 @@ else SSticker.roundend_check_paused = TRUE round_finished = MODE_INFESTATION_M_MAJOR //Humans destroyed the xenomorphs. + ares_conclude() addtimer(VARSET_CALLBACK(SSticker, roundend_check_paused, FALSE), MARINE_MAJOR_ROUND_END_DELAY) else if(!num_humans && !num_xenos) round_finished = MODE_INFESTATION_DRAW_DEATH //Both were somehow destroyed. @@ -347,7 +383,7 @@ round_statistics.current_map.total_marine_victories++ if(MODE_INFESTATION_DRAW_DEATH) end_icon = "draw" - musical_track = pick('sound/theme/nuclear_detonation1.ogg','sound/theme/nuclear_detonation2.ogg') + musical_track = 'sound/theme/neutral_hopeful2.ogg' if(round_statistics && round_statistics.current_map) round_statistics.current_map.total_draws++ var/sound/S = sound(musical_track, channel = SOUND_CHANNEL_LOBBY) diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm index d2fd5af6dda9..64d8795be3d2 100644 --- a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm +++ b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm @@ -87,6 +87,7 @@ return 1 /datum/game_mode/whiskey_outpost/pre_setup() + SSticker.mode.toggleable_flags ^= MODE_HARDCORE_PERMA for(var/obj/effect/landmark/whiskey_outpost/xenospawn/X) xeno_spawns += X.loc for(var/obj/effect/landmark/whiskey_outpost/supplydrops/S) diff --git a/code/game/gamemodes/colonialmarines/xenovsxeno.dm b/code/game/gamemodes/colonialmarines/xenovsxeno.dm index f9bf3f779b24..a0d555acd2fb 100644 --- a/code/game/gamemodes/colonialmarines/xenovsxeno.dm +++ b/code/game/gamemodes/colonialmarines/xenovsxeno.dm @@ -261,7 +261,7 @@ /datum/game_mode/xenovs/declare_completion() announce_ending() var/musical_track - musical_track = pick('sound/theme/nuclear_detonation1.ogg','sound/theme/nuclear_detonation2.ogg') + musical_track = pick('sound/theme/neutral_melancholy1.ogg', 'sound/theme/neutral_melancholy2.ogg') var/sound/S = sound(musical_track, channel = SOUND_CHANNEL_LOBBY) S.status = SOUND_STREAM diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index a03a1aef1031..8017056c682d 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -82,7 +82,7 @@ var/global/cas_tracking_id_increment = 0 //this var used to assign unique tracki return ///Triggered when the dropship first lands. -/datum/game_mode/proc/ds_first_landed(obj/docking_port/mobile/marine_dropship) +/datum/game_mode/proc/ds_first_landed(obj/docking_port/stationary/marine_dropship) SHOULD_CALL_PARENT(TRUE) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_DS_FIRST_LANDED) return diff --git a/code/game/jobs/job/civilians/support/nurse.dm b/code/game/jobs/job/civilians/support/nurse.dm index f510548c8a95..034421d799aa 100644 --- a/code/game/jobs/job/civilians/support/nurse.dm +++ b/code/game/jobs/job/civilians/support/nurse.dm @@ -6,7 +6,7 @@ selection_class = "job_doctor" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/nurse - entry_message_body = "You are tasked with keeping the Marines healthy and strong. You are also an expert when it comes to medication and treatment, but you do not know anything about surgery. Focus on assisting doctors and triaging wounded marines." + entry_message_body = "You are tasked with keeping the Marines healthy and strong. You are also an expert when it comes to medication and treatment, and can do minor surgical procedures. Focus on assisting doctors and triaging wounded marines." /obj/effect/landmark/start/nurse name = JOB_NURSE diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 3ef06ecfd576..b860667486be 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -221,7 +221,7 @@ var/mob/living/carbon/human/new_character = new(NP.loc) new_character.lastarea = get_area(NP.loc) - NP.client.prefs.copy_all_to(new_character) + NP.client.prefs.copy_all_to(new_character, title) if (NP.client.prefs.be_random_body) var/datum/preferences/TP = new() diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm index 4cc15179df70..9f4068e8450f 100644 --- a/code/game/jobs/job/marine/squads.dm +++ b/code/game/jobs/job/marine/squads.dm @@ -280,6 +280,7 @@ 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) SIGNAL_HANDLER if(M == overwatch_officer) diff --git a/code/game/machinery/bio-dome_floodlights.dm b/code/game/machinery/bio-dome_floodlights.dm index 83d40aef21e3..488cf1ed79cc 100644 --- a/code/game/machinery/bio-dome_floodlights.dm +++ b/code/game/machinery/bio-dome_floodlights.dm @@ -1,6 +1,6 @@ /obj/structure/machinery/hydro_floodlight_switch name = "Biodome Floodlight Switch" - icon = 'icons/turf/ground_map.dmi' + icon = 'icons/obj/structures/machinery/power.dmi' icon_state = "panelnopower" desc = "This switch controls the floodlights surrounding the archaeology complex. It only functions when there is power." density = FALSE diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index fecedda22a14..8fa0b9b86a0c 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -11,6 +11,7 @@ unslashable = TRUE var/circuit = null //The path to the circuit board type. If circuit==null, the computer can't be disassembled. var/processing = FALSE //Set to true if computer needs to do /process() + var/deconstructible = TRUE var/exproof = 0 /obj/structure/machinery/computer/Initialize() @@ -96,6 +97,9 @@ /obj/structure/machinery/computer/attackby(obj/item/I, mob/user) if(HAS_TRAIT(I, TRAIT_TOOL_SCREWDRIVER) && circuit) + if(!deconstructible) + to_chat(user, SPAN_WARNING("You can't figure out how to deconstruct [src]...")) + return if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) to_chat(user, SPAN_WARNING("You don't know how to deconstruct [src]...")) return diff --git a/code/game/machinery/computer/groundside_operations.dm b/code/game/machinery/computer/groundside_operations.dm index 234852539226..6cefa28a2c95 100644 --- a/code/game/machinery/computer/groundside_operations.dm +++ b/code/game/machinery/computer/groundside_operations.dm @@ -273,13 +273,17 @@ to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("Searching for helmet cam. No helmet cam found for this marine! Tell your squad to put their helmets on!")]") else if(cam && cam == new_cam)//click the camera you're watching a second time to stop watching. visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Stopping helmet cam view of [cam_target].")]") + usr.UnregisterSignal(cam, COMSIG_PARENT_QDELETING) cam = null usr.reset_view(null) else if(usr.client.view != world_view_size) to_chat(usr, SPAN_WARNING("You're too busy peering through binoculars.")) else + if(cam) + usr.UnregisterSignal(cam, COMSIG_PARENT_QDELETING) cam = new_cam usr.reset_view(cam) + usr.RegisterSignal(cam, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/mob, reset_observer_view_on_deletion)) if("activate_echo") var/reason = input(usr, "What is the purpose of Echo Squad?", "Activation Reason") @@ -306,6 +310,8 @@ ..() if(!isRemoteControlling(user)) + if(cam) + user.UnregisterSignal(cam, COMSIG_PARENT_QDELETING) cam = null user.reset_view(null) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 5ba958ad95fe..ed06c0117f33 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -185,6 +185,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li flags_atom |= USES_HEARING /obj/structure/machinery/cryopod/Destroy() + SetLuminosity(0) QDEL_NULL(occupant) QDEL_NULL(announce) . = ..() @@ -367,6 +368,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li qdel(G) icon_state = "body_scanner_open" + SetLuminosity(0) if(occupant.key) occupant.ghostize(0) @@ -507,6 +509,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li M.forceMove(src) occupant = M icon_state = "body_scanner_closed" + SetLuminosity(2) time_entered = world.time start_processing() @@ -527,6 +530,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li occupant = null stop_processing() icon_state = "body_scanner_open" + SetLuminosity(0) playsound(src, 'sound/machines/pod_open.ogg', 30) #ifdef OBJECTS_PROXY_SPEECH diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 678c0156c8c2..e3e5fd3bee87 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -551,6 +551,9 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( update_icon() /obj/structure/machinery/door/airlock/attackby(obj/item/C, mob/user) + if(SEND_SIGNAL(C, COMSIG_ITEM_ATTACK_AIRLOCK, src, user) & COMPONENT_CANCEL_AIRLOCK_ATTACK) + return + if(istype(C, /obj/item/clothing/mask/cigarette)) if(isElectrified()) var/obj/item/clothing/mask/cigarette/L = C @@ -606,32 +609,6 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( update_icon() return - if(istype(C, /obj/item/maintenance_jack) && locked) - var/obj/item/maintenance_jack/current_jack = C - - if(current_jack.crowbar_mode) - return - - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_MASTER)) //Engi 3 is much faster - user.visible_message(SPAN_DANGER("[user] begins to search for [src]'s bolts!"),\ - SPAN_NOTICE("You search for [src]'s bolts.")) - if(!do_after(user, 15 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE, src, INTERRUPT_ALL)) //Otherwise it takes an extra 15 seconds - to_chat(user, SPAN_WARNING("You fail to find the bolts on [src].")) - return - - user.visible_message(SPAN_DANGER("[user] begins to disable [src]'s bolts!"),\ - SPAN_NOTICE("You start to disable [src]'s bolts.")) - playsound(src, "pry", 25, TRUE) - - if(!do_after(user, 5 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE, src, INTERRUPT_ALL)) - to_chat(user, SPAN_WARNING("You decide not to disable the bolts on [src].")) - return - - user.visible_message(SPAN_DANGER("[user] disables the bolts on [src]."),\ - SPAN_NOTICE("You unbolt [src].")) - unlock(TRUE) - return - else if(HAS_TRAIT(C, TRAIT_TOOL_SCREWDRIVER)) if(no_panel) to_chat(user, SPAN_WARNING("\The [src] has no panel to open!")) @@ -763,7 +740,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( closeOther.close() return ..(forced) -/obj/structure/machinery/door/airlock/close(forced=0) +/obj/structure/machinery/door/airlock/close(forced = FALSE) if(operating || welded || locked || !loc) return if(!forced) @@ -809,12 +786,12 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( ..() return -/obj/structure/machinery/door/airlock/proc/lock(forced=0) +/obj/structure/machinery/door/airlock/proc/lock(forced = FALSE) if((operating && !forced) || locked) return playsound(loc, 'sound/machines/hydraulics_1.ogg', 25) - locked = 1 + locked = TRUE visible_message(SPAN_NOTICE("\The [src] airlock emits a loud thunk, then a click.")) update_icon() @@ -822,7 +799,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( if(operating || !locked) return if(forced || (arePowerSystemsOn())) //only can raise bolts if power's on - locked = 0 + locked = FALSE playsound(loc, 'sound/machines/hydraulics_2.ogg', 25) visible_message(SPAN_NOTICE("\The [src] airlock emits a click, then hums slightly.")) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 0f024907d82c..b54658b24245 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -247,7 +247,6 @@ return FALSE operating = TRUE - CHECK_TICK src.density = TRUE src.layer = closed_layer do_animate("closing") diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 8926de0b5174..972ce6b7570e 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -73,26 +73,21 @@ return /obj/structure/machinery/door/poddoor/open() - if(operating == 1) //doors can still open when emag-disabled + if(operating) //doors can still open when emag-disabled return - if(!operating) //in case of emag - operating = 1 + if(!opacity) - return 1 + return TRUE + + operating = TRUE playsound(loc, 'sound/machines/blastdoor.ogg', 20, 0) flick("[base_icon_state]c0", src) icon_state = "[base_icon_state]0" SetOpacity(0) - sleep(10) - layer = open_layer - density = FALSE - if(operating == 1) //emag again - operating = 0 - if(autoclose) - addtimer(CALLBACK(src, PROC_REF(autoclose)), 150) - return 1 + addtimer(CALLBACK(src, PROC_REF(finish_open)), openspeed) + return TRUE /obj/structure/machinery/door/poddoor/close() if(operating) @@ -100,7 +95,7 @@ if(opacity == initial(opacity)) return - operating = 1 + operating = TRUE playsound(loc, 'sound/machines/blastdoor.ogg', 20, 0) layer = closed_layer @@ -109,19 +104,21 @@ density = TRUE SetOpacity(initial(opacity)) - sleep(10) - operating = 0 + addtimer(CALLBACK(src, PROC_REF(finish_close)), openspeed) return +/obj/structure/machinery/door/poddoor/finish_close() + operating = FALSE + /obj/structure/machinery/door/poddoor/two_tile/open() - if(operating == 1) //doors can still open when emag-disabled + if(operating) //doors can still open when emag-disabled return - if(!operating) //in case of emag - operating = 1 + + operating = TRUE start_opening() - sleep(10) - open_fully() - return 1 + + addtimer(CALLBACK(src, PROC_REF(open_fully)), openspeed) + return TRUE /obj/structure/machinery/door/poddoor/two_tile/proc/start_opening() flick("[base_icon_state]c0", src) @@ -154,8 +151,7 @@ if(operating) return start_closing() - sleep(10) - close_fully() + addtimer(CALLBACK(src, PROC_REF(close_fully)), openspeed) return /obj/structure/machinery/door/poddoor/two_tile/proc/start_closing() diff --git a/code/game/machinery/doors/railing.dm b/code/game/machinery/doors/railing.dm index 0147946761d3..145a5d8191dc 100644 --- a/code/game/machinery/doors/railing.dm +++ b/code/game/machinery/doors/railing.dm @@ -35,29 +35,31 @@ PF.flags_can_pass_all = (PASS_OVER^PASS_OVER_FIRE)|PASS_CRUSHER_CHARGE /obj/structure/machinery/door/poddoor/railing/open() - if (operating == 1) //doors can still open when emag-disabled - return 0 - if(!operating) //in case of emag - operating = 1 + if(operating) //doors can still open when emag-disabled + return FALSE + + operating = TRUE flick("railingc0", src) icon_state = "railing0" layer = open_layer - sleep(12) + addtimer(CALLBACK(src, PROC_REF(finish_open)), 1.2 SECONDS) + return TRUE +/obj/structure/machinery/door/poddoor/railing/finish_open() density = FALSE - if(operating == 1) //emag again - operating = 0 - return 1 + if(operating) //emag again + operating = FALSE /obj/structure/machinery/door/poddoor/railing/close() - if (operating) - return 0 + if(operating) + return FALSE + density = TRUE - operating = 1 + operating = TRUE layer = closed_layer flick("railingc1", src) icon_state = "railing1" addtimer(VARSET_CALLBACK(src, operating, FALSE), 1.2 SECONDS) - return 1 + return TRUE diff --git a/code/game/machinery/doors/runed_sandstone.dm b/code/game/machinery/doors/runed_sandstone.dm index 8939ba8ca368..d67398baa305 100644 --- a/code/game/machinery/doors/runed_sandstone.dm +++ b/code/game/machinery/doors/runed_sandstone.dm @@ -89,33 +89,34 @@ return FALSE -/obj/structure/machinery/door/airlock/sandstone/runed/open(forced=1) +/obj/structure/machinery/door/airlock/sandstone/runed/open(forced = TRUE) if(operating || welded || locked || !loc || !density) return FALSE if(!forced && !arePowerSystemsOn()) return FALSE + playsound(loc, 'sound/effects/runedsanddoor.ogg', 25, 0) visible_message(SPAN_NOTICE("\The [src] makes a loud grating sound as hidden workings pull it open.")) - - if(!operating) - operating = TRUE - CHECK_TICK + operating = TRUE do_animate("opening") icon_state = "door0" - src.SetOpacity(FALSE) - sleep(openspeed) - src.layer = open_layer - src.density = FALSE + SetOpacity(FALSE) + + addtimer(CALLBACK(src, PROC_REF(finish_open)), openspeed) + return + +/obj/structure/machinery/door/airlock/sandstone/runed/finish_open() + layer = open_layer + density = FALSE update_icon() SetOpacity(0) - if (filler) + if(filler) filler.SetOpacity(opacity) if(operating) operating = FALSE - return -/obj/structure/machinery/door/airlock/sandstone/runed/close(forced=1) +/obj/structure/machinery/door/airlock/sandstone/runed/close(forced = TRUE) if(operating || welded || locked || !loc || density) return if(safe) @@ -128,12 +129,15 @@ visible_message(SPAN_NOTICE("\The [src] makes a loud grating sound as hidden workings force it shut.")) operating = TRUE - CHECK_TICK - src.density = TRUE - src.SetOpacity(TRUE) - src.layer = closed_layer + density = TRUE + SetOpacity(TRUE) + layer = closed_layer do_animate("closing") - sleep(openspeed) + + addtimer(CALLBACK(src, PROC_REF(finish_close)), openspeed) + return + +/obj/structure/machinery/door/airlock/sandstone/runed/finish_close() update_icon() operating = FALSE @@ -150,7 +154,6 @@ var/obj/structure/window/killthis = (locate(/obj/structure/window) in turf) if(killthis) killthis.ex_act(EXPLOSION_THRESHOLD_LOW) - return /obj/structure/machinery/door/airlock/sandstone/runed/lock(forced=0) if(operating || locked) return diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index 449ec42279fe..68b0464f87f8 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -32,28 +32,32 @@ return /obj/structure/machinery/door/poddoor/shutters/open() - if(operating == 1) //doors can still open when emag-disabled + if(operating) //doors can still open when emag-disabled return - if(!operating) //in case of emag - operating = 1 + + operating = TRUE flick("[base_icon_state]c0", src) icon_state = "[base_icon_state]0" playsound(loc, 'sound/machines/blastdoor.ogg', 25) - sleep(10) + + addtimer(CALLBACK(src, PROC_REF(finish_open)), openspeed) + return TRUE + +/obj/structure/machinery/door/poddoor/shutters/finish_open() density = FALSE layer = open_layer SetOpacity(0) - if(operating == 1) //emag again - operating = 0 + if(operating) //emag again + operating = FALSE if(autoclose) addtimer(CALLBACK(src, PROC_REF(autoclose)), 150) - return 1 /obj/structure/machinery/door/poddoor/shutters/close() if(operating) return - operating = 1 + + operating = TRUE flick("[base_icon_state]c1", src) icon_state = "[base_icon_state]1" layer = closed_layer @@ -62,10 +66,12 @@ SetOpacity(1) playsound(loc, 'sound/machines/blastdoor.ogg', 25) - sleep(10) - operating = 0 + addtimer(CALLBACK(src, PROC_REF(finish_close)), openspeed) return +/obj/structure/machinery/door/poddoor/shutters/finish_close() + operating = FALSE + /obj/structure/machinery/door/poddoor/shutters/almayer icon = 'icons/obj/structures/doors/blastdoors_shutters.dmi' openspeed = 4 //shorter open animation. diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 19bdedd35765..6d96daf3152f 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -62,35 +62,38 @@ return /obj/structure/machinery/door/window/open() - if (src.operating == 1) //doors can still open when emag-disabled - return 0 - if(!src.operating) //in case of emag - src.operating = 1 - flick(text("[]opening", src.base_state), src) - playsound(src.loc, 'sound/machines/windowdoor.ogg', 25, 1) - src.icon_state = text("[]open", src.base_state) - sleep(10) - - src.density = FALSE - - if(operating == 1) //emag again - src.operating = 0 - return 1 + if(operating) //doors can still open when emag-disabled + return FALSE + + operating = TRUE + flick(text("[]opening", base_state), src) + playsound(loc, 'sound/machines/windowdoor.ogg', 25, 1) + icon_state = text("[]open", base_state) + + addtimer(CALLBACK(src, PROC_REF(finish_open)), openspeed) + return TRUE + +/obj/structure/machinery/door/window/finish_open() + density = FALSE + + if(operating) //emag again + operating = FALSE /obj/structure/machinery/door/window/close() - if (src.operating) - return 0 - src.operating = 1 - flick(text("[]closing", src.base_state), src) - playsound(src.loc, 'sound/machines/windowdoor.ogg', 25, 1) - src.icon_state = src.base_state + if (operating) + return FALSE - src.density = TRUE + operating = TRUE + flick(text("[]closing", src.base_state), src) + playsound(loc, 'sound/machines/windowdoor.ogg', 25, 1) + icon_state = base_state + density = TRUE - sleep(10) + addtimer(CALLBACK(src, PROC_REF(finish_close)), openspeed) + return TRUE - src.operating = 0 - return 1 +/obj/structure/machinery/door/window/finish_close() + operating = FALSE /obj/structure/machinery/door/window/proc/take_damage(damage) src.health = max(0, src.health - damage) diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index ca676f41453d..783d24c00f2e 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -319,7 +319,7 @@ var/list/alldepartments = list() GLOB.fax_contents += faxcontents - var/msg_admin = SPAN_NOTICE("[target_department]: [key_name(user, 1)] ") + var/msg_admin = SPAN_STAFF_IC("[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(target_department) @@ -342,7 +342,7 @@ var/list/alldepartments = list() GLOB.GeneralFaxes.Add("\[view message at [world.timeofday]\] REPLY") msg_admin += "(RPLY): " - msg_admin += "Receiving fax via secure connection ... view message" + msg_admin += SPAN_STAFF_IC("Receiving fax via secure connection ... view message") var/msg_ghost = SPAN_NOTICE("[target_department]: ") msg_ghost += "Receiving fax via secure connection ... view message" diff --git a/code/game/machinery/fire_alarm.dm b/code/game/machinery/fire_alarm.dm index 261eea67913b..fe1f80646c4f 100644 --- a/code/game/machinery/fire_alarm.dm +++ b/code/game/machinery/fire_alarm.dm @@ -139,8 +139,10 @@ FIRE ALARM var/area/area = get_area(src) if (area.flags_alarm_state & ALARM_WARNING_FIRE) + user.visible_message("[user] deactivates [src].", "You deactivate [src].") reset() else + user.visible_message("[user] activates [src].", "You activate [src].") alarm() return diff --git a/code/game/machinery/groundmap_geothermal.dm b/code/game/machinery/groundmap_geothermal.dm index ec20f00449bb..6714e3ef669b 100644 --- a/code/game/machinery/groundmap_geothermal.dm +++ b/code/game/machinery/groundmap_geothermal.dm @@ -201,7 +201,7 @@ //Putting these here since it's power-related /obj/structure/machinery/colony_floodlight_switch name = "Colony Floodlight Switch" - icon = 'icons/turf/ground_map.dmi' + icon = 'icons/obj/structures/machinery/power.dmi' icon_state = "panelnopower" desc = "This switch controls the floodlights surrounding the archaeology complex. It only functions when there is power." density = FALSE @@ -279,7 +279,7 @@ if(!ispowered) to_chat(user, "Nothing happens.") return 0 - playsound(src,'sound/machines/click.ogg', 15, 1) + playsound(src,'sound/items/Deconstruct.ogg', 30, 1) use_power(5) toggle_lights() turned_on = !(src.turned_on) @@ -299,7 +299,7 @@ icon_state = "flood_s_off" density = TRUE anchored = TRUE - layer = WINDOW_LAYER + layer = ABOVE_XENO_LAYER var/damaged = 0 //Can be smashed by xenos var/is_lit = 0 //whether the floodlight is switched to on or off. Does not necessarily mean it emits light. unslashable = TRUE diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 7055e1663ab1..e1c9c9a4e279 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -5,7 +5,7 @@ density = FALSE drag_delay = 1 - var/mob/living/carbon/human/attached = null + var/mob/living/carbon/attached = null var/mode = 1 // 1 is injecting, 0 is taking blood. var/obj/item/reagent_container/beaker = null diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index ac0d3e852ae1..50abb701145e 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -118,7 +118,11 @@ GLOBAL_LIST_EMPTY(vending_products) if (!item_name || item_name == "" || !typepath) continue - GLOB.vending_products[typepath] = 1 + if(islist(typepath)) + for(var/path in typepath) + GLOB.vending_products[path] = 1 + else + GLOB.vending_products[typepath] = 1 //get which turf the vendor will dispense its products on. /obj/structure/machinery/cm_vending/proc/get_appropriate_vend_turf() @@ -1059,10 +1063,10 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( var/p_name = myprod[1] //taking it's name var/p_cost = cost_index == null ? 0 : myprod[cost_index] - var/item_ref = myprod[3] + var/obj/item/item_ref = myprod[3] var/priority = myprod[priority_index] - - var/obj/item/I = item_ref + if(islist(item_ref)) // multi-vending + item_ref = item_ref[1] var/is_category = item_ref == null @@ -1073,7 +1077,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( "prod_index" = i, "prod_name" = p_name, "prod_color" = priority, - "prod_desc" = initial(I.desc), + "prod_desc" = initial(item_ref.desc), "prod_cost" = p_cost, "image" = imgid ) @@ -1123,24 +1127,23 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( var/list/stock_values = list() - var/mob/living/carbon/human/H = user - var/buy_flags = H.marine_buy_flags + var/mob/living/carbon/human/marine = user var/points = 0 if(vending_machine.instanced_vendor_points) points = vending_machine.available_points_to_display else if(vending_machine.use_snowflake_points) - points = H.marine_snowflake_points + points = marine.marine_snowflake_points else if(vending_machine.use_points) - points = H.marine_points + points = marine.marine_points for (var/i in 1 to length(ui_listed_products)) var/list/myprod = ui_listed_products[i] //we take one list from listed_products var/prod_available = FALSE var/p_cost = myprod[2] - var/avail_flag = myprod[4] - if(points >= p_cost && (!avail_flag || buy_flags & avail_flag)) + var/category = myprod[4] + if(points >= p_cost && (!category || ((category in marine.marine_buyable_categories) && (marine.marine_buyable_categories[category])))) prod_available = TRUE stock_values += list(prod_available) @@ -1153,7 +1156,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( vendor.stat |= IN_USE var/vend_flags = vendor.vend_flags - var/turf/target_turf = vendor.get_appropriate_vend_turf(user) if(LAZYLEN(itemspec)) //making sure it's not empty if(vendor.vend_delay) @@ -1164,54 +1166,17 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( sleep(vendor.vend_delay) var/prod_type = itemspec[3] - - var/obj/item/new_item - if(ispath(prod_type, /obj/item)) - if(ispath(prod_type, /obj/item/weapon/gun)) - new_item = new prod_type(target_turf, TRUE) - else - if(prod_type == /obj/item/device/radio/headset/almayer/marine) - prod_type = vendor.headset_type - else if(prod_type == /obj/item/clothing/gloves/marine) - prod_type = vendor.gloves_type - new_item = new prod_type(target_turf) - new_item.add_fingerprint(user) + if(islist(prod_type)) + for(var/each_type in prod_type) + vendor_successful_vend_one(vendor, each_type, user, target_turf, itemspec[4] == MARINE_CAN_BUY_UNIFORM) else - new_item = new prod_type(target_turf) + vendor_successful_vend_one(vendor, prod_type, user, target_turf, itemspec[4] == MARINE_CAN_BUY_UNIFORM) if(vend_flags & VEND_LIMITED_INVENTORY) itemspec[2]-- if(vend_flags & VEND_LOAD_AMMO_BOXES) vendor.update_derived_ammo_and_boxes(itemspec) - if(vend_flags & VEND_UNIFORM_RANKS) - // apply ranks to clothing - var/bitf = itemspec[4] - if(bitf) - if(bitf == MARINE_CAN_BUY_UNIFORM) - var/obj/item/clothing/under/underclothes = new_item - //Gives ranks to the ranked - if(user.wear_id && user.wear_id.paygrade) - var/rankpath = get_rank_pins(user.wear_id.paygrade) - if(rankpath) - var/obj/item/clothing/accessory/ranks/rank_insignia = new rankpath() - underclothes.attach_accessory(user, rank_insignia) - - if(vend_flags & VEND_UNIFORM_AUTOEQUIP) - // autoequip - if(istype(new_item, /obj/item) && new_item.flags_equip_slot != NO_FLAGS) //auto-equipping feature here - if(new_item.flags_equip_slot == SLOT_ACCESSORY) - if(user.w_uniform) - var/obj/item/clothing/clothing = user.w_uniform - if(clothing.can_attach_accessory(new_item)) - clothing.attach_accessory(user, new_item) - else - user.equip_to_appropriate_slot(new_item) - - if(vend_flags & VEND_TO_HAND) - if(user.client?.prefs && (user.client?.prefs?.toggle_prefs & TOGGLE_VEND_ITEM_TO_HAND)) - if(vendor.Adjacent(user)) - user.put_in_any_hand_if_possible(new_item, disable_warning = TRUE) else to_chat(user, SPAN_WARNING("ERROR: itemspec is missing. Please report this to admins.")) sleep(15) @@ -1219,29 +1184,87 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( vendor.stat &= ~IN_USE vendor.update_icon() +/proc/vendor_successful_vend_one(obj/structure/machinery/cm_vending/vendor, prod_type, mob/living/carbon/human/user, turf/target_turf, insignas_override) + var/obj/item/new_item + var/vend_flags = vendor.vend_flags + if(ispath(prod_type, /obj/item)) + if(ispath(prod_type, /obj/item/weapon/gun)) + new_item = new prod_type(target_turf, TRUE) + else + if(prod_type == /obj/item/device/radio/headset/almayer/marine) + prod_type = vendor.headset_type + else if(prod_type == /obj/item/clothing/gloves/marine) + prod_type = vendor.gloves_type + new_item = new prod_type(target_turf) + new_item.add_fingerprint(user) + else + new_item = new prod_type(target_turf) + + if(vend_flags & VEND_UNIFORM_RANKS) + if(insignas_override) + var/obj/item/clothing/under/underclothes = new_item + //Gives ranks to the ranked + if(istype(underclothes) && user.wear_id && user.wear_id.paygrade) + var/rankpath = get_rank_pins(user.wear_id.paygrade) + if(rankpath) + var/obj/item/clothing/accessory/ranks/rank_insignia = new rankpath() + underclothes.attach_accessory(user, rank_insignia) + + if(vend_flags & VEND_UNIFORM_AUTOEQUIP) + // autoequip + if(istype(new_item, /obj/item) && new_item.flags_equip_slot != NO_FLAGS) //auto-equipping feature here + if(new_item.flags_equip_slot == SLOT_ACCESSORY) + if(user.w_uniform) + var/obj/item/clothing/clothing = user.w_uniform + if(clothing.can_attach_accessory(new_item)) + clothing.attach_accessory(user, new_item) + else + user.equip_to_appropriate_slot(new_item) + + if(vend_flags & VEND_TO_HAND) + if(user.client?.prefs && (user.client?.prefs?.toggle_prefs & TOGGLE_VEND_ITEM_TO_HAND)) + if(vendor.Adjacent(user)) + user.put_in_any_hand_if_possible(new_item, disable_warning = TRUE) + + new_item.post_vendor_spawn_hook(user) + /proc/handle_vend(obj/structure/machinery/cm_vending/vendor, list/listed_products, mob/living/carbon/human/vending_human) if(vendor.vend_flags & VEND_USE_VENDOR_FLAGS) return TRUE - var/can_buy_flags = listed_products[4] - if(!(vending_human.marine_buy_flags & can_buy_flags)) - return FALSE - - if(can_buy_flags == (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH)) - if(vending_human.marine_buy_flags & MARINE_CAN_BUY_R_POUCH) - vending_human.marine_buy_flags &= ~MARINE_CAN_BUY_R_POUCH - else - vending_human.marine_buy_flags &= ~MARINE_CAN_BUY_L_POUCH - return TRUE - if(can_buy_flags == (MARINE_CAN_BUY_COMBAT_R_POUCH|MARINE_CAN_BUY_COMBAT_L_POUCH)) - if(vending_human.marine_buy_flags & MARINE_CAN_BUY_COMBAT_R_POUCH) - vending_human.marine_buy_flags &= ~MARINE_CAN_BUY_COMBAT_R_POUCH - else - vending_human.marine_buy_flags &= ~MARINE_CAN_BUY_COMBAT_L_POUCH - return TRUE - - vending_human.marine_buy_flags &= ~can_buy_flags + var/buying_category = listed_products[4] + if(buying_category) + if(!(buying_category in vending_human.marine_buyable_categories)) + return FALSE + if(!vending_human.marine_buyable_categories[buying_category]) + return FALSE + vending_human.marine_buyable_categories[buying_category] -= 1 return TRUE +// Unload ALL the items throwing them around randomly, optionally destroying the vendor +/obj/structure/machinery/cm_vending/proc/catastrophic_failure(throw_objects = TRUE, destroy = FALSE) + stat |= IN_USE + var/list/products = get_listed_products() + var/i = 1 + while(i <= length(products)) + sleep(0.5) + var/list/itemspec = products[i] + if(!itemspec[2] || itemspec[2] <= 0) + i++ + continue + itemspec[2] -= 1 + var/list/spawned = list() + if(islist(itemspec[3])) + for(var/path in itemspec[3]) + spawned += new path(loc) + else if(itemspec[3]) + var/path = itemspec[3] + spawned += new path(loc) + if(throw_objects) + for(var/atom/movable/spawned_atom in spawned) + INVOKE_ASYNC(spawned_atom, TYPE_PROC_REF(/atom/movable, throw_atom), pick(orange(src, 4)), 4, SPEED_FAST) + stat &= ~IN_USE + if(destroy) + qdel(src) //------------HACKING--------------- diff --git a/code/game/machinery/vending/essential_sets.dm b/code/game/machinery/vending/essential_sets.dm index 7d28b00199b0..711b17eb2c3e 100644 --- a/code/game/machinery/vending/essential_sets.dm +++ b/code/game/machinery/vending/essential_sets.dm @@ -57,3 +57,4 @@ /obj/item/clothing/shoes/dress, /obj/item/storage/large_holster/ceremonial_sword/full, ) + diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index ca038a4bb4f1..a61934324491 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -55,6 +55,7 @@ /obj/item/reagent_container/food/snacks/packaged_burrito = 12, /obj/item/reagent_container/food/snacks/packaged_hdogs =12, /obj/item/reagent_container/food/snacks/kepler_crisps = 12, + /obj/item/reagent_container/food/snacks/kepler_crisps/flamehot = 12, /obj/item/reagent_container/food/snacks/wy_chips/pepper = 12, /obj/item/reagent_container/food/snacks/eat_bar = 12, /obj/item/reagent_container/food/snacks/wrapped/booniebars = 6, @@ -67,6 +68,7 @@ /obj/item/reagent_container/food/snacks/packaged_burrito = 5, /obj/item/reagent_container/food/snacks/packaged_hdogs = 5, /obj/item/reagent_container/food/snacks/kepler_crisps = 3, + /obj/item/reagent_container/food/snacks/kepler_crisps/flamehot = 5, /obj/item/reagent_container/food/snacks/wy_chips/pepper = 3, /obj/item/reagent_container/food/snacks/eat_bar = 4, /obj/item/reagent_container/food/snacks/wrapped/booniebars = 4, diff --git a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm index cd956b33123d..3d6a48b45daa 100644 --- a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm @@ -89,17 +89,17 @@ GLOBAL_LIST_INIT(cm_vending_clothing_commanding_officer, list( list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_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_RECOMMENDED), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector/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("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), )) /obj/structure/machinery/cm_vending/clothing/commanding_officer diff --git a/code/game/machinery/vending/vendor_types/crew/medical.dm b/code/game/machinery/vending/vendor_types/crew/medical.dm index 3bd5f9ffa35b..ccf4abe03282 100644 --- a/code/game/machinery/vending/vendor_types/crew/medical.dm +++ b/code/game/machinery/vending/vendor_types/crew/medical.dm @@ -60,19 +60,19 @@ GLOBAL_LIST_INIT(cm_vending_clothing_doctor, list( list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, 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("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medkit 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)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, 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("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (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), @@ -116,19 +116,19 @@ GLOBAL_LIST_INIT(cm_vending_clothing_nurse, list( list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, 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("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medkit 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)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, 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("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (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), @@ -173,21 +173,21 @@ GLOBAL_LIST_INIT(cm_vending_clothing_researcher, list( list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Vials Pouch", 0, /obj/item/storage/pouch/vials, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_MANDATORY), - list("Chemist Pouch", 0, /obj/item/storage/pouch/chem, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_MANDATORY), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Vials Pouch", 0, /obj/item/storage/pouch/vials, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_MANDATORY), + list("Chemist Pouch", 0, /obj/item/storage/pouch/chem, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_MANDATORY), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, 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_RECOMMENDED), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit 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)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, 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("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (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), diff --git a/code/game/machinery/vending/vendor_types/crew/mp.dm b/code/game/machinery/vending/vendor_types/crew/mp.dm index cdfb5c014028..cdf374249211 100644 --- a/code/game/machinery/vending/vendor_types/crew/mp.dm +++ b/code/game/machinery/vending/vendor_types/crew/mp.dm @@ -23,8 +23,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police, list( list("Security HUD Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, 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_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Full)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), @@ -70,8 +70,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police_warden, list( list("Security HUD Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, 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_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Full)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm b/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm index 50eebd1851c1..231e02bb5118 100644 --- a/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm @@ -62,11 +62,14 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("M70 Flak Jacket", 0, /obj/item/clothing/suit/armor/vest/pilot, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("M30 Tactical Helmet", 0, /obj/item/clothing/head/helmet/marine/pilot, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), - + + list("ARMOR (CHOOSE 1)", 0, null, null, null), + list("M70 Flak Jacket", 0, /obj/item/clothing/suit/armor/vest/pilot, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + list("M3-VL Pattern Flak Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest/dcc, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), list("88 Mod 4 Combat Pistol", 0, /obj/item/weapon/gun/pistol/mod88, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("VP78 Pistol", 0, /obj/item/weapon/gun/pistol/vp78, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -83,19 +86,19 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list( list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, 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_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + 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("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, 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("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (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), @@ -148,10 +151,13 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list( GLOBAL_LIST_INIT(cm_vending_clothing_dropship_crew_chief, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("M3-VL Pattern Flak Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest/dcc, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), - list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + + list("ARMOR (CHOOSE 1)", 0, null, null, null), + list("M70 Flak Jacket", 0, /obj/item/clothing/suit/armor/vest/pilot, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + list("M3-VL Pattern Flak Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest/dcc, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), list("88 Mod 4 Combat Pistol", 0, /obj/item/weapon/gun/pistol/mod88, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -169,19 +175,19 @@ GLOBAL_LIST_INIT(cm_vending_clothing_dropship_crew_chief, list( list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, 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_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + 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("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, 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("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (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), diff --git a/code/game/machinery/vending/vendor_types/crew/sea.dm b/code/game/machinery/vending/vendor_types/crew/sea.dm index d6776a0a4c5d..ee583828ec44 100644 --- a/code/game/machinery/vending/vendor_types/crew/sea.dm +++ b/code/game/machinery/vending/vendor_types/crew/sea.dm @@ -39,16 +39,17 @@ GLOBAL_LIST_INIT(cm_vending_clothing_sea, list( list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, 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 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 Combat Toolbelt Rig (Full)", 0, /obj/item/storage/belt/gun/utility, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector/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("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, 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("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("COMBAT ARMOR (CHOOSE 1)", 0, null, null, null), list("M3-VL Pattern Ballistics Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest, MARINE_CAN_BUY_ARMOR, 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 e2aeda57b184..24b60079692b 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -53,10 +53,10 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police_chief, list( list("Security HUD Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_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_RECOMMENDED), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), @@ -107,13 +107,19 @@ GLOBAL_LIST_INIT(cm_vending_clothing_chief_engineer, list( list("Welding Kit", 0, /obj/item/tool/weldpack, MARINE_CAN_BUY_BACKPACK, 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_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_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("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, 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("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("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), @@ -138,13 +144,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_chief_engineer, list( list("Officer M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/SO, MARINE_CAN_BUY_COMBAT_HELMET, VENDOR_ITEM_REGULAR), list("M10 Technician Helmet", 0, /obj/item/clothing/head/helmet/marine/tech, MARINE_CAN_BUY_COMBAT_HELMET, VENDOR_ITEM_REGULAR), - list("COMBAT POUCHES (CHOOSE 2)", 0, null, null, null), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_COMBAT_R_POUCH|MARINE_CAN_BUY_COMBAT_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_COMBAT_R_POUCH|MARINE_CAN_BUY_COMBAT_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_COMBAT_R_POUCH|MARINE_CAN_BUY_COMBAT_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_COMBAT_R_POUCH|MARINE_CAN_BUY_COMBAT_L_POUCH), VENDOR_ITEM_REGULAR), - list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, (MARINE_CAN_BUY_COMBAT_R_POUCH|MARINE_CAN_BUY_COMBAT_L_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), @@ -179,12 +178,12 @@ GLOBAL_LIST_INIT(cm_vending_clothing_req_officer, list( list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Empty)", 0, /obj/item/storage/pouch/tools, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_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_RECOMMENDED), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Empty)", 0, /obj/item/storage/pouch/tools, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (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), @@ -228,20 +227,20 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list( list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, 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("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medkit 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)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, 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("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("ACCESSORIES (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), @@ -285,15 +284,15 @@ GLOBAL_LIST_INIT(cm_vending_clothing_xo, list( list("USCM Shoulder Patch", 0, /obj/item/clothing/accessory/patch, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Document Pouch", 0, /obj/item/storage/pouch/document, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_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_RECOMMENDED), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, 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("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Document Pouch", 0, /obj/item/storage/pouch/document, 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("ACCESSORIES (CHOOSE 1)", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/crew/staff_officer.dm b/code/game/machinery/vending/vendor_types/crew/staff_officer.dm index 9fbc76618c70..5b0324edc2a2 100644 --- a/code/game/machinery/vending/vendor_types/crew/staff_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/staff_officer.dm @@ -37,25 +37,25 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer, list( list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Document Pouch", 0, /obj/item/storage/pouch/document, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, 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("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, 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("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (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), diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index ab58db5d28a2..a16b9d2448be 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -31,8 +31,8 @@ list("Radiation Firstaid Kit", 6, /obj/item/storage/firstaid/rad, null, VENDOR_ITEM_REGULAR), list("MEDICAL SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), + 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("Medevac Bed", 6, /obj/item/roller/medevac, null, VENDOR_ITEM_REGULAR), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), list("Roller Bed", 4, /obj/item/roller, null, VENDOR_ITEM_REGULAR), @@ -139,26 +139,26 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list( list("M276 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("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Document Pouch", 0, /obj/item/storage/pouch/document, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Machete Pouch (Full)", 0, /obj/item/storage/pouch/machete/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, 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("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, 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 (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, 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("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Machete Pouch (Full)", 0, /obj/item/storage/pouch/machete/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("MASK", 0, null, null, null), list("Sterile mask", 0, /obj/item/clothing/mask/surgical, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) 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 4cc491cecf1d..023bbe390bfc 100644 --- a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm +++ b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm @@ -326,17 +326,17 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list( list("M276 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("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/tank, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, 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("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, 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("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, 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), diff --git a/code/game/machinery/vending/vendor_types/dress.dm b/code/game/machinery/vending/vendor_types/dress.dm index 937caef85089..aff221260d03 100644 --- a/code/game/machinery/vending/vendor_types/dress.dm +++ b/code/game/machinery/vending/vendor_types/dress.dm @@ -74,7 +74,7 @@ if(uniform_path in vended_items) can_vend = FALSE var/name = sanitize(initial(O.name)) - var/flags = can_vend ? NO_FLAGS : MARINE_CAN_BUY_ALL + var/flags = can_vend ? null : MARINE_CAN_BUY_DRESS display_list += list( list(name, 0, uniform_path, flags, VENDOR_ITEM_REGULAR) ) diff --git a/code/game/machinery/vending/vendor_types/intelligence_officer.dm b/code/game/machinery/vending/vendor_types/intelligence_officer.dm index d692684428e5..829c542f6b26 100644 --- a/code/game/machinery/vending/vendor_types/intelligence_officer.dm +++ b/code/game/machinery/vending/vendor_types/intelligence_officer.dm @@ -79,21 +79,21 @@ GLOBAL_LIST_INIT(cm_vending_clothing_intelligence_officer, list( list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Document Pouch", 0, /obj/item/storage/pouch/document, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pills)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + 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 (Pills)", 0, /obj/item/storage/pouch/firstaid/full/pills, 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("Large General Pouch", 0, /obj/item/storage/pouch/general/large, 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("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, 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("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/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (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), diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm index 79a23c91d3e9..5815f60b2e0c 100644 --- a/code/game/machinery/vending/vendor_types/medical.dm +++ b/code/game/machinery/vending/vendor_types/medical.dm @@ -133,8 +133,8 @@ /obj/structure/machinery/cm_vending/sorted/medical/populate_product_list(scale) listed_products = list( list("FIELD SUPPLIES", -1, null, null), - list("Advanced Burn Kit", round(scale * 7), /obj/item/stack/medical/advanced/ointment, VENDOR_ITEM_REGULAR), - list("Advanced Trauma Kit", round(scale * 7), /obj/item/stack/medical/advanced/bruise_pack, VENDOR_ITEM_REGULAR), + list("Burn Kit", round(scale * 7), /obj/item/stack/medical/advanced/ointment, VENDOR_ITEM_REGULAR), + list("Trauma Kit", round(scale * 7), /obj/item/stack/medical/advanced/bruise_pack, VENDOR_ITEM_REGULAR), list("Ointment", round(scale * 7), /obj/item/stack/medical/ointment, VENDOR_ITEM_REGULAR), list("Roll of Gauze", round(scale * 7), /obj/item/stack/medical/bruise_pack, VENDOR_ITEM_REGULAR), list("Splints", round(scale * 7), /obj/item/stack/medical/splint, VENDOR_ITEM_REGULAR), @@ -365,8 +365,8 @@ list("Health Analyzer", 8, /obj/item/device/healthanalyzer, VENDOR_ITEM_REGULAR), list("FIELD SUPPLIES", -1, null, null), - list("Advanced Burn Kit", 8, /obj/item/stack/medical/advanced/ointment, VENDOR_ITEM_REGULAR), - list("Advanced Trauma Kit", 8, /obj/item/stack/medical/advanced/bruise_pack, VENDOR_ITEM_REGULAR), + list("Burn Kit", 8, /obj/item/stack/medical/advanced/ointment, VENDOR_ITEM_REGULAR), + list("Trauma Kit", 8, /obj/item/stack/medical/advanced/bruise_pack, VENDOR_ITEM_REGULAR), list("Ointment", 8, /obj/item/stack/medical/ointment, VENDOR_ITEM_REGULAR), list("Roll of Gauze", 8, /obj/item/stack/medical/bruise_pack, VENDOR_ITEM_REGULAR), list("Splints", 8, /obj/item/stack/medical/splint, VENDOR_ITEM_REGULAR) diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index c915c4fa427d..89e78e898abc 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -35,7 +35,7 @@ list("SU-6 Smart Pistol", round(scale * 3), /obj/item/storage/box/guncase/smartpistol, VENDOR_ITEM_REGULAR), list("MOU-53 Shotgun", round(scale * 2), /obj/item/storage/box/guncase/mou53, VENDOR_ITEM_REGULAR), list("XM88 Heavy Rifle", round(scale * 3), /obj/item/storage/box/guncase/xm88, VENDOR_ITEM_REGULAR), - list("M41AE2 Heavy Pulse Rifle", round(scale * 2), /obj/item/storage/box/guncase/lmg, VENDOR_ITEM_REGULAR), + list("M41AE2 Heavy Pulse Rifle", round(scale * 2.5), /obj/item/storage/box/guncase/lmg, VENDOR_ITEM_REGULAR), list("M41A Pulse Rifle MK1", round(scale * 3), /obj/item/storage/box/guncase/m41aMK1, VENDOR_ITEM_REGULAR), list("M56D Heavy Machine Gun", round(scale * 2), /obj/item/storage/box/guncase/m56d, VENDOR_ITEM_REGULAR), list("M2C Heavy Machine Gun", round(scale * 2), /obj/item/storage/box/guncase/m2c, VENDOR_ITEM_REGULAR), @@ -45,6 +45,7 @@ list("EXPLOSIVES", -1, null, null), list("M15 Fragmentation Grenade", round(scale * 2), /obj/item/explosive/grenade/high_explosive/m15, VENDOR_ITEM_REGULAR), list("M20 Claymore Anti-Personnel Mine", round(scale * 4), /obj/item/explosive/mine, VENDOR_ITEM_REGULAR), + list("M19 Anti-Tank Mine", round(scale * 2), /obj/item/explosive/mine/bury/antitank, VENDOR_ITEM_REGULAR), list("M40 HEDP Grenade", round(scale * 25), /obj/item/explosive/grenade/high_explosive, VENDOR_ITEM_REGULAR), list("M40 HIDP Incendiary Grenade", round(scale * 4), /obj/item/explosive/grenade/incendiary, VENDOR_ITEM_REGULAR), list("M40 HPDP White Phosphorus Smoke Grenade", round(scale * 4), /obj/item/explosive/grenade/phosphorus, VENDOR_ITEM_REGULAR), @@ -74,6 +75,7 @@ list("Technician Welderpack", round(scale * 2), /obj/item/storage/backpack/marine/engineerpack, VENDOR_ITEM_REGULAR), list("Mortar Shell Backpack", round(scale * 1), /obj/item/storage/backpack/marine/mortarpack, VENDOR_ITEM_REGULAR), list("Technician Welder-Satchel", round(scale * 5), /obj/item/storage/backpack/marine/engineerpack/satchel, VENDOR_ITEM_REGULAR), + list("IMP Ammo Rack", round(scale * 2), /obj/item/storage/backpack/marine/ammo_rack, VENDOR_ITEM_REGULAR), list("Radio Telephone Pack", round(scale * 2), /obj/item/storage/backpack/marine/satchel/rto, VENDOR_ITEM_REGULAR), list("BELTS", -1, null, null), 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 74504c412ff2..397474c8a7d6 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 @@ -37,6 +37,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list( list("M74 AGM-Smoke Airburst Packet (x3 airburst grenades)", 10, /obj/item/storage/box/packet/airburst_smoke, null, VENDOR_ITEM_REGULAR), list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR), list("M20 Mine Box (x4 mines)", 18, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR), + list("M19 Anti Tank Mine", 18, /obj/item/explosive/mine/bury/antitank, null, VENDOR_ITEM_REGULAR), list("M40 MFHS Metal Foam Grenade", 5, /obj/item/explosive/grenade/metal_foam, null, VENDOR_ITEM_REGULAR), list("AMMUNITION", 0, null, null, null), @@ -50,7 +51,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list( list("VP78 Pistol", 8, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), list("SU-6 Smart Pistol", 12, /obj/item/storage/box/guncase/smartpistol, null, VENDOR_ITEM_REGULAR), list("M240 Incinerator Unit", 12, /obj/item/storage/box/guncase/flamer, null, VENDOR_ITEM_REGULAR), - list("M41AE2 Heavy Pulse Rifle", 18, /obj/item/storage/box/guncase/lmg, null, VENDOR_ITEM_REGULAR), list("M79 Grenade Launcher", 24, /obj/item/storage/box/guncase/m79, null, VENDOR_ITEM_REGULAR), list("M56D Heavy Machine Gun", 24, /obj/item/storage/box/guncase/m56d, null, VENDOR_ITEM_REGULAR), @@ -127,19 +127,19 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list( list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, 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_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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 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("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (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), 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 f0bb255c9321..47b0881daff0 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 @@ -8,7 +8,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list( list("M4RA Sniper Kit", 0, /obj/item/storage/box/kit/mini_sniper, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("M240 Pyrotechnician Support Kit", 0, /obj/item/storage/box/kit/mini_pyro, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("M2C Heavy Machine Gun", 0, /obj/item/storage/box/guncase/m2c, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), - list("M41AE2 Heavy Pulse Rifle", 0, /obj/item/storage/box/guncase/lmg, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("M56D Heavy Machine Gun", 0, /obj/item/storage/box/guncase/m56d, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("M79 Grenade Launcher", 0, /obj/item/storage/box/guncase/m79, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("MOU-53 Shotgun", 0, /obj/item/storage/box/guncase/mou53, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), @@ -54,8 +53,8 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list( list("M40 MFHS Metal Foam Grenade", 5, /obj/item/explosive/grenade/metal_foam, null, VENDOR_ITEM_REGULAR), list("MEDICAL SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), + 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), @@ -84,7 +83,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list( list("M240 Incinerator Unit", 18, /obj/item/storage/box/guncase/flamer, null, VENDOR_ITEM_REGULAR), list("VP78 Pistol", 8, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), list("SU-6 Smart Pistol", 12, /obj/item/storage/box/guncase/smartpistol, null, VENDOR_ITEM_REGULAR), - list("M41AE2 Heavy Pulse Rifle", 18, /obj/item/storage/box/guncase/lmg, null, VENDOR_ITEM_REGULAR), list("M79 Grenade Launcher", 18, /obj/item/storage/box/guncase/m79, null, VENDOR_ITEM_REGULAR), list("RADIO KEYS", 0, null, null, null), @@ -116,6 +114,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_leader, list( list("Headset", 0, /obj/item/device/radio/headset/almayer/marine, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("Helmet", 0, /obj/item/clothing/head/helmet/marine/leader, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY), list("BACKPACK (CHOOSE 1)", 0, null, null, null), list("Backpack", 0, /obj/item/storage/backpack/marine, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), @@ -136,18 +135,18 @@ GLOBAL_LIST_INIT(cm_vending_clothing_leader, list( list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + 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_RECOMMENDED), + 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("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, 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("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (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), @@ -196,7 +195,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_leader, list( spawned_gear_list = list( /obj/item/explosive/plastic, /obj/item/device/binoculars/range/designator, - /obj/item/map/current_map, + /obj/item/storage/box/m94/signal, /obj/item/tool/extinguisher/mini, /obj/item/storage/box/zipcuffs, ) 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 43138d026726..ab864947e8f8 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 @@ -5,11 +5,12 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("Essential Medical Set", 0, /obj/effect/essentials_set/medic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("FIELD SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_RECOMMENDED), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_RECOMMENDED), + 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), list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_RECOMMENDED), @@ -69,7 +70,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("RESTRICTED FIREARMS", 0, null, null, null), list("VP78 Pistol", 8, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), list("SU-6 Smart Pistol", 12, /obj/item/storage/box/guncase/smartpistol, null, VENDOR_ITEM_REGULAR), - list("M41AE2 Heavy Pulse Rifle", 18, /obj/item/storage/box/guncase/lmg, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), list("M3 B12 Pattern Armor", 28, /obj/item/clothing/suit/storage/marine/leader, null, VENDOR_ITEM_REGULAR), @@ -140,27 +140,27 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list( list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Vial Pouch (Full)", 0, /obj/item/storage/pouch/vials/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, 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("Medkit 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)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, 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), 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 8287e53d7774..3777fe75aa16 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 @@ -190,7 +190,6 @@ list("VP78 Magazine", round(scale * 5), /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR), list("SU-6 Smartpistol Magazine (.45)", round(scale * 5), /obj/item/ammo_magazine/pistol/smart, VENDOR_ITEM_REGULAR), list("M240 Incinerator Tank", round(scale * 3), /obj/item/ammo_magazine/flamer_tank, VENDOR_ITEM_REGULAR), - list("M41AE2 Box Magazine (10x24mm)", round(scale * 3), /obj/item/ammo_magazine/rifle/lmg, VENDOR_ITEM_REGULAR), list("M56D Drum Magazine", round(scale * 2), /obj/item/ammo_magazine/m56d, VENDOR_ITEM_REGULAR), list("M2C Box Magazine", round(scale * 2), /obj/item/ammo_magazine/m2c, VENDOR_ITEM_REGULAR), list("HIRR Baton Slugs", round(scale * 6), /obj/item/explosive/grenade/slug/baton, VENDOR_ITEM_REGULAR), @@ -316,3 +315,24 @@ list("M41A Solid Stock", round(scale * 1.5), /obj/item/attachable/stock/rifle, VENDOR_ITEM_REGULAR), list("M44 Magnum Sharpshooter Stock", round(scale * 1.5), /obj/item/attachable/stock/revolver, VENDOR_ITEM_REGULAR) ) + +//------------ESSENTIAL SETS--------------- +/obj/effect/essentials_set/random/uscm_light_armor + spawned_gear_list = list( + /obj/item/clothing/suit/storage/marine/light/padded, + /obj/item/clothing/suit/storage/marine/light/padless, + /obj/item/clothing/suit/storage/marine/light/padless_lines, + /obj/item/clothing/suit/storage/marine/light/carrier, + /obj/item/clothing/suit/storage/marine/light/skull, + /obj/item/clothing/suit/storage/marine/light/smooth, + ) + +/obj/effect/essentials_set/random/uscm_heavy_armor + spawned_gear_list = list( + /obj/item/clothing/suit/storage/marine/heavy/padded, + /obj/item/clothing/suit/storage/marine/heavy/padless, + /obj/item/clothing/suit/storage/marine/heavy/padless_lines, + /obj/item/clothing/suit/storage/marine/heavy/carrier, + /obj/item/clothing/suit/storage/marine/heavy/skull, + /obj/item/clothing/suit/storage/marine/heavy/smooth, + ) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm index 3a26ede637d0..7ec257142ff5 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm @@ -2,11 +2,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), - list("Uniform", 0, /obj/item/clothing/under/marine, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/almayer/marine, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Helmet", 0, /obj/item/clothing/head/helmet/marine, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), + list("Standard Marine Apparel", 0, list(/obj/item/clothing/under/marine, /obj/item/clothing/shoes/marine/knife, /obj/item/clothing/gloves/marine, /obj/item/device/radio/headset/almayer/marine, /obj/item/clothing/head/helmet/marine), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), @@ -32,17 +28,17 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("M276 M40 Grenade Rig (Empty)", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, 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_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, 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("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -52,7 +48,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("RESTRICTED FIREARMS", 0, null, null, null), list("VP78 Pistol", 15, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), list("SU-6 Smart Pistol", 15, /obj/item/storage/box/guncase/smartpistol, null, VENDOR_ITEM_REGULAR), - list("M41AE2 Heavy Pulse Rifle", 30, /obj/item/storage/box/guncase/lmg, null, VENDOR_ITEM_REGULAR), list("M79 Grenade Launcher", 30, /obj/item/storage/box/guncase/m79, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), @@ -75,9 +70,12 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), + 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("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), list("Brown Webbing Vest", 15, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_REGULAR), list("Black Webbing Vest", 15, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 15, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), list("SensorMate Medical HUD", 15, /obj/item/clothing/glasses/hud/sensor, 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), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm index 0a7016207394..fae628dfeb0c 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm @@ -8,7 +8,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_smartgun, list( list("M56 Smartgun Drum", 15, /obj/item/ammo_magazine/smartgun, null, VENDOR_ITEM_RECOMMENDED), list("SMARTGUN EXTRA UTILITIES (CHOOSE 1)", 0, null, null, null), - list("Burst Fire Assembly", 0, /obj/item/attachable/burstfire_assembly, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), list("High-Capacity Power Cell", 0, /obj/item/cell/high, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), list("GUN ATTACHMENTS (CHOOSE 1)", 0, null, null, null), @@ -77,18 +76,18 @@ GLOBAL_LIST_INIT(cm_vending_clothing_smartgun, list( list("M280 Smartgunner Drum Belt", 0, /obj/item/storage/belt/marine/smartgunner, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch", 0, /obj/item/storage/pouch/electronics, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Machete Pouch (Full)", 0, /obj/item/storage/pouch/machete/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch", 0, /obj/item/storage/pouch/electronics, 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_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + 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("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Machete Pouch (Full)", 0, /obj/item/storage/pouch/machete/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, 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), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm index b29c1ac2e1d7..d8f1eb742785 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm @@ -97,16 +97,16 @@ GLOBAL_LIST_INIT(cm_vending_clothing_specialist, list( list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, 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_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, 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 Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, 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), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm index 0883cfb9354c..e373244f72d6 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm @@ -27,7 +27,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_tl, list( list("RESTRICTED FIREARMS", 0, null, null, null), list("VP78 Pistol", 10, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), list("SU-6 Smart Pistol", 15, /obj/item/storage/box/guncase/smartpistol, null, VENDOR_ITEM_REGULAR), - list("M41AE2 Heavy Pulse Rifle", 30, /obj/item/storage/box/guncase/lmg, null, VENDOR_ITEM_REGULAR), list("M79 Grenade Launcher", 30, /obj/item/storage/box/guncase/m79, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), @@ -96,21 +95,21 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tl, list( list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, 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_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + 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("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, 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_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + 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/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("ACCESSORIES (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), diff --git a/code/game/objects/effects/decals/cleanable/blood/xeno.dm b/code/game/objects/effects/decals/cleanable/blood/xeno.dm index 12f6e859493d..ade4723a1d74 100644 --- a/code/game/objects/effects/decals/cleanable/blood/xeno.dm +++ b/code/game/objects/effects/decals/cleanable/blood/xeno.dm @@ -5,7 +5,7 @@ name = "sizzling blood" desc = "It's yellow and acidic. It looks like... blood?" icon = 'icons/effects/blood.dmi' - basecolor = "#dffc00" + basecolor = BLOOD_COLOR_XENO amount = 1 /obj/effect/decal/cleanable/blood/gibs/xeno @@ -14,7 +14,7 @@ desc = "Gnarly..." icon_state = "xgib1" random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6") - basecolor = "#dffc00" + basecolor = BLOOD_COLOR_XENO /obj/effect/decal/cleanable/blood/gibs/xeno/update_icon() color = "#FFFFFF" @@ -35,4 +35,4 @@ random_icon_states = list("xgibmid1", "xgibmid2", "xgibmid3") /obj/effect/decal/cleanable/blood/xtracks - basecolor = "#dffc00" + basecolor = BLOOD_COLOR_XENO diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index 8d6a1ab87c0b..0399d0996411 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -31,6 +31,16 @@ icon_state = "dirt" mouse_opacity = MOUSE_OPACITY_TRANSPARENT +/obj/effect/decal/cleanable/dirt/greenglow + name = "glowing goo" + acid_damage = 1 + icon_state = "greenglow" + luminosity = 1 + +/obj/effect/decal/cleanable/dirt/greenglow/Destroy() + SetLuminosity(0) + return ..() + /obj/effect/decal/cleanable/flour name = "flour" desc = "It's still good. Four second rule!" diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm index 126b61f8c875..49342af8514f 100644 --- a/code/game/objects/effects/effect_system/effect_system.dm +++ b/code/game/objects/effects/effect_system/effect_system.dm @@ -11,7 +11,7 @@ would spawn and follow the beaker, even if it is carried or thrown. var/cardinals = 0 var/turf/location var/atom/holder - var/setup = 0 + var/setup = FALSE /datum/effect_system/Destroy(force, ...) holder = null @@ -24,7 +24,7 @@ would spawn and follow the beaker, even if it is carried or thrown. number = n cardinals = c location = loca - setup = 1 + setup = TRUE /datum/effect_system/proc/attach(atom/atom) holder = atom @@ -64,13 +64,13 @@ steam.start() -- spawns the effect /datum/effect_system/steam_spread/start() var/i = 0 - for(i=0, i 20) + for(i=0, i 20) return spawn(0) if(holder) - src.location = get_turf(holder) - var/obj/effect/particle_effect/sparks/sparks = new /obj/effect/particle_effect/sparks(src.location) - src.total_sparks++ + location = get_turf(holder) + var/obj/effect/particle_effect/sparks/sparks = new /obj/effect/particle_effect/sparks(location) + total_sparks++ var/direction - if(src.cardinals) + if(cardinals) direction = pick(cardinal) else direction = pick(alldirs) @@ -156,42 +156,45 @@ steam.start() -- spawns the effect /datum/effect_system/ion_trail_follow var/turf/oldposition - var/processing = 1 - var/on = 1 + var/processing = TRUE + var/on = TRUE /datum/effect_system/ion_trail_follow/set_up(atom/atom) attach(atom) oldposition = get_turf(atom) /datum/effect_system/ion_trail_follow/start() - if(!src.on) - src.on = 1 - src.processing = 1 - if(src.processing) - src.processing = 0 + if(!on) + on = TRUE + processing = TRUE + if(processing) + processing = FALSE spawn(0) - var/turf/T = get_turf(src.holder) - if(T != src.oldposition) - if(istype(T, /turf/open/space)) - var/obj/effect/particle_effect/ion_trails/I = new /obj/effect/particle_effect/ion_trails(src.oldposition) - src.oldposition = T - I.setDir(src.holder.dir) - flick("ion_fade", I) - I.icon_state = "blank" - QDEL_IN(I, 20) + var/turf/turf = get_turf(holder) + if(isnull(turf)) + qdel(src) + return + if(turf != oldposition) + if(istype(turf, /turf/open/space)) + var/obj/effect/particle_effect/ion_trails/trails = new /obj/effect/particle_effect/ion_trails(oldposition) + oldposition = turf + trails.setDir(holder.dir) + flick("ion_fade", trails) + trails.icon_state = "blank" + QDEL_IN(trails, 20) spawn(2) - if(src.on) - src.processing = 1 - src.start() + if(on) + processing = TRUE + start() else spawn(2) - if(src.on) - src.processing = 1 - src.start() + if(on) + processing = TRUE + start() /datum/effect_system/ion_trail_follow/proc/stop() - src.processing = 0 - src.on = 0 + processing = FALSE + on = FALSE @@ -203,39 +206,42 @@ steam.start() -- spawns the effect /datum/effect_system/steam_trail_follow var/turf/oldposition - var/processing = 1 - var/on = 1 + var/processing = TRUE + var/on = TRUE /datum/effect_system/steam_trail_follow/set_up(atom/atom) attach(atom) oldposition = get_turf(atom) /datum/effect_system/steam_trail_follow/start() - if(!src.on) - src.on = 1 - src.processing = 1 - if(src.processing) - src.processing = 0 + if(!on) + on = TRUE + processing = TRUE + if(processing) + processing = FALSE spawn(0) - if(src.number < 3) - var/obj/effect/particle_effect/steam/I = new /obj/effect/particle_effect/steam(src.oldposition) - src.number++ - src.oldposition = get_turf(holder) - I.setDir(src.holder.dir) + if(number < 3) + var/obj/effect/particle_effect/steam/trails = new /obj/effect/particle_effect/steam(oldposition) + number++ + oldposition = get_turf(holder) + if(isnull(oldposition)) + qdel(src) + return + trails.setDir(holder.dir) spawn(10) - qdel(I) + qdel(trails) number-- spawn(2) - if(src.on) - src.processing = 1 - src.start() + if(on) + processing = TRUE + start() else spawn(2) - if(src.on) - src.processing = 1 - src.start() + if(on) + processing = TRUE + start() /datum/effect_system/steam_trail_follow/proc/stop() - src.processing = 0 - src.on = 0 + processing = FALSE + on = FALSE diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index 0a2ba1e02e65..a02069087412 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -256,6 +256,17 @@ icon = 'icons/effects/effects.dmi' smokeranking = SMOKE_RANK_MED +///////////////////////////////////////// +// Acid Runner Smoke, Harmless Visuals only +///////////////////////////////////////// +/obj/effect/particle_effect/smoke/acid_runner_harmless + color = "#86B028" + time_to_live = 2 + opacity = FALSE + alpha = 200 + smokeranking = SMOKE_RANK_HARMLESS + amount = 0 + ///////////////////////////////////////// // BOILER SMOKES ///////////////////////////////////////// diff --git a/code/game/objects/effects/landmarks/itemspawner.dm b/code/game/objects/effects/landmarks/itemspawner.dm index 2ab18b62ab97..6858ed6b055a 100644 --- a/code/game/objects/effects/landmarks/itemspawner.dm +++ b/code/game/objects/effects/landmarks/itemspawner.dm @@ -1,9 +1,9 @@ //Costume spawner landmarks /obj/effect/landmark/costume/random/Initialize() //costume spawner, selects a random subclass and disappears . = ..() - var/list/options = typesof(/obj/effect/landmark/costume) - /obj/effect/landmark/costume/random - var/PICK = options[rand(1, options.len)] - new PICK(src.loc) + var/list/options = subtypesof(/obj/effect/landmark/costume) - /obj/effect/landmark/costume/random + var/CHOICE = pick(options) + new CHOICE(src.loc) return INITIALIZE_HINT_QDEL //SUBCLASSES. Spawn a bunch of items and disappear likewise @@ -63,7 +63,7 @@ . = ..() new /obj/item/clothing/suit/storage/wcoat(src.loc) new /obj/item/clothing/glasses/monocle(src.loc) - var/CHOICE= pick( /obj/item/clothing/head/bowler, /obj/item/clothing/head/that) + var/CHOICE = pick(/obj/item/clothing/head/bowler, /obj/item/clothing/head/that) new CHOICE(src.loc) new /obj/item/clothing/shoes/black(src.loc) new /obj/item/weapon/pole/fancy_cane(src.loc) @@ -81,7 +81,7 @@ . = ..() new /obj/item/clothing/under/pirate(src.loc) new /obj/item/clothing/suit/pirate(src.loc) - var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana ) + var/CHOICE = pick(/obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana) new CHOICE(src.loc) new /obj/item/clothing/glasses/eyepatch(src.loc) return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index af5aee782e93..64a5025794e3 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -8,10 +8,9 @@ var/invisibility_value = INVISIBILITY_MAXIMUM /obj/effect/landmark/New() - ..() tag = "landmark*[name]" invisibility = invisibility_value - return 1 + return ..() /obj/effect/landmark/Initialize(mapload, ...) . = ..() @@ -105,6 +104,9 @@ /obj/effect/landmark/ert_spawns/distress_wo name = "distress_wo" +/obj/effect/landmark/ert_spawns/groundside_xeno + name = "distress_groundside_xeno" + /obj/effect/landmark/monkey_spawn name = "monkey_spawn" icon_state = "monkey_spawn" diff --git a/code/game/objects/effects/temporary_visuals.dm b/code/game/objects/effects/temporary_visuals.dm index c1c4a558fa66..4dc07b76f3cb 100644 --- a/code/game/objects/effects/temporary_visuals.dm +++ b/code/game/objects/effects/temporary_visuals.dm @@ -40,7 +40,9 @@ layer = ABOVE_XENO_LAYER var/splatter_type = "splatter" -/obj/effect/temp_visual/dir_setting/bloodsplatter/Initialize(mapload, set_dir, fx_duration) +/obj/effect/temp_visual/dir_setting/bloodsplatter/Initialize(mapload, set_dir, fx_duration, color_override) + if(color_override) + color = color_override if(IS_DIAGONAL_DIR(set_dir)) icon_state = "[splatter_type][pick(1, 2, 6)]" else @@ -76,21 +78,21 @@ /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter splatter_type = "csplatter" - color = "#77b013" + color = BLOOD_COLOR_XENO /obj/effect/temp_visual/dir_setting/bloodsplatter/human splatter_type = "csplatter" - color = "#a8180d" + color = BLOOD_COLOR_HUMAN /obj/effect/temp_visual/dir_setting/bloodsplatter/hellhound splatter_type = "csplatter" - color = "#a80d3b" + color = BLOOD_COLOR_YAUTJA /obj/effect/temp_visual/dir_setting/bloodsplatter/yautjasplatter splatter_type = "csplatter" - color = "#5A934A" + color = BLOOD_COLOR_YAUTJA_DARK /obj/effect/temp_visual/dir_setting/bloodsplatter/synthsplatter splatter_type = "csplatter" - color = "#e0e0e0" + color = BLOOD_COLOR_SYNTHETIC diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 559a73a13a82..2edfc3d6ea2b 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -781,7 +781,9 @@ cases. Override_icon_state should be a list.*/ /obj/item/proc/showoff(mob/user) - for (var/mob/M in view(user)) + var/list/viewers = get_mobs_in_view(world_view_size, user) + user.langchat_speech("holds up [src].", viewers, GLOB.all_languages, skip_language_check = TRUE, animation_style = LANGCHAT_FAST_POP, additional_styles = list("langchat_small", "emote")) + for (var/mob/M in viewers) M.show_message("[user] holds up [src]. Take a closer look.", SHOW_MESSAGE_VISIBLE) /mob/living/carbon/verb/showoff() diff --git a/code/game/objects/items/artifacts.dm b/code/game/objects/items/artifacts.dm deleted file mode 100644 index a5845eaf4a97..000000000000 --- a/code/game/objects/items/artifacts.dm +++ /dev/null @@ -1,34 +0,0 @@ -/obj/item/changestone - name = "\proper an uncut ruby" - desc = "The ruby shines and catches the light, despite being uncut." - icon = 'icons/obj/items/misc.dmi' - icon_state = "changerock" - -/obj/item/changestone/proc/change(mob/target) - if(!ishuman(target)) - return FALSE - var/mob/living/carbon/human/humantarget = target - if(humantarget.flags_human_misc & HUMAN_FLAG_CHANGED) - return - if(humantarget.gender == FEMALE) - humantarget.gender = MALE - else - humantarget.gender = FEMALE - humantarget.visible_message(SPAN_NOTICE("[humantarget] changes in a way you can't quite pinpoint."), SPAN_NOTICE("You feel different.")) - humantarget.flags_human_misc |= HUMAN_FLAG_CHANGED - return TRUE - -/obj/item/changestone/attack_hand(mob/user as mob) - change(user) - . = ..() - -/obj/item/changestone/attack(mob/living/M, mob/living/user) - if(change(user)) - return - . = ..() - -/obj/item/changestone/mob_launch_collision(mob/living/L) - . = ..() - change(L) - - diff --git a/code/game/objects/items/circuitboards/robot_modules.dm b/code/game/objects/items/circuitboards/robot_modules.dm index 89afe9e2729d..2e5185353852 100644 --- a/code/game/objects/items/circuitboards/robot_modules.dm +++ b/code/game/objects/items/circuitboards/robot_modules.dm @@ -31,6 +31,7 @@ . = ..() QDEL_NULL(emag) QDEL_NULL(jetpack) + QDEL_NULL_LIST(modules) /obj/item/circuitboard/robot_module/proc/respawn_consumable(mob/living/silicon/robot/R) diff --git a/code/game/objects/items/devices/cloaking.dm b/code/game/objects/items/devices/cloaking.dm index 64ea7189cd68..05e7786744e2 100644 --- a/code/game/objects/items/devices/cloaking.dm +++ b/code/game/objects/items/devices/cloaking.dm @@ -23,10 +23,8 @@ spark_system.attach(src) /obj/item/device/chameleon/Destroy() - if(spark_system) - qdel(spark_system) - spark_system = null - . = ..() + QDEL_NULL(spark_system) + return ..() /obj/item/device/chameleon/dropped(mob/user) disrupt(user) diff --git a/code/game/objects/items/devices/data_detector.dm b/code/game/objects/items/devices/data_detector.dm index ad1b9c3bb05f..6a358ec09bd8 100644 --- a/code/game/objects/items/devices/data_detector.dm +++ b/code/game/objects/items/devices/data_detector.dm @@ -17,6 +17,7 @@ /obj/structure/machinery/computer/objective, /obj/item/limb/head/synth, ) + var/detect_empty_vial_boxes = FALSE /obj/item/device/motiondetector/intel/get_help_text() . = "Green indicators on your HUD will show the location of intelligence objects detected by the scanner. Has two modes: slow long-range [SPAN_HELPFUL("(14 tiles)")] and fast short-range [SPAN_HELPFUL("(7 tiles)")]." @@ -42,10 +43,16 @@ var/detected for(var/DT in objects_to_detect) if(istype(I, DT)) + if(!detect_empty_vial_boxes && istype(I, /obj/item/storage/fancy/vials/random)) + if(!I.contents) + continue detected = TRUE if(I.contents) for(var/obj/item/CI in I.contents) if(istype(CI, DT)) + if(!detect_empty_vial_boxes && istype(I, /obj/item/storage/fancy/vials/random)) + if(!I.contents) + continue detected = TRUE break if(human_user && detected) @@ -69,6 +76,9 @@ for(var/obj/I in M.contents_twice()) for(var/DT in objects_to_detect) if(istype(I, DT)) + if(!detect_empty_vial_boxes && istype(I, /obj/item/storage/fancy/vials/random)) + if(!I.contents) + continue detected = TRUE break if(detected) diff --git a/code/game/objects/items/devices/defibrillator.dm b/code/game/objects/items/devices/defibrillator.dm index e873fa893d62..0596ae9d14b8 100644 --- a/code/game/objects/items/devices/defibrillator.dm +++ b/code/game/objects/items/devices/defibrillator.dm @@ -228,6 +228,7 @@ user.visible_message(SPAN_NOTICE("[icon2html(src, viewers(src))] \The [src] beeps: Defibrillation successful.")) playsound(get_turf(src), 'sound/items/defib_success.ogg', 25, 0) user.track_life_saved(user.job) + user.life_revives_total++ H.handle_revive() to_chat(H, SPAN_NOTICE("You suddenly feel a spark and your consciousness returns, dragging you back to the mortal plane.")) if(H.client?.prefs.toggles_flashing & FLASH_CORPSEREVIVE) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index a73cb5fafa2f..6fe39172d783 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -58,8 +58,9 @@ if(!toggleable) to_chat(user, SPAN_WARNING("You cannot toggle \the [src.name] on or off.")) return FALSE + if(!isturf(user.loc)) - to_chat(user, "You cannot turn the light on while in [user.loc].") //To prevent some lighting anomalities. + to_chat(user, SPAN_WARNING("You cannot turn the light [on ? "off" : "on"] while in [user.loc].")) //To prevent some lighting anomalies. return FALSE on = !on @@ -524,8 +525,9 @@ anchored = TRUE if(activate_message) visible_message(SPAN_DANGER("[src]'s flame reaches full strength. It's fully active now."), null, 5) - msg_admin_niche("Flare target [src] has been activated by [key_name(user, 1)] at ([x], [y], [z]). (JMP LOC)") - log_game("Flare target [src] has been activated by [key_name(user, 1)] at ([x], [y], [z]).") + var/turf/target_turf = get_turf(src) + msg_admin_niche("Flare target [src] has been activated by [key_name(user, 1)] at ([target_turf.x], [target_turf.y], [target_turf.z]). (JMP LOC)") + log_game("Flare target [src] has been activated by [key_name(user, 1)] at ([target_turf.x], [target_turf.y], [target_turf.z]).") return TRUE /obj/item/device/flashlight/flare/signal/attack_hand(mob/user) diff --git a/code/game/objects/items/devices/motion_detector.dm b/code/game/objects/items/devices/motion_detector.dm index d3130aeefb26..01858ed486d0 100644 --- a/code/game/objects/items/devices/motion_detector.dm +++ b/code/game/objects/items/devices/motion_detector.dm @@ -309,6 +309,11 @@ name = "hacked motion detector" desc = "A device that usually picks up non-USCM signals, but this one's been hacked to detect all non-freelancer movement instead. Fight fire with fire!" iff_signal = FACTION_MERCENARY + +/obj/item/device/motiondetector/hacked/pmc + name = "corporate motion detector" + desc = "A device that usually picks up non-USCM signals, but this one's been reprogrammed to detect all non-PMC movement instead. Very corporate." + iff_signal = FACTION_PMC /obj/item/device/motiondetector/hacked/dutch name = "hacked motion detector" diff --git a/code/game/objects/items/devices/portable_vendor.dm b/code/game/objects/items/devices/portable_vendor.dm index a9e587c43dfb..0b96b859c4ac 100644 --- a/code/game/objects/items/devices/portable_vendor.dm +++ b/code/game/objects/items/devices/portable_vendor.dm @@ -14,18 +14,22 @@ throw_range = 4 w_class = SIZE_LARGE - var/req_role = "" //to be compared with assigned_role to only allow those to use that machine. + /// to be compared with assigned_role to only allow those to use that machine. + var/req_role = "" var/points = 40 var/max_points = 50 var/use_points = TRUE - var/fabricating = 0 - var/broken = 0 + var/fabricating = FALSE + var/broken = FALSE + var/list/purchase_log = list() var/list/listed_products = list() - var/special_prod_time_lock //needs to be a time define - var/list/special_prods //list of typepaths + /// needs to be a time define + var/special_prod_time_lock + /// list of typepaths + var/list/special_prods /obj/item/device/portable_vendor/attack_hand(mob/user) if(loc == user) @@ -67,119 +71,108 @@ user.set_interaction(src) - ui_interact(user) - - -/obj/item/device/portable_vendor/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0) - - if(!ishuman(user)) return + tgui_interact(user) - var/list/display_list = list() - - - for(var/i in 1 to listed_products.len) - var/list/myprod = listed_products[i] - var/p_name = myprod[1] - var/p_cost = myprod[2] - if(p_cost > 0) - p_name += " ([p_cost] points)" +/obj/item/device/portable_vendor/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "PortableVendor", "[src]") + ui.open() - var/prod_available = FALSE - //var/avail_flag = myprod[4] - if(points >= p_cost || !use_points) - prod_available = TRUE +/obj/item/device/portable_vendor/ui_data(mob/user) + . = ..() - //place in main list, name, cost, available or not, color. - display_list += list(list("prod_index" = i, "prod_name" = p_name, "prod_available" = prod_available, "prod_color" = myprod[4], "prod_desc" = myprod[5])) + var/list/available_items = list() + for(var/index in 1 to length(listed_products)) + var/product = listed_products[index] + var/name = product[1] + var/cost = product[2] + var/color = product[4] + var/description = product[5] - var/list/data = list( - "vendor_name" = name, - "show_points" = use_points, - "current_points" = round(points), - "max_points" = max_points, - "displayed_records" = display_list, - ) + if(cost > 0) + name += " ([cost] points)" - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) + var/available = points >= product[2] || !use_points + available_items += list(list("index" = index, "name" = name, "cost" = cost, "available" = available, "color" = color, "description" = description)) - if (!ui) - ui = new(user, src, ui_key, "portable_vendor.tmpl", name , 600, 700) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(0) + .["vendor_name"] = name + .["show_points"] = use_points + .["current_points"] = round(points) + .["max_points"] = max_points + .["displayed_records"] = available_items -/obj/item/device/portable_vendor/Topic(href, href_list) +/obj/item/device/portable_vendor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return + + switch(action) + if("vend") + vend(text2num(params["choice"]), ui.user) + +/obj/item/device/portable_vendor/proc/vend(choice, mob/user) if(broken) return - if(usr.is_mob_incapacitated()) + + if(user.is_mob_incapacitated()) return - if (in_range(src, usr) && ishuman(usr)) - usr.set_interaction(src) - if (href_list["vend"]) + if(!(in_range(src, user) || ishuman(user))) + return - if(!allowed(usr)) - to_chat(usr, SPAN_WARNING("Access denied.")) - return + user.set_interaction(src) - var/mob/living/carbon/human/H = usr - var/obj/item/card/id/I = H.wear_id - if(!istype(I)) //not wearing an ID - to_chat(H, SPAN_WARNING("Access denied. No ID card detected")) - return + if(!allowed(user)) + to_chat(user, SPAN_WARNING("Access denied.")) + return - if(I.registered_name != H.real_name) - to_chat(H, SPAN_WARNING("Wrong ID card owner detected.")) - return + var/mob/living/carbon/human/human_user = user + var/obj/item/card/id/id = human_user.get_idcard() - if(req_role && I.rank != req_role) - to_chat(H, SPAN_WARNING("This device isn't for you.")) - return + if(!istype(id)) + to_chat(human_user, SPAN_WARNING("Access denied. No ID card detected.")) + return - var/idx=text2num(href_list["vend"]) + if(req_role && req_role != id.rank) + to_chat(human_user, SPAN_WARNING("This device isn't for you.")) - var/list/L = listed_products[idx] - var/cost = L[2] + var/list/product = listed_products[choice] - if(use_points && points < cost) - to_chat(H, SPAN_WARNING("Not enough points.")) - return + var/cost = product[2] + if(use_points && points < cost) + to_chat(human_user, SPAN_WARNING("Not enough points.")) + return - var/turf/T = get_turf(loc) - if(length(T.contents) > 25) - to_chat(H, SPAN_WARNING("The floor is too cluttered, make some space.")) - return + var/turf/current_turf = get_turf(src) + if(length(current_turf.contents) > 25) + to_chat(human_user, SPAN_WARNING("The floor is too cluttered, make some space.")) + return - if(special_prod_time_lock) - if(L[3] in special_prods) - if(world.time < SSticker.mode.round_time_lobby + special_prod_time_lock) - to_chat(usr, SPAN_WARNING("\The [src] is still fabricating \the [L[1]]. Please wait another [round((SSticker.mode.round_time_lobby + special_prod_time_lock-world.time)/600)] minutes before trying again.")) - return + if(special_prod_time_lock && (product[3] in special_prods)) + if(ROUND_TIME < special_prod_time_lock) + to_chat(usr, SPAN_WARNING("[src] is still fabricating [product[1]]. Please wait another [round((SSticker.mode.round_time_lobby + special_prod_time_lock-world.time)/600)] minutes before trying again.")) + return - if(use_points) - points -= cost + if(use_points) + points -= cost - purchase_log += "[key_name(usr)] bought [L[1]]." + purchase_log += "[key_name(usr)] bought [product[1]]." - playsound(src, "sound/machines/fax.ogg", 5) - fabricating = 1 - update_overlays() - spawn(30) - var/type_p = L[3] - var/obj/IT = new type_p(get_turf(src)) - H.put_in_any_hand_if_possible(IT) - fabricating = 0 - update_overlays() + playsound(src, "sound/machines/fax.ogg", 5) + fabricating = TRUE + update_overlays() - src.add_fingerprint(usr) - ui_interact(usr) //updates the nanoUI window + addtimer(CALLBACK(src, PROC_REF(spawn_product), product[3], user), 3 SECONDS) +/obj/item/device/portable_vendor/proc/spawn_product(typepath, mob/user) + var/obj/new_item = new typepath(get_turf(src)) + user.put_in_any_hand_if_possible(new_item) + fabricating = FALSE + update_overlays() /obj/item/device/portable_vendor/proc/update_overlays() if(overlays) overlays.Cut() @@ -194,8 +187,7 @@ /obj/item/device/portable_vendor/process() points = min(max_points, points+0.05) - -/obj/item/device/portable_vendor/New() +/obj/item/device/portable_vendor/Initialize() . = ..() START_PROCESSING(SSobj, src) update_overlays() diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index ae5cf3c56403..631ef8fa0e2c 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -65,6 +65,7 @@ /obj/item/device/radio/headset/Destroy() wearer = null + QDEL_NULL_LIST(keys) return ..() /obj/item/device/radio/headset/proc/set_volume_setting() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index dd0ceed3f144..2092ffa108c6 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -216,8 +216,6 @@ if(!(src.wires & WIRE_TRANSMIT)) // The device has to have all its wires and shit intact return - M.last_target_click = world.time - /* Quick introduction: This new radio system uses a very robust FTL signaling technology unoriginally dubbed "subspace" which is somewhat similar to 'blue-space' but can't diff --git a/code/game/objects/items/explosives/mine.dm b/code/game/objects/items/explosives/mine.dm index 6b8c9bccd299..0457b946f27e 100644 --- a/code/game/objects/items/explosives/mine.dm +++ b/code/game/objects/items/explosives/mine.dm @@ -8,8 +8,9 @@ icon_state = "m20" force = 5 w_class = SIZE_SMALL - //layer = MOB_LAYER - 0.1 //You can't just randomly hide claymores under boxes. Booby-trapping bodies is fine though + layer = MOB_LAYER - 0.1 //You can't just randomly hide claymores under boxes. Booby-trapping bodies is fine though throwforce = 5 + health = 60 throw_range = 6 throw_speed = SPEED_VERY_FAST unacidable = TRUE @@ -22,22 +23,59 @@ ) angle = 60 use_dir = TRUE + /// How much shrapnel is distributed when it explodes + var/shrapnel_count = 12 + /// How big of a boom that happens when this detonates? + var/explosive_power = 60 var/iff_signal = FACTION_MARINE var/triggered = FALSE var/hard_iff_lock = FALSE var/obj/effect/mine_tripwire/tripwire - - var/map_deployed = FALSE + /// Whether or not tripwires are enabled + var/use_tripwire = TRUE + /// If the mine needs to be buried. + var/needs_digging = FALSE + /// Is it buried? + var/buried = FALSE + /// Whether or not the mine is prespawned + var/map_prespawn = FALSE + /// After being deployed, how long does the mine take to be armed and ready? Leave false to disable. Use defines + var/arming_time = FALSE + /// If the trigger discriminates on "heavy" targets such as t3s + var/heavy_trigger = FALSE + /// How long should it take to deploy + var/deploy_time = 4 SECONDS + +/obj/item/explosive/mine/get_examine_text(mob/user) + . = ..() + if(buried) + . += "This is buried." + if(heavy_trigger) + . += "It has a heavy trigger." /obj/item/explosive/mine/Initialize() . = ..() - if(map_deployed) + if(map_prespawn) deploy_mine(null) /obj/item/explosive/mine/Destroy() QDEL_NULL(tripwire) . = ..() +// Mines are NOT bullet proof +/obj/item/explosive/mine/bullet_act(obj/item/projectile/boolet) + ..() + health -= boolet.damage + healthcheck() + return TRUE + +/** + * Simply checks the health of the mine, if its zero or below, prime it. + */ +/obj/item/explosive/mine/proc/healthcheck() + if(health <= 0) + prime() + /obj/item/explosive/mine/ex_act() prime() //We don't care about how strong the explosion was. @@ -63,7 +101,9 @@ /obj/item/explosive/mine/attack_self(mob/living/user) if(!..()) return - + if(needs_digging && is_mainship_level(user.z)) + to_chat(user, SPAN_WARNING("This mine needs to be buried in suitable terrain!")) + return if(check_for_obstacles(user)) return @@ -72,9 +112,10 @@ user.visible_message(SPAN_NOTICE("[user] starts deploying [src]."), \ SPAN_NOTICE("You start deploying [src].")) - if(!do_after(user, 40, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) + playsound(loc, 'sound/machines/click.ogg', 25, 1) + if(!do_after(user, deploy_time, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) user.visible_message(SPAN_NOTICE("[user] stops deploying [src]."), \ - SPAN_NOTICE("You stop deploying \the [src].")) + SPAN_NOTICE("You stop deploying [src].")) return if(active) @@ -82,29 +123,46 @@ if(check_for_obstacles(user)) return - - user.visible_message(SPAN_NOTICE("[user] finishes deploying [src]."), \ + if(needs_digging) + playsound(loc, 'sound/weapons/flipblade.ogg', 25, 1) + user.visible_message(SPAN_NOTICE("[user] pulls the pin on [src]."), \ + SPAN_NOTICE("You pull the activation pin and prepare it to be buried.")) + user.drop_inv_item_on_ground(src) + anchored = TRUE + return + else + user.visible_message(SPAN_NOTICE("[user] finishes deploying [src]."), \ SPAN_NOTICE("You finish deploying [src].")) - + if(user) + user.drop_inv_item_on_ground(src) + setDir(user ? user.dir : dir) //The direction it is planted in is the direction the user faces at that time deploy_mine(user) /obj/item/explosive/mine/proc/deploy_mine(mob/user) if(!hard_iff_lock && user) iff_signal = user.faction - cause_data = create_cause_data(initial(name), user) anchored = TRUE playsound(loc, 'sound/weapons/mine_armed.ogg', 25, 1) - if(user) - user.drop_inv_item_on_ground(src) - setDir(user ? user.dir : dir) //The direction it is planted in is the direction the user faces at that time activate_sensors() update_icon() //Disarming -/obj/item/explosive/mine/attackby(obj/item/W, mob/user) - if(HAS_TRAIT(W, TRAIT_TOOL_MULTITOOL)) +/obj/item/explosive/mine/attackby(obj/item/thing, mob/user) + if(needs_digging && HAS_TRAIT(thing, TRAIT_TOOL_SHOVEL) && !active && anchored && !buried) + user.visible_message(SPAN_NOTICE("[user] starts burying [src]."), \ + SPAN_NOTICE("You start burying [src].")) + playsound(user.loc, 'sound/effects/thud.ogg', 40, 1, 6) + if(!do_after(user, 3 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_BUILD)) + user.visible_message(SPAN_WARNING("[user] stops burying [src]."), \ + SPAN_WARNING("You stop burying [src].")) + return + user.visible_message(SPAN_NOTICE("[user] finished burying [src]."), \ + SPAN_NOTICE("You finish burying [src].")) + buried = TRUE + addtimer(CALLBACK(src, PROC_REF(deploy_mine), user), arming_time) + if(HAS_TRAIT(thing, TRAIT_TOOL_MULTITOOL)) if(active) if(user.action_busy) return @@ -112,7 +170,7 @@ user.visible_message(SPAN_NOTICE("[user] starts disarming [src]."), \ SPAN_NOTICE("You start disarming [src].")) else - user.visible_message(SPAN_NOTICE("[user] starts fiddling with \the [src], trying to disarm it."), \ + user.visible_message(SPAN_NOTICE("[user] starts fiddling with [src], trying to disarm it."), \ SPAN_NOTICE("You start disarming [src], but you don't know its IFF data. This might end badly...")) if(!do_after(user, 30, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY)) user.visible_message(SPAN_WARNING("[user] stops disarming [src]."), \ @@ -141,6 +199,7 @@ anchored = FALSE active = FALSE triggered = FALSE + buried = FALSE update_icon() QDEL_NULL(tripwire) @@ -168,38 +227,61 @@ /obj/item/explosive/mine/proc/set_tripwire() - if(!active && !tripwire) + if(!active && !tripwire && use_tripwire) var/tripwire_loc = get_turf(get_step(loc, dir)) tripwire = new(tripwire_loc) tripwire.linked_claymore = src - active = TRUE + active = TRUE + //Mine can also be triggered if you "cross right in front of it" (same tile) -/obj/item/explosive/mine/Crossed(atom/A) +/obj/item/explosive/mine/Crossed(atom/victim) ..() - if(isliving(A)) - var/mob/living/L = A - if(!L.stat == DEAD)//so dragged corpses don't trigger mines. - return - else - try_to_prime(A) + try_to_prime(victim) -/obj/item/explosive/mine/Collided(atom/movable/AM) - try_to_prime(AM) +/obj/item/explosive/mine/Collided(atom/movable/atom_movable) + try_to_prime(atom_movable) +/** + * Proc that notifies a heavy trigger failing to detonate + */ +/obj/item/explosive/mine/proc/heavy_trigger_notify(mob/living/unfortunate_soul) + unfortunate_soul.visible_message(SPAN_DANGER("[icon2html(src, viewers(src))] [name] clicks as [unfortunate_soul] moves on top of it."), \ + SPAN_DANGER("[icon2html(src, unfortunate_soul)] [name] clicks as you move on top of it."), \ + SPAN_DANGER("You hear a click.")) -/obj/item/explosive/mine/proc/try_to_prime(mob/living/L) +/** + * Proc that runs checks before priming occurs + */ +/obj/item/explosive/mine/proc/try_to_prime(mob/living/unfortunate_soul) if(!active || triggered || (customizable && !detonator)) return - if(!istype(L)) + if(!istype(unfortunate_soul)) return - if(L.stat == DEAD) + if(unfortunate_soul.stat == DEAD) return - if(L.get_target_lock(iff_signal) || isrobot(L)) + if(unfortunate_soul.get_target_lock(iff_signal) || isrobot(unfortunate_soul)) return - L.visible_message(SPAN_DANGER("[icon2html(src, viewers(src))] The [name] clicks as [L] moves in front of it."), \ - SPAN_DANGER("[icon2html(src, L)] The [name] clicks as you move in front of it."), \ + if(heavy_trigger && buried) + playsound(loc, 'sound/weapons/flipblade.ogg', 35, 1) + if(isxeno(unfortunate_soul)) + var/mob/living/carbon/xenomorph/xeno = unfortunate_soul + if(xeno.mob_size < MOB_SIZE_BIG) + heavy_trigger_notify(unfortunate_soul) + return + if(prob(75) && ishuman(unfortunate_soul)) + var/mob/living/carbon/human/human = unfortunate_soul + if(!human.wear_suit) + heavy_trigger_notify(unfortunate_soul) + return + if(human.wear_suit.slowdown > SLOWDOWN_ARMOR_HEAVY) // "Nice hustle, 'tons-a-fun'! Next time, eat a salad!" + heavy_trigger_notify(unfortunate_soul) + return + + + unfortunate_soul.visible_message(SPAN_DANGER("[icon2html(src, viewers(src))] [name] clicks as [unfortunate_soul] moves on top of it."), \ + SPAN_DANGER("[icon2html(src, unfortunate_soul)] [name] clicks as you move on top of it."), \ SPAN_DANGER("You hear a click.")) triggered = TRUE @@ -210,11 +292,11 @@ //Note : May not be actual explosion depending on linked method /obj/item/explosive/mine/prime() - set waitfor = 0 if(!customizable) create_shrapnel(loc, 12, dir, angle, , cause_data) - cell_explosion(loc, 60, 20, EXPLOSION_FALLOFF_SHAPE_LINEAR, dir, cause_data) + //so that shrapnel has time to hit mobs before they are knocked over by the explosion + addtimer(CALLBACK(GLOBAL_PROC,GLOBAL_PROC_REF(cell_explosion), loc, explosive_power, 20, EXPLOSION_FALLOFF_SHAPE_LINEAR, dir, cause_data), 0.3 SECONDS) qdel(src) else . = ..() @@ -222,18 +304,27 @@ disarm() -/obj/item/explosive/mine/attack_alien(mob/living/carbon/xenomorph/M) +/obj/item/explosive/mine/attack_alien(mob/living/carbon/xenomorph/beno) if(triggered) //Mine is already set to go off return XENO_NO_DELAY_ACTION - - if(M.a_intent == INTENT_HELP) - to_chat(M, SPAN_XENONOTICE("If you hit this hard enough, it would probably explode.")) + if(beno.a_intent == INTENT_HELP) + if(buried) + to_chat(beno, SPAN_XENONOTICE("This is buried, you need to dig it out to damage it!")) + else + to_chat(beno, SPAN_XENONOTICE("If you hit this hard enough, it would probably explode.")) return XENO_NO_DELAY_ACTION - - M.animation_attack_on(src) - M.visible_message(SPAN_DANGER("[M] has slashed [src]!"), \ - SPAN_DANGER("You slash [src]!")) - playsound(loc, 'sound/weapons/slice.ogg', 25, 1) + if(buried) + beno.animation_attack_on(src) + beno.visible_message(SPAN_NOTICE("[beno] starts digging up [src]."), \ + SPAN_NOTICE("You start digging up [src]. This might end badly...")) + if(!do_after(beno, deploy_time * 1.5, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY)) + beno.visible_message(SPAN_WARNING("[beno] stops disarming [src]."), \ + SPAN_WARNING("You stop disarming [src].")) + return + else + beno.visible_message(SPAN_DANGER("[beno] has slashed [src]!"), \ + SPAN_DANGER("You slash [src]!")) + playsound(loc, 'sound/weapons/slice.ogg', 25, 1) //We move the tripwire randomly in either of the four cardinal directions triggered = TRUE @@ -270,7 +361,7 @@ /obj/effect/mine_tripwire/ex_act(severity) return -/obj/effect/mine_tripwire/Crossed(atom/movable/AM) +/obj/effect/mine_tripwire/Crossed(atom/movable/atom_movable) if(!linked_claymore) qdel(src) return @@ -279,12 +370,12 @@ return if(linked_claymore) - linked_claymore.try_to_prime(AM) + linked_claymore.try_to_prime(atom_movable) /obj/item/explosive/mine/active icon_state = "m20_active" base_icon_state = "m20" - map_deployed = TRUE + map_prespawn = TRUE /obj/item/explosive/mine/no_iff iff_signal = null @@ -293,6 +384,76 @@ iff_signal = null +// Subtype from this to create buried mines. +/obj/item/explosive/mine/bury + use_tripwire = FALSE + needs_digging = TRUE + map_prespawn = FALSE + buried = FALSE + arming_time = 3 SECONDS + use_dir = FALSE + unacidable = TRUE + var/datum/effect_system/spark_spread/sparks = new + +/obj/item/explosive/mine/bury/examine(mob/user) + . = ..() + if(!buried) + . += "\n A small label on the bottom reads: 'To deploy: simply pull the pin to activate it and dig it in with your standard issue e-tool. This munition will automatically arm in [arming_time] seconds after being buried.' " + else + . += SPAN_DANGER("\n This unit is armed and ready") + +/obj/item/explosive/mine/bury/Destroy() + . = ..() + QDEL_NULL(sparks) + +/obj/item/explosive/mine/bury/Initialize(mapload, ...) + . = ..() + sparks.set_up(5, 0, src) + sparks.attach(src) + +/obj/item/explosive/mine/bury/disarm() + . = ..() + QDEL_NULL(sparks) + + +/obj/item/explosive/mine/bury/prime() + . = ..() + QDEL_NULL(sparks) + +/obj/item/explosive/mine/bury/antitank + name = "\improper M19 Anti-Tank Mine" + desc = "This older anti tank mine design from the 21st century was rolled back into service simply due to the currently-used M307 EMP anti tank mines being unable to trigger against the minimally armored vehicles commonly used by CLF. Featuring a 250 pound minimum detonation threshold, it can be employed against all but the lightest of vehicles. Despite being outdated, it can still pack a punch against APCs and lighter vehicles, while its plastic construction prevents detection by simple methods." + icon_state = "antitank_mine" + w_class = SIZE_LARGE + layer = MOB_LAYER - 0.1 //You can't just randomly hide claymores under boxes. Booby-trapping bodies is fine though + explosive_power = 150 + heavy_trigger = TRUE + +/obj/item/explosive/mine/bury/antitank/prime() + set waitfor = 0 + create_shrapnel(loc, shrapnel_count, , ,/datum/ammo/bullet/shrapnel, cause_data) + cell_explosion(loc, explosive_power, 25, EXPLOSION_FALLOFF_SHAPE_EXPONENTIAL_HALF, dir, cause_data) + for(var/mob/living/carbon/M in oview(1, src)) + M.AdjustStun(4) + M.KnockDown(4) + to_chat(M, SPAN_HIGHDANGER("Molten copper rips through your lower body!")) + M.apply_damage(50,BURN) + if(ishuman(M)) + sparks.start() + var/mob/living/carbon/human/H = M + var/obj/limb/L = H.get_limb("l_leg") + var/obj/limb/R = H.get_limb("r_leg") + R.droplimb() + L.droplimb() + playsound(M.loc, "bone_break", 45, TRUE) + playsound(M.loc, "bone_break", 45, TRUE) + for(var/mob/living/living_mob in viewers(7, src)) + if(living_mob.client) + shake_camera(living_mob, 10, 1) + qdel(src) + if(!QDELETED(src)) + disarm() + /obj/item/explosive/mine/pmc name = "\improper M20P Claymore anti-personnel mine" desc = "The M20P Claymore is a directional proximity triggered anti-personnel mine designed by Armat Systems for use by the United States Colonial Marines. It has been modified for use by the Wey-Yu PMC forces." @@ -303,7 +464,7 @@ /obj/item/explosive/mine/pmc/active icon_state = "m20p_active" base_icon_state = "m20p" - map_deployed = TRUE + map_prespawn = TRUE /obj/item/explosive/mine/custom name = "Custom mine" diff --git a/code/game/objects/items/explosives/plastic.dm b/code/game/objects/items/explosives/plastic.dm index 0fffb245bc1a..4c2a1774d4db 100644 --- a/code/game/objects/items/explosives/plastic.dm +++ b/code/game/objects/items/explosives/plastic.dm @@ -62,10 +62,6 @@ /obj/item/explosive/plastic/afterattack(atom/target, mob/user, flag) setDir(get_dir(user, target)) - if(antigrief_protection && user.faction == FACTION_MARINE && explosive_antigrief_check(src, user)) - to_chat(user, SPAN_WARNING("\The [name]'s safe-area accident inhibitor prevents you from planting it!")) - msg_admin_niche("[key_name(user)] attempted to prime \a [name] in [get_area(src)] [ADMIN_JMP(src.loc)]") - return if(user.action_busy || !flag) return @@ -75,6 +71,11 @@ if(!can_place(user, target)) return + if(antigrief_protection && user.faction == FACTION_MARINE && explosive_antigrief_check(src, user)) + to_chat(user, SPAN_WARNING("[name]'s safe-area accident inhibitor prevents you from planting it!")) + msg_admin_niche("[key_name(user)] attempted to prime \a [name] in [get_area(src)] [ADMIN_JMP(src.loc)]") + return + user.visible_message(SPAN_WARNING("[user] is trying to plant [name] on [target]!"), SPAN_WARNING("You are trying to plant [name] on [target]!")) if(ismob(target)) diff --git a/code/game/objects/items/reagent_containers/blood_pack.dm b/code/game/objects/items/reagent_containers/blood_pack.dm index c507b2633828..450cdde2fa00 100644 --- a/code/game/objects/items/reagent_containers/blood_pack.dm +++ b/code/game/objects/items/reagent_containers/blood_pack.dm @@ -6,7 +6,7 @@ desc = "Contains blood used for transfusion." icon = 'icons/obj/items/bloodpack.dmi' icon_state = "empty" - volume = 160 + volume = 300 matter = list("plastic" = 500) flags_atom = CAN_BE_SYRINGED transparent = TRUE diff --git a/code/game/objects/items/reagent_containers/food/cans.dm b/code/game/objects/items/reagent_containers/food/cans.dm index 2ecce5323924..c14ee4d7a4ee 100644 --- a/code/game/objects/items/reagent_containers/food/cans.dm +++ b/code/game/objects/items/reagent_containers/food/cans.dm @@ -224,13 +224,13 @@ . = ..() reagents.add_reagent("lemon_lime", 30) -/obj/item/reagent_container/food/drinks/cans/lemon_lime +/obj/item/reagent_container/food/drinks/cans/iced_tea name = "iced tea can" desc = "Just like the squad redneck's grandmother used to buy." icon_state = "ice_tea_can" center_of_mass = "x=16;y=10" -/obj/item/reagent_container/food/drinks/cans/lemon_lime/Initialize() +/obj/item/reagent_container/food/drinks/cans/iced_tea/Initialize() . = ..() reagents.add_reagent("icetea", 30) diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index 58b9ec88459a..7dae94bfe4eb 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -3243,6 +3243,19 @@ reagents.add_reagent("bread", 4) reagents.add_reagent("sodiumchloride", 12) +/obj/item/reagent_container/food/snacks/kepler_crisps/flamehot + name = "Kepler Flamehot" + desc = "'They're disturbingly good!' Due to an exceptionally well-timed ad campaign with the release of Kepler Flamehot in 2165, the Kepler brand was able to overtake other confectionary Weyland products by quarter three of that year. Contains 0% trans fat." + icon_state = "flamehotkepler" + bitesize = 2 + trash = /obj/item/trash/kepler/flamehot + +/obj/item/reagent_container/food/snacks/kepler_crisps/flamehot/Initialize() + . = ..() + reagents.add_reagent("bread", 4) + reagents.add_reagent("sodiumchloride", 4) + reagents.add_reagent("hotsauce", 8) + //Wrapped candy bars /obj/item/reagent_container/food/snacks/wrapped diff --git a/code/game/objects/items/reagent_containers/pill.dm b/code/game/objects/items/reagent_containers/pill.dm index 47f73c5429b4..de86ad07f53a 100644 --- a/code/game/objects/items/reagent_containers/pill.dm +++ b/code/game/objects/items/reagent_containers/pill.dm @@ -166,10 +166,6 @@ pill_initial_reagents = list("cyanide" = 50) pill_icon_class = "tox" -/obj/item/reagent_container/pill/adminordrazine - pill_desc = "An Adminordrazine pill. It's magic. We don't have to explain it." - pill_initial_reagents = list("adminordrazine" = 50) - /obj/item/reagent_container/pill/stox pill_desc = "A sleeping pill commonly used to treat insomnia." pill_initial_reagents = list("stoxin" = 15) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index cd8ee9621d65..f96903cfb687 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -142,9 +142,9 @@ return TRUE /obj/item/stack/medical/advanced/bruise_pack - name = "advanced trauma kit" - singular_name = "advanced trauma kit" - desc = "An advanced trauma kit for severe injuries." + name = "trauma kit" + singular_name = "trauma kit" + desc = "A trauma kit for severe injuries." icon_state = "traumakit" heal_brute = 12 @@ -209,13 +209,13 @@ stack_id = "soothing herbs" alien = TRUE /obj/item/stack/medical/advanced/ointment - name = "advanced burn kit" - singular_name = "advanced burn kit" - desc = "An advanced treatment kit for severe burns." + name = "burn kit" + singular_name = "burn kit" + desc = "A treatment kit for severe burns." icon_state = "burnkit" heal_burn = 12 - stack_id = "advanced burn kit" + stack_id = "burn kit" /obj/item/stack/medical/advanced/ointment/attack(mob/living/carbon/M as mob, mob/user as mob) if(..()) diff --git a/code/game/objects/items/stacks/predator.dm b/code/game/objects/items/stacks/predator.dm index 1397088cb3c2..e500932b08f6 100644 --- a/code/game/objects/items/stacks/predator.dm +++ b/code/game/objects/items/stacks/predator.dm @@ -15,41 +15,47 @@ max_amount = 8 /obj/item/stack/yautja_rope/attack(mob/living/mob_victim, mob/living/carbon/human/user) - . = ..() - if(!.) - return + if(mob_victim.stat != DEAD) + return ..() + + if(mob_victim.mob_size != MOB_SIZE_HUMAN) + to_chat(user, SPAN_WARNING("[mob_victim] has the wrong body plan to hang up.")) + return TRUE if(!HAS_TRAIT(user, TRAIT_SUPER_STRONG)) to_chat(user, SPAN_WARNING("You're not strong enough to lift [mob_victim] up with a rope. Also, that's kind of fucked up.")) - return - - if(mob_victim.mob_size != MOB_SIZE_HUMAN) - return + return TRUE var/mob/living/carbon/human/victim = mob_victim - if(victim.stat != DEAD) - return if(!do_after(user, 1 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, victim)) - return + return TRUE + + user.visible_message(SPAN_NOTICE("[user] starts to secure \his rope to the ceiling..."), + SPAN_NOTICE("You start securing the rope to the ceiling...")) - to_chat(user, SPAN_NOTICE("You start securing the rope to the ceiling...")) if(do_after(user, 4 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, victim)) var/turf/rturf = get_turf(victim) var/area/rarea = get_area(victim) if(rturf.density) to_chat(user, SPAN_WARNING("They're in a wall!")) - return + return TRUE if(rarea.ceiling == CEILING_NONE) - to_chat(user, SPAN_WARNING("There's no ceiling!")) + to_chat(user, SPAN_WARNING("There's no ceiling to hang them from!")) + return TRUE + user.visible_message(SPAN_NOTICE("[user] secures the rope."), + SPAN_NOTICE("You secure the rope.")) + if(!do_after(user, 1 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, victim)) + return + user.visible_message(SPAN_WARNING("[user] begins hanging [victim] up by the rope..."), + SPAN_NOTICE("You start hanging [victim] up by the rope...")) + if(!do_after(user, 3 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, victim)) return - to_chat(user, SPAN_NOTICE("You secure the rope.")) - to_chat(user, SPAN_NOTICE("You start hanging [victim] by the rope...")) - if(do_after(user, 4 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, victim)) - to_chat(user, SPAN_NOTICE("You finish the hanging of [victim].")) - user.stop_pulling() - victim.get_hung() - use(1) + user.visible_message(SPAN_WARNING("[user] hangs [victim] from the ceiling!"), SPAN_NOTICE("You finish hanging [victim].")) + user.stop_pulling() + victim.get_hung() + use(1) + return TRUE /mob/living/carbon/human/proc/get_hung() animate(src, pixel_y = 9, time = 0.5 SECONDS, easing = SINE_EASING|EASE_OUT) diff --git a/code/game/objects/items/stacks/sandbags.dm b/code/game/objects/items/stacks/sandbags.dm index 84769825a472..56c20720fab1 100644 --- a/code/game/objects/items/stacks/sandbags.dm +++ b/code/game/objects/items/stacks/sandbags.dm @@ -16,7 +16,7 @@ stack_id = "empty sandbags" /obj/item/stack/sandbags_empty/attackby(obj/item/W, mob/user) - if (istype(W, /obj/item/tool/shovel)) + if (HAS_TRAIT(W, TRAIT_TOOL_SHOVEL)) var/obj/item/tool/shovel/ET = W if(ET.dirt_amt) ET.dirt_amt-- diff --git a/code/game/objects/items/stacks/snow.dm b/code/game/objects/items/stacks/snow.dm index ae9fd5193b7e..0707a1e42ff3 100644 --- a/code/game/objects/items/stacks/snow.dm +++ b/code/game/objects/items/stacks/snow.dm @@ -23,7 +23,7 @@ GLOBAL_LIST_INIT(snow_recipes, list( return ..() /obj/item/stack/snow/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/tool/shovel)) + if(HAS_TRAIT(W, TRAIT_TOOL_SHOVEL)) var/obj/item/tool/shovel/ET = W if(isturf(loc)) if(ET.dirt_amt) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 1c3aae767f08..ab424883f34a 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -399,6 +399,36 @@ xeno_icon_state = "marinepack" 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/ammo_rack + name = "\improper IMP ammo rack" + desc = "A bare IMP frame with buckles designed to hold multiple ammo cans, but can fit any cumbersome box thanks to Marine ingenuity. Helps you lug around extra rounds or supplies." + has_gamemode_skin = FALSE + storage_slots = 3 + icon_state = "ammo_pack_0" + can_hold = list(/obj/item/ammo_box) + max_w_class = SIZE_MASSIVE + throw_range = 0 + xeno_types = null + var/base_icon_state = "ammo_pack" + var/move_delay_mult = 0.4 + +/obj/item/storage/backpack/marine/ammo_rack/update_icon() + . = ..() + icon_state = "[base_icon_state]_[length(contents)]" + +/obj/item/storage/backpack/marine/ammo_rack/pickup(mob/user, silent) + . = ..() + RegisterSignal(user, COMSIG_HUMAN_POST_MOVE_DELAY, PROC_REF(handle_movedelay)) + +/obj/item/storage/backpack/marine/ammo_rack/proc/handle_movedelay(mob/user, list/movedata) + SIGNAL_HANDLER + if(locate(/obj/item/storage/backpack/marine/ammo_rack) in user.contents) + movedata["move_delay"] += move_delay_mult + +/obj/item/storage/backpack/marine/ammo_rack/dropped(mob/user, silent) + . = ..() + UnregisterSignal(user, COMSIG_HUMAN_POST_MOVE_DELAY) + /obj/item/storage/backpack/marine/medic name = "\improper USCM corpsman backpack" desc = "A standard-issue backpack worn by USCM medics." diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index d4ac5e5bba30..2717b7c98501 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -69,6 +69,7 @@ /obj/item/storage/firstaid/regular icon_state = "firstaid" + desc = "It's an emergency medical kit containing basic medication and equipment. No training required to use." /obj/item/storage/firstaid/regular/fill_preset_inventory() new /obj/item/device/healthanalyzer(src) @@ -99,7 +100,7 @@ /obj/item/storage/firstaid/toxin name = "toxin first-aid kit" - desc = "Used to treat when you have a high amount of toxins in your body." + desc = "It's an emergency medical kit containing lifesaving anti-toxic medication." icon_state = "antitoxin" item_state = "firstaid-toxin" possible_icons_full = list("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") @@ -134,7 +135,7 @@ /obj/item/storage/firstaid/adv name = "advanced first-aid kit" - desc = "Contains advanced medical treatments." + desc = "Contains more effective methods of medical treatment than a basic first-aid kit, such as burn and trauma kits." icon_state = "advfirstaid" item_state = "firstaid-advanced" diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 5900097e030e..d8555fc71424 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -613,12 +613,13 @@ desc = "It can carry grenades, plastic explosives, mine boxes, and other explosives." icon_state = "large_explosive" storage_slots = 3 - max_w_class = SIZE_MEDIUM + max_w_class = SIZE_LARGE can_hold = list( /obj/item/explosive/plastic, /obj/item/explosive/mine, /obj/item/explosive/grenade, /obj/item/storage/box/explosive_mines, + /obj/item/explosive/mine/bury, ) /obj/item/storage/pouch/explosive/attackby(obj/item/W, mob/user) diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index e1912ea0ac79..dd8f10a51559 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -22,9 +22,7 @@ var/atom/movable/screen/storage/storage_start = null //storage UI var/atom/movable/screen/storage/storage_continue = null var/atom/movable/screen/storage/storage_end = null - var/atom/movable/screen/storage/stored_start = null - var/atom/movable/screen/storage/stored_continue = null - var/atom/movable/screen/storage/stored_end = null + var/datum/item_storage_box/stored_ISB = null // This contains what previously was known as stored_start, stored_continue, and stored_end var/atom/movable/screen/close/closer = null var/foldable = null var/use_sound = "rustle" //sound played when used. null for no sound. @@ -204,6 +202,8 @@ var/list/global/item_storage_box_cache = list() var/atom/movable/screen/storage/start = null var/atom/movable/screen/storage/continued = null var/atom/movable/screen/storage/end = null + /// The index that indentifies me inside item_storage_box_cache + var/index /datum/item_storage_box/New() start = new() @@ -213,6 +213,13 @@ var/list/global/item_storage_box_cache = list() end = new() end.icon_state = "stored_end" +/datum/item_storage_box/Destroy(force, ...) + QDEL_NULL(start) + QDEL_NULL(continued) + QDEL_NULL(end) + item_storage_box_cache[index] = null // Or would it be better to -= src? + return ..() + /obj/item/storage/proc/space_orient_objs(list/obj/item/display_contents) var/baseline_max_storage_space = 21 //should be equal to default backpack capacity var/storage_cap_width = 2 //length of sprite for start and end of the box representing total storage space @@ -243,11 +250,12 @@ var/list/global/item_storage_box_cache = list() for(var/obj/item/O in contents) startpoint = endpoint + 1 endpoint += storage_width * O.get_storage_cost()/max_storage_space + var/isb_index = "[startpoint], [endpoint], [stored_cap_width]" click_border_start.Add(startpoint) click_border_end.Add(endpoint) - if(!item_storage_box_cache["[startpoint], [endpoint], [stored_cap_width]"]) + if(!item_storage_box_cache[isb_index]) var/datum/item_storage_box/box = new() var/matrix/M_start = matrix() var/matrix/M_continue = matrix() @@ -259,16 +267,15 @@ var/list/global/item_storage_box_cache = list() box.start.apply_transform(M_start) box.continued.apply_transform(M_continue) box.end.apply_transform(M_end) - item_storage_box_cache["[startpoint], [endpoint], [stored_cap_width]"] = box + box.index = isb_index + item_storage_box_cache[isb_index] = box - var/datum/item_storage_box/ISB = item_storage_box_cache["[startpoint], [endpoint], [stored_cap_width]"] - stored_start = ISB.start - stored_continue = ISB.continued - stored_end = ISB.end + var/datum/item_storage_box/ISB = item_storage_box_cache[isb_index] + stored_ISB = ISB - storage_start.overlays += src.stored_start - storage_start.overlays += src.stored_continue - storage_start.overlays += src.stored_end + storage_start.overlays += ISB.start + storage_start.overlays += ISB.continued + storage_start.overlays += ISB.end O.screen_loc = "4:[round((startpoint+endpoint)/2)+(2+O.hud_offset)],2:16" O.layer = ABOVE_HUD_LAYER @@ -806,9 +813,7 @@ W is always an item. stop_warning prevents messaging. user may be null.**/ QDEL_NULL(storage_start) QDEL_NULL(storage_continue) QDEL_NULL(storage_end) - QDEL_NULL(stored_start) - QDEL_NULL(stored_continue) - QDEL_NULL(stored_end) + QDEL_NULL(stored_ISB) QDEL_NULL(closer) return ..() diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index f8eb04f5461e..3a5afef6cf1e 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -83,9 +83,3 @@ distribute_pressure = 0 icon_state = "jetpack-black" item_state = "jetpack-black" - -/obj/item/tank/jetpack/carbondioxide/New() - ..() - src.ion_trail = new /datum/effect_system/ion_trail_follow() - src.ion_trail.set_up(src) - diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm index bb68958eb105..c064508c4d7c 100644 --- a/code/game/objects/items/tools/maintenance_tools.dm +++ b/code/game/objects/items/tools/maintenance_tools.dm @@ -501,7 +501,23 @@ flags_equip_slot = SLOT_SUIT_STORE pry_capable = IS_PRY_CAPABLE_FORCE //but not really ///Whether the Maintenance Jack is on crowbar or wrench mode - var/crowbar_mode = TRUE + var/crowbar_mode = TRUE //False for wrench mode + ///Whether you need the "super strength" trait to pry open doors + var/requires_superstrength_pry = TRUE + ///Whether you get the speed penalty from not having engi 3 + var/requires_skills_unbolt = TRUE + ///How long it takes (in seconds) to pry open an airlock + var/prying_time = 3 SECONDS + ///How long it takes (in seconds) to pry open a resin door + var/resin_prying_time = 5 SECONDS + ///How long it takes (in seconds) to unbolt an airlock + var/unbolt_time = 5 SECONDS + ///How long extra will it take (in seconds) people who do not have engi 3 (if requires_skills_unbolt is true) + var/unskilled_unbolt_time = 15 SECONDS + +/obj/item/maintenance_jack/Initialize() + . = ..() + RegisterSignal(src, COMSIG_ITEM_ATTACK_AIRLOCK, PROC_REF(handle_airlock_attack)) /obj/item/maintenance_jack/get_examine_text(mob/user) . = ..() @@ -523,7 +539,6 @@ animate(transform = matrix(180, MATRIX_ROTATE), time = 2, easing = EASE_OUT) REMOVE_TRAIT(src, TRAIT_TOOL_CROWBAR, TRAIT_SOURCE_INHERENT) ADD_TRAIT(src, TRAIT_TOOL_WRENCH, TRAIT_SOURCE_INHERENT) - pry_capable = null return //Switch to crowbar mode | Pry open doors if super strong trait @@ -535,72 +550,115 @@ animate(transform = matrix(360, MATRIX_ROTATE), time = 2, easing = EASE_OUT) REMOVE_TRAIT(src, TRAIT_TOOL_WRENCH, TRAIT_SOURCE_INHERENT) ADD_TRAIT(src, TRAIT_TOOL_CROWBAR, TRAIT_SOURCE_INHERENT) - pry_capable = IS_PRY_CAPABLE_FORCE - -/obj/item/maintenance_jack/afterattack(obj/door, mob/living/user, proximity) - if(!crowbar_mode) //Otherwise it lets you pry open right after unbolting - return - if(!proximity) - return - if(istype(door, /obj/structure/machinery/door/airlock)) - var/obj/structure/machinery/door/airlock/airlock = door - if(airlock.locked) - to_chat(user, SPAN_DANGER("You can't pry open [airlock] while it is bolted shut.")) +/obj/item/maintenance_jack/proc/handle_airlock_attack(source, obj/structure/machinery/door/airlock/attacked_door, mob/user) + . = COMPONENT_CANCEL_AIRLOCK_ATTACK + if(crowbar_mode) + if(attacked_door.locked) //Bolted + to_chat(user, SPAN_DANGER("You can't pry open [attacked_door] while it is bolted shut.")) return - if(!HAS_TRAIT(user, TRAIT_SUPER_STRONG)) //basically IS_PRY_CAPABLE_CROWBAR - if(!airlock.arePowerSystemsOn()) - if(!airlock.operating) - if(airlock.density) - airlock.open(TRUE) - else - airlock.close(TRUE) - else - to_chat(user, SPAN_WARNING("The airlock's motors resist your efforts to force it.")) + if(!attacked_door.arePowerSystemsOn()) //Opens like normal if unpowered + return FALSE + + if(requires_superstrength_pry) + if(!HAS_TRAIT(user, TRAIT_SUPER_STRONG)) //basically IS_PRY_CAPABLE_CROWBAR + return + if(!attacked_door.density) //If its open return - if(!airlock.density) + if(attacked_door.heavy) //Unopenable + to_chat(usr, SPAN_DANGER("You cannot force [attacked_door] open.")) return - if(airlock.heavy) - to_chat(usr, SPAN_DANGER("You cannot force [airlock] open.")) - return FALSE - if(user.action_busy || user.a_intent == INTENT_HARM) + if(user.action_busy) return - user.visible_message(SPAN_DANGER("[user] jams [src] into [airlock] and starts to pry it open."), - SPAN_DANGER("You jam [src] into [airlock] and start to pry it open.")) + user.visible_message(SPAN_DANGER("[user] jams [src] into [attacked_door] and starts to pry it open."), + SPAN_DANGER("You jam [src] into [attacked_door] and start to pry it open.")) playsound(src, "pry", 15, TRUE) - if(!do_after(user, 3 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) + if(!do_after(user, prying_time, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) return - if(!airlock.density) + if(!attacked_door.density) return - if(airlock.locked) - user.visible_message(SPAN_DANGER("[user] fails to force [airlock] open with [src]."), - SPAN_DANGER("You fail to force [airlock] open with [src].")) + if(attacked_door.locked) + user.visible_message(SPAN_DANGER("[user] fails to force [attacked_door] open with [src]."), + SPAN_DANGER("You fail to force [attacked_door] open with [src].")) return - user.visible_message(SPAN_DANGER("[user] forces [airlock] open with [src]."), - SPAN_DANGER("You force [airlock] open with [src].")) - airlock.open(TRUE) + user.visible_message(SPAN_DANGER("[user] forces [attacked_door] open with [src]."), + SPAN_DANGER("You force [attacked_door] open with [src].")) + attacked_door.open(TRUE) + return - else if(istype(door, /obj/structure/mineral_door/resin)) - var/obj/structure/mineral_door/resin/resin_door = door - if(!HAS_TRAIT(user, TRAIT_SUPER_STRONG)) //basically IS_PRY_CAPABLE_CROWBAR - return - if(resin_door.isSwitchingStates) - return - if(!resin_door.density || user.action_busy || user.a_intent == INTENT_HARM) - return + //Wrench Mode + if(!attacked_door.locked) + to_chat(user, SPAN_NOTICE("You cannot disable bolts on a door that is already unbolted.")) + return + + if(requires_skills_unbolt) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_MASTER)) //Engi 3 is much faster + user.visible_message(SPAN_DANGER("[user] begins to search for [attacked_door]'s bolts!"),\ + SPAN_NOTICE("You search for [attacked_door]'s bolts.")) + if(!do_after(user, unskilled_unbolt_time, INTERRUPT_ALL, BUSY_ICON_HOSTILE, src, INTERRUPT_ALL)) //Otherwise it takes an extra 15 seconds + to_chat(user, SPAN_WARNING("You fail to find the bolts on [attacked_door].")) + return + + user.visible_message(SPAN_DANGER("[user] begins to disable [attacked_door]'s bolts!"),\ + SPAN_NOTICE("You start to disable [attacked_door]'s bolts.")) + playsound(attacked_door, "pry", 25, TRUE) - user.visible_message(SPAN_DANGER("[user] jams [src] into [resin_door] and starts to pry it open."), - SPAN_DANGER("You jam [src] into [resin_door] and start to pry it open.")) - playsound(user, 'sound/weapons/wristblades_hit.ogg', 15, TRUE) + if(!do_after(user, unbolt_time, INTERRUPT_ALL, BUSY_ICON_HOSTILE, src, INTERRUPT_ALL)) + to_chat(user, SPAN_WARNING("You decide not to disable the bolts on [attacked_door].")) + return + + user.visible_message(SPAN_DANGER("[user] disables the bolts on [attacked_door]."),\ + SPAN_NOTICE("You unbolt [attacked_door].")) + attacked_door.unlock(TRUE) + return + +/obj/item/maintenance_jack/afterattack(atom/attacked_obj, mob/living/user, proximity) + if(!proximity) + return + + if(istype(attacked_obj, /obj/structure/mineral_door/resin)) + var/obj/structure/mineral_door/resin/resin_door = attacked_obj + + if(resin_door) + if(crowbar_mode) + if(requires_superstrength_pry) + if(!HAS_TRAIT(user, TRAIT_SUPER_STRONG)) //basically IS_PRY_CAPABLE_CROWBAR + return ..() + if(resin_door.isSwitchingStates) + return + if(!resin_door.density || user.action_busy || user.a_intent == INTENT_HARM) + return - if(do_after(user, 5 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE) && resin_door.density) - user.visible_message(SPAN_DANGER("[user] forces [resin_door] open with [src]."), - SPAN_DANGER("You force [resin_door] open with [src].")) - resin_door.Open() + user.visible_message(SPAN_DANGER("[user] jams [src] into [resin_door] and starts to pry it open."), + SPAN_DANGER("You jam [src] into [resin_door] and start to pry it open.")) + playsound(user, 'sound/weapons/wristblades_hit.ogg', 15, TRUE) + if(!do_after(user, resin_prying_time, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) + to_chat(user, SPAN_NOTICE("You stop prying [resin_door] open.")) + return + + user.visible_message(SPAN_DANGER("[user] forces [resin_door] open with [src]."), + SPAN_DANGER("You force [resin_door] open with [src].")) + resin_door.Open() + return + + if(istype(attacked_obj, /turf/open/floor)) + var/turf/open/floor/flooring = attacked_obj + + if(crowbar_mode && user.a_intent == INTENT_HELP) //Only pry flooring on help intent + if(flooring.hull_floor) //no interaction for hulls + return + if(flooring.weeds) + return attackby(src, user) + + to_chat(user, SPAN_WARNING("You forcefully pry off [flooring], destroying it in the process.")) + playsound(src, 'sound/items/Crowbar.ogg', 25, 1) + flooring.make_plating() + return + return ..() /* Welding backpack */ diff --git a/code/game/objects/items/tools/shovel_tools.dm b/code/game/objects/items/tools/shovel_tools.dm index 29bc19f65bbf..900394a37556 100644 --- a/code/game/objects/items/tools/shovel_tools.dm +++ b/code/game/objects/items/tools/shovel_tools.dm @@ -22,6 +22,7 @@ var/shovelspeed = 30 var/dirt_amt = 0 var/dirt_amt_per_dig = 6 + inherent_traits = list(TRAIT_TOOL_SHOVEL) /obj/item/tool/shovel/update_icon() diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 1d0165f12738..b2a66becd869 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -397,7 +397,7 @@ /obj/item/toy/dice name = "d6" - desc = "A dice with six sides." + desc = "A die with six sides." icon = 'icons/obj/items/dice.dmi' icon_state = "d66" w_class = SIZE_TINY @@ -406,11 +406,11 @@ /obj/item/toy/dice/Initialize() . = ..() - icon_state = "[name][rand(sides)]" + icon_state = "[name][rand(1, sides)]" /obj/item/toy/dice/d20 name = "d20" - desc = "A dice with twenty sides." + desc = "A die with twenty sides." icon_state = "d2020" sides = 20 diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 36bb6634f642..d9d40e003c7a 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -68,6 +68,10 @@ name = "Kepler wrapper" icon_state = "kepler" +/obj/item/trash/kepler/flamehot + name = "Kepler Flamehot wrapper" + icon_state = "flamehotkepler" + /obj/item/trash/liquidfood name = "\improper \"LiquidFood\" ration" icon_state = "liquidfood" diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index 6ffb179c4ed0..26a0a59b8090 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -56,3 +56,20 @@ new/obj/item/shard(src.loc) playsound(src, "shatter", 25, 1) qdel(src) + +/obj/item/weapon/dart + name = "red throwing dart" + desc = "A dart. For throwing. This one's red." + icon = 'icons/obj/items/items.dmi' + icon_state = "red_dart" + force = MELEE_FORCE_WEAK + throwforce = MELEE_FORCE_WEAK + throw_speed = SPEED_VERY_FAST + throw_range = 5 + hitsound = 'sound/weapons/bladeslice.ogg' + attack_verb = list("stabbed", "poked", "attacked") + +/obj/item/weapon/dart/green + name = "green throwing dart" + desc = "A dart. For throwing. This one's green." + icon_state = "green_dart" diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 13c6c6b19d07..42a3a2f0b9ea 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -451,3 +451,7 @@ /obj/proc/set_origin_name_prefix(name_prefix) return + +/// override for subtypes that require extra behaviour when spawned from a vendor +/obj/proc/post_vendor_spawn_hook(mob/living/carbon/human/user) + return diff --git a/code/game/objects/prop.dm b/code/game/objects/prop.dm index 8e0791c6c027..e59c24b30d5f 100644 --- a/code/game/objects/prop.dm +++ b/code/game/objects/prop.dm @@ -88,3 +88,141 @@ desc = "It has some sort of a tube at the end of its tail. What the hell is this thing?" icon = 'icons/mob/xenos/effects.dmi' icon_state = "facehugger_impregnated" + +//-----USS Almayer Props -----// +//Put any props that don't function properly, they could function in the future but for now are for looks. This system could be expanded for other maps too. ~Art + +/obj/item/prop/almayer + name = "GENERIC USS ALMAYER PROP" + desc = "THIS SHOULDN'T BE VISIBLE, IF YOU SEE THIS THERE IS A PROBLEM IN THE PROP.DM FILE MAKE A BUG REPORT " + icon = 'icons/obj/structures/props/almayer_props.dmi' + icon_state = "hangarbox" + +/obj/item/prop/almayer/box + name = "metal crate" + desc = "A metal crate used often for storing small electronics that go into dropships" + icon_state = "hangarbox" + w_class = SIZE_LARGE + +/obj/item/prop/almayer/flight_recorder + name = "\improper FR-112 flight recorder" + desc = "A small red box that contains flight data from a dropship while it's on mission. Usually referred to as the black box, although this one comes in bloody red." + icon_state = "flight_recorder" + w_class = SIZE_LARGE + +/obj/item/prop/almayer/flight_recorder/colony + name = "\improper CIR-60 colony information recorder" + desc = "A small red box that records colony announcements, colonist flatlines and other key readouts. Usually refered to the black box, although this one comes in bloody red." + icon_state = "flight_recorder" + w_class = SIZE_LARGE + +/obj/item/prop/almayer/flare_launcher + name = "\improper MJU-77/C case" + desc = "A flare launcher that usually gets mounted onto dropships to help survivability against infrared tracking missiles." + icon_state = "flare_launcher" + w_class = SIZE_SMALL + +/obj/item/prop/almayer/chaff_launcher + name = "\improper RR-247 Chaff case" + desc = "A chaff launcher that usually gets mounted onto dropships to help survivability against radar tracking missiles." + icon_state = "chaff_launcher" + w_class = SIZE_MEDIUM + +/obj/item/prop/almayer/handheld1 + name = "small handheld" + desc = "A small piece of electronic doodads" + icon_state = "handheld1" + w_class = SIZE_SMALL + +/obj/item/prop/almayer/comp_closed + name = "dropship maintenance computer" + desc = "A closed dropship maintenance computer that technicians and pilots use to find out what's wrong with a dropship. It has various outlets for different systems." + icon_state = "hangar_comp" + w_class = SIZE_LARGE + +/obj/item/prop/almayer/comp_open + name = "dropship maintenance computer" + desc = "An opened dropship maintenance computer, it seems to be off however. It's used by technicians and pilots to find damaged or broken systems on a dropship. It has various outlets for different systems." + icon_state = "hangar_comp_open" + w_class = SIZE_LARGE + +//lore fluff books and magazines + +/obj/item/prop/magazine + name = "generic prop magazine" + desc = "A Magazine with a picture of a pretty girl on it..wait isn't that my mom?" + icon = 'icons/obj/structures/props/posters.dmi' + icon_state = "poster15" + throw_speed = SPEED_FAST + throw_range = 5 + w_class = SIZE_MEDIUM + attack_verb = list("bashed", "whacked", "educated") + pickup_sound = "sound/handling/book_pickup.ogg" + drop_sound = "sound/handling/book_pickup.ogg" + black_market_value = 15 + +//random magazines +/obj/item/prop/magazine/dirty + name = "Dirty Magazine" + desc = "Wawaweewa." + icon_state = "poster17" + +/obj/item/prop/magazine/dirty/torn + name = "\improper torn magazine page" + desc = "Hubba hubba." + +/obj/item/prop/magazine/dirty/torn/alt + icon_state = "poster3" + + +//books +/obj/item/prop/magazine/book + name = "generic prop book" + desc = "some generic hardcover book, probably sucked" + icon = 'icons/obj/items/books.dmi' + icon_state = "bookSpaceLaw" + +/obj/item/prop/magazine/book/spacebeast + name = "\improper Space Beast, by Robert Morse" + desc = "An autobiography focusing on the events of 'Fury 161' in August 2179 following the arrival of 'Ellen Ripley' and an unknown alien creature known as 'The Dragon' the books writing is extremely crude and was book banned shorty after publication." + +/obj/item/prop/magazine/book/borntokill + name = "\improper Born to Kill" + desc = "An autobiography penned by Derik A.W. Tomahawk it recounts his service in the USCM. The book was harshly criticised for its bland and uncreative writing and wasn't well received by the general public or members of the UA military. However, artificial soldiers typically value the information contained within." + +/obj/item/prop/magazine/book/bladerunner + name = "\improper Bladerunner: A True Detectives Story" + desc = "In the dark undercity of Luna 2119, blade runner Richard Ford is called out of retirement to terminate a cult of replicants who have escaped Earth seeking the meaning of their existence." + +/obj/item/prop/magazine/book/starshiptroopers + name = "Starship Troopers" + desc = "Written by Robert A. Heinlein, this book really missed the mark when it comes to the individual equipment it depicts 'troopers' having, but it's still issued to every marine in basic so it must have some value." + +/obj/item/prop/magazine/book/theartofwar + name = "The Art of War" + desc = "A treatise on war written by Sun Tzu a great general, strategist, and philosopher from ancient Earth. This book is on the Commandant of the United States Colonial Marine Corps reading list and most officers can be found in possession of a copy. Most officers who've read it claim to know a little bit more about fighting than most enlisted but results may vary. " + +//boots magazine +/obj/item/prop/magazine/boots + name = "generic Boots! magazine" + desc = "The only official USCM magazine!" + +/obj/item/prop/magazine/boots/n117 + name = "Boots!: Issue No.117" + desc = "The only official USCM magazine, the headline reads 'STOP CANNING' the short paragraph further explains the dangers of marines throwing CN-20 Nerve gas into bathrooms as a prank." + +/obj/item/prop/magazine/boots/n150 + name = "Boots!: Issue No.150" + desc = "The only official USCM magazine, the headline reads 'UPP Rations, The truth.' the short paragraph further explains UPP field rations aren't standardized and are produced at a local level. Because of this, captured and confiscated UPP rations have included some odd choices such as duck liver, century eggs, lutefisk, pickled pig snout, canned tripe, and dehydrated candied radish snacks." + +/obj/item/prop/magazine/boots/n160 + name = "Boots!: Issue No.160" + desc = "The only official USCM magazine, the headline reads 'Corporate Liaison 'emotionally exhausted' from screwing so many people over.'" + +/obj/item/prop/magazine/boots/n054 + name = "Boots!: Issue No.54" + desc = "The only official USCM magazine, the headline reads 'ARMAT strikes back against litigants in M41A-MK2 self cleaning case'" + +/obj/item/prop/magazine/boots/n055 + name = "Boots!: Issue No.55" + desc = "The only official USCM magazine, the headline reads 'TEN tips to keep your UD4 cockpit both safer and more relaxing.'" diff --git a/code/game/objects/structures/barricade/misc.dm b/code/game/objects/structures/barricade/misc.dm index 5e0958f974b1..dc792f594f13 100644 --- a/code/game/objects/structures/barricade/misc.dm +++ b/code/game/objects/structures/barricade/misc.dm @@ -30,7 +30,7 @@ to_chat(user, "You can't get near that, it's melting!") return //Removing the barricades - if(istype(W, /obj/item/tool/shovel) && user.a_intent != INTENT_HARM) + if(HAS_TRAIT(W, TRAIT_TOOL_SHOVEL) && user.a_intent != INTENT_HARM) var/obj/item/tool/shovel/ET = W if(ET.folded) return diff --git a/code/game/objects/structures/barricade/sandbags.dm b/code/game/objects/structures/barricade/sandbags.dm index d3dce285ab92..83aa14b48be2 100644 --- a/code/game/objects/structures/barricade/sandbags.dm +++ b/code/game/objects/structures/barricade/sandbags.dm @@ -68,7 +68,7 @@ to_chat(user, "You can't get near that, it's melting!") return - if(istype(W, /obj/item/tool/shovel) && user.a_intent != INTENT_HARM) + if(HAS_TRAIT(W, TRAIT_TOOL_SHOVEL) && user.a_intent != INTENT_HARM) var/obj/item/tool/shovel/ET = W if(!ET.folded) user.visible_message(SPAN_NOTICE("[user] starts disassembling [src]."), \ @@ -90,7 +90,7 @@ user.visible_message(SPAN_NOTICE("[user] starts adding more [SB] to [src]."), \ SPAN_NOTICE("You start adding sandbags to [src].")) for(var/i = build_stage to BARRICADE_SANDBAG_5) - if(build_stage >= BARRICADE_SANDBAG_5 || !do_after(user, 5, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, src) || build_stage >= BARRICADE_SANDBAG_5) + if(build_stage >= BARRICADE_SANDBAG_5 || !do_after(user, 5, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, src) || build_stage >= BARRICADE_SANDBAG_5 || SB.amount == 0) break SB.use(1) increment_build_stage() diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 3449c9d74278..05355feeb154 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -31,10 +31,7 @@ /obj/structure/closet/Initialize() . = ..() if(!opened && fill_from_loc) // if closed, any item at the crate's loc is put in the contents - for(var/obj/item/I in src.loc) - if(I.density || I.anchored || I == src) - continue - I.forceMove(src) + store_items() GLOB.closet_list += src flags_atom |= USES_HEARING diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 89393ee9a43b..7848aaba4897 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -22,7 +22,12 @@ /obj/structure/closet/emcloset/Initialize() . = ..() +#ifndef UNIT_TESTS switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10, "nothing" = 0, "delete" = 0))) +#else + var/test = "both" + switch (test) // We don't want randomness in tests +#endif if ("small") new /obj/item/tank/emergency_oxygen(src) new /obj/item/tank/emergency_oxygen(src) @@ -51,12 +56,12 @@ // teehee - Ah, tg coders... if ("delete") - qdel(src) + return INITIALIZE_HINT_QDEL //If you want to re-add fire, just add "fire" = 15 to the pick list. /*if ("fire") new /obj/structure/closet/firecloset(src.loc) - qdel(src)*/ + return INITIALIZE_HINT_QDEL*/ /obj/structure/closet/emcloset/legacy/Initialize() . = ..() diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index b91543d9ec5c..430a2df52e84 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -64,13 +64,22 @@ M.animation_attack_on(src) unpack() M.visible_message(SPAN_DANGER("[M] smashes [src] apart!"), \ - SPAN_DANGER("You smash [src] apart!"), 5, CHAT_TYPE_XENO_COMBAT) + SPAN_DANGER("You smash [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION /obj/structure/largecrate/ex_act(power) if(power >= EXPLOSION_THRESHOLD_VLOW) unpack() +/obj/structure/largecrate/proc/take_damage(damage) + health -= damage + if(health <= 0) + unpack() + +/obj/structure/largecrate/bullet_act(obj/item/projectile/P) + take_damage(P.calculate_damage(P.damage)) + return TRUE + /obj/structure/largecrate/mule icon_state = "mulecrate" diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index aa3325d8e3f6..b19fc4788c01 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -80,10 +80,29 @@ PLANT_CUT_MACHETE = 3 = Needs at least a machete to be cut down icon = 'icons/obj/structures/props/pinetrees.dmi' icon_state = "pine_c" +//dead /obj/structure/flora/tree/dead icon = 'icons/obj/structures/props/deadtrees.dmi' + +/obj/structure/flora/tree/dead/tree_1 icon_state = "tree_1" +/obj/structure/flora/tree/dead/tree_2 + icon_state = "tree_2" + +/obj/structure/flora/tree/dead/tree_3 + icon_state = "tree_3" + +/obj/structure/flora/tree/dead/tree_4 + icon_state = "tree_4" + +/obj/structure/flora/tree/dead/tree_5 + icon_state = "tree_5" + +/obj/structure/flora/tree/dead/tree_6 + icon_state = "tree_6" + +//joshua /obj/structure/flora/tree/joshua name = "joshua tree" desc = "A tall tree covered in spiky-like needles, covering its trunk." @@ -128,14 +147,25 @@ ICE GRASS icon_state = "" variations = 3 +//brown /obj/structure/flora/grass/ice/brown - icon_state = "snowgrassbb_1" icon_tag = "snowgrassbb" +/obj/structure/flora/grass/ice/brown/snowgrassbb_1 + icon_state = "snowgrassbb_1" + +/obj/structure/flora/grass/ice/brown/snowgrassbb_2 + icon_state = "snowgrassbb_2" + +/obj/structure/flora/grass/ice/brown/snowgrassbb_3 + icon_state = "snowgrassbb_3" + +//green /obj/structure/flora/grass/ice/green - icon_state = "snowgrassgb_1" icon_tag = "snowgrassgb" + icon_state = "snowgrassgb_1" +//both /obj/structure/flora/grass/ice/both icon_state = "snowgrassall_1" icon_tag = "snowgrassall" @@ -168,13 +198,80 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. */ +//Light desert grass + /obj/structure/flora/grass/desert icon = 'icons/obj/structures/props/dam.dmi' + +// to replace with +/obj/structure/flora/grass/desert/lightgrass_1 icon_state = "lightgrass_1" -/obj/structure/flora/grass/desert/heavy +/obj/structure/flora/grass/desert/lightgrass_2 + icon_state = "lightgrass_2" + +/obj/structure/flora/grass/desert/lightgrass_3 + icon_state = "lightgrass_3" + +/obj/structure/flora/grass/desert/lightgrass_4 + icon_state = "lightgrass_4" + +/obj/structure/flora/grass/desert/lightgrass_5 + icon_state = "lightgrass_5" + +/obj/structure/flora/grass/desert/lightgrass_6 + icon_state = "lightgrass_6" + +/obj/structure/flora/grass/desert/lightgrass_7 + icon_state = "lightgrass_7" + +/obj/structure/flora/grass/desert/lightgrass_8 + icon_state = "lightgrass_8" + +/obj/structure/flora/grass/desert/lightgrass_9 + icon_state = "lightgrass_9" + +/obj/structure/flora/grass/desert/lightgrass_10 + icon_state = "lightgrass_10" + +/obj/structure/flora/grass/desert/lightgrass_11 + icon_state = "lightgrass_11" + +/obj/structure/flora/grass/desert/lightgrass_12 + icon_state = "lightgrass_12" + +//heavy desert grass + +/obj/structure/flora/grass/desert/heavygrass_1 icon_state = "heavygrass_1" +/obj/structure/flora/grass/desert/heavygrass_2 + icon_state = "heavygrass_2" + +/obj/structure/flora/grass/desert/heavygrass_3 + icon_state = "heavygrass_3" + +/obj/structure/flora/grass/desert/heavygrass_4 + icon_state = "heavygrass_4" + +/obj/structure/flora/grass/desert/heavygrass_5 + icon_state = "heavygrass_5" + +/obj/structure/flora/grass/desert/heavygrass_6 + icon_state = "heavygrass_6" + +/obj/structure/flora/grass/desert/heavygrass_7 + icon_state = "heavygrass_7" + +/obj/structure/flora/grass/desert/heavygrass_8 + icon_state = "heavygrass_8" + +/obj/structure/flora/grass/desert/heavygrass_9 + icon_state = "heavygrass_9" + +/obj/structure/flora/grass/desert/heavygrass_10 + icon_state = "heavygrass_10" + /* TALLGRASS - SPREADS FIRES @@ -417,7 +514,50 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. icon = 'icons/obj/structures/props/plants.dmi' icon_state = "pottedplant_26" density = FALSE + var/stashed_item + var/static/possible_starting_items = list(/obj/item/clothing/mask/cigarette/weed, /obj/item/clothing/mask/cigarette, /obj/item/clothing/mask/cigarette/bcigarette) //breaking bad reference + /// For things that might affect someone/everyone's round if hidden. + var/static/blocked_atoms = list(/obj/item/device/cotablet, /obj/item/card/id) + var/static/blacklist_typecache + +/obj/structure/flora/pottedplant/Initialize(mapload) + . = ..() + if(!blacklist_typecache) + blacklist_typecache = typecacheof(blocked_atoms) + + if(prob(5)) + var/prestashed_item = pick(possible_starting_items) + stashed_item = new prestashed_item(src) + +/obj/structure/flora/pottedplant/attackby(obj/item/stash, mob/user) + if(stashed_item) + to_chat(user, SPAN_WARNING("There's already something stashed here!")) + return + + if(is_type_in_typecache(stash, blacklist_typecache)) + to_chat(user, SPAN_WARNING("You probably shouldn't hide [stash] in [src].")) + return + + if(stash.w_class == SIZE_TINY) + user.drop_inv_item_to_loc(stash, src) + stashed_item = stash + user.visible_message("[user] puts something in [src].", "You hide [stash] in [src].") + return + + to_chat(user, SPAN_WARNING("[stash] is too big to fit into [src]!")) + +/obj/structure/flora/pottedplant/attack_hand(mob/user) + if(!stashed_item) + return + user.put_in_hands(contents[1]) + user.visible_message( "[user] takes something out of [src].", "You take [stashed_item] from [src].") + stashed_item = null + +/obj/structure/flora/pottedplant/Destroy() + if(stashed_item) + QDEL_NULL(stashed_item) + return ..() /obj/structure/flora/pottedplant/random icon_tag = "pottedplant" variations = "30" @@ -438,7 +578,6 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. layer = ABOVE_XENO_LAYER projectile_coverage = PROJECTILE_COVERAGE_NONE - /obj/structure/flora/jungle/shrub desc = "Pretty thick scrub, it'll take something sharp and a lot of determination to clear away." icon_state = "grass4" @@ -448,6 +587,21 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. desc = "Some kind of bizarre alien tree. It oozes with a sickly yellow sap." icon_state = "plantbot1" +/obj/structure/flora/jungle/cart_wreck + name = "old janicart" + desc = "Doesn't look like it'll do much cleaning any more." + icon_state = "cart_wreck" + +/obj/structure/flora/jungle/alienplant1 + name = "strange tree" + desc = "Some kind of bizarre alien tree. It oozes with a sickly yellow sap." + icon_state = "alienplant1" + luminosity = 2 + +/obj/structure/flora/jungle/alienplant1/Destroy() + SetLuminosity(0) + return ..() + /obj/structure/flora/jungle/planttop1 name = "strange tree" desc = "Some kind of bizarre alien tree. It oozes with a sickly yellow sap." @@ -459,16 +613,29 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. icon_state = "" //will this break it?? - Nope density = TRUE +//light vines /obj/structure/flora/jungle/vines name = "vines" desc = "A mass of twisted vines." icon = 'icons/effects/spacevines.dmi' - icon_state = "light_1" icon_tag = "light" variations = 3 cut_level = PLANT_CUT_MACHETE fire_flag = FLORA_BURN_NO_SPREAD +/obj/structure/flora/jungle/vines/light_1 + icon_state = "light_1" + icon_tag = "light_1" + +/obj/structure/flora/jungle/vines/light_2 + icon_state = "light_2" + icon_tag = "light_2" + +/obj/structure/flora/jungle/vines/light_3 + icon_state = "light_3" + icon_tag = "light_3" + +//heavy hide you /obj/structure/flora/jungle/vines/heavy desc = "A thick, coiled mass of twisted vines." opacity = TRUE diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index 9e4343c7c137..f2e6b172ad88 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -265,7 +265,7 @@ GLOB.hijack_bustable_ladders += src /obj/structure/ladder/fragile_almayer/Destroy() - GLOB.hijack_bustable_windows -= src + GLOB.hijack_bustable_ladders -= src return ..() /obj/structure/ladder/fragile_almayer/deconstruct() diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm index 2405779b1a00..f6905d4d044d 100644 --- a/code/game/objects/structures/props.dm +++ b/code/game/objects/structures/props.dm @@ -648,6 +648,10 @@ health = 150 luminosity = 6 +/obj/structure/prop/brazier/Destroy() + SetLuminosity(0) + return ..() + /obj/structure/prop/brazier/Initialize() . = ..() if(luminosity) @@ -736,7 +740,7 @@ icon_state = "small_wire" /obj/structure/prop/ice_colony/poly_kevlon_roll - name = "poly_kevlon roll" + name = "plastic roll" desc = "A big roll of poly-kevlon plastic used in temporary shelter construction." icon_state = "kevlon_roll" anchored = FALSE diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm index 9fbd9b189c64..f20a7cfc25d6 100644 --- a/code/game/objects/structures/reagent_dispensers.dm +++ b/code/game/objects/structures/reagent_dispensers.dm @@ -38,6 +38,11 @@ . += SPAN_NOTICE(" Nothing.") if(reagents) . += SPAN_NOTICE("Total volume: [reagents.total_volume] / [reagents.maximum_volume].") + if(dispensing) + . += SPAN_NOTICE("\nTransfer mode: Dispensing") + else + . += SPAN_NOTICE("\nTransfer mode: Filling") + . += SPAN_NOTICE("Transfer rate: [amount_per_transfer_from_this] units") /obj/structure/reagent_dispensers/Destroy() playsound(src.loc, 'sound/effects/slosh.ogg', 50, 1, 3) diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 70240452655b..cacb8232fd60 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -592,3 +592,9 @@ desc = "An unbelievably creepy cat clock that surveys the room with every tick and every tock." icon = 'icons/obj/structures/props/catclock.dmi' icon_state = "cat_clock_motion" + +/obj/structure/sign/dartboard + name = "dartboard" + desc = "A dartboard, secured with a nail and a string. It has bullet holes and knife stab marks over and around it." + icon = 'icons/obj/structures/props/props.dmi' + icon_state = "dart_board" 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 db83b378e186..bda4b60ca21e 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -330,9 +330,8 @@ var/global/list/activated_medevac_stretchers = list() if(buckled_mob || buckled_bodybag) overlays += image("icon_state"="stretcher_box","layer"=LYING_LIVING_MOB_LAYER + 0.1) - -/obj/structure/bed/medevac_stretcher/verb/activate_medevac_beacon() - set name = "Activate medevac" +/obj/structure/bed/medevac_stretcher/verb/toggle_medevac_beacon_verb() + set name = "Toggle medevac" set desc = "Toggle the medevac beacon inside the stretcher." set category = "Object" set src in oview(1) @@ -370,13 +369,10 @@ var/global/list/activated_medevac_stretchers = list() to_chat(user, SPAN_WARNING("[src] must be in the open or under a glass roof.")) return - if(buckled_mob || buckled_bodybag) - stretcher_activated = TRUE - activated_medevac_stretchers += src - to_chat(user, SPAN_NOTICE("You activate [src]'s beacon.")) - update_icon() - else - to_chat(user, SPAN_WARNING("You need to attach something to [src] before you can activate its beacon yet.")) + stretcher_activated = TRUE + activated_medevac_stretchers += src + to_chat(user, SPAN_NOTICE("You activate [src]'s beacon.")) + update_icon() /obj/item/roller/medevac name = "medevac stretcher" @@ -385,6 +381,13 @@ var/global/list/activated_medevac_stretchers = list() rollertype = /obj/structure/bed/medevac_stretcher matter = list("plastic" = 5000, "metal" = 5000) +/obj/item/roller/medevac/deploy_roller(mob/user, atom/location) + var/obj/structure/bed/medevac_stretcher/medevac_stretcher = new rollertype(location) + medevac_stretcher.add_fingerprint(user) + user.temp_drop_inv_item(src) + qdel(src) + medevac_stretcher.toggle_medevac_beacon(user) + //bedroll /obj/structure/bed/bedroll name = "bedroll" diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 918c58c71a9e..7537d47c941f 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -37,6 +37,8 @@ if(!picked_up_item) return var/mob/living/carbon/human/H = over + if(usr != H) + return if(!CAN_PICKUP(H, src)) return if(buckled_mob) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 08777d4ddc82..658ee44a2638 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -444,6 +444,15 @@ unslashable = TRUE unacidable = TRUE +/obj/structure/window/reinforced/ultra/initialize_pass_flags(datum/pass_flags_container/PF) + . = ..() + if (PF) + PF.flags_can_pass_all = NONE + PF.flags_can_pass_front = NONE + PF.flags_can_pass_behind = PASS_OVER^(PASS_OVER_ACID_SPRAY) + flags_can_pass_front_temp = NONE + flags_can_pass_behind_temp = NONE + /obj/structure/window/reinforced/ultra/Initialize() . = ..() GLOB.hijack_bustable_windows += src @@ -833,7 +842,7 @@ desc = "A glass window with a special rod matrix inside a wall frame. This one has an automatic shutter system to prevent any atmospheric breach." health = 200 //icon_state = "rwindow0_debug" //Uncomment to check hull in the map editor - var/triggered = 0 //indicates if the shutters have already been triggered + var/triggered = FALSE //indicates if the shutters have already been triggered /obj/structure/window/framed/prison/reinforced/hull/Destroy() spawn_shutters() @@ -842,8 +851,8 @@ /obj/structure/window/framed/prison/reinforced/hull/proc/spawn_shutters(from_dir = 0) if(triggered) return - else - triggered = 1 + + triggered = TRUE for(var/direction in cardinal) if(direction == from_dir) continue //doesn't check backwards for(var/obj/structure/window/framed/prison/reinforced/hull/W in get_step(src,direction) ) @@ -854,8 +863,7 @@ P.setDir(SOUTH) else P.setDir(EAST) - spawn(0) - P.close() + P.close() /obj/structure/window/framed/prison/cell name = "cell window" diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 58b2a2dedca1..dcc854bfa71d 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -521,6 +521,7 @@ var/datum/controller/supply/supply_controller = new() qdel(C) // Sell manifests. + var/screams = FALSE for(var/atom/movable/movable_atom in area_shuttle) if(istype(movable_atom, /obj/item/paper/manifest)) var/obj/item/paper/manifest/M = movable_atom @@ -531,6 +532,7 @@ var/datum/controller/supply/supply_controller = new() if(black_market_enabled) var/points_to_add = get_black_market_value(movable_atom) if(points_to_add == KILL_MENDOZA) + screams = TRUE kill_mendoza() black_market_sold_items[movable_atom.type] += 1 black_market_points += points_to_add @@ -538,6 +540,7 @@ var/datum/controller/supply/supply_controller = new() // Don't disintegrate humans! Maul their corpse instead. >:) if(ishuman(movable_atom)) var/timer = 0.5 SECONDS + screams = TRUE for(var/index in 1 to 10) timer += 0.5 SECONDS addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(maul_human), movable_atom), timer) @@ -545,11 +548,11 @@ var/datum/controller/supply/supply_controller = new() // Delete everything else. else qdel(movable_atom) -/proc/maul_human(mob/living/carbon/human/mauled_human) - - for(var/atom/computer as anything in supply_controller.bound_supply_computer_list) - computer.balloon_alert_to_viewers("you hear horrifying noises coming from the elevator!") + if(screams) + for(var/atom/computer as anything in bound_supply_computer_list) + computer.balloon_alert_to_viewers("you hear horrifying noises coming from the elevator!") +/proc/maul_human(mob/living/carbon/human/mauled_human) mauled_human.visible_message(SPAN_HIGHDANGER("The machinery crushes [mauled_human]"), SPAN_HIGHDANGER("The elevator machinery is CRUSHING YOU!")) if(mauled_human.stat != DEAD) @@ -1169,8 +1172,6 @@ var/datum/controller/supply/supply_controller = new() /datum/controller/supply/proc/kill_mendoza() if(!mendoza_status) return //cant kill him twice - for(var/atom/computer as anything in bound_supply_computer_list) - computer.balloon_alert_to_viewers("you hear horrifying noises coming from the elevator!") mendoza_status = FALSE // he'll die soon enough, and in the meantime will be too busy to handle requests. diff --git a/code/game/turfs/auto_turf.dm b/code/game/turfs/auto_turf.dm index 4556289da9ea..733089a0dfed 100644 --- a/code/game/turfs/auto_turf.dm +++ b/code/game/turfs/auto_turf.dm @@ -316,6 +316,9 @@ icon = 'icons/turf/floors/auto_shale.dmi' icon_prefix = "shale" +/turf/open/auto_turf/shale/is_weedable() + return SEMI_WEEDABLE + /turf/open/auto_turf/shale/get_dirt_type() return DIRT_TYPE_SHALE diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm index 483f3250f8c5..92bce17e50f6 100644 --- a/code/game/turfs/closed.dm +++ b/code/game/turfs/closed.dm @@ -230,6 +230,7 @@ name = "wall" icon_state = "wall1" icon = 'icons/turf/shuttle.dmi' + layer = ABOVE_TURF_LAYER /turf/closed/shuttle/is_weedable() return FULLY_WEEDABLE diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 41ada18c1552..baebe7cae5c8 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -327,10 +327,43 @@ /turf/open/gm/grass name = "grass" - icon_state = "grass1" baseturfs = /turf/open/gm/grass scorchable = "grass1" +/turf/open/gm/grass/grass1 + icon_state = "grass1" + +/turf/open/gm/grass/grass2 + icon_state = "grass2" + +/turf/open/gm/grass/grassbeach + icon_state = "grassbeach" + +/turf/open/gm/grass/grassbeach/north + +/turf/open/gm/grass/grassbeach/south + dir = 1 + +/turf/open/gm/grass/grassbeach/west + dir = 4 + +/turf/open/gm/grass/grassbeach/east + dir = 8 + +/turf/open/gm/grass/gbcorner + icon_state = "gbcorner" + +/turf/open/gm/grass/gbcorner/north_west + +/turf/open/gm/grass/gbcorner/south_east + dir = 1 + +/turf/open/gm/grass/gbcorner/south_west + dir = 4 + +/turf/open/gm/grass/gbcorner/north_east + dir = 8 + /turf/open/gm/grass/Initialize(mapload, ...) . = ..() @@ -357,6 +390,45 @@ baseturfs = /turf/open/gm/dirtgrassborder scorchable = "grass1" +/turf/open/gm/dirtgrassborder/north + +/turf/open/gm/dirtgrassborder/south + dir = 1 + +/turf/open/gm/dirtgrassborder/west + dir = 4 + +/turf/open/gm/dirtgrassborder/east + dir = 8 + +/turf/open/gm/dirtgrassborder/grassdirt_corner + icon_state = "grassdirt_corner" + +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west + +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east + dir = 1 + +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east + dir = 4 + +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west + dir = 8 + +/turf/open/gm/dirtgrassborder/grassdirt_corner2 + icon_state = "grassdirt_corner2" + +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west + +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east + dir = 1 + +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east + dir = 4 + +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west + dir = 8 + /turf/open/gm/dirtgrassborder/Initialize(mapload, ...) . = ..() @@ -527,6 +599,44 @@ baseturfs = /turf/open/gm/coast supports_surgery = FALSE +/turf/open/gm/coast/north + +/turf/open/gm/coast/south + dir = 1 + +/turf/open/gm/coast/west + dir = 4 + +/turf/open/gm/coast/east + dir = 8 + +/turf/open/gm/coast/beachcorner + icon_state = "beachcorner" + +/turf/open/gm/coast/beachcorner/north_west + +/turf/open/gm/coast/beachcorner/north_east + dir = 1 + +/turf/open/gm/coast/beachcorner/south_east + dir = 4 + +/turf/open/gm/coast/beachcorner/south_west + dir = 8 + +/turf/open/gm/coast/beachcorner2 + icon_state = "beachcorner2" + +/turf/open/gm/coast/beachcorner2/north_west + +/turf/open/gm/coast/beachcorner2/north_east + dir = 1 + +/turf/open/gm/coast/beachcorner2/south_west + dir = 4 + +/turf/open/gm/coast/beachcorner2/south_east + dir = 8 /turf/open/gm/riverdeep name = "river" diff --git a/code/game/turfs/strata.dm b/code/game/turfs/strata.dm index e48f6bf8bc40..a89f98a732ae 100644 --- a/code/game/turfs/strata.dm +++ b/code/game/turfs/strata.dm @@ -5,6 +5,13 @@ /turf/open/gm/grass/weedable/is_weedable() return FULLY_WEEDABLE +//just in case + +/turf/open/gm/grass/grass1/weedable //inherit from general turfs + +/turf/open/gm/grass/grass1/weedable/is_weedable() + return FULLY_WEEDABLE + /turf/open/gm/dirtgrassborder/weedable /turf/open/gm/dirtgrassborder/weedable/is_weedable() //Gotta have our sexy grass borders be weedable. diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 1012944f4518..e686e7e2ee11 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -245,6 +245,7 @@ if(!istype(A)) return + SEND_SIGNAL(src, COMSIG_TURF_ENTERED, A) SEND_SIGNAL(A, COMSIG_MOVABLE_TURF_ENTERED, src) // Let explosions know that the atom entered diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index b1531d26e3c9..702cbd35560c 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -412,6 +412,8 @@ walltype = WALL_CULT color = "#3c3434" +/turf/closed/wall/cult/make_girder(destroyed_girder) + return /turf/closed/wall/vault icon_state = "rockvault" @@ -702,6 +704,12 @@ var/datum/cause_data/construction_data flags_turf = TURF_ORGANIC +/turf/closed/wall/resin/Initialize(mapload) + . = ..() + + for(var/obj/effect/alien/weeds/node/weed_node in contents) + qdel(weed_node) + /turf/closed/wall/resin/pillar name = "resin pillar segment" hull = TRUE diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 321ff015f7bc..1c94eb485300 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -190,17 +190,30 @@ var/view_size = getviewsize(view) var/aspect_ratio = view_size[1] / view_size[2] - // Calculate desired pixel width using window size and aspect ratio - var/sizes = params2list(winget(src, "mainwindow.split;mapwindow", "size")) + var/desired_width = 0 + var/sizes = params2list(winget(src, "mainwindow.split;mapwindow;mainwindow", "size")) var/map_size = splittext(sizes["mapwindow.size"], "x") - var/height = text2num(map_size[2]) - var/desired_width = round(height * aspect_ratio) - if (text2num(map_size[1]) == desired_width) - // Nothing to do - return + + if(prefs.adaptive_zoom) + // If using adaptive zoom, we directly use the intended horizontal map size to be pixel perfect + var/zoom_factor = get_adaptive_zoom_factor() + if(zoom_factor) + desired_width = view_size[1] * world.icon_size * zoom_factor + 4 // 4 pixels margin + + if(!desired_width) + // Calculate desired pixel width using window size and aspect ratio + var/height = text2num(map_size[2]) + desired_width = round(height * aspect_ratio) var/split_size = splittext(sizes["mainwindow.split.size"], "x") var/split_width = text2num(split_size[1]) + // Always leave at least 240px of verb panel for the poor sod to switch back if they made a mistake + if(split_width - desired_width < 240) + desired_width = split_width - 240 + + if (text2num(map_size[1]) == desired_width) + // Nothing to do + return // Calculate and apply a best estimate // +4 pixels are for the width of the splitter's handle diff --git a/code/game/world.dm b/code/game/world.dm index eacda304b380..3b3a1c2625d3 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -393,8 +393,11 @@ var/datum/BSQL_Connection/connection CRASH("[lib] init error: [init]") /world/proc/HandleTestRun() - //trigger things to run the whole process + // Wait for the game ticker to initialize Master.sleep_offline_after_initializations = FALSE + UNTIL(SSticker.initialized) + + //trigger things to run the whole process SSticker.request_start() CONFIG_SET(number/round_end_countdown, 0) var/datum/callback/cb diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index c4214b4b26fa..d21188615785 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -49,6 +49,7 @@ var/list/admin_verbs_default = list( /client/proc/vehicle_panel, /client/proc/in_view_panel, /*allows application of aheal/sleep in an AOE*/ /client/proc/toggle_lz_resin, + /client/proc/strip_all_in_view, /client/proc/rejuvenate_all_in_view, /client/proc/rejuvenate_all_humans_in_view, /client/proc/rejuvenate_all_revivable_humans_in_view, @@ -108,7 +109,7 @@ var/list/admin_verbs_minor_event = list( /client/proc/cmd_admin_change_custom_event, /datum/admins/proc/admin_force_distress, /datum/admins/proc/admin_force_ERT_shuttle, - /client/proc/force_shuttle, + /client/proc/force_hijack, /datum/admins/proc/force_predator_round, //Force spawns a predator round. /client/proc/adjust_predator_round, /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ @@ -151,7 +152,8 @@ var/list/admin_verbs_major_event = list( /client/proc/map_template_upload, /client/proc/enable_podlauncher, /client/proc/change_taskbar_icon, - /client/proc/change_weather + /client/proc/change_weather, + /client/proc/admin_blurb ) var/list/admin_verbs_spawn = list( @@ -170,6 +172,7 @@ var/list/admin_verbs_server = list( /datum/admins/proc/change_ground_map, /datum/admins/proc/change_ship_map, /datum/admins/proc/vote_ground_map, + /datum/admins/proc/override_ground_map, /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ /client/proc/cmd_debug_del_all, /datum/admins/proc/togglejoin, @@ -205,6 +208,7 @@ var/list/admin_verbs_debug = list( /datum/admins/proc/view_runtime_log, /*shows the server runtime log for this round*/ /datum/admins/proc/view_href_log, /*shows the server HREF log for this round*/ /datum/admins/proc/view_tgui_log, /*shows the server TGUI log for this round*/ + /client/proc/admin_blurb, ) var/list/admin_verbs_debug_advanced = list( diff --git a/code/modules/admin/autoreply.dm b/code/modules/admin/autoreply.dm index c83f4c6f4d14..a90e21b7f311 100644 --- a/code/modules/admin/autoreply.dm +++ b/code/modules/admin/autoreply.dm @@ -37,3 +37,12 @@ GLOBAL_REFERENCE_LIST_INDEXED(adminreplies, /datum/autoreply/admin, title) /datum/autoreply/admin/intended title = "Intended" message = "This is an intended feature and therefore does not need admin intervention." + +/datum/autoreply/admin/event + title = "Event" + message = "There is currently a special event running and many things may be changed or different, however normal rules still apply unless you have been specifically instructed otherwise by a staff member." + +/datum/autoreply/admin/whitelist + title = "Whitelist Issue" + message = "Staff are unable to handle most whitelist rulebreaks in-game, please make a player report on the forums, here." + diff --git a/code/modules/admin/player_panel/actions/physical.dm b/code/modules/admin/player_panel/actions/physical.dm index e1dd680c43c8..a48f39e81a5e 100644 --- a/code/modules/admin/player_panel/actions/physical.dm +++ b/code/modules/admin/player_panel/actions/physical.dm @@ -180,11 +180,15 @@ permissions_required = R_SPAWN /datum/player_action/strip_equipment/act(client/user, mob/target, list/params) - for (var/obj/item/I in target) + for (var/obj/item/current_item in target) + if(istype(current_item, /obj/item/card/id)) + continue + if(params["drop_items"]) - target.drop_inv_item_to_loc(I, target.loc, FALSE, TRUE) - else - qdel(I) + target.drop_inv_item_to_loc(current_item, target.loc, FALSE, TRUE) + continue + + qdel(current_item) message_admins("[key_name_admin(user)] stripped [target] of their items.") return TRUE diff --git a/code/modules/admin/server_verbs.dm b/code/modules/admin/server_verbs.dm index 0d35bd084196..47a60c043741 100644 --- a/code/modules/admin/server_verbs.dm +++ b/code/modules/admin/server_verbs.dm @@ -50,6 +50,42 @@ log_admin("[key_name(usr)] started a groundmap vote.") message_admins("[key_name_admin(usr)] started a groundmap vote.") +/datum/admins/proc/override_ground_map() + set category = "Server" + set name = "M: Override Next Map" + + if(!check_rights(R_SERVER)) + return + + var/map_type = tgui_alert(usr, "Override Ship or Ground Map?", "Map selection", list(GROUND_MAP, SHIP_MAP, "Cancel")) + if(map_type == "Cancel") + return + + var/map = input(usr, "Choose a custom map to run for next round","Upload Map") as null|file + if(!map) + return + if(copytext("[map]", -4) != ".dmm")//4 == length(".dmm") + to_chat(usr, SPAN_WARNING("Filename must end in '.dmm': [map]"), confidential = TRUE) + return + + message_admins(SPAN_ADMINNOTICE("[key_name_admin(usr)] is overriding the next '[map_type]' map with a custom one.")) + fcopy(map, "data/[OVERRIDE_MAPS_TO_FILENAME[map_type]]") + if(tgui_alert(usr, "Do you want to upload a custom map config or use defaults? Config controls things like survivors and monkey types, camouflages, lore messages, map items, nightmare, special environmental features...", "Map Config Flavor", list("Default", "Override")) == "Override") + tgui_alert(usr, "Choose the custom map configuration for next round. Make sure it's VALID. It MUST have \"override_map\":true !", "Warning", list("OK!")) + var/map_config = input(usr, "Choose custom map configuration to upload", "Upload Map Config") as null|file + if(map_config) + var/parse_check = json_decode(file2text(map_config)) + if(parse_check && parse_check["override_map"]) + fcopy(map_config, MAP_TO_FILENAME[map_type]) + tgui_alert(usr, "Done, using uploaded map_config. ALWAYS check at start of round that the map loaded correctly when using this. Passing a map vote or changing it with verb vote will revert these changes. Good luck!", "One little thing...", list("OK")) + message_admins(SPAN_ADMINNOTICE("[key_name_admin(usr)] overrode next '[map_type]' map with '[map]' and '[map_config]' for settings.")) + return + to_chat(usr, SPAN_ADMINNOTICE("Couldn't retrieve map_config file or it was invalid, using default config.")) + + fcopy(OVERRIDE_DEFAULT_MAP_CONFIG[map_type], MAP_TO_FILENAME[map_type]) + tgui_alert(usr, "Done, using default map_config ('Unknown' map). ALWAYS check at start of round that the map loaded correctly when using this. Passing a map vote or changing it with verb vote will revert these changes. Good luck!", "One little thing...", list("OK")) + message_admins(SPAN_ADMINNOTICE("[key_name_admin(usr)] overrode next '[map_type]' map with '[map]' and default settings.")) + /datum/admins/proc/change_ship_map() set category = "Server" set name = "M: Change Ship Map" diff --git a/code/modules/admin/tabs/admin_tab.dm b/code/modules/admin/tabs/admin_tab.dm index 2461474c2f6d..11ee49b65e61 100644 --- a/code/modules/admin/tabs/admin_tab.dm +++ b/code/modules/admin/tabs/admin_tab.dm @@ -317,7 +317,7 @@ else if(mob.get_type_in_ears(/obj/item/device/radio/headset)) to_chat(mob, message) - message_admins("[key_name(usr)] used Subtle Message All In View from [message_option], saying \"[input]\".") + message_admins(SPAN_STAFF_IC("[key_name(usr)] used Subtle Message All In View from [message_option], saying \"[input]\".")) #undef SUBTLE_MESSAGE_IN_HEAD #undef SUBTLE_MESSAGE_WEYLAND @@ -421,6 +421,33 @@ remove_verb(src, admin_verbs_hideable) add_verb(src, /client/proc/enable_admin_verbs) +/client/proc/strip_all_in_view() + set name = "Strip All" + set category = "Admin.InView" + set hidden = TRUE + + if(!admin_holder || !(admin_holder.rights & R_MOD)) + to_chat(src, "Only administrators may use this command.") + return + + if(tgui_alert(src, "This will strip ALL mobs within your view range. Are you sure?", "Confirmation", list("Yes", "Cancel")) != "Yes") + return + + var/strip_self = FALSE + if(tgui_alert(src, "Do you want to strip yourself as well?", "Confirmation", list("Yes", "No")) == "Yes") + strip_self = TRUE + + for(var/mob/living/current_mob in view()) + if(!strip_self && usr == current_mob) + continue + for (var/obj/item/current_item in current_mob) + //no more deletion of ID cards + if(istype(current_item, /obj/item/card/id)) + continue + qdel(current_item) + + message_admins(WRAP_STAFF_LOG(usr, "stripped everyone in [get_area(usr)] ([usr.x],[usr.y],[usr.z])."), usr.x, usr.y, usr.z) + /client/proc/rejuvenate_all_in_view() set name = "Rejuvenate All" set category = "Admin.InView" @@ -575,6 +602,8 @@ Alert Message In View
Subtle Message In View

+ Strip All Mobs In View
+
"} show_browser(usr, dat, "In View Panel", "inviews") diff --git a/code/modules/admin/tabs/event_tab.dm b/code/modules/admin/tabs/event_tab.dm index 3d0c8eaf9748..8fca782ecd63 100644 --- a/code/modules/admin/tabs/event_tab.dm +++ b/code/modules/admin/tabs/event_tab.dm @@ -349,7 +349,7 @@ if("CMB") var/body = "" - + for(var/text in GLOB.CMBFaxes) body += text body += "

" @@ -386,7 +386,7 @@ var/datum/hive_status/hive for(var/hivenumber in GLOB.hive_datum) hive = GLOB.hive_datum[hivenumber] - if(hive.totalXenos.len > 0 || hive.totalDeadXenos.len > 0) + if(hive.totalXenos.len > 0 || hive.total_dead_xenos.len > 0) hives += list("[hive.name]" = hive.hivenumber) last_hive_checked = hive @@ -423,32 +423,28 @@ message_admins("Admin [key_name(usr)] has turned everyone into a primitive") -/client/proc/force_shuttle() - set name = "Force Dropship" - set desc = "Force a dropship to launch" +/client/proc/force_hijack() + set name = "Force Hijack" + set desc = "Force a dropship to be hijacked" set category = "Admin.Shuttles" var/list/shuttles = list(DROPSHIP_ALAMO, DROPSHIP_NORMANDY) - var/tag = tgui_input_list(usr, "Which dropship should be force launched?", "Select a dropship:", shuttles) + var/tag = tgui_input_list(usr, "Which dropship should be force hijacked?", "Select a dropship:", shuttles) if(!tag) return - var/crash = 0 - switch(tgui_input_list(usr, "Would you like to force a crash?", "Force crash", list("Yes", "No"))) - if("Yes") crash = 1 - if("No") crash = 0 - else return var/obj/docking_port/mobile/marine_dropship/dropship = SSshuttle.getShuttle(tag) if(!dropship) - to_chat(src, SPAN_DANGER("Error: Attempted to force a dropship launch but the shuttle datum was null. Code: MSD_FSV_DIN")) - log_admin("Error: Attempted to force a dropship launch but the shuttle datum was null. Code: MSD_FSV_DIN") + to_chat(src, SPAN_DANGER("Error: Attempted to force a dropship hijack but the shuttle datum was null. Code: MSD_FSV_DIN")) + log_admin("Error: Attempted to force a dropship hijack but the shuttle datum was null. Code: MSD_FSV_DIN") return - if(crash) - var/obj/structure/machinery/computer/shuttle/dropship/flight/computer = dropship.getControlConsole() - computer.hijack(usr) - else - to_chat(usr, SPAN_WARNING("Use the shuttle manipulator to normally move a shuttle")) + var/confirm = tgui_alert(usr, "Are you sure you want to hijack [dropship]?", "Force hijack", list("Yes", "No")) == "Yes" + if(!confirm) + return + + var/obj/structure/machinery/computer/shuttle/dropship/flight/computer = dropship.getControlConsole() + computer.hijack(usr, force = TRUE) /client/proc/cmd_admin_create_centcom_report() set name = "Report: Faction" @@ -979,3 +975,20 @@ GLOB.bioscan_data.ares_bioscan(FALSE, variance) if("Yautja") GLOB.bioscan_data.yautja_bioscan() + +/client/proc/admin_blurb() + set name = "Global Blurb Message" + set category = "Admin.Events" + + if(!check_rights(R_ADMIN|R_DEBUG)) + return FALSE + var/duration = 5 SECONDS + var/message = "ADMIN TEST" + var/text_input = tgui_input_text(usr, "Announcement message", "Message Contents", message, timeout = 5 MINUTES) + message = text_input + duration = tgui_input_number(usr, "Set the duration of the alert in deci-seconds.", "Duration", 5 SECONDS, 5 MINUTES, 5 SECONDS, 20 SECONDS) + var/confirm = tgui_alert(usr, "Are you sure you wish to send '[message]' to all players for [(duration / 10)] seconds?", "Confirm", list("Yes", "No"), 20 SECONDS) + if(confirm != "Yes") + return FALSE + show_blurb(GLOB.player_list, duration, message, TRUE, "center", "center", "#bd2020", "ADMIN") + message_admins("[key_name(usr)] sent an admin blurb alert to all players. Alert reads: '[message]' and lasts [(duration / 10)] seconds.") diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm index ca6f0f977ade..96c9312db7d1 100644 --- a/code/modules/admin/topic/topic.dm +++ b/code/modules/admin/topic/topic.dm @@ -1241,7 +1241,7 @@ log_admin("[src.owner] replied to [key_name(H)]'s USCM message with the message [input].") for(var/client/X in GLOB.admins) if((R_ADMIN|R_MOD) & X.admin_holder.rights) - to_chat(X, "ADMINS/MODS: \red [src.owner] replied to [key_name(H)]'s USCM message with: \blue \")[input]\"") + to_chat(X, SPAN_STAFF_IC("ADMINS/MODS: \red [src.owner] replied to [key_name(H)]'s USCM message with: \blue \")[input]\"")) to_chat(H, SPAN_DANGER("You hear something crackle in your headset before a voice speaks, please stand by for a message from USCM:\" \blue \"[input]\"")) else if(href_list["SyndicateReply"]) @@ -1306,7 +1306,7 @@ fax_message = new(generate_templated_fax(0, organization_type, subject, addressed_to, message_body, sent_by, "Editor in Chief", organization_type)) show_browser(usr, "[fax_message.data]", "pressfaxpreview", "size=500x400") var/send_choice = tgui_input_list(usr, "Send this fax?", "Fax Template", list("Send", "Cancel")) - if(send_choice != "Send") + if(send_choice != "Send") return GLOB.fax_contents += fax_message // save a copy @@ -1345,7 +1345,7 @@ P.stamps += "
This paper has been stamped by the Free Press Quantum Relay." to_chat(src.owner, "Message reply to transmitted successfully.") - message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]", 1) + message_admins(SPAN_STAFF_IC("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]"), 1) return to_chat(src.owner, "/red Unable to locate fax!") else if(href_list["USCMFaxReply"]) @@ -1388,7 +1388,7 @@ fax_message = new(generate_templated_fax(0, "USCM CENTRAL COMMAND", subject,addressed_to, message_body,sent_by, sent_title, "United States Colonial Marine Corps")) show_browser(usr, "[fax_message.data]", "uscmfaxpreview", "size=500x400") var/send_choice = tgui_input_list(usr, "Send this fax?", "Fax Template", list("Send", "Cancel")) - if(send_choice != "Send") + if(send_choice != "Send") return GLOB.fax_contents += fax_message // save a copy @@ -1427,7 +1427,7 @@ P.stamps += "
This paper has been stamped by the USCM High Command Quantum Relay." to_chat(src.owner, "Message reply to transmitted successfully.") - message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]", 1) + message_admins(SPAN_STAFF_IC("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]"), 1) return to_chat(src.owner, "/red Unable to locate fax!") @@ -1509,7 +1509,7 @@ P.stamps += "
This paper has been stamped and encrypted by the Weyland-Yutani Quantum Relay (tm)." to_chat(src.owner, "Message reply to transmitted successfully.") - message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]", 1) + message_admins(SPAN_STAFF_IC("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]"), 1) return to_chat(src.owner, "/red Unable to locate fax!") @@ -1591,7 +1591,7 @@ P.stamps += "
This paper has been stamped by The Office of Colonial Marshals." to_chat(src.owner, "Message reply to transmitted successfully.") - message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]", 1) + message_admins(SPAN_STAFF_IC("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]"), 1) return to_chat(src.owner, "/red Unable to locate fax!") diff --git a/code/modules/admin/topic/topic_events.dm b/code/modules/admin/topic/topic_events.dm index c95b6d33648d..1055d5e47879 100644 --- a/code/modules/admin/topic/topic_events.dm +++ b/code/modules/admin/topic/topic_events.dm @@ -115,16 +115,25 @@ else if(href_list["spawn_as"] == "ert") offer_as_ert = TRUE + var/strip_the_humans = FALSE + var/strip_weapons = FALSE + if(href_list["equip_with"] == "no_weapons") + strip_weapons = TRUE + + if(href_list["equip_with"] == "no_equipment") + strip_the_humans = TRUE + if(humans_to_spawn) var/list/turfs = list() if(isnull(range_to_spawn_on)) range_to_spawn_on = 0 + var/turf/spawn_turf if(range_to_spawn_on) - for(var/turf/T in range(initial_turf, range_to_spawn_on)) - if(!T || istype(T, /turf/closed)) + for(spawn_turf in range(initial_turf, range_to_spawn_on)) + if(!spawn_turf || istype(spawn_turf, /turf/closed)) continue - turfs += T + turfs += spawn_turf else turfs = list(initial_turf) @@ -132,20 +141,58 @@ return var/list/humans = list() - var/mob/living/carbon/human/H + var/mob/living/carbon/human/spawned_human for(var/i = 0 to humans_to_spawn-1) - var/turf/to_spawn_at = pick(turfs) - H = new(to_spawn_at) + spawn_turf = pick(turfs) + spawned_human = new(spawn_turf) - if(!H.hud_used) - H.create_hud() - - arm_equipment(H, job_name, TRUE, FALSE) + if(!spawned_human.hud_used) + spawned_human.create_hud() if(free_the_humans) - owner.free_for_ghosts(H) + owner.free_for_ghosts(spawned_human) + + arm_equipment(spawned_human, job_name, TRUE, FALSE) + + humans += spawned_human + + if(strip_the_humans) + for(var/obj/item/current_item in spawned_human) + //no more deletion of ID cards + if(istype(current_item, /obj/item/card/id/)) + continue + qdel(current_item) + continue + + if(strip_weapons) + var/obj/item_storage + for(var/obj/item/current_item in spawned_human.GetAllContents(3)) + if(istype(current_item, /obj/item/ammo_magazine)) + + item_storage = current_item.loc + qdel(current_item) + + if(istype(item_storage, /obj/item/storage)) + item_storage.update_icon() + + continue + + if(istype(current_item, /obj/item/weapon)) + qdel(current_item) + continue + + if(istype(current_item, /obj/item/explosive)) + qdel(current_item) + + for(var/obj/item/hand_item in spawned_human.hands) + if(istype(hand_item, /obj/item/weapon)) + qdel(hand_item) + continue + + if(istype(hand_item, /obj/item/explosive)) + qdel(hand_item) + - humans += H if (offer_as_ert) var/datum/emergency_call/custom/em_call = new() @@ -197,11 +244,12 @@ if(isnull(range_to_spawn_on)) range_to_spawn_on = 0 + var/turf/spawn_turf if(range_to_spawn_on) - for(var/turf/T in range(initial_turf, range_to_spawn_on)) - if(!T || istype(T, /turf/closed)) + for(spawn_turf in range(initial_turf, range_to_spawn_on)) + if(!spawn_turf || istype(spawn_turf, /turf/closed)) continue - turfs += T + turfs += spawn_turf else turfs = list(initial_turf) @@ -213,8 +261,8 @@ var/list/xenos = list() var/mob/living/carbon/xenomorph/X for(var/i = 0 to xenos_to_spawn - 1) - var/turf/to_spawn_at = pick(turfs) - X = new caste_type(to_spawn_at, null, xeno_hive) + spawn_turf = pick(turfs) + X = new caste_type(spawn_turf, null, xeno_hive) if(!X.hud_used) X.create_hud() diff --git a/code/modules/admin/topic/topic_inview.dm b/code/modules/admin/topic/topic_inview.dm index 38214af9587b..7535767af3a8 100644 --- a/code/modules/admin/topic/topic_inview.dm +++ b/code/modules/admin/topic/topic_inview.dm @@ -18,3 +18,5 @@ subtlemessageall() if("alertall") alertall() + if("stripall") + owner.strip_all_in_view() diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 913e63d5eeb4..03d2ae517354 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -366,13 +366,16 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /datum/admin_help/proc/FullMonty(ref_src) if(!ref_src) ref_src = "[REF(src)]" - . = ADMIN_FULLMONTY_NONAME(initiator.mob) + . = "
Ticket Actions: " if(state == AHELP_ACTIVE) if(initial_message) . += " (DEFER)" if (CONFIG_GET(flag/popup_admin_pm)) . += " (POPUP)" . += ClosureLinks(ref_src) + . += "
Player Actions: " + . += ADMIN_FULLMONTY_NONAME(initiator.mob) + . += "" //private /datum/admin_help/proc/ClosureLinks(ref_src) @@ -402,7 +405,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) msg = sanitize(copytext_char(msg, 1, MAX_MESSAGE_LEN)) var/ref_src = "[REF(src)]" //Message to be sent to all admins - var/admin_msg = SPAN_ADMINSAY(SPAN_ADMINHELP("Ticket [TicketHref("#[id]", ref_src)]: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]: [msg]")) + var/admin_msg = SPAN_ADMINSAY(SPAN_ADMINHELP("Ticket [TicketHref("#[id]", ref_src)]: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]
[msg]")) AddInteraction("[LinkedReplyName(ref_src)]: [msg]", player_message = "[LinkedReplyName(ref_src)]: [msg]") log_admin_private("Ticket #[id]: [key_name(initiator)]: [msg]") @@ -516,7 +519,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) AddInteraction("Deferred to Mentors by [key_name_admin(usr)].", player_message = "Deferred to Mentors.") to_chat(initiator, SPAN_ADMINHELP("Your ticket has been deferred to Mentors.")) - Resolve() + log_ahelp(id, "Defer", "Deferred to mentors by [usr.key]", null, usr.ckey) + Close(silent = TRUE) /datum/admin_help/proc/mark_ticket() if(marked_admin) @@ -609,9 +613,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) dat += "

Opened at: [gameTimestamp(wtime = opened_at)] (Approx [DisplayTimeText(world.time - opened_at)] ago)" if(closed_at) dat += "
Closed at: [gameTimestamp(wtime = closed_at)] (Approx [DisplayTimeText(world.time - closed_at)] ago)" - dat += "

" + dat += "
" if(initiator) - dat += "Actions: [FullMonty(ref_src)]
" + dat += "[FullMonty(ref_src)]
" //All the action buttons for tickets/ahelps else dat += "DISCONNECTED[FOURSPACES][ClosureLinks(ref_src)]
" dat += "
Log:

" diff --git a/code/modules/admin/verbs/freeforghosts.dm b/code/modules/admin/verbs/freeforghosts.dm index 7d3ad324f0cf..a2f3912030e5 100644 --- a/code/modules/admin/verbs/freeforghosts.dm +++ b/code/modules/admin/verbs/freeforghosts.dm @@ -20,7 +20,7 @@ if(mind || client) ghostize(FALSE) - GLOB.freed_mob_list |= src + GLOB.freed_mob_list |= WEAKREF(src) /client/proc/free_all_mobs_in_view() set name = "Free All Mobs" diff --git a/code/modules/admin/verbs/getlogs.dm b/code/modules/admin/verbs/getlogs.dm index b0223cbd3ebd..37bf4f1c9d85 100644 --- a/code/modules/admin/verbs/getlogs.dm +++ b/code/modules/admin/verbs/getlogs.dm @@ -51,7 +51,7 @@ message_admins("[key_name_admin(src)] accessed file: [path]") to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - src << run(file(path)) + src << ftp(file(path)) //This proc allows download of past server logs saved within the data/logs/ folder. //It works similarly to show-server-log. @@ -73,7 +73,7 @@ message_admins("[key_name_admin(src)] accessed file: [path]") to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - src << run(file(path)) + src << ftp(file(path)) //Other log stuff put here for the sake of organisation @@ -96,7 +96,7 @@ message_admins("[key_name_admin(src)] accessed file: [path]") to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - src << run(file(path)) + src << ftp(file(path)) /**Shows this round's attack log*/ /datum/admins/proc/view_attack_log() @@ -117,7 +117,7 @@ message_admins("[key_name_admin(src)] accessed file: [path]") to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - src << run(file(path)) + src << ftp(file(path)) /**Shows this round's runtime log*/ /datum/admins/proc/view_runtime_log() @@ -138,7 +138,7 @@ message_admins("[key_name_admin(src)] accessed file: [path]") to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - src << run(file(path)) + src << ftp(file(path)) /**Shows this round's href log*/ /datum/admins/proc/view_href_log() @@ -159,7 +159,7 @@ message_admins("[key_name_admin(src)] accessed file: [path]") to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - src << run(file(path)) + src << ftp(file(path)) /**Shows this round's tgui log*/ /datum/admins/proc/view_tgui_log() @@ -180,4 +180,4 @@ message_admins("[key_name_admin(src)] accessed file: [path]") to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - src << run(file(path)) + src << ftp(file(path)) diff --git a/code/modules/admin/verbs/mob_verbs.dm b/code/modules/admin/verbs/mob_verbs.dm index 3aed46d5434e..376115c0d630 100644 --- a/code/modules/admin/verbs/mob_verbs.dm +++ b/code/modules/admin/verbs/mob_verbs.dm @@ -166,7 +166,7 @@ return to_chat(H, SPAN_DANGER("Message received through headset. [message_option] Transmission \"[msg]\"")) - var/message = WRAP_STAFF_LOG(usr, "subtle messaged [key_name(M)] as [message_option], saying \"[msg]\" in [get_area(M)] ([M.x],[M.y],[M.z]).") + var/message = WRAP_STAFF_LOG(usr, SPAN_STAFF_IC("subtle messaged [key_name(M)] as [message_option], saying \"[msg]\" in [get_area(M)] ([M.x],[M.y],[M.z]).")) message_admins(message, M.x, M.y, M.z) admin_ticket_log(M, message) diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 5a60c0185e37..e0210e4577a0 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -17,9 +17,9 @@ liaison = 1 if(liaison) - msg = SPAN_NOTICE("LIAISON: [key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]") + msg = SPAN_STAFF_IC("LIAISON: [key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]") else - msg = SPAN_NOTICE("PRAY: [key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]") + msg = SPAN_STAFF_IC("PRAY: [key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]") log_admin(msg) for(var/client/C in GLOB.admins) if(AHOLD_IS_MOD(C.admin_holder) && C.prefs.toggles_chat & CHAT_PRAYER) @@ -31,7 +31,7 @@ /proc/high_command_announce(text , mob/Sender , iamessage) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) - msg = "[SPAN_NOTICE("USCM[iamessage ? "IA" : ""]:")][key_name(Sender, 1)] [CC_MARK(Sender)] [ADMIN_PP(Sender)] [ADMIN_VV(Sender)] [ADMIN_SM(Sender)] [ADMIN_JMP_USER(Sender)] [CC_REPLY(Sender)]: [msg]" + msg = "[SPAN_STAFF_IC("USCM[iamessage ? "IA" : ""]:")][key_name(Sender, 1)] [CC_MARK(Sender)] [ADMIN_PP(Sender)] [ADMIN_VV(Sender)] [ADMIN_SM(Sender)] [ADMIN_JMP_USER(Sender)] [CC_REPLY(Sender)]: [msg]" log_admin(msg) for(var/client/C in GLOB.admins) if((R_ADMIN|R_MOD) & C.admin_holder.rights) diff --git a/code/modules/admin/view_variables/reference_tracking.dm b/code/modules/admin/view_variables/reference_tracking.dm index a5b2af68c772..f6f2b86f31d7 100644 --- a/code/modules/admin/view_variables/reference_tracking.dm +++ b/code/modules/admin/view_variables/reference_tracking.dm @@ -12,9 +12,11 @@ SSgarbage.update_nextfire(reset_time = TRUE) return +#if !defined(UNIT_TESTS) && !defined(SPACEMAN_DMM) // Without this we just get thousands of warnings about sleeps in qdel if(!skip_alert && tgui_alert(usr,"Running this will lock everything up for about 5 minutes. Would you like to begin the search?", "Find References", list("Yes", "No")) != "Yes") running_find_references = null return +#endif //this keeps the garbage collector from failing to collect objects being searched for in here SSgarbage.can_fire = FALSE @@ -22,7 +24,7 @@ if(usr?.client) usr.client.running_find_references = type - log_reftracker("Beginning search for references to a [type].") + log_reftracker("Beginning search for references to '[src]' a [type].") var/starting_time = world.time @@ -58,7 +60,7 @@ log_reftracker("Finished searching clients") #endif - log_reftracker("Completed search for references to a [type].") + log_reftracker("Completed search for references to '[src]' a [type].") if(usr?.client) usr.client.running_find_references = null @@ -129,6 +131,11 @@ continue //End early, don't want these logging #endif log_reftracker("Found [type] [text_ref(src)] in list [container_name].") + var/msg + for(var/i in 1 to min(10, potential_cache.len)) + msg += "[potential_cache[i]]," + if(msg) + log_reftracker("List contents: [msg]") continue var/assoc_val = null @@ -142,6 +149,11 @@ continue //End early, don't want these logging #endif log_reftracker("Found [type] [text_ref(src)] in list [container_name]\[[element_in_list]\]") + var/msg + for(var/i in 1 to min(10, potential_cache.len)) + msg += "[potential_cache[i]]," + if(msg) + log_reftracker("List contents: [msg]") continue //We need to run both of these checks, since our object could be hiding in either of them //Check normal sublists diff --git a/code/modules/almayer/machinery.dm b/code/modules/almayer/machinery.dm index 5e763033c625..cb90db9e8535 100644 --- a/code/modules/almayer/machinery.dm +++ b/code/modules/almayer/machinery.dm @@ -1,70 +1,12 @@ //-----USS Almayer Machinery file -----// // Put any new machines in here before map is released and everything moved to their proper positions. - - -//-----USS Almayer Props -----// -//Put any props that don't function properly, they could function in the future but for now are for looks. This system could be expanded for other maps too. ~Art - -/obj/item/prop/almayer - name = "GENERIC USS ALMAYER PROP" - desc = "THIS SHOULDN'T BE VISIBLE, AHELP 'ART-P03' IF SEEN IN ROUND WITH LOCATION" - icon = 'icons/obj/structures/props/almayer_props.dmi' - icon_state = "hangarbox" - -/obj/item/prop/almayer/box - name = "metal crate" - desc = "A metal crate used often for storing small electronics that go into dropships" - icon_state = "hangarbox" - w_class = SIZE_LARGE - -/obj/item/prop/almayer/flight_recorder - name = "\improper FR-112 flight recorder" - desc = "A small red box that contains flight data from a dropship while it's on mission. Usually referred to as the black box, although this one comes in bloody red." - icon_state = "flight_recorder" - w_class = SIZE_LARGE - -/obj/item/prop/almayer/flight_recorder/colony - name = "\improper CIR-60 colony information recorder" - desc = "A small red box that records colony announcements, colonist flatlines and other key readouts. Usually refered to the black box, although this one comes in bloody red." - icon_state = "flight_recorder" - w_class = SIZE_LARGE - -/obj/item/prop/almayer/flare_launcher - name = "\improper MJU-77/C case" - desc = "A flare launcher that usually gets mounted onto dropships to help survivability against infrared tracking missiles." - icon_state = "flare_launcher" - w_class = SIZE_SMALL - -/obj/item/prop/almayer/chaff_launcher - name = "\improper RR-247 Chaff case" - desc = "A chaff launcher that usually gets mounted onto dropships to help survivability against radar tracking missiles." - icon_state = "chaff_launcher" - w_class = SIZE_MEDIUM - -/obj/item/prop/almayer/handheld1 - name = "small handheld" - desc = "A small piece of electronic doodads" - icon_state = "handheld1" - w_class = SIZE_SMALL - -/obj/item/prop/almayer/comp_closed - name = "dropship maintenance computer" - desc = "A closed dropship maintenance computer that technicians and pilots use to find out what's wrong with a dropship. It has various outlets for different systems." - icon_state = "hangar_comp" - w_class = SIZE_LARGE - -/obj/item/prop/almayer/comp_open - name = "dropship maintenance computer" - desc = "An opened dropship maintenance computer, it seems to be off however. It's used by technicians and pilots to find damaged or broken systems on a dropship. It has various outlets for different systems." - icon_state = "hangar_comp_open" - w_class = SIZE_LARGE - /obj/structure/machinery/prop/almayer name = "GENERIC USS ALMAYER PROP" desc = "THIS SHOULDN'T BE VISIBLE, AHELP 'ART-P01' IF SEEN IN ROUND WITH LOCATION" /obj/structure/machinery/prop/almayer/hangar/dropship_part_fabricator + /obj/structure/machinery/prop/almayer/computer/PC name = "personal desktop" desc = "A small computer hooked up into the ship's computer network." diff --git a/code/modules/assembly/signaller.dm b/code/modules/assembly/signaller.dm index fe5ce3e3f426..4ac25854e8ea 100644 --- a/code/modules/assembly/signaller.dm +++ b/code/modules/assembly/signaller.dm @@ -139,7 +139,7 @@ /obj/item/device/assembly/signaller/proc/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, RADIO_CHAT) + radio_connection = SSradio.add_object(src, frequency, RADIO_SIGNALS) /obj/item/device/assembly/signaller/Destroy() SSradio.remove_object(src, frequency) diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index be2f977b6a53..8f0939474427 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -42,7 +42,7 @@ var/played = 0 var/midi_silenced = 0 var/datum/soundOutput/soundOutput - var/list/volume_preferences = list(1, 0.5, 1, 0.85)//Game, music, admin midis, lobby music + var/list/volume_preferences = list(1, 0.5, 1, 0.6)//Game, music, admin midis, lobby music //////////// //SECURITY// diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 21915009f77a..6926175c835a 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -152,7 +152,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( var/datum/fax/info = locate(href_list["FaxView"]) - if(!istype(info)) + if(!istype(info)) return if(info.photo_list) @@ -451,6 +451,10 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( ////////////// /client/Del() if(!gc_destroyed) + gc_destroyed = world.time + if (!QDELING(src)) + stack_trace("Client does not purport to be QDELING, this is going to cause bugs in other places!") + SEND_SIGNAL(src, COMSIG_PARENT_QDELETING, TRUE) Destroy() return ..() diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 0cc8b6b04d48..e51a904cfdac 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -53,6 +53,7 @@ var/const/MAX_SAVE_SLOTS = 10 var/be_special = 0 // Special role selection var/toggle_prefs = TOGGLE_MIDDLE_MOUSE_CLICK|TOGGLE_DIRECTIONAL_ATTACK|TOGGLE_MEMBER_PUBLIC|TOGGLE_AMBIENT_OCCLUSION|TOGGLE_VEND_ITEM_TO_HAND // flags in #define/mode.dm var/auto_fit_viewport = FALSE + var/adaptive_zoom = 0 var/UI_style = "midnight" var/toggles_admin = TOGGLES_ADMIN_DEFAULT var/toggles_chat = TOGGLES_CHAT_DEFAULT @@ -99,10 +100,13 @@ var/const/MAX_SAVE_SLOTS = 10 var/predator_flavor_text = "" //CO-specific preferences var/commander_sidearm = "Mateba" + var/affiliation = "Unaligned" //SEA specific preferences ///holds our preferred job options for jobs - var/pref_special_job_options = list() + var/list/pref_special_job_options = list() + ///Holds assignment of character slots to jobs. + var/list/pref_job_slots = list() //WL Council preferences. var/yautja_status = WHITELIST_NORMAL @@ -122,6 +126,7 @@ var/const/MAX_SAVE_SLOTS = 10 var/underwear = "Boxers (Camo Conforming)" //underwear type var/undershirt = "Undershirt (Tan)" //undershirt type var/backbag = 2 //backpack type + var/preferred_armor = "Random" //preferred armor type (from their primary prep vendor) var/h_style = "Crewcut" //Hair type var/r_hair = 0 //Hair color @@ -328,6 +333,8 @@ var/const/MAX_SAVE_SLOTS = 10 dat += "

Occupation Choices:

" dat += "
" dat += "\tSet Role Preferences" + dat += "
" + dat += "\tAssign Character Slots to Roles" dat += "" dat += "
" @@ -369,6 +376,8 @@ var/const/MAX_SAVE_SLOTS = 10 dat += "Backpack Type: [backbaglist[backbag]]
" + dat += "Preferred Armor: [preferred_armor]
" + dat += "Show Job Gear: [show_job_gear ? "True" : "False"]
" dat += "Background: Cycle Background
" @@ -381,7 +390,7 @@ var/const/MAX_SAVE_SLOTS = 10 if(length(gear)) dat += "
" for(var/i = 1; i <= gear.len; i++) - var/datum/gear/G = gear_datums[gear[i]] + var/datum/gear/G = gear_datums_by_name[gear[i]] if(G) total_cost += G.cost dat += "[gear[i]] ([G.cost] points) Remove
" @@ -464,16 +473,13 @@ var/const/MAX_SAVE_SLOTS = 10 dat += "Be [role_name]: [be_special & (1<
" n++ - - dat += "
" - dat += "\tSet Role Preferences" - dat += "
" if(MENU_CO) if(RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_COMMANDER) dat += "
" dat += "

Commander Settings:

" dat += "Commander Whitelist Status: [commander_status]
" dat += "Commander Sidearm: [commander_sidearm]
" + dat += "Commander Affiliation: [affiliation]
" dat += "
" else dat += "You do not have the whitelist for this role." @@ -566,6 +572,7 @@ var/const/MAX_SAVE_SLOTS = 10 dat += "

Game Settings:

" dat += "Ambient Occlusion: [toggle_prefs & TOGGLE_AMBIENT_OCCLUSION ? "Enabled" : "Disabled"]
" dat += "Fit Viewport: [auto_fit_viewport ? "Auto" : "Manual"]
" + dat += "Adaptive Zoom: [adaptive_zoom ? "[adaptive_zoom * 2]x" : "Disabled"]
" dat += "tgui Window Mode: [(tgui_fancy) ? "Fancy (default)" : "Compatible (slower)"]
" dat += "tgui Window Placement: [(tgui_lock) ? "Primary monitor" : "Free (default)"]
" dat += "Play Admin Midis: [(toggles_sound & SOUND_MIDI) ? "Yes" : "No"]
" @@ -739,6 +746,83 @@ var/const/MAX_SAVE_SLOTS = 10 onclose(user, "mob_occupation", user.client, list("_src_" = "prefs", "preference" = "job", "task" = "close")) return +//limit - The amount of jobs allowed per column. Defaults to 13 to make it look nice. +//splitJobs - Allows you split the table by job. You can make different tables for each department by including their heads. Defaults to CE to make it look nice. +//width - Screen' width. Defaults to 550 to make it look nice. +//height - Screen's height. Defaults to 500 to make it look nice. +/datum/preferences/proc/set_job_slots(mob/user, limit = 19, list/splitJobs = list(JOB_CHIEF_REQUISITION), width = 950, height = 700) + if(!RoleAuthority) + return + + var/HTML = "" + HTML += "
" + HTML += "Assign character slots to jobs.
Unavailable occupations are crossed out.

" + HTML += "
Done

" // Easier to press up here. + HTML += "
" // Table within a table for alignment, also allows you to easily add more colomns. + HTML += "" + var/index = -1 + + //The job before the current job. I only use this to get the previous jobs color when I'm filling in blank rows. + + var/list/active_role_names = GLOB.gamemode_roles[GLOB.master_mode] + if(!active_role_names) + active_role_names = ROLES_DISTRESS_SIGNAL + + for(var/role_name as anything in active_role_names) + var/datum/job/job = RoleAuthority.roles_by_name[role_name] + if(!job) + debug_log("Missing job for prefs: [role_name]") + continue + index++ + if((index >= limit) || (job.title in splitJobs)) + HTML += "
" + index = 0 + + HTML += "" + continue + else if(job.flags_startup_parameters & ROLE_WHITELISTED && !(RoleAuthority.roles_whitelist[user.ckey] & job.flags_whitelist)) + HTML += "[job.disp_title]" + continue + else if(!job.can_play_role(user.client)) + HTML += "[job.disp_title]" + continue + + HTML += "[job.disp_title]" + + var/slot_name = get_job_slot_name(job.title) + HTML += "" + + HTML += "
" + if(jobban_isbanned(user, job.title)) + HTML += "[job.disp_title]BANNED
WHITELISTED
TIMELOCKED
[slot_name]" + HTML += "
" + HTML += "

" + + var/b_color + var/msg + if(toggle_prefs & TOGGLE_START_JOIN_CURRENT_SLOT) + b_color = "red" + msg = "This preference is ignored when joining at the start of the round." + else + b_color = "green" + msg = "This preference is used when joining at the start of the round." + HTML += "
[msg]
" + if(toggle_prefs & TOGGLE_LATE_JOIN_CURRENT_SLOT) + b_color = "red" + msg = "This preference is ignored when joining a round in progress." + else + b_color = "green" + msg = "This preference is used when joining a round in progress." + HTML += "
[msg]
" + + HTML += "
Reset
" + HTML += "" + + close_browser(user, "preferences") + show_browser(user, HTML, "Job Assignment", "job_slots_assignment", "size=[width]x[height]") + onclose(user, "job_slots_assignment", user.client, list("_src_" = "prefs", "preference" = "job_slot", "task" = "close")) + return + /datum/preferences/proc/SetRecords(mob/user) var/HTML = "" HTML += "
" @@ -829,6 +913,40 @@ var/const/MAX_SAVE_SLOTS = 10 job_preference_list[J.title] = priority return TRUE +/datum/preferences/proc/assign_job_slot(mob/user, target_job) + var/list/slot_options = list(JOB_SLOT_RANDOMISED_TEXT = JOB_SLOT_RANDOMISED_SLOT, JOB_SLOT_CURRENT_TEXT = JOB_SLOT_CURRENT_SLOT) + var/savefile/S = new /savefile(path) + var/slot_name + for(var/slot in 1 to MAX_SAVE_SLOTS) + S.cd = "/character[slot]" + S["real_name"] >> slot_name + if(slot_name) + slot_options["[slot_name] (slot #[slot])"] = slot + var/chosen_slot = tgui_input_list(user, "Assign character for [target_job] job", "Slot assignment", slot_options) + if(chosen_slot) + pref_job_slots[target_job] = slot_options[chosen_slot] + set_job_slots(user) + +/datum/preferences/proc/get_job_slot_name(job_title) + . = JOB_SLOT_CURRENT_TEXT + if(!(job_title in pref_job_slots)) + return + var/slot_number = pref_job_slots[job_title] + switch(slot_number) + if(JOB_SLOT_RANDOMISED_SLOT) + return JOB_SLOT_RANDOMISED_TEXT + if(1 to MAX_SAVE_SLOTS) + var/savefile/S = new /savefile(path) + S.cd = "/character[slot_number]" + return "[S["real_name"]] (slot #[slot_number])" + +/datum/preferences/proc/reset_job_slots() + pref_job_slots = list() + var/datum/job/J + for(var/role in RoleAuthority.roles_by_path) + J = RoleAuthority.roles_by_path[role] + pref_job_slots[J.title] = JOB_SLOT_CURRENT_SLOT + /datum/preferences/proc/process_link(mob/user, list/href_list) var/whitelist_flags = RoleAuthority.roles_whitelist[user.ckey] @@ -854,40 +972,52 @@ var/const/MAX_SAVE_SLOTS = 10 SetJob(user, href_list["text"], priority) else SetChoices(user) - return 1 + return TRUE + if("job_slot") + switch(href_list["task"]) + if("close") + close_browser(user, "job_slots_assignment") + ShowChoices(user) + if("assign") + assign_job_slot(user, href_list["target_job"]) + if("start_join") + toggle_prefs ^= TOGGLE_START_JOIN_CURRENT_SLOT + set_job_slots(user) + if("late_join") + toggle_prefs ^= TOGGLE_LATE_JOIN_CURRENT_SLOT + set_job_slots(user) + if("reset") + reset_job_slots() + set_job_slots(user) + else + 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", gear_datums_by_category) + if(!gear_category) + return + var/choice = tgui_input_list(user, "Select gear to add: ", gear_category, gear_datums_by_category[gear_category]) + if(!choice) + return - var/list/valid_gear_choices = list() - - for(var/gear_name in gear_datums) - var/datum/gear/G = gear_datums[gear_name] - if(G.whitelisted && !is_alien_whitelisted(user, G.whitelisted)) - continue - valid_gear_choices += gear_name - - var/choice = tgui_input_list(user, "Select gear to add: ", "Gear to add", valid_gear_choices) - - if(choice && gear_datums[choice]) - - var/total_cost = 0 - - if(isnull(gear) || !islist(gear)) gear = list() - - if(gear && gear.len) - for(var/gear_name in gear) - if(gear_datums[gear_name]) - var/datum/gear/G = gear_datums[gear_name] - total_cost += G.cost - - var/datum/gear/C = gear_datums[choice] - total_cost += C.cost - if(C && total_cost <= MAX_GEAR_COST) - gear += choice - to_chat(user, SPAN_NOTICE("Added \the '[choice]' for [C.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.")) + var/total_cost = 0 + var/datum/gear/G + if(isnull(gear) || !islist(gear)) + gear = list() + if(gear.len) + for(var/gear_name in gear) + G = gear_datums_by_name[gear_name] + total_cost += G?.cost + + G = 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"]) @@ -1198,6 +1328,13 @@ var/const/MAX_SAVE_SLOTS = 10 return commander_sidearm = new_co_sidearm + if("co_affiliation") + var/new_co_affiliation = tgui_input_list(user, "Choose your faction affiliation.", "Commanding Officer's Affiliation", FACTION_ALLEGIANCE_USCM_COMMANDER) + if(!new_co_affiliation) + return + affiliation = new_co_affiliation + + if("yautja_status") var/list/options = list("Normal" = WHITELIST_NORMAL) @@ -1461,6 +1598,11 @@ var/const/MAX_SAVE_SLOTS = 10 if(new_pref_squad) preferred_squad = new_pref_squad + if("prefarmor") + var/new_pref_armor = tgui_input_list(user, "Choose your character's default style of armor:", "Character Preferences", GLOB.armor_style_list) + if(new_pref_armor) + preferred_armor = new_pref_armor + if("limbs") var/limb_name = tgui_input_list(user, "Which limb do you want to change?", list("Left Leg","Right Leg","Left Arm","Right Arm","Left Foot","Right Foot","Left Hand","Right Hand")) if(!limb_name) return @@ -1711,6 +1853,12 @@ var/const/MAX_SAVE_SLOTS = 10 if(auto_fit_viewport && owner) owner.fit_viewport() + if("adaptive_zoom") + adaptive_zoom += 1 + if(adaptive_zoom == 3) + adaptive_zoom = 0 + owner?.adaptive_zoom() + if("inputstyle") var/result = tgui_alert(user, "Which input style do you want?", "Input Style", list("Modern", "Legacy")) if(!result) @@ -1790,11 +1938,26 @@ var/const/MAX_SAVE_SLOTS = 10 ShowChoices(user) return 1 -// Transfers both physical characteristics and character information to character -/datum/preferences/proc/copy_all_to(mob/living/carbon/human/character, safety = 0) + +/// Loads appropriate character slot for the given job as assigned in preferences. +/datum/preferences/proc/find_assigned_slot(job_title, is_late_join = FALSE) + if(toggle_prefs & (is_late_join ? TOGGLE_LATE_JOIN_CURRENT_SLOT : TOGGLE_START_JOIN_CURRENT_SLOT)) + return + var/slot_for_job = pref_job_slots[job_title] + switch(slot_for_job) + if(JOB_SLOT_RANDOMISED_SLOT) + be_random_body = TRUE + be_random_name = TRUE + if(1 to MAX_SAVE_SLOTS) + load_character(slot_for_job) + +/// Transfers both physical characteristics and character information to character +/datum/preferences/proc/copy_all_to(mob/living/carbon/human/character, job_title, is_late_join = FALSE) if(!istype(character)) return + find_assigned_slot(job_title, is_late_join) + if(be_random_name) real_name = random_name(gender) @@ -1810,15 +1973,16 @@ var/const/MAX_SAVE_SLOTS = 10 character.voice = real_name character.name = character.real_name - character.flavor_texts["general"] = flavor_texts["general"] - character.flavor_texts["head"] = flavor_texts["head"] - character.flavor_texts["face"] = flavor_texts["face"] - character.flavor_texts["eyes"] = flavor_texts["eyes"] - character.flavor_texts["torso"] = flavor_texts["torso"] - character.flavor_texts["arms"] = flavor_texts["arms"] - character.flavor_texts["hands"] = flavor_texts["hands"] - character.flavor_texts["legs"] = flavor_texts["legs"] - character.flavor_texts["feet"] = flavor_texts["feet"] + if(!be_random_body) + character.flavor_texts["general"] = flavor_texts["general"] + character.flavor_texts["head"] = flavor_texts["head"] + character.flavor_texts["face"] = flavor_texts["face"] + character.flavor_texts["eyes"] = flavor_texts["eyes"] + character.flavor_texts["torso"] = flavor_texts["torso"] + character.flavor_texts["arms"] = flavor_texts["arms"] + character.flavor_texts["hands"] = flavor_texts["hands"] + character.flavor_texts["legs"] = flavor_texts["legs"] + character.flavor_texts["feet"] = flavor_texts["feet"] character.med_record = strip_html(med_record) character.sec_record = strip_html(sec_record) @@ -1972,47 +2136,6 @@ var/const/MAX_SAVE_SLOTS = 10 message_admins("[character] ([character.ckey]) has spawned with their gender as plural or neuter. Please notify coders.") character.gender = MALE - -// Transfers the character's information (name, flavor text, records, roundstart clothes, etc.) to the mob -/datum/preferences/proc/copy_information_to(mob/living/carbon/human/character, safety = 0) - if(!istype(character)) - return - - if(be_random_name) - real_name = random_name(gender) - - if(CONFIG_GET(flag/humans_need_surnames)) - var/firstspace = findtext(real_name, " ") - var/name_length = length(real_name) - if(!firstspace) //we need a surname - real_name += " [pick(last_names)]" - else if(firstspace == name_length) - real_name += "[pick(last_names)]" - - character.real_name = real_name - character.voice = real_name - character.name = character.real_name - - character.flavor_texts["general"] = flavor_texts["general"] - character.flavor_texts["head"] = flavor_texts["head"] - character.flavor_texts["face"] = flavor_texts["face"] - character.flavor_texts["eyes"] = flavor_texts["eyes"] - character.flavor_texts["torso"] = flavor_texts["torso"] - character.flavor_texts["arms"] = flavor_texts["arms"] - character.flavor_texts["hands"] = flavor_texts["hands"] - character.flavor_texts["legs"] = flavor_texts["legs"] - character.flavor_texts["feet"] = flavor_texts["feet"] - - character.med_record = med_record - character.sec_record = sec_record - character.gen_record = gen_record - character.exploit_record = exploit_record - - character.origin = origin - character.personal_faction = faction - character.religion = religion - - /datum/preferences/proc/open_load_dialog(mob/user) var/dat = "" dat += "
" diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index fa208b73a840..ee8c855d8b31 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -1,694 +1,775 @@ -var/global/list/gear_datums = list() +var/global/list/gear_datums_by_category = list() +var/global/list/gear_datums_by_name = list() /proc/populate_gear_list() - for(var/type in typesof(/datum/gear)-/datum/gear) - var/datum/gear/G = new type() - gear_datums[G.display_name] = G - return 1 + var/datum/gear/G + for(var/gear_type in subtypesof(/datum/gear)) + G = new gear_type() + if(!G.display_name) + continue //Skipping parent types that are not actual items. + if(!G.category) + log_debug("Improper gear datum: [gear_type].") + continue + if(G.display_name in gear_datums_by_name) + log_debug("Duplicate gear datum name: [G.display_name].") + continue + LAZYSET(gear_datums_by_category[G.category], "[G.display_name] [G.cost == 1 ? "(1 point)" : "([G.cost] points)"]", G) + gear_datums_by_name[G.display_name] = G /datum/gear var/display_name // Name/index. + var/category //Used for sorting in the loadout selection. var/path // Path to item. - var/cost // Number of points used. - var/slot // Slot to equip to. + 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. - var/whitelisted // Term to check the whitelist for.. var/list/allowed_origins -// This is sorted both by slot and alphabetically! Don't fuck it up! -// Headslot items +/datum/gear/eyewear + category = "Eyewear" + slot = WEAR_EYES -/datum/gear/cmbandana - display_name = "USCM Bandana (Green)" - path = /obj/item/clothing/head/cmbandana - cost = 3 - slot = WEAR_HEAD +/datum/gear/eyewear/aviators + display_name = "Aviator shades" + path = /obj/item/clothing/glasses/sunglasses/aviator + +/datum/gear/eyewear/eyepatch + display_name = "Eyepatch" + path = /obj/item/clothing/glasses/eyepatch + +/datum/gear/eyewear/rpg_glasses + display_name = "Marine RPG Glasses" + path = /obj/item/clothing/glasses/regular allowed_origins = USCM_ORIGINS -/datum/gear/cmbandanatan - display_name = "USCM Bandana (Tan)" - path = /obj/item/clothing/head/cmbandana/tan - cost = 3 - slot = WEAR_HEAD +/datum/gear/eyewear/prescription_glasses + display_name = "Prescription Glasses" + path = /obj/item/clothing/glasses/regular/hipster + +/datum/gear/eyewear/goggles + display_name = "Ballistic goggles" + path = /obj/item/clothing/glasses/mgoggles + +/datum/gear/eyewear/prescription_goggles + display_name = "Prescription ballistic goggles" + path = /obj/item/clothing/glasses/mgoggles/prescription + +/datum/gear/eyewear/goggles_black + display_name = "Ballistic goggles, black" + path = /obj/item/clothing/glasses/mgoggles/black + +/datum/gear/eyewear/goggles_orange + display_name = "Ballistic goggles, orange" + path = /obj/item/clothing/glasses/mgoggles/orange + +/datum/gear/eyewear/bimex_shades + display_name = "BiMex personal shades" + path = /obj/item/clothing/glasses/sunglasses/big + +/datum/gear/eyewear/sunglasses + display_name = "Sunglasses" + path = /obj/item/clothing/glasses/sunglasses + +/datum/gear/eyewear/prescription_sunglasses + display_name = "Prescription sunglasses" + path = /obj/item/clothing/glasses/sunglasses/prescription + +/datum/gear/mask + category = "Masks and scarves" + slot = WEAR_FACE + +/datum/gear/mask/balaclava_black + display_name = "Balaclava, black" + path = /obj/item/clothing/mask/balaclava + +/datum/gear/mask/balaclava_green + display_name = "Balaclava, green" + path = /obj/item/clothing/mask/balaclava/tactical + +/datum/gear/mask/coif + display_name = "Coif" + path = /obj/item/clothing/mask/rebreather/scarf + +/datum/gear/mask/face_wrap_black + display_name = "Face wrap, black" + path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/black + +/datum/gear/mask/face_wrap_green + display_name = "Face wrap, green" + path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green + +/datum/gear/mask/face_wrap_grey + display_name = "Face wrap, grey" + path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask + +/datum/gear/mask/face_wrap_red + display_name = "Face wrap, red" + path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/red + +/datum/gear/mask/face_wrap_tan + display_name = "Face wrap, tan" + path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/tan + +/datum/gear/mask/face_wrap_squad + display_name = "Face wrap, squad specific" + path =/obj/item/clothing/mask/rebreather/scarf/tacticalmask/squad + +/datum/gear/mask/gas + display_name = "Gas mask" + path = /obj/item/clothing/mask/gas + +/datum/gear/mask/scarf_black + display_name = "Scarf, black" + path = /obj/item/clothing/mask/tornscarf/black + +/datum/gear/mask/scarf_desert + display_name = "Scarf, desert" + path = /obj/item/clothing/mask/tornscarf/desert + +/datum/gear/mask/scarf_green + display_name = "Scarf, green" + path = /obj/item/clothing/mask/tornscarf/green + +/datum/gear/mask/scarf_grey + display_name = "Scarf, grey" + path = /obj/item/clothing/mask/tornscarf + +/datum/gear/mask/scarf_urban + display_name = "Scarf, urban" + path = /obj/item/clothing/mask/tornscarf/urban + +/datum/gear/mask/scarf_white + display_name = "Scarf, white" + path = /obj/item/clothing/mask/tornscarf/snow + +/datum/gear/mask/uscm allowed_origins = USCM_ORIGINS -/datum/gear/cmbeanie - display_name = "USCM Beanie (Gray)" - path = /obj/item/clothing/head/beanie/gray +/datum/gear/mask/uscm/balaclava_green + display_name = "USCM balaclava, green" + path = /obj/item/clothing/mask/rebreather/scarf/green + +/datum/gear/mask/uscm/balaclava_grey + display_name = "USCM balaclava, grey" + path = /obj/item/clothing/mask/rebreather/scarf/gray + +/datum/gear/mask/uscm/balaclava_tan + display_name = "USCM balaclava, tan" + path = /obj/item/clothing/mask/rebreather/scarf/tan + +/datum/gear/headwear + category = "Headwear" cost = 3 slot = WEAR_HEAD + +/datum/gear/headwear/durag_black + display_name = "Durag, black" + path = /obj/item/clothing/head/durag/black + +/datum/gear/headwear/durag + display_name = "Durag, mission specific" + path = /obj/item/clothing/head/durag + +/datum/gear/headwear/uscm allowed_origins = USCM_ORIGINS -/datum/gear/cmbeanie/green - display_name = "USCM Beanie (Green)" +/datum/gear/headwear/uscm/bandana_green + display_name = "USCM bandana, green" + path = /obj/item/clothing/head/cmbandana + +/datum/gear/headwear/uscm/bandana_tan + display_name = "USCM bandana, tan" + path = /obj/item/clothing/head/cmbandana/tan + +/datum/gear/headwear/uscm/beanie_grey + display_name = "USCM beanie, grey" + path = /obj/item/clothing/head/beanie/gray + +/datum/gear/headwear/uscm/beanie_green + display_name = "USCM beanie, green" path = /obj/item/clothing/head/beanie/green -/datum/gear/cmbeanie/tan - display_name = "USCM Beanie (Tan)" +/datum/gear/headwear/uscm/beanie_tan + display_name = "USCM beanie, tan" path = /obj/item/clothing/head/beanie/tan -/datum/gear/squadberet - display_name = "USCM Beret (Squad Specific)" +/datum/gear/headwear/uscm/beret_squad + display_name = "USCM beret, squad specific" path = /obj/item/clothing/head/beret/cm/squadberet - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS -/datum/gear/cmberet - display_name = "USCM Beret (Green)" + +/datum/gear/headwear/uscm/beret_green + display_name = "USCM beret, green" path = /obj/item/clothing/head/beret/cm - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS -/datum/gear/cmberettan - display_name = "USCM Beret (Tan)" +/datum/gear/headwear/uscm/beret_tan + display_name = "USCM beret, tan" path = /obj/item/clothing/head/beret/cm/tan - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS -/datum/gear/cmheadband - display_name = "USCM Headband (Green)" - path = /obj/item/clothing/head/headband - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS +/datum/gear/headwear/uscm/boonie_olive + display_name = "USCM boonie hat, olive" + path = /obj/item/clothing/head/cmcap/boonie -/datum/gear/cmheadbandred - display_name = "USCM Headband (Red)" - path = /obj/item/clothing/head/headband/red - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS +/datum/gear/headwear/uscm/boonie_tan + display_name = "USCM boonie hat, tan" + path = /obj/item/clothing/head/cmcap/boonie/tan -/datum/gear/cmheadbandtan - display_name = "USCM Headband (Tan)" - path = /obj/item/clothing/head/headband/tan - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS +/datum/gear/headwear/uscm/cap + display_name = "USCM cap" + path = /obj/item/clothing/head/cmcap -/datum/gear/cmheadbandbrown - display_name = "USCM Headband (Brown)" +/datum/gear/headwear/uscm/headband_brown + display_name = "USCM headband, brown" path = /obj/item/clothing/head/headband/brown - cost = 3 - slot = WEAR_HEAD -/datum/gear/cmheadbandgray - display_name = "USCM Headband (Gray)" +/datum/gear/headwear/uscm/headband_green + display_name = "USCM headband, green" + path = /obj/item/clothing/head/headband + +/datum/gear/headwear/uscm/headband_grey + display_name = "USCM headband, grey" path = /obj/item/clothing/head/headband/gray - cost = 3 - slot = WEAR_HEAD -/datum/gear/cmheadbandsquad - display_name = "USCM Headband (Squad)" +/datum/gear/headwear/uscm/headband_red + display_name = "USCM headband, red" + path = /obj/item/clothing/head/headband/red + +/datum/gear/headwear/uscm/headband_tan + display_name = "USCM headband, tan" + path = /obj/item/clothing/head/headband/tan + +/datum/gear/headwear/uscm/headband_squad + display_name = "USCM headband, squad specific" path = /obj/item/clothing/head/headband/squad - cost = 3 - slot = WEAR_HEAD -/datum/gear/cmheadset - display_name = "USCM Earpiece" +/datum/gear/headwear/uscm/headset + display_name = "USCM headset" path = /obj/item/clothing/head/headset - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS -/datum/gear/cmcap - display_name = "USCM Cap" - path = /obj/item/clothing/head/cmcap - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS +/datum/gear/helmet_garb + category = "Helmet accessories" + cost = 1 -/datum/gear/booniehat - display_name = "USCM Boonie Hat (Olive)" - path = /obj/item/clothing/head/cmcap/boonie - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS +/datum/gear/helmet_garb/flair_initech + display_name = "Flair, Initech" + path = /obj/item/prop/helmetgarb/flair_initech -/datum/gear/booniehattan - display_name = "USCM Boonie Hat (Tan)" - path = /obj/item/clothing/head/cmcap/boonie/tan - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS +/datum/gear/helmet_garb/flair_io + display_name = "Flair, Io" + path = /obj/item/prop/helmetgarb/flair_io -/datum/gear/durag - display_name = "Durag (Mission Specific)" - path = /obj/item/clothing/head/durag - cost = 3 - slot = WEAR_HEAD +/datum/gear/helmet_garb/flair_peace + display_name = "Flair, Peace and Love" + path = /obj/item/prop/helmetgarb/flair_peace -/datum/gear/duragblack - display_name = "Durag (Black)" - path = /obj/item/clothing/head/durag/black - cost = 3 - slot = WEAR_HEAD +/datum/gear/helmet_garb/flair_uscm + display_name = "Flair, USCM" + path = /obj/item/prop/helmetgarb/flair_uscm -/datum/gear/eyepatch - display_name = "Eyepatch" - path = /obj/item/clothing/glasses/eyepatch - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/helmet_gasmask + display_name = "M5 integrated gasmask" + path = /obj/item/prop/helmetgarb/helmet_gasmask -/datum/gear/thugshades - display_name = "BiMex Personal Shades" - path = /obj/item/clothing/glasses/sunglasses/big - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/gunoil + display_name = "Gun oil" + path = /obj/item/prop/helmetgarb/gunoil -/datum/gear/sunglasses - display_name = "Cheap Sunglasses" - path = /obj/item/clothing/glasses/sunglasses - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/netting + display_name = "Helmet netting" + path = /obj/item/prop/helmetgarb/netting -/datum/gear/prescription_sunglasses - display_name = "Prescription Sunglasses" - path = /obj/item/clothing/glasses/sunglasses/prescription - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/lucky_feather + display_name = "Lucky feather, red" + path = /obj/item/prop/helmetgarb/lucky_feather -/datum/gear/cigar - display_name = "Premium Cigar" - path = /obj/item/clothing/mask/cigarette/cigar - slot = WEAR_FACE - cost = 2 +/datum/gear/helmet_garb/lucky_feather/yellow + display_name = "Lucky feather, yellow" + path = /obj/item/prop/helmetgarb/lucky_feather/yellow -/datum/gear/classic_cigar - display_name = "Classic Cigar" - path = /obj/item/clothing/mask/cigarette/cigar/classic - slot = WEAR_FACE - cost = 3 +/datum/gear/helmet_garb/lucky_feather/purple + display_name = "Lucky feather, purple" + path = /obj/item/prop/helmetgarb/lucky_feather/purple -/datum/gear/cigarette - display_name = "Cigarette" - path = /obj/item/clothing/mask/cigarette - slot = WEAR_FACE - cost = 1 +/datum/gear/helmet_garb/lucky_feather/blue + display_name = "Lucky feather, blue" + path = /obj/item/prop/helmetgarb/lucky_feather/blue -/datum/gear/balaclava - display_name = "Black Balaclava" - path = /obj/item/clothing/mask/balaclava - slot = WEAR_FACE - cost = 2 +/datum/gear/helmet_garb/broken_nvgs + display_name = "Night vision goggles, broken" + path = /obj/item/prop/helmetgarb/helmet_nvg/cosmetic -/datum/gear/balaclava/green - display_name = "Green Balaclava" - path = /obj/item/clothing/mask/balaclava/tactical - slot = WEAR_FACE - cost = 2 +/datum/gear/helmet_garb/prescription_bottle + display_name = "Prescription bottle" + path = /obj/item/prop/helmetgarb/prescription_bottle -/datum/gear/coif - display_name = "Coif" - path = /obj/item/clothing/mask/rebreather/scarf - cost = 2 - slot = WEAR_FACE +/datum/gear/helmet_garb/raincover + display_name = "Rain cover" + path = /obj/item/prop/helmetgarb/raincover -/datum/gear/cmbalaclava - display_name = "USCM Balaclava (Green)" - path = /obj/item/clothing/mask/rebreather/scarf/green - cost = 2 - slot = WEAR_FACE - allowed_origins = USCM_ORIGINS +/datum/gear/helmet_garb/rabbits_foot + display_name = "Rabbit's foot" + path = /obj/item/prop/helmetgarb/rabbitsfoot -/datum/gear/cmbalaclava/tan - display_name = "USCM Balaclava (Tan)" - path = /obj/item/clothing/mask/rebreather/scarf/tan - cost = 2 - slot = WEAR_FACE +/datum/gear/helmet_garb/rosary + display_name = "Rosary" + path = /obj/item/prop/helmetgarb/rosary -/datum/gear/cmbalaclava/gray - display_name = "USCM Balaclava (Gray)" - path = /obj/item/clothing/mask/rebreather/scarf/gray - cost = 2 - slot = WEAR_FACE +/datum/gear/helmet_garb/spent_buck + display_name = "Spent buckshot" + path = /obj/item/prop/helmetgarb/spent_buckshot -/datum/gear/cmgoggles - display_name = "Ballistic Goggles" - path = /obj/item/clothing/glasses/mgoggles - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/spent_flechette + display_name = "Spent flechette" + path = /obj/item/prop/helmetgarb/spent_flech -/datum/gear/cmPgoggles - display_name = "Prescription Ballistic Goggles" - path = /obj/item/clothing/glasses/mgoggles/prescription - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/spent_slugs + display_name = "Spent slugs" + path = /obj/item/prop/helmetgarb/spent_slug -/datum/gear/cmgogglesblack - display_name = "Ballistic Goggles (Black)" - path = /obj/item/clothing/glasses/mgoggles/black - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/spacejam_tickets + display_name = "Tickets to Space Jam" + path = /obj/item/prop/helmetgarb/spacejam_tickets -/datum/gear/cmgogglesorange - display_name = "Ballistic Goggles (Orange)" - path = /obj/item/clothing/glasses/mgoggles/orange - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/trimmed_wire + display_name = "Trimmed barbed wire" + path = /obj/item/prop/helmetgarb/trimmed_wire -/datum/gear/aviators - display_name = "Aviator Shades" - path = /obj/item/clothing/glasses/sunglasses/aviator - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/bullet_pipe + display_name = "10x99mm XM42B casing pipe" + path = /obj/item/prop/helmetgarb/bullet_pipe + allowed_origins = USCM_ORIGINS -/datum/gear/rpgglasses - display_name = "Marine RPG Glasses" - path = /obj/item/clothing/glasses/regular - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/chaplain_patch + display_name = "USCM chaplain helmet patch" + path = /obj/item/prop/helmetgarb/chaplain_patch allowed_origins = USCM_ORIGINS -/datum/gear/prescglasses - display_name = "Prescription Glasses" - path = /obj/item/clothing/glasses/regular/hipster - cost = 2 - slot = WEAR_EYES +/datum/gear/paperwork + category = "Paperwork" -/datum/gear/tacticalmask - display_name = "Face Wrap (Gray)" - path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/pen + display_name = "Pen, black" + path = /obj/item/tool/pen + cost = 1 -/datum/gear/tacticalmasktan - display_name = "Face Wrap (Tan)" - path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/tan - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/pen_blue + display_name = "Pen, blue" + path = /obj/item/tool/pen/blue -/datum/gear/tacticalmaskred - display_name = "Face Wrap (Red)" - path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/red - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/pen_green + display_name = "Pen, green" + path = /obj/item/tool/pen/green -/datum/gear/tacticalmaskgreeen - display_name = "Face Wrap (Green)" - path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/pen_red + display_name = "Pen, red" + path = /obj/item/tool/pen/red -/datum/gear/tacticalmasksquad - display_name = "Face Wrap (Squad)" - path =/obj/item/clothing/mask/rebreather/scarf/tacticalmask/squad - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/paper + display_name = "Sheet of paper" + path = /obj/item/paper + cost = 1 -/datum/gear/tacticalmaskblack - display_name = "Face Wrap (Black)" - path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/black - slot = WEAR_FACE - cost = 2 -// -/datum/gear/tornscarfclassic - display_name = "Scarf (Grey)" - path = /obj/item/clothing/mask/tornscarf - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/clipboard + display_name = "Clipboard" + path = /obj/item/clipboard -/datum/gear/tornscarfgreen - display_name = "Scarf (Green)" - path = /obj/item/clothing/mask/tornscarf/green - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/folder_black + display_name = "Folder, black" + path = /obj/item/folder/black -/datum/gear/tornscarfwhite - display_name = "Scarf (White)" - path = /obj/item/clothing/mask/tornscarf/snow - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/folder_blue + display_name = "Folder, blue" + path = /obj/item/folder/blue -/datum/gear/tornscarfdesert - display_name = "Scarf (Desert)" - path = /obj/item/clothing/mask/tornscarf/desert - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/folder_red + display_name = "Folder, red" + path = /obj/item/folder/red -/datum/gear/tornscarfurban - display_name = "Scarf (Urban)" - path = /obj/item/clothing/mask/tornscarf/urban - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/folder_white + display_name = "Folder, white" + path = /obj/item/folder/white -/datum/gear/tornscarfblack - display_name = "Scarf (Black)" - path = /obj/item/clothing/mask/tornscarf/black - slot = WEAR_FACE - cost = 2 -// -/datum/gear/greenfacepaint - display_name = "Green Facepaint" - path = /obj/item/facepaint/green - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/paperwork/folder_yellow + display_name = "Folder, yellow" + path = /obj/item/folder/yellow -/datum/gear/brownfacepaint - display_name = "Brown Facepaint" - path = /obj/item/facepaint/brown - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/paperwork/notepad_black + display_name = "Notepad, black" + path = /obj/item/notepad/black -/datum/gear/blackfacepaint - display_name = "Black Facepaint" - path = /obj/item/facepaint/black - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/paperwork/notepad_blue + display_name = "Notepad, blue" + path = /obj/item/notepad/blue -/datum/gear/fullbodyfacepaint - display_name = "Fullbody Paint" - path = /obj/item/facepaint/sniper - slot = WEAR_IN_BACK - cost = 4 //To match with the skull paint amount of point, gave this amount of point for the same reason of the skull facepaint (too cool for everyone to be able to constantly use) +/datum/gear/paperwork/notepad_green + display_name = "Notepad, green" + path = /obj/item/notepad/green -/datum/gear/aceofspades - display_name = "Ace of Spades" - path = /obj/item/toy/handcard/aceofspades - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/paperwork/notepad_red + display_name = "Notepad, red" + path = /obj/item/notepad/red -/datum/gear/pack_emeraldgreen - display_name = "Pack Of Emerald Greens" - path = /obj/item/storage/fancy/cigarettes/emeraldgreen - slot = WEAR_IN_BACK +/datum/gear/toy + category = "Recreational" + +/datum/gear/toy/camera + display_name = "Camera" + path = /obj/item/device/camera + +/datum/gear/toy/film + display_name = "Camera film" + path = /obj/item/device/camera_film cost = 1 -/datum/gear/pack_lucky_strikes - display_name = "Pack Of Lucky Strikes" - path = /obj/item/storage/fancy/cigarettes/lucky_strikes - slot = WEAR_IN_BACK +/datum/gear/toy/card cost = 1 -/datum/gear/weed_joint - display_name = "Joint of Space Weed" - path = /obj/item/clothing/mask/cigarette/weed - slot = WEAR_IN_BACK +/datum/gear/toy/card/ace_of_spades + display_name = "Card, ace of spades" + path = /obj/item/toy/handcard/aceofspades + +/datum/gear/toy/card/uno_reverse_red + display_name = "Card, Uno Reverse - red" + path = /obj/item/toy/handcard/uno_reverse_red + +/datum/gear/toy/card/uno_reverse_blue + display_name = "Card, Uno Reverse - blue" + path = /obj/item/toy/handcard/uno_reverse_blue + +/datum/gear/toy/card/uno_reverse_purple + display_name = "Card, Uno Reverse - purple" + path = /obj/item/toy/handcard/uno_reverse_purple + +/datum/gear/toy/card/uno_reverse_yellow + display_name = "Card, Uno Reverse - yellow" + path = /obj/item/toy/handcard/uno_reverse_yellow + +/datum/gear/toy/deck + display_name = "Deck of cards, regular" + path = /obj/item/toy/deck + +/datum/gear/toy/deck/uno + display_name = "Deck of cards, Uno" + path = /obj/item/toy/deck/uno + +/datum/gear/toy/d6 + display_name = "Die, 6 sides" + path = /obj/item/toy/dice + +/datum/gear/toy/d20 + display_name = "Die, 20 sides" + path = /obj/item/toy/dice/d20 + +/datum/gear/toy/walkman + display_name = "Walkman" + path = /obj/item/device/walkman + +/datum/gear/weapon + category = "Weapons" cost = 4 -/datum/gear/type_80_Bayonet +/datum/gear/weapon/type_80_Bayonet display_name = "Type 80 Bayonet" path = /obj/item/attachable/bayonet/upp_replica - slot = WEAR_IN_BACK - cost = 4 -/datum/gear/m8_cartridge_bayonet +/datum/gear/weapon/m8_cartridge_bayonet display_name = "M8 Cartridge Bayonet" path = /obj/item/storage/box/co2_knife - slot = WEAR_IN_BACK - cost = 4 -/datum/gear/clfpistol +/datum/gear/weapon/clfpistol display_name = "D18 Holdout Pistol" path = /obj/item/storage/box/clf - slot = WEAR_IN_BACK - cost = 4 -/datum/gear/m4a3_custom +/datum/gear/weapon/m4a3_custom display_name = "M4A3 Custom Pistol" path = /obj/item/weapon/gun/pistol/m4a3/custom - slot = WEAR_IN_BACK - cost = 4 allowed_origins = USCM_ORIGINS -/datum/gear/m44_custom_revolver +/datum/gear/weapon/m44_custom_revolver display_name = "M44 Custom Revolver" path = /obj/item/weapon/gun/revolver/m44/custom - slot = WEAR_IN_BACK - cost = 7 allowed_origins = USCM_ORIGINS -/datum/gear/jungle_boots - display_name = "Jungle Pattern Combat Boots" - path = /obj/item/clothing/shoes/marine/jungle - slot = WEAR_IN_BACK - cost = 3 +/datum/gear/drink + category = "Canned drinks" -/datum/gear/uno_reverse_red - display_name = "Uno Reverse - Red" - path = /obj/item/toy/handcard/uno_reverse_red - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/drink/water + display_name = "Bottled water" + path = /obj/item/reagent_container/food/drinks/cans/waterbottle + cost = 1 -/datum/gear/uno_reverse_blue - display_name = "Uno Reverse - Blue" - path = /obj/item/toy/handcard/uno_reverse_blue - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/drink/grape_juice + display_name = "Grape juice" + path = /obj/item/reagent_container/food/drinks/cans/grape_juice -/datum/gear/uno_reverse_purple - display_name = "Uno Reverse - Purple" - path = /obj/item/toy/handcard/uno_reverse_purple - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/drink/lemon_lime + display_name = "Lemon lime" + path = /obj/item/reagent_container/food/drinks/cans/lemon_lime -/datum/gear/uno_reverse_yellow - display_name = "Uno Reverse - Yellow" - path = /obj/item/toy/handcard/uno_reverse_yellow - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/drink/iced_tea + display_name = "Iced tea" + path = /obj/item/reagent_container/food/drinks/cans/iced_tea + +/datum/gear/drink/cola + display_name = "Classic Cola" + path = /obj/item/reagent_container/food/drinks/cans/classcola + +/datum/gear/drink/mountain_wind + display_name = "Mountain Wind" + path = /obj/item/reagent_container/food/drinks/cans/space_mountain_wind + +/datum/gear/drink/space_up + display_name = "Space Up" + path = /obj/item/reagent_container/food/drinks/cans/space_up -/datum/gear/candy +/datum/gear/drink/souto_classic + display_name = "Classic Souto" + path = /obj/item/reagent_container/food/drinks/cans/souto/classic + +/datum/gear/drink/souto_diet + display_name = "Diet Souto" + path = /obj/item/reagent_container/food/drinks/cans/souto/diet/classic + +/datum/gear/drink/boda + display_name = "Boda Soda" + path = /obj/item/reagent_container/food/drinks/cans/boda + cost = 3 //Legally imported from UPP. + +/datum/gear/drink/boda/plus + display_name = "Boda Cola" + path = /obj/item/reagent_container/food/drinks/cans/bodaplus + +/datum/gear/drink/alcohol + cost = 3 //Illegal in military. + +/datum/gear/drink/alcohol/ale + display_name = "Weyland-Yutani IPA Ale" + path = /obj/item/reagent_container/food/drinks/cans/ale + +/datum/gear/drink/alcohol/aspen + display_name = "Weyland-Yutani Aspen Beer" + path = /obj/item/reagent_container/food/drinks/cans/aspen + +/datum/gear/drink/alcohol/beer + display_name = "Weyland-Yutani Lite Beer" + path = /obj/item/reagent_container/food/drinks/cans/beer + +/datum/gear/drink/alcohol/loko + display_name = "Thirteen Loko" + path = /obj/item/reagent_container/food/drinks/cans/thirteenloko + +/datum/gear/flask + category = "Flasks" + +/datum/gear/flask/canteen + display_name = "Canteen" + path = /obj/item/reagent_container/food/drinks/flask/canteen + +/datum/gear/flask/leather + display_name = "Leather flask" + path = /obj/item/reagent_container/food/drinks/flask/detflask + +/datum/gear/flask/leather_black + display_name = "Black leather flask" + path = /obj/item/reagent_container/food/drinks/flask/barflask + +/datum/gear/flask/metal + display_name = "Metal flask" + path = /obj/item/reagent_container/food/drinks/flask + +/datum/gear/flask/uscm + display_name = "USCM flask" + path = /obj/item/reagent_container/food/drinks/flask/marine + +/datum/gear/flask/vacuum + display_name = "Vacuum flask" + path = /obj/item/reagent_container/food/drinks/flask/vacuumflask + +/datum/gear/flask/wy + display_name = "WY flask" + path = /obj/item/reagent_container/food/drinks/flask/weylandyutani + +/datum/gear/snack_sweet + category = "Food (sweets)" + +/datum/gear/snack_sweet/candy display_name = "Bar of candy" path = /obj/item/reagent_container/food/snacks/candy - slot = WEAR_IN_BACK - cost = 2 -/datum/gear/lime - display_name = "Lucky Lime" - path = /obj/item/reagent_container/food/snacks/grown/lime - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/snack_sweet/chocolate + display_name = "Bar of chocolate" + path = /obj/item/reagent_container/food/snacks/chocolatebar -/datum/gear/pen - display_name = "Pen" - path = /obj/item/tool/pen - slot = WEAR_IN_BACK - cost = 1 +/datum/gear/snack_sweet/candy_apple + display_name = "Candied apple" + path = /obj/item/reagent_container/food/snacks/candiedapple -/datum/gear/lighter - display_name = "Random Lighter" - path = /obj/item/tool/lighter/random - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/snack_sweet/cookie + display_name = "Cookie" + path = /obj/item/reagent_container/food/snacks/cookie -/datum/gear/uscmpatch - display_name = "USCM shoulder patch" - path = /obj/item/clothing/accessory/patch - cost = 1 - slot = WEAR_IN_ACCESSORY - allowed_origins = USCM_ORIGINS +/datum/gear/snack_sweet/fortune_cookie + display_name = "Fortune cookie" + path = /obj/item/reagent_container/food/snacks/fortunecookie/prefilled + cost = 3 -/datum/gear/falconpatch - display_name = "Falling Falcons shoulder patch" - path = /obj/item/clothing/accessory/patch/falcon - cost = 1 - slot = WEAR_IN_ACCESSORY - allowed_origins = USCM_ORIGINS +/datum/gear/snack_sweet/donut_normal + display_name = "Donut" + path = /obj/item/reagent_container/food/snacks/donut/normal -/datum/gear/gas_mask - display_name = "Gas Mask" - path = /obj/item/clothing/mask/gas - cost = 2 - slot = WEAR_FACE +/datum/gear/snack_sweet/donut_jelly + display_name = "Jelly donut" + path = /obj/item/reagent_container/food/snacks/donut/jelly -/datum/gear/gunoil - display_name = "Gun Oil" - path = /obj/item/prop/helmetgarb/gunoil - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_sweet/donut_cherry + display_name = "Cherry donut" + path = /obj/item/reagent_container/food/snacks/donut/cherryjelly -/datum/gear/netting - display_name = "Helmet Netting" - path = /obj/item/prop/helmetgarb/netting - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged + category = "Food (packaged)" -/datum/gear/spent_buck - display_name = "Spent Buckshot" - path = /obj/item/prop/helmetgarb/spent_buckshot - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged/beef_jerky + display_name = "Beef jerky" + path = /obj/item/reagent_container/food/snacks/sosjerky -/datum/gear/spent_slugs - display_name = "Spent Slugs" - path = /obj/item/prop/helmetgarb/spent_slug - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged/meat_bar + display_name = "MEAT bar" + path = /obj/item/reagent_container/food/snacks/eat_bar -/datum/gear/spent_flechette - display_name = "Spent Flechette" - path = /obj/item/prop/helmetgarb/spent_flech - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged/kepler_crisps + display_name = "Kepler Crisps" + path = /obj/item/reagent_container/food/snacks/kepler_crisps -/datum/gear/prescription_bottle - display_name = "Prescription Bottle" - path = /obj/item/prop/helmetgarb/prescription_bottle - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged/burrito + display_name = "Packaged burrito" + path = /obj/item/reagent_container/food/snacks/packaged_burrito -/datum/gear/raincover - display_name = "Helmet Rain Cover" - path = /obj/item/prop/helmetgarb/raincover - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged/cheeseburger + display_name = "Packaged cheeseburger" + path = /obj/item/reagent_container/food/snacks/packaged_burger -/datum/gear/rabbits_foot - display_name = "Rabbit's Foot" - path = /obj/item/prop/helmetgarb/rabbitsfoot - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged/hotdog + display_name = "Packaged hotdog" + path = /obj/item/reagent_container/food/snacks/packaged_hdogs -/datum/gear/rosary - display_name = "Rosary" - path = /obj/item/prop/helmetgarb/rosary - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged/chips_pepper + display_name = "W-Y Pepper Chips" + path = /obj/item/reagent_container/food/snacks/wy_chips/pepper -/datum/gear/lucky_feather - display_name = "Lucky Feather - Red" - path = /obj/item/prop/helmetgarb/lucky_feather - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_grown + category = "Food (healthy)" -/datum/gear/lucky_feather/blue - display_name = "Lucky Feather - Blue" - path = /obj/item/prop/helmetgarb/lucky_feather/blue +/datum/gear/snack_grown/apple + display_name = "Apple" + path = /obj/item/reagent_container/food/snacks/grown/apple -/datum/gear/lucky_feather/purple - display_name = "Lucky Feather - Purple" - path = /obj/item/prop/helmetgarb/lucky_feather/purple +/datum/gear/snack_grown/carrot + display_name = "Carrot" + path = /obj/item/reagent_container/food/snacks/grown/carrot -/datum/gear/lucky_feather/yellow - display_name = "Lucky Feather - Yellow" - path = /obj/item/prop/helmetgarb/lucky_feather/yellow +/datum/gear/snack_grown/corn + display_name = "Corn" + path = /obj/item/reagent_container/food/snacks/grown/corn -/datum/gear/helmet_gasmask - display_name = "M5 integrated gasmask" - path = /obj/item/prop/helmetgarb/helmet_gasmask - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/snack_grown/lemon + display_name = "Lemon" + path = /obj/item/reagent_container/food/snacks/grown/lemon -/datum/gear/trimmed_wire - display_name = "Trimmed Barbed Wire" - path = /obj/item/prop/helmetgarb/trimmed_wire - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/snack_grown/lime + display_name = "Lime" + path = /obj/item/reagent_container/food/snacks/grown/lime -/datum/gear/bullet_pipe - display_name = "10x99mm XM42B casing pipe" - path = /obj/item/prop/helmetgarb/bullet_pipe - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_grown/orange + display_name = "Orange" + path = /obj/item/reagent_container/food/snacks/grown/orange -/datum/gear/flair_initech - display_name = "Initech Flair" - path = /obj/item/prop/helmetgarb/flair_initech - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_grown/potato + display_name = "Potato" + path = /obj/item/reagent_container/food/snacks/grown/potato -/datum/gear/flair_io - display_name = "Io Flair" - path = /obj/item/prop/helmetgarb/flair_io - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/smoking + category = "Smoking" -/datum/gear/flair_peace - display_name = "Peace and Love Flair" - path = /obj/item/prop/helmetgarb/flair_peace +/datum/gear/smoking/cigarette + display_name = "Cigarette" + path = /obj/item/clothing/mask/cigarette cost = 1 - slot = WEAR_IN_BACK + slot = WEAR_FACE -/datum/gear/flair_uscm - display_name = "USCM Flair" - path = /obj/item/prop/helmetgarb/flair_uscm - cost = 1 - slot = WEAR_IN_BACK - allowed_origins = USCM_ORIGINS +/datum/gear/smoking/cigarette/cigar_classic + display_name = "Classic cigar" + path = /obj/item/clothing/mask/cigarette/cigar/classic + cost = 3 -/datum/gear/broken_nvgs - display_name = "Broken Night Vision Goggles" - path = /obj/item/prop/helmetgarb/helmet_nvg/cosmetic - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/smoking/cigarette/cigar_premium + display_name = "Premium cigar" + path = /obj/item/clothing/mask/cigarette/cigar + cost = 2 -/datum/gear/spacejam_tickets - display_name = "Authentic Tickets to Space Jam" - path = /obj/item/prop/helmetgarb/spacejam_tickets - cost = 4 - slot = WEAR_IN_BACK +/datum/gear/smoking/pack_emerald_green + display_name = "Pack Of Emerald Greens" + path = /obj/item/storage/fancy/cigarettes/emeraldgreen -/datum/gear/weyland_booze - display_name = "Weyland-Yutani Lite" - path = /obj/item/reagent_container/food/drinks/cans/beer - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/smoking/pack_lucky_strikes + display_name = "Pack Of Lucky Strikes" + path = /obj/item/storage/fancy/cigarettes/lucky_strikes -/datum/gear/weyland_IPA - display_name = "Weyland-Yutani IPA" - path = /obj/item/reagent_container/food/drinks/cans/beer - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/smoking/weed_joint + display_name = "Joint of space weed" + path = /obj/item/clothing/mask/cigarette/weed + cost = 4 -/datum/gear/flask - display_name = "Metal Flask" - path = /obj/item/reagent_container/food/drinks/flask - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/smoking/lighter + display_name = "Lighter, cheap" + path = /obj/item/tool/lighter/random + cost = 1 -/datum/gear/flask_canteen - display_name = "Canteen" - path = /obj/item/reagent_container/food/drinks/flask/canteen - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/smoking/zippo + display_name = "Lighter, zippo" + path = /obj/item/tool/lighter/zippo -/datum/gear/flask_uscm - display_name = "USCM Flask" - path = /obj/item/reagent_container/food/drinks/flask/marine - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/misc + category = "Miscellaneous" -/datum/gear/flask_wy - display_name = "WY Flask" - path = /obj/item/reagent_container/food/drinks/flask/weylandyutani - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/misc/facepaint_green + display_name = "Facepaint, green" + path = /obj/item/facepaint/green -/datum/gear/flask_det - display_name = "Leather Flask" - path = /obj/item/reagent_container/food/drinks/flask/detflask - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/misc/facepaint_brown + display_name = "Facepaint, brown" + path = /obj/item/facepaint/brown -/datum/gear/flask_bar - display_name = "Black Leather Flask" - path = /obj/item/reagent_container/food/drinks/flask/barflask - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/misc/facepaint_black + display_name = "Facepaint, black" + path = /obj/item/facepaint/black -/datum/gear/flask_vacuum - display_name = "Vacuum Flask" - path = /obj/item/reagent_container/food/drinks/flask/vacuumflask - cost = 3 //they're too cool for 2 points - slot = WEAR_IN_BACK +/datum/gear/misc/facepaint_body + display_name = "Fullbody paint" + path = /obj/item/facepaint/sniper + cost = 4 //To match with the skull paint amount of point, gave this amount of point for the same reason of the skull facepaint (too cool for everyone to be able to constantly use) + +/datum/gear/misc/jungle_boots + display_name = "Jungle pattern combat boots" + path = /obj/item/clothing/shoes/marine/jungle + cost = 3 -/datum/gear/pdt_kit - display_name = "PDT/L Kit" +/datum/gear/misc/pdt_kit + display_name = "PDT/L kit" path = /obj/item/storage/box/pdt_kit cost = 3 - slot = WEAR_IN_BACK -/datum/gear/sunscreen_stick - display_name = "USCM Issue Sunscreen" +/datum/gear/misc/sunscreen_stick + display_name = "USCM issue sunscreen" path = /obj/item/facepaint/sunscreen_stick cost = 1 //The cadmium poisoning pays for the discounted cost longterm - slot = WEAR_IN_BACK + allowed_origins = USCM_ORIGINS -/datum/gear/chaplain_patch - display_name = "USCM Chaplain Helmet Patch" - path = /obj/item/prop/helmetgarb/chaplain_patch - cost = 1 //similar price to flairs - slot = WEAR_IN_BACK +/datum/gear/misc/patch_uscm + display_name = "USCM shoulder patch" + path = /obj/item/clothing/accessory/patch + cost = 1 + slot = WEAR_IN_ACCESSORY + allowed_origins = USCM_ORIGINS + +/datum/gear/misc/patch_uscm/falcon + display_name = "Falling Falcons shoulder patch" + path = /obj/item/clothing/accessory/patch/falcon diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index cca62d91e508..0a1b54112f18 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -150,6 +150,7 @@ S["view_controller"] >> View_MC S["observer_huds"] >> observer_huds S["pref_special_job_options"] >> pref_special_job_options + S["pref_job_slots"] >> pref_job_slots S["synth_name"] >> synthetic_name S["synth_type"] >> synthetic_type @@ -172,6 +173,7 @@ S["commander_status"] >> commander_status S["co_sidearm"] >> commander_sidearm + S["co_affiliation"] >> affiliation S["yautja_status"] >> yautja_status S["synth_status"] >> synth_status S["key_bindings"] >> key_bindings @@ -190,6 +192,7 @@ S["custom_cursors"] >> custom_cursors S["autofit_viewport"] >> auto_fit_viewport + S["adaptive_zoom"] >> adaptive_zoom //Sanitize ooccolor = sanitize_hexcolor(ooccolor, CONFIG_GET(string/ooc_color_default)) @@ -221,6 +224,7 @@ no_radials_preference = sanitize_integer(no_radials_preference, FALSE, TRUE, FALSE) no_radial_labels_preference = sanitize_integer(no_radial_labels_preference, FALSE, TRUE, FALSE) auto_fit_viewport = sanitize_integer(auto_fit_viewport, FALSE, TRUE, TRUE) + adaptive_zoom = sanitize_integer(adaptive_zoom, 0, 2, 0) synthetic_name = synthetic_name ? sanitize_text(synthetic_name, initial(synthetic_name)) : initial(synthetic_name) synthetic_type = sanitize_inlist(synthetic_type, PLAYER_SYNTHS, initial(synthetic_type)) @@ -242,6 +246,7 @@ predator_flavor_text = predator_flavor_text ? sanitize_text(predator_flavor_text, initial(predator_flavor_text)) : initial(predator_flavor_text) commander_status = sanitize_inlist(commander_status, whitelist_hierarchy, initial(commander_status)) commander_sidearm = sanitize_inlist(commander_sidearm, list("Mateba","Colonel's Mateba","Golden Desert Eagle","Desert Eagle"), initial(commander_sidearm)) + affiliation = sanitize_inlist(affiliation, FACTION_ALLEGIANCE_USCM_COMMANDER, initial(affiliation)) yautja_status = sanitize_inlist(yautja_status, whitelist_hierarchy + list("Elder"), initial(yautja_status)) synth_status = sanitize_inlist(synth_status, whitelist_hierarchy, initial(synth_status)) key_bindings = sanitize_keybindings(key_bindings) @@ -249,6 +254,7 @@ hotkeys = sanitize_integer(hotkeys, FALSE, TRUE, TRUE) custom_cursors = sanitize_integer(custom_cursors, FALSE, TRUE, TRUE) pref_special_job_options = sanitize_islist(pref_special_job_options, list()) + pref_job_slots = sanitize_islist(pref_job_slots, list()) vars["fps"] = fps if(remembered_key_bindings) @@ -324,6 +330,7 @@ S["view_controller"] << View_MC S["observer_huds"] << observer_huds S["pref_special_job_options"] << pref_special_job_options + S["pref_job_slots"] << pref_job_slots S["synth_name"] << synthetic_name S["synth_type"] << synthetic_type @@ -346,6 +353,7 @@ S["commander_status"] << commander_status S["co_sidearm"] << commander_sidearm + S["co_affiliation"] << affiliation S["yautja_status"] << yautja_status S["synth_status"] << synth_status @@ -355,6 +363,7 @@ S["hotkeys"] << hotkeys S["autofit_viewport"] << auto_fit_viewport + S["adaptive_zoom"] << adaptive_zoom S["hear_vox"] << hear_vox @@ -442,6 +451,7 @@ S["traits"] >> traits S["preferred_squad"] >> preferred_squad + S["preferred_armor"] >> preferred_armor S["nanotrasen_relation"] >> nanotrasen_relation //S["skin_style"] >> skin_style @@ -491,6 +501,7 @@ 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)) backbag = sanitize_integer(backbag, 1, backbaglist.len, initial(backbag)) + preferred_armor = sanitize_inlist(preferred_armor, GLOB.armor_style_list, "Random") //b_type = sanitize_text(b_type, initial(b_type)) alternate_option = sanitize_integer(alternate_option, 0, 3, initial(alternate_option)) @@ -586,6 +597,7 @@ S["nanotrasen_relation"] << nanotrasen_relation S["preferred_squad"] << preferred_squad + S["preferred_armor"] << preferred_armor //S["skin_style"] << skin_style S["uplinklocation"] << uplinklocation diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 90b605b7f54f..9e3d9eb33766 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -201,13 +201,19 @@ to_chat(src, SPAN_BOLDNOTICE("The icon on your taskbar will no longer flash when an admin messages you. Warning, use at own risk.")) //be special -/client/verb/toggle_be_special(role in be_special_flags) +/client/verb/toggle_be_special() set name = "Toggle SpecialRole Candidacy" set category = "Preferences" set desc = "Toggles which special roles you would like to be a candidate for, during events." + + var/list/be_special_flags = list( + "Xenomorph after unrevivable death" = BE_ALIEN_AFTER_DEATH, + "Agent" = BE_AGENT, + ) + var/role = tgui_input_list(usr, "Toggle which candidacy?", "Select role", be_special_flags) + if(!role) + return var/role_flag = be_special_flags[role] - - if(!role_flag) return prefs.be_special ^= role_flag prefs.save_preferences() to_chat(src, SPAN_BOLDNOTICE("You will [(prefs.be_special & role_flag) ? "now" : "no longer"] be considered for [role] events (where possible).")) @@ -507,10 +513,30 @@ prefs.auto_fit_viewport = !prefs.auto_fit_viewport if(prefs.auto_fit_viewport) to_chat(src, SPAN_NOTICE("Now auto fitting viewport.")) + fit_viewport() else to_chat(src, SPAN_NOTICE("No longer auto fitting viewport.")) prefs.save_preferences() +/client/verb/toggle_adaptive_zooming() + set name = "Toggle Adaptive Zooming" + set category = "Preferences.UI" + + switch(prefs.adaptive_zoom) + if(0) + prefs.adaptive_zoom = 1 + to_chat(src, SPAN_BOLDNOTICE("Adaptive Zooming is now enabled, switching between x1 and x2 zoom. This is recommended for 1080p monitors.")) + adaptive_zoom() + if(1) + prefs.adaptive_zoom = 2 + to_chat(src, SPAN_BOLDNOTICE("Adaptive Zooming is now enabled, switching between x2 and x4 zoom.")) + adaptive_zoom() + if(2) + prefs.adaptive_zoom = 0 + to_chat(src, SPAN_BOLDNOTICE("Adaptive Zooming is now disabled.")) + adaptive_zoom() + prefs.save_preferences() + //------------ GHOST PREFERENCES --------------------------------- /client/proc/show_ghost_preferences() // Shows ghost-related preferences. diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 79584be10f0a..7bcf1dd6645c 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -541,7 +541,7 @@ /obj/item/clothing/glasses/sunglasses desc = "Generic off-brand eyewear, used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes." - name = "cheap sunglasses" + name = "sunglasses" icon_state = "sun" item_state = "sunglasses" darkness_view = -1 diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index dcee7800ba1b..165dc03f25e2 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -57,8 +57,9 @@ if(!toggleable) to_chat(user, SPAN_WARNING("You cannot toggle [src] on or off.")) return FALSE + if(!isturf(user.loc)) - to_chat(user, "You cannot turn the light on while in [user.loc].") //To prevent some lighting anomalies. + to_chat(user, SPAN_WARNING("You cannot turn the light [on ? "off" : "on"] while in [user.loc].")) //To prevent some lighting anomalies. return FALSE on = !on diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index c5a001a97c0b..e6dd7be603df 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -130,8 +130,9 @@ ..() if(!isturf(user.loc)) - to_chat(user, "You cannot turn the light on while in [user.loc]") //To prevent some lighting anomalities. + to_chat(user, SPAN_WARNING("You cannot turn the light [on ? "off" : "on" ] while in [user.loc].")) //To prevent some lighting anomalies. return + on = !on icon_state = "hardhat[on]_pumpkin" diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index eff6f1306827..1d464269b432 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -132,10 +132,9 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 drop_sound = "armorequip" equip_sounds = list('sound/handling/putting_on_armor1.ogg') var/armor_variation = 0 - //speciality does NOTHING if you have NO_NAME_OVERRIDE -/obj/item/clothing/suit/storage/marine/Initialize() +/obj/item/clothing/suit/storage/marine/Initialize(mapload) . = ..() if(!(flags_atom & NO_NAME_OVERRIDE)) name = "[specialty]" @@ -143,12 +142,12 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 name += " snow armor" //Leave marine out so that armors don't have to have "Marine" appended (see: generals). else name += " armor" - if(armor_variation) - icon_state = replacetext(icon_state,"1","[rand(1,armor_variation)]") if(!(flags_atom & NO_SNOW_TYPE)) select_gamemode_skin(type) armor_overlays = list("lamp") //Just one for now, can add more later. + if(armor_variation && mapload) + post_vendor_spawn_hook() update_icon() pockets.max_w_class = SIZE_SMALL //Can contain small items AND rifle magazines. pockets.bypass_w_limit = list( @@ -171,6 +170,22 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 else armor_overlays["lamp"] = null if(user) user.update_inv_wear_suit() + +/obj/item/clothing/suit/storage/marine/post_vendor_spawn_hook(mob/living/carbon/human/user) //used for randomizing/selecting a variant for armors. + var/new_look //used for the icon_state text replacement. + + if(!user?.client?.prefs) + new_look = rand(1,armor_variation) + + else if(user.client.prefs.preferred_armor == "Random") + new_look = rand(1,armor_variation) + + else + new_look = GLOB.armor_style_list[user.client.prefs.preferred_armor] + + icon_state = replacetext(icon_state,"1","[new_look]") + update_icon(user) + /obj/item/clothing/suit/storage/marine/pickup(mob/user) if(flags_marine_armor & ARMOR_LAMP_ON) user.SetLuminosity(brightness_on, FALSE, src) @@ -206,8 +221,9 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 ..() if(!isturf(user.loc)) - to_chat(user, SPAN_WARNING("You cannot turn the light on while in [user.loc].")) //To prevent some lighting anomalities. + to_chat(user, SPAN_WARNING("You cannot turn the light [is_light_on() ? "off" : "on"] while in [user.loc].")) //To prevent some lighting anomalies. return + if(flashlight_cooldown > world.time) return if(!ishuman(user)) @@ -470,6 +486,30 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 armor_internaldamage = CLOTHING_ARMOR_LOW storage_slots = 2 +/obj/item/clothing/suit/storage/marine/light/padded + icon_state = "L1" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/padless + icon_state = "L2" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/padless_lines + icon_state = "L3" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/carrier + icon_state = "L4" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/skull + icon_state = "L5" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/smooth + icon_state = "L6" + armor_variation = 0 + /obj/item/clothing/suit/storage/marine/light/vest name = "\improper M3-VL pattern ballistics vest" desc = "Up until 2182 USCM non-combat personnel were issued non-standardized ballistics vests, though the lack of IMP compatibility and suit lamps proved time and time again inefficient. This modified M3-L shell is the result of a 6-year R&D program; It provides utility, protection, AND comfort to all USCM non-combat personnel." @@ -535,6 +575,30 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 slowdown = SLOWDOWN_ARMOR_LOWHEAVY movement_compensation = SLOWDOWN_ARMOR_MEDIUM +/obj/item/clothing/suit/storage/marine/heavy/padded + icon_state = "H1" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/heavy/padless + icon_state = "H2" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/heavy/padless_lines + icon_state = "H3" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/heavy/carrier + icon_state = "H4" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/heavy/skull + icon_state = "H5" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/heavy/smooth + icon_state = "H6" + armor_variation = 0 + //===========================//SPECIALIST\\================================\\ //=======================================================================\\ diff --git a/code/modules/cm_aliens/Ovipositor.dm b/code/modules/cm_aliens/Ovipositor.dm index c52666bcebc2..9758497b7009 100644 --- a/code/modules/cm_aliens/Ovipositor.dm +++ b/code/modules/cm_aliens/Ovipositor.dm @@ -7,31 +7,33 @@ unacidable = TRUE var/begin_decay_time = 0 health = 50 - var/decay_ready = 0 - var/decayed = 0 // This is here so later on we can use the ovpositor molt for research. ~BMC777 - var/destroyed = 0 + var/decayed = FALSE // This is here so later on we can use the ovpositor molt for research. ~BMC777 + var/destroyed = FALSE /obj/ovipositor/Initialize(mapload, ...) . = ..() begin_decay_time = world.timeofday + QUEEN_OVIPOSITOR_DECAY_TIME - process_decay() + START_PROCESSING(SSeffects, src) // Process every second -/obj/ovipositor/proc/process_decay() - set background = 1 +/obj/ovipositor/Destroy() + if(!decayed && !destroyed) + STOP_PROCESSING(SSeffects, src) - spawn while (!decayed && !destroyed) - if (world.timeofday > begin_decay_time) - decayed = 1 - do_decay() + return ..() - if (health < 0) - destroyed = 1 - explode() +/obj/ovipositor/process() + if (health < 0) + explode() + return - sleep(10) // Process every second. + if (world.timeofday > begin_decay_time) + do_decay() /obj/ovipositor/proc/do_decay() + decayed = TRUE + STOP_PROCESSING(SSeffects, src) + icon_state = "ovipositor_molted" flick("ovipositor_decay", src) sleep(15) @@ -43,6 +45,9 @@ qdel(src) /obj/ovipositor/proc/explode() + destroyed = TRUE + STOP_PROCESSING(SSeffects, src) + icon_state = "ovipositor_gibbed" flick("ovipositor_explosion", src) sleep(15) diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm index 87f0e3b6548c..f21cd6498615 100644 --- a/code/modules/cm_aliens/XenoStructures.dm +++ b/code/modules/cm_aliens/XenoStructures.dm @@ -512,27 +512,33 @@ START_PROCESSING(SSprocessing, src) -/obj/effect/alien/resin/acid_pillar/proc/can_target(mob/living/carbon/C, position_to_get = 0) - if(get_dist(src, C) > range) +/obj/effect/alien/resin/acid_pillar/proc/can_target(mob/living/carbon/current_mob, position_to_get = 0) + /// Is it a friendly xenomorph that is on fire + var/burning_friendly = FALSE + + if(get_dist(src, current_mob) > range) return FALSE - var/check_dead = FALSE - if(C.ally_of_hivenumber(hivenumber)) - if(!C.on_fire || !isxeno(C)) + if(current_mob.ally_of_hivenumber(hivenumber)) + if(!isxeno(current_mob)) + return FALSE + if(!current_mob.on_fire) return FALSE - else if(C.lying || C.is_mob_incapacitated(TRUE)) + burning_friendly = TRUE + + else if(current_mob.lying || current_mob.is_mob_incapacitated(TRUE)) return FALSE - if(!check_dead && C.health < 0) + if(!burning_friendly && current_mob.health < 0) return FALSE - if(check_dead && C.stat == DEAD) + if(current_mob.stat == DEAD) return FALSE var/turf/current_turf var/turf/last_turf = loc var/atom/temp_atom = new acid_type() var/current_pos = 1 - for(var/i in getline(src, C)) + for(var/i in getline(src, current_mob)) current_turf = i if(LinkBlocked(temp_atom, last_turf, current_turf)) qdel(temp_atom) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 21fc3d900d1c..cf6fa4e3665e 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -25,11 +25,17 @@ set_hive_data(src, hivenumber) update_icon() - INVOKE_ASYNC(src, PROC_REF(Grow)) + addtimer(CALLBACK(src, PROC_REF(Grow)), rand(EGG_MIN_GROWTH_TIME, EGG_MAX_GROWTH_TIME)) /obj/effect/alien/egg/Destroy() . = ..() - QDEL_NULL_LIST(egg_triggers) + for(var/obj/effect/egg_trigger/trigger as anything in egg_triggers) + trigger.linked_egg = null + trigger.linked_eggmorph = null + qdel(trigger) + if(egg_triggers) + egg_triggers.Cut() + egg_triggers = null /obj/effect/alien/egg/ex_act(severity) Burst(TRUE)//any explosion destroys the egg. @@ -81,9 +87,6 @@ return ..() /obj/effect/alien/egg/proc/Grow() - set waitfor = 0 - update_icon() - sleep(rand(EGG_MIN_GROWTH_TIME, EGG_MAX_GROWTH_TIME)) if(status == EGG_GROWING) icon_state = "Egg" status = EGG_GROWN diff --git a/code/modules/cm_marines/altitude_control_console.dm b/code/modules/cm_marines/altitude_control_console.dm index 15d3dbae4ebd..a8281806be10 100644 --- a/code/modules/cm_marines/altitude_control_console.dm +++ b/code/modules/cm_marines/altitude_control_console.dm @@ -38,6 +38,10 @@ GLOBAL_VAR_INIT(ship_alt, SHIP_ALT_MED) . = ..() START_PROCESSING(SSslowobj, src) +/obj/structure/machinery/computer/altitude_control_console/Destroy() + STOP_PROCESSING(SSslowobj, src) + return ..() + /obj/structure/machinery/computer/altitude_control_console/process() . = ..() var/temperature_change diff --git a/code/modules/cm_marines/anti_air.dm b/code/modules/cm_marines/anti_air.dm index 16ceafd4c397..22d43456437b 100644 --- a/code/modules/cm_marines/anti_air.dm +++ b/code/modules/cm_marines/anti_air.dm @@ -23,6 +23,12 @@ var/obj/structure/anti_air_cannon/almayer_aa_cannon if(!almayer_aa_cannon) almayer_aa_cannon = src +/obj/structure/anti_air_cannon/Destroy() + . = ..() + if(almayer_aa_cannon == src) + almayer_aa_cannon = null + message_admins("Reference to almayer_aa_cannon is lost!") + /obj/structure/anti_air_cannon/ex_act() return diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index f0fb44ead4b7..42bbd7f746e7 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -909,7 +909,6 @@ - //on arrival we break any link /obj/structure/dropship_equipment/medevac_system/on_arrival() if(linked_stretcher) @@ -922,7 +921,7 @@ return if(!ship_base) //not installed return - if(!skillcheck(user, SKILL_PILOT, SKILL_PILOT_TRAINED)) + if(!skillcheck(user, SKILL_PILOT, SKILL_PILOT_TRAINED) && !skillcheck(user, SKILL_MEDICAL, SKILL_MEDICAL_DOCTOR)) to_chat(user, SPAN_WARNING(" You don't know how to use [src].")) return @@ -938,7 +937,7 @@ return if(!linked_stretcher) - to_chat(user, SPAN_WARNING("There seems to be no medevac stretcher connected to [src].")) + equipment_interact(user) return if(!is_ground_level(linked_stretcher.z)) @@ -953,7 +952,6 @@ activate_winch(user) - /obj/structure/dropship_equipment/medevac_system/proc/activate_winch(mob/user) set waitfor = 0 var/old_stretcher = linked_stretcher @@ -1001,7 +999,7 @@ flick("winched_stretcher", linked_stretcher) linked_stretcher.visible_message(SPAN_NOTICE("A winch hook falls from the sky and starts lifting [linked_stretcher] up.")) - medevac_cooldown = world.time + 600 + medevac_cooldown = world.time + DROPSHIP_MEDEVAC_COOLDOWN linked_stretcher.linked_medevac = null linked_stretcher = null diff --git a/code/modules/cm_marines/orbital_cannon.dm b/code/modules/cm_marines/orbital_cannon.dm index b4e566201b46..431b03fb31d3 100644 --- a/code/modules/cm_marines/orbital_cannon.dm +++ b/code/modules/cm_marines/orbital_cannon.dm @@ -48,6 +48,9 @@ var/list/ob_type_fuel_requirements /obj/structure/orbital_cannon/Destroy() QDEL_NULL(tray) + if(almayer_orbital_cannon == src) + almayer_orbital_cannon = null + message_admins("Reference to almayer_orbital_cannon is lost!") return ..() /obj/structure/orbital_cannon/ex_act() diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index 0c303b7028e3..401d8fd9784a 100644 --- a/code/modules/cm_marines/overwatch.dm +++ b/code/modules/cm_marines/overwatch.dm @@ -430,6 +430,7 @@ current_squad = null if(cam && !ishighersilicon(usr)) usr.reset_view(null) + usr.UnregisterSignal(cam, COMSIG_PARENT_QDELETING) cam = null state = 0 if("pick_squad") @@ -593,13 +594,17 @@ to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("Searching for helmet cam. No helmet cam found for this marine! Tell your squad to put their helmets on!")]") else if(cam && cam == new_cam)//click the camera you're watching a second time to stop watching. visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Stopping helmet cam view of [cam_target].")]") + usr.UnregisterSignal(cam, COMSIG_PARENT_QDELETING) cam = null usr.reset_view(null) else if(usr.client.view != world_view_size) to_chat(usr, SPAN_WARNING("You're too busy peering through binoculars.")) else + if(cam) + usr.UnregisterSignal(cam, COMSIG_PARENT_QDELETING) cam = new_cam usr.reset_view(cam) + usr.RegisterSignal(cam, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/mob, reset_observer_view_on_deletion)) attack_hand(usr) //The above doesn't ever seem to work. /obj/structure/machinery/computer/overwatch/check_eye(mob/user) @@ -611,6 +616,8 @@ /obj/structure/machinery/computer/overwatch/on_unset_interaction(mob/user) ..() if(!isRemoteControlling(user)) + if(cam) + user.UnregisterSignal(cam, COMSIG_PARENT_QDELETING) cam = null user.reset_view(null) diff --git a/code/modules/cm_preds/smartdisc.dm b/code/modules/cm_preds/smartdisc.dm index 2dfc986f41f6..068ff3550024 100644 --- a/code/modules/cm_preds/smartdisc.dm +++ b/code/modules/cm_preds/smartdisc.dm @@ -236,14 +236,6 @@ qdel(src) return - for(var/mob/living/carbon/C in range(6)) - if(C.target_locked) - var/image/I = C.target_locked - if(I.icon_state == "locked-y" && !isyautja(C) && C.stat != DEAD) - stance = HOSTILE_STANCE_ATTACK - target_mob = C - break - if(!stat) switch(stance) if(HOSTILE_STANCE_IDLE) diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm index 4a93775b61d6..1b98ef402b90 100644 --- a/code/modules/cm_preds/yaut_bracers.dm +++ b/code/modules/cm_preds/yaut_bracers.dm @@ -191,8 +191,8 @@ name = "clan bracers" desc = "An extremely complex, yet simple-to-operate set of armored bracers worn by the Yautja. It has many functions, activate them to use some." - armor_melee = CLOTHING_ARMOR_MEDIUMHIGH - armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH + armor_melee = CLOTHING_ARMOR_MEDIUM + armor_bullet = CLOTHING_ARMOR_HIGH armor_laser = CLOTHING_ARMOR_MEDIUMHIGH armor_energy = CLOTHING_ARMOR_MEDIUMHIGH armor_bomb = CLOTHING_ARMOR_HIGH diff --git a/code/modules/cm_preds/yaut_items.dm b/code/modules/cm_preds/yaut_items.dm index ff6d3e4fd9a8..e9b7c36b5df6 100644 --- a/code/modules/cm_preds/yaut_items.dm +++ b/code/modules/cm_preds/yaut_items.dm @@ -118,7 +118,7 @@ flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_HEAD|BODY_FLAG_LEGS flags_item = ITEM_PREDATOR armor_melee = CLOTHING_ARMOR_HIGH - armor_bullet = CLOTHING_ARMOR_HIGH + armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH armor_laser = CLOTHING_ARMOR_HIGH armor_energy = CLOTHING_ARMOR_HIGH armor_bomb = CLOTHING_ARMOR_HIGHPLUS @@ -213,7 +213,7 @@ unacidable = TRUE permeability_coefficient = 0.01 flags_inventory = NOSLIPPING - flags_armor_protection = BODY_FLAG_FEET|BODY_FLAG_LEGS|BODY_FLAG_GROIN + flags_armor_protection = BODY_FLAG_FEET|BODY_FLAG_LEGS flags_item = ITEM_PREDATOR siemens_coefficient = 0.2 @@ -252,7 +252,7 @@ name = "clan greaves" desc = "A pair of armored, perfectly balanced boots. Perfect for running through the jungle." - armor_melee = CLOTHING_ARMOR_MEDIUM + armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_HIGH armor_laser = CLOTHING_ARMOR_MEDIUMHIGH armor_energy = CLOTHING_ARMOR_MEDIUMHIGH @@ -275,6 +275,7 @@ WEAR_BODY = 'icons/mob/humans/onmob/hunter/pred_gear.dmi' ) + flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS|BODY_FLAG_FEET|BODY_FLAG_HANDS //Does not cover the head though. flags_heat_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_ARMS|BODY_FLAG_FEET|BODY_FLAG_HANDS flags_item = ITEM_PREDATOR @@ -283,8 +284,8 @@ siemens_coefficient = 0.9 min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT - armor_melee = CLOTHING_ARMOR_MEDIUM - armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_melee = CLOTHING_ARMOR_LOW + armor_bullet = CLOTHING_ARMOR_LOW armor_laser = CLOTHING_ARMOR_MEDIUM armor_energy = CLOTHING_ARMOR_MEDIUM armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH @@ -296,8 +297,8 @@ name = "body mesh" desc = "A set of very fine chainlink in a meshwork for comfort and utility." - armor_melee = CLOTHING_ARMOR_MEDIUMLOW - armor_bullet = CLOTHING_ARMOR_HIGH + armor_melee = CLOTHING_ARMOR_LOW + armor_bullet = CLOTHING_ARMOR_LOW armor_laser = CLOTHING_ARMOR_MEDIUMHIGH armor_energy = CLOTHING_ARMOR_MEDIUMHIGH armor_bomb = CLOTHING_ARMOR_HIGH @@ -505,7 +506,7 @@ var/variant = rand(1, 4) //Random sprite variant. icon_state = "scalp_[variant]" - blood_color = "#A10808" //So examine describes it as 'bloody'. Synths can't be scalped so it'll always be human blood. + blood_color = BLOOD_COLOR_HUMAN //So examine describes it as 'bloody'. Synths can't be scalped so it'll always be human blood. flags_atom = FPRINT|NOBLOODY //Don't want the ugly item blood overlay ending up on this. We'll use our own blood overlay. var/image/blood_overlay = image('icons/obj/items/hunter/pred_gear.dmi', "scalp_[variant]_blood") @@ -970,7 +971,7 @@ desc = "A bone from a human." icon = 'icons/obj/items/skeleton.dmi' accessory_icons = list(WEAR_BODY = 'icons/mob/humans/onmob/hunter/pred_gear.dmi') - icon_state = "head" + icon_state = null ///Has it been cleaned by a polishing rag? var/polished = FALSE /obj/item/clothing/accessory/limb/skeleton/l_arm diff --git a/code/modules/cm_preds/yaut_mask.dm b/code/modules/cm_preds/yaut_mask.dm index 04fa740b068b..c715ca590cd5 100644 --- a/code/modules/cm_preds/yaut_mask.dm +++ b/code/modules/cm_preds/yaut_mask.dm @@ -180,7 +180,7 @@ /obj/item/clothing/mask/gas/yautja/hunter name = "clan mask" desc = "A beautifully designed metallic face mask, both ornate and functional." - armor_melee = CLOTHING_ARMOR_MEDIUMHIGH + armor_melee = CLOTHING_ARMOR_MEDIUM armor_bullet = CLOTHING_ARMOR_HIGH armor_laser = CLOTHING_ARMOR_MEDIUMHIGH armor_energy = CLOTHING_ARMOR_MEDIUMHIGH diff --git a/code/modules/cm_preds/yaut_weapons.dm b/code/modules/cm_preds/yaut_weapons.dm index 5393e11bf6ba..40006dafe60b 100644 --- a/code/modules/cm_preds/yaut_weapons.dm +++ b/code/modules/cm_preds/yaut_weapons.dm @@ -1,3 +1,7 @@ +#define FLAY_STAGE_SCALP 1 +#define FLAY_STAGE_STRIP 2 +#define FLAY_STAGE_SKIN 3 + /*######################################### ########### Weapon Reused Procs ########### #########################################*/ @@ -418,7 +422,7 @@ 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 - return + return TRUE if(issamespecies(user, victim)) to_chat(user, SPAN_HIGHDANGER("ARE YOU OUT OF YOUR MIND!?")) @@ -426,68 +430,137 @@ if(isspeciessynth(victim)) to_chat(user, SPAN_WARNING("You can't flay metal...")) //look at this dumbass - return + return TRUE + + if(SEND_SIGNAL(victim, COMSIG_HUMAN_FLAY_ATTEMPT, user, src) & COMPONENT_CANCEL_ATTACK) + return TRUE + + if(victim.overlays_standing[FLAY_LAYER]) //Already fully flayed. Possibly the user wants to cut them down? + return ..() if(!do_after(user, 1 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, victim)) - return + return TRUE - to_chat(user, SPAN_WARNING("You start flaying [victim].")) + user.visible_message(SPAN_DANGER("[user] begins to flay [victim] with \a [src]..."), + SPAN_DANGER("You start flaying [victim] with your [src.name]...")) playsound(loc, 'sound/weapons/pierce.ogg', 25) if(do_after(user, 4 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, victim)) - to_chat(user, SPAN_WARNING("You prepare the skin, cutting the flesh off in vital places.")) + if(SEND_SIGNAL(victim, COMSIG_HUMAN_FLAY_ATTEMPT, user, src) & COMPONENT_CANCEL_ATTACK) //In case two preds try to flay the same person at once. + return TRUE + user.visible_message(SPAN_DANGER("[user] makes a series of cuts in [victim]'s skin."), + SPAN_DANGER("You prepare the skin, cutting the flesh off in vital places.")) playsound(loc, 'sound/weapons/slash.ogg', 25) - create_leftovers(victim, has_meat = TRUE, skin_amount = 0) + for(var/limb in victim.limbs) victim.apply_damage(15, BRUTE, limb, sharp = FALSE) victim.add_flay_overlay(stage = 1) - if(do_after(user, 4 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE, victim)) + var/datum/flaying_datum/flay_datum = new(victim) + flay_datum.create_leftovers(victim, TRUE, 0) + SEND_SIGNAL(victim, COMSIG_HUMAN_FLAY_ATTEMPT, user, src, TRUE) + else + to_chat(user, SPAN_WARNING("You were interrupted before you could finish your work!")) + return TRUE + +///Records status of flaying attempts and handles progress. +/datum/flaying_datum + var/mob/living/carbon/human/victim + var/current_flayer + var/flaying_stage = FLAY_STAGE_SCALP + +/datum/flaying_datum/New(mob/living/carbon/human/target) + . = ..() + victim = target + RegisterSignal(victim, COMSIG_HUMAN_FLAY_ATTEMPT, PROC_REF(begin_flaying)) + +///Loops until interrupted or done. +/datum/flaying_datum/proc/begin_flaying(mob/living/carbon/human/target, mob/living/carbon/human/user, obj/item/tool, ongoing_attempt) + SIGNAL_HANDLER + if(current_flayer) + if(current_flayer != user) + to_chat(user, SPAN_WARNING("You can't flay [target], [current_flayer] is already at work!")) + else + current_flayer = user + if(!ongoing_attempt) + playsound(user.loc, 'sound/weapons/pierce.ogg', 25) + user.visible_message(SPAN_DANGER("[user] resumes the flaying of [victim] with \a [tool]..."), + SPAN_DANGER("You resume the flaying of [victim] with your [tool.name]...")) + INVOKE_ASYNC(src, PROC_REF(flay), target, user, tool) //do_after sleeps. + return COMPONENT_CANCEL_ATTACK + +/datum/flaying_datum/proc/flay(mob/living/carbon/human/target, mob/living/carbon/human/user, obj/item/tool) + if(!do_after(user, 4 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE, victim)) + to_chat(user, SPAN_WARNING("You were interrupted before you could finish your work!")) + current_flayer = null + return + + switch(flaying_stage) + if(FLAY_STAGE_SCALP) + playsound(user.loc, 'sound/weapons/slashmiss.ogg', 25) + flaying_stage = FLAY_STAGE_STRIP var/obj/limb/head/v_head = victim.get_limb("head") - if(v_head) //they might be beheaded - create_leftovers(victim, has_meat = FALSE, skin_amount = 1) - victim.apply_damage(10, BRUTE, v_head, sharp = FALSE) + if(!v_head || (v_head.status & LIMB_DESTROYED)) //they might be beheaded + victim.apply_damage(10, BRUTE, "chest", sharp = TRUE) + user.visible_message(SPAN_DANGER("[user] peels the skin around the stump of [victim]'s head loose with \the [tool]."), + SPAN_DANGER("[victim] is missing \his head. Pelts like this just aren't the same... You peel the skin around the stump loose with your [tool.name].")) + else + victim.apply_damage(10, BRUTE, v_head, sharp = TRUE) v_head.disfigured = TRUE + create_leftovers(victim, has_meat = FALSE, skin_amount = 1) if(victim.h_style == "Bald") //you can't scalp someone with no hair. - to_chat(user, SPAN_WARNING("You make some rough cuts on [victim]'s head and face with \the [src].")) + user.visible_message(SPAN_DANGER("[user] makes some rough cuts on [victim]'s head and face with \a [tool]."), + SPAN_DANGER("You make some rough cuts on [victim]'s head and face.")) else - to_chat(user, SPAN_WARNING("You use \the [src] to cut around [victim]'s hairline, then rip \his scalp from \his head.")) + user.visible_message(SPAN_DANGER("[user] cuts around [victim]'s hairline, then tears \his scalp from \his head!"), + SPAN_DANGER("You cut around [victim]'s hairline, then rip \his scalp from \his head.")) var/obj/item/scalp/cut_scalp = new(get_turf(user), victim, user) //Create a scalp of the victim at the user's feet. user.put_in_inactive_hand(cut_scalp) //Put it in the user's offhand if possible. victim.h_style = "Bald" victim.update_hair() //tear the hair off with the scalp - playsound(loc, 'sound/weapons/slashmiss.ogg', 25) - - if(do_after(user, 4 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE, victim)) - to_chat(user, SPAN_WARNING("You jab \the [src] into the flesh cuts, using them to tear off most of the skin, the remainder skin hanging off the flesh.")) - playsound(loc, 'sound/weapons/bladeslice.ogg', 25) - create_leftovers(victim, has_meat = FALSE, skin_amount = 3) - for(var/limb in victim.limbs) - victim.apply_damage(18, BRUTE, limb, sharp = FALSE) - victim.remove_overlay(UNDERWEAR_LAYER) - victim.f_style = "Shaved" - victim.update_hair() //then rip the beard off along the skin - victim.add_flay_overlay(stage = 2) - - if(do_after(user, 4 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE, victim)) - to_chat(user, SPAN_WARNING("You completely flay [victim], sloppily ripping most remaining flesh and skin off the body. Use rope to hang them from the ceiling.")) - playsound(loc, 'sound/weapons/wristblades_hit.ogg', 25) - create_leftovers(victim, has_meat = TRUE, skin_amount = 2) - for(var/limb in victim.limbs) - victim.apply_damage(22, BRUTE, limb, sharp = FALSE) - for(var/obj/item/item in victim) - victim.drop_inv_item_to_loc(item, victim.loc, FALSE, TRUE) - - victim.status_flags |= PERMANENTLY_DEAD - victim.add_flay_overlay(stage = 3) + + if(FLAY_STAGE_STRIP) + user.visible_message(SPAN_DANGER("[user] jabs \his [tool.name] into [victim]'s cuts, prying, cutting, then tearing off large areas of skin. The remainder hangs loosely."), + SPAN_DANGER("You jab your [tool.name] into [victim]'s cuts, prying, cutting, then tearing off large areas of skin. The remainder hangs loosely.")) + playsound(user.loc, 'sound/weapons/bladeslice.ogg', 25) + create_leftovers(victim, has_meat = FALSE, skin_amount = 3) + flaying_stage = FLAY_STAGE_SKIN + for(var/limb in victim.limbs) + victim.apply_damage(18, BRUTE, limb, sharp = TRUE) + victim.remove_overlay(UNDERWEAR_LAYER) + victim.drop_inv_item_on_ground(victim.get_item_by_slot(WEAR_BODY)) //Drop uniform, belt etc as well. + victim.f_style = "Shaved" + victim.update_hair() //then rip the beard off along the skin + victim.add_flay_overlay(stage = 2) + + if(FLAY_STAGE_SKIN) + user.visible_message(SPAN_DANGER("[user] completely flays [victim], pulling the remaining skin off of \his body like a glove!"), + SPAN_DANGER("You completely flay [victim], pulling the remaining skin off of \his body like a glove.\nUse rope to hang \him from the ceiling.")) + playsound(user.loc, 'sound/weapons/wristblades_hit.ogg', 25) + create_leftovers(victim, has_meat = TRUE, skin_amount = 2) + for(var/limb in victim.limbs) + victim.apply_damage(22, BRUTE, limb, sharp = TRUE) + for(var/obj/item/item in victim) + victim.drop_inv_item_to_loc(item, victim.loc, FALSE, TRUE) + victim.status_flags |= PERMANENTLY_DEAD + victim.add_flay_overlay(stage = 3) + + //End the loop and remove all references to the datum. + current_flayer = null + UnregisterSignal(victim, COMSIG_HUMAN_FLAY_ATTEMPT) + victim = null + return + + flay(target, user, tool) /mob/living/carbon/human/proc/add_flay_overlay(stage = 1) remove_overlay(FLAY_LAYER) var/image/flay_icon = new /image('icons/mob/humans/dam_human.dmi', "human_[stage]") flay_icon.layer = -FLAY_LAYER + flay_icon.blend_mode = BLEND_INSET_OVERLAY overlays_standing[FLAY_LAYER] = flay_icon apply_overlay(FLAY_LAYER) -/obj/item/weapon/yautja/knife/proc/create_leftovers(mob/living/victim, has_meat, skin_amount) +/datum/flaying_datum/proc/create_leftovers(mob/living/victim, has_meat, skin_amount) if(has_meat) var/obj/item/reagent_container/food/snacks/meat/meat = new /obj/item/reagent_container/food/snacks/meat(victim.loc) meat.name = "raw [victim.name] steak" @@ -1096,3 +1169,7 @@ var/mob/living/carbon/human/user = usr //Hacky... user.update_power_display(perc) return TRUE + +#undef FLAY_STAGE_SCALP +#undef FLAY_STAGE_STRIP +#undef FLAY_STAGE_SKIN diff --git a/code/modules/cm_tech/implements/medical_czsp.dm b/code/modules/cm_tech/implements/medical_czsp.dm index aefb36e79f01..ccfd59ce7cbc 100644 --- a/code/modules/cm_tech/implements/medical_czsp.dm +++ b/code/modules/cm_tech/implements/medical_czsp.dm @@ -40,10 +40,10 @@ /obj/item/stack/medical/advanced/ointment/upgraded name = "upgraded burn kit" singular_name = "upgraded burn kit" - stack_id = "upgraded advanced burn kit" + stack_id = "upgraded burn kit" icon_state = "burnkit_upgraded" - desc = "An upgraded advanced burn treatment kit. Three times as effective as standard-issue, and non-replenishable. Use sparingly on only the most critical burns." + desc = "An upgraded burn treatment kit. Three times as effective as standard-issue, and non-replenishable. Use sparingly on only the most critical burns." max_amount = 10 amount = 10 @@ -55,10 +55,10 @@ /obj/item/stack/medical/advanced/bruise_pack/upgraded name = "upgraded trauma kit" singular_name = "upgraded trauma kit" - stack_id = "upgraded advanced trauma kit" + stack_id = "upgraded trauma kit" icon_state = "traumakit_upgraded" - desc = "An upgraded advanced trauma treatment kit. Three times as effective as standard-issue, and non-replenishable. Use sparingly on only the most critical wounds." + desc = "An upgraded trauma treatment kit. Three times as effective as standard-issue, and non-replenishable. Use sparingly on only the most critical wounds." max_amount = 10 amount = 10 diff --git a/code/modules/cm_tech/resources/resource.dm b/code/modules/cm_tech/resources/resource.dm index 8eb7e96a6a58..eda0af9f63b8 100644 --- a/code/modules/cm_tech/resources/resource.dm +++ b/code/modules/cm_tech/resources/resource.dm @@ -56,6 +56,8 @@ A.r_node = src /obj/structure/resource_node/Destroy() + if(controlled_area && controlled_area.r_node == src) + controlled_area.r_node = null controlled_area = null return ..() diff --git a/code/modules/cm_tech/tech.dm b/code/modules/cm_tech/tech.dm index f13e4f7fddf8..5c37dafef3f3 100644 --- a/code/modules/cm_tech/tech.dm +++ b/code/modules/cm_tech/tech.dm @@ -65,6 +65,7 @@ unlocked = TRUE to_chat(user, SPAN_HELPFUL("You have purchased the '[name]' tech node.")) + log_admin("[key_name_admin(user)] has bought '[name]' via tech points.") holder.spend_points(required_points) update_icon(node) return TRUE diff --git a/code/modules/decorators/weapon_map_decorator.dm b/code/modules/decorators/weapon_map_decorator.dm index b724fac1c1d2..55e78f349a60 100644 --- a/code/modules/decorators/weapon_map_decorator.dm +++ b/code/modules/decorators/weapon_map_decorator.dm @@ -1,5 +1,5 @@ /datum/decorator/weapon_map_decorator - var/list/map_array = list() + var/list/camouflage_type var/icon/c_icon var/icon/l_icon @@ -8,7 +8,7 @@ var/icon/j_icon /datum/decorator/weapon_map_decorator/is_active_decor() - return map_array.Find(SSmapping.configs[GROUND_MAP].map_name) + return SSmapping.configs[GROUND_MAP].camouflage_type == camouflage_type /datum/decorator/weapon_map_decorator/get_decor_types() return typesof(/obj/item/weapon/gun) - /obj/item/weapon/gun @@ -28,41 +28,41 @@ gun.item_icons[WEAR_J_STORE] = j_icon /datum/decorator/weapon_map_decorator/classic + camouflage_type = "classic" c_icon = 'icons/obj/items/weapons/guns/guns_by_map/classic/guns_obj.dmi' l_icon = 'icons/obj/items/weapons/guns/guns_by_map/classic/guns_lefthand.dmi' r_icon = 'icons/obj/items/weapons/guns/guns_by_map/classic/guns_righthand.dmi' b_icon = 'icons/obj/items/weapons/guns/guns_by_map/classic/back.dmi' j_icon = 'icons/obj/items/weapons/guns/guns_by_map/classic/suit_slot.dmi' - map_array = list(MAP_PRISON_STATION, MAP_PRISON_STATION_V3, MAP_LV522_CHANCES_CLAIM) /datum/decorator/weapon_map_decorator/desert + camouflage_type = "desert" c_icon = 'icons/obj/items/weapons/guns/guns_by_map/desert/guns_obj.dmi' l_icon = 'icons/obj/items/weapons/guns/guns_by_map/desert/guns_lefthand.dmi' r_icon = 'icons/obj/items/weapons/guns/guns_by_map/desert/guns_righthand.dmi' b_icon = 'icons/obj/items/weapons/guns/guns_by_map/desert/back.dmi' j_icon = 'icons/obj/items/weapons/guns/guns_by_map/desert/suit_slot.dmi' - map_array = list(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO) /datum/decorator/weapon_map_decorator/jungle + camouflage_type = "jungle" c_icon = 'icons/obj/items/weapons/guns/guns_by_map/jungle/guns_obj.dmi' l_icon = 'icons/obj/items/weapons/guns/guns_by_map/jungle/guns_lefthand.dmi' r_icon = 'icons/obj/items/weapons/guns/guns_by_map/jungle/guns_righthand.dmi' b_icon = 'icons/obj/items/weapons/guns/guns_by_map/jungle/back.dmi' j_icon = 'icons/obj/items/weapons/guns/guns_by_map/jungle/suit_slot.dmi' - map_array = list(MAP_LV_624, MAP_RUNTIME,MAP_NEW_VARADERO) /datum/decorator/weapon_map_decorator/snow + camouflage_type = "snow" c_icon = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_obj.dmi' l_icon = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand.dmi' r_icon = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand.dmi' b_icon = 'icons/obj/items/weapons/guns/guns_by_map/snow/back.dmi' j_icon = 'icons/obj/items/weapons/guns/guns_by_map/snow/suit_slot.dmi' - map_array = list(MAP_CORSAT, MAP_SOROKYNE_STRATA, MAP_ICE_COLONY, MAP_ICE_COLONY_V3) /datum/decorator/weapon_map_decorator/urban + camouflage_type = "urban" // Sprites not currently all done! c_icon = 'icons/obj/items/weapons/guns/guns_by_map/urban/guns_obj.dmi' l_icon = 'icons/obj/items/weapons/guns/guns_by_map/urban/guns_lefthand.dmi' r_icon = 'icons/obj/items/weapons/guns/guns_by_map/urban/guns_righthand.dmi' b_icon = 'icons/obj/items/weapons/guns/guns_by_map/urban/back.dmi' j_icon = 'icons/obj/items/weapons/guns/guns_by_map/urban/suit_slot.dmi' - map_array = list() diff --git a/code/modules/defenses/planted_flag.dm b/code/modules/defenses/planted_flag.dm index 18300c63ffa1..fac725047fa9 100644 --- a/code/modules/defenses/planted_flag.dm +++ b/code/modules/defenses/planted_flag.dm @@ -27,6 +27,8 @@ /obj/structure/machinery/defenses/planted_flag/Initialize() . = ..() + RegisterSignal(src, COMSIG_ATOM_TURF_CHANGE, PROC_REF(turf_changed)) + if(turned_on) apply_area_effect() start_processing() @@ -80,6 +82,11 @@ apply_buff_to_player(H) +/obj/structure/machinery/defenses/planted_flag/proc/turf_changed() + SIGNAL_HANDLER + if(range_bounds) + QDEL_NULL(range_bounds) + /obj/structure/machinery/defenses/planted_flag/proc/apply_buff_to_player(mob/living/carbon/human/H) H.activate_order_buff(COMMAND_ORDER_HOLD, buff_intensity, 1.5 SECONDS) H.activate_order_buff(COMMAND_ORDER_FOCUS, buff_intensity, 1.5 SECONDS) diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index 7024974c7e7b..3d485f3abda7 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -63,6 +63,7 @@ start_processing() set_range() update_icon() + RegisterSignal(src, COMSIG_ATOM_TURF_CHANGE, PROC_REF(unset_range)) /obj/structure/machinery/defenses/sentry/Destroy() //Clear these for safety's sake. targets = null @@ -107,7 +108,9 @@ range_bounds = RECT(x, y - 4, 7, 7) /obj/structure/machinery/defenses/sentry/proc/unset_range() - qdel(range_bounds) + SIGNAL_HANDLER + if(range_bounds) + QDEL_NULL(range_bounds) /obj/structure/machinery/defenses/sentry/update_icon() ..() diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 4068a21d2e31..c626f9cd1ee1 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -281,6 +281,7 @@ Gunshots/explosions/opening doors/less rare audio (done) weap = null currentimage = null left = null + right = null up = null down = null return ..() diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index 7eac2eb44199..fc70e5fc90bb 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -80,38 +80,38 @@ faction_group = list(faction) //load_appearance() -/datum/equipment_preset/proc/load_race(mob/living/carbon/human/H, client/mob_client) +/datum/equipment_preset/proc/load_race(mob/living/carbon/human/new_human, client/mob_client) return -/datum/equipment_preset/proc/load_name(mob/living/carbon/human/H, randomise, client/mob_client) - H.gender = pick(60;MALE,40;FEMALE) +/datum/equipment_preset/proc/load_name(mob/living/carbon/human/new_human, randomise, client/mob_client) + new_human.gender = pick(60;MALE,40;FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) - var/random_name = capitalize(pick(H.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names)) - H.change_real_name(H, random_name) - H.age = rand(21,45) + A.randomize_appearance(new_human) + var/random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names)) + new_human.change_real_name(new_human, random_name) + new_human.age = rand(21,45) -/datum/equipment_preset/proc/load_age(mob/living/carbon/human/H, client/mob_client) - if(minimum_age && H.age < minimum_age) - H.age = minimum_age +/datum/equipment_preset/proc/load_age(mob/living/carbon/human/new_human, client/mob_client) + if(minimum_age && new_human.age < minimum_age) + new_human.age = minimum_age -/datum/equipment_preset/proc/load_rank(mob/living/carbon/human/H, client/mob_client) +/datum/equipment_preset/proc/load_rank(mob/living/carbon/human/new_human, client/mob_client) return paygrade -/datum/equipment_preset/proc/load_gear(mob/living/carbon/human/H, client/mob_client) +/datum/equipment_preset/proc/load_gear(mob/living/carbon/human/new_human, client/mob_client) return -/datum/equipment_preset/proc/load_status(mob/living/carbon/human/H, client/mob_client) +/datum/equipment_preset/proc/load_status(mob/living/carbon/human/new_human, client/mob_client) return -/datum/equipment_preset/proc/load_skills(mob/living/carbon/human/H, client/mob_client) - H.set_skills(skills) +/datum/equipment_preset/proc/load_skills(mob/living/carbon/human/new_human, client/mob_client) + new_human.set_skills(skills) -/datum/equipment_preset/proc/load_id(mob/living/carbon/human/H, client/mob_client) +/datum/equipment_preset/proc/load_id(mob/living/carbon/human/new_human, client/mob_client) if(!idtype) return var/obj/item/card/id/W = new idtype() - W.name = "[H.real_name]'s ID Card" + W.name = "[new_human.real_name]'s ID Card" if(assignment) W.name += " ([assignment])" W.access = access.Copy(1, 0) @@ -119,91 +119,89 @@ W.faction_group = faction_group.Copy() W.assignment = assignment W.rank = rank - W.registered_name = H.real_name - W.registered_ref = WEAKREF(H) - W.registered_gid = H.gid - W.blood_type = H.blood_type - W.paygrade = load_rank(H) + W.registered_name = new_human.real_name + W.registered_ref = WEAKREF(new_human) + W.registered_gid = new_human.gid + W.blood_type = new_human.blood_type + W.paygrade = load_rank(new_human) W.uniform_sets = uniform_sets - H.equip_to_slot_or_del(W, WEAR_ID) - H.faction = faction - H.faction_group = faction_group.Copy() - if(H.mind) - H.mind.name = H.real_name + new_human.equip_to_slot_or_del(W, WEAR_ID) + new_human.faction = faction + new_human.faction_group = faction_group.Copy() + if(new_human.mind) + new_human.mind.name = new_human.real_name // Bank account details handled in generate_money_account() - H.job = rank - H.comm_title = role_comm_title + new_human.job = rank + new_human.comm_title = role_comm_title -/datum/equipment_preset/proc/load_languages(mob/living/carbon/human/H, client/mob_client) - H.set_languages(languages) +/datum/equipment_preset/proc/load_languages(mob/living/carbon/human/new_human, client/mob_client) + new_human.set_languages(languages) -/datum/equipment_preset/proc/load_preset(mob/living/carbon/human/H, randomise = FALSE, count_participant = FALSE, client/mob_client, show_job_gear = TRUE) - load_race(H, mob_client) +/datum/equipment_preset/proc/load_preset(mob/living/carbon/human/new_human, randomise = FALSE, count_participant = FALSE, client/mob_client, show_job_gear = TRUE) + load_race(new_human, mob_client) if(randomise || uses_special_name) - load_name(H, randomise, mob_client) + load_name(new_human, randomise, mob_client) else if(origin_override) var/datum/origin/origin = GLOB.origins[origin_override] - H.name = origin.correct_name(H.name, H.gender) + new_human.name = origin.correct_name(new_human.name, new_human.gender) if(origin_override) - H.origin = origin_override - load_skills(H, mob_client) //skills are set before equipment because of skill restrictions on certain clothes. - load_languages(H, mob_client) - load_age(H, mob_client) - load_id(H, mob_client) + new_human.origin = origin_override + load_skills(new_human, mob_client) //skills are set before equipment because of skill restrictions on certain clothes. + load_languages(new_human, mob_client) + load_age(new_human, mob_client) if(show_job_gear) - load_gear(H, mob_client) - load_status(H, mob_client) - load_vanity(H, mob_client) - load_traits(H, mob_client) + load_gear(new_human, mob_client) + load_id(new_human, mob_client) + load_status(new_human, mob_client) + load_vanity(new_human, mob_client) + load_traits(new_human, mob_client) if(round_statistics && count_participant) round_statistics.track_new_participant(faction) - H.assigned_equipment_preset = src + new_human.assigned_equipment_preset = src - H.regenerate_icons() + new_human.regenerate_icons() - H.marine_points = MARINE_TOTAL_BUY_POINTS //resetting buy points - H.marine_snowflake_points = MARINE_TOTAL_SNOWFLAKE_POINTS - H.marine_buy_flags = MARINE_CAN_BUY_ALL + new_human.marine_points = MARINE_TOTAL_BUY_POINTS //resetting buy points + new_human.marine_snowflake_points = MARINE_TOTAL_SNOWFLAKE_POINTS + new_human.marine_buyable_categories = MARINE_CAN_BUY_ALL + new_human.hud_set_squad() + new_human.add_to_all_mob_huds() - H.hud_set_squad() - H.add_to_all_mob_huds() - -/datum/equipment_preset/proc/load_vanity(mob/living/carbon/human/H, client/mob_client) - if(!H.client || !H.client.prefs || !H.client.prefs.gear) +/datum/equipment_preset/proc/load_vanity(mob/living/carbon/human/new_human, client/mob_client) + if(!new_human.client || !new_human.client.prefs || !new_human.client.prefs.gear) return//We want to equip them with custom stuff second, after they are equipped with everything else. var/datum/gear/G - var/i - for(i in H.client.prefs.gear) - G = gear_datums[i] + for(var/gear_name in new_human.client.prefs.gear) + G = gear_datums_by_name[gear_name] if(G) if(G.allowed_roles && !(assignment in G.allowed_roles)) - to_chat(H, SPAN_WARNING("Custom gear [G.display_name] cannot be equipped: Invalid Role")) + to_chat(new_human, SPAN_WARNING("Custom gear [G.display_name] cannot be equipped: Invalid Role")) return - if(G.allowed_origins && !(H.origin in G.allowed_origins)) - to_chat(H, SPAN_WARNING("Custom gear [G.display_name] cannot be equipped: Invalid Origin")) + if(G.allowed_origins && !(new_human.origin in G.allowed_origins)) + to_chat(new_human, SPAN_WARNING("Custom gear [G.display_name] cannot be equipped: Invalid Origin")) return - if(!H.equip_to_slot_or_del(new G.path, G.slot)) - H.equip_to_slot_or_del(new G.path, WEAR_IN_BACK) + if(!(G.slot && new_human.equip_to_slot_or_del(new G.path, G.slot))) + new_human.equip_to_slot_or_del(new G.path, WEAR_IN_BACK) //Gives ranks to the ranked var/current_rank = paygrade - var/obj/item/card/id/I = H.get_idcard() + var/obj/item/card/id/I = new_human.get_idcard() if(I) current_rank = I.paygrade - if(H.w_uniform && current_rank) + if(new_human.w_uniform && current_rank) var/rankpath = get_rank_pins(current_rank) if(rankpath) var/obj/item/clothing/accessory/ranks/R = new rankpath() - if(H.wear_suit && H.wear_suit.can_attach_accessory(R)) - H.wear_suit.attach_accessory(H, R, TRUE) - else if(H.w_uniform && H.w_uniform.can_attach_accessory(R)) - H.w_uniform.attach_accessory(H, R, TRUE) + if(new_human.wear_suit && new_human.wear_suit.can_attach_accessory(R)) + new_human.wear_suit.attach_accessory(new_human, R, TRUE) + else if(new_human.w_uniform && new_human.w_uniform.can_attach_accessory(R)) + new_human.w_uniform.attach_accessory(new_human, R, TRUE) else qdel(R) if(flags & EQUIPMENT_PRESET_MARINE) - var/playtime = get_job_playtime(H.client, assignment) + var/playtime = get_job_playtime(new_human.client, assignment) var/medal_type switch(playtime) @@ -216,46 +214,46 @@ if(JOB_PLAYTIME_TIER_4 to INFINITY) medal_type = /obj/item/clothing/accessory/medal/platinum/service - if(!H.client.prefs.playtime_perks) + if(!new_human.client.prefs.playtime_perks) medal_type = null if(medal_type) var/obj/item/clothing/accessory/medal/medal = new medal_type() - medal.recipient_name = H.real_name + medal.recipient_name = new_human.real_name medal.recipient_rank = current_rank - if(H.wear_suit && H.wear_suit.can_attach_accessory(medal)) - H.wear_suit.attach_accessory(H, medal, TRUE) - else if(H.w_uniform && H.w_uniform.can_attach_accessory(medal)) - H.w_uniform.attach_accessory(H, medal, TRUE) + if(new_human.wear_suit && new_human.wear_suit.can_attach_accessory(medal)) + new_human.wear_suit.attach_accessory(new_human, medal, TRUE) + else if(new_human.w_uniform && new_human.w_uniform.can_attach_accessory(medal)) + new_human.w_uniform.attach_accessory(new_human, medal, TRUE) else - if(!H.equip_to_slot_if_possible(medal, WEAR_IN_BACK, disable_warning = TRUE)) - if(!H.equip_to_slot_if_possible(medal, WEAR_L_HAND)) - if(!H.equip_to_slot_if_possible(medal, WEAR_R_HAND)) - medal.forceMove(H.loc) + if(!new_human.equip_to_slot_if_possible(medal, WEAR_IN_BACK, disable_warning = TRUE)) + if(!new_human.equip_to_slot_if_possible(medal, WEAR_L_HAND)) + if(!new_human.equip_to_slot_if_possible(medal, WEAR_R_HAND)) + medal.forceMove(new_human.loc) //Gives glasses to the vision impaired - if(H.disabilities & NEARSIGHTED) + if(new_human.disabilities & NEARSIGHTED) var/obj/item/clothing/glasses/regular/P = new /obj/item/clothing/glasses/regular() - if(!H.equip_to_slot_if_possible(P, WEAR_EYES)) - if(istype(H.glasses, /obj/item/clothing/glasses)) - var/obj/item/clothing/glasses/EYES = H.glasses + if(!new_human.equip_to_slot_if_possible(P, WEAR_EYES)) + if(istype(new_human.glasses, /obj/item/clothing/glasses)) + var/obj/item/clothing/glasses/EYES = new_human.glasses if(EYES.prescription) //if they already have prescription glasses they don't need new ones return - if(!H.equip_to_slot_if_possible(P, WEAR_IN_BACK)) - if(!H.equip_to_slot_if_possible(P, WEAR_L_HAND)) - if(!H.equip_to_slot_if_possible(P, WEAR_R_HAND)) - P.forceMove(H.loc) + if(!new_human.equip_to_slot_if_possible(P, WEAR_IN_BACK)) + if(!new_human.equip_to_slot_if_possible(P, WEAR_L_HAND)) + if(!new_human.equip_to_slot_if_possible(P, WEAR_R_HAND)) + P.forceMove(new_human.loc) -/datum/equipment_preset/proc/load_traits(mob/living/carbon/human/H, client/mob_client) - var/client/real_client = mob_client || H.client +/datum/equipment_preset/proc/load_traits(mob/living/carbon/human/new_human, client/mob_client) + var/client/real_client = mob_client || new_human.client if(!real_client?.prefs?.traits) return for(var/trait in real_client.prefs.traits) var/datum/character_trait/CT = GLOB.character_traits[trait] - CT.apply_trait(H, src) + CT.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") @@ -289,16 +287,16 @@ idtype = null -/datum/equipment_preset/proc/spawn_rebel_uniform(mob/living/carbon/human/H) - if(!istype(H)) return +/datum/equipment_preset/proc/spawn_rebel_uniform(mob/living/carbon/human/new_human) + if(!istype(new_human)) return var/uniformpath = pick( /obj/item/clothing/under/colonist/clf, ) - H.equip_to_slot_or_del(new uniformpath, WEAR_BODY) + new_human.equip_to_slot_or_del(new uniformpath, WEAR_BODY) -/datum/equipment_preset/proc/spawn_rebel_suit(mob/living/carbon/human/H) - if(!istype(H)) return +/datum/equipment_preset/proc/spawn_rebel_suit(mob/living/carbon/human/new_human) + if(!istype(new_human)) return var/suitpath = pick( /obj/item/clothing/suit/storage/militia, /obj/item/clothing/suit/storage/militia/vest, @@ -307,11 +305,11 @@ /obj/item/clothing/suit/armor/bulletproof, /obj/item/clothing/suit/armor/vest, ) - H.equip_to_slot_or_del(new suitpath, WEAR_JACKET) + new_human.equip_to_slot_or_del(new suitpath, WEAR_JACKET) -/datum/equipment_preset/proc/spawn_rebel_helmet(mob/living/carbon/human/H) - if(!istype(H)) return +/datum/equipment_preset/proc/spawn_rebel_helmet(mob/living/carbon/human/new_human) + if(!istype(new_human)) return var/helmetpath = pick( /obj/item/clothing/head/militia, /obj/item/clothing/head/militia/bucket, @@ -325,11 +323,11 @@ /obj/item/clothing/head/headband/rebel, /obj/item/clothing/head/headband/rambo, ) - H.equip_to_slot_or_del(new helmetpath, WEAR_HEAD) + new_human.equip_to_slot_or_del(new helmetpath, WEAR_HEAD) -/datum/equipment_preset/proc/spawn_rebel_shoes(mob/living/carbon/human/H) - if(!istype(H)) return +/datum/equipment_preset/proc/spawn_rebel_shoes(mob/living/carbon/human/new_human) + if(!istype(new_human)) return var/shoespath = pick( /obj/item/clothing/shoes/black, /obj/item/clothing/shoes/brown, @@ -338,22 +336,22 @@ /obj/item/clothing/shoes/combat, /obj/item/clothing/shoes/swat, ) - H.equip_to_slot_or_del(new shoespath, WEAR_FEET) + new_human.equip_to_slot_or_del(new shoespath, WEAR_FEET) -/datum/equipment_preset/proc/spawn_rebel_gloves(mob/living/carbon/human/H) - if(!istype(H)) return +/datum/equipment_preset/proc/spawn_rebel_gloves(mob/living/carbon/human/new_human) + if(!istype(new_human)) return var/glovespath = pick( /obj/item/clothing/gloves/black, /obj/item/clothing/gloves/swat, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/botanic_leather, ) - H.equip_to_slot_or_del(new glovespath, WEAR_HANDS) + new_human.equip_to_slot_or_del(new glovespath, WEAR_HANDS) -/datum/equipment_preset/proc/spawn_rebel_belt(mob/living/carbon/human/H) - if(!istype(H)) return +/datum/equipment_preset/proc/spawn_rebel_belt(mob/living/carbon/human/new_human) + if(!istype(new_human)) return var/beltpath = pick( /obj/item/storage/belt/utility/full, /obj/item/storage/belt/knifepouch, @@ -362,7 +360,7 @@ /obj/item/storage/large_holster/katana/full, /obj/item/storage/large_holster/machete/full, /obj/item/storage/belt/marine) - H.equip_to_slot_or_del(new beltpath, WEAR_WAIST) + new_human.equip_to_slot_or_del(new beltpath, WEAR_WAIST) /datum/equipment_preset/proc/spawn_rebel_weapon(atom/M, sidearm = 0, ammo_amount = 12) @@ -527,8 +525,8 @@ var/list/rebel_rifles = list( return 1 -/datum/equipment_preset/proc/spawn_merc_helmet(mob/living/carbon/human/H) - if(!istype(H)) return +/datum/equipment_preset/proc/spawn_merc_helmet(mob/living/carbon/human/new_human) + if(!istype(new_human)) return var/helmetpath = pick( /obj/item/clothing/head/freelancer, /obj/item/clothing/head/helmet/skullcap, @@ -540,7 +538,7 @@ var/list/rebel_rifles = list( /obj/item/clothing/head/headband/red, /obj/item/clothing/head/headband/tan, ) - H.equip_to_slot_or_del(new helmetpath, WEAR_HEAD) + new_human.equip_to_slot_or_del(new helmetpath, WEAR_HEAD) /datum/equipment_preset/proc/spawn_merc_weapon(atom/M, sidearm = 0, ammo_amount = 12) @@ -624,8 +622,8 @@ var/list/rebel_rifles = list( var/ammopath = elite_merc_shotguns[gunpath] if(spawn_belt) if(ishuman(M)) - var/mob/living/carbon/human/H = M - H.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun, WEAR_WAIST) + var/mob/living/carbon/human/new_human = M + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun, WEAR_WAIST) ammo_amount = 24 spawn_weapon(gunpath, ammopath, M, 0, ammo_amount) else @@ -633,8 +631,8 @@ var/list/rebel_rifles = list( var/ammopath = elite_merc_rifles[gunpath] if(spawn_belt) if(ishuman(M)) - var/mob/living/carbon/human/H = M - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine, WEAR_WAIST) + var/mob/living/carbon/human/new_human = M + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine, WEAR_WAIST) spawn_weapon(gunpath, ammopath, M, 0, ammo_amount) @@ -646,11 +644,11 @@ var/list/rebel_rifles = list( if(gunpath) gun = new gunpath(spawnloc) if(ishuman(spawnloc)) - var/mob/living/carbon/human/H = spawnloc - H.equip_to_slot_or_del(gun, sidearm? pick(WEAR_L_HAND, WEAR_R_HAND) : WEAR_J_STORE) + var/mob/living/carbon/human/new_human = spawnloc + new_human.equip_to_slot_or_del(gun, sidearm? pick(WEAR_L_HAND, WEAR_R_HAND) : WEAR_J_STORE) if(ammopath && ammo_amount) for(var/i in 0 to ammo_amount-1) - if(!H.equip_to_appropriate_slot(new ammopath)) + if(!new_human.equip_to_appropriate_slot(new ammopath)) break else if(ammopath) spawnloc = get_turf(spawnloc) @@ -658,184 +656,187 @@ var/list/rebel_rifles = list( new ammopath(spawnloc) -/datum/equipment_preset/proc/generate_random_marine_primary_for_wo(mob/living/carbon/human/H, shuffle = rand(0,10)) +/datum/equipment_preset/proc/generate_random_marine_primary_for_wo(mob/living/carbon/human/new_human, shuffle = rand(0,10)) switch(shuffle) if(0 to 4) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/stripped(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41a(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/stripped(new_human), WEAR_J_STORE) + 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) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_BACK) if(5,7) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m39(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m39(new_human), WEAR_WAIST) + 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) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(new_human), WEAR_IN_BACK) else - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun/full(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun/full(new_human), WEAR_WAIST) return -/datum/equipment_preset/proc/add_common_wo_equipment(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/self_setting(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE(H), WEAR_IN_BACK) +/datum/equipment_preset/proc/add_common_wo_equipment(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/self_setting(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK) -/datum/equipment_preset/proc/add_ice_colony_survivor_equipment(mob/living/carbon/human/H) +/datum/equipment_preset/proc/add_ice_colony_survivor_equipment(mob/living/carbon/human/new_human) if((SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) && (SSmapping.configs[GROUND_MAP].map_name != MAP_CORSAT)) - H.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) -/datum/equipment_preset/proc/add_random_synth_infiltrator_equipment(mob/living/carbon/human/H) //To mitigate people metaing infiltrators on the spot +/datum/equipment_preset/proc/add_random_synth_infiltrator_equipment(mob/living/carbon/human/new_human) //To mitigate people metaing infiltrators on the spot var/random_gear = rand(0,4) switch(random_gear) if(0) - H.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/w_br(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/w_br(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) if(1) - H.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/gray_blu(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/gray_blu(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) if(2) - H.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/r_bla(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/r_bla(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) if(3) - H.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/trainee(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/trainee(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress(new_human), WEAR_FEET) if(4) - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) -/datum/equipment_preset/proc/add_random_survivor_medical_gear(mob/living/carbon/human/H) // Randomized medical gear. Survivors wont have their gear all kitted out once the outbreak began much like a doctor on a coffee break wont carry their instruments around. This is a generation of items they may or maynot get when the outbreak happens +/datum/equipment_preset/proc/add_random_survivor_medical_gear(mob/living/carbon/human/new_human) // Randomized medical gear. Survivors wont have their gear all kitted out once the outbreak began much like a doctor on a coffee break wont carry their instruments around. This is a generation of items they may or maynot get when the outbreak happens var/random_gear = rand(0,4) switch(random_gear) if(0) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) if(1) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/robust(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/robust(new_human), WEAR_IN_BACK) if(2) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/robust(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/robust(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) if(3) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/robust(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/robust(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) -/datum/equipment_preset/proc/add_random_survivor_research_gear(mob/living/carbon/human/H) // Randomized medical gear. Survivors wont have their gear all kitted out once the outbreak began much like a doctor on a coffee break wont carry their instruments around. This is a generation of items they may or maynot get when the outbreak happens +/datum/equipment_preset/proc/add_random_survivor_research_gear(mob/living/carbon/human/new_human) // Randomized medical gear. Survivors wont have their gear all kitted out once the outbreak began much like a doctor on a coffee break wont carry their instruments around. This is a generation of items they may or maynot get when the outbreak happens var/random_gear = rand(0,3) switch(random_gear) if(0) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector(new_human), WEAR_IN_BACK) if(1) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/metal_foam(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/metal_foam(new_human), WEAR_IN_BACK) if(2) - H.equip_to_slot_or_del(new /obj/structure/closet/bodybag/tarp/reactive(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/structure/closet/bodybag/tarp/reactive(new_human), WEAR_IN_BACK) if(3) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/antiweed(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/antiweed(new_human), WEAR_IN_BACK) -/datum/equipment_preset/proc/add_random_cl_survivor_loot(mob/living/carbon/human/H) // Loot Generation associated with CL survivor. Makes them a little more valuable and not a useless pick. +/datum/equipment_preset/proc/add_random_cl_survivor_loot(mob/living/carbon/human/new_human) // Loot Generation associated with CL survivor. Makes them a little more valuable and not a useless pick. var/random_gear = rand(0,2) switch(random_gear) if(0) - H.equip_to_slot_or_del(new /obj/item/paper/research_notes/grant/high(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/grant/high(new_human.back), WEAR_IN_BACK) if(1) - H.equip_to_slot_or_del(new /obj/item/paper/research_notes/grant(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/grant(new_human.back), WEAR_IN_BACK) if(2) - H.equip_to_slot_or_del(new /obj/item/paper/research_notes/good(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/good(new_human.back), WEAR_IN_BACK) -/datum/equipment_preset/proc/add_random_kutjevo_survivor_uniform(mob/living/carbon/human/H) // Kutjevo Survivor Clothing Randomizer +/datum/equipment_preset/proc/add_random_kutjevo_survivor_uniform(mob/living/carbon/human/new_human) // Kutjevo Survivor Clothing Randomizer var/random_gear = rand(0,1) switch(random_gear) if(0) - H.equip_to_slot_or_del(new /obj/item/clothing/under/kutjevo/drysuit(H), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/kutjevo/drysuit(new_human), WEAR_BODY) if(1) - H.equip_to_slot_or_del(new /obj/item/clothing/under/kutjevo(H), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/kutjevo(new_human), WEAR_BODY) -/datum/equipment_preset/proc/add_random_kutjevo_survivor_equipment(mob/living/carbon/human/H) // Kutjevo Survivor Clothing Randomizer +/datum/equipment_preset/proc/add_random_kutjevo_survivor_equipment(mob/living/carbon/human/new_human) // Kutjevo Survivor Clothing Randomizer var/random_gear = rand(0,2) switch(random_gear) if(0) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/kutjevo(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/kutjevo(H), WEAR_HEAD) + 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/head/helmet/marine/veteran/kutjevo(new_human), WEAR_HEAD) if(1) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/kutjevo(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/kutjevo(H), WEAR_HEAD) + 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/head/helmet/marine/veteran/kutjevo(new_human), WEAR_HEAD) if(2) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/kutjevo(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/kutjevo(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/kutjevo(H), WEAR_HEAD) + 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/glasses/kutjevo(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/kutjevo(new_human), WEAR_HEAD) -/datum/equipment_preset/proc/add_random_survivor_equipment(mob/living/carbon/human/H) // Think of this gear as something a survivor of an outbreak might get before shortly taking shelter I.E spawn. +/datum/equipment_preset/proc/add_random_survivor_equipment(mob/living/carbon/human/new_human) // Think of this gear as something a survivor of an outbreak might get before shortly taking shelter I.E spawn. var/random_gear = rand(0,5) switch(random_gear) if(0) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov(new_human), WEAR_IN_BACK) if(1) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94(new_human), WEAR_IN_BACK) if(2) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/nailgun(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/nailgun(new_human), WEAR_IN_BACK) if(3) - H.equip_to_slot_or_del(new /obj/item/weapon/twohanded/fireaxe(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/twohanded/fireaxe(new_human), WEAR_IN_BACK) if(4) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank(new_human), WEAR_IN_BACK) if(5) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human.back), WEAR_IN_BACK) // Random Survivor Weapon Spawners -/datum/equipment_preset/proc/add_survivor_weapon_pistol(mob/living/carbon/human/H) // Pistols a survivor might come across in a colony. They may have gotten it from a code red gun cabinet or simply have one becuase of hostile natives. +/datum/equipment_preset/proc/add_survivor_weapon_pistol(mob/living/carbon/human/new_human) // Pistols a survivor might come across in a colony. They may have gotten it from a code red gun cabinet or simply have one becuase of hostile natives. var/random_weapon = rand(0,4) switch(random_weapon) if(0) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/b92fs(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/b92fs(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/b92fs(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/b92fs(new_human), WEAR_IN_BACK) if(1) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb(new_human), WEAR_IN_BACK) if(2) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower(new_human), WEAR_IN_BACK) if(3) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BACK) if(4) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/small(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/small(H), WEAR_IN_BACK) + 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/H) // 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,5) +/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) switch(random_weapon) if(0) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/mp5(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/mp5(new_human), WEAR_WAIST) if(1) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/fp9000(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/fp9000(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/fp9000(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/fp9000(new_human), WEAR_WAIST) if(2) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/shotgun_ammo, WEAR_WAIST) + 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) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23/no_lock/stripped(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/nsg23(H), WEAR_WAIST) + 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) if(4) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/mar40(H), WEAR_WAIST) + 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) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/merc(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/shotgun_ammo, WEAR_WAIST) + 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) + 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) /** * Randomizes the primary weapon a survivor might find at the start of the outbreak in a gun cabinet. @@ -844,41 +845,41 @@ var/list/rebel_rifles = list( * Some weapons may not appear at all in a colony so they will need the extra ammo. * MERC, and DB needed a handfull of shells to compete with the normal CMB. */ -/datum/equipment_preset/proc/add_survivor_weapon_civilian(mob/living/carbon/human/H) +/datum/equipment_preset/proc/add_survivor_weapon_civilian(mob/living/carbon/human/new_human) // a high chance to just not have a primary weapon if(prob(60)) return var/random_weapon = rand(0,3) switch(random_weapon) if(0) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/boltaction(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/boltaction(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/boltaction(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/boltaction(new_human), WEAR_WAIST) if(1) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/uzi(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/uzi(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/uzi(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/uzi(new_human), WEAR_WAIST) if(2) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/shotgun_ammo, WEAR_WAIST) + 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) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/ar10(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/ar10(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/ar10(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/ar10(new_human), WEAR_WAIST) -/datum/equipment_preset/proc/add_survivor_weapon_security(mob/living/carbon/human/H) // Randomizes the primary weapon a survivor might find at the start of the outbreak in a gun cabinet. +/datum/equipment_preset/proc/add_survivor_weapon_security(mob/living/carbon/human/new_human) // Randomizes the primary weapon a survivor might find at the start of the outbreak in a gun cabinet. var/random_weapon = rand(0, 3) switch(random_weapon) if(0) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/mar40(H), WEAR_WAIST) + 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(1) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/mp5(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/mp5(new_human), WEAR_WAIST) if(2) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/shotgun_ammo, WEAR_WAIST) + 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) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m16(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m16(H), 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) @@ -897,16 +898,16 @@ var/list/rebel_rifles = list( list("Combat Pack", 0, /obj/item/storage/backpack/lightpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + 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_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), diff --git a/code/modules/gear_presets/agents.dm b/code/modules/gear_presets/agents.dm index 83b9ecc22ecb..e346cba373bf 100644 --- a/code/modules/gear_presets/agents.dm +++ b/code/modules/gear_presets/agents.dm @@ -38,12 +38,12 @@ dress_gloves = list(/obj/item/clothing/gloves/marine/dress) dress_shoes = list(/obj/item/clothing/shoes/laceup) -/datum/equipment_preset/uscm_ship/stowaway/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/stowaway(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/briefcase/stowaway(H), WEAR_L_HAND) +/datum/equipment_preset/uscm_ship/stowaway/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/stowaway(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/storage/backpack/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/briefcase/stowaway(new_human), WEAR_L_HAND) /datum/equipment_preset/upp/representative name = "UPP Representative" @@ -70,12 +70,12 @@ role_comm_title = "UPP Rep." skills = /datum/skills/civilian/survivor -/datum/equipment_preset/upp/representative/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/rep(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/gimmick/jason(H), WEAR_JACKET) +/datum/equipment_preset/upp/representative/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/rep(new_human), 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/shoes/laceup(new_human), WEAR_FEET) + 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/suit/gimmick/jason(new_human), WEAR_JACKET) /datum/equipment_preset/twe/representative name = "TWE Representative" @@ -103,28 +103,28 @@ role_comm_title = "TWE Rep." skills = /datum/skills/civilian/survivor -/datum/equipment_preset/twe/representative/load_name(mob/living/carbon/human/H, randomise) - H.gender = MALE +/datum/equipment_preset/twe/representative/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = MALE var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name - if(H.gender == MALE) + if(new_human.gender == MALE) random_name = "[pick(first_names_male_dutch)] [pick(last_names_clf)]" - H.f_style = "Shaved" + new_human.f_style = "Shaved" - H.change_real_name(H, random_name) - H.age = rand(17,35) - H.h_style = "Crewcut" - H.r_hair = 0 - H.g_hair = 0 - H.b_hair = 0 - H.r_eyes = 139 - H.g_eyes = 62 - H.b_eyes = 19 + new_human.change_real_name(new_human, random_name) + new_human.age = rand(17,35) + new_human.h_style = "Crewcut" + new_human.r_hair = 0 + new_human.g_hair = 0 + new_human.b_hair = 0 + new_human.r_eyes = 139 + new_human.g_eyes = 62 + new_human.b_eyes = 19 -/datum/equipment_preset/twe/representative/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/rep(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/twe_suit(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) +/datum/equipment_preset/twe/representative/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/rep(new_human), WEAR_L_EAR) + 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/storage/backpack/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm index b8f7eaebe521..c669a8a3c61e 100644 --- a/code/modules/gear_presets/clf.dm +++ b/code/modules/gear_presets/clf.dm @@ -11,18 +11,18 @@ . = ..() access = get_antagonist_access() -/datum/equipment_preset/clf/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(60;MALE, 40;FEMALE) +/datum/equipment_preset/clf/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(60;MALE, 40;FEMALE) var/random_name var/first_name var/last_name //gender checks - if(H.gender == MALE) + if(new_human.gender == MALE) if(prob(40)) first_name = "[capitalize(randomly_generate_japanese_word(rand(1, 3)))]" else first_name = "[pick(first_names_male_clf)]" - H.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") + new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") else if(prob(40)) first_name = "[capitalize(randomly_generate_japanese_word(rand(1, 3)))]" @@ -35,14 +35,14 @@ last_name = "[pick(last_names_clf)]" //put them together random_name = "[first_name] [last_name]" - H.change_real_name(H, random_name) - H.age = rand(17,45) - H.r_hair = 25 - H.g_hair = 25 - H.b_hair = 35 - H.r_eyes = 139 - H.g_eyes = 62 - H.b_eyes = 19 + new_human.change_real_name(new_human, random_name) + new_human.age = rand(17,45) + new_human.r_hair = 25 + new_human.g_hair = 25 + new_human.b_hair = 35 + new_human.r_eyes = 139 + new_human.g_eyes = 62 + new_human.b_eyes = 19 //*****************************************************************************************************/ @@ -55,27 +55,27 @@ skills = /datum/skills/clf -/datum/equipment_preset/clf/soldier/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/clf/soldier/load_gear(mob/living/carbon/human/new_human) var/obj/item/clothing/under/colonist/clf/jumpsuit = new() var/obj/item/clothing/accessory/storage/webbing/W = new() - jumpsuit.attach_accessory(H, W) - H.equip_to_slot_or_del(jumpsuit, WEAR_BODY) - spawn_rebel_suit(H) - spawn_rebel_helmet(H) - spawn_rebel_shoes(H) - spawn_rebel_gloves(H) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/flashlight(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(H), WEAR_R_STORE) - - H.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun/full/random(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb(H), WEAR_BACK) + jumpsuit.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(jumpsuit, WEAR_BODY) + spawn_rebel_suit(new_human) + spawn_rebel_helmet(new_human) + spawn_rebel_shoes(new_human) + spawn_rebel_gloves(new_human) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_L_STORE) + 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/belt/shotgun/full/random(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb(new_human), WEAR_BACK) if(prob(50)) - spawn_rebel_smg(H) + spawn_rebel_smg(new_human) else - spawn_rebel_rifle(H) + spawn_rebel_rifle(new_human) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF(H), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF(new_human), WEAR_L_EAR) /datum/equipment_preset/clf/soldier/get_antag_clothing_equipment() return list( @@ -91,16 +91,16 @@ list("Combat Pack", 0, /obj/item/storage/backpack/lightpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + 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_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -148,14 +148,6 @@ -//*****************************************************************************************************/ - -/datum/equipment_preset/clf/soldier/cryo - name = "CLF Cryo Soldier" - -/datum/equipment_preset/clf/soldier/cryo/load_gear(mob/living/carbon/human/H) - return - //*****************************************************************************************************/ /datum/equipment_preset/clf/engineer @@ -167,35 +159,35 @@ skills = /datum/skills/clf/combat_engineer -/datum/equipment_preset/clf/engineer/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/clf/engineer/load_gear(mob/living/carbon/human/new_human) var/obj/item/clothing/under/colonist/clf/M = new() var/obj/item/clothing/accessory/storage/webbing/W = new() - M.attach_accessory(H, W) - H.equip_to_slot_or_del(M, WEAR_BODY) - - spawn_rebel_suit(H) - spawn_rebel_shoes(H) - spawn_rebel_gloves(H) - - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/welding, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/cct, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/low_grade_full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_R_STORE) - - spawn_rebel_weapon(H) - spawn_rebel_weapon(H,1) + M.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(M, WEAR_BODY) + + spawn_rebel_suit(new_human) + spawn_rebel_shoes(new_human) + spawn_rebel_gloves(new_human) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/welding, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/cct, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK) + 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/explosive/plastic/breaching_charge, WEAR_IN_BACK) + 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/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/molotov, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/low_grade_full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_R_STORE) + + spawn_rebel_weapon(new_human) + spawn_rebel_weapon(new_human,1) /datum/equipment_preset/clf/engineer/get_antag_clothing_equipment() return list( @@ -213,19 +205,19 @@ list("Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + 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_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -283,14 +275,6 @@ //*****************************************************************************************************/ -/datum/equipment_preset/clf/engineer/cryo - name = "CLF Cryo Engineer" - -/datum/equipment_preset/clf/engineer/cryo/load_gear(mob/living/carbon/human/H) - return - -//*****************************************************************************************************/ - /datum/equipment_preset/clf/medic name = "CLF Medic" flags = EQUIPMENT_PRESET_EXTRA @@ -299,38 +283,38 @@ role_comm_title = "MED" skills = /datum/skills/clf/combat_medic -/datum/equipment_preset/clf/medic/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/clf/medic/load_gear(mob/living/carbon/human/new_human) var/obj/item/clothing/under/colonist/clf/CLF = new() var/obj/item/clothing/accessory/storage/surg_vest/equipped/W = new() - CLF.attach_accessory(H, W) - H.equip_to_slot_or_del(CLF, WEAR_BODY) - - spawn_rebel_suit(H) - spawn_rebel_helmet(H) - spawn_rebel_shoes(H) - spawn_rebel_gloves(H) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_defib_and_analyzer(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BELT) - - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/medic(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/structure/bed/portable_surgery(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar(H), WEAR_IN_BACK) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + CLF.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(CLF, WEAR_BODY) + + spawn_rebel_suit(new_human) + spawn_rebel_helmet(new_human) + spawn_rebel_shoes(new_human) + spawn_rebel_gloves(new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_defib_and_analyzer(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BELT) + + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/medic(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/structure/bed/portable_surgery(new_human), 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/tool/surgery/surgical_line, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_BACK) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/device/flashlight(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large(H), WEAR_R_STORE) + 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/flashlight(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large(new_human), WEAR_R_STORE) - spawn_rebel_smg(H) + spawn_rebel_smg(new_human) /datum/equipment_preset/clf/medic/get_antag_clothing_equipment() return list( @@ -350,19 +334,19 @@ list("Medical Storage Rig", 0, /obj/item/storage/belt/medical, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch (Splints)", 0, /obj/item/storage/pouch/medical/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, 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_RECOMMENDED), + 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 Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch (Splints)", 0, /obj/item/storage/pouch/medical/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + 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("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -387,8 +371,8 @@ list("Essential Medical Set", 0, /obj/effect/essentials_set/medic/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("FIELD SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_RECOMMENDED), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_RECOMMENDED), + 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("FIRSTAID KITS", 0, null, null, null), @@ -447,14 +431,6 @@ //*****************************************************************************************************/ -/datum/equipment_preset/clf/medic/cryo - name = "CLF Cryo Medic" - -/datum/equipment_preset/clf/medic/cryo/load_gear(mob/living/carbon/human/H) - return - -//*****************************************************************************************************/ - /datum/equipment_preset/clf/specialist name = "CLF Specialist" flags = EQUIPMENT_PRESET_EXTRA @@ -463,44 +439,44 @@ role_comm_title = "SPC" skills = /datum/skills/clf/specialist -/datum/equipment_preset/clf/specialist/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/clf/specialist/load_gear(mob/living/carbon/human/new_human) //jumpsuit and their webbing var/obj/item/clothing/under/colonist/clf/CLF = new() var/obj/item/clothing/accessory/storage/webbing/five_slots/W = new() - CLF.attach_accessory(H, W) - H.equip_to_slot_or_del(CLF, WEAR_BODY) + CLF.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(CLF, WEAR_BODY) //clothing - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(H), WEAR_EYES) - - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/cct(H), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(new_human), WEAR_EYES) + + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/cct(new_human), WEAR_L_EAR) //standard backpack stuff - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flashlight(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_BACK) //specialist backpack stuff - H.equip_to_slot_or_del(new /obj/item/prop/folded_anti_tank_sadar(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/ears/earmuffs(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/prop/folded_anti_tank_sadar(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/ears/earmuffs(new_human), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_IN_BACK) //storage items - H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) if(prob(75)) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(H), WEAR_IN_BACK) - spawn_rebel_specialist_weapon(H, 10) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(new_human), WEAR_IN_BACK) + spawn_rebel_specialist_weapon(new_human, 10) else - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(H), WEAR_IN_JACKET) - spawn_weapon(/obj/item/weapon/gun/lever_action/r4t, /obj/item/ammo_magazine/handful/lever_action, H) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(new_human), WEAR_IN_JACKET) + spawn_weapon(/obj/item/weapon/gun/lever_action/r4t, /obj/item/ammo_magazine/handful/lever_action, new_human) /datum/equipment_preset/clf/specialist/get_antag_clothing_equipment() return list( @@ -516,16 +492,16 @@ list("Combat Pack", 0, /obj/item/storage/backpack/lightpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + 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_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -574,11 +550,129 @@ //*****************************************************************************************************/ -/datum/equipment_preset/clf/specialist/cryo - name = "CLF Cryo Specialist" +/datum/equipment_preset/clf/commander + name = "CLF Cell Commander" + flags = EQUIPMENT_PRESET_EXTRA + assignment = JOB_CLF_COMMANDER + rank = JOB_CLF_COMMANDER + role_comm_title = "CMDR" + skills = /datum/skills/clf/commander + +/datum/equipment_preset/clf/commander/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(new_human), WEAR_L_EAR) + 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/suit/storage/militia/smartgun(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/clf(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack/clf(new_human), WEAR_BACK) + 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/storage/belt/gun/smartgunner/clf/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) + + 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/full(new_human), WEAR_R_STORE) + +/datum/equipment_preset/clf/commander/get_antag_clothing_equipment() + return list( + list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), + list("Combat Boots", 0, /obj/item/clothing/shoes/combat, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), + list("CLF Uniform", 0, /obj/item/clothing/under/colonist/clf, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), + list("CLF Smartgun Armor", 0, /obj/item/clothing/suit/storage/militia/smartgun, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + list("Black Gloves", 0, /obj/item/clothing/gloves/black, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), + list("CLF Smartgunner Belt", 0, /obj/item/storage/belt/gun/smartgunner/clf, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), + list("Headset", 0, /obj/item/device/radio/headset/distress/CLF/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), + list("Flashlight", 0, /obj/item/device/flashlight, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("Combat Pack", 0, /obj/item/storage/backpack/lightpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + + list("HELMET (CHOOSE 1)", 0, null, null, null), + list("Y8 Miner Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner, MARINE_CAN_BUY_HELMET, 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), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + 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_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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("ATTACHMENTS (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("Gyroscopic Stabilizer", 0, /obj/item/attachable/gyro, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Masterkey Shotgun", 0, /obj/item/attachable/attached_gun/shotgun, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Recoil Compensator", 0, /obj/item/attachable/compensator, 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) + ) + +/datum/equipment_preset/clf/commander/get_antag_gear_equipment() + return list( + list("CELL LEADER SET (MANDATORY)", 0, null, null, null), + list("Essential Leader Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), -/datum/equipment_preset/clf/specialist/cryo/load_gear(mob/living/carbon/human/H) - return + list("GENERAL SUPPLIES", 0, null, null, null), + list("Megaphone", 5, /obj/item/device/megaphone, null, VENDOR_ITEM_REGULAR), + 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("Metal x10", 5, /obj/item/stack/sheet/metal/small_stack, null, VENDOR_ITEM_RECOMMENDED), + list("Plasteel x10", 7, /obj/item/stack/sheet/plasteel/small_stack, null, VENDOR_ITEM_RECOMMENDED), + list("Sandbags x25", 10, /obj/item/stack/sandbags_empty/half, null, VENDOR_ITEM_RECOMMENDED), + 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("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), + list("Adv 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("Sensor Medical HUD", 4, /obj/item/clothing/glasses/hud/sensor, null, VENDOR_ITEM_MANDATORY), + + list("SPECIAL AMMUNITION", 0, null, null, null), + list("M16 AP Magazine (5.56x45mm)", 10, /obj/item/ammo_magazine/rifle/m16/ap, null, VENDOR_ITEM_REGULAR), + list("MAR Extended Magazine (7.62x39mm)", 10, /obj/item/ammo_magazine/rifle/mar40/extended, null, VENDOR_ITEM_REGULAR), + list("Shotgun Incendiary Shells (Handful)", 15, /obj/item/ammo_magazine/handful/shotgun/incendiary, null, VENDOR_ITEM_REGULAR), + + list("EXPLOSIVES", 0, null, null, null), + list("EMP Grenade", 10, /obj/item/explosive/grenade/empgrenade, null, VENDOR_ITEM_REGULAR), + list("Improvised Explosive Device", 15, /obj/item/explosive/grenade/custom/ied, null, VENDOR_ITEM_REGULAR), + list("Improvised Firebomb", 10, /obj/item/explosive/grenade/incendiary/molotov, null, VENDOR_ITEM_REGULAR), + list("Incendiary IED", 15, /obj/item/explosive/grenade/custom/ied_incendiary, null, VENDOR_ITEM_REGULAR), + list("Improvised Phosphorus Bomb", 20, /obj/item/explosive/grenade/phosphorus/clf, null, VENDOR_ITEM_REGULAR), + list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, 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("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), + list("Random Useful (Or Not) Item", 5, /obj/effect/essentials_set/random/clf_bonus_item, 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) + ) //*****************************************************************************************************/ @@ -590,36 +684,36 @@ role_comm_title = "LDR" skills = /datum/skills/clf/leader -/datum/equipment_preset/clf/leader/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/clf/leader/load_gear(mob/living/carbon/human/new_human) //No random armor, so that it's more clear that he's the leader - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/clf(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec/hos(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine(H), WEAR_WAIST) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor/prescription(H), WEAR_EYES) + 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/suit/storage/militia(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec/hos(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(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/storage/belt/marine(new_human), WEAR_WAIST) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor(H), WEAR_EYES) - - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied_incendiary(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied_incendiary(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/screwdriver(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/multitool(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flashlight(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(H), WEAR_R_STORE) - - spawn_weapon(/obj/item/weapon/gun/rifle/mar40, /obj/item/ammo_magazine/rifle/mar40, H) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor(new_human), WEAR_EYES) + + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied_incendiary(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied_incendiary(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/multitool(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) + + spawn_weapon(/obj/item/weapon/gun/rifle/mar40, /obj/item/ammo_magazine/rifle/mar40, new_human) /datum/equipment_preset/clf/leader/get_antag_clothing_equipment() return list( @@ -638,16 +732,16 @@ list("Officer Beret", 0, /obj/item/clothing/head/beret/sec/hos, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + 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_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -685,8 +779,8 @@ list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("MEDICAL SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), + 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), @@ -736,62 +830,63 @@ role_comm_title = "Syn" -/datum/equipment_preset/clf/synth/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(50;MALE,50;FEMALE) +/datum/equipment_preset/clf/synth/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(50;MALE,50;FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name if(prob(10)) random_name = "[capitalize(randomly_generate_japanese_word(rand(2, 3)))]" - else if(H.gender == MALE) + else if(new_human.gender == MALE) random_name = "[pick(first_names_male_clf)]" else random_name = "[pick(first_names_female_clf)]" - if(H.gender == MALE) - H.f_style = "5 O'clock Shadow" + if(new_human.gender == MALE) + new_human.f_style = "5 O'clock Shadow" - H.change_real_name(H, random_name) - H.r_hair = 15 - H.g_hair = 15 - H.b_hair = 25 - H.r_eyes = 139 - H.g_eyes = 62 - H.b_eyes = 19 + new_human.change_real_name(new_human, random_name) + new_human.r_hair = 15 + new_human.g_hair = 15 + new_human.b_hair = 25 + new_human.r_eyes = 139 + new_human.g_eyes = 62 + new_human.b_eyes = 19 idtype = /obj/item/card/id/data -/datum/equipment_preset/clf/synth/load_race(mob/living/carbon/human/H) - H.set_species(SYNTH_COLONY_GEN_ONE) +/datum/equipment_preset/clf/synth/load_race(mob/living/carbon/human/new_human) + new_human.set_species(SYNTH_COLONY_GEN_ONE) -/datum/equipment_preset/clf/synth/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/clf/synth/load_gear(mob/living/carbon/human/new_human) + load_name(new_human) var/obj/item/clothing/under/colonist/clf/CLF = new() var/obj/item/clothing/accessory/storage/webbing/W = new() - CLF.attach_accessory(H, W) - H.equip_to_slot_or_del(CLF, WEAR_BODY) - - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_suture_and_graft, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(H), WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - - spawn_weapon(/obj/item/weapon/gun/rifle/mar40/carbine, /obj/item/ammo_magazine/rifle/mar40/extended, H, 0, 10) - - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/attachable/bayonet/upp, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/synth, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_R_STORE) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + CLF.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(CLF, WEAR_BODY) + + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_suture_and_graft, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + + spawn_weapon(/obj/item/weapon/gun/rifle/mar40/carbine, /obj/item/ammo_magazine/rifle/mar40/extended, new_human, 0, 10) + + new_human.equip_to_slot_or_del(new /obj/item/roller, 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/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet/upp, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/synth, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_R_STORE) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) /datum/equipment_preset/clf/synth/get_antag_clothing_equipment() return list( @@ -829,19 +924,19 @@ list("M276 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("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, 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_RECOMMENDED), + 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("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("MASK", 0, null, null, null), list("Sterile mask", 0, /obj/item/clothing/mask/surgical, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) @@ -870,8 +965,8 @@ list("Radiation Firstaid Kit", 6, /obj/item/storage/firstaid/rad, null, VENDOR_ITEM_REGULAR), list("MEDICAL SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), + 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("Medevac Bed", 6, /obj/item/roller/medevac, null, VENDOR_ITEM_REGULAR), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), list("Roller Bed", 4, /obj/item/roller, null, VENDOR_ITEM_REGULAR), @@ -910,17 +1005,6 @@ list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), ) - -//*****************************************************************************************************/ - - - -/datum/equipment_preset/clf/leader/cryo - name = "CLF Cryo Leader" - -/datum/equipment_preset/clf/leader/cryo/load_gear(mob/living/carbon/human/H) - return - //*****************************************************************************************************/ /datum/equipment_preset/clf/commander @@ -963,16 +1047,16 @@ list("Y8 Miner Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + 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_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -1010,8 +1094,8 @@ list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("MEDICAL SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), + 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), diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index 1894e661638d..3d8d1a6883ef 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -9,36 +9,36 @@ . = ..() access = get_all_accesses() + get_all_civilian_accesses() -/datum/equipment_preset/cmb/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(80;MALE,20;FEMALE) +/datum/equipment_preset/cmb/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(80;MALE,20;FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) var/hair_color = pick(hair_colors) - H.r_hair = hair_colors[hair_color][1] - H.g_hair = hair_colors[hair_color][2] - H.b_hair = hair_colors[hair_color][3] - H.r_facial = hair_colors[hair_color][1] - H.g_facial = hair_colors[hair_color][2] - H.b_facial = hair_colors[hair_color][3] + new_human.r_hair = hair_colors[hair_color][1] + new_human.g_hair = hair_colors[hair_color][2] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] var/eye_color = pick(colors) - H.r_eyes = colors[eye_color][1] - H.g_eyes = colors[eye_color][2] - H.b_eyes = colors[eye_color][3] - if(H.gender == MALE) + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] + if(new_human.gender == MALE) random_name = "[pick(first_names_male)] [pick(last_names)]" - H.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",) - H.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) + new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",) + new_human.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) else random_name = "[pick(first_names_female)] [pick(last_names)]" - H.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",) - H.change_real_name(H, random_name) - H.age = rand(20,45) - H.r_hair = rand(15,35) - H.g_hair = rand(15,35) - H.b_hair = rand(25,45) + new_human.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",) + new_human.change_real_name(new_human, random_name) + new_human.age = rand(20,45) + new_human.r_hair = rand(15,35) + new_human.g_hair = rand(15,35) + new_human.b_hair = rand(25,45) //*****************************************************************************************************/ @@ -56,43 +56,43 @@ access = get_all_accesses() + get_all_civilian_accesses() -/datum/equipment_preset/cmb/load_name(mob/living/carbon/human/H) - H.gender = pick(80;MALE,20;FEMALE) +/datum/equipment_preset/cmb/load_name(mob/living/carbon/human/new_human) + new_human.gender = pick(80;MALE,20;FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name - random_name = capitalize(pick(H.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names)) - H.change_real_name(H, random_name) - H.name = H.real_name - H.age = rand(22,45) + random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names)) + new_human.change_real_name(new_human, random_name) + new_human.name = new_human.real_name + new_human.age = rand(22,45) var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) var/hair_color = pick(hair_colors) - H.r_hair = hair_colors[hair_color][1] - H.g_hair = hair_colors[hair_color][2] - H.b_hair = hair_colors[hair_color][3] - H.r_facial = hair_colors[hair_color][1] - H.g_facial = hair_colors[hair_color][2] - H.b_facial = hair_colors[hair_color][3] + new_human.r_hair = hair_colors[hair_color][1] + new_human.g_hair = hair_colors[hair_color][2] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] var/eye_color = pick(colors) - H.r_eyes = colors[eye_color][1] - H.g_eyes = colors[eye_color][2] - H.b_eyes = colors[eye_color][3] - if(H.gender == MALE) - H.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",) - H.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] + if(new_human.gender == MALE) + new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",) + new_human.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) else - H.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",) - H.change_real_name(H, random_name) - H.age = rand(20,45) - H.r_hair = rand(15,35) - H.g_hair = rand(15,35) - H.b_hair = rand(25,45) - -/datum/equipment_preset/cmb/load_id(mob/living/carbon/human/H, client/mob_client) + new_human.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",) + new_human.change_real_name(new_human, random_name) + new_human.age = rand(20,45) + new_human.r_hair = rand(15,35) + new_human.g_hair = rand(15,35) + new_human.b_hair = rand(25,45) + +/datum/equipment_preset/cmb/load_id(mob/living/carbon/human/new_human, client/mob_client) if(human_versus_human) - var/obj/item/clothing/under/uniform = H.w_uniform + var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS uniform.sensor_faction = FACTION_USCM @@ -109,76 +109,76 @@ rank = JOB_CMB skills = /datum/skills/cmb -/datum/equipment_preset/cmb/standard/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/cmb/standard/load_gear(mob/living/carbon/human/new_human) var/choice = rand(1,10) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) + 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/mask/cigarette, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_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/storage/belt/security/MP/CMB/full, WEAR_WAIST) + 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/knife, WEAR_FEET) + 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/storage/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) switch(choice) if(1 to 6) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) if(7 to 8) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + 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/pouch/shotgun/large, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) if(9 to 10) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_L_HAND) + 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/smg/mp5, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) //*****************************************************************************************************/ @@ -196,45 +196,45 @@ minimum_age = 30 languages = ALL_HUMAN_LANGUAGES -/datum/equipment_preset/cmb/leader/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/cmb/leader/load_gear(mob/living/carbon/human/new_human) //clothes - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) + new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) + 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/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY) + 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/mask/cigarette/cigar, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_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/weapon/gun/shotgun/pump/dual_tube/cmb/m3717, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full, WEAR_WAIST) + 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/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) //pouches - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot/incendiary, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/incendiary, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot/incendiary, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/incendiary, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE) //backpack - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15/rubber, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15/rubber, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) //*****************************************************************************************************/ /datum/equipment_preset/cmb/synth @@ -248,94 +248,94 @@ rank = JOB_CMB_SYN languages = ALL_SYNTH_LANGUAGES -/datum/equipment_preset/cmb/synth/load_skills(mob/living/carbon/human/H) - H.set_skills(/datum/skills/synthetic/cmb) - H.allow_gun_usage = FALSE +/datum/equipment_preset/cmb/synth/load_skills(mob/living/carbon/human/new_human) + new_human.set_skills(/datum/skills/synthetic/cmb) + new_human.allow_gun_usage = FALSE -/datum/equipment_preset/cmb/synth/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(50;MALE,50;FEMALE) +/datum/equipment_preset/cmb/synth/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(50;MALE,50;FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name - if(H.gender == MALE) + if(new_human.gender == MALE) random_name = "[pick(first_names_male)]" else random_name = "[pick(first_names_female)]" - if(H.gender == MALE) - H.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") + if(new_human.gender == MALE) + new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") - H.change_real_name(H, random_name) - H.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut") + new_human.change_real_name(new_human, random_name) + new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut") var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) var/hair_color = pick(hair_colors) - H.r_hair = hair_colors[hair_color][1] - H.g_hair = hair_colors[hair_color][2] - H.b_hair = hair_colors[hair_color][3] - H.r_facial = hair_colors[hair_color][1] - H.g_facial = hair_colors[hair_color][2] - H.b_facial = hair_colors[hair_color][3] + new_human.r_hair = hair_colors[hair_color][1] + new_human.g_hair = hair_colors[hair_color][2] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] var/eye_color = pick(colors) - H.r_eyes = colors[eye_color][1] - H.g_eyes = colors[eye_color][2] - H.b_eyes = colors[eye_color][3] + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] -/datum/equipment_preset/cmb/synth/load_race(mob/living/carbon/human/H) - H.set_species(SYNTH_COLONY) +/datum/equipment_preset/cmb/synth/load_race(mob/living/carbon/human/new_human) + new_human.set_species(SYNTH_COLONY) -/datum/equipment_preset/cmb/synth/load_gear(mob/living/carbon/human/H) - load_name(H) +/datum/equipment_preset/cmb/synth/load_gear(mob/living/carbon/human/new_human) + load_name(new_human) //backpack - H.equip_to_slot_or_del(new /obj/item/storage/backpack/security, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/autopsy_scanner, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/security, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/autopsy_scanner, WEAR_IN_BACK) + 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/device/radio, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) //face - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen, WEAR_R_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, 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/device/flashlight/pen, WEAR_R_EAR) + 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/clothing/head/CMB, WEAR_HEAD) //uniform - H.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/candy, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_J_STORE) + 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/health/ceramic_plate, WEAR_ACCESSORY) + 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/accessory/storage/droppouch, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/candy, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_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/device/motiondetector, WEAR_J_STORE) //belt - H.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/synth, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/synth, WEAR_WAIST) //holding - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full, WEAR_L_HAND) + 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/belt/medical/lifesaver/full, WEAR_L_HAND) //pouches - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_R_STORE) //*****************************************************************************************************/ @@ -352,41 +352,41 @@ skills = /datum/skills/civilian/survivor languages = list(LANGUAGE_ENGLISH, LANGUAGE_SPANISH, LANGUAGE_JAPANESE) -/datum/equipment_preset/cmb/liaison/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/cmb/liaison/load_gear(mob/living/carbon/human/new_human) //clothes - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/ICC, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/mod88, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/yellow, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/reagent_container/spray/pepper, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/folder/blue, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/ICC, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/mod88, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/yellow, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/spray/pepper, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/folder/blue, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_J_STORE) //holding - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clipboard, WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.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/insulated, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clipboard, WEAR_L_HAND) + 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/glasses/sunglasses, WEAR_EYES) //pouches - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/wypacket, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/spacecash/c1000, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/spacecash/c1000, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/wypacket, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/spacecash/c1000, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/spacecash/c1000, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_R_STORE) //backpack and stuff in it - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/pen/clicky, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/paper/carbon, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/paper/carbon, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, WEAR_IN_BACK) + 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/tool/pen/clicky, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/paper/carbon, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/paper/carbon, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, WEAR_IN_BACK) //*****************************************************************************************************/ @@ -403,40 +403,40 @@ skills = /datum/skills/civilian/survivor/doctor languages = list(LANGUAGE_ENGLISH, LANGUAGE_SPANISH, LANGUAGE_RUSSIAN) -/datum/equipment_preset/cmb/observer/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/cmb/observer/load_gear(mob/living/carbon/human/new_human) //clothes - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen, WEAR_R_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/suspenders, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/pen, WEAR_R_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/suspenders, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_ACCESSORY) + 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/device/flashlight, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full, WEAR_WAIST) //holding - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_R_HAND) //pouches - H.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/reagent_container/spray/pepper, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/spray/pepper, WEAR_IN_R_STORE) //backpack and stuff in it - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/camera_film, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/pen/clicky, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/paper/carbon, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/folder, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clipboard, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + 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/camera_film, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/pen/clicky, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/paper/carbon, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/folder, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clipboard, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) //############ Anchorpoint Station Colonial Marines - They serve as reinforcements for the Colonial Marshals of Anchorpoint Station. ############# @@ -457,45 +457,45 @@ skills = /datum/skills/pfc/crafty faction = FACTION_USCM -/datum/equipment_preset/uscm/cmb/load_status(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/cmb/load_status(mob/living/carbon/human/new_human) . = ..() - H.nutrition = rand(NUTRITION_MAX, NUTRITION_NORMAL) + new_human.nutrition = rand(NUTRITION_MAX, NUTRITION_NORMAL) -/datum/equipment_preset/uscm/cmb/load_rank(mob/living/carbon/human/H) - if(H.client) - if(get_job_playtime(H.client, rank) < JOB_PLAYTIME_TIER_1) +/datum/equipment_preset/uscm/cmb/load_rank(mob/living/carbon/human/new_human) + if(new_human.client) + if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) return "ME1" return paygrade -/datum/equipment_preset/uscm/cmb/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/baton/cattleprod, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/ammo_box/rounds, WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_R_HAND) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint/gl, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/high_explosive, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/high_explosive, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) +/datum/equipment_preset/uscm/cmb/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton/cattleprod, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_box/rounds, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint/gl, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/high_explosive, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/high_explosive, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) //Anchorpoint Station Marine Squad Leader @@ -513,36 +513,36 @@ minimum_age = 25 skills = /datum/skills/SL -/datum/equipment_preset/uscm/cmb/leader/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3/custom, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/large_holster/m37, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/leader, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/lead, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/leader, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) // he's collected the squad's supply of these magazines on request of OW - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, WEAR_L_HAND) +/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3/custom, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/m37, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/leader, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/lead, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/leader, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + 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/m41aMK1/ap, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) // he's collected the squad's supply of these magazines on request of OW + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/buckshot, WEAR_L_HAND) //Anchorpoint Station Marine RTO - technical specialist, has the responsibility of engineering as well /datum/equipment_preset/uscm/cmb/rto @@ -558,39 +558,39 @@ role_comm_title = "A-TS" skills = /datum/skills/tl -/datum/equipment_preset/uscm/cmb/rto/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/rto, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/rto, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/tl, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/rto, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/rto, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) - - H.back.pickup() +/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/rto, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) + 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/device/radio/headset/almayer/marine/cryo/tl, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/rto, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/rto, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) + 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/explosive/plastic/breaching_charge, WEAR_IN_BACK) + 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/ammo_magazine/rifle/m41aMK1, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + + new_human.back.pickup() //Anchorpoint Station Corpsman /datum/equipment_preset/uscm/cmb/medic @@ -608,51 +608,51 @@ utility_under = list(/obj/item/clothing/under/marine/medic) -/datum/equipment_preset/uscm/cmb/medic/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/medic, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/med, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/medic, WEAR_BACK) +/datum/equipment_preset/uscm/cmb/medic/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/medic, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_gasmask, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/med, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/medic, WEAR_BACK) if(prob(50)) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/adrenaline, WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/adrenaline, WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, WEAR_IN_BELT) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical, WEAR_FACE) + 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, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/adrenaline, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/adrenaline, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency/skillless, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, WEAR_IN_BELT) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription, WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medical, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/imidazoline, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) + 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/storage/box/MRE, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_BACK) + 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/pouch/medical, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/imidazoline, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full, WEAR_R_STORE) //Anchorpoint Station Marine Smartgunnner /datum/equipment_preset/uscm/cmb/smartgunner @@ -668,23 +668,23 @@ role_comm_title = "A-SG" skills = /datum/skills/smartgunner -/datum/equipment_preset/uscm/cmb/smartgunner/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/smartgun_powerpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3/custom, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/smartgunner/full/, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/head/headband/red, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo, WEAR_L_EAR) +/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) + new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3/custom, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/smartgunner/full/, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/headband/red, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo, WEAR_L_EAR) diff --git a/code/modules/gear_presets/colonist.dm b/code/modules/gear_presets/colonist.dm index 8f852f83592a..81e5c8ec6ae8 100644 --- a/code/modules/gear_presets/colonist.dm +++ b/code/modules/gear_presets/colonist.dm @@ -13,16 +13,16 @@ minimap_icon = "surv" minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN -/datum/equipment_preset/colonist/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET) - H.equip_to_slot(new /obj/item/attachable/bayonet(H), WEAR_L_STORE) - H.equip_to_slot(new /obj/item/device/flashlight(H), WEAR_R_STORE) - -/datum/equipment_preset/survivor/load_id(mob/living/carbon/human/H, client/mob_client) - var/obj/item/clothing/under/uniform = H.w_uniform +/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) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(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(new /obj/item/attachable/bayonet(new_human), WEAR_L_STORE) + new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE) + +/datum/equipment_preset/survivor/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 uniform.sensor_faction = FACTION_COLONIST @@ -38,16 +38,16 @@ access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_ENGINEERING) skills = /datum/skills/OT -/datum/equipment_preset/colonist/engineer/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) +/datum/equipment_preset/colonist/engineer/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) - H.equip_to_slot(new /obj/item/attachable/bayonet(H), WEAR_L_STORE) - H.equip_to_slot(new /obj/item/device/flashlight(H), WEAR_R_STORE) + new_human.equip_to_slot(new /obj/item/attachable/bayonet(new_human), WEAR_L_STORE) + new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE) //*****************************************************************************************************/ @@ -59,15 +59,15 @@ access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_RESEARCH) skills = /datum/skills/MP -/datum/equipment_preset/colonist/security/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec(H), WEAR_HEAD) +/datum/equipment_preset/colonist/security/load_gear(mob/living/carbon/human/new_human) + 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/device/radio/headset(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(new_human), WEAR_BODY) + 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/beret/sec(new_human), WEAR_HEAD) - H.equip_to_slot(new /obj/item/attachable/bayonet(H), WEAR_L_STORE) - H.equip_to_slot(new /obj/item/device/flashlight(H), WEAR_R_STORE) + new_human.equip_to_slot(new /obj/item/attachable/bayonet(new_human), WEAR_L_STORE) + new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE) //*****************************************************************************************************/ @@ -80,14 +80,14 @@ access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) skills = /datum/skills/doctor -/datum/equipment_preset/colonist/doctor/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/med(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), WEAR_FACE) - - H.equip_to_slot(new /obj/item/attachable/bayonet(H), WEAR_L_STORE) - H.equip_to_slot(new /obj/item/device/flashlight(H), WEAR_R_STORE) +/datum/equipment_preset/colonist/doctor/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/med(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) + + new_human.equip_to_slot(new /obj/item/attachable/bayonet(new_human), WEAR_L_STORE) + new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE) diff --git a/code/modules/gear_presets/contractor.dm b/code/modules/gear_presets/contractor.dm index 8756e064099e..c318eb6b76d4 100644 --- a/code/modules/gear_presets/contractor.dm +++ b/code/modules/gear_presets/contractor.dm @@ -10,37 +10,37 @@ . = ..() access = get_all_accesses() + get_all_centcom_access() -/datum/equipment_preset/contractor/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(80;MALE,20;FEMALE) +/datum/equipment_preset/contractor/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(80;MALE,20;FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) var/hair_color = pick(hair_colors) - H.r_hair = hair_colors[hair_color][1] - H.g_hair = hair_colors[hair_color][2] - H.b_hair = hair_colors[hair_color][3] - H.r_facial = hair_colors[hair_color][1] - H.g_facial = hair_colors[hair_color][2] - H.b_facial = hair_colors[hair_color][3] + new_human.r_hair = hair_colors[hair_color][1] + new_human.g_hair = hair_colors[hair_color][2] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] var/eye_color = pick(colors) - H.r_eyes = colors[eye_color][1] - H.g_eyes = colors[eye_color][2] - H.b_eyes = colors[eye_color][3] + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] idtype = /obj/item/card/id/data - if(H.gender == MALE) + if(new_human.gender == MALE) random_name = "[pick(first_names_male)] [pick(last_names)]" - H.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",) - H.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) + new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",) + new_human.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) else random_name = "[pick(first_names_female)] [pick(last_names)]" - H.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",) - H.change_real_name(H, random_name) - H.age = rand(20,45) - H.r_hair = rand(15,35) - H.g_hair = rand(15,35) - H.b_hair = rand(25,45) + new_human.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",) + new_human.change_real_name(new_human, random_name) + new_human.age = rand(20,45) + new_human.r_hair = rand(15,35) + new_human.g_hair = rand(15,35) + new_human.b_hair = rand(25,45) //*****************************************************************************************************/ @@ -60,44 +60,44 @@ access = get_all_accesses() + get_all_centcom_access() -/datum/equipment_preset/dust_raider/load_name(mob/living/carbon/human/H) - H.gender = pick(60;MALE,40;FEMALE) +/datum/equipment_preset/dust_raider/load_name(mob/living/carbon/human/new_human) + new_human.gender = pick(60;MALE,40;FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name - random_name = capitalize(pick(H.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names)) - H.change_real_name(H, random_name) - H.name = H.real_name - H.age = rand(22,45) + random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names)) + new_human.change_real_name(new_human, random_name) + new_human.name = new_human.real_name + new_human.age = rand(22,45) var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) var/hair_color = pick(hair_colors) - H.r_hair = hair_colors[hair_color][1] - H.g_hair = hair_colors[hair_color][2] - H.b_hair = hair_colors[hair_color][3] - H.r_facial = hair_colors[hair_color][1] - H.g_facial = hair_colors[hair_color][2] - H.b_facial = hair_colors[hair_color][3] + new_human.r_hair = hair_colors[hair_color][1] + new_human.g_hair = hair_colors[hair_color][2] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] var/eye_color = pick(colors) - H.r_eyes = colors[eye_color][1] - H.g_eyes = colors[eye_color][2] - H.b_eyes = colors[eye_color][3] + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] idtype = /obj/item/card/id/data - if(H.gender == MALE) - H.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",) - H.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) + if(new_human.gender == MALE) + new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",) + new_human.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) else - H.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",) - H.change_real_name(H, random_name) - H.age = rand(20,45) - H.r_hair = rand(15,35) - H.g_hair = rand(15,35) - H.b_hair = rand(25,45) - -/datum/equipment_preset/contractor/load_id(mob/living/carbon/human/H, client/mob_client) + new_human.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",) + new_human.change_real_name(new_human, random_name) + new_human.age = rand(20,45) + new_human.r_hair = rand(15,35) + new_human.g_hair = rand(15,35) + new_human.b_hair = rand(25,45) + +/datum/equipment_preset/contractor/load_id(mob/living/carbon/human/new_human, client/mob_client) if(human_versus_human) - var/obj/item/clothing/under/uniform = H.w_uniform + var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS uniform.sensor_faction = FACTION_CONTRACTOR @@ -115,91 +115,91 @@ skills = /datum/skills/contractor faction = FACTION_CONTRACTOR -/datum/equipment_preset/contractor/duty/standard/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/contractor/duty/standard/load_gear(mob/living/carbon/human/new_human) var/choice = rand(1,10) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/gray_blu, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE,WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/gray_blu, 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/marine/light/vest, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) + 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/helmet/marine, 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/glasses/sunglasses/big, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + 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/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, 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% - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/tactical, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE) - H.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/weapon/gun/rifle/mar40/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/mar40/extended, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, 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/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_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) if(4 to 5) // 20% - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/l42a/abr40/tactical, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/abr40/holo_target, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/abr40/holo_target, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/abr40/holo_target, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/extended, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/extended, WEAR_IN_R_STORE) - H.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/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/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) if(6 to 8) // 20% - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/tactical, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_BACK) + 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) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, 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/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/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% - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat/covert, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/buckshot, WEAR_R_STORE) - H.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/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) + 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/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) + 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/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) if(10) // 10% - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/tactical, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) - H.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/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) + 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/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) + 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/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) + 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/magazine/large, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, 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_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_BACK) //*****************************************************************************************************/ @@ -215,37 +215,37 @@ skills = /datum/skills/contractor/heavy faction = FACTION_CONTRACTOR -/datum/equipment_preset/contractor/duty/heavy/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/gray_blu, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/lmg/tactical, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE) +/datum/equipment_preset/contractor/duty/heavy/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/gray_blu, WEAR_BODY) + 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/mar40/lmg, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_ACCESSORY) + 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/marine/light/vest, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/lmg/tactical, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) + 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/helmet/marine, 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/glasses/sunglasses/big, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE) //backpack and stuff in it - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE,WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, 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/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -261,38 +261,38 @@ skills = /datum/skills/contractor/engi faction = FACTION_CONTRACTOR -/datum/equipment_preset/contractor/duty/engi/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/w_br, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest/tool_webbing, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine/tactical, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES) +/datum/equipment_preset/contractor/duty/engi/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/w_br, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest/tool_webbing, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine/tactical, WEAR_J_STORE) + 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/helmet/marine, 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/glasses/sunglasses/big, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES) //storage items - H.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/contractor, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE) - H.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/device/motiondetector/hacked/contractor, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + 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/mar40/extended, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, 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_R_STORE) //backpack and stuff in it - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) - H.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/backpack/marine/engineerpack/ert, WEAR_BACK) + 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/explosive/plastic/breaching_charge, WEAR_IN_BACK) + 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/stack/sheet/metal/large_stack, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) //*****************************************************************************************************/ @@ -307,38 +307,38 @@ skills = /datum/skills/contractor/medic faction = FACTION_CONTRACTOR -/datum/equipment_preset/contractor/duty/medic/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/contractor/duty/medic/load_gear(mob/living/carbon/human/new_human) //clothing - H.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/w_br, WEAR_BODY) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine/tactical, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/w_br, WEAR_BODY) + new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) + 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/device/binoculars/range, WEAR_IN_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/helmet/marine, 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/glasses/hud/health, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine/tactical, WEAR_J_STORE) //storage items - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_L_STORE) - H.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/storage/pouch/magazine/large, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) //backpack and stuff in it - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) //Line in vest. - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_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/surgery/synthgraft, WEAR_IN_BACK) //Line in vest. + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, 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/ammo_magazine/rifle/mar40/extended, WEAR_IN_BACK) //*****************************************************************************************************/ @@ -353,43 +353,43 @@ skills = /datum/skills/contractor/leader faction = FACTION_CONTRACTOR -/datum/equipment_preset/contractor/duty/leader/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/contractor/duty/leader/load_gear(mob/living/carbon/human/new_human) //clothes - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/r_bla, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/tactical, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/r_bla, WEAR_BODY) + 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) + 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/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) + 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/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) + 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/marine/light/vest, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) + 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/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) + 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/helmet/marine, 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/glasses/hud/sensor, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE) + 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/m41aMK1/ap, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) //backpack and stuff in it - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector/m717/hacked/contractor, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + 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/explosive/plastic/breaching_charge, 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/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, 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/device/motiondetector/m717/hacked/contractor, 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, WEAR_IN_BACK) //*****************************************************************************************************/ /datum/equipment_preset/contractor/duty/synth @@ -403,83 +403,83 @@ faction = FACTION_CONTRACTOR languages = ALL_SYNTH_LANGUAGES -/datum/equipment_preset/contractor/duty/synth/load_skills(mob/living/carbon/human/H) - H.set_skills(/datum/skills/synthetic) - H.allow_gun_usage = FALSE +/datum/equipment_preset/contractor/duty/synth/load_skills(mob/living/carbon/human/new_human) + new_human.set_skills(/datum/skills/synthetic) + new_human.allow_gun_usage = FALSE -/datum/equipment_preset/contractor/duty/synth/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(50;MALE,50;FEMALE) +/datum/equipment_preset/contractor/duty/synth/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(50;MALE,50;FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name - if(H.gender == MALE) + if(new_human.gender == MALE) random_name = "[pick(first_names_male)]" else random_name = "[pick(first_names_female)]" - if(H.gender == MALE) - H.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") + if(new_human.gender == MALE) + new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") - H.change_real_name(H, random_name) - H.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut") + new_human.change_real_name(new_human, random_name) + new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut") var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) var/hair_color = pick(hair_colors) - H.r_hair = hair_colors[hair_color][1] - H.g_hair = hair_colors[hair_color][2] - H.b_hair = hair_colors[hair_color][3] - H.r_facial = hair_colors[hair_color][1] - H.g_facial = hair_colors[hair_color][2] - H.b_facial = hair_colors[hair_color][3] + new_human.r_hair = hair_colors[hair_color][1] + new_human.g_hair = hair_colors[hair_color][2] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] var/eye_color = pick(colors) - H.r_eyes = colors[eye_color][1] - H.g_eyes = colors[eye_color][2] - H.b_eyes = colors[eye_color][3] + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] -/datum/equipment_preset/contractor/duty/synth/load_race(mob/living/carbon/human/H) - H.set_species(SYNTH_GEN_THREE) +/datum/equipment_preset/contractor/duty/synth/load_race(mob/living/carbon/human/new_human) + new_human.set_species(SYNTH_GEN_THREE) -/datum/equipment_preset/contractor/duty/synth/load_gear(mob/living/carbon/human/H) - load_name(H) +/datum/equipment_preset/contractor/duty/synth/load_gear(mob/living/carbon/human/new_human) + load_name(new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/black, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) //1 - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) //2 - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) - H.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/backpack/marine/smartpack/black, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) //1 + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) //2 + 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/storage/box/packet/smoke, WEAR_IN_BACK) //face - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/experimental_mesons, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine, 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/glasses/sunglasses/big, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine, WEAR_HEAD) //body - H.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/r_bla, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/synvest, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/contractor, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/r_bla, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) + 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/marine/light/synvest, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_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/tool/surgery/synthgraft, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/contractor, WEAR_J_STORE) //waist - H.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/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/weapon/twohanded/breacher/synth, WEAR_L_HAND) + 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/weapon/twohanded/breacher/synth, WEAR_L_HAND) //póckets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_R_STORE) //*****************************************************************************************************/ @@ -494,93 +494,93 @@ skills = /datum/skills/contractor faction = FACTION_CONTRACTOR -/datum/equipment_preset/contractor/covert/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/contractor/covert/load_gear(mob/living/carbon/human/new_human) var/choice = rand(1,10) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/tactical, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE,WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies, 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/marine/light/vest, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) + 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/helmet/marine/covert, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET) + 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/glasses/sunglasses/sechud/tactical, 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/storage/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + 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/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, 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% - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/tactical, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE) - H.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/weapon/gun/rifle/mar40/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/mar40/extended, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, 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/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_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) if(4 to 5) // 20% - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/l42a/abr40/tactical, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/abr40/holo_target, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/abr40/holo_target, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/abr40/holo_target, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/extended, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/extended, WEAR_IN_R_STORE) - H.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/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/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) if(6 to 8) // 20% - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/tactical, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_BACK) + 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) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, 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/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/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% - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat/covert, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/buckshot, WEAR_R_STORE) - H.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/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) + 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/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) + 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/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) if(10) // 10% - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/tactical, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) - H.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/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) + 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/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) + 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/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) + 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/magazine/large, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, 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_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_BACK) //*****************************************************************************************************/ @@ -600,39 +600,39 @@ . = ..() access = get_antagonist_pmc_access() -/datum/equipment_preset/contractor/covert/heavy/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/lmg/tactical, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/tactical, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE) +/datum/equipment_preset/contractor/covert/heavy/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies, WEAR_BODY) + 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/mar40/lmg, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_ACCESSORY) + 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/marine/light/vest, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/lmg/tactical, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) + 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/mask/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/tactical, WEAR_EYES) + 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/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_R_STORE) //backpack and stuff in it - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE,WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, 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/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -653,39 +653,39 @@ . = ..() access = get_antagonist_pmc_access() -/datum/equipment_preset/contractor/covert/engi/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest/tool_webbing, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine/tactical, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES) +/datum/equipment_preset/contractor/covert/engi/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest/tool_webbing, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine/tactical, WEAR_J_STORE) + 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/mask/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET) + 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/glasses/welding/superior, WEAR_EYES) //storage items - H.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/contractor, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE) - H.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/device/motiondetector/hacked/contractor, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + 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/mar40/extended, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, 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_R_STORE) //backpack and stuff in it - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) - H.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/backpack/marine/engineerpack/ert, WEAR_BACK) + 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/explosive/plastic/breaching_charge, WEAR_IN_BACK) + 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/stack/sheet/metal/large_stack, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) //*****************************************************************************************************/ @@ -705,39 +705,39 @@ . = ..() access = get_antagonist_pmc_access() -/datum/equipment_preset/contractor/covert/medic/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/contractor/covert/medic/load_gear(mob/living/carbon/human/new_human) //clothing - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone, WEAR_BODY) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine/tactical, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone, WEAR_BODY) + new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) + 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/device/binoculars/range, WEAR_IN_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/mask/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET) + 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/glasses/hud/health, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine/tactical, WEAR_J_STORE) //storage items - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_L_STORE) - H.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/storage/pouch/magazine/large, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) //backpack and stuff in it - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) //Line in vest. - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_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/surgery/synthgraft, WEAR_IN_BACK) //Line in vest. + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, 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/ammo_magazine/rifle/mar40/extended, WEAR_IN_BACK) //*****************************************************************************************************/ @@ -752,44 +752,44 @@ skills = /datum/skills/contractor/leader faction = FACTION_CONTRACTOR -/datum/equipment_preset/contractor/covert/leader/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/contractor/covert/leader/load_gear(mob/living/carbon/human/new_human) //clothes - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/tactical, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies, WEAR_BODY) + 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) + 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/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) + 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/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) + 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/marine/light/vest, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) + 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/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) + 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/mask/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET) + 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/glasses/hud/sensor, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE) + 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/m41aMK1/ap, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) //backpack and stuff in it - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector/m717/hacked/contractor, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + 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/explosive/plastic/breaching_charge, 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/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, 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/device/motiondetector/m717/hacked/contractor, 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, WEAR_IN_BACK) //*****************************************************************************************************/ /datum/equipment_preset/contractor/covert/synth @@ -804,82 +804,82 @@ faction = FACTION_CONTRACTOR languages = ALL_SYNTH_LANGUAGES -/datum/equipment_preset/contractor/covert/synth/load_skills(mob/living/carbon/human/H) - H.set_skills(/datum/skills/synthetic) - H.allow_gun_usage = FALSE +/datum/equipment_preset/contractor/covert/synth/load_skills(mob/living/carbon/human/new_human) + new_human.set_skills(/datum/skills/synthetic) + new_human.allow_gun_usage = FALSE -/datum/equipment_preset/contractor/covert/synth/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(50;MALE,50;FEMALE) +/datum/equipment_preset/contractor/covert/synth/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(50;MALE,50;FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name - if(H.gender == MALE) + if(new_human.gender == MALE) random_name = "[pick(first_names_male)]" else random_name = "[pick(first_names_female)]" - if(H.gender == MALE) - H.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") + if(new_human.gender == MALE) + new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") - H.change_real_name(H, random_name) - H.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut") + new_human.change_real_name(new_human, random_name) + new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut") var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) var/hair_color = pick(hair_colors) - H.r_hair = hair_colors[hair_color][1] - H.g_hair = hair_colors[hair_color][2] - H.b_hair = hair_colors[hair_color][3] - H.r_facial = hair_colors[hair_color][1] - H.g_facial = hair_colors[hair_color][2] - H.b_facial = hair_colors[hair_color][3] + new_human.r_hair = hair_colors[hair_color][1] + new_human.g_hair = hair_colors[hair_color][2] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] var/eye_color = pick(colors) - H.r_eyes = colors[eye_color][1] - H.g_eyes = colors[eye_color][2] - H.b_eyes = colors[eye_color][3] + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] idtype = /obj/item/card/id/data -/datum/equipment_preset/contractor/covert/synth/load_race(mob/living/carbon/human/H) - H.set_species(SYNTH_GEN_THREE) +/datum/equipment_preset/contractor/covert/synth/load_race(mob/living/carbon/human/new_human) + new_human.set_species(SYNTH_GEN_THREE) -/datum/equipment_preset/contractor/covert/synth/load_gear(mob/living/carbon/human/H) - load_name(H) +/datum/equipment_preset/contractor/covert/synth/load_gear(mob/living/carbon/human/new_human) + load_name(new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/black, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) //1 - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) //2 - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) - H.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/backpack/marine/smartpack/black, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) //1 + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) //2 + 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/storage/box/packet/smoke, WEAR_IN_BACK) //face - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/experimental_mesons, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/covert, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/cosmetic, WEAR_IN_HELMET) + 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/head/helmet/marine/covert, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/cosmetic, WEAR_IN_HELMET) //body - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/synvest, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/contractor, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) + 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/marine/light/synvest, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_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/tool/surgery/synthgraft, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/contractor, WEAR_J_STORE) //waist - H.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/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/weapon/twohanded/breacher/synth, WEAR_L_HAND) + 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/weapon/twohanded/breacher/synth, WEAR_L_HAND) //póckets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_R_STORE) diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index c99c40ff7ccc..08389ed00a60 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -11,44 +11,44 @@ idtype = /obj/item/card/id/lanyard var/xenovictim = FALSE //Set to true to make the corpse spawn as a victim of a xeno burst -/datum/equipment_preset/corpse/load_languages(mob/living/carbon/human/H) +/datum/equipment_preset/corpse/load_languages(mob/living/carbon/human/new_human) return -/datum/equipment_preset/corpse/load_status(mob/living/carbon/human/H) - . = ..(H) - H.death(create_cause_data("existing"), TRUE) //Kills the new mob - H.apply_damage(100, BRUTE) - H.apply_damage(100, BRUTE) - H.apply_damage(100, BRUTE) +/datum/equipment_preset/corpse/load_status(mob/living/carbon/human/new_human) + . = ..(new_human) + new_human.death(create_cause_data("existing"), TRUE) //Kills the new mob + new_human.apply_damage(100, BRUTE) + new_human.apply_damage(100, BRUTE) + new_human.apply_damage(100, BRUTE) if(xenovictim) var/datum/internal_organ/O var/i for(i in list("heart","lungs")) - O = H.internal_organs_by_name[i] - H.internal_organs_by_name -= i - H.internal_organs -= O - H.chestburst = 2 - H.update_burst() + O = new_human.internal_organs_by_name[i] + new_human.internal_organs_by_name -= i + new_human.internal_organs -= O + new_human.chestburst = 2 + new_human.update_burst() //buckle to nest var/obj/structure/bed/nest/N = locate() in get_turf(src) if(N) - H.buckled = N - H.setDir(N.dir) - H.update_canmove() - N.buckled_mob = H - N.afterbuckle(H) - H.undefibbable = TRUE - H.spawned_corpse = TRUE - H.updatehealth() - H.pulse = PULSE_NONE - -/datum/equipment_preset/corpse/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - add_random_survivor_equipment(H) - add_survivor_weapon_civilian(H) - add_survivor_weapon_pistol(H) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET) + new_human.buckled = N + new_human.setDir(N.dir) + new_human.update_canmove() + N.buckled_mob = new_human + N.afterbuckle(new_human) + new_human.undefibbable = TRUE + new_human.spawned_corpse = TRUE + new_human.updatehealth() + new_human.pulse = PULSE_NONE + +/datum/equipment_preset/corpse/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + add_random_survivor_equipment(new_human) + add_survivor_weapon_civilian(new_human) + add_survivor_weapon_pistol(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) //*****************************************************************************************************/ @@ -65,24 +65,24 @@ ACCESS_ILLEGAL_PIRATE, ) -/datum/equipment_preset/corpse/realpirate/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(H), WEAR_BODY) +/datum/equipment_preset/corpse/realpirate/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(H), WEAR_HEAD) + 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/clothing/shoes/jackboots(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(new_human), WEAR_HEAD) //*****************************************************************************************************/ /datum/equipment_preset/corpse/realpirate/ranged name = "Corpse - Pirate Gunner" -/datum/equipment_preset/corpse/realpirate/ranged/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/pirate(H), WEAR_HEAD) +/datum/equipment_preset/corpse/realpirate/ranged/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/pirate(new_human), WEAR_HEAD) . = ..() //*****************************************************************************************************/ @@ -101,20 +101,20 @@ /datum/equipment_preset/corpse/russian -/datum/equipment_preset/corpse/russian/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/corpse/russian/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(new_human), WEAR_JACKET) + 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/storage/belt/marine(new_human), WEAR_WAIST) + 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/marine/upp(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) if(prob(25)) - H.equip_to_slot_or_del(new /obj/item/clothing/head/bearpelt(H), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bearpelt(new_human), WEAR_HEAD) else - H.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(H), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) //*****************************************************************************************************/ // Civilians @@ -123,17 +123,17 @@ name = "Corpse - Prisoner" assignment = "Prisoner" -/datum/equipment_preset/corpse/prisoner/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(H), WEAR_BODY) +/datum/equipment_preset/corpse/prisoner/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/attachable/bayonet(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), WEAR_FEET) + 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/backpack/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK) + 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/clothing/shoes/orange(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(new_human), WEAR_FEET) //*****************************************************************************************************/ @@ -142,16 +142,16 @@ assignment = "Chef" access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/corpse/chef/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(H), WEAR_BODY) +/datum/equipment_preset/corpse/chef/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/chef/classic(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/chefhat(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/backpack(H), WEAR_BACK) + 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/clothing/suit/chef/classic(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/chefhat(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack(new_human), WEAR_BACK) //*****************************************************************************************************/ @@ -161,21 +161,21 @@ xenovictim = TRUE access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY) -/datum/equipment_preset/corpse/doctor/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), WEAR_BODY) +/datum/equipment_preset/corpse/doctor/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/med(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/attachable/bayonet(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/chef/classic(H), WEAR_JACKET) - add_random_survivor_medical_gear(H) + 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/backpack/satchel/med(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK) + 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/clothing/suit/chef/classic(new_human), WEAR_JACKET) + add_random_survivor_medical_gear(new_human) //*****************************************************************************************************/ @@ -185,27 +185,27 @@ xenovictim = TRUE access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_ENGINEERING) -/datum/equipment_preset/corpse/engineer/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(H), WEAR_BODY) +/datum/equipment_preset/corpse/engineer/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/attachable/bayonet(H.back), WEAR_IN_BACK) + 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/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + 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/device/radio/headset/distress(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(H.back), WEAR_IN_BACK) + 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/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human.back), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -219,20 +219,20 @@ //As a joke, clown has all access so they can clown everywhere... access = get_all_accesses() -/datum/equipment_preset/corpse/clown/load_name(mob/living/carbon/human/H, randomise) +/datum/equipment_preset/corpse/clown/load_name(mob/living/carbon/human/new_human, randomise) . = ..() //To load gender, randomise appearance, etc. - H.change_real_name(H, pick(clown_names)) //Picking a proper clown name! - -/datum/equipment_preset/corpse/clown/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/toy/bikehorn(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/clown(H), WEAR_BACK) + new_human.change_real_name(new_human, pick(clown_names)) //Picking a proper clown name! + +/datum/equipment_preset/corpse/clown/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/toy/bikehorn(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/clown(new_human), WEAR_BACK) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -242,33 +242,33 @@ xenovictim = TRUE access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY) -/datum/equipment_preset/corpse/scientist/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/corpse/scientist/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(H), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/virologist(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/green(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/chem(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/green(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/attachable/bayonet(H.back), WEAR_IN_BACK) + 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/backpack/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/virologist(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/green(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) + 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/chem(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/green(new_human), WEAR_FEET) + 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/device/motiondetector(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/attachable/bayonet(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/paper/research_notes/good(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(H), WEAR_IN_JACKET) + 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/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/good(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_JACKET) //*****************************************************************************************************/ @@ -278,15 +278,15 @@ xenovictim = TRUE access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_ENGINEERING) -/datum/equipment_preset/corpse/miner/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(H), WEAR_BODY) +/datum/equipment_preset/corpse/miner/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/industrial(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), WEAR_FEET) + 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/clothing/gloves/black(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/industrial(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) //*****************************************************************************************************/ @@ -296,26 +296,26 @@ xenovictim = TRUE access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND) -/datum/equipment_preset/corpse/security/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/corpse/security/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/attachable/bayonet(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + 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/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/clothing/head/helmet(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) //*****************************************************************************************************/ @@ -334,25 +334,25 @@ ACCESS_CIVILIAN_COMMAND, ) -/datum/equipment_preset/corpse/security/marshal/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/corpse/security/marshal/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(H), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/heavy(H), WEAR_WAIST) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + 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/backpack/satchel/sec(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/heavy(new_human), WEAR_WAIST) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/attachable/bayonet(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) . = ..() @@ -373,24 +373,24 @@ ACCESS_CIVILIAN_COMMAND, ) -/datum/equipment_preset/corpse/security/liaison/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(H), WEAR_BODY) +/datum/equipment_preset/corpse/security/liaison/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/attachable/bayonet(H.back), WEAR_IN_BACK) - add_random_cl_survivor_loot(H) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(H), WEAR_FEET) + 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/clothing/suit/armor/vest(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST) + 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/storage/backpack/satchel(new_human), WEAR_BACK) + 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/attachable/bayonet(new_human.back), WEAR_IN_BACK) + add_random_cl_survivor_loot(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(new_human), WEAR_FEET) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/attachable/bayonet(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK) . = ..() //*****************************************************************************************************/ @@ -408,18 +408,18 @@ ACCESS_CIVILIAN_COMMAND, ) -/datum/equipment_preset/corpse/prison_security/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/corpse/prison_security/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) + 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/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/clothing/head/helmet(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) //*****************************************************************************************************/ /////////////////Officers////////////////////// @@ -438,15 +438,15 @@ ACCESS_CIVILIAN_COMMAND, ) -/datum/equipment_preset/corpse/bridgeofficer/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(H), WEAR_BODY) +/datum/equipment_preset/corpse/bridgeofficer/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/bulletproof(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), WEAR_EYES) + 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/clothing/suit/armor/bulletproof(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) //*****************************************************************************************************/ /datum/equipment_preset/corpse/bridgeofficer/johnson @@ -471,12 +471,12 @@ ACCESS_WY_CORPORATE, ) -/datum/equipment_preset/corpse/bridgeofficer/johnson/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/waiter(H), WEAR_BODY) +/datum/equipment_preset/corpse/bridgeofficer/johnson/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/waiter(new_human), WEAR_BODY) . = ..() -/datum/equipment_preset/corpse/bridgeofficer/johnson/load_name(mob/living/carbon/human/H, randomise) - H.change_real_name(H, "Johnson Telovin") +/datum/equipment_preset/corpse/bridgeofficer/johnson/load_name(mob/living/carbon/human/new_human, randomise) + new_human.change_real_name(new_human, "Johnson Telovin") //*****************************************************************************************************/ @@ -494,20 +494,20 @@ ACCESS_CIVILIAN_COMMAND, ) -/datum/equipment_preset/corpse/commander/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_commander(H), WEAR_BODY) +/datum/equipment_preset/corpse/commander/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_commander(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/bulletproof(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/centhat(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(H), WEAR_R_STORE) - add_random_cl_survivor_loot(H) + 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/clothing/suit/armor/bulletproof(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/centhat(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(new_human), WEAR_R_STORE) + add_random_cl_survivor_loot(new_human) //*****************************************************************************************************/ @@ -531,16 +531,16 @@ ACCESS_WY_CORPORATE, ) -/datum/equipment_preset/corpse/wysec/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/formal/servicedress(H), WEAR_BODY) +/datum/equipment_preset/corpse/wysec/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/formal/servicedress(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) + 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/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/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) /////Actually specific colonists @@ -554,17 +554,17 @@ access = list(ACCESS_CIVILIAN_PUBLIC) idtype = /obj/item/card/id/lanyard -/datum/equipment_preset/colonist/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/colonist/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), WEAR_FEET) + 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/device/radio(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) /datum/equipment_preset/corpse/colonist/burst name = "Corpse - Burst Colonist" @@ -579,10 +579,10 @@ access = list(ACCESS_CIVILIAN_PUBLIC) idtype = /obj/item/card/id/lanyard -/datum/equipment_preset/corpse/colonist/random/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/corpse/colonist/random/load_gear(mob/living/carbon/human/new_human) var/random_surv_type = pick(SSmapping.configs[GROUND_MAP].survivor_types) var/datum/equipment_preset/survivor/surv_equipment = new random_surv_type - surv_equipment.load_gear(H) + surv_equipment.load_gear(new_human) /datum/equipment_preset/corpse/colonist/random/burst name = "Corpse - Burst Colonist Random" @@ -597,15 +597,15 @@ access = list(ACCESS_CIVILIAN_PUBLIC) idtype = /obj/item/card/id/lanyard -/datum/equipment_preset/corpse/colonist/kutjevo/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/corpse/colonist/kutjevo/load_gear(mob/living/carbon/human/new_human) - add_random_kutjevo_survivor_uniform(H) - add_random_kutjevo_survivor_equipment(H) - add_random_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), WEAR_FEET) + add_random_kutjevo_survivor_uniform(new_human) + add_random_kutjevo_survivor_equipment(new_human) + add_random_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) + 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/clothing/shoes/black(new_human), WEAR_FEET) /datum/equipment_preset/corpse/colonist/kutjevo/burst name = "Corpse - Burst Colonist Kutjevo" @@ -629,32 +629,32 @@ ACCESS_WY_CORPORATE, ) -/datum/equipment_preset/corpse/ua_riot/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/corpse/ua_riot/load_gear(mob/living/carbon/human/new_human) var/random = rand(1,5) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(H), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/classic_baton(H), WEAR_WAIST) + 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/backpack/satchel/sec, WEAR_BACK) + 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/suit/storage/marine/veteran/ua_riot(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/classic_baton(new_human), WEAR_WAIST) switch(random) if(1) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security, WEAR_EYES) if(2) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) if(3) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(new_human), WEAR_EYES) if(4) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) if(5) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(new_human), WEAR_IN_BACK) /datum/equipment_preset/corpse/ua_riot/burst @@ -681,23 +681,23 @@ ACCESS_MARINE_MEDBAY, ) -/datum/equipment_preset/corpse/wy/manager/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/corpse/wy/manager/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/manager(H), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/manager(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/manager(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/manager(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/attachable/bayonet(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(H), WEAR_R_STORE) - add_random_cl_survivor_loot(H) + 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/backpack/satchel/lockable/liaison, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/manager(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress, WEAR_FEET) + 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/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK) + 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_cl_survivor_loot(new_human) /datum/equipment_preset/corpse/wy/manager/burst @@ -724,24 +724,24 @@ ACCESS_WY_CORPORATE, ) -/datum/equipment_preset/corpse/clf/load_gear(mob/living/carbon/human/H) - - spawn_rebel_uniform(H) - spawn_rebel_suit(H) - spawn_rebel_helmet(H) - spawn_rebel_shoes(H) - spawn_rebel_gloves(H) - spawn_rebel_belt(H) - - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flashlight(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(H), WEAR_R_STORE) - add_random_survivor_equipment(H) - add_pmc_survivor_weapon(H) - add_survivor_weapon_pistol(H) +/datum/equipment_preset/corpse/clf/load_gear(mob/living/carbon/human/new_human) + + spawn_rebel_uniform(new_human) + spawn_rebel_suit(new_human) + spawn_rebel_helmet(new_human) + spawn_rebel_shoes(new_human) + spawn_rebel_gloves(new_human) + spawn_rebel_belt(new_human) + + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_BACK) + 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_pistol(new_human) /datum/equipment_preset/corpse/clf/burst name = "Corpse - Burst Colonial Liberation Front Soldier" @@ -765,23 +765,23 @@ ACCESS_WY_CORPORATE, ) -/datum/equipment_preset/corpse/upp/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/corpse/upp/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD) //body var/obj/item/clothing/under/marine/veteran/UPP/UPP = new() - H.equip_to_slot_or_del(UPP, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(UPP, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_JACKET) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - add_random_survivor_equipment(H) + 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) + add_random_survivor_equipment(new_human) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) /datum/equipment_preset/corpse/upp/burst name = "Corpse - Burst Union of Progressive Peoples Soldier" @@ -807,20 +807,20 @@ ACCESS_CIVILIAN_LOGISTICS, ) -/datum/equipment_preset/corpse/pmc/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/hvh, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(H), WEAR_L_STORE) - add_random_survivor_equipment(H) +/datum/equipment_preset/corpse/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/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/satchel, WEAR_BACK) + 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/belt/gun/m4a3/mod88, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE) + add_random_survivor_equipment(new_human) /datum/equipment_preset/corpse/pmc/burst name = "Corpse - Burst Weyland-Yutani PMC (Standard)" @@ -834,19 +834,19 @@ paygrade = "WEY-GOON" skills = /datum/skills/MP -/datum/equipment_preset/corpse/pmc/goon/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) +/datum/equipment_preset/corpse/pmc/goon/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, 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/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88_near_empty, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) + 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/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, 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/firstaid/full, WEAR_R_STORE) /datum/equipment_preset/corpse/pmc/goon/lead name = "Corpse - Weyland-Yutani Corporate Security Lead (Goon Lead)" @@ -855,19 +855,19 @@ rank = JOB_WY_GOON_LEAD paygrade = "WEY-GOON-L" -/datum/equipment_preset/corpse/pmc/goon/lead/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/lead, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/lead, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) +/datum/equipment_preset/corpse/pmc/goon/lead/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/lead, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, 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/helmet/marine/veteran/pmc/corporate/lead, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88_near_empty, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) + 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/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, 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/firstaid/full, WEAR_R_STORE) // Freelancer @@ -888,19 +888,19 @@ ACCESS_WY_CORPORATE, ) -/datum/equipment_preset/corpse/freelancer/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/corpse/freelancer/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(H), WEAR_L_STORE) - spawn_merc_helmet(H) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET) + 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/pmc, WEAR_HANDS) + 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/belt/marine, WEAR_WAIST) + 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/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) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE) + spawn_merc_helmet(new_human) /datum/equipment_preset/corpse/freelancer/burst name = "Corpse - Burst Freelancer Mercenary" @@ -928,19 +928,19 @@ ACCESS_WY_CORPORATE, ) -/datum/equipment_preset/corpse/dutchrifle/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/corpse/dutchrifle/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(H), WEAR_FEET) - spawn_merc_helmet(H) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + 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/storage/pouch/tools/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET) + spawn_merc_helmet(new_human) /datum/equipment_preset/corpse/dutchrifle/burst name = "Corpse - Burst Dutch Dozen Rifleman" @@ -966,27 +966,27 @@ ACCESS_WY_CORPORATE, ) -/datum/equipment_preset/corpse/pizza/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/corpse/pizza/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/clothing/under/pizza, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/pizza, WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) + add_ice_colony_survivor_equipment(new_human) else - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/soft/red, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/red, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/pizzabox/margherita, WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/dr_gibb, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/pizzabox/vegetable, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/pizzabox/mushroom, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/pizzabox/meat, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/dr_gibb, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/thirteenloko, WEAR_IN_BACK) + 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/clothing/head/soft/red, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/red, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/pizzabox/margherita, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/dr_gibb, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/pizzabox/vegetable, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/pizzabox/mushroom, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/pizzabox/meat, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/dr_gibb, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/thirteenloko, WEAR_IN_BACK) /datum/equipment_preset/corpse/pizza/burst name = "Corpse - Burst Pizza Deliverer" @@ -1012,19 +1012,19 @@ ACCESS_WY_CORPORATE, ) -/datum/equipment_preset/corpse/gladiator/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/corpse/gladiator/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/under/chainshirt/hunter, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/gladiator, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND) - H.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/chainshirt/hunter, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/gladiator, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword, WEAR_L_HAND) - var/obj/item/lantern = new /obj/item/device/flashlight/lantern(H) + var/obj/item/lantern = new /obj/item/device/flashlight/lantern(new_human) lantern.name = "Beacon of Holy Light" /datum/equipment_preset/corpse/gladiator/burst diff --git a/code/modules/gear_presets/dust_raider.dm b/code/modules/gear_presets/dust_raider.dm index 8416554e09b8..0f62ae71fbb7 100644 --- a/code/modules/gear_presets/dust_raider.dm +++ b/code/modules/gear_presets/dust_raider.dm @@ -5,15 +5,15 @@ faction = FACTION_MARINE -/datum/equipment_preset/dust_raider/load_name(mob/living/carbon/human/H) - H.gender = pick(60;MALE,40;FEMALE) +/datum/equipment_preset/dust_raider/load_name(mob/living/carbon/human/new_human) + new_human.gender = pick(60;MALE,40;FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name - random_name = capitalize(pick(H.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names)) - H.change_real_name(H, random_name) - H.name = H.real_name - H.age = rand(21,45) + random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names)) + new_human.change_real_name(new_human, random_name) + new_human.name = new_human.real_name + new_human.age = rand(21,45) //*****************************************************************************************************/ @@ -28,14 +28,14 @@ role_comm_title = "RFN" skills = /datum/skills/pfc/crafty -/datum/equipment_preset/dust_raider/private/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/dust_raider/private/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(H), WEAR_BACK) - generate_random_marine_primary_for_wo(H) - add_common_wo_equipment(H) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) + generate_random_marine_primary_for_wo(new_human) + add_common_wo_equipment(new_human) //*****************************************************************************************************/ @@ -50,21 +50,21 @@ role_comm_title = "SL" skills = /datum/skills/SL -/datum/equipment_preset/dust_raider/leader/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/dust_raider/leader/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/leader(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/leader(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/map/whiskey_outpost_map(H), WEAR_IN_BACK) - add_common_wo_equipment(H) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/leader(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/leader(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/map/whiskey_outpost_map(new_human), WEAR_IN_BACK) + add_common_wo_equipment(new_human) //*****************************************************************************************************/ @@ -79,18 +79,18 @@ role_comm_title = "SG" skills = /datum/skills/smartgunner -/datum/equipment_preset/dust_raider/smartgunner/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/dust_raider/smartgunner/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(H), WEAR_J_STORE) - add_common_wo_equipment(H) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE) + add_common_wo_equipment(new_human) //Backup SMG Weapon - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles(new_human), WEAR_EYES) //*****************************************************************************************************/ @@ -105,21 +105,21 @@ role_comm_title = "Eng" skills = /datum/skills/combat_engineer -/datum/equipment_preset/dust_raider/engineer/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/dust_raider/engineer/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/engineer(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/tech(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(H), WEAR_L_STORE) - generate_random_marine_primary_for_wo(H) - add_common_wo_equipment(H) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/engineer(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/tech(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack(new_human), WEAR_BACK) + 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/device/binoculars/range(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_L_STORE) + generate_random_marine_primary_for_wo(new_human) + add_common_wo_equipment(new_human) //*****************************************************************************************************/ @@ -134,27 +134,27 @@ role_comm_title = "HM" skills = /datum/skills/combat_medic -/datum/equipment_preset/dust_raider/medic/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/dust_raider/medic/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/medic(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/medic(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) if(prob(50)) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full(H), WEAR_WAIST) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_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/tool/surgery/surgical_line(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full(new_human), WEAR_WAIST) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full(H), WEAR_L_STORE) - generate_random_marine_primary_for_wo(H) - add_common_wo_equipment(H) + 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/storage/pouch/medkit/full(new_human), WEAR_L_STORE) + generate_random_marine_primary_for_wo(new_human) + add_common_wo_equipment(new_human) //*****************************************************************************************************/ @@ -169,19 +169,19 @@ role_comm_title = "Spc" skills = /datum/skills/specialist -/datum/equipment_preset/dust_raider/specialist/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/dust_raider/specialist/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/attachable/magnetic_harness(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/spec_kit, WEAR_R_HAND) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39(H), WEAR_L_STORE) - add_common_wo_equipment(H) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39/full(new_human), WEAR_WAIST) + 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) + 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/storage/pouch/pistol(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/attachable/magnetic_harness(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/spec_kit, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39(new_human), WEAR_L_STORE) + add_common_wo_equipment(new_human) diff --git a/code/modules/gear_presets/dutch.dm b/code/modules/gear_presets/dutch.dm index a917025342cc..a88d282b1e91 100644 --- a/code/modules/gear_presets/dutch.dm +++ b/code/modules/gear_presets/dutch.dm @@ -13,73 +13,73 @@ ..() rank = assignment -/datum/equipment_preset/dutch/load_name(mob/living/carbon/human/NEW_HUMAN, randomise) - NEW_HUMAN.gender = pick(60;MALE,40;FEMALE) - var/datum/preferences/HUMAN = new() - HUMAN.randomize_appearance(NEW_HUMAN) +/datum/equipment_preset/dutch/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(60;MALE,40;FEMALE) + var/datum/preferences/human = new() + human.randomize_appearance(new_human) var/random_name - if(NEW_HUMAN.gender == MALE) + if(new_human.gender == MALE) random_name = "[pick(first_names_male_dutch)] [pick(last_names)]" - NEW_HUMAN.f_style = "5 O'clock Shadow" + new_human.f_style = "5 O'clock Shadow" else random_name = "[pick(first_names_female_dutch)] [pick(last_names)]" - NEW_HUMAN.change_real_name(NEW_HUMAN, random_name) - NEW_HUMAN.age = rand(25,35) - NEW_HUMAN.r_hair = rand(10,30) - NEW_HUMAN.g_hair = rand(10,30) - NEW_HUMAN.b_hair = rand(20,50) - NEW_HUMAN.r_eyes = rand(129,149) - NEW_HUMAN.g_eyes = rand(52,72) - NEW_HUMAN.b_eyes = rand(9,29) + new_human.change_real_name(new_human, random_name) + new_human.age = rand(25,35) + new_human.r_hair = rand(10,30) + new_human.g_hair = rand(10,30) + new_human.b_hair = rand(20,50) + new_human.r_eyes = rand(129,149) + new_human.g_eyes = rand(52,72) + new_human.b_eyes = rand(9,29) idtype = /obj/item/card/id/dogtag -/datum/equipment_preset/dutch/load_gear(mob/living/carbon/human/NEW_HUMAN) - - - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch(NEW_HUMAN), WEAR_HEAD) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(NEW_HUMAN), WEAR_IN_HELMET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(NEW_HUMAN), WEAR_IN_HELMET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(NEW_HUMAN), WEAR_L_EAR) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(NEW_HUMAN), WEAR_BODY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(NEW_HUMAN), WEAR_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(NEW_HUMAN), WEAR_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/dutch(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster(NEW_HUMAN), WEAR_ACCESSORY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(NEW_HUMAN), WEAR_IN_ACCESSORY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(NEW_HUMAN), WEAR_IN_ACCESSORY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(NEW_HUMAN), WEAR_IN_ACCESSORY) - 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/storage/pouch/firstaid/ert(NEW_HUMAN), WEAR_R_STORE) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(NEW_HUMAN), WEAR_FEET) +/datum/equipment_preset/dutch/load_gear(mob/living/carbon/human/new_human) + + + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(new_human), WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(new_human), WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/dutch(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_ACCESSORY) + 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/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET) switch(rand(1, 10)) if(1 to 6) // 60% for standard m16 - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m16/dutch(NEW_HUMAN), WEAR_J_STORE) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap(NEW_HUMAN), WEAR_IN_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap(NEW_HUMAN), WEAR_IN_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/belt/marine/dutch/m16/ap(NEW_HUMAN), WEAR_WAIST) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/m16/ap(NEW_HUMAN), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m16/dutch(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/dutch/m16/ap(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/m16/ap(new_human), WEAR_L_STORE) if(7 to 9) // 30% for m16 with m203 - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m16/grenadier/dutch(NEW_HUMAN), WEAR_J_STORE) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap(NEW_HUMAN), WEAR_IN_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap(NEW_HUMAN), WEAR_IN_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/belt/grenade/large/dutch/full(NEW_HUMAN), WEAR_WAIST) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/m16/ap(NEW_HUMAN), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m16/grenadier/dutch(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/grenade/large/dutch/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/m16/ap(new_human), WEAR_L_STORE) if(10) // 10% for M60 - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/weapon/gun/m60(NEW_HUMAN), WEAR_J_STORE)//these preds gonna GET SOME!!!!!!!!!!! - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/m60(NEW_HUMAN), WEAR_IN_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/m60(NEW_HUMAN), WEAR_IN_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/belt/marine/dutch/m60(NEW_HUMAN), WEAR_WAIST) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/m60(NEW_HUMAN), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/m60(new_human), WEAR_J_STORE)//these preds gonna GET SOME!!!!!!!!!!! + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/m60(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/m60(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/dutch/m60(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/m60(new_human), WEAR_L_STORE) - to_chat(NEW_HUMAN, SPAN_WARNING("You are a member of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your leader's face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your backpack have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs. You have a very wide variety of skills, put them to use!")) + to_chat(new_human, SPAN_WARNING("You are a member of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your leader's face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your backpack have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs. You have a very wide variety of skills, put them to use!")) /datum/equipment_preset/dutch/minigun name = JOB_DUTCH_MINIGUNNER @@ -89,30 +89,30 @@ skills = /datum/skills/dutchmerc -/datum/equipment_preset/dutch/minigun/load_gear(mob/living/carbon/human/NEW_HUMAN) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch(NEW_HUMAN), WEAR_HEAD) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(NEW_HUMAN), WEAR_IN_HELMET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(NEW_HUMAN), WEAR_IN_HELMET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(NEW_HUMAN), WEAR_L_EAR) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(NEW_HUMAN), WEAR_BODY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(NEW_HUMAN), WEAR_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/weapon/gun/minigun(NEW_HUMAN), WEAR_J_STORE) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(NEW_HUMAN), WEAR_IN_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(NEW_HUMAN), WEAR_IN_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(NEW_HUMAN), WEAR_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911(NEW_HUMAN), WEAR_WAIST) - 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/storage/pouch/firstaid/ert(NEW_HUMAN), WEAR_R_STORE) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/emp_dutch(NEW_HUMAN), WEAR_L_STORE) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(NEW_HUMAN), WEAR_FEET) - - to_chat(NEW_HUMAN, SPAN_WARNING("You are a member of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your leader's face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your backpack have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) +/datum/equipment_preset/dutch/minigun/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(new_human), WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(new_human), WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/minigun(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911(new_human), WEAR_WAIST) + 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/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/emp_dutch(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET) + + to_chat(new_human, SPAN_WARNING("You are a member of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your leader's face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your backpack have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) /datum/equipment_preset/dutch/flamer name = JOB_DUTCH_FLAMETHROWER @@ -122,31 +122,31 @@ skills = /datum/skills/dutchmerc -/datum/equipment_preset/dutch/flamer/load_gear(mob/living/carbon/human/NEW_HUMAN) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(NEW_HUMAN), WEAR_BODY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch(NEW_HUMAN), WEAR_HEAD) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(NEW_HUMAN), WEAR_IN_HELMET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(NEW_HUMAN), WEAR_IN_HELMET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(NEW_HUMAN), WEAR_L_EAR) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(NEW_HUMAN), WEAR_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/xm177/dutch, WEAR_J_STORE) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(NEW_HUMAN), WEAR_IN_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(NEW_HUMAN), WEAR_IN_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster(NEW_HUMAN), WEAR_ACCESSORY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(NEW_HUMAN), WEAR_IN_ACCESSORY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(NEW_HUMAN), WEAR_IN_ACCESSORY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(NEW_HUMAN), WEAR_IN_ACCESSORY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/large_holster/fuelpack(NEW_HUMAN), WEAR_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/weapon/gun/flamer/M240T(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/belt/marine/dutch/m16/ap(NEW_HUMAN), WEAR_WAIST) - 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/storage/pouch/flamertank(NEW_HUMAN), WEAR_L_STORE) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X(NEW_HUMAN), WEAR_IN_L_STORE) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/B(NEW_HUMAN), WEAR_IN_L_STORE) - 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/clothing/shoes/marine/jungle/knife(NEW_HUMAN), WEAR_FEET) - - to_chat(NEW_HUMAN, SPAN_WARNING("You are a member of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your leader's face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your backpack have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) +/datum/equipment_preset/dutch/flamer/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(new_human), WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(new_human), WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/xm177/dutch, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/fuelpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/flamer/M240T(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/dutch/m16/ap(new_human), WEAR_WAIST) + 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/storage/pouch/flamertank(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X(new_human), WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/B(new_human), WEAR_IN_L_STORE) + 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/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET) + + to_chat(new_human, SPAN_WARNING("You are a member of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your leader's face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your backpack have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) /datum/equipment_preset/dutch/medic name = JOB_DUTCH_MEDIC @@ -156,40 +156,40 @@ skills = /datum/skills/dutchmedic -/datum/equipment_preset/dutch/medic/load_gear(mob/living/carbon/human/NEW_HUMAN) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch(NEW_HUMAN), WEAR_HEAD) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(NEW_HUMAN), WEAR_IN_HELMET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(NEW_HUMAN), WEAR_IN_HELMET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(NEW_HUMAN), 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) +/datum/equipment_preset/dutch/medic/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(new_human), WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(new_human), WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(new_human), 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) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(NEW_HUMAN), WEAR_BODY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(NEW_HUMAN), WEAR_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/xm177/dutch(NEW_HUMAN), WEAR_J_STORE) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(NEW_HUMAN), WEAR_IN_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(NEW_HUMAN), WEAR_IN_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(NEW_HUMAN), WEAR_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact_adv(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/dutch(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke(NEW_HUMAN), WEAR_IN_BACK) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(NEW_HUMAN), WEAR_IN_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/clothing/accessory/storage/webbing, WEAR_ACCESSORY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap, WEAR_IN_ACCESSORY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap, WEAR_IN_ACCESSORY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap, WEAR_IN_ACCESSORY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch(NEW_HUMAN), WEAR_WAIST) - 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/storage/pouch/magazine/large/m16/ap(NEW_HUMAN), WEAR_L_STORE) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced(NEW_HUMAN), WEAR_R_STORE) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(NEW_HUMAN), WEAR_FEET) - - to_chat(NEW_HUMAN, SPAN_WARNING("You are a medic of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your leader's face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your backpack have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to help your team members hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) + 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/clothing/under/marine/veteran/dutch(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/xm177/dutch(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/empgrenade/dutch(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact_adv(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/dutch(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_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/clothing/accessory/storage/webbing, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch(new_human), WEAR_WAIST) + 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/storage/pouch/magazine/large/m16/ap(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET) + + to_chat(new_human, SPAN_WARNING("You are a medic of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your leader's face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your backpack have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to help your team members hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) /datum/equipment_preset/dutch/arnie name = "Dutch's Dozen - Arnold" @@ -200,42 +200,42 @@ skills = /datum/skills/dutch idtype = /obj/item/card/id/gold -/datum/equipment_preset/dutch/arnie/load_name(mob/living/carbon/human/NEW_HUMAN, randomise) - NEW_HUMAN.gender = MALE - NEW_HUMAN.change_real_name(NEW_HUMAN, "Arnold 'Dutch' Schäfer") - NEW_HUMAN.f_style = "5 O'clock Shadow" - NEW_HUMAN.h_style = "Mulder" - - NEW_HUMAN.age = 38 - NEW_HUMAN.r_hair = 15 - NEW_HUMAN.g_hair = 15 - NEW_HUMAN.b_hair = 25 - NEW_HUMAN.r_eyes = 139 - NEW_HUMAN.g_eyes = 62 - NEW_HUMAN.b_eyes = 19 +/datum/equipment_preset/dutch/arnie/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = MALE + new_human.change_real_name(new_human, "Arnold 'Dutch' Schäfer") + new_human.f_style = "5 O'clock Shadow" + new_human.h_style = "Mulder" + + new_human.age = 38 + new_human.r_hair = 15 + new_human.g_hair = 15 + new_human.b_hair = 25 + new_human.r_eyes = 139 + new_human.g_eyes = 62 + new_human.b_eyes = 19 idtype = /obj/item/card/id/gold -/datum/equipment_preset/dutch/arnie/load_gear(mob/living/carbon/human/NEW_HUMAN) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch/cap(NEW_HUMAN), WEAR_HEAD) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(NEW_HUMAN), WEAR_L_EAR) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/empproof(NEW_HUMAN), WEAR_EYES) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/yautja/hunter(NEW_HUMAN), WEAR_FACE) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(NEW_HUMAN), WEAR_BODY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(NEW_HUMAN), WEAR_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/xm177/dutch(NEW_HUMAN), WEAR_J_STORE) //he uses a grenadier m16 in the movie but too gear limited to add it so he gets the cool gun - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap(NEW_HUMAN), WEAR_IN_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap(NEW_HUMAN), WEAR_IN_JACKET) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/large_holster/machete/arnold/full(NEW_HUMAN), WEAR_BACK) - 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/m16/ap, WEAR_IN_ACCESSORY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap, WEAR_IN_ACCESSORY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap, WEAR_IN_ACCESSORY) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/belt/marine/dutch/m16/ap(NEW_HUMAN), WEAR_WAIST) - 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/storage/pouch/explosive/emp_dutch(NEW_HUMAN), WEAR_L_STORE) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/socmed/dutch(NEW_HUMAN), WEAR_R_STORE) - NEW_HUMAN.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(NEW_HUMAN), WEAR_FEET) - - NEW_HUMAN.set_species("Human Hero") //Arnold is STRONG. - - to_chat(NEW_HUMAN, SPAN_WARNING("You are Dutch, the leader of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your pouch have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) +/datum/equipment_preset/dutch/arnie/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch/cap(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/empproof(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/yautja/hunter(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/xm177/dutch(new_human), WEAR_J_STORE) //he uses a grenadier m16 in the movie but too gear limited to add it so he gets the cool gun + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/machete/arnold/full(new_human), WEAR_BACK) + 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/m16/ap, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16/ap, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/dutch/m16/ap(new_human), WEAR_WAIST) + 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/storage/pouch/explosive/emp_dutch(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/socmed/dutch(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET) + + new_human.set_species("Human Hero") //Arnold is STRONG. + + to_chat(new_human, SPAN_WARNING("You are Dutch, the leader of the Dutch's Dozen! You are fully aware of anything and everything regarding the Yautja, down to every minute detail. The Yautja mask on your face serves to let the Yautja track you, or for you to place traps. The Yautja can detect their gear signatures, and will track this mask as soon as you arrive. The EMP grenades in your pouch have a very wide area range. They will interrupt Predator cloak and consume their bracer charge. REMEMBER: Your objective is to hunt, kill and loot the Predators planetside, and NOT hunt Xenomorphs.")) diff --git a/code/modules/gear_presets/forcon_survivors.dm b/code/modules/gear_presets/forcon_survivors.dm index 8be3be5d9a8c..c18582ff44e1 100644 --- a/code/modules/gear_presets/forcon_survivors.dm +++ b/code/modules/gear_presets/forcon_survivors.dm @@ -14,103 +14,103 @@ ACCESS_CIVILIAN_LOGISTICS, ) -/datum/equipment_preset/survivor/forecon/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/survivor/forecon/load_gear(mob/living/carbon/human/new_human) var/obj/item/clothing/under/marine/reconnaissance/uniform = new() var/obj/item/clothing/accessory/storage/droppouch/pouch = new() var/obj/item/clothing/accessory/ranks/marine/e5/pin = new() var/obj/item/clothing/accessory/patch/patch_uscm = new() var/obj/item/clothing/accessory/patch/forecon/patch_forecon = new() - uniform.attach_accessory(H,pouch) - uniform.attach_accessory(H,patch_uscm) - uniform.attach_accessory(H,pin) - uniform.attach_accessory(H,patch_forecon) - H.equip_to_slot_or_del(uniform, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/marine(H), WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/facepaint/sniper(H), WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE(H), WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/device/flashlight(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/device/radio(H), WEAR_IN_BACK) - GLOB.character_traits[/datum/character_trait/skills/spotter].apply_trait(H) - -/datum/equipment_preset/survivor/forecon/add_survivor_weapon_security(mob/living/carbon/human/H) + uniform.attach_accessory(new_human,pouch) + uniform.attach_accessory(new_human,patch_uscm) + uniform.attach_accessory(new_human,pin) + uniform.attach_accessory(new_human,patch_forecon) + new_human.equip_to_slot_or_del(uniform, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/marine(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/facepaint/sniper(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) + GLOB.character_traits[/datum/character_trait/skills/spotter].apply_trait(new_human) + +/datum/equipment_preset/survivor/forecon/add_survivor_weapon_security(mob/living/carbon/human/new_human) return -/datum/equipment_preset/survivor/forecon/proc/add_forecon_weapon(mob/living/carbon/human/H) +/datum/equipment_preset/survivor/forecon/proc/add_forecon_weapon(mob/living/carbon/human/new_human) var/random_gun = rand(1,3) switch(random_gun) if(1 , 2) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a(new_human), WEAR_L_HAND) + 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(3) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m4ra(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m4ra(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m4ra(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m4ra(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m4ra(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m4ra(new_human), WEAR_IN_BACK) -/datum/equipment_preset/survivor/forecon/add_survivor_weapon_pistol(mob/living/carbon/human/H) +/datum/equipment_preset/survivor/forecon/add_survivor_weapon_pistol(mob/living/carbon/human/new_human) return -/datum/equipment_preset/survivor/forecon/proc/add_forecon_weapon_pistol(mob/living/carbon/human/H) +/datum/equipment_preset/survivor/forecon/proc/add_forecon_weapon_pistol(mob/living/carbon/human/new_human) var/random_pistol = rand(1,5) switch(random_pistol) if(1 , 2) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(H), WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(H), WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(H), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/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) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BELT) if(3 , 4) - H.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39(H), WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/extended(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/extended(H), WEAR_IN_BACK) + 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) if(5) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector(H),WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector(new_human),WEAR_WAIST) -/datum/equipment_preset/survivor/forecon/add_random_survivor_equipment(mob/living/carbon/human/H) +/datum/equipment_preset/survivor/forecon/add_random_survivor_equipment(mob/living/carbon/human/new_human) return -/datum/equipment_preset/survivor/forecon/proc/add_forecon_equipment(mob/living/carbon/human/H) +/datum/equipment_preset/survivor/forecon/proc/add_forecon_equipment(mob/living/carbon/human/new_human) var/random_equipment = rand(1,3) switch(random_equipment) if(1) - H.equip_to_slot_or_del(new /obj/item/device/walkman(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/cassette_tape/indie(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/walkman(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/cassette_tape/indie(new_human), WEAR_IN_BACK) if(2) - H.equip_to_slot_or_del(new /obj/item/toy/deck(H), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/toy/deck(new_human), WEAR_IN_ACCESSORY) if(3) - H.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(H), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(new_human), WEAR_IN_ACCESSORY) -/datum/equipment_preset/survivor/forecon/proc/spawn_random_headgear(mob/living/carbon/human/H) +/datum/equipment_preset/survivor/forecon/proc/spawn_random_headgear(mob/living/carbon/human/new_human) var/i = rand(1,10) switch(i) if (1 , 2) - H.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(H), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD) if (3 , 4) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beanie/gray(H), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beanie/gray(new_human), WEAR_HEAD) if (5 , 6) - H.equip_to_slot_or_del(new /obj/item/clothing/head/durag(H), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/durag(new_human), WEAR_HEAD) if (7 , 8) - H.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie/tan(H), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie/tan(new_human), WEAR_HEAD) if (9) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(H), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) /datum/equipment_preset/survivor/forecon/standard name = "Survivor - USCM Reconnaissance Marine" assignment = "Reconnaissance Rifleman" skills = /datum/skills/military/survivor/forecon_standard -/datum/equipment_preset/survivor/forecon/standard/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/survivor/forecon/standard/load_gear(mob/living/carbon/human/new_human) ..() - add_forecon_weapon_pistol(H) - add_forecon_weapon(H) - spawn_random_headgear(H) - add_forecon_equipment(H) + add_forecon_weapon_pistol(new_human) + add_forecon_weapon(new_human) + spawn_random_headgear(new_human) + add_forecon_equipment(new_human) ///*****************************// @@ -119,20 +119,20 @@ assignment = "Reconnaissance Support Technician" skills = /datum/skills/military/survivor/forecon_techician -/datum/equipment_preset/survivor/forecon/tech/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/big(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(H), WEAR_EYES) +/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES) ..() - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(H), WEAR_IN_BACK) - add_forecon_weapon(H) - spawn_random_headgear(H) - add_forecon_equipment(H) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini(new_human), WEAR_IN_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) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human), WEAR_IN_BACK) + add_forecon_weapon(new_human) + spawn_random_headgear(new_human) + add_forecon_equipment(new_human) ///*****************************// @@ -141,14 +141,14 @@ assignment = "Reconnaissance Marksman" skills = /datum/skills/military/survivor/forecon_marksman -/datum/equipment_preset/survivor/forecon/marksman/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m4ra_custom(H), WEAR_L_HAND) +/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) ..() - add_forecon_weapon_pistol(H) - spawn_random_headgear(H) - add_forecon_equipment(H) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m4ra/custom(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m4ra/custom(H), WEAR_IN_BACK) + add_forecon_weapon_pistol(new_human) + spawn_random_headgear(new_human) + add_forecon_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m4ra/custom(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m4ra/custom(new_human), WEAR_IN_BACK) ///*****************************// @@ -157,16 +157,16 @@ assignment = "Reconnaissance Smartgunner" skills = /datum/skills/military/survivor/forecon_smartgunner -/datum/equipment_preset/survivor/forecon/smartgunner/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(H), WEAR_R_HAND) +/datum/equipment_preset/survivor/forecon/smartgunner/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(new_human), WEAR_R_HAND) ..() - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(H), WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(H), WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(H), WEAR_IN_BELT) - add_forecon_weapon(H) - spawn_random_headgear(H) - add_forecon_equipment(H) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/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) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BELT) + add_forecon_weapon(new_human) + spawn_random_headgear(new_human) + add_forecon_equipment(new_human) ///*****************************// @@ -175,16 +175,16 @@ assignment = "Reconnaissance Grenadier" skills = /datum/skills/military/survivor/forecon_grenadier -/datum/equipment_preset/survivor/forecon/grenadier/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/launcher/grenade/m81/m79(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(H), WEAR_R_HAND) +/datum/equipment_preset/survivor/forecon/grenadier/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/launcher/grenade/m81/m79(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(new_human), WEAR_R_HAND) ..() - H.equip_to_slot_or_del(new /obj/item/storage/belt/grenade(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/incendiary(H), WEAR_IN_BACK) - spawn_random_headgear(H) - add_forecon_equipment(H) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/grenade(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/incendiary(new_human), WEAR_IN_BACK) + spawn_random_headgear(new_human) + add_forecon_equipment(new_human) //---------------------------\\ @@ -194,23 +194,23 @@ skills = /datum/skills/military/survivor/forecon_squad_leader paygrade = "MO1" -/datum/equipment_preset/survivor/forecon/squad_leader/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/survivor/forecon/squad_leader/load_gear(mob/living/carbon/human/new_human) var/obj/item/clothing/under/marine/reconnaissance/uniform = new() var/obj/item/clothing/accessory/storage/droppouch/pouch = new() var/obj/item/clothing/accessory/ranks/marine/o1/pin = new() var/obj/item/clothing/accessory/patch/patch_uscm = new() var/obj/item/clothing/accessory/patch/forecon/patch_forecon = new() - uniform.attach_accessory(H,pouch) - uniform.attach_accessory(H,patch_uscm) - uniform.attach_accessory(H,pin) - uniform.attach_accessory(H,patch_forecon) - H.equip_to_slot_or_del(uniform, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump(H), WEAR_R_HAND) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/slugs(H), WEAR_L_HAND) + uniform.attach_accessory(new_human,pouch) + uniform.attach_accessory(new_human,patch_uscm) + uniform.attach_accessory(new_human,pin) + uniform.attach_accessory(new_human,patch_forecon) + new_human.equip_to_slot_or_del(uniform, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump(new_human), WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/shotgun/slugs(new_human), WEAR_L_HAND) ..() - add_forecon_weapon_pistol(H) - spawn_random_headgear(H) - add_forecon_equipment(H) + add_forecon_weapon_pistol(new_human) + spawn_random_headgear(new_human) + add_forecon_equipment(new_human) //---------------------------\\ @@ -222,28 +222,28 @@ idtype = /obj/item/card/id/gold role_comm_title = "FORECON CO" -/datum/equipment_preset/survivor/forecon/major/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/survivor/forecon/major/load_gear(mob/living/carbon/human/new_human) var/obj/item/clothing/under/marine/reconnaissance/uniform = new() var/obj/item/clothing/accessory/storage/droppouch/pouch = new() var/obj/item/clothing/accessory/ranks/marine/o4/pin = new() var/obj/item/clothing/accessory/patch/patch_uscm = new() var/obj/item/clothing/accessory/patch/forecon/patch_forecon = new() - uniform.attach_accessory(H,pouch) - uniform.attach_accessory(H,patch_uscm) - uniform.attach_accessory(H,pin) - uniform.attach_accessory(H,patch_forecon) - H.equip_to_slot_or_del(uniform, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_green(H), WEAR_JACKET) + uniform.attach_accessory(new_human,pouch) + uniform.attach_accessory(new_human,patch_uscm) + uniform.attach_accessory(new_human,pin) + uniform.attach_accessory(new_human,patch_forecon) + new_human.equip_to_slot_or_del(uniform, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_green(new_human), WEAR_JACKET) ..() - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/cmateba(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/mateba/cmateba(H), WEAR_R_HAND) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba(H), WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba(H), WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba(H), WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo/gold(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/bottle/davenport(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/cmateba(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/mateba/cmateba(new_human), WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba(new_human), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba(new_human), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba(new_human), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo/gold(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/bottle/davenport(new_human), WEAR_IN_BACK) //----------------------\\ diff --git a/code/modules/gear_presets/fun.dm b/code/modules/gear_presets/fun.dm index 0fa536f6d1c3..19eb64942f10 100644 --- a/code/modules/gear_presets/fun.dm +++ b/code/modules/gear_presets/fun.dm @@ -16,18 +16,18 @@ skills = /datum/skills/pfc/crafty -/datum/equipment_preset/fun/pirate/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(H), WEAR_EYES) +/datum/equipment_preset/fun/pirate/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/under/pirate(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) + 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/bandana(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(new_human), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/pirate(H), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/pirate(new_human), WEAR_L_HAND) - H.equip_to_slot(new /obj/item/attachable/bayonet(H), WEAR_L_STORE) - H.equip_to_slot(new /obj/item/device/flashlight(H), WEAR_R_STORE) + new_human.equip_to_slot(new /obj/item/attachable/bayonet(new_human), WEAR_L_STORE) + new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE) //*****************************************************************************************************/ @@ -38,19 +38,19 @@ skills = /datum/skills/SL idtype = /obj/item/card/id/silver -/datum/equipment_preset/fun/pirate/captain/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/pirate(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(H), WEAR_EYES) +/datum/equipment_preset/fun/pirate/captain/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/under/pirate(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) + 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/suit/pirate(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/pirate(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(new_human), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/pirate(H), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/pirate(new_human), WEAR_L_HAND) - H.equip_to_slot(new /obj/item/attachable/bayonet(H), WEAR_L_STORE) - H.equip_to_slot(new /obj/item/device/flashlight(H), WEAR_R_STORE) + new_human.equip_to_slot(new /obj/item/attachable/bayonet(new_human), WEAR_L_STORE) + new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE) //*****************************************************************************************************/ @@ -58,15 +58,15 @@ name = "Fun - Clown" flags = EQUIPMENT_PRESET_EXTRA -/datum/equipment_preset/fun/clown/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/clown(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), WEAR_FACE) +/datum/equipment_preset/fun/clown/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/clown(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(new_human), WEAR_FACE) - H.equip_to_slot(new /obj/item/toy/bikehorn(H), WEAR_L_STORE) - H.equip_to_slot(new /obj/item/device/flashlight(H), WEAR_R_STORE) + new_human.equip_to_slot(new /obj/item/toy/bikehorn(new_human), WEAR_L_STORE) + new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE) //*****************************************************************************************************/ @@ -87,12 +87,12 @@ skills = /datum/skills/specialist -/datum/equipment_preset/fun/hefa/load_skills(mob/living/carbon/human/H) +/datum/equipment_preset/fun/hefa/load_skills(mob/living/carbon/human/new_human) ..() - H.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_GRENADIER) + new_human.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_GRENADIER) -/datum/equipment_preset/fun/hefa/load_name(mob/living/carbon/human/H, randomise) - H.gender = MALE +/datum/equipment_preset/fun/hefa/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = MALE var/list/names = list( "Lancelot", "Gawain", "Geraint", "Percival", "Bors", "Lamorak", "Kay", "Gareth", "Bedivere", "Gaheris", "Galahad", "Tristan", "Palamedes", "Aban", "Abrioris", "Aglovale", "Agravain", "Aqiff", "Bagdemagus", "Baudwin", "Brastius", "Bredbeddle", "Breunor", "Caradoc", "Calogrenant", @@ -101,30 +101,30 @@ ) var/new_name = pick(names) + " of the HEFA Order" - H.change_real_name(H, new_name) - H.f_style = "5 O'clock Shadow" + new_human.change_real_name(new_human, new_name) + new_human.f_style = "5 O'clock Shadow" -/datum/equipment_preset/fun/hefa/load_gear(mob/living/carbon/human/H) - var/obj/item/clothing/under/marine/M = new(H) +/datum/equipment_preset/fun/hefa/load_gear(mob/living/carbon/human/new_human) + var/obj/item/clothing/under/marine/M = new(new_human) var/obj/item/clothing/accessory/storage/webbing/W = new() - M.attach_accessory(H, W) - - H.equip_to_slot_or_del(M, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/specialist/hefa(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(H), WEAR_L_STORE) - var/jacket_success = H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/M3G/hefa(H), WEAR_JACKET) - var/satchel_success = H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(H), WEAR_BACK) - var/waist_success = H.equip_to_slot_or_del(new /obj/item/storage/belt/grenade/large(H), WEAR_WAIST) - var/pouch_r_success = H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive(H), WEAR_R_STORE) - var/gun_success = H.equip_to_slot_or_del(new /obj/item/weapon/gun/launcher/grenade/m92(H), WEAR_J_STORE) + M.attach_accessory(new_human, W) + + new_human.equip_to_slot_or_del(M, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/specialist/hefa(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE) + var/jacket_success = new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/M3G/hefa(new_human), WEAR_JACKET) + var/satchel_success = new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) + var/waist_success = new_human.equip_to_slot_or_del(new /obj/item/storage/belt/grenade/large(new_human), WEAR_WAIST) + var/pouch_r_success = new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive(new_human), WEAR_R_STORE) + var/gun_success = new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/launcher/grenade/m92(new_human), WEAR_J_STORE) // Now pump /everything/ full of HEFAs // M92 launcher if(gun_success) - var/obj/item/weapon/gun/launcher/grenade/m92/launcher = H.s_store + var/obj/item/weapon/gun/launcher/grenade/m92/launcher = new_human.s_store launcher.name = "HEFA grenade launcher" launcher.internal_slots = 10 // big buff @@ -146,91 +146,91 @@ // Satchel if(satchel_success) for(var/i in 1 to 7) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(new_human.back), WEAR_IN_BACK) // Belt if(waist_success) - var/obj/item/storage/belt/grenade/large/belt = H.belt + var/obj/item/storage/belt/grenade/large/belt = new_human.belt belt.name = "M42 HEFA rig Mk. XVII" for(var/i in 1 to belt.storage_slots) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(H.belt), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(new_human.belt), WEAR_IN_BELT) // Armor/suit if(jacket_success) - var/obj/item/clothing/suit/storage/marine/M3G/armor = H.wear_suit + var/obj/item/clothing/suit/storage/marine/M3G/armor = new_human.wear_suit armor.name = "HEFA Knight armor" for(var/i in 1 to armor.storage_slots) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(H.wear_suit), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(new_human.wear_suit), WEAR_IN_JACKET) // Pouch if(pouch_r_success) - var/obj/item/storage/pouch/explosive/pouch = H.r_store + var/obj/item/storage/pouch/explosive/pouch = new_human.r_store pouch.name = "HEFA pouch" for(var/i in 1 to pouch.storage_slots) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(H.r_store), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(new_human.r_store), WEAR_IN_R_STORE) // Webbing for(var/i in 1 to W.hold.storage_slots) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(H.back), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(new_human.back), WEAR_IN_ACCESSORY) /datum/equipment_preset/fun/hefa/melee name = "HEFA Knight - Melee" -/datum/equipment_preset/fun/hefa/melee/load_gear(mob/living/carbon/human/H) - var/obj/item/clothing/under/marine/M = new(H) +/datum/equipment_preset/fun/hefa/melee/load_gear(mob/living/carbon/human/new_human) + var/obj/item/clothing/under/marine/M = new(new_human) M.name = "HEFA Knight uniform" var/obj/item/clothing/accessory/storage/webbing/W = new() - M.attach_accessory(H, W) - - H.equip_to_slot_or_del(M, WEAR_BODY) - var/shoes_success = H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/specialist/hefa(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(H), WEAR_L_STORE) - var/jacket_success = H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/M3G/hefa(H), WEAR_JACKET) - var/satchel_success = H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(H), WEAR_BACK) - var/waist_success = H.equip_to_slot_or_del(new /obj/item/storage/belt/grenade/large(H), WEAR_WAIST) - var/pouch_r_success = H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/weapon/claymore/hefa(H), WEAR_R_HAND) - H.equip_to_slot_or_del(new /obj/item/weapon/claymore/hefa(H), WEAR_IN_BACK) + M.attach_accessory(new_human, W) + + new_human.equip_to_slot_or_del(M, WEAR_BODY) + var/shoes_success = new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/specialist/hefa(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE) + var/jacket_success = new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/M3G/hefa(new_human), WEAR_JACKET) + var/satchel_success = new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) + var/waist_success = new_human.equip_to_slot_or_del(new /obj/item/storage/belt/grenade/large(new_human), WEAR_WAIST) + var/pouch_r_success = new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/hefa(new_human), WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/hefa(new_human), WEAR_IN_BACK) if(shoes_success) - var/obj/item/clothing/shoes/marine/knife/shoes = H.shoes + var/obj/item/clothing/shoes/marine/knife/shoes = new_human.shoes shoes.name = "HEFA Knight combat boots" // Now pump /everything/ full of HEFAs // Satchel if(satchel_success) - var/obj/item/storage/backpack/marine/satchel = H.back + var/obj/item/storage/backpack/marine/satchel = new_human.back satchel.name = "HEFA storage bag" for(var/i in 1 to 7) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(new_human.back), WEAR_IN_BACK) // Belt if(waist_success) - var/obj/item/storage/belt/grenade/large/belt = H.belt + var/obj/item/storage/belt/grenade/large/belt = new_human.belt belt.name = "M42 HEFA rig Mk. XVII" for(var/i in 1 to belt.storage_slots) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(H.belt), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(new_human.belt), WEAR_IN_BELT) // Armor/suit if(jacket_success) - var/obj/item/clothing/suit/storage/marine/M3G/armor = H.wear_suit + var/obj/item/clothing/suit/storage/marine/M3G/armor = new_human.wear_suit armor.name = "HEFA Knight armor" for(var/i in 1 to armor.storage_slots) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(H.wear_suit), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(new_human.wear_suit), WEAR_IN_JACKET) // Pouches if(pouch_r_success) - var/obj/item/storage/pouch/explosive/pouch = H.r_store + var/obj/item/storage/pouch/explosive/pouch = new_human.r_store pouch.name = "HEFA pouch" for(var/i in 1 to pouch.storage_slots) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(H.r_store), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(new_human.r_store), WEAR_IN_R_STORE) // Webbing for(var/i in 1 to W.hold.storage_slots) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(H.back), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(new_human.back), WEAR_IN_ACCESSORY) /datum/equipment_preset/fun/santa name = "Fun - Santa" @@ -248,37 +248,37 @@ . = ..() access = get_all_accesses() + get_all_centcom_access() -/datum/equipment_preset/fun/santa/load_name(mob/living/carbon/human/H, randomise) - H.gender = MALE - H.change_real_name(H, "Santa") +/datum/equipment_preset/fun/santa/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = MALE + new_human.change_real_name(new_human, "Santa") - H.age = 270 //he is old - H.r_hair = 0 - H.g_hair = 0 - H.b_hair = 0 + new_human.age = 270 //he is old + new_human.r_hair = 0 + new_human.g_hair = 0 + new_human.b_hair = 0 -/datum/equipment_preset/fun/santa/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/fun/santa/load_gear(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/santabag(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/santabag(new_human), WEAR_BACK) //pack filled with gifts //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(H), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(new_human), WEAR_L_EAR) //body - H.equip_to_slot_or_del(new /obj/item/clothing/under/pj/red(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/space/santa(H), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/pj/red(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/space/santa(new_human), WEAR_JACKET) //pockets - H.equip_to_slot_or_del(new /obj/item/device/flash(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(H), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human), WEAR_L_STORE) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/santahat(H), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/santahat(new_human), WEAR_HEAD) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress(H), 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/shoes/dress(new_human), WEAR_FEET) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/santa(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/santa(new_human), WEAR_WAIST) - H.set_species("Human Hero") //Santa is STRONG. - ADD_TRAIT(H, TRAIT_SANTA, TRAIT_SOURCE_ADMIN) + new_human.set_species("Human Hero") //Santa is STRONG. + ADD_TRAIT(new_human, TRAIT_SANTA, TRAIT_SOURCE_ADMIN) /datum/equipment_preset/upp/ivan name = "Fun - Ivan" @@ -288,46 +288,46 @@ rank = "UPP Armsmaster" role_comm_title = null -/datum/equipment_preset/upp/ivan/load_name(mob/living/carbon/human/H, randomise) - H.gender = MALE - H.change_real_name(H, "Ivan") - H.f_style = "Shaved" - H.h_style = "Shaved Head" - H.ethnicity = "Scandinavian" - H.r_hair = 165 - H.g_hair = 42 - H.b_hair = 42 - -/datum/equipment_preset/upp/ivan/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/ivan/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = MALE + new_human.change_real_name(new_human, "Ivan") + new_human.f_style = "Shaved" + new_human.h_style = "Shaved Head" + new_human.ethnicity = "Scandinavian" + new_human.r_hair = 165 + new_human.g_hair = 42 + new_human.b_hair = 42 + +/datum/equipment_preset/upp/ivan/load_gear(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/ivan, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/ivan, WEAR_BACK) //back filled with random guns, it's awesome //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) //body + webbing var/obj/item/clothing/under/marine/veteran/UPP/UPP = new() var/obj/item/clothing/accessory/storage/webbing/W = new() - UPP.attach_accessory(H, W) - H.equip_to_slot_or_del(UPP, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/jacket/ivan, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/m60, WEAR_J_STORE) + UPP.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(UPP, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/jacket/ivan, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/m60, WEAR_J_STORE) //webbing - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m60, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m60, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/m60, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/m60, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/m60, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/m60, WEAR_IN_ACCESSORY) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/full, WEAR_R_STORE) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/ivanberet, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ivanberet, WEAR_HEAD) //limb - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.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/marine/upp, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/ivan, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/ivan, WEAR_WAIST) //belt filled with random magazines, it's cool - H.set_species("Human Hero") //Ivan is STRONG. + new_human.set_species("Human Hero") //Ivan is STRONG. /datum/equipment_preset/fun/van_bandolier @@ -344,64 +344,64 @@ . = ..() access = get_all_accesses() -/datum/equipment_preset/fun/van_bandolier/load_name(mob/living/carbon/human/H, randomise) - H.gender = MALE - H.change_real_name(H, "Van Bandolier") - H.age = 55 - H.r_hair = 153 //Light brown hair. - H.g_hair = 102 - H.b_hair = 51 - H.r_facial = 153 - H.g_facial = 102 - H.b_facial = 51 - H.h_style = "Mullet" - H.f_style = "Full English" - H.ethnicity = "Anglo" - H.r_eyes = 102 //Brown eyes. - H.g_eyes = 51 - H.b_eyes = 0 - -/datum/equipment_preset/fun/van_bandolier/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/fun/van_bandolier/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = MALE + new_human.change_real_name(new_human, "Van Bandolier") + new_human.age = 55 + new_human.r_hair = 153 //Light brown hair. + new_human.g_hair = 102 + new_human.b_hair = 51 + new_human.r_facial = 153 + new_human.g_facial = 102 + new_human.b_facial = 51 + new_human.h_style = "Mullet" + new_human.f_style = "Full English" + new_human.ethnicity = "Anglo" + new_human.r_eyes = 102 //Brown eyes. + new_human.g_eyes = 51 + new_human.b_eyes = 0 + +/datum/equipment_preset/fun/van_bandolier/load_gear(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/double/twobore(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/double/twobore(new_human), WEAR_BACK) //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(H), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(new_human), WEAR_L_EAR) //body - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/van_bandolier(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/van_bandolier(H), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/van_bandolier(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/van_bandolier(new_human), WEAR_JACKET) //suit storage - H.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun/van_bandolier(H), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun/van_bandolier(new_human), WEAR_J_STORE) //suit pockets - H.equip_to_slot_or_del(new /obj/item/device/binoculars/civ(H.wear_suit), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint(H.wear_suit), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/civ(new_human.wear_suit), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/splint(new_human.wear_suit), WEAR_IN_JACKET) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human), WEAR_R_STORE) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/van_bandolier(H), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/van_bandolier(new_human), WEAR_HEAD) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/insulated/van_bandolier(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/van_bandolier(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/insulated/van_bandolier(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/van_bandolier(new_human), WEAR_FEET) //hands - H.equip_to_slot_or_del(new /obj/item/storage/box/twobore(H), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/twobore(new_human), WEAR_L_HAND) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/webley/full(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/webley/full(new_human), WEAR_WAIST) - H.set_species("Human Hero") //Van Bandolier is not easily subdued. + new_human.set_species("Human Hero") //Van Bandolier is not easily subdued. //But he isn't completely unstoppable, either. Reenables slow, knockout, daze, stun and permanent (organ dam, IB etc.) damage. //Stuns and knockdowns are shorter but he's not completely immune. - H.status_flags &= ~NO_PERMANENT_DAMAGE - H.status_flags |= STATUS_FLAGS_DEBILITATE - ADD_TRAIT(H, TRAIT_TWOBORE_TRAINING, TRAIT_SOURCE_ADMIN) //Means he can handle his gun and speak its hit lines. + new_human.status_flags &= ~NO_PERMANENT_DAMAGE + new_human.status_flags |= STATUS_FLAGS_DEBILITATE + ADD_TRAIT(new_human, TRAIT_TWOBORE_TRAINING, TRAIT_SOURCE_ADMIN) //Means he can handle his gun and speak its hit lines. /datum/equipment_preset/fun/monkey @@ -417,16 +417,16 @@ rank = "Monkey" idtype = /obj/item/card/id/dogtag -/datum/equipment_preset/fun/monkey/load_race(mob/living/carbon/human/H, client/mob_client) - H.set_species(SPECIES_MONKEY) +/datum/equipment_preset/fun/monkey/load_race(mob/living/carbon/human/new_human, client/mob_client) + new_human.set_species(SPECIES_MONKEY) -/datum/equipment_preset/fun/monkey/load_name(mob/living/carbon/human/H, randomise, client/mob_client) - H.gender = pick(60;MALE,40;FEMALE) - var/random_name = get_random_name(H) - H.change_real_name(H, random_name) - H.age = rand(1, 40) +/datum/equipment_preset/fun/monkey/load_name(mob/living/carbon/human/new_human, randomise, client/mob_client) + new_human.gender = pick(60;MALE,40;FEMALE) + var/random_name = get_random_name(new_human) + new_human.change_real_name(new_human, random_name) + new_human.age = rand(1, 40) -/datum/equipment_preset/fun/monkey/proc/get_random_name(mob/living/carbon/human/H) +/datum/equipment_preset/fun/monkey/proc/get_random_name(mob/living/carbon/human/new_human) return pick(monkey_names) /datum/equipment_preset/fun/monkey/marine @@ -436,15 +436,15 @@ rank = "Monkey Marine" paygrade = "ME2" -/datum/equipment_preset/fun/monkey/marine/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/monkey(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive(H), WEAR_IN_JACKET) +/datum/equipment_preset/fun/monkey/marine/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/monkey(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive(new_human), WEAR_IN_JACKET) /datum/equipment_preset/fun/monkey/soldier name = "Fun - Monkey Soldier" @@ -453,15 +453,15 @@ rank = "Monkey Soldier" paygrade = "UE1" -/datum/equipment_preset/fun/monkey/soldier/get_random_name(mob/living/carbon/human/H) - return H.gender == MALE ? pick(first_names_male_upp) : pick(first_names_female_upp) - -/datum/equipment_preset/fun/monkey/soldier/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/monkey(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/rifleman(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp(H), WEAR_IN_JACKET) +/datum/equipment_preset/fun/monkey/soldier/get_random_name(mob/living/carbon/human/new_human) + return new_human.gender == MALE ? pick(first_names_male_upp) : pick(first_names_female_upp) + +/datum/equipment_preset/fun/monkey/soldier/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/suit/storage/marine/faction/UPP(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/monkey(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/rifleman(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp(new_human), WEAR_IN_JACKET) diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm index 6b7b1ff484d8..6dd3f830eb12 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -8,25 +8,25 @@ name = "Mutineer" flags = EQUIPMENT_PRESET_EXTRA -/datum/equipment_preset/other/mutineer/load_status(mob/living/carbon/human/H) +/datum/equipment_preset/other/mutineer/load_status(mob/living/carbon/human/new_human) . = ..() - H.mob_flags |= MUTINEER - H.hud_set_squad() + new_human.mob_flags |= MUTINEER + new_human.hud_set_squad() - to_chat(H, SPAN_HIGHDANGER("
You are now a Mutineer!")) - to_chat(H, SPAN_DANGER("Please check the rules to see what you can and can't do as a mutineer.
")) + to_chat(new_human, SPAN_HIGHDANGER("
You are now a Mutineer!")) + to_chat(new_human, SPAN_DANGER("Please check the rules to see what you can and can't do as a mutineer.
")) /datum/equipment_preset/other/mutineer/leader name = "Mutineer Leader" flags = EQUIPMENT_PRESET_EXTRA -/datum/equipment_preset/other/mutineer/leader/load_status(mob/living/carbon/human/H) - for(var/datum/action/human_action/activable/mutineer/A in H.actions) - A.remove_from(H) +/datum/equipment_preset/other/mutineer/leader/load_status(mob/living/carbon/human/new_human) + for(var/datum/action/human_action/activable/mutineer/A in new_human.actions) + A.remove_from(new_human) var/list/abilities = subtypesof(/datum/action/human_action/activable/mutineer) for(var/type in abilities) - give_action(H, type) + give_action(new_human, type) /datum/equipment_preset/other/freelancer name = "Freelancer" @@ -40,21 +40,21 @@ . = ..() access = get_all_accesses() -/datum/equipment_preset/other/freelancer/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(60;MALE,40;FEMALE) +/datum/equipment_preset/other/freelancer/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(60;MALE,40;FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name - if(H.gender == MALE) + if(new_human.gender == MALE) random_name = "[pick(first_names_male_colonist)] [pick(last_names_colonist)]" - H.f_style = "5 O'clock Shadow" + new_human.f_style = "5 O'clock Shadow" else random_name = "[pick(first_names_female_colonist)] [pick(last_names_colonist)]" - H.change_real_name(H, random_name) - H.age = rand(20,45) - H.r_hair = 25 - H.g_hair = 25 - H.b_hair = 35 + new_human.change_real_name(new_human, random_name) + new_human.age = rand(20,45) + new_human.r_hair = 25 + new_human.g_hair = 25 + new_human.b_hair = 35 //*****************************************************************************************************/ @@ -65,68 +65,68 @@ skills = /datum/skills/freelancer -/datum/equipment_preset/other/freelancer/standard/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/freelancer/standard/load_gear(mob/living/carbon/human/new_human) //generic clothing - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - spawn_merc_helmet(H) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET) + 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/pmc, WEAR_HANDS) + spawn_merc_helmet(new_human) //storage and specific stuff, they all get an ERT medpouch. - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) + 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, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) - load_freelancer_soldier(H) + load_freelancer_soldier(new_human) -/datum/equipment_preset/other/freelancer/standard/proc/load_freelancer_soldier(mob/living/carbon/human/H) +/datum/equipment_preset/other/freelancer/standard/proc/load_freelancer_soldier(mob/living/carbon/human/new_human) var/percentage = rand(1, 100) switch(percentage) //most freelancers are rifleman, most others are breachers, some have HPRs. if(1 to 66) - load_freelancer_rifleman(H) + load_freelancer_rifleman(new_human) if(67 to 85) - load_freelancer_shotgunner(H) + load_freelancer_shotgunner(new_human) else - load_freelancer_machinegunner(H) - -/datum/equipment_preset/other/freelancer/standard/proc/load_freelancer_machinegunner(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - spawn_merc_weapon(H,1,6) - spawn_weapon(/obj/item/weapon/gun/rifle/lmg, /obj/item/ammo_magazine/rifle/lmg, H, 0, 5) //HPR mini-spec - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg/holo_target, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg/holo_target, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE) - -/datum/equipment_preset/other/freelancer/standard/proc/load_freelancer_shotgunner(mob/living/carbon/human/H) + load_freelancer_machinegunner(new_human) + +/datum/equipment_preset/other/freelancer/standard/proc/load_freelancer_machinegunner(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + spawn_merc_weapon(new_human,1,6) + spawn_weapon(/obj/item/weapon/gun/rifle/lmg, /obj/item/ammo_magazine/rifle/lmg, new_human, 0, 5) //HPR mini-spec + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg/holo_target, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg/holo_target, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE) + +/datum/equipment_preset/other/freelancer/standard/proc/load_freelancer_shotgunner(mob/living/carbon/human/new_human) //storage items - H.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - spawn_weapon(/obj/item/weapon/gun/shotgun/type23, pick(shotgun_handfuls_8g), H, 0, 14) //shotgunner mini-spec - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied_incendiary, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied_incendiary, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, WEAR_IN_BACK) - - -/datum/equipment_preset/other/freelancer/standard/proc/load_freelancer_rifleman(mob/living/carbon/human/H) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + spawn_weapon(/obj/item/weapon/gun/shotgun/type23, pick(shotgun_handfuls_8g), new_human, 0, 14) //shotgunner mini-spec + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied_incendiary, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied_incendiary, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, WEAR_IN_BACK) + + +/datum/equipment_preset/other/freelancer/standard/proc/load_freelancer_rifleman(mob/living/carbon/human/new_human) //storage items - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/upp, WEAR_R_STORE) - spawn_merc_weapon(H) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/upp, WEAR_R_STORE) + spawn_merc_weapon(new_human) //backpack stuff - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) //*****************************************************************************************************/ @@ -137,67 +137,67 @@ assignment = "Freelancer Medic" skills = /datum/skills/freelancer/combat_medic -/datum/equipment_preset/other/freelancer/medic/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/freelancer/medic/load_gear(mob/living/carbon/human/new_human) var/shotgunner = FALSE if(prob(50)) shotgunner = TRUE - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer, WEAR_BODY) else var/obj/item/clothing/under/marine/veteran/freelancer/FREELANCER = new() var/obj/item/clothing/accessory/storage/surg_vest/equipped/W = new() - FREELANCER.attach_accessory(H, W) - H.equip_to_slot_or_del(FREELANCER, WEAR_BODY) - - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - spawn_merc_helmet(H) - - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + FREELANCER.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(FREELANCER, WEAR_BODY) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET) + 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/pmc, WEAR_HANDS) + spawn_merc_helmet(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/storage/backpack/lightpack, WEAR_BACK) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) + 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/storage/box/attachments(new_human), WEAR_IN_BACK) - load_freelancer_medic(H, shotgunner) + load_freelancer_medic(new_human, shotgunner) -/datum/equipment_preset/other/freelancer/medic/proc/load_freelancer_medic(mob/living/carbon/human/H, shotgunner) +/datum/equipment_preset/other/freelancer/medic/proc/load_freelancer_medic(mob/living/carbon/human/new_human, shotgunner) if(shotgunner) - load_shotgunner_medic(H) + load_shotgunner_medic(new_human) else - load_standard_medic(H) + load_standard_medic(new_human) -/datum/equipment_preset/other/freelancer/medic/proc/load_shotgunner_medic(mob/living/carbon/human/H) +/datum/equipment_preset/other/freelancer/medic/proc/load_shotgunner_medic(mob/living/carbon/human/new_human) //storage items - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_suture_and_graft, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_suture_and_graft, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BELT) //stuff in backpack - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) - H.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/device/defibrillator, WEAR_IN_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/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) //gun - spawn_merc_shotgun(H) + spawn_merc_shotgun(new_human) -/datum/equipment_preset/other/freelancer/medic/proc/load_standard_medic(mob/living/carbon/human/H, /obj/item/clothing/under/marine/veteran/freelancer/FREELANCER) +/datum/equipment_preset/other/freelancer/medic/proc/load_standard_medic(mob/living/carbon/human/new_human, /obj/item/clothing/under/marine/veteran/freelancer/FREELANCER) //storage items - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST) //stuff in backpack - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) //Line is in vest. - spawn_merc_rifle(H) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_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/device/healthanalyzer, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) //Line is in vest. + spawn_merc_rifle(new_human) //*****************************************************************************************************/ @@ -210,30 +210,30 @@ skills = /datum/skills/freelancer/SL -/datum/equipment_preset/other/freelancer/leader/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/freelancer/leader/load_gear(mob/living/carbon/human/new_human) //No random helmet, so that it's more clear that he's the leader - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/freelancer/beret, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/freelancer/beret, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) - - spawn_weapon(/obj/item/weapon/gun/rifle/m41aMK1, /obj/item/ammo_magazine/rifle/m41aMK1, H, 0, 9) - spawn_merc_weapon(H,1,2) + 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/radio/headset/distress/dutch, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/stick, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) + + spawn_weapon(/obj/item/weapon/gun/rifle/m41aMK1, /obj/item/ammo_magazine/rifle/m41aMK1, new_human, 0, 9) + spawn_merc_weapon(new_human,1,2) //*****************************************************************************************************/ @@ -249,21 +249,21 @@ . = ..() access = get_all_accesses() -/datum/equipment_preset/other/elite_merc/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(70;MALE,30;FEMALE) +/datum/equipment_preset/other/elite_merc/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(70;MALE,30;FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name - if(H.gender == MALE) + if(new_human.gender == MALE) random_name = "[pick(first_names_male_colonist)] [pick(last_names_colonist)]" - H.f_style = "5 O'clock Shadow" + new_human.f_style = "5 O'clock Shadow" else random_name = "[pick(first_names_female_colonist)] [pick(last_names_colonist)]" - H.change_real_name(H, random_name) - H.age = rand(20,45) - H.r_hair = rand(15,35) - H.g_hair = rand(15,35) - H.b_hair = rand(25,45) + new_human.change_real_name(new_human, random_name) + new_human.age = rand(20,45) + new_human.r_hair = rand(15,35) + new_human.g_hair = rand(15,35) + new_human.b_hair = rand(25,45) //*****************************************************************************************************/ @@ -282,29 +282,29 @@ . = ..() access = get_antagonist_pmc_access() -/datum/equipment_preset/other/elite_merc/standard/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/elite_merc/standard/load_gear(mob/living/carbon/human/new_human) //TODO: add unique backpacks and satchels //clothes - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/mercenary/miner, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/mercenary/miner, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles, WEAR_EYES) + 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/under/marine/veteran/mercenary/miner, WEAR_BODY) + 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/gloves/marine/veteran, WEAR_HANDS) + 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/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + 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/night/m42_night_goggles, WEAR_EYES) //storage items, belt spawning is handled in the spawn elite weapon proc. - H.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/upp, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/upp, WEAR_R_STORE) //backpack and stuff in it - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/hefa, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, 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/packet/hefa, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) - spawn_merc_elite_weapon(H, 12, 50, 1) + spawn_merc_elite_weapon(new_human, 12, 50, 1) //*****************************************************************************************************/ @@ -323,32 +323,32 @@ . = ..() access = get_antagonist_pmc_access() -/datum/equipment_preset/other/elite_merc/heavy/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/elite_merc/heavy/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels //clothes - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/mercenary, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/mercenary/heavy, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles, WEAR_EYES) + 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/under/marine/veteran/mercenary, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/mercenary/heavy, 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/helmet/marine/veteran/mercenary, 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/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles, WEAR_EYES) //storage items - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/heavy, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/pressurized_reagent_canister/oxycodone, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/heavy, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pressurized_reagent_canister/oxycodone, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) //backpack and stuff in it - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/m15, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/phosphorus, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/m15, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/phosphorus, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun(new_human), WEAR_IN_BACK) //gun - H.equip_to_slot_or_del(new /obj/item/weapon/gun/minigun(H), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/minigun(new_human), WEAR_J_STORE) //*****************************************************************************************************/ @@ -367,45 +367,45 @@ . = ..() access = get_antagonist_pmc_access() -/datum/equipment_preset/other/elite_merc/engineer/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/elite_merc/engineer/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels //snowflake webbing var/obj/item/clothing/under/marine/veteran/mercenary/support/SUPPORT = new() var/obj/item/clothing/accessory/storage/black_vest/W = new() - SUPPORT.attach_accessory(H, W) + SUPPORT.attach_accessory(new_human, W) W.hold.storage_slots = 7 - H.equip_to_slot_or_del(SUPPORT, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/bicaridine, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/bicaridine, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/kelotane, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/kelotane, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/tramadol, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/tramadol, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(SUPPORT, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/bicaridine, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/bicaridine, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/kelotane, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/kelotane, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/tramadol, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/tramadol, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_ACCESSORY) //clothes - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/mercenary/support, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary/support/engineer, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles, WEAR_EYES) + 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/suit/storage/marine/veteran/mercenary/support, 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/helmet/marine/veteran/mercenary/support/engineer, 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/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles, WEAR_EYES) //storage items - H.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/elite_merc, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/elite_merc, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical/full, WEAR_R_STORE) //backpack and stuff in it - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/large_stack, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) //gun - spawn_merc_elite_weapon(H, 9, 100, 0) //only shotguns + spawn_merc_elite_weapon(new_human, 9, 100, 0) //only shotguns //*****************************************************************************************************/ @@ -424,38 +424,38 @@ . = ..() access = get_antagonist_pmc_access() -/datum/equipment_preset/other/elite_merc/medic/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/elite_merc/medic/load_gear(mob/living/carbon/human/new_human) //webbing var/obj/item/clothing/under/marine/veteran/mercenary/support/SUPPORT = new() var/obj/item/clothing/accessory/storage/surg_vest/equipped/W = new() - SUPPORT.attach_accessory(H, W) - H.equip_to_slot_or_del(SUPPORT, WEAR_BODY) + SUPPORT.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(SUPPORT, WEAR_BODY) //clothing - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/medhud, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/mercenary/support, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/mercenary/support, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary/support, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.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/night/medhud, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/mercenary/support, WEAR_BODY) + 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/suit/storage/marine/veteran/mercenary/support, 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/helmet/marine/veteran/mercenary/support, 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/gas/pmc, WEAR_FACE) //storage items - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST) //backpack and stuff in it - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) //Line in vest. - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_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/device/defibrillator/upgraded, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_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/surgery/synthgraft, WEAR_IN_BACK) //Line in vest. + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, 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(new_human), WEAR_IN_BACK) //gun - spawn_merc_elite_weapon(H, 7, 0, 0) //no shotguns + spawn_merc_elite_weapon(new_human, 7, 0, 0) //no shotguns //*****************************************************************************************************/ @@ -474,30 +474,30 @@ . = ..() access = get_antagonist_pmc_access() -/datum/equipment_preset/other/elite_merc/leader/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/elite_merc/leader/load_gear(mob/living/carbon/human/new_human) //clothes - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/mercenary, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/mercenary, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/medhud, WEAR_EYES) + 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/under/marine/veteran/mercenary, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/mercenary, 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/helmet/marine/veteran/mercenary, 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/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/medhud, WEAR_EYES) //storage items - H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) //backpack and stuff in it - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/m15, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/packet/phosphorus/upp, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/elite_merc, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/m15, 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/packet/phosphorus/upp, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/elite_merc, WEAR_IN_BACK) //gun - spawn_merc_elite_weapon(H, 7, 25, 1) //lower shotgun chance, but not zero + spawn_merc_elite_weapon(new_human, 7, 25, 1) //lower shotgun chance, but not zero //*****************************************************************************************************/ @@ -514,14 +514,14 @@ . = ..() access = get_all_accesses() + get_all_centcom_access() -/datum/equipment_preset/other/business_person/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/business_person/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_if_possible(new /obj/item/clothing/under/lawyer/bluesuit, WEAR_BODY) - H.equip_if_possible(new /obj/item/clothing/shoes/centcom, WEAR_FEET) - H.equip_if_possible(new /obj/item/clothing/gloves/white, WEAR_HANDS) + new_human.equip_if_possible(new /obj/item/clothing/under/lawyer/bluesuit, WEAR_BODY) + new_human.equip_if_possible(new /obj/item/clothing/shoes/centcom, WEAR_FEET) + new_human.equip_if_possible(new /obj/item/clothing/gloves/white, WEAR_HANDS) - H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses, WEAR_EYES) - H.equip_if_possible(new /obj/item/clipboard, WEAR_WAIST) + new_human.equip_if_possible(new /obj/item/clothing/glasses/sunglasses, WEAR_EYES) + new_human.equip_if_possible(new /obj/item/clipboard, WEAR_WAIST) //*****************************************************************************************************/ @@ -532,19 +532,19 @@ skills = /datum/skills/pfc idtype = /obj/item/card/id/data -/datum/equipment_preset/other/compression_suit/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/compression_suit/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/space/compression, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/compression, WEAR_HEAD) - var /obj/item/tank/jetpack/J = new /obj/item/tank/jetpack/oxygen(H) - H.equip_to_slot_or_del(J, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/space/compression, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/compression, WEAR_HEAD) + var /obj/item/tank/jetpack/J = new /obj/item/tank/jetpack/oxygen(new_human) + new_human.equip_to_slot_or_del(J, WEAR_BACK) J.toggle() - H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/breath, WEAR_FACE) J.Topic(null, list("stat" = 1)) - spawn_merc_weapon(H) + spawn_merc_weapon(new_human) //*****************************************************************************************************/ @@ -564,35 +564,35 @@ . = ..() access = get_freelancer_access() -/datum/equipment_preset/other/pizza/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(MALE,FEMALE) +/datum/equipment_preset/other/pizza/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(MALE,FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name - if(H.gender == MALE) + if(new_human.gender == MALE) random_name = "[pick(first_names_male)] [pick(last_names)]" else random_name = "[pick(first_names_female)] [pick(last_names)]" - H.change_real_name(H, random_name) - H.age = rand(17,45) + new_human.change_real_name(new_human, random_name) + new_human.age = rand(17,45) -/datum/equipment_preset/other/pizza/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/pizza/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/clothing/under/pizza, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/soft/red, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/red, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/pizzabox/margherita, WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/dr_gibb, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/pizzabox/vegetable, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/pizzabox/mushroom, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/pizzabox/meat, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/dr_gibb, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/thirteenloko, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/pizza, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/red, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/red, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/pizzabox/margherita, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/dr_gibb, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/pizzabox/vegetable, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/pizzabox/mushroom, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/pizzabox/meat, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/dr_gibb, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/thirteenloko, WEAR_IN_BACK) /datum/equipment_preset/other/souto name = "Souto Man" @@ -609,28 +609,28 @@ . = ..() access = get_freelancer_access() -/datum/equipment_preset/other/souto/load_name(mob/living/carbon/human/H, randomise) - H.gender = MALE - H.change_real_name(H, "Souto Man") - H.age = 40 +/datum/equipment_preset/other/souto/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = MALE + new_human.change_real_name(new_human, "Souto Man") + new_human.age = 40 -/datum/equipment_preset/other/souto/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/souto/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/clothing/under/souto, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/souto, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/souto, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/souto, WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/fake_mustache, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/space/souto, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/souto, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/souto, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/souto, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/souto, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/souto, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/souto, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/souto, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/fake_mustache, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/space/souto, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/souto, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/souto, WEAR_WAIST) + 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/shoes/souto, WEAR_FEET) var/obj/vehicle/souto/super/V = new - V.forceMove(H.loc) - V.buckle_mob(H, H) + V.forceMove(new_human.loc) + V.buckle_mob(new_human, new_human) //*****************************************************************************************************/ @@ -643,45 +643,45 @@ faction = FACTION_ZOMBIE //Overloading the function to be able to spawn gear first -/datum/equipment_preset/other/zombie/load_preset(mob/living/carbon/human/H, randomise = FALSE) +/datum/equipment_preset/other/zombie/load_preset(mob/living/carbon/human/new_human, randomise = FALSE) if(randomise) - load_name(H) - load_skills(H) //skills are set before equipment because of skill restrictions on certain clothes. - load_languages(H) - load_gear(H) - load_id(H) - load_status(H) - load_vanity(H) - load_race(H)//Race is loaded last, otherwise we wouldn't be able to equip gear! - H.assigned_equipment_preset = src - H.regenerate_icons() - -/datum/equipment_preset/other/zombie/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(MALE, FEMALE) + load_name(new_human) + load_skills(new_human) //skills are set before equipment because of skill restrictions on certain clothes. + load_languages(new_human) + load_gear(new_human) + load_id(new_human) + load_status(new_human) + load_vanity(new_human) + load_race(new_human)//Race is loaded last, otherwise we wouldn't be able to equip gear! + new_human.assigned_equipment_preset = src + new_human.regenerate_icons() + +/datum/equipment_preset/other/zombie/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(MALE, FEMALE) var/datum/preferences/A = new - A.randomize_appearance(H) - var/random_name = capitalize(pick(H.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names)) - H.change_real_name(H, random_name) - H.age = rand(21,45) + A.randomize_appearance(new_human) + var/random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names)) + new_human.change_real_name(new_human, random_name) + new_human.age = rand(21,45) -/datum/equipment_preset/other/zombie/load_id(mob/living/carbon/human/H, client/mob_client) - var/obj/item/clothing/under/uniform = H.w_uniform +/datum/equipment_preset/other/zombie/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 uniform.sensor_faction = FACTION_COLONIST - H.job = "Zombie" - H.faction = faction + new_human.job = "Zombie" + new_human.faction = faction return ..() -/datum/equipment_preset/other/zombie/load_race(mob/living/carbon/human/H) - H.set_species(SPECIES_HUMAN) // Set back, so that we can get our claws again - H.set_species(SPECIES_ZOMBIE) +/datum/equipment_preset/other/zombie/load_race(mob/living/carbon/human/new_human) + new_human.set_species(SPECIES_HUMAN) // Set back, so that we can get our claws again + new_human.set_species(SPECIES_ZOMBIE) -/datum/equipment_preset/other/zombie/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/zombie/load_gear(mob/living/carbon/human/new_human) var/uniform_path = pick(/obj/item/clothing/under/colonist, /obj/item/clothing/under/colonist/ua_civvies, /obj/item/clothing/under/colonist/wy_davisone, /obj/item/clothing/under/colonist/wy_joliet_shopsteward, /obj/item/clothing/under/marine/ua_riot, /obj/item/clothing/under/suit_jacket/manager, /obj/item/clothing/under/suit_jacket/director) - H.equip_to_slot_or_del(new uniform_path, WEAR_BODY) + new_human.equip_to_slot_or_del(new uniform_path, WEAR_BODY) var/shoe_path = pick(/obj/item/clothing/shoes/laceup, /obj/item/clothing/shoes/leather, /obj/item/clothing/shoes/jackboots) - H.equip_to_slot_or_del(new shoe_path, WEAR_FEET) + new_human.equip_to_slot_or_del(new shoe_path, WEAR_FEET) //*****************************************************************************************************/ @@ -696,30 +696,30 @@ rank = FACTION_GLADIATOR faction = FACTION_GLADIATOR -/datum/equipment_preset/other/gladiator/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(MALE, FEMALE) +/datum/equipment_preset/other/gladiator/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(MALE, FEMALE) var/datum/preferences/A = new - A.randomize_appearance(H) - var/random_name = capitalize(pick(H.gender == MALE ? first_names_male_gladiator : first_names_female_gladiator)) - H.change_real_name(H, random_name) - H.age = rand(21,45) - -/datum/equipment_preset/other/gladiator/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/under/chainshirt/hunter, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/gladiator, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND) - H.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword, WEAR_L_HAND) - - var/obj/item/lantern = new /obj/item/device/flashlight/lantern(H) + A.randomize_appearance(new_human) + var/random_name = capitalize(pick(new_human.gender == MALE ? first_names_male_gladiator : first_names_female_gladiator)) + new_human.change_real_name(new_human, random_name) + new_human.age = rand(21,45) + +/datum/equipment_preset/other/gladiator/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/chainshirt/hunter, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/gladiator, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword, WEAR_L_HAND) + + var/obj/item/lantern = new /obj/item/device/flashlight/lantern(new_human) lantern.name = "Beacon of Holy Light" - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) - H.equip_to_slot_or_del(lantern, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) + new_human.equip_to_slot_or_del(lantern, WEAR_R_STORE) //*****************************************************************************************************/ @@ -730,22 +730,22 @@ assignment = "Samnite" rank = "Samnite" -/datum/equipment_preset/other/gladiator/champion/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/under/chainshirt/hunter, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/gladiator, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND) - H.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword, WEAR_L_HAND) - - var/obj/item/lantern = new /obj/item/device/flashlight/lantern(H) +/datum/equipment_preset/other/gladiator/champion/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/chainshirt/hunter, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/gladiator, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword, WEAR_L_HAND) + + var/obj/item/lantern = new /obj/item/device/flashlight/lantern(new_human) lantern.name = "Beacon of Holy Light" - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) - H.equip_to_slot_or_del(lantern, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) + new_human.equip_to_slot_or_del(lantern, WEAR_R_STORE) //*****************************************************************************************************/ @@ -756,22 +756,22 @@ assignment = "Spartacus" rank = "Spartacus" -/datum/equipment_preset/other/gladiator/leader/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/under/chainshirt/hunter, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/gladiator, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword, WEAR_L_HAND) - - var/obj/item/lantern = new /obj/item/device/flashlight/lantern(H) +/datum/equipment_preset/other/gladiator/leader/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/chainshirt/hunter, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/gladiator, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword, WEAR_L_HAND) + + var/obj/item/lantern = new /obj/item/device/flashlight/lantern(new_human) lantern.name = "Beacon of Holy Light" - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) - H.equip_to_slot_or_del(lantern, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) + new_human.equip_to_slot_or_del(lantern, WEAR_R_STORE) //*****************************************************************************************************/ @@ -791,53 +791,53 @@ . = ..() access = get_all_civilian_accesses() -/datum/equipment_preset/other/xeno_cultist/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain/cultist(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(H), WEAR_L_STORE) +/datum/equipment_preset/other/xeno_cultist/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain/cultist(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) - var/obj/item/clothing/suit/cultist_hoodie/hoodie = new /obj/item/clothing/suit/cultist_hoodie(H) + var/obj/item/clothing/suit/cultist_hoodie/hoodie = new /obj/item/clothing/suit/cultist_hoodie(new_human) hoodie.flags_item |= NODROP|DELONDROP - H.equip_to_slot_or_del(hoodie, WEAR_JACKET) + new_human.equip_to_slot_or_del(hoodie, WEAR_JACKET) - var/obj/item/clothing/head/cultist_hood/hood = new /obj/item/clothing/head/cultist_hood(H) + var/obj/item/clothing/head/cultist_hood/hood = new /obj/item/clothing/head/cultist_hood(new_human) hood.flags_item |= NODROP|DELONDROP - H.equip_to_slot_or_del(hood, WEAR_HEAD) + new_human.equip_to_slot_or_del(hood, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(H), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) //*****************************************************************************************************/ -/datum/equipment_preset/other/xeno_cultist/load_status(mob/living/carbon/human/H, hivenumber = XENO_HIVE_NORMAL) - if(SSticker.mode && H.mind) - SSticker.mode.xenomorphs += H.mind +/datum/equipment_preset/other/xeno_cultist/load_status(mob/living/carbon/human/new_human, hivenumber = XENO_HIVE_NORMAL) + if(SSticker.mode && new_human.mind) + SSticker.mode.xenomorphs += new_human.mind var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] if(hive) - H.faction = hive.internal_faction - if(hive.leading_cult_sl == H) + new_human.faction = hive.internal_faction + if(hive.leading_cult_sl == new_human) hive.leading_cult_sl = null - H.hivenumber = hivenumber + new_human.hivenumber = hivenumber - GLOB.xeno_cultists += H + GLOB.xeno_cultists += new_human var/list/huds_to_add = list(MOB_HUD_XENO_INFECTION, MOB_HUD_XENO_STATUS) for(var/hud_to_add in huds_to_add) var/datum/mob_hud/hud = huds[hud_to_add] - hud.add_hud_to(H) + hud.add_hud_to(new_human) var/list/actions_to_add = subtypesof(/datum/action/human_action/activable/cult) - if(istype(H.wear_suit, /obj/item/clothing/suit/cultist_hoodie) || istype(H.head, /obj/item/clothing/head/cultist_hood)) + if(istype(new_human.wear_suit, /obj/item/clothing/suit/cultist_hoodie) || istype(new_human.head, /obj/item/clothing/head/cultist_hood)) actions_to_add -= /datum/action/human_action/activable/cult/obtain_equipment for(var/action_to_add in actions_to_add) - give_action(H, action_to_add) + give_action(new_human, action_to_add) - H.default_lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE - H.update_sight() + new_human.default_lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + new_human.update_sight() /datum/equipment_preset/other/xeno_cultist/leader name = "Cultist - Xeno Cultist Leader" @@ -848,19 +848,19 @@ assignment = "Cultist Leader" rank = "Cultist Leader" -/datum/equipment_preset/other/xeno_cultist/leader/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/xeno_cultist/leader/load_gear(mob/living/carbon/human/new_human) . = ..() - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/cultist(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/cultist(new_human), WEAR_EYES) -/datum/equipment_preset/other/xeno_cultist/leader/load_status(mob/living/carbon/human/H) +/datum/equipment_preset/other/xeno_cultist/leader/load_status(mob/living/carbon/human/new_human) . = ..() - var/datum/hive_status/hive = GLOB.hive_datum[H.hivenumber] - hive.leading_cult_sl = H + var/datum/hive_status/hive = GLOB.hive_datum[new_human.hivenumber] + hive.leading_cult_sl = new_human var/list/types = subtypesof(/datum/action/human_action/activable/cult_leader) for(var/type in types) - give_action(H, type) + give_action(new_human, type) //*****************************************************************************************************/ @@ -872,27 +872,27 @@ idtype = /obj/item/card/id/dogtag uses_special_name = TRUE -/datum/equipment_preset/other/professor_dummy/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(MALE, FEMALE) - H.real_name = "Professor DUMMY the Medical Mannequin" - H.name = H.real_name - H.age = rand(1,5) +/datum/equipment_preset/other/professor_dummy/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(MALE, FEMALE) + new_human.real_name = "Professor DUMMY the Medical Mannequin" + new_human.name = new_human.real_name + new_human.age = rand(1,5) var/datum/preferences/A = new - A.randomize_appearance(H) + A.randomize_appearance(new_human) -/datum/equipment_preset/other/professor_dummy/load_race(mob/living/carbon/human/H) +/datum/equipment_preset/other/professor_dummy/load_race(mob/living/carbon/human/new_human) . = ..() //Can't hug the dummy! Otherwise it's basically human... - H.huggable = FALSE - H.mob_flags |= EASY_SURGERY //Nurses can practise surgery on it. + new_human.huggable = FALSE + new_human.mob_flags |= EASY_SURGERY //Nurses can practise surgery on it. -/datum/equipment_preset/other/professor_dummy/load_gear(mob/living/carbon/human/H) - var/obj/item/device/professor_dummy_tablet/tablet = new /obj/item/device/professor_dummy_tablet(H) - tablet.link_mob(H) - H.equip_to_slot_or_del(tablet, WEAR_R_HAND) +/datum/equipment_preset/other/professor_dummy/load_gear(mob/living/carbon/human/new_human) + var/obj/item/device/professor_dummy_tablet/tablet = new /obj/item/device/professor_dummy_tablet(new_human) + tablet.link_mob(new_human) + new_human.equip_to_slot_or_del(tablet, WEAR_R_HAND) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical, WEAR_BODY) //*****************************************************************************************************/ @@ -914,20 +914,20 @@ . = ..() access = get_antagonist_access() -/datum/equipment_preset/other/tank/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/tank/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/tanker(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/vc(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/tanker(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/tool/weldpack(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tank(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/tech/tanker(H), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/tanker(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/vc(new_human), WEAR_L_EAR) + 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/belt/gun/m4a3/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/tanker(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tank(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/tech/tanker(new_human), WEAR_HEAD) - spawn_weapon(/obj/item/weapon/gun/smg/m39, /obj/item/ammo_magazine/smg/m39/extended, H, 0, 3) + spawn_weapon(/obj/item/weapon/gun/smg/m39, /obj/item/ammo_magazine/smg/m39/extended, new_human, 0, 3) /datum/equipment_preset/other/tank/load_status() return @@ -961,13 +961,13 @@ ACCESS_MARINE_DELTA, ) -/datum/equipment_preset/other/tank/trainee/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/other/tank/trainee/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/tanker(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tank(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/tanker(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) + 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/pouch/general/large(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tank(new_human), WEAR_R_STORE) //*****************************************************************************************************/ diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm index 9ca1195aae6f..789d40f09706 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -15,19 +15,19 @@ access = get_all_accesses() + get_all_centcom_access() + get_antagonist_access() -/datum/equipment_preset/pmc/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(MALE,FEMALE) +/datum/equipment_preset/pmc/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(MALE,FEMALE) var/random_name var/first_name var/last_name var/datum/preferences/A = new() - A.randomize_appearance(H) - if(H.gender == MALE) + A.randomize_appearance(new_human) + if(new_human.gender == MALE) if(prob(10)) first_name = "[capitalize(randomly_generate_japanese_word(rand(2, 3)))]" else first_name = "[pick(first_names_male_pmc)]" - H.f_style = "5 O'clock Shadow" + new_human.f_style = "5 O'clock Shadow" else if(prob(10)) first_name = "[capitalize(randomly_generate_japanese_word(rand(2, 3)))]" @@ -38,16 +38,16 @@ else last_name = "[pick(last_names_pmc)]" random_name = "[first_name] [last_name]" - H.change_real_name(H, random_name) - H.age = rand(25,35) - H.h_style = "Shaved Head" - H.r_hair = 25 - H.g_hair = 25 - H.b_hair = 35 - -/datum/equipment_preset/pmc/load_id(mob/living/carbon/human/H, client/mob_client) + new_human.change_real_name(new_human, random_name) + new_human.age = rand(25,35) + new_human.h_style = "Shaved Head" + new_human.r_hair = 25 + new_human.g_hair = 25 + new_human.b_hair = 35 + +/datum/equipment_preset/pmc/load_id(mob/living/carbon/human/new_human, client/mob_client) if(human_versus_human) - var/obj/item/clothing/under/uniform = H.w_uniform + var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS uniform.sensor_faction = FACTION_PMC @@ -64,52 +64,52 @@ paygrade = "PMC-OP" skills = /datum/skills/pmc -/datum/equipment_preset/pmc/pmc_standard/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/pmc/pmc_standard/load_gear(mob/living/carbon/human/new_human) var/choice = rand(1,5) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) + new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) if(prob(50)) - H.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/suit/storage/marine/veteran/pmc, WEAR_JACKET) else - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light, 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/gas/pmc, WEAR_FACE) + + 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/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_ACCESSORY) + + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) switch(choice) if(1,2) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) if(3) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/nsg_ap, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/nsg23/extended, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/nsg23/extended, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/nsg_ap, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/nsg23/extended, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/nsg23/extended, WEAR_IN_BACK) if(4,5) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_rifle, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_rifle, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_BACK) /datum/equipment_preset/pmc/pmc_standard/get_antag_clothing_equipment() return list( @@ -139,17 +139,17 @@ list("M276 M40 Grenade Rig (Empty)", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, 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_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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("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), @@ -206,39 +206,39 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), paygrade = "PMC-EN" skills = /datum/skills/pmc -/datum/equipment_preset/pmc/pmc_detainer/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/pmc/pmc_detainer/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) + new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) if(prob(50)) - H.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/suit/storage/marine/veteran/pmc, WEAR_JACKET) else - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/tactical, WEAR_EYES) - - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/taser, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/corporate/detainer, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_rifle, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/box/zipcuffs/small, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flash, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light, 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/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/tactical, WEAR_EYES) + + 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/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_ACCESSORY) + + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/taser, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) + + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/corporate/detainer, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_rifle, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/zipcuffs/small, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flash, WEAR_IN_BACK) /datum/equipment_preset/pmc/pmc_detainer/get_antag_clothing_equipment() return list( @@ -268,17 +268,17 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig (Empty)", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, 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_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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("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), @@ -336,41 +336,41 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), skills = /datum/skills/pmc/medic headset_type = /obj/item/device/radio/headset/distress/pmc/medic -/datum/equipment_preset/pmc/pmc_medic/load_gear(mob/living/carbon/human/H) - - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) +/datum/equipment_preset/pmc/pmc_medic/load_gear(mob/living/carbon/human/new_human) + + new_human.equip_to_slot_or_del(new headset_type, 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/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/gas/pmc, WEAR_FACE) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - H.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/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39, WEAR_R_STORE) /datum/equipment_preset/pmc/pmc_medic/get_antag_clothing_equipment() return list( @@ -401,23 +401,23 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, 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("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medkit 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)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, 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("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -435,8 +435,8 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Essential Medic Set", 0, /obj/effect/essentials_set/medic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("FIELD SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_RECOMMENDED), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_RECOMMENDED), + 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("FIRSTAID KITS", 0, null, null, null), @@ -511,44 +511,44 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), skills = /datum/skills/pmc/medic/chem headset_type = /obj/item/device/radio/headset/distress/pmc/medic -/datum/equipment_preset/pmc/pmc_med_investigator/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/pmc/pmc_med_investigator/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new headset_type, 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/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/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, 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/device/defibrillator, WEAR_IN_BACK) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) - - H.equip_to_slot_or_del(new /obj/item/device/reagent_scanner, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medical, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/syringe/full, WEAR_R_STORE) - - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/reagent_container/syringe/counteragent, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/sedative, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) + 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/reagent_scanner, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) + + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/syringe/full, WEAR_R_STORE) + + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/syringe/counteragent, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/sedative, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) /datum/equipment_preset/pmc/pmc_med_investigator/get_antag_clothing_equipment() return list( @@ -579,23 +579,23 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, 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("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medkit 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)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, 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("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -613,8 +613,8 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Essential Medic Set", 0, /obj/effect/essentials_set/medic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("FIELD SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_RECOMMENDED), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_RECOMMENDED), + 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("FIRSTAID KITS", 0, null, null, null), @@ -691,44 +691,44 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), skills = /datum/skills/pmc/SL headset_type = /obj/item/device/radio/headset/distress/pmc/command -/datum/equipment_preset/pmc/pmc_leader/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/pmc/pmc_leader/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/leader, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/leader, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/leader, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES) - - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_BACK) - - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_BACK) - - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite, WEAR_J_STORE) - - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_rifle, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) - - var/obj/item/device/radio/headset/R = H.wear_l_ear + new_human.equip_to_slot_or_del(new headset_type, 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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES) + + 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/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_ACCESSORY) + + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_BACK) + + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_BACK) + + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite, WEAR_J_STORE) + + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_rifle, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) + + var/obj/item/device/radio/headset/R = new_human.wear_l_ear if(istype(R)) R.volume = RADIO_VOLUME_IMPORTANT @@ -759,19 +759,19 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + 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_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, 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("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), @@ -843,33 +843,33 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), skills = /datum/skills/pmc/SL/chem headset_type = /obj/item/device/radio/headset/distress/pmc/command -/datum/equipment_preset/pmc/pmc_lead_investigator/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/pmc/pmc_lead_investigator/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/leader, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/leader, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/leader, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/device/reagent_scanner, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_rifle, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new headset_type, 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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES) + 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/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/reagent_scanner, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_rifle, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) /datum/equipment_preset/pmc/pmc_lead_investigator/get_antag_clothing_equipment() return list( @@ -898,19 +898,19 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + 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_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, 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("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), @@ -981,27 +981,27 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), role_comm_title = "SG" skills = /datum/skills/pmc/smartgunner -/datum/equipment_preset/pmc/pmc_gunner/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/pmc/pmc_gunner/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner/veteran/pmc, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/gunner, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/cell/hyper, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/smartgun_powerpack/pmc, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/dirty, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/large/vp78, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/pmc/full, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles, WEAR_EYES) + new_human.equip_to_slot_or_del(new headset_type, 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/clothing/suit/storage/marine/smartgunner/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/gunner, 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/gas/pmc/leader, WEAR_FACE) + 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/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/cell/hyper, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack/pmc, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/dirty, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/large/vp78, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/pmc/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles, WEAR_EYES) /datum/equipment_preset/pmc/pmc_gunner/get_antag_clothing_equipment() return list( @@ -1021,17 +1021,17 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M280 Smartgunner Drum Belt", 0, /obj/item/storage/belt/marine/smartgunner, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, 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_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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("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), @@ -1088,36 +1088,36 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), skills = /datum/skills/pmc/specialist headset_type = /obj/item/device/radio/headset/distress/pmc/cct -/datum/equipment_preset/pmc/pmc_sniper/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/pmc/pmc_sniper/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/sniper, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/sniper, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles/m42c, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39/full/elite, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/sniper/elite, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sniper, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new headset_type, 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/clothing/suit/storage/marine/veteran/pmc/sniper, 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/sniper, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) + 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/glasses/night/m42_night_goggles/m42c, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39/full/elite, WEAR_WAIST) + 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/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/sniper/elite, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/elite, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sniper, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) /datum/equipment_preset/pmc/pmc_sniper/get_antag_clothing_equipment() return list( @@ -1144,17 +1144,17 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, 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_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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("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), @@ -1209,23 +1209,23 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), skills = /datum/skills/pmc/tank_crew headset_type = /obj/item/device/radio/headset/distress/pmc/cct -/datum/equipment_preset/pmc/pmc_crewman/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/tool/weldpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/leader, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tank, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39, WEAR_L_STORE) - - spawn_weapon(/obj/item/weapon/gun/smg/m39/elite, /obj/item/ammo_magazine/smg/m39/ap, H, 0, 0) +/datum/equipment_preset/pmc/pmc_crewman/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new headset_type, 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/under/marine/veteran/pmc, WEAR_BODY) + 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/glasses/welding/superior, 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/tool/weldpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_JACKET) + 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/storage/belt/gun/m4a3/vp78, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tank, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39, WEAR_L_STORE) + + spawn_weapon(/obj/item/weapon/gun/smg/m39/elite, /obj/item/ammo_magazine/smg/m39/ap, new_human, 0, 0) /datum/equipment_preset/pmc/pmc_crewman/get_antag_clothing_equipment() return list( @@ -1252,19 +1252,19 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + 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_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, 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("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), @@ -1339,38 +1339,38 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_XENOMORPH) headset_type = /obj/item/device/radio/headset/distress/pmc/command -/datum/equipment_preset/pmc/xeno_handler/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_ACCESSORY) - - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_WAIST) - - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) - - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) +/datum/equipment_preset/pmc/xeno_handler/load_gear(mob/living/carbon/human/new_human) + 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/mask/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new headset_type, 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/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_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/accessory/storage/black_vest, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_ACCESSORY) + + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) + + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_WAIST) + + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) /datum/equipment_preset/pmc/xeno_handler/get_antag_clothing_equipment() return list( @@ -1400,19 +1400,19 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + 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_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, 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("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), @@ -1484,37 +1484,37 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), skills = /datum/skills/pmc/doctor headset_type = /obj/item/device/radio/headset/distress/pmc/medic -/datum/equipment_preset/pmc/doctor/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/leader, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) +/datum/equipment_preset/pmc/doctor/load_gear(mob/living/carbon/human/new_human) + 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/mask/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new headset_type, 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/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) + 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/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, 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/surgery/synthgraft, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/pressurized_reagent_canister/oxycodone, WEAR_R_STORE) //surgery + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pressurized_reagent_canister/oxycodone, WEAR_R_STORE) //surgery /datum/equipment_preset/pmc/doctor/get_antag_clothing_equipment() @@ -1546,23 +1546,23 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, 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("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medkit 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)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, 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("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -1580,8 +1580,8 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Essential Medic Set", 0, /obj/effect/essentials_set/medic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("FIELD SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_RECOMMENDED), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_RECOMMENDED), + 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("FIRSTAID KITS", 0, null, null, null), @@ -1658,34 +1658,34 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), skills = /datum/skills/pmc/engineer headset_type = /obj/item/device/radio/headset/distress/pmc/cct -/datum/equipment_preset/pmc/technician/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest/brown_vest, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) - - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) - - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full, WEAR_R_STORE) +/datum/equipment_preset/pmc/technician/load_gear(mob/living/carbon/human/new_human) + 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/mask/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new headset_type, 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/clothing/accessory/storage/black_vest/brown_vest, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full, WEAR_WAIST) + 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/clothing/glasses/welding/superior, WEAR_EYES) + + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) + + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) + + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full, WEAR_R_STORE) /datum/equipment_preset/pmc/technician/get_antag_clothing_equipment() return list( @@ -1717,20 +1717,20 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, 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_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, 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_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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("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), @@ -1807,25 +1807,25 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), skills = /datum/skills/pmc/director headset_type = /obj/item/device/radio/headset/distress/pmc/command/director -/datum/equipment_preset/pmc/director/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/head/director, WEAR_HEAD) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/director, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/director, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/pmc, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) +/datum/equipment_preset/pmc/director/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/director, 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/under/suit_jacket/director, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/director, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/pmc, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable, WEAR_BACK) - var/obj/item/storage/pouch/pistol/command/command_pouch = new(H) + var/obj/item/storage/pouch/pistol/command/command_pouch = new(new_human) command_pouch.desc = replacetext(command_pouch.desc, "Captains", "corporate PMC directors") - H.equip_to_slot_or_del(command_pouch, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/device/cotablet/pmc(H), WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range(H), WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(command_pouch, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/cotablet/pmc(new_human), WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) - var/obj/item/device/radio/headset/R = H.wear_l_ear + var/obj/item/device/radio/headset/R = new_human.wear_l_ear if(istype(R)) R.volume = RADIO_VOLUME_CRITICAL @@ -1845,73 +1845,73 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), headset_type = /obj/item/device/radio/headset/distress/pmc/command -/datum/equipment_preset/pmc/synth/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(50;MALE,50;FEMALE) +/datum/equipment_preset/pmc/synth/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(50;MALE,50;FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name if(prob(10)) random_name = "[capitalize(randomly_generate_japanese_word(rand(2, 3)))]" - else if(H.gender == MALE) + else if(new_human.gender == MALE) random_name = "[pick(first_names_male_pmc)]" else random_name = "[pick(first_names_female_pmc)]" - if(H.gender == MALE) - H.f_style = "5 O'clock Shadow" - - H.change_real_name(H, random_name) - H.r_hair = 15 - H.g_hair = 15 - H.b_hair = 25 - H.r_eyes = 139 - H.g_eyes = 62 - H.b_eyes = 19 - -/datum/equipment_preset/pmc/synth/load_race(mob/living/carbon/human/H) - H.set_species(SYNTH_GEN_THREE) - -/datum/equipment_preset/pmc/synth/load_skills(mob/living/carbon/human/H) - H.set_skills(/datum/skills/synthetic) - H.allow_gun_usage = FALSE - -/datum/equipment_preset/pmc/synth/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET) - - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) - H.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/experimental_mesons, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/white, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_BACK) - new /obj/item/clothing/suit/auto_cpr(H.back) - - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/nailgun/compact, WEAR_J_STORE) - - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_R_STORE) + if(new_human.gender == MALE) + new_human.f_style = "5 O'clock Shadow" + + new_human.change_real_name(new_human, random_name) + new_human.r_hair = 15 + new_human.g_hair = 15 + new_human.b_hair = 25 + new_human.r_eyes = 139 + new_human.g_eyes = 62 + new_human.b_eyes = 19 + +/datum/equipment_preset/pmc/synth/load_race(mob/living/carbon/human/new_human) + new_human.set_species(SYNTH_GEN_THREE) + +/datum/equipment_preset/pmc/synth/load_skills(mob/living/carbon/human/new_human) + new_human.set_skills(/datum/skills/synthetic) + new_human.allow_gun_usage = FALSE + +/datum/equipment_preset/pmc/synth/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/surg_vest/equipped, WEAR_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/tool/surgery/synthgraft, 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 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) + + 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/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/ammo_magazine/smg/nailgun, WEAR_IN_BACK) + new /obj/item/clothing/suit/auto_cpr(new_human.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/pouch/tools/tactical, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_R_STORE) /datum/equipment_preset/pmc/synth/get_antag_clothing_equipment() return list( @@ -1950,27 +1950,27 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 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("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Document Pouch", 0, /obj/item/storage/pouch/document, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Oxycodone)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/oxycodone, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Machete Pouch (Full)", 0, /obj/item/storage/pouch/machete/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, 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("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, 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 (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, 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 (Oxycodone)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/oxycodone, 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("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Machete Pouch (Full)", 0, /obj/item/storage/pouch/machete/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), ) @@ -1980,8 +1980,8 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Essential Medic Set", 0, /obj/effect/essentials_set/medic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("FIELD SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_RECOMMENDED), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_RECOMMENDED), + 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("FIRSTAID KITS", 0, null, null, null), diff --git a/code/modules/gear_presets/survivors.dm b/code/modules/gear_presets/survivors.dm index 5c0815137465..d29498ee9f89 100644 --- a/code/modules/gear_presets/survivors.dm +++ b/code/modules/gear_presets/survivors.dm @@ -18,23 +18,23 @@ var/survivor_variant = CIVILIAN_SURVIVOR -/datum/equipment_preset/survivor/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(MALE, FEMALE) +/datum/equipment_preset/survivor/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(MALE, FEMALE) var/datum/preferences/A = new - A.randomize_appearance(H) - var/random_name = capitalize(pick(H.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names)) - H.change_real_name(H, random_name) - H.age = rand(21,45) - -/datum/equipment_preset/survivor/load_gear(mob/living/carbon/human/H) // Essentially where you will put the most essential piece of kit you want survivors to spawn with. - add_random_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(H), WEAR_IN_BACK) - add_survivor_weapon_pistol(H) - -/datum/equipment_preset/survivor/load_id(mob/living/carbon/human/H, client/mob_client) - var/obj/item/clothing/under/uniform = H.w_uniform + A.randomize_appearance(new_human) + var/random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names)) + new_human.change_real_name(new_human, random_name) + new_human.age = rand(21,45) + +/datum/equipment_preset/survivor/load_gear(mob/living/carbon/human/new_human) // Essentially where you will put the most essential piece of kit you want survivors to spawn with. + add_random_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) + 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/stack/sheet/metal/med_small_stack(new_human), WEAR_IN_BACK) + add_survivor_weapon_pistol(new_human) + +/datum/equipment_preset/survivor/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 uniform.sensor_faction = FACTION_COLONIST @@ -53,22 +53,22 @@ survivor_variant = SCIENTIST_SURVIVOR -/datum/equipment_preset/survivor/scientist/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(H), WEAR_BODY) +/datum/equipment_preset/survivor/scientist/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/virologist(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/green(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/chem(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/green(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/paper/research_notes/good(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/full(H), WEAR_R_STORE) - add_survivor_weapon_civilian(H) - add_random_survivor_research_gear(H) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/virologist(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/green(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) + 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/chem(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/green(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/good(new_human), WEAR_IN_JACKET) + 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/medical/full(new_human), WEAR_R_STORE) + add_survivor_weapon_civilian(new_human) + add_random_survivor_research_gear(new_human) ..() @@ -76,14 +76,14 @@ name = "Survivor - Sorokyne Strata Researcher" assignment = "Sorokyne Strata Researcher" -/datum/equipment_preset/survivor/scientist/soro/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/tox(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(H), WEAR_JACKET) +/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(new_human), WEAR_FACE) + 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/head/ushanka(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(new_human), WEAR_JACKET) ..() @@ -91,14 +91,14 @@ name = "Survivor - Shivas Snowball Researcher" assignment = "Shivas Snowball Researcher" -/datum/equipment_preset/survivor/scientist/shiva/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/tox(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/purple(H), WEAR_JACKET) +/datum/equipment_preset/survivor/scientist/shiva/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) + 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/gloves/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/purple(new_human), WEAR_JACKET) ..() @@ -106,10 +106,10 @@ name = "Survivor - CORSAT Researcher" assignment = "CORSAT Researcher" -/datum/equipment_preset/survivor/scientist/corsat/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/researcher(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), WEAR_FEET) +/datum/equipment_preset/survivor/scientist/corsat/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/researcher(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) ..() @@ -117,15 +117,15 @@ name = "Survivor - Florina Researcher" assignment = "Florina Researcher" -/datum/equipment_preset/survivor/scientist/florina/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/purple(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/chem(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), WEAR_FEET) +/datum/equipment_preset/survivor/scientist/florina/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/purple(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) + 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/chem(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) ..() @@ -133,14 +133,14 @@ name = "Survivor - LV-624 Archeologist" assignment = "LV-624 Archeologist" -/datum/equipment_preset/survivor/scientist/lv/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/researcher(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) +/datum/equipment_preset/survivor/scientist/lv/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/researcher(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) + 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(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) ..() @@ -148,14 +148,14 @@ name = "Survivor - Solaris Scientist" assignment = "Solaris Scientist" -/datum/equipment_preset/survivor/scientist/solaris/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/virologist(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/green(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/green(H), WEAR_FEET) +/datum/equipment_preset/survivor/scientist/solaris/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/virologist(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/green(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) + 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/clothing/shoes/green(new_human), WEAR_FEET) ..() @@ -171,29 +171,29 @@ survivor_variant = MEDICAL_SURVIVOR -/datum/equipment_preset/survivor/doctor/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), WEAR_BODY) +/datum/equipment_preset/survivor/doctor/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/med(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), WEAR_JACKET) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/med(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) var/random_gear = rand(0,4) switch(random_gear) if(0) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_R_STORE) if(1) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/full(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/full(new_human), WEAR_R_STORE) if(2) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE) if(3) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/first_responder/full(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/first_responder/full(new_human), WEAR_R_STORE) if(4) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced(H), WEAR_R_STORE) - add_random_survivor_medical_gear(H) - add_survivor_weapon_civilian(H) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced(new_human), WEAR_R_STORE) + add_random_survivor_medical_gear(new_human) + add_survivor_weapon_civilian(new_human) ..() @@ -202,9 +202,9 @@ name = "Survivor - Trijent Doctor" assignment = "Trijent Dam Doctor" -/datum/equipment_preset/survivor/doctor/trijent/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/blue(H), WEAR_HEAD) +/datum/equipment_preset/survivor/doctor/trijent/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/blue(new_human), WEAR_HEAD) ..() @@ -212,10 +212,10 @@ name = "Survivor - Sorokyne Strata Doctor" assignment = "Sorokyne Strata Doctor" -/datum/equipment_preset/survivor/doctor/soro/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(H), WEAR_HEAD) +/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) ..() @@ -223,9 +223,9 @@ name = "Survivor - CORSAT Doctor" assignment = "CORSAT Doctor" -/datum/equipment_preset/survivor/doctor/corsat/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(H), WEAR_HEAD) +/datum/equipment_preset/survivor/doctor/corsat/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(new_human), WEAR_HEAD) ..() @@ -233,9 +233,9 @@ name = "Survivor - Florina Doctor" assignment = "Florina Doctor" -/datum/equipment_preset/survivor/doctor/florina/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(H), WEAR_HEAD) +/datum/equipment_preset/survivor/doctor/florina/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) ..() @@ -243,15 +243,15 @@ name = "Survivor - Kutjevo Doctor" assignment = "Kutjevo Doctor" -/datum/equipment_preset/survivor/doctor/kutjevo/load_gear(mob/living/carbon/human/H) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) +/datum/equipment_preset/survivor/doctor/kutjevo/load_gear(mob/living/carbon/human/new_human) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) - add_random_kutjevo_survivor_uniform(H) - add_random_kutjevo_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) + add_random_kutjevo_survivor_uniform(new_human) + add_random_kutjevo_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) ..() @@ -259,10 +259,10 @@ name = "Survivor - LV-624 Emergency Medical Technician" assignment = "LV-624 Emergency Medical Technician" -/datum/equipment_preset/survivor/doctor/lv/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(H.back), WEAR_IN_BACK) +/datum/equipment_preset/survivor/doctor/lv/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human.back), WEAR_IN_BACK) ..() @@ -270,9 +270,9 @@ name = "Survivor - Solaris Doctor" assignment = "Solaris Doctor" -/datum/equipment_preset/survivor/doctor/solaris/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/purple(H), WEAR_HEAD) +/datum/equipment_preset/survivor/doctor/solaris/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/purple(new_human), WEAR_HEAD) ..() @@ -280,13 +280,13 @@ name = "Survivor - Shivas Snowball Doctor" assignment = "Shivas Snowball Doctor" -/datum/equipment_preset/survivor/doctor/shiva/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/green(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(H), WEAR_FACE) +/datum/equipment_preset/survivor/doctor/shiva/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/green(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(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/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) ..() @@ -304,24 +304,24 @@ survivor_variant = CORPORATE_SURVIVOR -/datum/equipment_preset/survivor/corporate/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(H), WEAR_BODY) +/datum/equipment_preset/survivor/corporate/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - add_random_cl_survivor_loot(H) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(H), WEAR_FEET) - add_survivor_weapon_civilian(H) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/document(H), WEAR_R_STORE) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(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/storage/backpack/satchel(new_human), WEAR_BACK) + add_random_cl_survivor_loot(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(new_human), WEAR_FEET) + add_survivor_weapon_civilian(new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/document(new_human), WEAR_R_STORE) ..() -/datum/equipment_preset/survivor/corporate/load_rank(mob/living/carbon/human/H) - if(H.client) - var/playtime = get_job_playtime(H.client, JOB_CORPORATE_LIAISON) - if(H.client.prefs.playtime_perks) +/datum/equipment_preset/survivor/corporate/load_rank(mob/living/carbon/human/new_human) + if(new_human.client) + var/playtime = get_job_playtime(new_human.client, JOB_CORPORATE_LIAISON) + if(new_human.client.prefs.playtime_perks) if(playtime > JOB_PLAYTIME_TIER_4) return "WYC5" else if(playtime > JOB_PLAYTIME_TIER_3) @@ -336,13 +336,13 @@ name = "Survivor - Shivas Snowball Corporate Liaison" assignment = "Shivas Snowball Corporate Liaison" -/datum/equipment_preset/survivor/corporate/shiva/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/navy(H), WEAR_JACKET) +/datum/equipment_preset/survivor/corporate/shiva/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(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/clothing/suit/storage/snow_suit/survivor/parka/navy(new_human), WEAR_JACKET) ..() @@ -358,33 +358,33 @@ survivor_variant = SECURITY_SURVIVOR -/datum/equipment_preset/survivor/security/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), WEAR_BODY) +/datum/equipment_preset/survivor/security/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), WEAR_HEAD) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + add_ice_colony_survivor_equipment(new_human) + 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/clothing/head/helmet(new_human), WEAR_HEAD) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine(H), WEAR_R_STORE) - add_survivor_weapon_security(H) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(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(new_human), WEAR_R_STORE) + add_survivor_weapon_security(new_human) ..() /datum/equipment_preset/survivor/security/trijent name = "Survivor - Trijent Security Guard" assignment = "Trijent Dam Security Guard" -/datum/equipment_preset/survivor/security/trijent/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_security/navyblue(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/mpcap(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit/black(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) +/datum/equipment_preset/survivor/security/trijent/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_security/navyblue(new_human), WEAR_BODY) + 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/head/beret/marine/mp/mpcap(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit/black(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) ..() @@ -392,14 +392,14 @@ name = "Survivor - Sorokyne Strata Security" assignment = "Sorokyne Strata Security" -/datum/equipment_preset/survivor/security/soro/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) +/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(new_human), WEAR_JACKET) + 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/shoes/marine/upp(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) ..() @@ -408,16 +408,16 @@ assignment = "Weyland-Yutani Security Guard" languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) -/datum/equipment_preset/survivor/security/corsat/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/formal/servicedress(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(H), WEAR_HEAD) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) +/datum/equipment_preset/survivor/security/corsat/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/formal/servicedress(new_human), WEAR_BODY) + 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/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) ..() @@ -425,13 +425,13 @@ name = "Survivor - Florina Prison Guard" assignment = "Florina Prison Guard" -/datum/equipment_preset/survivor/security/florina/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) +/datum/equipment_preset/survivor/security/florina/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(new_human), WEAR_BODY) + 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/clothing/head/helmet(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) ..() @@ -440,13 +440,13 @@ assignment = "Kutjevo Security Guard" -/datum/equipment_preset/survivor/security/kutjevo/load_gear(mob/living/carbon/human/H) - add_random_kutjevo_survivor_uniform(H) - add_random_kutjevo_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) +/datum/equipment_preset/survivor/security/kutjevo/load_gear(mob/living/carbon/human/new_human) + add_random_kutjevo_survivor_uniform(new_human) + add_random_kutjevo_survivor_equipment(new_human) + 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/shoes/marine/knife(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/shoes/jackboots(new_human), WEAR_FEET) ..() @@ -455,12 +455,12 @@ assignment = "Weyland-Yutani Security Guard" languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) -/datum/equipment_preset/survivor/security/lv/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/formal/servicedress(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle(H), WEAR_FEET) +/datum/equipment_preset/survivor/security/lv/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/formal/servicedress(new_human), WEAR_BODY) + 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/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle(new_human), WEAR_FEET) ..() @@ -468,14 +468,14 @@ name = "Survivor - Shivas Snowball Security Guard" assignment = "United Americas Peacekeeper" -/datum/equipment_preset/survivor/security/shiva/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) +/datum/equipment_preset/survivor/security/shiva/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) + 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/mask/rebreather/scarf(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(new_human), WEAR_HEAD) + 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/clothing/shoes/marine/knife(new_human), WEAR_FEET) ..() @@ -483,13 +483,13 @@ name = "Survivor - Solaris United Americas Peacekeepers" assignment = "United Americas Peacekeeper" -/datum/equipment_preset/survivor/security/solaris/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec/hos(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) +/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) + 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(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec/hos(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) ..() @@ -504,16 +504,16 @@ survivor_variant = SECURITY_SURVIVOR -/datum/equipment_preset/survivor/prisoner/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(H), WEAR_BODY) +/datum/equipment_preset/survivor/prisoner/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - if(prob(50)) H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), WEAR_HEAD) - if(prob(50)) H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H.back), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(H), WEAR_R_STORE) - add_survivor_weapon_civilian(H) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + if(prob(50)) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(new_human), WEAR_HEAD) + if(prob(50)) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human.back), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) + add_survivor_weapon_civilian(new_human) ..() /datum/equipment_preset/survivor/gangleader @@ -523,16 +523,16 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/survivor/gangleader/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(H), WEAR_BODY) +/datum/equipment_preset/survivor/gangleader/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/under/color/orange(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - if(prob(50)) H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), WEAR_HEAD) - if(prob(50)) H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H.back), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - add_survivor_weapon_civilian(H) + add_ice_colony_survivor_equipment(new_human) + if(prob(50)) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(new_human), WEAR_HEAD) + if(prob(50)) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human.back), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + add_survivor_weapon_civilian(new_human) ..() // ----- Civilian Survivor @@ -544,41 +544,41 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/survivor/civilian/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/survivor/civilian/load_gear(mob/living/carbon/human/new_human) var/random_gear = rand(0, 3) switch(random_gear) if(0) // Normal Colonist - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) if(1) // Janitor - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/janitor(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/vir(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/soft/purple(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/purple(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/galoshes(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/janitor(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/vir(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/purple(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/purple(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/galoshes(new_human), WEAR_FEET) if(2) // Bar Tender - H.equip_to_slot_or_del(new /obj/item/clothing/under/waiter(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/lawyer/bluejacket(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/bowlerhat(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/fake_mustache(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/beer_pack(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/waiter(new_human), WEAR_BODY) + 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/suit/storage/lawyer/bluejacket(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bowlerhat(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/fake_mustache(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/black(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/beer_pack(new_human.back), WEAR_IN_BACK) if(3) // Botanist - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/hyd(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/tool/hatchet(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/hyd(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/tool/hatchet(new_human.back), WEAR_IN_BACK) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general(H), WEAR_R_STORE) - add_survivor_weapon_civilian(H) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general(new_human), WEAR_R_STORE) + add_survivor_weapon_civilian(new_human) ..() @@ -591,16 +591,16 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/survivor/chef/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(H), WEAR_BODY) +/datum/equipment_preset/survivor/chef/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/chef(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/tool/kitchen/rollingpin(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general(H), WEAR_R_STORE) - add_survivor_weapon_civilian(H) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/chef(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/tool/kitchen/rollingpin(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general(new_human), WEAR_R_STORE) + add_survivor_weapon_civilian(new_human) ..() @@ -613,16 +613,16 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/survivor/chaplain/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(H), WEAR_BODY) +/datum/equipment_preset/survivor/chaplain/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/holidaypriest(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/bible/booze(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general(H), WEAR_R_STORE) - add_survivor_weapon_civilian(H) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/holidaypriest(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/bible/booze(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general(new_human), WEAR_R_STORE) + add_survivor_weapon_civilian(new_human) ..() @@ -630,10 +630,10 @@ name = "Survivor - Trijent Chaplain" assignment = "Trijent Chaplain" -/datum/equipment_preset/survivor/chaplain/trijent/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/nun(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/nun_hood(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/holidaypriest(H), WEAR_JACKET) +/datum/equipment_preset/survivor/chaplain/trijent/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/nun(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/nun_hood(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/holidaypriest(new_human), WEAR_JACKET) ..() @@ -641,11 +641,11 @@ name = "Survivor - Kutjevo Chaplain" assignment = "Kutjevo Chaplain" -/datum/equipment_preset/survivor/chaplain/kutjevo/load_gear(mob/living/carbon/human/H) - add_random_kutjevo_survivor_uniform(H) - add_random_kutjevo_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) +/datum/equipment_preset/survivor/chaplain/kutjevo/load_gear(mob/living/carbon/human/new_human) + add_random_kutjevo_survivor_uniform(new_human) + add_random_kutjevo_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) ..() @@ -653,10 +653,10 @@ name = "Survivor - LV-624 Priest" assignment = "LV-624 Priest" -/datum/equipment_preset/survivor/chaplain/lv/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/priest_robe(H), WEAR_JACKET) +/datum/equipment_preset/survivor/chaplain/lv/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/priest_robe(new_human), WEAR_JACKET) ..() @@ -664,9 +664,9 @@ name = "Survivor - Solaris Chaplain" assignment = "Solaris Chaplain" -/datum/equipment_preset/survivor/chaplain/solaris/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/holidaypriest(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/nun_hood(H), WEAR_HEAD) +/datum/equipment_preset/survivor/chaplain/solaris/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/holidaypriest(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/nun_hood(new_human), WEAR_HEAD) ..() @@ -681,18 +681,18 @@ survivor_variant = ENGINEERING_SURVIVOR -/datum/equipment_preset/survivor/engineer/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(H), WEAR_BODY) +/datum/equipment_preset/survivor/engineer/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/med_small_stack(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - add_survivor_weapon_civilian(H) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank(new_human), WEAR_IN_BACK) + 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/clothing/glasses/welding(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + add_survivor_weapon_civilian(new_human) ..() @@ -701,12 +701,12 @@ name = "Survivor - Dam Maintenance Technician" assignment = "Dam Maintenance Technician" -/datum/equipment_preset/survivor/engineer/trijent/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) +/datum/equipment_preset/survivor/engineer/trijent/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) ..() @@ -715,12 +715,12 @@ name = "Survivor - LV-624 Engineer" assignment = "LV-624 Engineer" -/datum/equipment_preset/survivor/engineer/lv/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/dispatch(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(H), WEAR_HEAD) +/datum/equipment_preset/survivor/engineer/lv/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/dispatch(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + 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) ..() @@ -728,13 +728,13 @@ name = "Survivor - Shivas Snowball Engineer" assignment = "Shivas Snowball Engineer" -/datum/equipment_preset/survivor/engineer/shiva/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/yellow(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(H), WEAR_HEAD) +/datum/equipment_preset/survivor/engineer/shiva/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/yellow(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + 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/mask/rebreather/scarf(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) ..() @@ -742,13 +742,13 @@ name = "Survivor - Sorokyne Strata Political Prisioner" assignment = "Sorokyne Strata Political Prisioner" -/datum/equipment_preset/survivor/engineer/soro/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(H), WEAR_FACE) +/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) + 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/marine/upp(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) ..() @@ -756,12 +756,12 @@ name = "Survivor - Hydro Electric Engineer" assignment = "Hydro Electric Engineer" -/datum/equipment_preset/survivor/engineer/trijent/hydro/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(H), WEAR_HEAD) +/datum/equipment_preset/survivor/engineer/trijent/hydro/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + 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(new_human), WEAR_HEAD) ..() @@ -769,11 +769,11 @@ name = "Survivor - Corsat Station Engineer" assignment = "Corsat Station Engineer" -/datum/equipment_preset/survivor/engineer/corsat/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/techofficer(H), WEAR_HEAD) +/datum/equipment_preset/survivor/engineer/corsat/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/techofficer(new_human), WEAR_HEAD) ..() @@ -781,12 +781,12 @@ name = "Survivor - Florina Engineer" assignment = "Florina Engineer" -/datum/equipment_preset/survivor/engineer/florina/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/white(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(H), WEAR_HEAD) +/datum/equipment_preset/survivor/engineer/florina/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/color/white(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + 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) ..() @@ -794,12 +794,12 @@ name = "Survivor - Kutjevo Engineer" assignment = "Kutjevo Engineer" -/datum/equipment_preset/survivor/engineer/kutjevo/load_gear(mob/living/carbon/human/H) - add_random_kutjevo_survivor_uniform(H) - add_random_kutjevo_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(H), WEAR_BACK) +/datum/equipment_preset/survivor/engineer/kutjevo/load_gear(mob/living/carbon/human/new_human) + add_random_kutjevo_survivor_uniform(new_human) + add_random_kutjevo_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(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/storage/backpack/satchel/eng(new_human), WEAR_BACK) ..() @@ -807,11 +807,11 @@ name = "Survivor - Solaris Engineer" assignment = "Solaris Engineer" -/datum/equipment_preset/survivor/engineer/solaris/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/soft/yellow(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(H), WEAR_BACK) +/datum/equipment_preset/survivor/engineer/solaris/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/yellow(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) ..() @@ -824,16 +824,16 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_LOGISTICS) -/datum/equipment_preset/survivor/miner/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/miner(H), WEAR_BODY) +/datum/equipment_preset/survivor/miner/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/miner(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/tool/pickaxe(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(H), WEAR_R_STORE) - add_survivor_weapon_civilian(H) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/tool/pickaxe(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) + add_survivor_weapon_civilian(new_human) ..() @@ -847,15 +847,15 @@ idtype = /obj/item/card/id/data access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/survivor/salesman/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(H), WEAR_BODY) +/datum/equipment_preset/survivor/salesman/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) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/wcoat(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/document(H), WEAR_R_STORE) - add_random_cl_survivor_loot(H) - add_survivor_weapon_civilian(H) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/wcoat(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/document(new_human), WEAR_R_STORE) + add_random_cl_survivor_loot(new_human) + add_survivor_weapon_civilian(new_human) ..() // ---- Trucker Survivor @@ -869,17 +869,17 @@ survivor_variant = ENGINEERING_SURVIVOR -/datum/equipment_preset/survivor/trucker/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/overalls(H), WEAR_BODY) +/datum/equipment_preset/survivor/trucker/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/overalls(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/clothing/head/soft/yellow(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/hardpoint/locomotion/van_wheels(H), WEAR_R_HAND) - add_survivor_weapon_civilian(H) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/yellow(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/hardpoint/locomotion/van_wheels(new_human), WEAR_R_HAND) + add_survivor_weapon_civilian(new_human) ..() @@ -887,12 +887,12 @@ name = "Survivor - LV-624 Cargo Technician" assignment = "LV-624 Cargo Technician" -/datum/equipment_preset/survivor/trucker/lv/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargo(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/soft/yellow(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) +/datum/equipment_preset/survivor/trucker/lv/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargo(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/yellow(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) ..() @@ -900,12 +900,12 @@ name = "Survivor - Kutjevo Heavy Vehicle Operator" assignment = "Kutjevo Heavy Vehicle Operator" -/datum/equipment_preset/survivor/trucker/kutjevo/load_gear(mob/living/carbon/human/H) - add_random_kutjevo_survivor_uniform(H) - add_random_kutjevo_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) +/datum/equipment_preset/survivor/trucker/kutjevo/load_gear(mob/living/carbon/human/new_human) + add_random_kutjevo_survivor_uniform(new_human) + add_random_kutjevo_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(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/storage/backpack/satchel(new_human), WEAR_BACK) ..() @@ -914,11 +914,11 @@ assignment = "Solaris Heavy Vehicle Operator" skills = /datum/skills/civilian/survivor/trucker -/datum/equipment_preset/survivor/trucker/solaris/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/worker_overalls(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/soft/red(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big(H), WEAR_EYES) +/datum/equipment_preset/survivor/trucker/solaris/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/worker_overalls(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/red(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big(new_human), WEAR_EYES) ..() @@ -927,12 +927,12 @@ assignment = "Trijent Dam Heavy Vehicle Operator" skills = /datum/skills/civilian/survivor/trucker -/datum/equipment_preset/survivor/trucker/trijent/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank(H), WEAR_IN_BACK) +/datum/equipment_preset/survivor/trucker/trijent/load_gear(mob/living/carbon/human/new_human) + 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/gloves/black(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank(new_human), WEAR_IN_BACK) ..() @@ -959,20 +959,20 @@ survivor_variant = SECURITY_SURVIVOR -/datum/equipment_preset/survivor/colonial_marshal/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(H), WEAR_BODY) +/datum/equipment_preset/survivor/colonial_marshal/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(H), WEAR_HEAD) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + add_ice_colony_survivor_equipment(new_human) + 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/head/CMB(new_human), WEAR_HEAD) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large(H), WEAR_R_STORE) - add_survivor_weapon_security(H) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large(new_human), WEAR_R_STORE) + add_survivor_weapon_security(new_human) ..() @@ -980,14 +980,14 @@ name = "Survivor - United Americas Riot Officer" assignment = "United Americas Riot Officer" -/datum/equipment_preset/survivor/colonial_marshal/florina/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), WEAR_FEET) +/datum/equipment_preset/survivor/colonial_marshal/florina/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) + 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/storage/marine/veteran/ua_riot(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) ..() @@ -995,11 +995,11 @@ name = "Survivor - LV-624 Head of Security" assignment = "LV-624 Head of Security" -/datum/equipment_preset/survivor/colonial_marshal/lv/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_security/navyblue(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec/hos(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) +/datum/equipment_preset/survivor/colonial_marshal/lv/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_security/navyblue(new_human), WEAR_BODY) + 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/head/beret/sec/hos(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) ..() @@ -1007,11 +1007,11 @@ name = "Survivor - Solaris Colonial Marshal Deputy" assignment = "CMB Deputy" -/datum/equipment_preset/survivor/colonial_marshal/solaris/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) +/datum/equipment_preset/survivor/colonial_marshal/solaris/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(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/shoes/marine/knife(new_human), WEAR_FEET) ..() @@ -1019,10 +1019,10 @@ name = "Survivor - Kutjevo Colonial Marshal Deputy" assignment = "CMB Deputy" -/datum/equipment_preset/survivor/colonial_marshal/kutjevo/load_gear(mob/living/carbon/human/H) - add_random_kutjevo_survivor_uniform(H) - add_random_kutjevo_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) +/datum/equipment_preset/survivor/colonial_marshal/kutjevo/load_gear(mob/living/carbon/human/new_human) + add_random_kutjevo_survivor_uniform(new_human) + add_random_kutjevo_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) ..() @@ -1030,14 +1030,14 @@ name = "Survivor - Shivas Colonial Marshal Deputy" assignment = "CMB Deputy" -/datum/equipment_preset/survivor/colonial_marshal/shiva/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/corp(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/red(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) +/datum/equipment_preset/survivor/colonial_marshal/shiva/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/corp(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/red(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) + 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/gloves/white(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) ..() @@ -1055,18 +1055,18 @@ survivor_variant = CORPORATE_SURVIVOR -/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(H), WEAR_BODY) +/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/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) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/document(H), WEAR_R_STORE) - add_survivor_weapon_civilian(H) - add_random_cl_survivor_loot(H) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(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/shoes/centcom(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/document(new_human), WEAR_R_STORE) + add_survivor_weapon_civilian(new_human) + add_random_cl_survivor_loot(new_human) ..() @@ -1074,10 +1074,10 @@ name = "Survivor - Interstellar Commerce Commission Liaison CORSAT" assignment = "Interstellar Commerce Commission Corporate Liaison" -/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/corsat/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), WEAR_JACKET) +/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/corsat/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) @@ -1092,18 +1092,18 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/survivor/roughneck/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/white(H), WEAR_BODY) +/datum/equipment_preset/survivor/roughneck/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/color/white(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/centcom(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large(H), WEAR_R_STORE) - add_pmc_survivor_weapon(H) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(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/mask/rebreather/scarf/tacticalmask/green(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/centcom(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(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) ..() @@ -1116,17 +1116,17 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_COMMAND) -/datum/equipment_preset/survivor/interstellar_human_rights_observer/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/suspenders(H), WEAR_BODY) +/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/suspenders(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - add_random_cl_survivor_loot(H) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(H), WEAR_HEAD) - add_survivor_weapon_civilian(H) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/document(H), WEAR_R_STORE) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + add_random_cl_survivor_loot(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) + add_survivor_weapon_civilian(new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/document(new_human), WEAR_R_STORE) ..() @@ -1135,9 +1135,9 @@ assignment = "Interstellar Human Rights Observer(Sorokyne)" -/datum/equipment_preset/survivor/interstellar_human_rights_observer/soro/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(H), WEAR_HEAD) +/datum/equipment_preset/survivor/interstellar_human_rights_observer/soro/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) ..() @@ -1155,27 +1155,27 @@ survivor_variant = SECURITY_SURVIVOR -/datum/equipment_preset/survivor/goon/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) +/datum/equipment_preset/survivor/goon/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, 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/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88_near_empty, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) + 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/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack(new_human), WEAR_IN_BACK) + 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) + 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/firstaid/full, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(H), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) /datum/equipment_preset/survivor/pmc name = "Survivor - PMC" @@ -1189,17 +1189,17 @@ languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND) -/datum/equipment_preset/survivor/pmc/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/hvh, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - add_pmc_survivor_weapon(H) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(H), WEAR_R_STORE) +/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) + 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/satchel, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) ..() @@ -1226,21 +1226,21 @@ survivor_variant = CORPORATE_SURVIVOR -/datum/equipment_preset/survivor/wy/manager/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/survivor/wy/manager/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/manager(H), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/manager(new_human), WEAR_BODY) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/manager(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/manager(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/paper/research_notes/good(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(H), WEAR_R_STORE) - add_pmc_survivor_weapon(H) - add_random_cl_survivor_loot(H) + 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/clothing/suit/storage/manager(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress, WEAR_FEET) + 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/paper/research_notes/good(new_human), WEAR_IN_JACKET) + 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) + add_pmc_survivor_weapon(new_human) + add_random_cl_survivor_loot(new_human) ..() @@ -1255,12 +1255,12 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/survivor/pmc/miner/one/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/mercenary/miner, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/mercenary/miner, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(H), WEAR_R_STORE) - add_pmc_survivor_weapon(H) +/datum/equipment_preset/survivor/pmc/miner/one/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/mercenary/miner, WEAR_BODY) + 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) ..() @@ -1271,17 +1271,17 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/survivor/pmc/freelancer/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/survivor/pmc/freelancer/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - spawn_merc_helmet(H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(H), WEAR_R_STORE) - add_pmc_survivor_weapon(H) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/freelancer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET) + 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/pmc, WEAR_HANDS) + spawn_merc_helmet(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/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) ..() @@ -1297,22 +1297,22 @@ access = list(ACCESS_CIVILIAN_PUBLIC) survivor_variant = HOSTILE_SURVIVOR -/datum/equipment_preset/survivor/clf/load_gear(mob/living/carbon/human/H) - - spawn_rebel_uniform(H) - spawn_rebel_suit(H) - spawn_rebel_helmet(H) - spawn_rebel_shoes(H) - spawn_rebel_gloves(H) - spawn_rebel_belt(H) - - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flashlight(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(H), WEAR_R_STORE) - add_survivor_weapon_security(H) - add_survivor_weapon_pistol(H) +/datum/equipment_preset/survivor/clf/load_gear(mob/living/carbon/human/new_human) + + spawn_rebel_uniform(new_human) + spawn_rebel_suit(new_human) + spawn_rebel_helmet(new_human) + spawn_rebel_shoes(new_human) + spawn_rebel_gloves(new_human) + spawn_rebel_belt(new_human) + + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) + add_survivor_weapon_security(new_human) + add_survivor_weapon_pistol(new_human) ..() diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 5e785d381e3a..50c2edfea3eb 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -11,26 +11,26 @@ . = ..() access = get_all_accesses() -/datum/equipment_preset/synth/load_race(mob/living/carbon/human/H) - if(H.client?.prefs?.synthetic_type) - H.set_species(H.client.prefs.synthetic_type) +/datum/equipment_preset/synth/load_race(mob/living/carbon/human/new_human) + if(new_human.client?.prefs?.synthetic_type) + new_human.set_species(new_human.client.prefs.synthetic_type) return - H.set_species(SYNTH_GEN_THREE) + new_human.set_species(SYNTH_GEN_THREE) -/datum/equipment_preset/synth/load_name(mob/living/carbon/human/H, randomise) +/datum/equipment_preset/synth/load_name(mob/living/carbon/human/new_human, randomise) var/final_name = "David" - if(H.client && H.client.prefs) - final_name = H.client.prefs.synthetic_name + if(new_human.client && new_human.client.prefs) + final_name = new_human.client.prefs.synthetic_name if(!final_name || final_name == "Undefined") final_name = "David" - H.change_real_name(H, final_name) + new_human.change_real_name(new_human, final_name) -/datum/equipment_preset/synth/load_skills(mob/living/carbon/human/H) +/datum/equipment_preset/synth/load_skills(mob/living/carbon/human/new_human) . = ..() - if(iscolonysynthetic(H) && !isworkingjoe(H)) - H.set_skills(/datum/skills/colonial_synthetic) + if(iscolonysynthetic(new_human) && !isworkingjoe(new_human)) + new_human.set_skills(/datum/skills/colonial_synthetic) - H.allow_gun_usage = FALSE + new_human.allow_gun_usage = FALSE //*****************************************************************************************************/ @@ -44,17 +44,17 @@ paygrade = "SYN" role_comm_title = "Syn" -/datum/equipment_preset/synth/uscm/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/synth/uscm/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/industrial - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + 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 back_item(new_human), WEAR_BACK) //*****************************************************************************************************/ @@ -68,17 +68,17 @@ paygrade = "SYN" role_comm_title = "Syn" -/datum/equipment_preset/synth/uscm/councillor/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/synth/uscm/councillor/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/industrial - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/councillor(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/councillor(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + 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 back_item(new_human), WEAR_BACK) //*****************************************************************************************************/ @@ -86,19 +86,19 @@ name = "WO Support Synthetic" flags = EQUIPMENT_PRESET_START_OF_ROUND_WO -/datum/equipment_preset/synth/uscm/wo/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/synth/uscm/wo/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/cm(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/RO(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest/brown_vest(H), WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/tan(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(H), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/cm(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/RO(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + 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/clothing/accessory/storage/black_vest/brown_vest(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/tan(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE) //*****************************************************************************************************/ @@ -124,35 +124,35 @@ var/survivor_variant = CIVILIAN_SURVIVOR -/datum/equipment_preset/synth/survivor/load_race(mob/living/carbon/human/H) +/datum/equipment_preset/synth/survivor/load_race(mob/living/carbon/human/new_human) //Switch to check client for synthetic generation preference, and set the subspecies of colonial synth var/generation_selection = SYNTH_COLONY_GEN_ONE - if(H.client?.prefs?.synthetic_type) - generation_selection = H.client.prefs.synthetic_type + if(new_human.client?.prefs?.synthetic_type) + generation_selection = new_human.client.prefs.synthetic_type switch(generation_selection) if(SYNTH_GEN_THREE) - H.set_species(SYNTH_COLONY) + new_human.set_species(SYNTH_COLONY) if(SYNTH_GEN_TWO) - H.set_species(SYNTH_COLONY_GEN_TWO) + new_human.set_species(SYNTH_COLONY_GEN_TWO) if(SYNTH_GEN_ONE) - H.set_species(SYNTH_COLONY_GEN_ONE) + new_human.set_species(SYNTH_COLONY_GEN_ONE) else - H.set_species(SYNTH_COLONY) + new_human.set_species(SYNTH_COLONY) /datum/equipment_preset/synth/survivor/New() . = ..() access = get_all_civilian_accesses() + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH + ACCESS_WY_CORPORATE //Access to civillians stuff + medbay stuff + engineering stuff + research -/datum/equipment_preset/synth/survivor/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/synth/survivor/load_gear(mob/living/carbon/human/new_human) for(var/equipment in equipment_to_spawn) var/equipment_path = islist(equipment_to_spawn[equipment]) ? pick(equipment_to_spawn[equipment]) : equipment_to_spawn[equipment] - H.equip_to_slot_or_del(new equipment_path(H), equipment) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/synth/full(H), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new equipment_path(new_human), equipment) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/synth/full(new_human), WEAR_L_STORE) -/datum/equipment_preset/synth/survivor/load_id(mob/living/carbon/human/H, client/mob_client) - var/obj/item/clothing/under/uniform = H.w_uniform +/datum/equipment_preset/synth/survivor/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 uniform.sensor_faction = FACTION_COLONIST @@ -241,9 +241,9 @@ survivor_variant = ENGINEERING_SURVIVOR -/datum/equipment_preset/synth/survivor/corporate_synth/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/synth/survivor/corporate_synth/load_gear(mob/living/carbon/human/new_human) ..() - add_random_cl_survivor_loot(H) + add_random_cl_survivor_loot(new_human) /datum/equipment_preset/synth/survivor/janitor_synth name = "Survivor - Synthetic - Janitor Synth" @@ -467,48 +467,48 @@ . = ..() access = get_all_accesses() -/datum/equipment_preset/synth/working_joe/load_race(mob/living/carbon/human/H) - H.set_species(SYNTH_WORKING_JOE) +/datum/equipment_preset/synth/working_joe/load_race(mob/living/carbon/human/new_human) + new_human.set_species(SYNTH_WORKING_JOE) -/datum/equipment_preset/synth/working_joe/load_vanity(mob/living/carbon/human/H) +/datum/equipment_preset/synth/working_joe/load_vanity(mob/living/carbon/human/new_human) return -/datum/equipment_preset/synth/working_joe/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/joe(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/electronics(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/reagent_container/spray/cleaner(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/spray/cleaner(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/glass/bucket(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/mop(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/wet_sign(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/bag/trash(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/bag/trash(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/device/lightreplacer(H.back), WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/maintenance_jack(H), WEAR_J_STORE) - -/datum/equipment_preset/synth/working_joe/load_race(mob/living/carbon/human/H) +/datum/equipment_preset/synth/working_joe/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/joe(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/electronics(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/spray/cleaner(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/spray/cleaner(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/bucket(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/mop(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/wet_sign(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/bag/trash(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/bag/trash(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/device/lightreplacer(new_human.back), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/maintenance_jack(new_human), WEAR_J_STORE) + +/datum/equipment_preset/synth/working_joe/load_race(mob/living/carbon/human/new_human) . = ..() - H.h_style = "Bald" - H.f_style = "Shaved" + new_human.h_style = "Bald" + new_human.f_style = "Shaved" if(prob(5)) - H.h_style = "Shoulder-length Hair" //Added the chance of hair as per Monkeyfist lore accuracy - H.r_eyes = 0 - H.g_eyes = 0 - H.b_eyes = 0 - H.r_hair = 100 - H.g_hair = 88 - H.b_hair = 74 - H.r_facial = 255 - H.g_facial = 255 - H.b_facial = 255 - -/datum/equipment_preset/synth/working_joe/load_name(mob/living/carbon/human/H, randomise) - H.change_real_name(H, "Working Joe #[rand(100)][rand(100)]") + new_human.h_style = "Shoulder-length Hair" //Added the chance of hair as per Monkeyfist lore accuracy + new_human.r_eyes = 0 + new_human.g_eyes = 0 + new_human.b_eyes = 0 + new_human.r_hair = 100 + new_human.g_hair = 88 + new_human.b_hair = 74 + new_human.r_facial = 255 + new_human.g_facial = 255 + new_human.b_facial = 255 + +/datum/equipment_preset/synth/working_joe/load_name(mob/living/carbon/human/new_human, randomise) + new_human.change_real_name(new_human, "Working Joe #[rand(100)][rand(100)]") //*****************************************************************************************************/ @@ -516,27 +516,27 @@ name = "Cultist - Xeno Cultist Synthetic" faction = FACTION_XENOMORPH -/datum/equipment_preset/synth/survivor/cultist_synth/load_gear(mob/living/carbon/human/H) +/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 - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/medic - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain/cultist(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_suture_and_graft(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(H), WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/weapon/baton(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(H), WEAR_L_EAR) - - var/obj/item/clothing/head/cultist_hood/hood = new /obj/item/clothing/head/cultist_hood(H) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain/cultist(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_suture_and_graft(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human), WEAR_IN_BELT) + 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/storage/pouch/tools/full(new_human), WEAR_R_STORE) + 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/weapon/baton(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(new_human), WEAR_L_EAR) + + var/obj/item/clothing/head/cultist_hood/hood = new /obj/item/clothing/head/cultist_hood(new_human) hood.flags_item |= NODROP|DELONDROP - H.equip_to_slot_or_del(hood, WEAR_HEAD) + new_human.equip_to_slot_or_del(hood, WEAR_HEAD) //*****************************************************************************************************/ @@ -544,36 +544,36 @@ name = "Fun - Xeno Cultist Midwife (Synthetic)" faction = FACTION_XENOMORPH -/datum/equipment_preset/synth/survivor/midwife/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/synth/survivor/midwife/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/medic - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/joe(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_suture_and_graft(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(H), WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/xenos(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/collectable/xenom(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/weapon/baton(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(H), WEAR_L_EAR) - - -/datum/equipment_preset/synth/survivor/midwife/load_name(mob/living/carbon/human/H, randomise) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/joe(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_suture_and_graft(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human), WEAR_IN_BELT) + 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/storage/pouch/tools/full(new_human), WEAR_R_STORE) + 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/clothing/suit/xenos(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/collectable/xenom(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(new_human), WEAR_L_EAR) + + +/datum/equipment_preset/synth/survivor/midwife/load_name(mob/living/carbon/human/new_human, randomise) var/final_name = "Midwife Joe" - if(H.client && H.client.prefs) - final_name = H.client.prefs.synthetic_name + if(new_human.client && new_human.client.prefs) + final_name = new_human.client.prefs.synthetic_name if(!final_name || final_name == "Undefined") //In case they don't have a name set or no prefs, there's a name. final_name = "Midwife Joe" else - final_name = "Midwife [H.real_name]" - H.change_real_name(H, final_name) + final_name = "Midwife [new_human.real_name]" + new_human.change_real_name(new_human, final_name) //*****************************************************************************************************/ @@ -591,56 +591,56 @@ . = ..() access = get_all_accesses() -/datum/equipment_preset/synth/infiltrator/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(MALE,FEMALE) +/datum/equipment_preset/synth/infiltrator/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(MALE,FEMALE) var/random_name var/first_name var/last_name var/datum/preferences/A = new() - A.randomize_appearance(H) - if(H.gender == MALE) + A.randomize_appearance(new_human) + if(new_human.gender == MALE) first_name = "[pick(first_names_male_colonist)]" else first_name ="[pick(first_names_female_colonist)]" last_name ="[pick(last_names_colonist)]" random_name = "[first_name] [last_name]" - H.change_real_name(H, random_name) + new_human.change_real_name(new_human, random_name) var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) var/hair_color = pick(hair_colors) - H.r_hair = hair_colors[hair_color][1] - H.g_hair = hair_colors[hair_color][2] - H.b_hair = hair_colors[hair_color][3] - H.r_facial = hair_colors[hair_color][1] - H.g_facial = hair_colors[hair_color][2] - H.b_facial = hair_colors[hair_color][3] + new_human.r_hair = hair_colors[hair_color][1] + new_human.g_hair = hair_colors[hair_color][2] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] var/eye_color = pick(colors) - H.r_eyes = colors[eye_color][1] - H.g_eyes = colors[eye_color][2] - H.b_eyes = colors[eye_color][3] - -/datum/equipment_preset/synth/infiltrator/load_race(mob/living/carbon/human/H) - H.set_species(SYNTH_INFILTRATOR) - -/datum/equipment_preset/synth/infiltrator/load_skills(mob/living/carbon/human/H) - H.set_skills(/datum/skills/infiltrator_synthetic) - H.allow_gun_usage = TRUE - -/datum/equipment_preset/synth/infiltrator/load_gear(mob/living/carbon/human/H) - add_random_synth_infiltrator_equipment(H) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/stack/nanopaste(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/stack/nanopaste(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/stack/nanopaste(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/handcuffs/zip(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/tranquilizer(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/weapon/butterfly(H), WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/device/flashlight(H), WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/weapon/chloroform(H), WEAR_IN_L_STORE) + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] + +/datum/equipment_preset/synth/infiltrator/load_race(mob/living/carbon/human/new_human) + new_human.set_species(SYNTH_INFILTRATOR) + +/datum/equipment_preset/synth/infiltrator/load_skills(mob/living/carbon/human/new_human) + new_human.set_skills(/datum/skills/infiltrator_synthetic) + new_human.allow_gun_usage = TRUE + +/datum/equipment_preset/synth/infiltrator/load_gear(mob/living/carbon/human/new_human) + add_random_synth_infiltrator_equipment(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/stack/nanopaste(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/tranquilizer(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/butterfly(new_human), WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/chloroform(new_human), WEAR_IN_L_STORE) //*****************************************************************************************************/ diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 7f09303fe003..00d8f126bdb5 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -9,20 +9,20 @@ . = ..() access = get_antagonist_access() -/datum/equipment_preset/upp/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(60;MALE,40;FEMALE) +/datum/equipment_preset/upp/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(60;MALE,40;FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name var/first_name var/last_name //gender checks - if(H.gender == MALE) + if(new_human.gender == MALE) if(prob(40)) first_name = "[capitalize(randomly_generate_chinese_word(1))]" else first_name = "[pick(first_names_male_upp)]" - H.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") + new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") else if(prob(40)) first_name = "[capitalize(randomly_generate_chinese_word(1))]" @@ -36,22 +36,22 @@ //put them together random_name = "[first_name] [last_name]" - H.change_real_name(H, random_name) - H.age = rand(17,35) - H.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Bun, Topknot") + new_human.change_real_name(new_human, random_name) + new_human.age = rand(17,35) + new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Bun, Topknot") var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) var/hair_color = pick(hair_colors) - H.r_hair = hair_colors[hair_color][1] - H.g_hair = hair_colors[hair_color][2] - H.b_hair = hair_colors[hair_color][3] - H.r_facial = hair_colors[hair_color][1] - H.g_facial = hair_colors[hair_color][2] - H.b_facial = hair_colors[hair_color][3] + new_human.r_hair = hair_colors[hair_color][1] + new_human.g_hair = hair_colors[hair_color][2] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] var/eye_color = pick(colors) - H.r_eyes = colors[eye_color][1] - H.g_eyes = colors[eye_color][2] - H.b_eyes = colors[eye_color][3] + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] idtype = /obj/item/card/id/dogtag //*****************************************************************************************************/ @@ -66,97 +66,97 @@ role_comm_title = "Sol" paygrade = "UE1" -/datum/equipment_preset/upp/soldier/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/soldier/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD) //body var/obj/item/clothing/under/marine/veteran/UPP/UPP = new() - H.equip_to_slot_or_del(UPP, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(UPP, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_JACKET) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.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/shoes/marine/upp, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) - load_upp_soldier(H, UPP) + load_upp_soldier(new_human, UPP) -/datum/equipment_preset/upp/soldier/proc/load_upp_soldier(mob/living/carbon/human/H, obj/item/clothing/under/marine/veteran/UPP/UPP) +/datum/equipment_preset/upp/soldier/proc/load_upp_soldier(mob/living/carbon/human/new_human, obj/item/clothing/under/marine/veteran/UPP/UPP) var/percentage = rand(1, 100) switch(percentage) //most UPP are rifleman, most others are breachers, some have both primaries. if(1 to 66) - load_upp_rifleman(H, UPP) + load_upp_rifleman(new_human, UPP) if(67 to 85) - load_upp_breacher(H, UPP) + load_upp_breacher(new_human, UPP) else - load_upp_double(H, UPP) + load_upp_double(new_human, UPP) -/datum/equipment_preset/upp/soldier/proc/load_upp_rifleman(mob/living/carbon/human/H) +/datum/equipment_preset/upp/soldier/proc/load_upp_rifleman(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //.75 - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //1.5 - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) //2.25 - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) //3.25 - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) //4.25 + 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) //.75 + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //1.5 + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) //2.25 + new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) //3.25 + new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) //4.25 //body - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/rifleman, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/rifleman, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/upp/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/upp/full, WEAR_WAIST) //rpocket - H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_R_STORE) //lpocket - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) -/datum/equipment_preset/upp/soldier/proc/load_upp_breacher(mob/living/carbon/human/H) +/datum/equipment_preset/upp/soldier/proc/load_upp_breacher(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //.75 - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //1.5 - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) //2.25 - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) //3.25 - H.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) //4.25 + 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) //.75 + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //1.5 + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) //2.25 + new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) //3.25 + new_human.equip_to_slot_or_del(new /obj/item/storage/box/m94, WEAR_IN_BACK) //4.25 //waist var/gunbelt = prob(50) ? /obj/item/storage/belt/gun/type47/NY : /obj/item/storage/belt/gun/type47/PK9 - H.equip_to_slot_or_del(new gunbelt, WEAR_WAIST) - pick_ammotype(H) + new_human.equip_to_slot_or_del(new gunbelt, WEAR_WAIST) + pick_ammotype(new_human) -/datum/equipment_preset/upp/soldier/proc/pick_ammotype(mob/living/carbon/human/H) +/datum/equipment_preset/upp/soldier/proc/pick_ammotype(mob/living/carbon/human/new_human) var/percentage = rand(1, 100) switch(percentage) if(1 to 33) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/breacher, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavybuck, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavybuck, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/breacher, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavybuck, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavybuck, WEAR_R_STORE) if(34 to 66) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/breacher/slug, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyslug, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyslug, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/breacher/slug, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyslug, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyslug, WEAR_R_STORE) else - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/breacher/flechette, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyflechette, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyflechette, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/breacher/flechette, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyflechette, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavyflechette, WEAR_R_STORE) -/datum/equipment_preset/upp/soldier/proc/load_upp_double(mob/living/carbon/human/H, obj/item/clothing/under/marine/veteran/UPP/UPP) +/datum/equipment_preset/upp/soldier/proc/load_upp_double(mob/living/carbon/human/new_human, obj/item/clothing/under/marine/veteran/UPP/UPP) //back var/rifle = prob(50) ? /obj/item/weapon/gun/rifle/type71/dual : /obj/item/weapon/gun/rifle/type71/carbine/dual - H.equip_to_slot_or_del(new rifle, WEAR_BACK) + new_human.equip_to_slot_or_del(new rifle, WEAR_BACK) //body - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/dual, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/dual, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/upp/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/upp/full, WEAR_WAIST) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavybuck, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/heavybuck, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) /datum/equipment_preset/upp/soldier/get_antag_clothing_equipment() return list( @@ -177,16 +177,16 @@ 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_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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), @@ -248,44 +248,44 @@ role_comm_title = "Med" paygrade = "UE3M" -/datum/equipment_preset/upp/medic/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/medic/load_gear(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) //1 - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) //2 - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) //2.33 - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3 - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3.33 + 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 + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) //2 + new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) //2.33 + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3 + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3.33 //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/medic, WEAR_L_EAR) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/medic, 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap, WEAR_HEAD) //body - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/medic, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/skorpion/upp/medic, WEAR_J_STORE) + 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/suit/storage/marine/faction/UPP, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/skorpion/upp/medic, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.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/shoes/marine/upp, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) //póckets var/obj/item/storage/pouch/magazine/pistol/large/ppouch = new() - H.equip_to_slot_or_del(ppouch, WEAR_R_STORE) + new_human.equip_to_slot_or_del(ppouch, WEAR_R_STORE) for(var/i = 1 to ppouch.storage_slots) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/skorpion, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medical, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/tricordrazine, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/skorpion, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/tricordrazine, WEAR_IN_L_STORE) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) /datum/equipment_preset/upp/medic/get_antag_clothing_equipment() return list( @@ -307,19 +307,19 @@ list("Type 41 Lifesaver Bag", 0, /obj/item/storage/belt/medical/lifesaver/upp/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch (Utilities)", 0, /obj/item/storage/pouch/medical/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + 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_RECOMMENDED), + 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_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch (Utilities)", 0, /obj/item/storage/pouch/medical/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit 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), @@ -341,8 +341,8 @@ list("Essential Medic Set", 0, /obj/effect/essentials_set/medic/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("FIELD SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_RECOMMENDED), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_RECOMMENDED), + 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("FIRSTAID KITS", 0, null, null, null), @@ -417,38 +417,38 @@ role_comm_title = "Sap" paygrade = "UE3S" -/datum/equipment_preset/upp/sapper/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/sapper/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 - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //.33 - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //.66 - H.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK) //1.66 - H.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) //2.66 + 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) //.33 + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //.66 + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK) //1.66 + new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) //2.66 //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/cct, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/cct, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas, WEAR_FACE) //head var/headgear = prob(70) ? /obj/item/clothing/head/helmet/marine/veteran/UPP/engi : /obj/item/clothing/head/uppcap/ushanka - H.equip_to_slot_or_del(new headgear, WEAR_HEAD) + new_human.equip_to_slot_or_del(new headgear, WEAR_HEAD) //body var/obj/item/clothing/under/marine/veteran/UPP/engi/UPP = new() var/obj/item/clothing/accessory/storage/black_vest/tool_webbing/W = new() - UPP.attach_accessory(H, W) - H.equip_to_slot_or_del(UPP, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/sapper, WEAR_J_STORE) + UPP.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(UPP, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/sapper, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/upp/sapper(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/upp/sapper(new_human), WEAR_WAIST) //limb - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/insulated(H), WEAR_HANDS) - H.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/insulated(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_R_STORE) /datum/equipment_preset/upp/sapper/get_antag_clothing_equipment() return list( @@ -472,18 +472,18 @@ list("Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (Choose 2)", 0, null, null, null), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + 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_RECOMMENDED), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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 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("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + 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("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -551,45 +551,45 @@ role_comm_title = "Spc" paygrade = "UE5" -/datum/equipment_preset/upp/specialist/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/specialist/load_gear(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) //1 - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //1.33 - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //1.66 - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) //2 - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) //2.33 - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) //2.66 + 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 + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //1.33 + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //1.66 + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) //2 + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) //2.33 + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) //2.66 //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP/heavy, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP/heavy, WEAR_HEAD) //body var/obj/item/clothing/under/marine/veteran/UPP/UPP = new() - H.equip_to_slot_or_del(UPP, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/heavy, WEAR_JACKET) + new_human.equip_to_slot_or_del(UPP, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/heavy, WEAR_JACKET) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.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/shoes/marine/upp, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) var/obj/item/device/internal_implant/subdermal_armor/implant = new() - implant.on_implanted(H) + implant.on_implanted(new_human) //body var/obj/item/clothing/accessory/storage/black_vest/W = new() - UPP.attach_accessory(H, W) + UPP.attach_accessory(new_human, W) for(var/i in 1 to W.hold.storage_slots) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/dragon, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/dragon, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath, WEAR_IN_JACKET) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/NY, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/NY, WEAR_WAIST) /datum/equipment_preset/upp/specialist/get_antag_clothing_equipment() return list( @@ -610,16 +610,16 @@ 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_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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), @@ -680,41 +680,41 @@ role_comm_title = "Spc" paygrade = "UE5" -/datum/equipment_preset/upp/minigunner/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/minigunner/load_gear(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) //1 - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //1.33 - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //1.66 - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) //2 - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) //2.33 - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) //2.66 + 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 + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //1.33 + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //1.66 + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) //2 + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) //2.33 + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) //2.66 //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP/heavy, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP/heavy, WEAR_HEAD) //body var/obj/item/clothing/under/marine/veteran/UPP/UPP = new() - H.equip_to_slot_or_del(UPP, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/heavy, WEAR_JACKET) + new_human.equip_to_slot_or_del(UPP, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/heavy, WEAR_JACKET) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.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/shoes/marine/upp, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) var/obj/item/device/internal_implant/subdermal_armor/implant = new() - implant.on_implanted(H) + implant.on_implanted(new_human) //body - H.equip_to_slot_or_del(new /obj/item/weapon/gun/minigun/upp, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/minigun/upp, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/minigun, WEAR_IN_JACKET) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/NY/shrapnel, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/NY/shrapnel, WEAR_WAIST) /datum/equipment_preset/upp/minigunner/get_antag_clothing_equipment() return list( @@ -735,16 +735,16 @@ 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_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, 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), @@ -805,37 +805,37 @@ role_comm_title = "SL" paygrade = "UE6" -/datum/equipment_preset/upp/leader/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/leader/load_gear(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/jima, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/jima, WEAR_BACK) //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR) //head - H.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/head/uppcap/beret, WEAR_HEAD) //body var/obj/item/clothing/under/marine/veteran/UPP/UPP = new() var/obj/item/clothing/accessory/storage/webbing/W = new() - UPP.attach_accessory(H, W) - H.equip_to_slot_or_del(UPP, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/heavy, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/flamer, WEAR_J_STORE) + UPP.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(UPP, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/heavy, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/flamer, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/NY/shrapnel, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/NY/shrapnel, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.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/shoes/marine/upp, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/flamertank, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flamertank, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) /datum/equipment_preset/upp/leader/get_antag_clothing_equipment() return list( @@ -857,18 +857,18 @@ list("Type 41 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + 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("Medkit 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), @@ -902,8 +902,8 @@ list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("MEDICAL SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), + 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), @@ -958,37 +958,37 @@ role_comm_title = "MP" paygrade = "UE6" -/datum/equipment_preset/upp/military_police/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/military_police/load_gear(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/upp, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/upp, WEAR_FACE) //head - H.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/head/uppcap/beret, WEAR_HEAD) //uniform var/obj/item/clothing/under/marine/veteran/UPP/mp/M = new() var/obj/item/clothing/accessory/storage/webbing/W = new() - M.attach_accessory(H, W) - H.equip_to_slot_or_del(M, WEAR_BODY) + M.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(M, WEAR_BODY) for(var/i in 1 to W.hold.storage_slots) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_ACCESSORY) //jacket - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/mp, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/flamer, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/mp, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/flamer, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/UPP/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/UPP/full, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.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/shoes/marine/upp, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_R_STORE) /datum/equipment_preset/upp/military_police/get_antag_clothing_equipment() return list( @@ -1011,18 +1011,18 @@ list("Type 43 Military Police Rig", 0, /obj/item/storage/belt/security/MP/UPP/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + 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("Medkit 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), @@ -1056,8 +1056,8 @@ list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("MEDICAL SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), + 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), @@ -1112,44 +1112,44 @@ role_comm_title = "Lt." paygrade = "UO1" -/datum/equipment_preset/upp/officer/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/officer/load_gear(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/megaphone, WEAR_IN_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) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/megaphone, WEAR_IN_BACK) //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR) //head - H.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/head/uppcap/beret, WEAR_HEAD) //uniform var/obj/item/clothing/under/marine/veteran/UPP/officer/M = new() var/obj/item/clothing/accessory/storage/webbing/W = new() - M.attach_accessory(H, W) - H.equip_to_slot_or_del(M, WEAR_BODY) + M.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(M, WEAR_BODY) for(var/i in 1 to W.hold.storage_slots) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/heap, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/heap, WEAR_IN_ACCESSORY) //jacket - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/officer, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/flamer/leader, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/officer, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/flamer/leader, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/NY, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/NY, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.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/shoes/marine/upp, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) /datum/equipment_preset/upp/officer/get_antag_clothing_equipment() return list( @@ -1174,18 +1174,18 @@ list("Type 47 Pistol Holster Rig NY", 0, /obj/item/storage/belt/gun/type47/NY, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + 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("Medkit 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), @@ -1219,8 +1219,8 @@ list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("MEDICAL SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), + 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), @@ -1272,44 +1272,44 @@ role_comm_title = "Sr-Lt." paygrade = "UO1E" -/datum/equipment_preset/upp/officer/senior/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/officer/senior/load_gear(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/megaphone, WEAR_IN_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) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/megaphone, WEAR_IN_BACK) //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR) //head - H.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/head/uppcap/beret, WEAR_HEAD) //uniform var/obj/item/clothing/under/marine/veteran/UPP/officer/M = new() var/obj/item/clothing/accessory/storage/webbing/W = new() - M.attach_accessory(H, W) - H.equip_to_slot_or_del(M, WEAR_BODY) + M.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(M, WEAR_BODY) for(var/i in 1 to W.hold.storage_slots) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/heap, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/heap, WEAR_IN_ACCESSORY) //jacket - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/officer, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/flamer/leader, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/officer, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/flamer/leader, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/NY/shrapnel, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/NY/shrapnel, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.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/shoes/marine/upp, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) /datum/equipment_preset/upp/officer/senior/get_antag_clothing_equipment() return list( @@ -1331,18 +1331,18 @@ list("Type 47 Pistol Holster Rig NY", 0, /obj/item/storage/belt/gun/type47/NY/shrapnel, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + 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("Medkit 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), @@ -1376,8 +1376,8 @@ list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("MEDICAL SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), + 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), @@ -1429,44 +1429,44 @@ role_comm_title = "May." paygrade = "UO3" -/datum/equipment_preset/upp/officer/major/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/officer/major/load_gear(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/megaphone, WEAR_IN_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) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/megaphone, WEAR_IN_BACK) //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/peaked, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/peaked, WEAR_HEAD) //uniform var/obj/item/clothing/under/marine/veteran/UPP/officer/M = new() var/obj/item/clothing/accessory/storage/webbing/W = new() - M.attach_accessory(H, W) - H.equip_to_slot_or_del(M, WEAR_BODY) + M.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(M, WEAR_BODY) for(var/i in 1 to W.hold.storage_slots) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/heap, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/heap, WEAR_IN_ACCESSORY) //jacket - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/kapitan, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/flamer/leader, WEAR_J_STORE) + 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/device/binoculars/range, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/flamer/leader, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/impact, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/impact, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.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/shoes/marine/upp, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) /datum/equipment_preset/upp/officer/major/get_antag_clothing_equipment() return list( @@ -1488,18 +1488,18 @@ list("Type 47 Pistol Holster Rig NY", 0, /obj/item/storage/belt/gun/type47/NY/shrapnel, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + 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("Medkit 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), @@ -1533,8 +1533,8 @@ list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("MEDICAL SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), + 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), @@ -1587,44 +1587,44 @@ paygrade = "UO5" skills = /datum/skills/upp/commander -/datum/equipment_preset/upp/officer/kolonel/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/officer/kolonel/load_gear(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/megaphone, WEAR_IN_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) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/megaphone, WEAR_IN_BACK) //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/peaked, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/peaked, WEAR_HEAD) //uniform var/obj/item/clothing/under/marine/veteran/UPP/officer/M = new() var/obj/item/clothing/accessory/storage/webbing/W = new() - M.attach_accessory(H, W) - H.equip_to_slot_or_del(M, WEAR_BODY) + M.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(M, WEAR_BODY) for(var/i in 1 to W.hold.storage_slots) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/heap, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/heap, WEAR_IN_ACCESSORY) //jacket - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/officer, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/flamer/leader, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/officer, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/flamer/leader, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/impact, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/impact, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.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/shoes/marine/upp, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_R_STORE) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) + 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() return list( @@ -1646,18 +1646,18 @@ list("Type 47 Pistol Holster Rig NY", 0, /obj/item/storage/belt/gun/type47/NY/shrapnel, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + 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("Medkit 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), @@ -1691,8 +1691,8 @@ list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("MEDICAL SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), + 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), @@ -1739,38 +1739,38 @@ /datum/equipment_preset/upp/sapper/survivor name = "UPP Sapper (Survivor)" -/datum/equipment_preset/upp/sapper/survivor/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/sapper/survivor/load_gear(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/nagant, WEAR_IN_BACK) //1 - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/upp, WEAR_IN_BACK) //1.3 - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/upp, WEAR_IN_BACK) //1.6 - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/upp, WEAR_IN_BACK) //2 - H.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK) //3 - H.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) //4 + 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/weapon/gun/revolver/nagant, WEAR_IN_BACK) //1 + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/upp, WEAR_IN_BACK) //1.3 + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/upp, WEAR_IN_BACK) //1.6 + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/upp, WEAR_IN_BACK) //2 + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK) //3 + new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) //4 //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/cct, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/cct, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas, WEAR_FACE) //head var/headgear = prob(70) ? /obj/item/clothing/head/helmet/marine/veteran/UPP/engi : /obj/item/clothing/head/uppcap/ushanka - H.equip_to_slot_or_del(new headgear, WEAR_HEAD) + new_human.equip_to_slot_or_del(new headgear, WEAR_HEAD) //body var/obj/item/clothing/under/marine/veteran/UPP/engi/UPP = new() var/obj/item/clothing/accessory/storage/black_vest/tool_webbing/W = new() - UPP.attach_accessory(H, W) - H.equip_to_slot_or_del(UPP, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/dual, WEAR_J_STORE) + UPP.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(UPP, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/type23/dual, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun/upp/heavybuck(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun/upp/heavybuck(new_human), WEAR_WAIST) //limb - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/insulated(H), WEAR_HANDS) - H.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/insulated(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE) //*****************************************************************************************************/ /datum/equipment_preset/upp/synth @@ -1785,84 +1785,84 @@ paygrade = "SYN" idtype = /obj/item/card/id/gold -/datum/equipment_preset/upp/synth/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(50;MALE,50;FEMALE) +/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() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name if(prob(10)) random_name = "[capitalize(randomly_generate_chinese_word(2))]" - else if(H.gender == MALE) + else if(new_human.gender == MALE) random_name = "[pick(first_names_male_upp)]" else random_name = "[pick(first_names_female_upp)]" - if(H.gender == MALE) - H.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") + if(new_human.gender == MALE) + new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") - H.change_real_name(H, random_name) - H.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut") + new_human.change_real_name(new_human, random_name) + new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut") var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) var/hair_color = pick(hair_colors) - H.r_hair = hair_colors[hair_color][1] - H.g_hair = hair_colors[hair_color][2] - H.b_hair = hair_colors[hair_color][3] - H.r_facial = hair_colors[hair_color][1] - H.g_facial = hair_colors[hair_color][2] - H.b_facial = hair_colors[hair_color][3] + new_human.r_hair = hair_colors[hair_color][1] + new_human.g_hair = hair_colors[hair_color][2] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] var/eye_color = pick(colors) - H.r_eyes = colors[eye_color][1] - H.g_eyes = colors[eye_color][2] - H.b_eyes = colors[eye_color][3] + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] idtype = /obj/item/card/id/dogtag -/datum/equipment_preset/upp/synth/load_race(mob/living/carbon/human/H) - H.set_species(SYNTH_GEN_THREE) +/datum/equipment_preset/upp/synth/load_race(mob/living/carbon/human/new_human) + new_human.set_species(SYNTH_GEN_THREE) -/datum/equipment_preset/upp/synth/load_gear(mob/living/carbon/human/H) - load_name(H) +/datum/equipment_preset/upp/synth/load_gear(mob/living/carbon/human/new_human) + load_name(new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) //1 - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) //2 - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) //2.33 - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //2.66 - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3 - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3.33 + 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 + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) //2 + new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) //2.33 + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //2.66 + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3 + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3.33 //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) //head var/hat = pick(/obj/item/clothing/head/uppcap, /obj/item/clothing/head/uppcap/beret, /obj/item/clothing/head/uppcap/ushanka) - H.equip_to_slot_or_del(new hat, WEAR_HEAD) + new_human.equip_to_slot_or_del(new hat, WEAR_HEAD) //body var/obj/item/clothing/under/marine/veteran/UPP/medic/UPP = new() var/obj/item/clothing/accessory/storage/black_vest/tool_webbing/W = new() - UPP.attach_accessory(H, W) - H.equip_to_slot_or_del(UPP, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/jacket, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/reagent_container/glass/bottle/tricordrazine, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/skorpion/upp/medic, WEAR_J_STORE) + UPP.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(UPP, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/jacket, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/bottle/tricordrazine, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/skorpion/upp/medic, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.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/shoes/marine/upp, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) //póckets var/obj/item/storage/pouch/magazine/pistol/large/ppouch = new() - H.equip_to_slot_or_del(ppouch, WEAR_R_STORE) + new_human.equip_to_slot_or_del(ppouch, WEAR_R_STORE) for(var/i = 1 to ppouch.storage_slots) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/skorpion, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medical, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/tricordrazine, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/skorpion, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/tricordrazine, WEAR_IN_L_STORE) /datum/equipment_preset/upp/synth/get_antag_clothing_equipment() return list( @@ -1900,18 +1900,18 @@ list("M276 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("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, 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_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("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("MASK", 0, null, null, null), list("Sterile mask", 0, /obj/item/clothing/mask/surgical, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) @@ -1940,8 +1940,8 @@ list("Radiation Firstaid Kit", 6, /obj/item/storage/firstaid/rad, null, VENDOR_ITEM_REGULAR), list("MEDICAL SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), + 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("Medevac Bed", 6, /obj/item/roller/medevac, null, VENDOR_ITEM_REGULAR), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), list("Roller Bed", 4, /obj/item/roller, null, VENDOR_ITEM_REGULAR), @@ -1993,58 +1993,58 @@ role_comm_title = "Cons" paygrade = "UE0" -/datum/equipment_preset/upp/conscript/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/conscript/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels //back var/maybebackpack = prob(20) ? pick(/obj/item/storage/backpack/lightpack/upp, /obj/item/storage/backpack/lightpack) : null if(maybebackpack) - H.equip_to_slot_or_del(new maybebackpack, WEAR_BACK) //what in back? + new_human.equip_to_slot_or_del(new maybebackpack, WEAR_BACK) //what in back? //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) //head var/maybehat = prob(66) ? pick(/obj/item/clothing/head/uppcap, /obj/item/clothing/head/uppcap/beret, /obj/item/clothing/head/ushanka, /obj/item/clothing/head/uppcap/ushanka) : null if(maybehat) - H.equip_to_slot_or_del(new maybehat, WEAR_HEAD) + new_human.equip_to_slot_or_del(new maybehat, WEAR_HEAD) //body var/obj/item/clothing/under/marine/veteran/UPP/UPP = new() - H.equip_to_slot_or_del(UPP, WEAR_BODY) + new_human.equip_to_slot_or_del(UPP, WEAR_BODY) var/maybejacket = prob(50) ? pick(/obj/item/clothing/suit/storage/marine/faction/UPP/jacket, /obj/item/clothing/suit/storage/snow_suit/soviet) : null if(maybejacket) - H.equip_to_slot_or_del(new maybejacket, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/bottle/vodka, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new maybejacket, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/bottle/vodka, WEAR_IN_JACKET) //limit of snowcoat - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp, WEAR_IN_JACKET) //limbs - H.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/shoes/marine/upp, WEAR_FEET) var/maybegloves = prob(80) ? pick(/obj/item/clothing/gloves/black, /obj/item/clothing/gloves/marine/veteran, /obj/item/clothing/gloves/combat) : null if(maybegloves) - H.equip_to_slot_or_del(new maybegloves, WEAR_HANDS) + new_human.equip_to_slot_or_del(new maybegloves, WEAR_HANDS) //gun - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/carbine, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/carbine, WEAR_R_HAND) //webbing or belt? if(prob(30)) var/obj/item/clothing/accessory/storage/webbing/W = new() - UPP.attach_accessory(H, W) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, WEAR_IN_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, WEAR_IN_ACCESSORY) + UPP.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, WEAR_IN_ACCESSORY) else if(prob(30)) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/upp/scarce, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/upp/scarce, WEAR_WAIST) //if you fail the rolls you must scavenge the ammo from your fallen brethren if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) if(prob(10)) //sometimes Ivan smiles upon the corps - H.set_species("Human Hero") + new_human.set_species("Human Hero") /datum/equipment_preset/upp/conscript/get_antag_clothing_equipment() return list( @@ -2062,9 +2062,9 @@ 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_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -2103,31 +2103,31 @@ idtype = /obj/item/card/id/data languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_TSL, LANGUAGE_SPANISH, LANGUAGE_CHINESE) -/datum/equipment_preset/upp/commando/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/commando/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/kdo, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/commando, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/PK9/tranq, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/scout_cloak/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/upp, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles/upp, WEAR_EYES) - - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) - - H.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK) - - spawn_weapon(/obj/item/weapon/gun/rifle/type71/carbine/commando, /obj/item/ammo_magazine/rifle/type71/heap, H, 0, 8) + 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/suit/storage/marine/faction/UPP/commando, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/PK9/tranq, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/scout_cloak/upp, WEAR_BACK) + 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/clothing/mask/gas/pmc/upp, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles/upp, WEAR_EYES) + + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + 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/storage/pouch/firstaid/full, WEAR_L_STORE) + + new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK) + + spawn_weapon(/obj/item/weapon/gun/rifle/type71/carbine/commando, /obj/item/ammo_magazine/rifle/type71/heap, new_human, 0, 8) /datum/equipment_preset/upp/commando/get_antag_clothing_equipment() return list( @@ -2151,18 +2151,18 @@ list("Type 41 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/type47/PK9/tranq, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + 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("Medkit 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), @@ -2224,39 +2224,39 @@ role_comm_title = "2ndKdo" paygrade = "UC2" -/datum/equipment_preset/upp/commando/medic/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/commando/medic/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/kdo/medic, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/medic, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/commando, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/scout_cloak/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/upp, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles/upp, WEAR_EYES) - - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_IN_BACK) + 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/suit/storage/marine/faction/UPP/commando, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/scout_cloak/upp, WEAR_BACK) + 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/clothing/mask/gas/pmc/upp, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles/upp, WEAR_EYES) + + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_IN_BACK) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.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/clothing/glasses/hud/health(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_JACKET) - spawn_weapon(/obj/item/weapon/gun/rifle/type71/carbine/commando, /obj/item/ammo_magazine/rifle/type71/heap, H, 0, 5) + spawn_weapon(/obj/item/weapon/gun/rifle/type71/carbine/commando, /obj/item/ammo_magazine/rifle/type71/heap, new_human, 0, 5) /datum/equipment_preset/upp/commando/medic/get_antag_clothing_equipment() return list( @@ -2281,19 +2281,19 @@ list("Type 41 Ammo Load Rig", 0, /obj/item/storage/belt/marine/upp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch (Splints)", 0, /obj/item/storage/pouch/medical/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + 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_RECOMMENDED), + 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_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch (Splints)", 0, /obj/item/storage/pouch/medical/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit 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), @@ -2315,8 +2315,8 @@ list("Essential Medic Set", 0, /obj/effect/essentials_set/medic/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("FIELD SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_RECOMMENDED), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_RECOMMENDED), + 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("FIRSTAID KITS", 0, null, null, null), @@ -2392,33 +2392,33 @@ paygrade = "UC3" idtype = /obj/item/card/id/silver -/datum/equipment_preset/upp/commando/leader/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/commando/leader/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/kdo/command, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/commando, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/scout_cloak/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/upp, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles/upp, WEAR_EYES) - - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/PK9/tranq, WEAR_WAIST) - - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_L_STORE) - - H.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/handcuffs, WEAR_IN_BACK) - - spawn_weapon(/obj/item/weapon/gun/rifle/type71/carbine/commando, /obj/item/ammo_magazine/rifle/type71/heap, H, 0, 7) + 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/suit/storage/marine/faction/UPP/commando, WEAR_JACKET) + 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/storage/backpack/marine/satchel/scout_cloak/upp, WEAR_BACK) + 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/clothing/mask/gas/pmc/upp, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles/upp, WEAR_EYES) + + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/PK9/tranq, WEAR_WAIST) + + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_BACK) + 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/storage/pouch/explosive/C4, WEAR_L_STORE) + + new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/handcuffs, WEAR_IN_BACK) + + spawn_weapon(/obj/item/weapon/gun/rifle/type71/carbine/commando, /obj/item/ammo_magazine/rifle/type71/heap, new_human, 0, 7) /datum/equipment_preset/upp/commando/leader/get_antag_clothing_equipment() return list( @@ -2442,18 +2442,18 @@ list("Type 41 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/type47/PK9/tranq, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_RECOMMENDED), + 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("Medkit 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), @@ -2487,8 +2487,8 @@ list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("MEDICAL SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), + 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), @@ -2544,20 +2544,20 @@ minimum_age = 30 skills = /datum/skills/tank_crew -/datum/equipment_preset/upp/tank/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/cct(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/PK9(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/tool/weldpack(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tank(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP/engi(H), WEAR_HEAD) - - spawn_weapon(/obj/item/weapon/gun/rifle/type71/carbine, /obj/item/ammo_magazine/rifle/type71, H, 0, 3) +/datum/equipment_preset/upp/tank/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/shoes/marine/upp(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/cct(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES) + 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/belt/gun/type47/PK9(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tank(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP/engi(new_human), WEAR_HEAD) + + spawn_weapon(/obj/item/weapon/gun/rifle/type71/carbine, /obj/item/ammo_magazine/rifle/type71, new_human, 0, 3) /datum/equipment_preset/upp/tank/load_status() return @@ -2583,14 +2583,14 @@ list("M276 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("First-Aid Pouch (Full)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/tank, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), + 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("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), @@ -2657,44 +2657,44 @@ role_comm_title = "Lt. Med." paygrade = "UO1M" -/datum/equipment_preset/upp/doctor/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/upp/doctor/load_gear(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_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) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, 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/reagent_container/food/snacks/upp, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/ushanka, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/ushanka, WEAR_HEAD) //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(H, W) - H.equip_to_slot_or_del(UPP, WEAR_BODY) + UPP.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(UPP, WEAR_BODY) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - H.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/shoes/marine/upp, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) //póckets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/oxycodone, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medical, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/oxycodone, WEAR_IN_L_STORE) - H.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/tricordrazine, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/oxycodone, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/oxycodone, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/tricordrazine, WEAR_IN_L_STORE) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) /datum/equipment_preset/upp/doctor/get_antag_clothing_equipment() return list( @@ -2714,16 +2714,16 @@ list("Type 41 Lifesaver Bag", 0, /obj/item/storage/belt/medical/lifesaver/upp/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medical Pouch (Splints)", 0, /obj/item/storage/pouch/medical/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + 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_RECOMMENDED), + 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_RECOMMENDED), + list("Medical Pouch (Splints)", 0, /obj/item/storage/pouch/medical/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, 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), @@ -2736,8 +2736,8 @@ list("Essential Medic Set", 0, /obj/effect/essentials_set/medic/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("FIELD SUPPLIES", 0, null, null, null), - list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_RECOMMENDED), - list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_RECOMMENDED), + 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("FIRSTAID KITS", 0, null, null, null), diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index ac80717962c6..0afe09c831b7 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -23,34 +23,38 @@ dress_shoes = list(/obj/item/clothing/shoes/dress) var/auto_squad_name -/datum/equipment_preset/uscm/load_status(mob/living/carbon/human/H) - H.nutrition = rand(NUTRITION_VERYLOW, NUTRITION_LOW) +/datum/equipment_preset/uscm/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = rand(NUTRITION_VERYLOW, NUTRITION_LOW) -/datum/equipment_preset/uscm/load_preset(mob/living/carbon/human/H, randomise, count_participant) +/datum/equipment_preset/uscm/load_preset(mob/living/carbon/human/new_human, randomise, count_participant) . = ..() - if(!auto_squad_name || is_admin_level(H.z)) + if(!auto_squad_name || is_admin_level(new_human.z)) return - if(!GLOB.data_core.manifest_modify(H.real_name, WEAKREF(H), assignment, rank)) - GLOB.data_core.manifest_inject(H) + if(!GLOB.data_core.manifest_modify(new_human.real_name, WEAKREF(new_human), assignment, rank)) + GLOB.data_core.manifest_inject(new_human) + + var/obj/item/card/id/ID = new_human.wear_id + var/datum/money_account/acct = create_account(new_human, rand(30, 50), GLOB.paygrades[ID.paygrade]) + ID.associated_account_number = acct.account_number var/datum/squad/auto_squad = get_squad_by_name(auto_squad_name) if(auto_squad) - transfer_marine_to_squad(H, auto_squad, H.assigned_squad, H.wear_id) + transfer_marine_to_squad(new_human, auto_squad, new_human.assigned_squad, new_human.wear_id) if(!auto_squad.active) auto_squad.engage_squad(FALSE) - H.marine_buy_flags &= ~MARINE_CAN_BUY_EAR - H.sec_hud_set_ID() - H.hud_set_squad() + new_human.marine_buyable_categories[MARINE_CAN_BUY_EAR] = 0 + new_human.sec_hud_set_ID() + new_human.hud_set_squad() - if(H.wear_l_ear) - if(istype(H.wear_l_ear, /obj/item/device/radio/headset/almayer/marine)) - var/obj/item/device/radio/headset/almayer/marine/equipped_headset = H.wear_l_ear - equipped_headset.add_hud_tracker(H) - else if(H.wear_r_ear) - if(istype(H.wear_r_ear, /obj/item/device/radio/headset/almayer/marine)) - var/obj/item/device/radio/headset/almayer/marine/equipped_headset = H.wear_r_ear - equipped_headset.add_hud_tracker(H) + if(new_human.wear_l_ear) + if(istype(new_human.wear_l_ear, /obj/item/device/radio/headset/almayer/marine)) + var/obj/item/device/radio/headset/almayer/marine/equipped_headset = new_human.wear_l_ear + equipped_headset.add_hud_tracker(new_human) + else if(new_human.wear_r_ear) + if(istype(new_human.wear_r_ear, /obj/item/device/radio/headset/almayer/marine)) + var/obj/item/device/radio/headset/almayer/marine/equipped_headset = new_human.wear_r_ear + equipped_headset.add_hud_tracker(new_human) //*****************************************************************************************************/ @@ -67,16 +71,16 @@ minimap_icon = "private" -/datum/equipment_preset/uscm/pfc/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/pfc/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) -/datum/equipment_preset/uscm/pfc/load_rank(mob/living/carbon/human/H) - if(H.client) - if(get_job_playtime(H.client, rank) < JOB_PLAYTIME_TIER_1) +/datum/equipment_preset/uscm/pfc/load_rank(mob/living/carbon/human/new_human) + if(new_human.client) + if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) return "ME1" return paygrade @@ -84,9 +88,9 @@ name = "USCM Cryo Squad Rifleman" auto_squad_name = SQUAD_MARINE_CRYO -/datum/equipment_preset/uscm/pfc/cryo/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/pfc/cryo/load_gear(mob/living/carbon/human/new_human) ..() - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(H), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(new_human), WEAR_L_EAR) //*****************************************************************************************************/ @@ -103,20 +107,20 @@ minimap_icon = "smartgunner" -/datum/equipment_preset/uscm/sg/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/sg/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) /datum/equipment_preset/uscm/sg/cryo name = "USCM Cryo Squad Smartgunner" auto_squad_name = SQUAD_MARINE_CRYO -/datum/equipment_preset/uscm/sg/cryo/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/sg/cryo/load_gear(mob/living/carbon/human/new_human) ..() - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(H), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(new_human), WEAR_L_EAR) //*****************************************************************************************************/ @@ -124,16 +128,16 @@ name = "USCM Squad Smartgunner" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE -/datum/equipment_preset/uscm/sg/full/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/specrag(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles(H), WEAR_EYES) +/datum/equipment_preset/uscm/sg/full/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/specrag(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles(new_human), WEAR_EYES) /datum/equipment_preset/uscm/sg/full/load_status() return //No cryo munchies @@ -161,16 +165,16 @@ minimap_icon = "vc" -/datum/equipment_preset/uscm/tank/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/tank/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/vc(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/tanker(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service/tanker, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/vc(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/tanker(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service/tanker, WEAR_JACKET) /datum/equipment_preset/uscm/tank/load_status() return @@ -183,19 +187,19 @@ utility_under = list(/obj/item/clothing/under/marine/officer/tanker) -/datum/equipment_preset/uscm/tank/full/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/vc(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/tanker(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/tanker(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/tool/weldpack(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tank(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/tech/tanker(H), WEAR_HEAD) +/datum/equipment_preset/uscm/tank/full/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/vc(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/tanker(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + 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/belt/gun/m4a3/mod88(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/tanker(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tank(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/tech/tanker(new_human), WEAR_HEAD) - spawn_weapon(/obj/item/weapon/gun/smg/m39, /obj/item/ammo_magazine/smg/m39/extended, H, 0, 3) + spawn_weapon(/obj/item/weapon/gun/smg/m39, /obj/item/ammo_magazine/smg/m39/extended, new_human, 0, 3) //*****************************************************************************************************/ @@ -223,14 +227,14 @@ minimap_icon = "io" -/datum/equipment_preset/uscm/intel/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/intel/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/intel(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/intel(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) /datum/equipment_preset/uscm/intel/load_status() return //No cryo munchies @@ -243,25 +247,25 @@ utility_under = list(/obj/item/clothing/under/marine/officer/intel) -/datum/equipment_preset/uscm/intel/full/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/intel/full/load_gear(mob/living/carbon/human/new_human) - var/obj/item/clothing/under/marine/officer/intel/U = new(H) + var/obj/item/clothing/under/marine/officer/intel/U = new(new_human) var/obj/item/clothing/accessory/storage/webbing/W = new() - U.attach_accessory(H, W) - H.equip_to_slot_or_del(U, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/intel(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/rto/intel(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/rto/intel(src), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(src), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/intel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/document(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/device/binoculars(H), WEAR_L_HAND) - - - H.hud_set_squad() + U.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(U, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/intel(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/rto/intel(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/rto/intel(src), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(src), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/intel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/document(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars(new_human), WEAR_L_HAND) + + + new_human.hud_set_squad() /*****************************************************************************************************/ /datum/equipment_preset/uscm/spec @@ -277,22 +281,22 @@ minimap_icon = "spec" -/datum/equipment_preset/uscm/spec/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/spec/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/specrag(H), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/specrag(new_human), WEAR_HEAD) /datum/equipment_preset/uscm/spec/cryo name = "USCM Cryo Squad Weapons Specialist" auto_squad_name = SQUAD_MARINE_CRYO -/datum/equipment_preset/uscm/spec/cryo/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/spec/cryo/load_gear(mob/living/carbon/human/new_human) ..() - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/spec_kit/cryo, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/spec_kit/cryo, WEAR_R_HAND) //*****************************************************************************************************/ @@ -300,21 +304,21 @@ name = "USCM Weapons Specialist (B18 Armor)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE -/datum/equipment_preset/uscm/spec/full_armor/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/specialist(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/specialist(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/specialist(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H.back), WEAR_IN_BACK) +/datum/equipment_preset/uscm/spec/full_armor/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/specialist(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/specialist(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/specialist(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human.back), WEAR_IN_BACK) /datum/equipment_preset/uscm/spec/full_armor/load_status() return //No cryo munchies @@ -336,20 +340,20 @@ utility_under = list(/obj/item/clothing/under/marine/medic) -/datum/equipment_preset/uscm/medic/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/medic/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/medic - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) /datum/equipment_preset/uscm/medic/cryo name = "USCM Cryo Squad Hospital Corpsman" auto_squad_name = SQUAD_MARINE_CRYO -/datum/equipment_preset/uscm/medic/cryo/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/medic/cryo/load_gear(mob/living/carbon/human/new_human) ..() - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/med(H), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/med(new_human), WEAR_L_EAR) //*****************************************************************************************************/ @@ -366,20 +370,20 @@ minimap_icon = "tl" -/datum/equipment_preset/uscm/tl/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/tl/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) /datum/equipment_preset/uscm/tl/cryo name = "USCM Cryo Fireteam Leader" auto_squad_name = SQUAD_MARINE_CRYO -/datum/equipment_preset/uscm/tl/cryo/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/tl/cryo/load_gear(mob/living/carbon/human/new_human) ..() - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/tl(H), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/tl(new_human), WEAR_L_EAR) /*****************************************************************************************************/ @@ -398,20 +402,20 @@ utility_under = list(/obj/item/clothing/under/marine/engineer) -/datum/equipment_preset/uscm/engineer/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/engineer/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/tech - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) /datum/equipment_preset/uscm/engineer/cryo name = "USCM Cryo Squad Combat Technician" auto_squad_name = SQUAD_MARINE_CRYO -/datum/equipment_preset/uscm/engineer/cryo/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/engineer/cryo/load_gear(mob/living/carbon/human/new_human) ..() - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/engi(H), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/engi(new_human), WEAR_L_EAR) //*****************************************************************************************************/ @@ -429,20 +433,20 @@ minimap_icon = "leader" -/datum/equipment_preset/uscm/leader/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/leader/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) /datum/equipment_preset/uscm/leader/cryo name = "USCM Cryo Squad Leader" auto_squad_name = SQUAD_MARINE_CRYO -/datum/equipment_preset/uscm/leader/cryo/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/leader/cryo/load_gear(mob/living/carbon/human/new_human) ..() - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/lead(H), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/lead(new_human), WEAR_L_EAR) //*****************************************************************************************************/ @@ -461,30 +465,30 @@ minimap_icon = "private" -/datum/equipment_preset/uscm/private_equipped/load_rank(mob/living/carbon/human/H) - if(H.client) - if(get_job_playtime(H.client, rank) < JOB_PLAYTIME_TIER_1) +/datum/equipment_preset/uscm/private_equipped/load_rank(mob/living/carbon/human/new_human) + if(new_human.client) + if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) return "ME1" return paygrade -/datum/equipment_preset/uscm/private_equipped/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE(H), WEAR_IN_BACK) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41a(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H.back), WEAR_IN_BACK) +/datum/equipment_preset/uscm/private_equipped/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK) + + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a(new_human), WEAR_J_STORE) + 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/extended(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human.back), WEAR_IN_BACK) /datum/equipment_preset/uscm/private_equipped/cryo name = "USCM Cryo Squad Rifleman (Equipped)" @@ -507,24 +511,24 @@ minimap_icon = "leader" -/datum/equipment_preset/uscm/leader_equipped/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/leader(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/lead(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/leader(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41a(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended(H.back), WEAR_IN_BACK) +/datum/equipment_preset/uscm/leader_equipped/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) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/leader(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/lead(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/leader(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a(new_human), WEAR_J_STORE) + 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/extended(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended(new_human.back), WEAR_IN_BACK) /datum/equipment_preset/uscm/leader_equipped/cryo name = "USCM Cryo Squad Leader (Equipped)" @@ -545,23 +549,23 @@ minimap_icon = "smartgunner" -/datum/equipment_preset/uscm/smartgunner_equipped/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(H), WEAR_R_HAND) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE(H), WEAR_IN_BACK) +/datum/equipment_preset/uscm/smartgunner_equipped/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) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(new_human), WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK) //Backup SMG Weapon - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(H), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(new_human), WEAR_L_EAR) /datum/equipment_preset/uscm/smartgunner_equipped/cryo name = "USCM Cryo Squad Smartgunner (Equipped)" @@ -585,27 +589,27 @@ utility_under = list(/obj/item/clothing/under/marine/engineer) -/datum/equipment_preset/uscm/engineer_equipped/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/engineer_equipped/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/engineer(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/tech(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/engi(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_R_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/engineer(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/tech(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/engi(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human.back), WEAR_IN_BACK) /datum/equipment_preset/uscm/engineer_equipped/cryo name = "USCM Cryo Squad Combat Technician (Equipped)" @@ -628,34 +632,34 @@ utility_under = list(/obj/item/clothing/under/marine/medic) -/datum/equipment_preset/uscm/medic_equipped/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/medic(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/med(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(H), WEAR_BACK) +/datum/equipment_preset/uscm/medic_equipped/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/medic(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/med(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) if(prob(50)) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full(H), WEAR_WAIST) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_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/belt/medical/lifesaver/full(new_human), WEAR_WAIST) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended(H.back), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H.back), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(H.back), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft(H), WEAR_IN_BACK) + 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/storage/pouch/medkit/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended(new_human.back), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human.back), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human.back), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft(new_human), WEAR_IN_BACK) /datum/equipment_preset/uscm/medic_equipped/cryo name = "USCM Cryo Hospital Corpsman (Equipped)" @@ -677,27 +681,27 @@ minimap_icon = "spec" -/datum/equipment_preset/uscm/specialist_equipped/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/specialist_equipped/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing(H), WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/attachable/magnetic_harness(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/spec_kit, WEAR_R_HAND) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39/full(new_human), WEAR_WAIST) + 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) + 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/storage/pouch/pistol(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/attachable/magnetic_harness(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/spec_kit, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK) /datum/equipment_preset/uscm/specialist_equipped/cryo name = "USCM Cryo Squad Weapons Specialist (Equipped)" @@ -708,26 +712,26 @@ /datum/equipment_preset/uscm/specialist_equipped/sniper name = "USCM Sniper Specialist (Equipped)" -/datum/equipment_preset/uscm/specialist_equipped/sniper/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/specialist_equipped/sniper/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/ghillie(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/ghillie(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smock(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing(H), WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/incendiary(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/flak(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/flak(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/attachments(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/MRE(H), WEAR_IN_BACK) - - spawn_weapon(/obj/item/weapon/gun/rifle/sniper/M42A, /obj/item/ammo_magazine/sniper, H, 0, 5) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/ghillie(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/ghillie(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smock(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/incendiary(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/flak(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/sniper/flak(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK) + + spawn_weapon(/obj/item/weapon/gun/rifle/sniper/M42A, /obj/item/ammo_magazine/sniper, new_human, 0, 5) //*****************************************************************************************************/ @@ -744,23 +748,23 @@ minimap_icon = "tl" -/datum/equipment_preset/uscm/tl_equipped/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/tl_equipped/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - var/obj/item/clothing/under/marine/rto/U = new(H) + var/obj/item/clothing/under/marine/rto/U = new(new_human) var/obj/item/clothing/accessory/storage/webbing/W = new() - U.attach_accessory(H, W) - H.equip_to_slot_or_del(U, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/rto(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/tl(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/rto(src), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(src), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/rto(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/binoculars(H), WEAR_L_HAND) - - H.back.pickup() + U.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(U, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/rto(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo/tl(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/rto(src), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(src), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/rto(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars(new_human), WEAR_L_HAND) + + new_human.back.pickup() /datum/equipment_preset/uscm/tl_equipped/cryo name = "USCM Cryo Fireteam Leader (Equipped)" @@ -781,56 +785,56 @@ minimap_icon = "private" -/datum/equipment_preset/uscm/marsoc/load_status(mob/living/carbon/human/H) - H.nutrition = NUTRITION_NORMAL +/datum/equipment_preset/uscm/marsoc/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL /datum/equipment_preset/uscm/marsoc/New() . = ..() access = get_all_accesses() + get_all_centcom_access() -/datum/equipment_preset/uscm/marsoc/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm/marsoc/load_gear(mob/living/carbon/human/new_human) //back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/marsoc, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/super, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/super, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/super, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/marsoc, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/super, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/super, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/super, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_IN_BACK) //face - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/marsoc, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/marsoc, WEAR_FACE) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/sof, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/sof, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/helmet_nvg/marsoc, WEAR_IN_HELMET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_HELMET) //uniform var/obj/item/clothing/under/marine/veteran/marsoc/M = new() var/obj/item/clothing/accessory/storage/black_vest/W = new() - M.attach_accessory(H, W) - H.equip_to_slot_or_del(M, WEAR_BODY) + M.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(M, WEAR_BODY) for(var/i in 1 to W.hold.storage_slots) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_ACCESSORY) //jacket var/obj/item/clothing/suit/storage/marine/sof/armor = new() - H.equip_to_slot_or_del(armor, WEAR_JACKET) + new_human.equip_to_slot_or_del(armor, WEAR_JACKET) for(var/i in 1 to armor.storage_slots) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/xm40/heap, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite/xm40, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/xm40/heap, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite/xm40, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat/marsoc, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat/marsoc, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/socmed/full, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/socmed/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical/full, WEAR_R_STORE) -/datum/equipment_preset/uscm/marsoc/load_rank(mob/living/carbon/human/H) - if(H.client) - if(get_job_playtime(H.client, rank) > JOB_PLAYTIME_TIER_2) +/datum/equipment_preset/uscm/marsoc/load_rank(mob/living/carbon/human/new_human) + if(new_human.client) + if(get_job_playtime(new_human.client, rank) > JOB_PLAYTIME_TIER_2) return "ME7" return paygrade @@ -838,11 +842,11 @@ /datum/equipment_preset/uscm/marsoc/covert name = "Marine Raiders (Covert)" uses_special_name = TRUE -/datum/equipment_preset/uscm/marsoc/covert/load_name(mob/living/carbon/human/H, randomise) - H.gender = MALE - H.change_real_name(H, "[pick(nato_phonetic_alphabet)]") - H.age = rand(20,30) -/datum/equipment_preset/uscm/marsoc/covert/load_rank(mob/living/carbon/human/H) +/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(nato_phonetic_alphabet)]") + new_human.age = rand(20,30) +/datum/equipment_preset/uscm/marsoc/covert/load_rank(mob/living/carbon/human/new_human) return "O" //Team Leader @@ -856,9 +860,9 @@ minimap_icon = "leader" -/datum/equipment_preset/uscm/marsoc/sl/load_rank(mob/living/carbon/human/H) - if(H.client) - if(get_job_playtime(H.client, rank) > JOB_PLAYTIME_TIER_2) +/datum/equipment_preset/uscm/marsoc/sl/load_rank(mob/living/carbon/human/new_human) + if(new_human.client) + if(get_job_playtime(new_human.client, rank) > JOB_PLAYTIME_TIER_2) return "MO2" return paygrade @@ -866,11 +870,11 @@ /datum/equipment_preset/uscm/marsoc/sl/covert name = "Marine Raider Team Leader (Covert)" uses_special_name = TRUE -/datum/equipment_preset/uscm/marsoc/sl/covert/load_name(mob/living/carbon/human/H, randomise) - H.gender = MALE - H.change_real_name(H, "[pick(nato_phonetic_alphabet)]") - H.age = rand(20,30) -/datum/equipment_preset/uscm/marsoc/sl/covert/load_rank(mob/living/carbon/human/H) +/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(nato_phonetic_alphabet)]") + new_human.age = rand(20,30) +/datum/equipment_preset/uscm/marsoc/sl/covert/load_rank(mob/living/carbon/human/new_human) return "O" //Officer /datum/equipment_preset/uscm/marsoc/cmd @@ -881,8 +885,8 @@ paygrade = "MO3" skills = /datum/skills/commando/deathsquad/officer -/datum/equipment_preset/uscm/marsoc/cmd/load_rank(mob/living/carbon/human/H) - if(H.client) - if(get_job_playtime(H.client, rank) > JOB_PLAYTIME_TIER_3) +/datum/equipment_preset/uscm/marsoc/cmd/load_rank(mob/living/carbon/human/new_human) + if(new_human.client) + if(get_job_playtime(new_human.client, rank) > JOB_PLAYTIME_TIER_3) return "MO4" return paygrade diff --git a/code/modules/gear_presets/uscm_dress.dm b/code/modules/gear_presets/uscm_dress.dm index 9fe641717706..cf95bca252cc 100644 --- a/code/modules/gear_presets/uscm_dress.dm +++ b/code/modules/gear_presets/uscm_dress.dm @@ -15,13 +15,13 @@ dress_gloves = list(/obj/item/clothing/gloves/marine/dress) dress_shoes = list(/obj/item/clothing/shoes/dress) -/datum/equipment_preset/uscm_event/dress/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/dress/blues(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/dress(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/head/marine/dress_cover(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/dress/blues(H), WEAR_JACKET) +/datum/equipment_preset/uscm_event/dress/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/dress/blues(new_human), WEAR_BODY) + 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/device/radio/headset/almayer(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/marine/dress_cover(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/dress/blues(new_human), WEAR_JACKET) /datum/equipment_preset/uscm_event/dress/lcpl name = "Dress Blues - (E-3) Lance Corporal" @@ -37,9 +37,9 @@ dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco) -/datum/equipment_preset/uscm_event/dress/nco/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/dress/blues/senior(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco(H), WEAR_JACKET) +/datum/equipment_preset/uscm_event/dress/nco/load_gear(mob/living/carbon/human/new_human) + 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/nco(new_human), WEAR_JACKET) . = ..() /datum/equipment_preset/uscm_event/dress/nco/sgt @@ -52,8 +52,8 @@ skills = /datum/skills/SEA access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP) -/datum/equipment_preset/uscm_event/dress/nco/snco/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(H), WEAR_L_EAR) +/datum/equipment_preset/uscm_event/dress/nco/snco/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR) . = ..() /datum/equipment_preset/uscm_event/dress/nco/snco/gysgt @@ -91,11 +91,11 @@ dress_gloves = list(/obj/item/clothing/gloves/marine/dress) dress_shoes = list(/obj/item/clothing/shoes/dress) -/datum/equipment_preset/uscm_event/dress/officer/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/dress/blues/senior(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/marine/dress_cover/officer(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(H), WEAR_L_EAR) +/datum/equipment_preset/uscm_event/dress/officer/load_gear(mob/living/carbon/human/new_human) + 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/head/marine/dress_cover/officer(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(new_human), WEAR_L_EAR) . = ..() /datum/equipment_preset/uscm_event/dress/officer/firstlt @@ -147,9 +147,9 @@ . = ..() access = get_all_marine_access() -/datum/equipment_preset/uscm_event/dress/officer/general/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/dress/blues/general(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(H), WEAR_L_EAR) +/datum/equipment_preset/uscm_event/dress/officer/general/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/dress/blues/general(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR) . = ..() diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm index 43a2e169ccc9..52e7b2a83e48 100644 --- a/code/modules/gear_presets/uscm_event.dm +++ b/code/modules/gear_presets/uscm_event.dm @@ -41,17 +41,17 @@ . = ..() access = get_all_accesses() + get_all_centcom_access() -/datum/equipment_preset/uscm_event/colonel/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress/commander(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/cm(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/cmateba/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/flash, WEAR_IN_JACKET) +/datum/equipment_preset/uscm_event/colonel/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(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(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/shoes/dress/commander(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/cm(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/cmateba/full(new_human), WEAR_L_STORE) + 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/device/flash, WEAR_IN_JACKET) /datum/equipment_preset/uscm_event/general name = "USCM O-7 - Brigadier General (High Command)" @@ -76,29 +76,29 @@ . = ..() access = get_all_accesses() + get_all_centcom_access() -/datum/equipment_preset/uscm_event/general/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_event/general/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/general(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/general(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/dress/general(H), WEAR_JACKET) - - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/large/mateba/impact(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/general(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/cotablet(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/mateba_case/general(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/handcuffs(H.back), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/device/flash, WEAR_IN_JACKET) - - H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/general(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(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/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/general(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/dress/general(new_human), WEAR_JACKET) + + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/large/mateba/impact(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/general(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/cotablet(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/mateba_case/general(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human.back), WEAR_IN_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/device/flash, WEAR_IN_JACKET) + + new_human.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) /datum/equipment_preset/uscm_event/general/o7 name = "USCM O-7 - Brigadier General (High Command)" @@ -149,33 +149,33 @@ role_comm_title = "OT" skills = /datum/skills/spy -/datum/equipment_preset/uscm_event/upp_spy/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_event/upp_spy/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/tech - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi/OT(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/demo_scanner(H), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi/OT(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/yellow(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/demo_scanner(new_human), WEAR_L_STORE) //TODO: preload all of those items before equipping the backpack //Otherwise, if you spawn the spy next to other people //they will see messages for them putting guns and explosives into their backpack... - H.equip_to_slot_or_del(new /obj/item/handcuffs(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/c99/upp/tranq(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99/tranq(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99/tranq(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/handcuffs(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/chameleon(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp(H.back), WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic(H.back), WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic(H.back), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/c99/upp/tranq(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99/tranq(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/c99/tranq(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/handcuffs(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/chameleon(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/upp(new_human.back), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic(new_human.back), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic(new_human.back), WEAR_IN_R_STORE) @@ -217,37 +217,37 @@ role_comm_title = "PvE" flags = EQUIPMENT_PRESET_EXTRA -/datum/equipment_preset/uscm_event/provost/enforcer/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_event/provost/enforcer/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/enforcer(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/enforcer(H), WEAR_JACKET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/enforcer(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(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/storage/belt/security/MP/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/enforcer(new_human), WEAR_JACKET) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/provost(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/beanbag(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/slug(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot(H), WEAR_L_HAND) - - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/flashbangs(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/taser(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flash(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/handcuffs(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat(H), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/provost(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/beanbag(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/slug(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot(new_human), WEAR_L_HAND) + + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/flashbangs(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/taser(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat(new_human), WEAR_J_STORE) /datum/equipment_preset/uscm_event/provost/tml name = "Provost Team Leader (ME6)" @@ -259,38 +259,38 @@ role_comm_title = "PvTML" flags = EQUIPMENT_PRESET_EXTRA -/datum/equipment_preset/uscm_event/provost/tml/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_event/provost/tml/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/tml(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/tml(H), WEAR_JACKET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/tml(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(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/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/tml(new_human), WEAR_JACKET) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/provost/senior(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/beanbag(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/slug(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/storage/box/nade_box/tear_gas(H), WEAR_R_HAND) - - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/flashbangs(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/taser(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flash(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/handcuffs(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat(H), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/provost/senior(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/beanbag(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/slug(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/nade_box/tear_gas(new_human), WEAR_R_HAND) + + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/flashbangs(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/taser(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat(new_human), WEAR_J_STORE) /datum/equipment_preset/uscm_event/provost/advisor @@ -303,29 +303,29 @@ role_comm_title = "PvA" flags = EQUIPMENT_PRESET_EXTRA -/datum/equipment_preset/uscm_event/provost/advisor/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_event/provost/advisor/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/advisor(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/advisor(H), WEAR_JACKET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/advisor(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(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/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/advisor(new_human), WEAR_JACKET) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/provost/senior(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/provost/senior(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost(new_human.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flash(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/handcuffs(H), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human), WEAR_IN_JACKET) /datum/equipment_preset/uscm_event/provost/inspector name = "Provost Inspector (PvI)" @@ -337,29 +337,29 @@ role_comm_title = "PvI" flags = EQUIPMENT_PRESET_EXTRA -/datum/equipment_preset/uscm_event/provost/inspector/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_event/provost/inspector/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/inspector(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/inspector(H), WEAR_JACKET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/inspector(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(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/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/inspector(new_human), WEAR_JACKET) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/provost/senior(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/provost/senior(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost(new_human.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flash(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/handcuffs(H), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human), WEAR_IN_JACKET) /datum/equipment_preset/uscm_event/provost/marshal @@ -373,26 +373,26 @@ role_comm_title = "PvM" flags = EQUIPMENT_PRESET_EXTRA -/datum/equipment_preset/uscm_event/provost/marshal/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_event/provost/marshal/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/marshal(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/impact(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/marshal(H), WEAR_JACKET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/marshal(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(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/storage/belt/gun/mateba/general/impact(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/marshal(new_human), WEAR_JACKET) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/mp/provost/marshal(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/mp/provost/marshal(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal(new_human.back), WEAR_IN_BACK) /datum/equipment_preset/uscm_event/provost/marshal/sector @@ -405,26 +405,26 @@ paygrade = "MO7" role_comm_title = "PvSM" -/datum/equipment_preset/uscm_event/provost/marshal/sector/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_event/provost/marshal/sector/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/marshal(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/impact(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/marshal(H), WEAR_JACKET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/marshal(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(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/storage/belt/gun/mateba/general/impact(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/marshal(new_human), WEAR_JACKET) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/mp/provost/marshal(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/mp/provost/marshal(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal(new_human.back), WEAR_IN_BACK) /datum/equipment_preset/uscm_event/provost/marshal/chief @@ -437,26 +437,26 @@ paygrade = "PvCM" role_comm_title = "PvCM" -/datum/equipment_preset/uscm_event/provost/marshal/chief/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_event/provost/marshal/chief/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/marshal/chief(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/impact(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/marshal/chief(H), WEAR_JACKET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/marshal/chief(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(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/storage/belt/gun/mateba/general/impact(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/marshal/chief(new_human), WEAR_JACKET) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/mp/provost/marshal(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal/chief(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/mp/provost/marshal(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal/chief(new_human.back), WEAR_IN_BACK) /*****************************************************************************************************/ @@ -498,21 +498,21 @@ role_comm_title = "TIS-IO" flags = EQUIPMENT_PRESET_EXTRA -/datum/equipment_preset/uscm_event/uaac/tis/io/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_event/uaac/tis/io/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/uaac/tis/io(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(H), WEAR_WAIST) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/uaac/tis/io(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(new_human), WEAR_WAIST) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder(H), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) /datum/equipment_preset/uscm_event/uaac/tis/sa name = "UAAC-TIS Special Agent (NO5)" @@ -525,25 +525,25 @@ role_comm_title = "TIS-SA" flags = EQUIPMENT_PRESET_EXTRA -/datum/equipment_preset/uscm_event/uaac/tis/sa/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_event/uaac/tis/sa/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/uaac/tis(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/impact(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/uaac/tis/sa(H), WEAR_JACKET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/uaac/tis(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(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/storage/belt/gun/mateba/general/impact(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/uaac/tis/sa(new_human), WEAR_JACKET) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/tis(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/tis(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE) /*****************************************************************************************************/ diff --git a/code/modules/gear_presets/uscm_medical.dm b/code/modules/gear_presets/uscm_medical.dm index 6ce218275a92..ac1e082f6655 100644 --- a/code/modules/gear_presets/uscm_medical.dm +++ b/code/modules/gear_presets/uscm_medical.dm @@ -49,29 +49,29 @@ utility_shoes = list(/obj/item/clothing/shoes/white) utility_extra = list(/obj/item/clothing/suit/storage/labcoat) -/datum/equipment_preset/uscm_ship/uscm_medical/cmo/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/uscm_medical/cmo/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/cmo(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_medical_officer(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/paper/research_notes/decent(H), WEAR_IN_JACKET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/cmo(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_medical_officer(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/decent(new_human), WEAR_IN_JACKET) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medical(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/cmo(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(H), WEAR_J_STORE) + 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/storage/belt/medical/lifesaver/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmo(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human), WEAR_J_STORE) //*****************************************************************************************************/ @@ -86,20 +86,20 @@ minimap_icon = list("medic" = MINIMAP_ICON_COLOR_DOCTOR) -/datum/equipment_preset/uscm_ship/uscm_medical/doctor/load_gear(mob/living/carbon/human/H) +/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 - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) //Surgeon this part of the code is to change the name on your ID @@ -120,25 +120,25 @@ minimap_icon = list("medic") -/datum/equipment_preset/uscm_ship/uscm_medical/nurse/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/uscm_medical/nurse/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/nurse(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/nurse(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) -/datum/equipment_preset/uscm_ship/uscm_medical/nurse/load_rank(mob/living/carbon/human/H) - if(H.client) - if(get_job_playtime(H.client, rank) < JOB_PLAYTIME_TIER_1) +/datum/equipment_preset/uscm_ship/uscm_medical/nurse/load_rank(mob/living/carbon/human/new_human) + if(new_human.client) + if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) return "ME3" return paygrade @@ -163,21 +163,21 @@ service_under = list(/obj/item/clothing/under/marine/officer/researcher) -/datum/equipment_preset/uscm_ship/uscm_medical/researcher/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/uscm_medical/researcher/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/researcher(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/researcher(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/researcher(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/paper/research_notes/bad(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/reagent_container/syringe(H), WEAR_IN_JACKET) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/researcher(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/bad(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/reagent_container/syringe(new_human), WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) diff --git a/code/modules/gear_presets/uscm_police.dm b/code/modules/gear_presets/uscm_police.dm index 527151ffe646..5b921f07f219 100644 --- a/code/modules/gear_presets/uscm_police.dm +++ b/code/modules/gear_presets/uscm_police.dm @@ -39,25 +39,25 @@ service_over = list(/obj/item/clothing/suit/storage/jacket/marine/service/mp) -/datum/equipment_preset/uscm_ship/uscm_police/mp/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/uscm_police/mp/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mmpo(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP(H), WEAR_JACKET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mmpo(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP(new_human), WEAR_JACKET) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) /datum/equipment_preset/uscm_ship/uscm_police/mp/load_rank(mob/living/carbon/human/human) if(human.client && get_job_playtime(human.client, rank) < JOB_PLAYTIME_TIER_1) @@ -102,25 +102,25 @@ service_over = list(/obj/item/clothing/suit/storage/jacket/marine/service/warden) -/datum/equipment_preset/uscm_ship/uscm_police/warden/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/uscm_police/warden/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/cmpcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/warden(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/warden(H), WEAR_JACKET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/cmpcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/warden(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/warden(new_human), WEAR_JACKET) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/warden(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/warden(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) //*****************************************************************************************************/ @@ -164,25 +164,25 @@ service_over = list(/obj/item/clothing/suit/storage/jacket/marine/service/cmp) -/datum/equipment_preset/uscm_ship/uscm_police/cmp/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/uscm_police/cmp/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/cmpcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/warrant(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/WO(H), WEAR_JACKET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/cmpcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/warrant(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/WO(new_human), WEAR_JACKET) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/cmp(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/cmp(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) //*****************************************************************************************************/ @@ -206,33 +206,33 @@ . = ..() access = get_all_accesses() + get_all_centcom_access() -/datum/equipment_preset/uscm_ship/uscm_police/riot_mp/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/uscm_police/riot_mp/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/cmpcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/warrant(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/riot/marine(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/riot(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat/riot(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/box/flashbangs(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/handcuffs(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/handcuffs(H.back), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/beanbag/riot(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/beanbag/riot(H), WEAR_R_STORE) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/cmpcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/warrant(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/riot/marine(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/riot(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(new_human), WEAR_WAIST) + 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/mask/gas(new_human), WEAR_FACE) + 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/weapon/shield/riot(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat/riot(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/flashbangs(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/beanbag/riot(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/beanbag/riot(new_human), WEAR_R_STORE) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) else - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) //*****************************************************************************************************/ diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index ff8e6dfade18..1569d282807e 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -70,21 +70,21 @@ dress_gloves = list(/obj/item/clothing/gloves/marine/dress) dress_shoes = list(/obj/item/clothing/shoes/laceup) -/datum/equipment_preset/uscm_ship/liaison/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/liaison/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/lockable/liaison //There is no suitable backpack for a CL really... - //if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + //if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) //back_item = /obj/item/storage/backpack - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcl(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), WEAR_FEET) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcl(new_human), WEAR_L_EAR) + 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/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) -/datum/equipment_preset/uscm_ship/liaison/load_rank(mob/living/carbon/human/H) - if(H.client) - var/playtime = get_job_playtime(H.client, rank) - if(H.client.prefs.playtime_perks) +/datum/equipment_preset/uscm_ship/liaison/load_rank(mob/living/carbon/human/new_human) + if(new_human.client) + var/playtime = get_job_playtime(new_human.client, rank) + if(new_human.client.prefs.playtime_perks) if(playtime > JOB_PLAYTIME_TIER_4) return "WYC5" else if(playtime > JOB_PLAYTIME_TIER_3) @@ -125,19 +125,19 @@ minimap_icon = "correspondent" minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN -/datum/equipment_preset/uscm_ship/reporter/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/reporter/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/reporter(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/reporter(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/reporter(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), WEAR_FEET) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/camera(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/device/camera_film(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/binoculars(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/notepad(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/reporter(new_human), WEAR_L_EAR) + 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 back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/camera(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/device/camera_film(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/notepad(new_human), WEAR_IN_BACK) /datum/equipment_preset/uscm_ship/reporter_uscm name = "Combat Correspondent" @@ -157,29 +157,29 @@ minimap_icon = "correspondent" minimap_background = MINIMAP_ICON_BACKGROUND_CIC -/datum/equipment_preset/uscm_ship/reporter_uscm/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/reporter_uscm/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine var/obj/item/clothing/under/marine/uniform = new() - uniform.attach_accessory(H, new /obj/item/clothing/accessory/storage/black_vest/brown_vest) - - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/reporter(H), WEAR_L_EAR) - H.equip_to_slot_or_del(uniform, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(H), WEAR_R_STORE) - - H.equip_to_slot_or_del(new /obj/item/device/camera(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/device/camera_film(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/binoculars(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/notepad(H), WEAR_IN_BACK) + uniform.attach_accessory(new_human, new /obj/item/clothing/accessory/storage/black_vest/brown_vest) + + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/reporter(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(uniform, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) + + new_human.equip_to_slot_or_del(new /obj/item/device/camera(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/device/camera_film(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/notepad(new_human), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -211,18 +211,18 @@ utility_under = list(/obj/item/clothing/under/marine/officer/ce) -/datum/equipment_preset/uscm_ship/chief_engineer/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/chief_engineer/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/tech - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/ce(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/ce(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/electronics(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/ce(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/ce(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/yellow(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/electronics(new_human), WEAR_R_STORE) //*****************************************************************************************************/ @@ -245,25 +245,25 @@ utility_under = list(/obj/item/clothing/under/marine/officer/engi) -/datum/equipment_preset/uscm_ship/maint/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/maint/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/tech - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/welding(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/demo_scanner(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/bag/trash(H), WEAR_L_HAND) - -/datum/equipment_preset/uscm_ship/maint/load_rank(mob/living/carbon/human/H) - if(H.client) - if(get_job_playtime(H.client, rank) < JOB_PLAYTIME_TIER_1) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi(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/yellow(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/welding(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/demo_scanner(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/bag/trash(new_human), WEAR_L_HAND) + +/datum/equipment_preset/uscm_ship/maint/load_rank(mob/living/carbon/human/new_human) + if(new_human.client) + if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) return "ME1" return paygrade @@ -290,19 +290,19 @@ utility_under = list(/obj/item/clothing/under/marine/officer/engi) -/datum/equipment_preset/uscm_ship/ordn/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/ordn/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/tech - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi/OT(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/demo_scanner(H), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi/OT(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/yellow(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/demo_scanner(new_human), WEAR_L_STORE) //*****************************************************************************************************/ @@ -335,19 +335,19 @@ utility_under = list(/obj/item/clothing/under/rank/ro_suit) -/datum/equipment_preset/uscm_ship/ro/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/ro/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/industrial - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/ro(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/ro_suit(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/req(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/flash(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/ro(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/ro_suit(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/yellow(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/req(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) //*****************************************************************************************************/ @@ -366,23 +366,23 @@ utility_under = list(/obj/item/clothing/under/rank/cargotech) -/datum/equipment_preset/uscm_ship/cargo/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/cargo/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/industrial - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/ct(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargotech(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beanie(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(H), WEAR_R_STORE) - -/datum/equipment_preset/uscm_ship/cargo/load_rank(mob/living/carbon/human/H) - if(H.client) - if(get_job_playtime(H.client, rank) < JOB_PLAYTIME_TIER_1) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/ct(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargotech(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/yellow(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beanie(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) + +/datum/equipment_preset/uscm_ship/cargo/load_rank(mob/living/carbon/human/new_human) + if(new_human.client) + if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) return "ME1" return paygrade @@ -422,18 +422,18 @@ . = ..() access = get_all_marine_access() -/datum/equipment_preset/uscm_ship/commander/load_race(mob/living/carbon/human/H, client/mob_client) +/datum/equipment_preset/uscm_ship/commander/load_race(mob/living/carbon/human/new_human, client/mob_client) ..() - ADD_TRAIT(H, TRAIT_EMOTE_CD_EXEMPT, TRAIT_SOURCE_JOB) + ADD_TRAIT(new_human, TRAIT_EMOTE_CD_EXEMPT, TRAIT_SOURCE_JOB) -/datum/equipment_preset/uscm_ship/commander/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/commander/load_gear(mob/living/carbon/human/new_human) var/sidearm = "Mateba" var/kit = null var/sidearmpath = /obj/item/storage/belt/gun/mateba/cmateba/full var/back_item = /obj/item/storage/backpack/satchel/lockable - if(H.client && H.client.prefs) - sidearm = H.client.prefs.commander_sidearm + if(new_human.client && new_human.client.prefs) + sidearm = new_human.client.prefs.commander_sidearm switch(sidearm) if("Mateba") sidearmpath = /obj/item/storage/belt/gun/mateba/cmateba/full @@ -450,18 +450,18 @@ if("VP78") sidearmpath = /obj/item/storage/belt/gun/m4a3/vp78 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress/commander(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/cm(H), WEAR_HEAD) - H.equip_to_slot_or_del(new sidearmpath(H), WEAR_WAIST) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/command(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(H), WEAR_L_HAND) + 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(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress/commander(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/cm(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new sidearmpath(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/command(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_L_HAND) if(kit) - H.equip_to_slot_or_del(new kit(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new kit(new_human), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -475,9 +475,9 @@ role_comm_title = "CO" minimum_age = 35 -/datum/equipment_preset/uscm_ship/commander/council/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/commander/council(H), WEAR_HEAD) +/datum/equipment_preset/uscm_ship/commander/council/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/commander/council(new_human), WEAR_HEAD) . = ..() /datum/equipment_preset/uscm_ship/commander/council/plus @@ -485,8 +485,8 @@ idtype = /obj/item/card/id/general paygrade = "MO6" -/datum/equipment_preset/uscm_ship/commander/council/plus/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/commander/councilchief(H), WEAR_HEAD) +/datum/equipment_preset/uscm_ship/commander/council/plus/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/commander/councilchief(new_human), WEAR_HEAD) . = ..() //*****************************************************************************************************/ @@ -512,20 +512,20 @@ . = ..() access = get_all_marine_access() - ACCESS_MARINE_CAPTAIN -/datum/equipment_preset/uscm_ship/xo/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/xo/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/exec(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range(H), WEAR_L_STORE) + 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/exec(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service(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/head/cmcap(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_L_STORE) //*****************************************************************************************************/ @@ -545,20 +545,20 @@ minimap_icon = list("cic" = MINIMAP_ICON_COLOR_BRONZE) minimap_background = MINIMAP_ICON_BACKGROUND_CIC -/datum/equipment_preset/uscm_ship/so/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/so/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/ro(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range(H), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(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/shoes/dress(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/ro(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_L_HAND) //*****************************************************************************************************/ @@ -583,21 +583,21 @@ . = ..() access = get_all_marine_access() - ACCESS_MARINE_CAPTAIN -/datum/equipment_preset/uscm_ship/sea/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/sea/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m44/custom(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/head/drillhat(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/flash(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/device/binoculars(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/device/whistle(H), WEAR_R_HAND) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + + 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/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m44/custom(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/drillhat(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/device/whistle(new_human), WEAR_R_HAND) /datum/equipment_preset/uscm_ship/sea/load_rank(mob/living/carbon/human/rankee) if(rankee?.client?.prefs?.pref_special_job_options[rank]) @@ -621,15 +621,15 @@ minimap_icon = "pilot" -/datum/equipment_preset/uscm_ship/po/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/po/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel - if(H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if(new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) //*****************************************************************************************************/ @@ -639,21 +639,21 @@ utility_under = list(/obj/item/clothing/under/marine/officer/pilot) -/datum/equipment_preset/uscm_ship/po/full/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/po/full/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel - if(H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if(new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/pilot(H), WEAR_JACKET) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/pilot(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + 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/belt/gun/m4a3/mod88(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/pilot(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/pilot(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) //*****************************************************************************************************/ @@ -671,15 +671,15 @@ minimap_icon = "dcc" -/datum/equipment_preset/uscm_ship/dcc/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/dcc/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel - if(H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if(new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot/dcc(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot/dcc(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) //*****************************************************************************************************/ @@ -689,21 +689,21 @@ utility_under = list(/obj/item/clothing/under/marine/officer/pilot/dcc) -/datum/equipment_preset/uscm_ship/dcc/full/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/dcc/full/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel - if(H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if(new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot/dcc(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest/dcc(H), WEAR_JACKET) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot/dcc(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + 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/belt/gun/m4a3/mod88(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest/dcc(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) //*****************************************************************************************************/ @@ -735,16 +735,16 @@ . = ..() access = get_all_accesses() + get_all_centcom_access() -/datum/equipment_preset/uscm_ship/officer/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/officer/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels - H.equip_if_possible(new /obj/item/clothing/under/rank/centcom/officer(H), WEAR_BODY) - H.equip_if_possible(new /obj/item/clothing/shoes/centcom(H), WEAR_FEET) - H.equip_if_possible(new /obj/item/clothing/gloves/white(H), WEAR_HANDS) - H.equip_if_possible(new /obj/item/clothing/head/beret/centcom/officer(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(H), WEAR_L_EAR) + new_human.equip_if_possible(new /obj/item/clothing/under/rank/centcom/officer(new_human), WEAR_BODY) + new_human.equip_if_possible(new /obj/item/clothing/shoes/centcom(new_human), WEAR_FEET) + new_human.equip_if_possible(new /obj/item/clothing/gloves/white(new_human), WEAR_HANDS) + new_human.equip_if_possible(new /obj/item/clothing/head/beret/centcom/officer(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(new_human), WEAR_L_EAR) - H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(H), WEAR_EYES) - H.equip_if_possible(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) + new_human.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) + new_human.equip_if_possible(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) //*****************************************************************************************************/ @@ -763,23 +763,23 @@ utility_under = list(/obj/item/clothing/under/marine/chef) -/datum/equipment_preset/uscm_ship/chef/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/uscm_ship/chef/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new /obj/item/clothing/head/chefhat(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/chef(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/chef(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/chef(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(H), WEAR_R_STORE) - -/datum/equipment_preset/uscm_ship/chef/load_rank(mob/living/carbon/human/H) - if(H.client) - if(get_job_playtime(H.client, rank) < JOB_PLAYTIME_TIER_1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/chefhat(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/chef(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/chef(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/chef(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(new_human), WEAR_WAIST) + 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/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) + +/datum/equipment_preset/uscm_ship/chef/load_rank(mob/living/carbon/human/new_human) + if(new_human.client) + if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1) return "ME1" return paygrade diff --git a/code/modules/gear_presets/whiteout.dm b/code/modules/gear_presets/whiteout.dm index 21d55e616684..3c242cd506d3 100644 --- a/code/modules/gear_presets/whiteout.dm +++ b/code/modules/gear_presets/whiteout.dm @@ -15,68 +15,68 @@ . = ..() access = get_antagonist_pmc_access() -/datum/equipment_preset/pmc/w_y_whiteout/load_race(mob/living/carbon/human/H) - H.set_species(SYNTH_COMBAT) - H.allow_gun_usage = TRUE //To allow usage of Guns/Grenades - H.h_style = "Bald" - H.f_style = "Shaved" - -/datum/equipment_preset/pmc/w_y_whiteout/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(MALE) +/datum/equipment_preset/pmc/w_y_whiteout/load_race(mob/living/carbon/human/new_human) + new_human.set_species(SYNTH_COMBAT) + new_human.allow_gun_usage = TRUE //To allow usage of Guns/Grenades + new_human.h_style = "Bald" + new_human.f_style = "Shaved" + +/datum/equipment_preset/pmc/w_y_whiteout/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(MALE) //var/datum/preferences/A = new() //A.randomize_appearance(mob) var/random_name - if(H.gender == MALE) + if(new_human.gender == MALE) random_name = "[pick(greek_letters)]" else random_name = "[pick(greek_letters)]" - H.change_real_name(H, random_name) - H.age = rand(17,45) + new_human.change_real_name(new_human, random_name) + new_human.age = rand(17,45) -/datum/equipment_preset/pmc/w_y_whiteout/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/pmc/w_y_whiteout/load_gear(mob/living/carbon/human/new_human) // back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/commando, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/EX, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/EX, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/commando, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + 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/explosive/plastic/breaching_charge, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste, 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/firstaid/synth, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/EX, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/EX, WEAR_IN_BACK) //face - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles/m42c, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles/m42c, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD) //uniform var/obj/item/clothing/under/marine/veteran/pmc/commando/M = new() var/obj/item/clothing/accessory/storage/webbing/W = new() - M.attach_accessory(H, W) - H.equip_to_slot_or_del(M, WEAR_BODY) + M.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(M, WEAR_BODY) for(var/i in 1 to W.hold.storage_slots) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_ACCESSORY) //jacket var/obj/item/clothing/suit/storage/marine/veteran/pmc/commando/armor = new() - H.equip_to_slot_or_del(armor, WEAR_JACKET) + new_human.equip_to_slot_or_del(armor, WEAR_JACKET) for(var/i in 1 to armor.storage_slots) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/heap, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite/whiteout, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/heap, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite/whiteout, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/weapon/gun/flamer/deathsquad, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/flamer/deathsquad, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc/commando, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc/commando, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/knife, WEAR_FEET) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/rifle_heap, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/rifle_heap, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/rifle_heap, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/rifle_heap, WEAR_L_STORE) var/obj/item/device/internal_implant/agility/implant = new() - implant.on_implanted(H) + implant.on_implanted(new_human) //*****************************************************************************************************/ @@ -86,47 +86,47 @@ assignment = "Whiteout Team Medic" role_comm_title = "WO-TM" -/datum/equipment_preset/pmc/w_y_whiteout/medic/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/pmc/w_y_whiteout/medic/load_gear(mob/living/carbon/human/new_human) // back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/commando, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/commando, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, 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/roller, WEAR_IN_BACK) //face - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/medhud, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/medhud, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD) //uniform var/obj/item/clothing/under/marine/veteran/pmc/commando/M = new() var/obj/item/clothing/accessory/storage/webbing/W = new() - M.attach_accessory(H, W) - H.equip_to_slot_or_del(M, WEAR_BODY) + M.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(M, WEAR_BODY) for(var/i in 1 to W.hold.storage_slots) - H.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_ACCESSORY) //jacket var/obj/item/clothing/suit/storage/marine/veteran/pmc/commando/armor = new() - H.equip_to_slot_or_del(armor, WEAR_JACKET) + new_human.equip_to_slot_or_del(armor, WEAR_JACKET) for(var/i in 1 to armor.storage_slots) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/heap, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite/whiteout, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/heap, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite/whiteout, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/weapon/gun/flamer/deathsquad, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/flamer/deathsquad, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc/commando, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc/commando, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/knife, WEAR_FEET) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/smg_heap, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/smg_heap, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/smg_heap, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/smg_heap, WEAR_R_STORE) var/obj/item/device/internal_implant/agility/implant = new() - implant.on_implanted(H) + implant.on_implanted(new_human) //*****************************************************************************************************/ /datum/equipment_preset/pmc/w_y_whiteout/terminator @@ -135,39 +135,39 @@ assignment = "Whiteout Team Terminator" role_comm_title = "WO-TT" -/datum/equipment_preset/pmc/w_y_whiteout/terminator/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/pmc/w_y_whiteout/terminator/load_gear(mob/living/carbon/human/new_human) // back - H.equip_to_slot_or_del(new /obj/item/smartgun_powerpack/pmc, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack/pmc, WEAR_BACK) //face - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/whiteout, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/whiteout, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD) //uniform var/obj/item/clothing/under/marine/veteran/pmc/commando/M = new() var/obj/item/clothing/accessory/storage/webbing/W = new() - M.attach_accessory(H, W) - H.equip_to_slot_or_del(M, WEAR_BODY) + M.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(M, WEAR_BODY) for(var/i in 1 to W.hold.storage_slots) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_ACCESSORY) //jacket var/obj/item/clothing/suit/storage/marine/smartgunner/veteran/pmc/terminator/armor = new() - H.equip_to_slot_or_del(armor, WEAR_JACKET) + new_human.equip_to_slot_or_del(armor, WEAR_JACKET) for(var/i in 1 to armor.storage_slots) - H.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/dirty/elite, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/dirty/elite, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/whiteout/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/whiteout/full, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc/commando, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc/commando, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/knife, WEAR_FEET) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sg, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sg, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sg, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sg, WEAR_L_STORE) var/obj/item/device/internal_implant/agility/implant = new() - implant.on_implanted(H) + implant.on_implanted(new_human) //*****************************************************************************************************/ /datum/equipment_preset/pmc/w_y_whiteout/leader @@ -176,44 +176,44 @@ assignment = "Whiteout Team Leader" role_comm_title = "WO-TL" -/datum/equipment_preset/pmc/w_y_whiteout/leader/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/pmc/w_y_whiteout/leader/load_gear(mob/living/carbon/human/new_human) // back - H.equip_to_slot_or_del(new /obj/item/storage/backpack/commando, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/commando, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste, 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/explosive/plastic/breaching_charge, WEAR_IN_BACK) + 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/firstaid/synth, WEAR_IN_BACK) //face - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles/m42c, WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles/m42c, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD) //uniform var/obj/item/clothing/under/marine/veteran/pmc/commando/M = new() var/obj/item/clothing/accessory/storage/webbing/W = new() - M.attach_accessory(H, W) - H.equip_to_slot_or_del(M, WEAR_BODY) + M.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(M, WEAR_BODY) for(var/i in 1 to W.hold.storage_slots) - H.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_ACCESSORY) //jacket var/obj/item/clothing/suit/storage/marine/veteran/pmc/commando/armor = new() - H.equip_to_slot_or_del(armor, WEAR_JACKET) + new_human.equip_to_slot_or_del(armor, WEAR_JACKET) for(var/i in 1 to armor.storage_slots) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/heap, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite/whiteout, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/heap, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite/whiteout, WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/full, WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc/commando, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc/commando, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/knife, WEAR_FEET) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/rifle_heap, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/rifle_heap, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/rifle_heap, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/rifle_heap, WEAR_L_STORE) var/obj/item/device/internal_implant/agility/implant = new() - implant.on_implanted(H) + implant.on_implanted(new_human) diff --git a/code/modules/gear_presets/wo.dm b/code/modules/gear_presets/wo.dm index 253b00b0487f..5ca610c06434 100644 --- a/code/modules/gear_presets/wo.dm +++ b/code/modules/gear_presets/wo.dm @@ -5,8 +5,8 @@ languages = list(LANGUAGE_ENGLISH) idtype = /obj/item/card/id/dogtag -/datum/equipment_preset/wo/load_status(mob/living/carbon/human/H) - H.nutrition = NUTRITION_NORMAL +/datum/equipment_preset/wo/load_status(mob/living/carbon/human/new_human) + new_human.nutrition = NUTRITION_NORMAL //*****************************************************************************************************/ @@ -43,14 +43,14 @@ . = ..() access = get_all_marine_access() -/datum/equipment_preset/wo/commander/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/commander/load_gear(mob/living/carbon/human/new_human) var/sidearm = "Mateba" var/kit = null var/sidearmpath = /obj/item/storage/belt/gun/mateba/cmateba/full var/back_item = /obj/item/storage/backpack/satchel/lockable - if(H.client && H.client.prefs) - sidearm = H.client.prefs.commander_sidearm + if(new_human.client && new_human.client.prefs) + sidearm = new_human.client.prefs.commander_sidearm switch(sidearm) if("Mateba") sidearmpath = /obj/item/storage/belt/gun/mateba/cmateba/full @@ -68,26 +68,26 @@ sidearmpath = /obj/item/storage/belt/gun/m4a3/vp78 //back - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) if(kit) - H.equip_to_slot_or_del(new kit(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new kit(new_human), WEAR_IN_BACK) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/cm(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(H), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/cm(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(new_human), WEAR_L_EAR) //uniform - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/command(H), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/command(new_human), WEAR_BODY) //jacket - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/SO(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword/ceremonial(H), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/SO(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/claymore/mercsword/ceremonial(new_human), WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new sidearmpath(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new sidearmpath(new_human), WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/techofficer/commander(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress/commander(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(H), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/techofficer/commander(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress/commander(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_L_HAND) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/command(H), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/command(new_human), WEAR_L_STORE) //*****************************************************************************************************/ @@ -111,27 +111,27 @@ . = ..() access = get_all_marine_access() -/datum/equipment_preset/wo/xo/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/xo/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine //back - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(H), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(new_human), WEAR_L_EAR) //uniform - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/exec(H), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/exec(new_human), WEAR_BODY) //jacket - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/SO(H), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/SO(new_human), WEAR_JACKET) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) //*****************************************************************************************************/ @@ -149,28 +149,28 @@ minimap_icon = "cmp" -/datum/equipment_preset/wo/cmp/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/cmp/load_gear(mob/living/carbon/human/new_human) //uniform - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(H), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY) //jacket - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(H), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE) //back - H.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(new_human), WEAR_BACK) //head - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/mp_honor/com(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/chiefofficer(H), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/mp_honor/com(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/chiefofficer(new_human), WEAR_HEAD) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/bayonet(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(H), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/bayonet(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_L_STORE) //SG headset - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles(new_human), WEAR_EYES) //*****************************************************************************************************/ /datum/equipment_preset/wo/vhg @@ -187,30 +187,30 @@ minimap_icon = "so" -/datum/equipment_preset/wo/vhg/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/vhg/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security //back - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec/alt(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/mp_honor/com(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec/alt(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/mp_honor/com(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(new_human), WEAR_EYES) //uniform - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(H), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY) //jacket - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/leader(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(H), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/leader(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_J_STORE) //waist - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1(new_human), WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/officer(H), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/officer(new_human), WEAR_HANDS) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/bayonet(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(H), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/bayonet(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE) //*****************************************************************************************************/ @@ -229,28 +229,28 @@ minimap_icon = "spec" -/datum/equipment_preset/wo/hgs/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/hgs/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security //back - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) //head - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/mp_honor(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/logisticsofficer(H), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/mp_honor(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/logisticsofficer(new_human), WEAR_HEAD) //uniform - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(H), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY) //waist - H.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39/full(H), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39/full(new_human), WEAR_WAIST) //limbs - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/officer(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/spec_kit(H), WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/officer(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/spec_kit(new_human), WEAR_R_HAND) //pockets - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39(H), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39(new_human), WEAR_L_STORE) //*****************************************************************************************************/ @@ -268,24 +268,24 @@ minimap_icon = "mp" -/datum/equipment_preset/wo/hg/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/hg/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/security - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/mp_honor(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/officer(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/leader(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/logisticsofficer(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/bayonet(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/mp_honor(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/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/officer(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/leader(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/logisticsofficer(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/bayonet(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -302,24 +302,24 @@ minimap_icon = "vc" -/datum/equipment_preset/wo/mortar_crew/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/mortar_crew/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/mortar, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/engineer, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_WAIST) - H.equip_to_slot_or_del(new back_item, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/screwdriver, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/mortar, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/mortar, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/engineer, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_WAIST) + new_human.equip_to_slot_or_del(new back_item, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/mortar, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses, WEAR_IN_BACK) //*****************************************************************************************************/ @@ -338,19 +338,19 @@ minimap_icon = "ro" -/datum/equipment_preset/wo/quartermaster/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/quartermaster/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/industrial - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/techofficer(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m44/custom(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/req(H), WEAR_HEAD) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(H), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(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/shoes/marine(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/techofficer(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m44/custom(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/req(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) //*****************************************************************************************************/ @@ -366,23 +366,23 @@ skills = /datum/skills/CE idtype = /obj/item/card/id -/datum/equipment_preset/wo/cargo/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/cargo/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/industrial - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/ct(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/engineer(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/ct(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/engineer(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/yellow(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(new_human), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -400,32 +400,32 @@ minimap_icon = "cmo" -/datum/equipment_preset/wo/head_surgeon/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/head_surgeon/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/medic - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/cmo(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), WEAR_JACKET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/cmo(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medical(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(H), WEAR_HEAD) - //H.equip_to_slot_or_del(new /obj/item/clothing/head/cmo(H), WEAR_HEAD)//2.10.2018 Will want to work on this a bit more, it doesn't quite fit. - Joshuu - H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), WEAR_J_STORE) - - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(H.back), WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator(H.back), WEAR_IN_BACK) + 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 back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(new_human), WEAR_HEAD) + //new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmo(new_human), WEAR_HEAD)//2.10.2018 Will want to work on this a bit more, it doesn't quite fit. - Joshuu + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(new_human), WEAR_J_STORE) + + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human.back), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator(new_human.back), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -443,29 +443,29 @@ minimap_icon = "doctor" -/datum/equipment_preset/wo/doctor/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/doctor/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/medic - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medical(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(H), WEAR_HEAD) - - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(H.back), WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator(H.back), WEAR_IN_BACK) + 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 back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(new_human), WEAR_HEAD) + + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human.back), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator(new_human.back), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -483,29 +483,29 @@ minimap_icon = "researcher" -/datum/equipment_preset/wo/chemist/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/chemist/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/medic - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/researcher(H), WEAR_JACKET) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/doc(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(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/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/researcher(new_human), WEAR_JACKET) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medical(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced(H), WEAR_L_STORE) + 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 back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced(new_human), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(H.back), WEAR_IN_BELT) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator(H.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human.back), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator(new_human.back), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -523,23 +523,23 @@ minimap_icon = "ce" -/datum/equipment_preset/wo/bcm/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/bcm/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/tech - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/engineer(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/engineer(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/yellow(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(new_human), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -557,23 +557,23 @@ minimap_icon = "mt" -/datum/equipment_preset/wo/bc/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/bc/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/tech - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/engineer(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/engineer(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/yellow(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(new_human), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -595,22 +595,22 @@ minimap_icon = "surv" minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN -/datum/equipment_preset/wo/reporter/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/reporter/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel //There is no suitable backpack for a CL really... - //if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + //if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) //back_item = /obj/item/storage/backpack - H.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/suspenders(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), WEAR_FEET) - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/device/camera(H), WEAR_L_HAND) - H.equip_to_slot_or_del(new /obj/item/device/camera_film(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/binoculars(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/taperecorder(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/megaphone(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/suspenders(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 back_item(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/camera(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/device/camera_film(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/megaphone(new_human), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -631,27 +631,27 @@ role_comm_title = "SL" skills = /datum/skills/SL -/datum/equipment_preset/wo/marine/sl/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/marine/sl/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/leader(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/leader(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/map/whiskey_outpost_map(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/designator(H), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/leader(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/leader(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/map/whiskey_outpost_map(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/designator(new_human), WEAR_IN_BACK) - add_common_wo_equipment(H) + add_common_wo_equipment(new_human) //*****************************************************************************************************/ @@ -666,27 +666,27 @@ role_comm_title = "Spc" skills = /datum/skills/specialist -/datum/equipment_preset/wo/marine/spec/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/marine/spec/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing(H), WEAR_ACCESSORY) - H.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/attachable/magnetic_harness(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/spec_kit, WEAR_R_HAND) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39(H), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/whiskey_supply_beacon(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39/full(new_human), WEAR_WAIST) + 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) + 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/storage/pouch/pistol(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/attachable/magnetic_harness(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/spec_kit, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39(new_human), WEAR_L_STORE) - add_common_wo_equipment(H) + add_common_wo_equipment(new_human) //*****************************************************************************************************/ @@ -701,18 +701,18 @@ role_comm_title = "SG" skills = /datum/skills/smartgunner -/datum/equipment_preset/wo/marine/sg/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/marine/sg/load_gear(mob/living/carbon/human/new_human) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles(new_human), WEAR_EYES) - add_common_wo_equipment(H) + add_common_wo_equipment(new_human) //*****************************************************************************************************/ @@ -727,26 +727,26 @@ role_comm_title = "ComTech" skills = /datum/skills/combat_engineer -/datum/equipment_preset/wo/marine/engineer/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/marine/engineer/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/tech - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/engineer(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/tech(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack(H), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/device/binoculars/range(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(H), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/engineer(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/tech(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack(new_human), WEAR_BACK) + 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/device/binoculars/range(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full(new_human), WEAR_L_STORE) - generate_random_marine_primary_for_wo(H) - add_common_wo_equipment(H) + generate_random_marine_primary_for_wo(new_human) + add_common_wo_equipment(new_human) //*****************************************************************************************************/ @@ -761,30 +761,30 @@ role_comm_title = "HM" skills = /datum/skills/combat_medic -/datum/equipment_preset/wo/marine/medic/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/marine/medic/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/medic - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) - - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/medic(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), WEAR_FACE) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/device/defibrillator(H), WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full(H), WEAR_WAIST) - if(H.disabilities & NEARSIGHTED) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(H), WEAR_EYES) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/medic(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/medic(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_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/belt/medical/lifesaver/full(new_human), WEAR_WAIST) + 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 - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(H), WEAR_EYES) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_JACKET) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_JACKET) - generate_random_marine_primary_for_wo(H) - add_common_wo_equipment(H) + 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/storage/pouch/medkit/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_JACKET) + generate_random_marine_primary_for_wo(new_human) + add_common_wo_equipment(new_human) //*****************************************************************************************************/ @@ -799,16 +799,16 @@ role_comm_title = "RFN" skills = /datum/skills/pfc -/datum/equipment_preset/wo/marine/pfc/load_gear(mob/living/carbon/human/H) +/datum/equipment_preset/wo/marine/pfc/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel - if (H.client && H.client.prefs && (H.client.prefs.backbag == 1)) + if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - H.equip_to_slot_or_del(new back_item(H), WEAR_BACK) + new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(H), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/medium(new_human), WEAR_JACKET) - generate_random_marine_primary_for_wo(H) - add_common_wo_equipment(H) + generate_random_marine_primary_for_wo(new_human) + add_common_wo_equipment(new_human) diff --git a/code/modules/gear_presets/wy.dm b/code/modules/gear_presets/wy.dm index 8cabac9c01a3..8532391dd2c5 100644 --- a/code/modules/gear_presets/wy.dm +++ b/code/modules/gear_presets/wy.dm @@ -23,14 +23,14 @@ . = ..() access += get_all_civilian_accesses() + get_all_centcom_access() -/datum/equipment_preset/wy/load_id(mob/living/carbon/human/H) +/datum/equipment_preset/wy/load_id(mob/living/carbon/human/new_human) . = ..() -/datum/equipment_preset/wy/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new headset_type(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(H), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(H), WEAR_BACK) +/datum/equipment_preset/wy/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new headset_type(new_human), WEAR_L_EAR) + 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/shoes/centcom(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) . = ..() /datum/equipment_preset/wy/trainee @@ -40,8 +40,8 @@ rank = JOB_TRAINEE paygrade = "WYC1" -/datum/equipment_preset/wy/trainee/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/trainee(H), WEAR_BODY) +/datum/equipment_preset/wy/trainee/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/trainee(new_human), WEAR_BODY) . = ..() /datum/equipment_preset/wy/junior_exec @@ -88,11 +88,11 @@ . = ..() access = get_all_accesses() + get_all_centcom_access() -/datum/equipment_preset/wy/manager/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/manager(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/manager(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/manager(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(H), WEAR_WAIST) +/datum/equipment_preset/wy/manager/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/manager(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/manager(new_human), WEAR_JACKET) + 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/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST) ..() /datum/equipment_preset/wy/manager/assistant_manager @@ -103,7 +103,7 @@ paygrade = "WYC7" /datum/equipment_preset/wy/manager/division_manager - name = "Corporate - H - Division Manager" + name = "Corporate - new_human - Division Manager" flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_DIVISION_MANAGER rank = JOB_DIVISION_MANAGER @@ -125,9 +125,9 @@ skills = /datum/skills/civilian/manager/director headset_type = /obj/item/device/radio/headset/distress/pmc/command/director -/datum/equipment_preset/wy/manager/director/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/director(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/director(H), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/head/director(H), WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general(H), WEAR_WAIST) +/datum/equipment_preset/wy/manager/director/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/director(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/director(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/director(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general(new_human), WEAR_WAIST) ..() diff --git a/code/modules/gear_presets/wy_goons.dm b/code/modules/gear_presets/wy_goons.dm index 292cb09929b6..8bc4cd1ad681 100644 --- a/code/modules/gear_presets/wy_goons.dm +++ b/code/modules/gear_presets/wy_goons.dm @@ -11,44 +11,44 @@ . = ..() access = get_all_accesses() + get_all_centcom_access() -/datum/equipment_preset/goon/load_name(mob/living/carbon/human/H, randomise) - H.gender = pick(MALE, FEMALE) +/datum/equipment_preset/goon/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(MALE, FEMALE) var/datum/preferences/A = new() - A.randomize_appearance(H) + A.randomize_appearance(new_human) var/random_name var/first_name var/last_name //gender checks - if(H.gender == MALE) + if(new_human.gender == MALE) first_name = "[pick(first_names_male_pmc)]" - H.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") + new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") else first_name = "[pick(first_names_female_pmc)]" last_name = "[pick(last_names_pmc)]" random_name = "[first_name] [last_name]" - H.change_real_name(H, random_name) + new_human.change_real_name(new_human, random_name) - H.age = rand(17,35) + new_human.age = rand(17,35) - H.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut") + new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut") var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) var/hair_color = pick(hair_colors) - H.r_hair = hair_colors[hair_color][1] - H.g_hair = hair_colors[hair_color][2] - H.b_hair = hair_colors[hair_color][3] - H.r_facial = hair_colors[hair_color][1] - H.g_facial = hair_colors[hair_color][2] - H.b_facial = hair_colors[hair_color][3] + new_human.r_hair = hair_colors[hair_color][1] + new_human.g_hair = hair_colors[hair_color][2] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] var/eye_color = pick(colors) - H.r_eyes = colors[eye_color][1] - H.g_eyes = colors[eye_color][2] - H.b_eyes = colors[eye_color][3] + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] -/datum/equipment_preset/goon/load_id(mob/living/carbon/human/H, client/mob_client) - var/obj/item/clothing/under/uniform = H.w_uniform +/datum/equipment_preset/goon/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 uniform.sensor_faction = FACTION_WY @@ -64,28 +64,28 @@ paygrade = "WEY-GOON" skills = /datum/skills/MP -/datum/equipment_preset/goon/standard/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) +/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, 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/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/corporate, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pulse_rifle, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/corporate, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pulse_rifle, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_BACK) /datum/equipment_preset/goon/lead @@ -97,28 +97,28 @@ paygrade = "WEY-GOON-L" skills = /datum/skills/MP -/datum/equipment_preset/goon/lead/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/lead, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/lead, WEAR_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) - - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) - - H.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/nsg_ap, WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/nsg23/ap, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/nsg23/ap, WEAR_IN_BACK) +/datum/equipment_preset/goon/lead/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/lead, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, 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/helmet/marine/veteran/pmc/corporate/lead, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) + + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) + + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) + + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/nsg_ap, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/nsg23/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/nsg23/ap, WEAR_IN_BACK) /datum/equipment_preset/goon/researcher name = "Weyland-Yutani Corporate Research Consultant (Goon Researcher)" @@ -129,26 +129,26 @@ paygrade = "CCMO" skills = /datum/skills/researcher -/datum/equipment_preset/goon/researcher/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit, WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat, WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) +/datum/equipment_preset/goon/researcher/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) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - H.equip_to_slot_or_del(new /obj/item/handheld_distress_beacon, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/handheld_distress_beacon, WEAR_IN_BACK) var/obj/item/spacecash/bundle/money = new /obj/item/spacecash/bundle money.worth = 5000 money.update_icon() - H.equip_to_slot_or_del(money, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(money, WEAR_IN_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full, WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medical, WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_R_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_L_STORE) diff --git a/code/modules/gear_presets/yautja.dm b/code/modules/gear_presets/yautja.dm index 36eaadb54537..51d2178bd905 100644 --- a/code/modules/gear_presets/yautja.dm +++ b/code/modules/gear_presets/yautja.dm @@ -9,24 +9,24 @@ var/default_cape_type = "None" -/datum/equipment_preset/yautja/load_race(mob/living/carbon/human/H, client/mob_client) - H.set_species(SPECIES_YAUTJA) - H.ethnicity = "tan" - H.body_type = "pred" //can be removed in future for body types +/datum/equipment_preset/yautja/load_race(mob/living/carbon/human/new_human, client/mob_client) + new_human.set_species(SPECIES_YAUTJA) + new_human.ethnicity = "tan" + new_human.body_type = "pred" //can be removed in future for body types if(!mob_client) - mob_client = H.client + mob_client = new_human.client if(mob_client?.prefs) - H.h_style = mob_client.prefs.predator_h_style - H.ethnicity = mob_client.prefs.predator_skin_color + new_human.h_style = mob_client.prefs.predator_h_style + new_human.ethnicity = mob_client.prefs.predator_skin_color -/datum/equipment_preset/yautja/load_id(mob/living/carbon/human/H) - H.job = rank - H.faction = faction +/datum/equipment_preset/yautja/load_id(mob/living/carbon/human/new_human) + new_human.job = rank + new_human.faction = faction -/datum/equipment_preset/yautja/load_vanity(mob/living/carbon/human/H) +/datum/equipment_preset/yautja/load_vanity(mob/living/carbon/human/new_human) return //No vanity items for Yautja! -/datum/equipment_preset/yautja/load_gear(mob/living/carbon/human/H, client/mob_client) +/datum/equipment_preset/yautja/load_gear(mob/living/carbon/human/new_human, client/mob_client) var/armor_number = 1 var/boot_number = 1 var/mask_number = 1 @@ -39,7 +39,7 @@ var/cape_color = "#654321" if(!mob_client) - mob_client = H.client + mob_client = new_human.client if(mob_client?.prefs) armor_number = mob_client.prefs.predator_armor_type boot_number = mob_client.prefs.predator_boot_type @@ -52,48 +52,48 @@ cape_type = mob_client.prefs.predator_cape_type cape_color = mob_client.prefs.predator_cape_color - H.equip_to_slot_or_del(new /obj/item/clothing/under/chainshirt/hunter(H), WEAR_BODY) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yautja/hunter(H, translator_type, caster_material), WEAR_HANDS) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/yautja(H), WEAR_L_EAR) - H.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(H), WEAR_R_STORE) - H.equip_to_slot_or_del(new /obj/item/device/yautja_teleporter(H), WEAR_L_STORE) - H.equip_to_slot_or_del(new /obj/item/storage/backpack/yautja(H), WEAR_WAIST) - H.equip_to_slot_or_del(new /obj/item/storage/medicomp/full(H), WEAR_IN_BELT) + 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), 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) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/yautja/hunter/knife(H, boot_number, greave_material), WEAR_FEET) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/yautja/hunter(H, armor_number, armor_material), WEAR_JACKET) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/yautja/hunter(H, mask_number, mask_material), WEAR_FACE) + 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), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/yautja/hunter(new_human, mask_number, mask_material), WEAR_FACE) var/cape_path = GLOB.all_yautja_capes[cape_type] if(ispath(cape_path)) - H.equip_to_slot_or_del(new cape_path(H, cape_color), WEAR_BACK) + 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/H, randomise) +/datum/equipment_preset/yautja/load_name(mob/living/carbon/human/new_human, randomise) var/final_name = "Le'pro" - H.gender = MALE - H.age = 100 - H.flavor_text = "" - H.flavor_texts["general"] = H.flavor_text - - if(H.client && H.client.prefs) - H.gender = H.client.prefs.predator_gender - H.age = H.client.prefs.predator_age - final_name = H.client.prefs.predator_name - H.flavor_text = H.client.prefs.predator_flavor_text - H.flavor_texts["general"] = H.flavor_text + new_human.gender = MALE + new_human.age = 100 + new_human.flavor_text = "" + new_human.flavor_texts["general"] = new_human.flavor_text + + if(new_human.client && new_human.client.prefs) + new_human.gender = new_human.client.prefs.predator_gender + new_human.age = new_human.client.prefs.predator_age + final_name = new_human.client.prefs.predator_name + 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" - H.change_real_name(H, final_name) + new_human.change_real_name(new_human, final_name) // YOUNG BLOOD /datum/equipment_preset/yautja/youngblood name = "Yautja Young" flags = EQUIPMENT_PRESET_START_OF_ROUND -/datum/equipment_preset/yautja/youngblood/load_name(mob/living/carbon/human/H, randomise) +/datum/equipment_preset/yautja/youngblood/load_name(mob/living/carbon/human/new_human, randomise) . = ..() - var/new_name = "Young [H.real_name]" - H.change_real_name(H, new_name) + var/new_name = "Young [new_human.real_name]" + new_human.change_real_name(new_human, new_name) //BLOODED /datum/equipment_preset/yautja/blooded @@ -107,10 +107,10 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND default_cape_type = PRED_YAUTJA_HALF_CAPE -/datum/equipment_preset/yautja/elite/load_name(mob/living/carbon/human/H, randomise) +/datum/equipment_preset/yautja/elite/load_name(mob/living/carbon/human/new_human, randomise) . = ..() - var/new_name = "Elite [H.real_name]" - H.change_real_name(H, new_name) + var/new_name = "Elite [new_human.real_name]" + new_human.change_real_name(new_human, new_name) // ELDER /datum/equipment_preset/yautja/elder @@ -118,13 +118,13 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND default_cape_type = PRED_YAUTJA_THIRD_CAPE -/datum/equipment_preset/yautja/elder/load_name(mob/living/carbon/human/H, randomise) +/datum/equipment_preset/yautja/elder/load_name(mob/living/carbon/human/new_human, randomise) . = ..() - var/new_name = "Elder [H.real_name]" - H.change_real_name(H, new_name) + var/new_name = "Elder [new_human.real_name]" + new_human.change_real_name(new_human, new_name) -/datum/equipment_preset/yautja/elder/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/yautja/elder(H), WEAR_L_EAR) +/datum/equipment_preset/yautja/elder/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/yautja/elder(new_human), WEAR_L_EAR) return ..() // CLAN LEADER @@ -133,13 +133,13 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND default_cape_type = PRED_YAUTJA_CAPE -/datum/equipment_preset/yautja/leader/load_name(mob/living/carbon/human/H, randomise) +/datum/equipment_preset/yautja/leader/load_name(mob/living/carbon/human/new_human, randomise) . = ..() - var/new_name = "Clan Leader [H.real_name]" - H.change_real_name(H, new_name) + var/new_name = "Clan Leader [new_human.real_name]" + new_human.change_real_name(new_human, new_name) -/datum/equipment_preset/yautja/leader/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/yautja/elder(H), WEAR_L_EAR) +/datum/equipment_preset/yautja/leader/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/yautja/elder(new_human), WEAR_L_EAR) return ..() // ANCIENT @@ -148,11 +148,11 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND default_cape_type = PRED_YAUTJA_PONCHO -/datum/equipment_preset/yautja/ancient/load_name(mob/living/carbon/human/H, randomise) +/datum/equipment_preset/yautja/ancient/load_name(mob/living/carbon/human/new_human, randomise) . = ..() - var/new_name = "Ancient [H.real_name]" - H.change_real_name(H, new_name) + var/new_name = "Ancient [new_human.real_name]" + new_human.change_real_name(new_human, new_name) -/datum/equipment_preset/yautja/ancient/load_gear(mob/living/carbon/human/H) - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/yautja/elder(H), WEAR_L_EAR) +/datum/equipment_preset/yautja/ancient/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/yautja/elder(new_human), WEAR_L_EAR) return ..() diff --git a/code/modules/hydroponics/hydro_tray.dm b/code/modules/hydroponics/hydro_tray.dm index 65cf76b19a4a..25fa77827b74 100644 --- a/code/modules/hydroponics/hydro_tray.dm +++ b/code/modules/hydroponics/hydro_tray.dm @@ -741,7 +741,7 @@ draw_warnings = 0 /obj/structure/machinery/portable_atmospherics/hydroponics/soil/attackby(obj/item/O as obj, mob/user as mob) - if(istype(O, /obj/item/tool/shovel)) + if(HAS_TRAIT(O, TRAIT_TOOL_SHOVEL)) to_chat(user, "You clear up [src]!") qdel(src) else if(istype(O,/obj/item/tool/shovel) || istype(O,/obj/item/tank)) diff --git a/code/modules/hydroponics/vines.dm b/code/modules/hydroponics/vines.dm index 743d8ef0d150..3745848ea254 100644 --- a/code/modules/hydroponics/vines.dm +++ b/code/modules/hydroponics/vines.dm @@ -29,7 +29,8 @@ if(master) master.vines -= src master.growth_queue -= src - . = ..() + master = null + return ..() /obj/effect/plantsegment/initialize_pass_flags(datum/pass_flags_container/PF) ..() @@ -294,18 +295,21 @@ /obj/effect/plant_controller/Destroy() STOP_PROCESSING(SSobj, src) - . = ..() + return ..() /obj/effect/plant_controller/proc/spawn_piece(turf/location) - var/obj/effect/plantsegment/SV = new(location) - SV.limited_growth = src.limited_growth - growth_queue += SV - vines += SV - SV.master = src + if(QDELETED(src)) + return + + var/obj/effect/plantsegment/vine = new(location) + vine.limited_growth = src.limited_growth + growth_queue += vine + vines += vine + vine.master = src if(seed) - SV.seed = seed - SV.name = "[seed.seed_name] vines" - SV.update() + vine.seed = seed + vine.name = "[seed.seed_name] vines" + vine.update() /obj/effect/plant_controller/process() diff --git a/code/modules/mapping/preloader.dm b/code/modules/mapping/preloader.dm index 0cd73d499e35..e8eee898a711 100644 --- a/code/modules/mapping/preloader.dm +++ b/code/modules/mapping/preloader.dm @@ -22,10 +22,12 @@ GLOBAL_DATUM_INIT(_preloader, /datum/map_preloader, new) value = deepCopyList(value) what.vars[attribute] = value +/// Area passthrough: do not instanciate a new area, reuse the current one /area/template_noop name = "Area Passthrough" icon_state = "noop" +/// Turf passthrough: do not instanciate a new turf, reuse the current one /turf/template_noop name = "Turf Passthrough" icon_state = "noop" diff --git a/code/modules/maptext_alerts/screen_alerts.dm b/code/modules/maptext_alerts/screen_alerts.dm index 1fed8b2da551..e96b436bde21 100644 --- a/code/modules/maptext_alerts/screen_alerts.dm +++ b/code/modules/maptext_alerts/screen_alerts.dm @@ -1,28 +1,25 @@ +/* +* These are ported from TGMC and are hopefully more flexible than text blurbs +*/ + /** * proc for playing a screen_text on a mob. * enqueues it if a screen text is running and plays i otherwise * Arguments: * * text: text we want to be displayed * * alert_type: typepath for screen text type we want to play here + * * override_color: the color of the text to use */ - -/* -* These are ported from TGMC and are hopefully more flexible than text blurbs -*/ - /mob/proc/play_screen_text(text, alert_type = /atom/movable/screen/text/screen_text, override_color = "#FFFFFF") - if(!client) - return var/atom/movable/screen/text/screen_text/text_box = new alert_type() text_box.text_to_play = text + text_box.player = client if(override_color) text_box.color = override_color + LAZYADD(client.screen_texts, text_box) if(LAZYLEN(client.screen_texts) == 1) //lets only play one at a time, for thematic effect and prevent overlap - INVOKE_ASYNC(text_box, TYPE_PROC_REF(/atom/movable/screen/text/screen_text, play_to_client), client) - return - client.screen_texts += text_box - + INVOKE_ASYNC(text_box, TYPE_PROC_REF(/atom/movable/screen/text/screen_text, play_to_client)) /atom/movable/screen/text/screen_text icon = null @@ -52,6 +49,8 @@ var/style_close = "" ///var for the text we are going to play var/text_to_play + ///The client that this text is for + var/client/player /atom/movable/screen/text/screen_text/command_order maptext_height = 64 @@ -65,14 +64,8 @@ style_open = "" style_close = "" -/** - * proc for actually playing this screen_text on a mob. - * Arguments: - * * player: client to play to - */ -/atom/movable/screen/text/screen_text/proc/play_to_client(client/player) - if(!player) - return +///proc for actually playing this screen_text on a mob. +/atom/movable/screen/text/screen_text/proc/play_to_client() player?.screen += src if(fade_in_time) animate(src, alpha = 255) @@ -84,37 +77,42 @@ if(reading_tag) if(text_to_play[tag_position] == ">") reading_tag = FALSE - lines_to_skip += tag_position - else - lines_to_skip += tag_position + lines_to_skip += tag_position tag_position++ else tag_position = findtext(text_to_play, html_locate_regex, tag_position) reading_tag = TRUE + for(var/letter = 2 to length(text_to_play) + letters_per_update step letters_per_update) if(letter in lines_to_skip) continue maptext = "[style_open][copytext_char(text_to_play, 1, letter)][style_close]" sleep(play_delay) - addtimer(CALLBACK(src, PROC_REF(after_play), player), fade_out_delay) + + addtimer(CALLBACK(src, PROC_REF(after_play)), fade_out_delay) ///handles post-play effects like fade out after the fade out delay -/atom/movable/screen/text/screen_text/proc/after_play(client/player) - if(!player) - return +/atom/movable/screen/text/screen_text/proc/after_play() if(!fade_out_time) - end_play(player) + end_play() return + animate(src, alpha = 0, time = fade_out_time) - addtimer(CALLBACK(src, PROC_REF(end_play), player), fade_out_time) + addtimer(CALLBACK(src, PROC_REF(end_play)), fade_out_time) ///ends the play then deletes this screen object and plays the next one in queue if it exists -/atom/movable/screen/text/screen_text/proc/end_play(client/player) +/atom/movable/screen/text/screen_text/proc/end_play() if(!player) + qdel(src) return + player.screen -= src LAZYREMOVE(player.screen_texts, src) qdel(src) - if(!LAZYLEN(player.screen_texts)) + + if(QDELETED(player)) + QDEL_NULL_LIST(player.screen_texts) return - player.screen_texts[1].play_to_client(player) + + if(LAZYLEN(player.screen_texts)) + player.screen_texts[1].play_to_client() // Theres more? diff --git a/code/modules/mob/camera/imaginary_friend.dm b/code/modules/mob/camera/imaginary_friend.dm index 826a4db29891..054dd6ea8ff4 100644 --- a/code/modules/mob/camera/imaginary_friend.dm +++ b/code/modules/mob/camera/imaginary_friend.dm @@ -39,7 +39,7 @@ /mob/camera/imaginary_friend/Initialize(mapload, mob/owner) . = ..() - if(!owner) + if(!owner || !owner.client) return INITIALIZE_HINT_QDEL src.owner = owner diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 4b94cdbc94dc..39bd19c30450 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -433,6 +433,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp for(var/obj/effect/step_trigger/S in new_turf) //<-- this is dumb S.Crossed(src) + // CRUTCH because ghost don't respect normal movement rules + SEND_SIGNAL(new_turf, COMSIG_TURF_ENTERED, src) + SEND_SIGNAL(src, COMSIG_GHOST_MOVED, new_turf) + /mob/dead/observer/get_examine_text(mob/user) return list(desc) @@ -818,12 +822,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return var/list/mobs_by_role = list() // the list the mobs are assigned to first, for sorting purposes - for(var/mob/living/L as anything in GLOB.freed_mob_list) - var/role_name = L.get_role_name() + for(var/datum/weakref/ref as anything in GLOB.freed_mob_list) + var/mob/living/resolved_mob = ref.resolve() + var/role_name = resolved_mob.get_role_name() if(!role_name) role_name = "No Role" LAZYINITLIST(mobs_by_role[role_name]) - mobs_by_role[role_name] += L + mobs_by_role[role_name] += resolved_mob var/list/freed_mob_choices = list() // the list we'll be choosing from for(var/role in mobs_by_role) @@ -835,18 +840,18 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return var/mob/living/L = freed_mob_choices[choice] - if(!L || !(L in GLOB.freed_mob_list)) + if(!L || !(WEAKREF(L) in GLOB.freed_mob_list)) return if(!istype(L)) return if(QDELETED(L) || L.client) - GLOB.freed_mob_list -= L + GLOB.freed_mob_list -= WEAKREF(L) to_chat(src, SPAN_WARNING("Something went wrong.")) return - GLOB.freed_mob_list -= L + GLOB.freed_mob_list -= WEAKREF(L) M.mind.transfer_to(L, TRUE) /mob/dead/verb/join_as_hellhound() diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index c880558189da..61848eda251c 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -252,10 +252,12 @@ //returns the color of the mob's blood /mob/living/proc/get_blood_color() - return "#A10808" + return BLOOD_COLOR_HUMAN /mob/living/carbon/xenomorph/get_blood_color() - return "#dffc00" + if(caste && caste.royal_caste) + return BLOOD_COLOR_XENO_ROYAL + return BLOOD_COLOR_XENO /mob/living/carbon/human/get_blood_color() return species.blood_color @@ -266,17 +268,18 @@ return /mob/living/carbon/xenomorph/get_blood_id() - return "xenoblood" - -/mob/living/carbon/xenomorph/queen/get_blood_id() - return "xenobloodroyal" - -/mob/living/carbon/xenomorph/praetorian/get_blood_id() - return "xenobloodroyal" + if(special_blood) + return special_blood + if(caste.royal_caste) + return "xenobloodroyal" + else + return "xenoblood" /mob/living/carbon/human/get_blood_id() if((NO_BLOOD in species.flags)) return + if(special_blood) + return special_blood if(species.name == "Yautja") return "greenblood" if(species.flags & IS_SYNTHETIC) @@ -372,6 +375,7 @@ var/obj/effect/decal/cleanable/blood/xeno/XB = locate() in T.contents if(!XB) XB = new(T) + XB.color = get_blood_color() /mob/living/silicon/robot/add_splatter_floor(turf/T, small_drip, b_color) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 22369505888d..a68286e6c970 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -17,6 +17,7 @@ /mob/living/carbon/Destroy() stomach_contents?.Cut() view_change_sources = null + active_transfusions = null . = ..() QDEL_NULL_LIST(internal_organs) diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index ecd1b6c97ca9..5cac9db53cc6 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -20,6 +20,10 @@ //blood.dm blood_volume = BLOOD_VOLUME_NORMAL + var/special_blood = null + + ///list of active transfusions from blood bags or iv stands + var/list/active_transfusions = list() var/datum/huntdata/hunter_data //Stores all information relating to Hunters for use with their HUD and other systems. diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 3bd6555dfa2c..c5fed21671c4 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -62,7 +62,8 @@ QDEL_NULL_LIST(embedded_items) QDEL_LIST_ASSOC_VAL(internal_organs_by_name) QDEL_NULL_LIST(limbs) - remove_from_all_mob_huds() + if(hud_used) + QDEL_NULL(hud_used) . = ..() overlays_standing = null @@ -89,7 +90,6 @@ assigned_squad = null selected_ability = null remembered_dropped_objects = null - active_transfusions = null /mob/living/carbon/human/get_status_tab_items() . = ..() diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 842cce5c8193..7f9801145a8e 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -121,7 +121,7 @@ //moved from IDs to prevent some exploits and to make points more flexible var/marine_points = MARINE_TOTAL_BUY_POINTS var/marine_snowflake_points = MARINE_TOTAL_SNOWFLAKE_POINTS - var/marine_buy_flags = MARINE_CAN_BUY_ALL + var/marine_buyable_categories = MARINE_CAN_BUY_ALL var/spawned_corpse = FALSE // For the corpse spawner //taken from blood.dm @@ -158,15 +158,9 @@ var/datum/action/human_action/activable/selected_ability - /// misc human flags - var/flags_human_misc = 0 - ///list of weakrefs of recently dropped objects var/list/remembered_dropped_objects = list() - ///list of active transfusions from blood bags or iv stands - var/list/active_transfusions = list() - /client/var/cached_human_playtime /client/proc/get_total_human_playtime(skip_cache = FALSE) diff --git a/code/modules/mob/living/carbon/human/life/handle_organs.dm b/code/modules/mob/living/carbon/human/life/handle_organs.dm index 3872a0675f3c..8d0a0dbc3e15 100644 --- a/code/modules/mob/living/carbon/human/life/handle_organs.dm +++ b/code/modules/mob/living/carbon/human/life/handle_organs.dm @@ -1,4 +1,3 @@ - // Takes care of organ & limb related updates, such as broken and missing limbs /mob/living/carbon/human/proc/handle_organs() @@ -25,6 +24,13 @@ var/damage = rand(3,5) I.take_damage(damage) pain.apply_pain(damage * PAIN_ORGAN_DAMAGE_MULTIPLIER) + if(E.is_broken() && prob(2)) + var/damage = rand(3,5) + var/datum/wound/internal_bleeding/internal_bleed = new + E.add_bleeding(internal_bleed, TRUE, damage) + E.wounds += internal_bleed + custom_pain("You feel broken bones cutting at you in your [E.display_name]!", 1) + pain.apply_pain(damage * 1.5) if(!lying && !buckled && prob(2)) var/left_leg_crippled = FALSE diff --git a/code/modules/mob/living/carbon/human/life/life_helpers.dm b/code/modules/mob/living/carbon/human/life/life_helpers.dm index fdfb0c10fa43..0339bf6ec742 100644 --- a/code/modules/mob/living/carbon/human/life/life_helpers.dm +++ b/code/modules/mob/living/carbon/human/life/life_helpers.dm @@ -200,7 +200,9 @@ if(thermal_protection_flags & BODY_FLAG_HAND_RIGHT) thermal_protection += THERMAL_PROTECTION_HAND_RIGHT - return min(1, thermal_protection) + var/list/protection_data = list("protection" = thermal_protection) + SEND_SIGNAL(src, COMSIG_HUMAN_COLD_PROTECTION_APPLY_MODIFIERS, protection_data) + return min(1, protection_data["protection"]) /mob/living/carbon/human/proc/process_glasses(obj/item/clothing/glasses/G) diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm index acf10dc64eb4..6c774432e776 100644 --- a/code/modules/mob/living/carbon/human/species/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/monkey.dm @@ -141,7 +141,7 @@ deform = 'icons/mob/humans/species/monkeys/r_neaera.dmi' flesh_color = "#8cd7a3" - blood_color = "#1d2cbf" + blood_color = BLOOD_COLOR_NEAERA tail = null /datum/species/monkey/neaera/New() diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 9db339cdac49..a6d0355bfbe5 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -71,7 +71,7 @@ var/list/abilities = list() // For species-derived or admin-given powers - var/blood_color = "#A10808" //Red. + var/blood_color = BLOOD_COLOR_HUMAN //Red. var/flesh_color = "#FFC896" //Pink. var/base_color //Used when setting species. var/hair_color //If the species only has one hair color @@ -463,7 +463,13 @@ return /datum/species/proc/handle_blood_splatter(mob/living/carbon/human/human, splatter_dir) - var/obj/effect/temp_visual/dir_setting/bloodsplatter/bloodsplatter = new bloodsplatter_type(human.loc, splatter_dir) + var/color_override + if(human.special_blood) + var/datum/reagent/D = chemical_reagents_list[human.special_blood] + if(D) + color_override = D.color + + var/obj/effect/temp_visual/dir_setting/bloodsplatter/bloodsplatter = new bloodsplatter_type(human.loc, splatter_dir, 5, color_override) return bloodsplatter /datum/species/proc/get_status_tab_items() diff --git a/code/modules/mob/living/carbon/human/species/synthetic.dm b/code/modules/mob/living/carbon/human/species/synthetic.dm index a7866fa50619..bdd0a994ed49 100644 --- a/code/modules/mob/living/carbon/human/species/synthetic.dm +++ b/code/modules/mob/living/carbon/human/species/synthetic.dm @@ -31,7 +31,7 @@ mob_flags = KNOWS_TECHNOLOGY flags = IS_WHITELISTED|NO_BREATHE|NO_CLONE_LOSS|NO_BLOOD|NO_POISON|IS_SYNTHETIC|NO_CHEM_METABOLIZATION|NO_NEURO|HAS_UNDERWEAR - blood_color = "#EEEEEE" + blood_color = BLOOD_COLOR_SYNTHETIC has_organ = list( "heart" = /datum/internal_organ/heart/prosthetic, @@ -40,6 +40,7 @@ knock_down_reduction = 5 stun_reduction = 5 + acid_blood_dodge_chance = 25 inherent_verbs = list( /mob/living/carbon/human/synthetic/proc/toggle_HUD, @@ -145,4 +146,4 @@ bloodsplatter_type = /obj/effect/temp_visual/dir_setting/bloodsplatter/human - blood_color = "#A10808" + blood_color = BLOOD_COLOR_HUMAN diff --git a/code/modules/mob/living/carbon/human/species/yautja.dm b/code/modules/mob/living/carbon/human/species/yautja.dm index 56d76b6d22e6..a4c87b5da4e1 100644 --- a/code/modules/mob/living/carbon/human/species/yautja.dm +++ b/code/modules/mob/living/carbon/human/species/yautja.dm @@ -2,7 +2,7 @@ group = SPECIES_YAUTJA name = "Yautja" name_plural = "Yautja" - brute_mod = 0.33 //Beefy! + brute_mod = 0.28 //Beefy! burn_mod = 0.65 reagent_tag = IS_YAUTJA mob_flags = KNOWS_TECHNOLOGY @@ -19,14 +19,14 @@ secondary_unarmed_type = /datum/unarmed_attack/bite/strong pain_type = /datum/pain/yautja stamina_type = /datum/stamina/none - blood_color = "#20d450" + blood_color = BLOOD_COLOR_YAUTJA flesh_color = "#907E4A" speech_sounds = list('sound/voice/pred_click1.ogg', 'sound/voice/pred_click2.ogg') speech_chance = 100 death_message = "clicks in agony and falls still, motionless and completely lifeless..." darksight = 5 slowdown = -0.5 - total_health = 150 //more health than regular humans, makes up for hardcrit reintroduction + total_health = 175 //more health than regular humans timed_hug = FALSE bloodsplatter_type = /obj/effect/temp_visual/dir_setting/bloodsplatter/yautjasplatter @@ -186,7 +186,9 @@ H.blood_type = "Y*" H.h_style = "Standard" + #ifndef UNIT_TESTS // Since this is a hard ref, we shouldn't confuse create_and_destroy GLOB.yautja_mob_list += H + #endif for(var/obj/limb/limb in H.limbs) switch(limb.name) if("groin","chest") diff --git a/code/modules/mob/living/carbon/human/species/zombie.dm b/code/modules/mob/living/carbon/human/species/zombie.dm index c28c57ea508c..2c9c423c671e 100644 --- a/code/modules/mob/living/carbon/human/species/zombie.dm +++ b/code/modules/mob/living/carbon/human/species/zombie.dm @@ -3,7 +3,7 @@ name = SPECIES_ZOMBIE name_plural = "Zombies" slowdown = 1 - blood_color = "#333333" + blood_color = BLOOD_COLOR_ZOMBIE icobase = 'icons/mob/humans/species/r_goo_zed.dmi' deform = 'icons/mob/humans/species/r_goo_zed.dmi' eyes = "blank_s" @@ -83,7 +83,7 @@ playsound(zombie.loc, rare_moan, 15, rare_variance) /datum/species/zombie/handle_death(mob/living/carbon/human/zombie, gibbed) - set waitfor = 0 + set waitfor = FALSE if(gibbed) remove_from_revive(zombie) @@ -95,8 +95,9 @@ if(zombie.client) zombie.play_screen_text("You are dead...
You will rise again in one minute.", /atom/movable/screen/text/screen_text/command_order, rgb(155, 0, 200)) to_chat(zombie, SPAN_XENOWARNING("You fall... but your body is slowly regenerating itself.")) - to_revive[WEAKREF(zombie)] = addtimer(CALLBACK(src, PROC_REF(revive_from_death), zombie), 1 MINUTES, TIMER_STOPPABLE|TIMER_OVERRIDE|TIMER_UNIQUE) - revive_times[WEAKREF(zombie)] = world.time + 1 MINUTES + var/weak_ref = WEAKREF(zombie) + to_revive[weak_ref] = addtimer(CALLBACK(src, PROC_REF(revive_from_death), zombie, "[REF(zombie)]"), 1 MINUTES, TIMER_STOPPABLE|TIMER_OVERRIDE|TIMER_UNIQUE|TIMER_NO_HASH_WAIT) + revive_times[weak_ref] = world.time + 1 MINUTES else if(zombie.client) zombie.play_screen_text("You are dead...
You lost your head. No reviving for you.", /atom/movable/screen/text/screen_text/command_order, rgb(155, 0, 200)) @@ -126,10 +127,11 @@ to_chat(ghost, SPAN_BOLDNOTICE(FONT_SIZE_LARGE("Your body has risen! (Verbs -> Ghost -> Re-enter corpse, or click here!)"))) /datum/species/zombie/proc/remove_from_revive(mob/living/carbon/human/zombie) - if(WEAKREF(zombie) in to_revive) - deltimer(to_revive[WEAKREF(zombie)]) - to_revive -= WEAKREF(zombie) - revive_times -= WEAKREF(zombie) + var/weak_ref = WEAKREF(zombie) + if(weak_ref in to_revive) + deltimer(to_revive[weak_ref]) + to_revive -= weak_ref + revive_times -= weak_ref /datum/species/zombie/get_status_tab_items(mob/living/carbon/human/zombie) var/list/static_tab_items = list() diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 04f824f6624e..355f69ca05a9 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -209,27 +209,21 @@ There are several things that need to be remembered: overlays_standing[HAIR_LAYER] = hair_s apply_overlay(HAIR_LAYER) - //Call when target overlay should be added/removed /mob/living/carbon/human/update_targeted() remove_overlay(TARGETED_LAYER) - var/image/I - if(targeted_by && target_locked) - I = image("icon" = target_locked) - else if(!targeted_by && target_locked) - QDEL_NULL(target_locked) + + var/image/holo_card_image + if(holo_card_color) - if(I) - I.overlays += image("icon" = 'icons/effects/Targeted.dmi', "icon_state" = "holo_card_[holo_card_color]") - else - I = image("icon" = 'icons/effects/Targeted.dmi', "icon_state" = "holo_card_[holo_card_color]") - if(!I) - return - I.layer = -TARGETED_LAYER - overlays_standing[TARGETED_LAYER] = I - apply_overlay(TARGETED_LAYER) + holo_card_image = image("icon" = 'icons/effects/Targeted.dmi', "icon_state" = "holo_card_[holo_card_color]") + if(!holo_card_image) + return + holo_card_image.layer = -TARGETED_LAYER + overlays_standing[TARGETED_LAYER] = holo_card_image + apply_overlay(TARGETED_LAYER) //Call when someone is gauzed or splinted, or when one of those items are removed /mob/living/carbon/human/update_med_icon() diff --git a/code/modules/mob/living/carbon/xenomorph/Abilities.dm b/code/modules/mob/living/carbon/xenomorph/Abilities.dm index 1b1577b95fe2..dbadadf8ef23 100644 --- a/code/modules/mob/living/carbon/xenomorph/Abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/Abilities.dm @@ -90,6 +90,8 @@ to_chat(X, SPAN_NOTICE("You will be ready to dig a new tunnel in 4 minutes.")) playsound(X.loc, 'sound/weapons/pierce.ogg', 25, 1) + return ..() + /datum/action/xeno_action/onclick/build_tunnel/proc/cooldown_end() var/mob/living/carbon/xenomorph/X = owner to_chat(X, SPAN_NOTICE("You are ready to dig a tunnel again.")) @@ -155,7 +157,7 @@ apply_cooldown() - ..() + return ..() /datum/action/xeno_action/activable/gut name = "Gut (200)" @@ -173,7 +175,7 @@ return if(xeno.queen_gut(target)) apply_cooldown() - ..() + return ..() /datum/action/xeno_action/onclick/psychic_whisper name = "Psychic Whisper" @@ -206,6 +208,7 @@ else to_chat(M, SPAN_XENO("You hear the voice of [X] resonate in your head. \"[msg]\"")) to_chat(X, SPAN_XENONOTICE("You said: \"[msg]\" to [M]")) + return ..() /datum/action/xeno_action/onclick/psychic_radiance name = "Psychic Radiance" @@ -236,6 +239,7 @@ var/targetstring = english_list(target_list) to_chat(X, SPAN_XENONOTICE("You said: \"[msg]\" to [targetstring]")) log_say("PsychicRadiance: [key_name(X)]->[targetstring] : [msg]") + return ..() /datum/action/xeno_action/activable/queen_give_plasma name = "Give Plasma (400)" @@ -283,6 +287,7 @@ target.flick_heal_overlay(3 SECONDS, COLOR_CYAN) apply_cooldown() to_chat(X, SPAN_XENONOTICE("You transfer some plasma to [target].")) + return ..() /datum/action/xeno_action/onclick/queen_order name = "Give Order (100)" @@ -311,6 +316,8 @@ else to_chat(X, SPAN_WARNING("You must overwatch the Xenomorph you want to give orders to.")) + return + return ..() /datum/action/xeno_action/onclick/queen_award name = "Give Royal Jelly (500)" @@ -325,6 +332,7 @@ return if(give_jelly_award(xeno.hive)) xeno.use_plasma(plasma_cost) + return ..() /datum/action/xeno_action/onclick/queen_word name = "Word of the Queen (50)" @@ -336,6 +344,7 @@ var/mob/living/carbon/xenomorph/queen/xeno = owner // We don't test or apply the cooldown here because the proc does it since verbs can activate it too xeno.hive_message() + return ..() /datum/action/xeno_action/onclick/queen_tacmap name = "View Xeno Tacmap" @@ -345,6 +354,7 @@ /datum/action/xeno_action/onclick/queen_tacmap/use_ability(atom/target) var/mob/living/carbon/xenomorph/queen/xeno = owner xeno.xeno_tacmap() + return ..() ///////////////////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm index eb250cba92e4..e03f225ccade 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -170,7 +170,7 @@ if(hive) hive.add_xeno(new_xeno) - if(!affected_mob.first_xeno) + if(!affected_mob.first_xeno && hive.hive_location) hive.increase_larva_after_burst() hive.hive_ui.update_burrowed_larva() diff --git a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm index 788a10e8c35d..121a231b7bf8 100644 --- a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm +++ b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm @@ -254,14 +254,14 @@ var/mob/living/carbon/xenomorph/X = loc X.drop_inv_item_on_ground(src) - attached = TRUE - if(isturf(H.loc)) forceMove(H.loc)//Just checkin if(!H.handle_hugger_attachment(src)) return FALSE + attached = TRUE + forceMove(H) icon_state = initial(icon_state) H.equip_to_slot(src, WEAR_FACE) diff --git a/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm b/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm index 902a2d06092c..46e144a1b1f5 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm @@ -74,6 +74,7 @@ if(oldXeno) to_chat(src, SPAN_XENOWARNING("You stop watching [oldXeno].")) + UnregisterSignal(oldXeno, COMSIG_PARENT_QDELETING) if(!QDELETED(oldXeno)) oldXeno.hud_set_queen_overwatch() else @@ -109,19 +110,25 @@ SEND_SIGNAL(src, COMSIG_XENO_STOP_OVERWATCH_XENO, oldXeno) oldXeno.hud_set_queen_overwatch() UnregisterSignal(src, COMSIG_MOB_MOVE_OR_LOOK) + UnregisterSignal(oldXeno, COMSIG_PARENT_QDELETING) observed_xeno = targetXeno observed_xeno.hud_set_queen_overwatch() SEND_SIGNAL(src, COMSIG_XENO_OVERWATCH_XENO, observed_xeno) RegisterSignal(src, COMSIG_MOB_MOVE_OR_LOOK, PROC_REF(overwatch_handle_mob_move_or_look)) + RegisterSignal(observed_xeno, COMSIG_PARENT_QDELETING, PROC_REF(overwatch_handle_deletion)) src.reset_view() +/mob/living/carbon/xenomorph/proc/overwatch_handle_deletion(mob/living/carbon/xenomorph/deleted, forced) + SIGNAL_HANDLER + overwatch(deleted, TRUE) + // Called from xeno Life() // Makes sure that Xeno overwatch is reset when the overwatched Xeno dies. /mob/living/carbon/xenomorph/proc/handle_overwatch() - if (observed_xeno && (observed_xeno == DEAD || QDELETED(observed_xeno))) + if (observed_xeno && (observed_xeno.stat == DEAD || QDELETED(observed_xeno))) overwatch(null, TRUE) /mob/living/carbon/xenomorph/proc/overwatch_handle_mob_move_or_look(mob/living/carbon/xenomorph/mover, actually_moving, direction, specific_direction) diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm index d2c099d0c1ff..22cb816f865b 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm @@ -147,7 +147,7 @@ . += "" //A simple handler for checking your state. Used in pretty much all the procs. -/mob/living/carbon/xenomorph/proc/check_state(permissive = 0) +/mob/living/carbon/xenomorph/proc/check_state(permissive = FALSE) if(!permissive) if(is_mob_incapacitated() || lying || buckled || evolving || !isturf(loc)) to_chat(src, SPAN_WARNING("You cannot do this in your current state.")) @@ -434,6 +434,9 @@ if(istype(O, /obj/structure/fence)) has_obstacle = TRUE break + if(istype(O, /obj/structure/tunnel)) + has_obstacle = TRUE + break if(istype(O, /obj/structure/bed)) if(istype(O, /obj/structure/bed/chair/dropship/passenger)) var/obj/structure/bed/chair/dropship/passenger/P = O diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index 3449b4db8325..f1d03d6507b1 100644 --- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm @@ -243,7 +243,7 @@ var/list/tackle_counter var/evolving = FALSE // Whether the xeno is in the process of evolving /// The damage dealt by a xeno whenever they take damage near someone - var/acid_blood_damage = 12 + var/acid_blood_damage = 20 var/nocrit = FALSE var/deselect_timer = 0 // Much like Carbon.last_special is a short tick record to prevent accidental deselects of abilities var/got_evolution_message = FALSE @@ -1079,4 +1079,9 @@ return ..() /mob/living/carbon/xenomorph/handle_blood_splatter(splatter_dir, duration) - new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(loc, splatter_dir, duration) + var/color_override + if(special_blood) + var/datum/reagent/D = chemical_reagents_list[special_blood] + if(D) + color_override = D.color + new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(loc, splatter_dir, duration, color_override) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm index a2121697ebea..af8f33cf1c76 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm @@ -224,11 +224,10 @@ client.pixel_x = 0 client.pixel_y = 0 is_zoomed = 0 - // Since theres several ways we can get here, we need to update the ability button state - for (var/datum/action/xeno_action/action in actions) - if (istype(action, /datum/action/xeno_action/onclick/toggle_long_range)) - action.button.icon_state = "template" - break; + // Since theres several ways we can get here, we need to update the ability button state and handle action's specific effects + for (var/datum/action/xeno_action/onclick/toggle_long_range/action in actions) + action.on_zoom_out() + return /mob/living/carbon/xenomorph/proc/do_acid_spray_cone(turf/T, spray_type = /obj/effect/xenomorph/spray, range = 3) set waitfor = FALSE @@ -377,4 +376,8 @@ to_chat(src, SPAN_WARNING("\The [target] doesn't use plasma.")) return FALSE + if(target == src) + to_chat(src, SPAN_WARNING("You can't transfer plasma to yourself!")) + return FALSE + return TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_powers.dm index 957fc3fe337d..e745e8940063 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_powers.dm @@ -56,6 +56,7 @@ X.visible_message(SPAN_XENODANGER("[X] fires a massive blast of acid at [A]!"), SPAN_XENODANGER("You fire a massive blast of acid at [A]!")) remove_stack_effects("You feel your speed return to normal!") + return TRUE /datum/action/xeno_action/activable/acid_lance/proc/stack() var/mob/living/carbon/xenomorph/X = owner @@ -103,7 +104,7 @@ return (activated_once || ..()) /datum/action/xeno_action/activable/xeno_spit/bombard/use_ability(atom/A) - ..() + . = ..() var/mob/living/carbon/xenomorph/xeno = owner if(!action_cooldown_check()) // activate c/d only if we already spit for (var/action_type in action_types_to_cd) @@ -122,7 +123,6 @@ if (!action_cooldown_check()) return - if (!xeno.check_state()) return if(sound_play) @@ -150,7 +150,7 @@ xeno_action.apply_cooldown_override(cooldown_duration) apply_cooldown() - return + return ..() /datum/action/xeno_action/onclick/dump_acid/proc/remove_speed_buff() if (movespeed_buff_applied && isxeno(owner)) @@ -211,7 +211,6 @@ target_turfs += get_step(left_turf, turn(dir_between, -90)) target_turfs += get_step(right_turf, turn(dir_between, 90)) - for (var/turf/T in target_turfs) if (!istype(T) || T.density) continue @@ -242,9 +241,7 @@ to_chat(X, SPAN_XENODANGER("You tap in your reserves to prepare a stronger [mine.name]!")) apply_cooldown() - ..() - return - + return ..() /datum/action/xeno_action/activable/acid_mine/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -284,8 +281,7 @@ button.overlays -= "+empowered" apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/acid_shotgun/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -310,9 +306,7 @@ P.fire_at(target, X, X, ammoDatum.max_range, ammoDatum.shell_speed) apply_cooldown() - ..() - return - + return ..() /datum/ammo/xeno/acid_shotgun name = "acid ball" @@ -358,3 +352,4 @@ to_chat(carbon_target,SPAN_HIGHDANGER("You are injected with something from [stabbing_xeno]'s tailstab!")) else CRASH("Globber has unknown ammo [stabbing_xeno.ammo]! Oh no!") + return TRUE 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 9b8d72465321..84b6c5ff5fef 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 @@ -15,6 +15,7 @@ X.tunnel(get_turf(A)) else X.burrow() + return ..() /datum/action/xeno_action/onclick/tremor name = "Tremor (100)" @@ -27,4 +28,4 @@ /datum/action/xeno_action/onclick/tremor/use_ability() var/mob/living/carbon/xenomorph/X = owner X.tremor() - ..() + return ..() 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 515d03ddc3bb..dd3e709dd0ad 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 @@ -7,11 +7,16 @@ if(used_burrow || tunnel || is_ventcrawling || action_busy) return - var/turf/T = get_turf(src) - if(!T) + var/turf/current_turf = get_turf(src) + if(!current_turf) + return + + var/area/current_area = get_area(current_turf) + if(current_area.flags_area & AREA_NOTUNNEL) + to_chat(src, SPAN_XENOWARNING("There's no way to burrow here.")) return - if(istype(T, /turf/open/floor/almayer/research/containment) || istype(T, /turf/closed/wall/almayer/research/containment)) + if(istype(current_turf, /turf/open/floor/almayer/research/containment) || istype(current_turf, /turf/closed/wall/almayer/research/containment)) to_chat(src, SPAN_XENOWARNING("You can't escape this cell!")) return diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/carrier/carrier_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/carrier/carrier_powers.dm index 1f27e69e3a89..1ee32225a40d 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/carrier/carrier_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/carrier/carrier_powers.dm @@ -1,16 +1,15 @@ /datum/action/xeno_action/activable/throw_hugger/use_ability(atom/A) var/mob/living/carbon/xenomorph/carrier/X = owner X.throw_hugger(A) - ..() + return ..() /datum/action/xeno_action/activable/retrieve_egg/use_ability(atom/A) var/mob/living/carbon/xenomorph/carrier/X = owner X.retrieve_egg(A) - ..() + return ..() /datum/action/xeno_action/onclick/set_hugger_reserve/use_ability(atom/Atom) var/mob/living/carbon/xenomorph/carrier/carrier = owner - carrier.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, carrier.huggers_max, carrier.huggers_reserved) - to_chat(carrier, SPAN_XENONOTICE("You reserved [carrier.huggers_reserved] facehuggers for yourself.")) + return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_powers.dm index 79b86977eb7c..ce4a631e281f 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_powers.dm @@ -136,8 +136,7 @@ to_chat(H, SPAN_XENOHIGHDANGER("You are slowed as [X] knocks you off balance!")) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/crusher_stomp/charger/use_ability() var/mob/living/carbon/xenomorph/Xeno = owner @@ -183,8 +182,7 @@ to_chat(Human, SPAN_XENOHIGHDANGER("You are shaken as [Xeno] quakes the earth!")) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/crusher_shield/use_ability(atom/Target) var/mob/living/carbon/xenomorph/xeno = owner @@ -216,8 +214,7 @@ addtimer(CALLBACK(src, PROC_REF(remove_shield)), 70, TIMER_UNIQUE|TIMER_OVERRIDE) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/crusher_shield/proc/remove_explosion_immunity() var/mob/living/carbon/xenomorph/xeno = owner @@ -274,11 +271,9 @@ COMSIG_LIVING_PRE_COLLIDE, COMSIG_XENO_STOP_MOMENTUM, COMSIG_XENO_START_CHARGING, - button.icon_state = "template" )) - if(!activated) button.icon_state = "template" - + return ..() /datum/action/xeno_action/activable/tumble/use_ability(atom/Target) if(!action_cooldown_check()) @@ -320,4 +315,4 @@ Xeno.launch_towards(LM) apply_cooldown() - ..() + return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm index 76efba62c5be..67e16d4b70de 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm @@ -31,8 +31,7 @@ xeno.update_icons() apply_cooldown() - ..() - return + return ..() // Defender Headbutt /datum/action/xeno_action/activable/headbutt/use_ability(atom/target_atom) @@ -100,8 +99,7 @@ carbone.throw_atom(thrown_turf, headbutt_distance, SPEED_SLOW, src) playsound(carbone,'sound/weapons/alien_claw_block.ogg', 50, 1) apply_cooldown() - ..() - return + return ..() // Defender Tail Sweep /datum/action/xeno_action/onclick/tail_sweep/use_ability(atom/A) @@ -153,8 +151,7 @@ playsound(human,'sound/weapons/alien_claw_block.ogg', 50, 1) apply_cooldown() - ..() - return + return ..() // Defender Fortify /datum/action/xeno_action/activable/fortify/use_ability(atom/target) @@ -190,8 +187,7 @@ button.icon_state = "template" apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/fortify/action_activate() ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm index 9dede41be053..e76cc4322bdb 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm @@ -25,4 +25,4 @@ if(current_airlock.density) //if its CLOSED YOU'RE SCUTTLING AND CANNOT POUNCE!!! to_chat(owner, SPAN_WARNING("You cannot do that while squeezing and scuttling!")) return FALSE - ..() + return ..() 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 daae0631f196..824e0cc5f9fd 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm @@ -302,24 +302,31 @@ return if(xeno.is_zoomed) - xeno.zoom_out() // will also handle icon_state - xeno.visible_message(SPAN_NOTICE("[xeno] stops looking off into the distance."), \ - SPAN_NOTICE("You stop looking off into the distance."), null, 5) - if(movement_slowdown) - xeno.recalculate_speed() - else - xeno.visible_message(SPAN_NOTICE("[xeno] starts looking off into the distance."), \ - SPAN_NOTICE("You start focusing your sight to look off into the distance."), null, 5) - if (should_delay) - if(!do_after(xeno, delay, INTERRUPT_NO_NEEDHAND, BUSY_ICON_GENERIC)) return - if(xeno.is_zoomed) return - if(handles_movement) - RegisterSignal(xeno, COMSIG_MOB_MOVE_OR_LOOK, PROC_REF(handle_mob_move_or_look)) - if(movement_slowdown) - xeno.speed_modifier += movement_slowdown - xeno.recalculate_speed() - xeno.zoom_in() - button.icon_state = "template_active" + xeno.zoom_out() // will call on_zoom_out() + return + xeno.visible_message(SPAN_NOTICE("[xeno] starts looking off into the distance."), \ + SPAN_NOTICE("You start focusing your sight to look off into the distance."), null, 5) + if (should_delay) + if(!do_after(xeno, delay, INTERRUPT_NO_NEEDHAND, BUSY_ICON_GENERIC)) return + if(xeno.is_zoomed) + return + if(handles_movement) + RegisterSignal(xeno, COMSIG_MOB_MOVE_OR_LOOK, PROC_REF(handle_mob_move_or_look)) + if(movement_slowdown) + xeno.speed_modifier += movement_slowdown + xeno.recalculate_speed() + xeno.zoom_in() + button.icon_state = "template_active" + return ..() + +/datum/action/xeno_action/onclick/toggle_long_range/proc/on_zoom_out() + var/mob/living/carbon/xenomorph/xeno = owner + xeno.visible_message(SPAN_NOTICE("[xeno] stops looking off into the distance."), \ + SPAN_NOTICE("You stop looking off into the distance."), null, 5) + if(movement_slowdown) + xeno.speed_modifier -= movement_slowdown + xeno.recalculate_speed() + button.icon_state = "template" /datum/action/xeno_action/onclick/toggle_long_range/proc/handle_mob_move_or_look(mob/living/carbon/xenomorph/xeno, actually_moving, direction, specific_direction) SIGNAL_HANDLER @@ -330,7 +337,6 @@ movement_buffer = initial(movement_buffer) xeno.zoom_out() // will also handle icon_state UnregisterSignal(xeno, COMSIG_MOB_MOVE_OR_LOOK) - xeno.recalculate_speed() // General use acid spray, can be subtyped to customize behavior. // ... or mutated at runtime by another action that retrieves and edits these values @@ -367,10 +373,10 @@ action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_4 -/datum/action/xeno_action/activable/transfer_plasma/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner - X.xeno_transfer_plasma(A, plasma_transfer_amount, transfer_delay, max_range) - ..() +/datum/action/xeno_action/activable/transfer_plasma/use_ability(atom/target) + var/mob/living/carbon/xenomorph/xeno = owner + xeno.xeno_transfer_plasma(target, plasma_transfer_amount, transfer_delay, max_range) + return ..() /datum/action/xeno_action/onclick/xenohide name = "Hide" 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 74158cbe81d6..dd9051ab0279 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm @@ -65,11 +65,8 @@ qdel(weed) playsound(X.loc, "alien_resin_build", 25) - apply_cooldown() - - ..() - return + return ..() /mob/living/carbon/xenomorph/lay_down() if(hardcore) @@ -94,6 +91,7 @@ var/mob/living/carbon/xenomorph/xeno = owner xeno.lay_down() button.icon_state = xeno.resting ? "template_active" : "template" + return ..() // Shift spits /datum/action/xeno_action/onclick/shift_spits/use_ability(atom/A) @@ -110,9 +108,7 @@ to_chat(X, SPAN_NOTICE("You will now spit [X.ammo.name] ([X.ammo.spit_cost] plasma).")) button.overlays.Cut() button.overlays += image('icons/mob/hud/actions_xeno.dmi', button, "shift_spit_[X.ammo.icon_state]") - ..() - return - + return ..() /datum/action/xeno_action/onclick/regurgitate/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -128,8 +124,7 @@ // Also has good reason to be a proc on all Xenos X.regurgitate(M, TRUE) - ..() - return + return ..() /datum/action/xeno_action/onclick/choose_resin/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -301,19 +296,19 @@ // Destructive Acid -/datum/action/xeno_action/activable/corrosive_acid/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner - X.corrosive_acid(A, acid_type, acid_plasma_cost) - for(var/obj/item/explosive/plastic/E in A.contents) - X.corrosive_acid(E,acid_type,acid_plasma_cost) - ..() - +/datum/action/xeno_action/activable/corrosive_acid/use_ability(atom/target) + var/mob/living/carbon/xenomorph/xeno = owner + xeno.corrosive_acid(target, acid_type, acid_plasma_cost) + for(var/obj/item/explosive/plastic/explosive in target.contents) + xeno.corrosive_acid(explosive,acid_type,acid_plasma_cost) + return ..() -/datum/action/xeno_action/onclick/emit_pheromones/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner - if(!istype(X)) +/datum/action/xeno_action/onclick/emit_pheromones/use_ability(atom/target) + var/mob/living/carbon/xenomorph/xeno = owner + if(!istype(xeno)) return - X.emit_pheromones(emit_cost = plasma_cost) + xeno.emit_pheromones(emit_cost = plasma_cost) + return ..() /mob/living/carbon/xenomorph/proc/emit_pheromones(pheromone, emit_cost = 30) if(!check_state(TRUE)) @@ -495,12 +490,11 @@ else if (spray_type == ACID_SPRAY_CONE) X.do_acid_spray_cone(get_turf(A), spray_effect_type, spray_distance) - ..() - return + return ..() /datum/action/xeno_action/onclick/xenohide/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner - if(!xeno.check_state(1)) + if(!xeno.check_state(TRUE)) return if(xeno.layer != XENO_HIDING_LAYER) xeno.layer = XENO_HIDING_LAYER @@ -511,6 +505,7 @@ to_chat(xeno, SPAN_NOTICE("You have stopped hiding.")) button.icon_state = "template" xeno.update_wounds() + return ..() /datum/action/xeno_action/onclick/place_trap/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -551,6 +546,7 @@ playsound(X.loc, "alien_resin_build", 25) new /obj/effect/alien/resin/trap(T, X) to_chat(X, SPAN_XENONOTICE("You place a resin hole on the weeds, it still needs a sister to fill it with acid.")) + return ..() /turf/proc/check_xeno_trap_placement(mob/living/carbon/xenomorph/X) if(is_weedable() < FULLY_WEEDABLE || !can_xeno_build(src)) @@ -612,6 +608,9 @@ to_chat(X, SPAN_XENOWARNING("It's too tight in here to build.")) return FALSE + if(!X.check_alien_construction(T)) + return FALSE + var/choice = XENO_STRUCTURE_CORE if(X.hive.hivecore_cooldown) to_chat(X, SPAN_WARNING("The weeds are still recovering from the death of the hive core, wait until the weeds have recovered!")) @@ -625,8 +624,8 @@ for(var/structure_name in X.hive.hive_structure_types) message += "[get_xeno_structure_desc(structure_name)]
" to_chat(X, SPAN_NOTICE(message)) - return - if(!X.check_state(1) || !X.check_plasma(400)) + return TRUE + if(!X.check_state(TRUE) || !X.check_plasma(400)) return FALSE var/structure_type = X.hive.hive_structure_types[choice] var/datum/construction_template/xenomorph/structure_template = new structure_type() @@ -686,8 +685,7 @@ X.use_plasma(400) X.place_construction(T, structure_template) - - + return ..() // XSS Spacecheck @@ -773,7 +771,7 @@ SEND_SIGNAL(xeno, COMSIG_XENO_POST_SPIT) apply_cooldown() - ..() + return ..() /datum/action/xeno_action/activable/bombard/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner 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 ee2592126d5b..e0a29a034029 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 @@ -116,4 +116,4 @@ macro_path = /datum/action/xeno_action/verb/verb_headbite ability_primacy = XENO_PRIMARY_ACTION_4 action_type = XENO_ACTION_CLICK - xeno_cooldown = 0 SECONDS + xeno_cooldown = 10 SECONDS diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm index fae94d7ce061..0c4ba1f2e86d 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm @@ -25,8 +25,7 @@ // Only resets when invisibility ends apply_cooldown_override(1000000000) - ..() - return + return ..() /datum/action/xeno_action/onclick/lurker_invisibility/proc/invisibility_off() if(!owner || owner.alpha == initial(owner.alpha)) @@ -80,8 +79,7 @@ xeno.next_move = world.time + 1 // Autoattack reset apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/lurker_assassinate/proc/unbuff_slash() var/mob/living/carbon/xenomorph/xeno = owner @@ -174,8 +172,7 @@ xeno.animation_attack_on(target) xeno.emote("roar") - ..() - return + return ..() /datum/action/xeno_action/activable/tail_jab/use_ability(atom/targeted_atom) @@ -250,8 +247,7 @@ log_attack("[key_name(xeno)] attacked [key_name(hit_target)] with Tail Jab") apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/tail_jab/proc/reset_direction(mob/living/carbon/xenomorph/xeno, last_dir, new_dir) // If the xenomorph is still holding the same direction as the tail stab animation's changed it to, reset it back to the old direction so the xenomorph isn't stuck facing backwards. @@ -308,4 +304,5 @@ xeno.flick_heal_overlay(3 SECONDS, "#00B800") xeno.emote("roar") log_attack("[key_name(xeno)] was executed by [key_name(target_carbon)] with a headbite!") - return TRUE + apply_cooldown() + return ..() 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 05a0dbda327a..d3865872f0ab 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 @@ -104,6 +104,7 @@ button.overlays.Cut() button.overlays += image('icons/mob/hud/actions_xeno.dmi', button, action_icon_result) + return ..() ////////// Oppressor powers @@ -343,6 +344,7 @@ button.overlays.Cut() button.overlays += image('icons/mob/hud/actions_xeno.dmi', button, action_icon_result) + return ..() /datum/action/xeno_action/activable/prae_retrieve name = "Retrieve" 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 990a7f919cce..70666e83bc74 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 @@ -73,8 +73,7 @@ BD.regen_shield() apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/pounce/prae_dash/use_ability(atom/A) if(!activated_once && !action_cooldown_check() || owner.throwing) @@ -84,9 +83,11 @@ . = ..() if(.) activated_once = TRUE + button.icon_state = "template_active" addtimer(CALLBACK(src, PROC_REF(timeout)), time_until_timeout) else damage_nearby_targets() + return TRUE /datum/action/xeno_action/activable/pounce/prae_dash/proc/timeout() if (activated_once) @@ -104,6 +105,7 @@ return activated_once = FALSE + button.icon_state = X.selected_ability == src ? "template_on" : "template" var/list/target_mobs = list() var/list/L = orange(1, X) @@ -192,8 +194,7 @@ xeno_throw_human(target_carbon, vanguard_user, get_dir(vanguard_user, target_atom), fling_distance) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/cleave/proc/remove_buff() buffed = FALSE @@ -229,8 +230,7 @@ apply_cooldown() xeno_attack_delay(stabbing_xeno) - ..() - return + return ..() /datum/action/xeno_action/activable/prae_abduct/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -364,8 +364,7 @@ addtimer(CALLBACK(src, /datum/action/xeno_action/activable/prae_abduct/proc/remove_tail_overlay, H, tail_image), 0.5 SECONDS) //needed so it can actually be seen as it gets deleted too quickly otherwise. apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/prae_abduct/proc/remove_tail_overlay(mob/living/carbon/human/overlayed_human, image/tail_image) overlayed_human.overlays -= tail_image @@ -434,8 +433,7 @@ shake_camera(target_carbon, 2, 1) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/tail_lash/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -522,8 +520,7 @@ 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)) - ..() - return + return ..() /////////// Dancer powers @@ -595,8 +592,7 @@ target_carbon.last_damage_data = create_cause_data(initial(dancer_user.caste_type), dancer_user) target_carbon.apply_armoured_damage(damage, ARMOR_MELEE, BRUTE, "chest", 10) playsound(target_carbon, 'sound/weapons/alien_tail_attack.ogg', 30, TRUE) - ..() - return + return ..() /datum/action/xeno_action/onclick/prae_dodge/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner @@ -627,8 +623,7 @@ addtimer(CALLBACK(src, PROC_REF(remove_effects)), duration) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/prae_dodge/proc/remove_effects() var/mob/living/carbon/xenomorph/xeno = owner @@ -695,7 +690,7 @@ to_chat(dancer_user, SPAN_WARNING("You can't attack through [atom_in_turf]!")) return - + // Hmm today I will kill a marine while looking away from them dancer_user.face_atom(target_carbon) @@ -704,11 +699,11 @@ var/buffed = FALSE var/datum/effects/dancer_tag/dancer_tag_effect = locate() in target_carbon.effects_list - + if (dancer_tag_effect) buffed = TRUE qdel(dancer_tag_effect) - + if (!buffed) new /datum/effects/xeno_slow(target_carbon, dancer_user, null, null, get_xeno_stun_duration(target_carbon, slow_duration)) @@ -741,8 +736,7 @@ target_carbon.apply_effect(daze_duration, DAZE) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/prae_acid_ball/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -774,8 +768,7 @@ grenade.throw_atom(A, 5, SPEED_SLOW, X, TRUE) addtimer(CALLBACK(grenade, TYPE_PROC_REF(/obj/item/explosive, prime)), prime_delay) - ..() - return + return ..() /datum/action/xeno_action/activable/warden_heal/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -912,8 +905,7 @@ use_plasma_owner() apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/prae_retrieve/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -1060,4 +1052,4 @@ to_chat(X, SPAN_XENOBOLDNOTICE("You fling [targetXeno] towards you with your resin hook, and they in front of you!")) targetXeno.throw_atom(throw_target_turf, throw_dist, SPEED_VERY_FAST, pass_flags = PASS_MOB_THRU) apply_cooldown() - return + return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm index 1958b6e9e576..058e643f5c64 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm @@ -40,9 +40,7 @@ shake_camera(M, 10, 1) apply_cooldown() - - . = ..() - return + return ..() /datum/action/xeno_action/onclick/smash/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner @@ -95,9 +93,7 @@ shake_camera(M, 0.2 SECONDS, 1) apply_cooldown() - - . = ..() - return + return ..() /datum/action/xeno_action/activable/devastate/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner @@ -163,5 +159,4 @@ xeno.visible_message(SPAN_XENODANGER("[xeno] rapidly slices into [carbon]!")) - . = ..() - return + return ..() 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 3811aae1719b..20bd029f5c94 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 @@ -130,8 +130,7 @@ SSround_recording.recorder.stop_tracking(target_xeno) SSround_recording.recorder.track_player(new_xeno) qdel(target_xeno) - ..() - return + return ..() /datum/action/xeno_action/onclick/remove_eggsac/use_ability(atom/A) var/mob/living/carbon/xenomorph/queen/X = owner @@ -154,7 +153,7 @@ if(!X.ovipositor) return X.dismount_ovipositor() - + return ..() /datum/action/xeno_action/onclick/grow_ovipositor/use_ability(atom/Atom) var/mob/living/carbon/xenomorph/queen/xeno = owner @@ -203,7 +202,7 @@ xeno.visible_message(SPAN_XENOWARNING("\The [xeno] has grown an ovipositor!"), \ SPAN_XENOWARNING("You have grown an ovipositor!")) xeno.mount_ovipositor() - + return ..() /datum/action/xeno_action/onclick/set_xeno_lead/use_ability(atom/A) var/mob/living/carbon/xenomorph/queen/X = owner @@ -246,7 +245,7 @@ X.overwatch(possible_xenos[1]) else to_chat(X, SPAN_XENOWARNING("There are no Xenomorph leaders. Overwatch a Xenomorph to make it a leader.")) - + return ..() /datum/action/xeno_action/activable/queen_heal/use_ability(atom/A, verbose) var/mob/living/carbon/xenomorph/queen/X = owner @@ -291,6 +290,7 @@ apply_cooldown() to_chat(X, SPAN_XENONOTICE("You channel your plasma to heal your sisters' wounds around this area.")) + return ..() /datum/action/xeno_action/onclick/give_evo_points/use_ability(atom/Atom) var/mob/living/carbon/xenomorph/queen/user_xeno = owner @@ -351,6 +351,7 @@ target_xeno.evolution_stored += evo_points_per_larva user_xeno.hive.stored_larva-- + return ..() /datum/action/xeno_action/onclick/banish/use_ability(atom/Atom) var/mob/living/carbon/xenomorph/queen/user_xeno = owner @@ -412,6 +413,7 @@ addtimer(CALLBACK(src, PROC_REF(remove_banish), user_xeno.hive, target_xeno.name), 30 MINUTES) message_admins("[key_name_admin(user_xeno)] has banished [key_name_admin(target_xeno)]. Reason: [reason]") + return ..() /datum/action/xeno_action/onclick/banish/proc/remove_banish(datum/hive_status/hive, name) hive.banished_ckeys.Remove(name) @@ -468,6 +470,7 @@ target_xeno.lock_evolve = FALSE user_xeno.hive.banished_ckeys.Remove(banished_name) + return ..() /datum/action/xeno_action/activable/secrete_resin/remote/queen/use_ability(atom/A) . = ..() @@ -573,6 +576,7 @@ to_chat(X, SPAN_XENONOTICE("You plant weeds at [T].")) apply_cooldown() + return ..() /datum/action/xeno_action/activable/expand_weeds/proc/reset_turf_cooldown(turf/T) recently_built_turfs -= T @@ -605,7 +609,7 @@ tunnel_xeno(src, xeno) addtimer(CALLBACK(src, PROC_REF(transport_xenos), T), 3 SECONDS) - return TRUE + return ..() /datum/action/xeno_action/activable/place_queen_beacon/proc/tunnel_xeno(datum/source, mob/living/carbon/xenomorph/X) SIGNAL_HANDLER @@ -694,7 +698,7 @@ var/obj/effect/alien/resin/resin_pillar/RP = new pillar_type(new_turf) RP.start_decay(brittle_time, decay_time) - return TRUE + return ..() /datum/action/xeno_action/activable/blockade/proc/check_turf(mob/living/carbon/xenomorph/queen/Q, turf/T) if(T.density) 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 df9baa46c29d..8c6c0834eebc 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 @@ -25,6 +25,7 @@ return ..() else actual_empower(xeno) + return TRUE /datum/action/xeno_action/onclick/empower/proc/actual_empower(mob/living/carbon/xenomorph/xeno) var/datum/behavior_delegate/ravager_base/behavior = xeno.behavior_delegate @@ -220,9 +221,7 @@ new /datum/effects/xeno_slow/superslow/(carbon_target, ravager_user, ttl = superslow_duration) apply_cooldown() - ..() - return - + return ..() ///////////// BERSERKER POWERS @@ -257,7 +256,6 @@ X.add_filter("apprehend_on", 1, list("type" = "outline", "color" = "#522020ff", "size" = 1)) // Dark red because the berserker is scary in this state apply_cooldown() - return ..() /datum/action/xeno_action/onclick/apprehend/proc/apprehend_off() @@ -352,8 +350,7 @@ H.dazed += daze_amount apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/eviscerate/use_ability(atom/A) var/mob/living/carbon/xenomorph/xeno = owner @@ -437,8 +434,7 @@ xeno.anchored = FALSE xeno.update_canmove() - ..() - return + return ..() ////////// HEDGEHOG POWERS @@ -474,8 +470,7 @@ addtimer(CALLBACK(src, PROC_REF(remove_shield)), shield_duration) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/spike_shield/action_cooldown_check() if (shield_active) // If active shield, return FALSE so that this action does not get carried out @@ -536,8 +531,7 @@ playsound(X, 'sound/effects/spike_spray.ogg', 25, 1) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/rav_spikes/action_cooldown_check() if(!owner) @@ -577,8 +571,7 @@ playsound(X, 'sound/effects/spike_spray.ogg', 25, 1) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/spike_shed/action_cooldown_check() if (cooldown_timer_id == TIMER_ID_NULL) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm index 99c980a76c85..64e4b73cfbd2 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm @@ -24,8 +24,7 @@ P.fire_at(target, X, X, ammoDatum.max_range, ammoDatum.shell_speed) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/acider_acid/use_ability(atom/A) @@ -43,7 +42,7 @@ X.corrosive_acid(A, acid_type, 0) for(var/obj/item/explosive/plastic/E in A.contents) X.corrosive_acid(E,acid_type,0) - ..() + return ..() /mob/living/carbon/xenomorph/runner/corrosive_acid(atom/O, acid_type, plasma_cost) if (mutation_type != RUNNER_ACIDER) @@ -192,18 +191,24 @@ X.set_effect(BD.caboom_timer*2, SUPERSLOW) X.say(";FOR THE HIVE!!!") + return ..() /datum/action/xeno_action/activable/acider_for_the_hive/proc/cancel_ability() - var/mob/living/carbon/xenomorph/X = owner + var/mob/living/carbon/xenomorph/xeno = owner - if(!istype(X)) + if(!istype(xeno)) return - var/datum/behavior_delegate/runner_acider/BD = X.behavior_delegate - if(!istype(BD)) + var/datum/behavior_delegate/runner_acider/behavior = xeno.behavior_delegate + if(!istype(behavior)) return - BD.caboom_trigger = FALSE - X.color = null - X.SetLuminosity(0) - BD.modify_acid(-BD.max_acid / 4) - to_chat(X, SPAN_XENOWARNING("You remove all your explosive acid before it combusted.")) + behavior.caboom_trigger = FALSE + xeno.color = null + xeno.SetLuminosity(0) + behavior.modify_acid(-behavior.max_acid / 4) + + // Done this way rather than setting to 0 in case something else slowed us + // -Original amount set - (time exploding + timer inaccuracy) * how much gets removed per tick / 2 + xeno.adjust_effect(behavior.caboom_timer * -2 - (behavior.caboom_timer - behavior.caboom_left + 2) * xeno.life_slow_reduction * 0.5, SUPERSLOW) + + to_chat(xeno, SPAN_XENOWARNING("You remove all your explosive acid before it combusted.")) 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 5cd45d4788ff..58384a01a3fa 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 @@ -28,7 +28,7 @@ projectile.fire_at(target, xeno, xeno, xeno.ammo.max_range, xeno.ammo.shell_speed) apply_cooldown() - ..() + return ..() /datum/action/xeno_action/activable/scattered_spit/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner @@ -63,7 +63,7 @@ projectile.fire_at(target, xeno, xeno, xeno.ammo.max_range, xeno.ammo.shell_speed) apply_cooldown() - ..() + return ..() /datum/action/xeno_action/onclick/paralyzing_slash/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner @@ -90,8 +90,7 @@ addtimer(CALLBACK(src, PROC_REF(unbuff_slash)), buff_duration) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/paralyzing_slash/proc/unbuff_slash() var/mob/living/carbon/xenomorph/xeno = owner diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_powers.dm index a27b62ee626b..ec8dfd9b7cd9 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_powers.dm @@ -30,8 +30,7 @@ addtimer(CALLBACK(src, PROC_REF(remove_effects)), duration) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/charge_spit/proc/disable_spatter() SIGNAL_HANDLER 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 460c287384f8..bd6e2bb8d08b 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 @@ -20,13 +20,13 @@ macro_path = /datum/action/xeno_action/verb/verb_fling action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_3 - xeno_cooldown = 65 + xeno_cooldown = 60 // Configurables var/fling_distance = 4 - var/stun_power = 1 - var/weaken_power = 1 - var/slowdown = FALSE + var/stun_power = 0 + var/weaken_power = 0.5 + var/slowdown = 2 // Warrior Lunge @@ -40,7 +40,7 @@ xeno_cooldown = 100 // Configurables - var/grab_range = 6 + var/grab_range = 4 var/click_miss_cooldown = 15 var/twitch_message_cooldown = 0 //apparently this is necessary for a tiny code that makes the lunge message on cooldown not be spammable, doesn't need to be big so 5 will do. @@ -53,7 +53,7 @@ macro_path = /datum/action/xeno_action/verb/verb_punch action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_1 - xeno_cooldown = 50 + xeno_cooldown = 45 // Configurables var/base_damage = 25 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 52bd88aad01e..1ba675f5e6d6 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 @@ -59,8 +59,7 @@ X.update_icons() apply_cooldown() - ..() - + return ..() /datum/action/xeno_action/activable/fling/use_ability(atom/target_atom) var/mob/living/carbon/xenomorph/woyer = owner @@ -121,8 +120,7 @@ carbone.throw_atom(throw_turf, fling_distance, SPEED_VERY_FAST, woyer, TRUE) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/warrior_punch/use_ability(atom/target_atom) var/mob/living/carbon/xenomorph/woyer = owner @@ -166,7 +164,7 @@ playsound(carbone,S, 50, 1) do_base_warrior_punch(carbone, target_limb) apply_cooldown() - ..() + return ..() /datum/action/xeno_action/activable/warrior_punch/proc/do_base_warrior_punch(mob/living/carbon/carbone, obj/limb/target_limb) var/mob/living/carbon/xenomorph/woyer = owner 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 96e04b265990..60fdda450df3 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm @@ -131,6 +131,9 @@ // TODO: make hidden a part of can_use_action if(!hidden && can_use_action() && use_ability(arglist(args))) SEND_SIGNAL(src, COMSIG_XENO_ACTION_USED, owner) + return TRUE + + return FALSE // For actions that do something on each life tick /datum/action/xeno_action/proc/life_tick() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm index a286eb552d9b..1bb8b42775ee 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm @@ -95,7 +95,7 @@ /mob/living/carbon/xenomorph/facehugger/pull_response(mob/puller) return TRUE -/mob/living/carbon/xenomorph/facehugger/UnarmedAttack(atom/A, proximity, click_parameters, tile_attack) +/mob/living/carbon/xenomorph/facehugger/UnarmedAttack(atom/A, proximity, click_parameters, tile_attack, ignores_resin = FALSE) a_intent = INTENT_HELP //Forces help intent for all interactions. if(!caste) return FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm index 9f3ea39ea85b..04b7e04c2da5 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm @@ -146,7 +146,7 @@ /mob/living/carbon/xenomorph/larva/pull_response(mob/puller) return TRUE -/mob/living/carbon/xenomorph/larva/UnarmedAttack(atom/A, proximity, click_parameters, tile_attack) +/mob/living/carbon/xenomorph/larva/UnarmedAttack(atom/A, proximity, click_parameters, tile_attack, ignores_resin = FALSE) a_intent = INTENT_HELP //Forces help intent for all interactions. if(!caste) return FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm b/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm index 94b876525a44..e1bdb18a29e2 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm @@ -32,6 +32,8 @@ minimap_icon = "praetorian" + royal_caste = TRUE + /mob/living/carbon/xenomorph/praetorian caste_type = XENO_CASTE_PRAETORIAN name = XENO_CASTE_PRAETORIAN diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm index 2b33b6891680..93b6d230b198 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm @@ -48,6 +48,8 @@ minimap_icon = "xenoqueen" + royal_caste = TRUE + /proc/update_living_queens() // needed to update when you change a queen to a different hive outer_loop: var/datum/hive_status/hive diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm index d66d034bbe66..d815bc18f9d5 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm @@ -112,7 +112,6 @@ /datum/behavior_delegate/warrior_base name = "Base Warrior Behavior Delegate" - var/slash_charge_cdr = 0.20 SECONDS // Amount to reduce charge cooldown by per slash var/lifesteal_percent = 7 var/max_lifesteal = 9 var/lifesteal_range = 3 // Marines within 3 tiles of range will give the warrior extra health @@ -120,21 +119,6 @@ var/color = "#6c6f24" var/emote_cooldown = 0 -/datum/behavior_delegate/warrior_base/melee_attack_additional_effects_self() - ..() - - var/datum/action/xeno_action/activable/lunge/cAction1 = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/lunge) - if (!cAction1.action_cooldown_check()) - cAction1.reduce_cooldown(slash_charge_cdr) - - var/datum/action/xeno_action/activable/fling/cAction2 = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/fling) - if (!cAction2.action_cooldown_check()) - cAction2.reduce_cooldown(slash_charge_cdr) - - var/datum/action/xeno_action/activable/warrior_punch/cAction3 = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/warrior_punch) - if (!cAction3.action_cooldown_check()) - cAction3.reduce_cooldown(slash_charge_cdr) - /datum/behavior_delegate/warrior_base/melee_attack_additional_effects_target(mob/living/carbon/A) ..() diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status.dm b/code/modules/mob/living/carbon/xenomorph/hive_status.dm index f8e54b957106..4fe1be51bfff 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_status.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_status.dm @@ -95,7 +95,6 @@ evilution_level = SSxevolution.get_evolution_boost_power(assoc_hive.hivenumber) else evilution_level = 1 - 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 86604a62dab6..4fa3470a6031 100644 --- a/code/modules/mob/living/carbon/xenomorph/life.dm +++ b/code/modules/mob/living/carbon/xenomorph/life.dm @@ -397,7 +397,7 @@ Make sure their actual health updates immediately.*/ return var/atom/tracking_atom - switch(QL.track_state) + switch(QL.track_state[1]) if(TRACKER_QUEEN) if(!hive || !hive.living_xeno_queen) QL.icon_state = "trackoff" @@ -408,8 +408,13 @@ Make sure their actual health updates immediately.*/ QL.icon_state = "trackoff" return tracking_atom = hive.hive_location - else - var/leader_tracker = text2num(QL.track_state) + if(TRACKER_LEADER) + if(!QL.track_state[2]) + QL.icon_state = "trackoff" + return + + var/leader_tracker = QL.track_state[2] + if(!hive || !hive.xeno_leader_list) QL.icon_state = "trackoff" return @@ -420,6 +425,23 @@ Make sure their actual health updates immediately.*/ QL.icon_state = "trackoff" return tracking_atom = hive.xeno_leader_list[leader_tracker] + if(TRACKER_TUNNEL) + if(!QL.track_state[2]) + QL.icon_state = "trackoff" + return + + var/tunnel_tracker = QL.track_state[2] + + if(!hive || !hive.tunnels) + QL.icon_state = "trackoff" + return + if(tunnel_tracker > hive.tunnels.len) + QL.icon_state = "trackoff" + return + if(!hive.tunnels[tunnel_tracker]) + QL.icon_state = "trackoff" + return + tracking_atom = hive.tunnels[tunnel_tracker] if(!tracking_atom) QL.icon_state = "trackoff" diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/boiler/trapper.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/boiler/trapper.dm index f929dd2211ff..cb43960a8e2c 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/boiler/trapper.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/boiler/trapper.dm @@ -12,6 +12,7 @@ /datum/action/xeno_action/activable/spray_acid/boiler, /datum/action/xeno_action/onclick/dump_acid, /datum/action/xeno_action/onclick/toggle_long_range/boiler, + /datum/action/xeno_action/onclick/acid_shroud, ) mutator_actions_to_add = list( /datum/action/xeno_action/activable/boiler_trap, @@ -32,6 +33,7 @@ if(boiler.is_zoomed) boiler.zoom_out() + boiler.tileoffset = 0 boiler.viewsize = TRAPPER_VIEWRANGE boiler.mutation_type = BOILER_TRAPPER boiler.plasma_types -= PLASMA_NEUROTOXIN diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm index 57ff925a635c..0e6b7e4657d3 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm @@ -121,8 +121,7 @@ xeno.update_icons() apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/change_fruit name = "Change Fruit" @@ -331,7 +330,7 @@ apply_cooldown() xeno_cooldown = initial(xeno_cooldown) - ..() + return ..() /datum/action/xeno_action/verb/verb_resin_surge() set category = "Alien" diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/healer.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/healer.dm index 3c949f2bd6fb..5caab38529e6 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/healer.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/healer.dm @@ -70,7 +70,7 @@ /datum/action/xeno_action/activable/apply_salve/use_ability(atom/target_atom) var/mob/living/carbon/xenomorph/xeno = owner xeno.xeno_apply_salve(target_atom, health_transfer_amount, max_range, damage_taken_mod) - ..() + return ..() /datum/action/xeno_action/verb/verb_apply_salve() set category = "Alien" diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/hivelord/resin_whisperer.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/hivelord/resin_whisperer.dm index f5264aecfeab..3200fd0da4a1 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/hivelord/resin_whisperer.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/hivelord/resin_whisperer.dm @@ -113,6 +113,7 @@ target_turf.visible_message(SPAN_XENONOTICE("The weeds begin pulsating wildly and secrete resin in the shape of \a [resing_construction.construction_name]!"), null, 5) to_chat(owner, SPAN_XENONOTICE("You focus your plasma into the weeds below you and force the weeds to secrete resin in the shape of \a [resing_construction.construction_name].")) playsound(target_turf, "alien_resin_build", 25) + return TRUE /datum/action/xeno_action/verb/verb_coerce_resin() set category = "Alien" diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm index 25ee9b315cc4..a2699a4f0f40 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm @@ -147,6 +147,8 @@ damage *= XVX_ACID_DAMAGEMULT target_living.apply_damage(damage, BURN) + for(var/turf/T in view(bound_xeno, acid_range)) + new /obj/effect/particle_effect/smoke/acid_runner_harmless(T) playsound(bound_xeno, 'sound/effects/blobattack.ogg', 75) if(bound_xeno.client && bound_xeno.hive) addtimer(CALLBACK(bound_xeno.hive, TYPE_PROC_REF(/datum/hive_status, free_respawn), bound_xeno.client), 5 SECONDS) diff --git a/code/modules/mob/living/carbon/xenomorph/update_icons.dm b/code/modules/mob/living/carbon/xenomorph/update_icons.dm index 21d6aaae609c..477ead761474 100644 --- a/code/modules/mob/living/carbon/xenomorph/update_icons.dm +++ b/code/modules/mob/living/carbon/xenomorph/update_icons.dm @@ -162,17 +162,6 @@ overlays_standing[X_RESOURCE_LAYER] = image("icon" = icon, "icon_state" = "[caste_type]_resources", "layer" =-X_RESOURCE_LAYER) apply_overlay(X_RESOURCE_LAYER) -//Call when target overlay should be added/removed -/mob/living/carbon/xenomorph/update_targeted() - remove_overlay(X_TARGETED_LAYER) - if(targeted_by && target_locked) - overlays_standing[X_TARGETED_LAYER] = image("icon" = target_locked, "layer" =-X_TARGETED_LAYER) - else if(!targeted_by && target_locked) - QDEL_NULL(target_locked) - if(!targeted_by || src.stat == DEAD) - overlays_standing[X_TARGETED_LAYER] = null - apply_overlay(X_TARGETED_LAYER) - /mob/living/carbon/xenomorph/update_inv_legcuffed() remove_overlay(X_LEGCUFF_LAYER) if(legcuffed) diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm index cf8f5978fafa..b5431720e14a 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm @@ -136,6 +136,8 @@ ///The iconstate for leadered xenos on the minimap, added as overlay var/minimap_leadered_overlay = "xenoleader" + var/royal_caste = FALSE + /datum/caste_datum/can_vv_modify() return FALSE @@ -263,10 +265,14 @@ ) /// Assoc list of free slots currently used by specific castes var/list/used_free_slots - var/list/tier_2_xenos = list()//list of living tier2 xenos - var/list/tier_3_xenos = list()//list of living tier3 xenos - var/list/totalXenos = list() //list of living xenos - var/list/totalDeadXenos = list()//list of previously living xenos + /// list of living tier2 xenos + var/list/tier_2_xenos = list() + /// list of living tier3 xenos + var/list/tier_3_xenos = list() + /// list of living xenos + var/list/totalXenos = list() + /// list of previously living xenos (hardrefs currently) + var/list/total_dead_xenos = list() var/xeno_queen_timer var/isSlotOpen = TRUE //Set true for starting alerts only after the hive has reached its full potential var/allowed_nest_distance = 15 //How far away do we allow nests from an ovied Queen. Default 15 tiles. @@ -287,8 +293,12 @@ var/allow_no_queen_actions = FALSE var/evolution_without_ovipositor = TRUE //Temporary for the roundstart. - var/allow_queen_evolve = TRUE // Set to true if you want to prevent evolutions into Queens - var/hardcore = FALSE // Set to true if you want to prevent bursts and spawns of new xenos. Will also prevent healing if the queen no longer exists + /// Set to true if you want to prevent evolutions into Queens + var/allow_queen_evolve = TRUE + /// Set to true if you want to prevent bursts and spawns of new xenos. Will also prevent healing if the queen no longer exists + var/hardcore = FALSE + /// Set to false if you want to prevent getting burrowed larva from latejoin marines + var/latejoin_burrowed = TRUE var/list/hive_inherant_traits @@ -434,8 +444,10 @@ if(hard) xeno.hivenumber = 0 xeno.hive = null +#ifndef UNIT_TESTS // Since this is a hard ref, we shouldn't confuse create_and_destroy else - totalDeadXenos += xeno + total_dead_xenos += xeno +#endif totalXenos -= xeno if(xeno.tier == 2) @@ -1025,6 +1037,7 @@ prefix = "Corrupted " color = "#80ff80" ui_color ="#4d994d" + latejoin_burrowed = FALSE need_round_end_check = TRUE @@ -1047,6 +1060,7 @@ prefix = "Alpha " color = "#ff4040" ui_color = "#992626" + latejoin_burrowed = FALSE dynamic_evolution = FALSE @@ -1056,6 +1070,7 @@ prefix = "Bravo " color = "#ffff80" ui_color = "#99994d" + latejoin_burrowed = FALSE dynamic_evolution = FALSE @@ -1065,6 +1080,7 @@ prefix = "Charlie " color = "#bb40ff" ui_color = "#702699" + latejoin_burrowed = FALSE dynamic_evolution = FALSE @@ -1074,6 +1090,7 @@ prefix = "Delta " color = "#8080ff" ui_color = "#4d4d99" + latejoin_burrowed = FALSE dynamic_evolution = FALSE @@ -1090,6 +1107,7 @@ allow_no_queen_actions = TRUE allow_queen_evolve = FALSE ignore_slots = TRUE + latejoin_burrowed = FALSE /datum/hive_status/forsaken name = "Forsaken Hive" @@ -1102,6 +1120,7 @@ allow_no_queen_actions = TRUE allow_queen_evolve = FALSE ignore_slots = TRUE + latejoin_burrowed = FALSE need_round_end_check = TRUE @@ -1117,6 +1136,7 @@ allow_no_queen_actions = TRUE allow_queen_evolve = FALSE ignore_slots = TRUE + latejoin_burrowed = FALSE need_round_end_check = TRUE @@ -1131,6 +1151,7 @@ ui_color = "#6abd99" hive_inherant_traits = list(TRAIT_XENONID, TRAIT_NO_COLOR) + latejoin_burrowed = FALSE /datum/hive_status/corrupted/tamed name = "Tamed Hive" @@ -1142,6 +1163,7 @@ allow_no_queen_actions = TRUE allow_queen_evolve = FALSE ignore_slots = TRUE + latejoin_burrowed = FALSE var/mob/living/carbon/human/leader var/list/allied_factions diff --git a/code/modules/mob/living/living_healthscan.dm b/code/modules/mob/living/living_healthscan.dm index 067f39e1ab42..6875aa934fd2 100644 --- a/code/modules/mob/living/living_healthscan.dm +++ b/code/modules/mob/living/living_healthscan.dm @@ -101,7 +101,7 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant)) "hugged" = (locate(/obj/item/alien_embryo) in target_mob), ) - var/internal_bleeding = FALSE + var/internal_bleeding = FALSE //do they have internal bleeding anywhere if(!isnull(data_detail_level)) detail_level = data_detail_level @@ -158,11 +158,10 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant)) var/core_fracture_detected = FALSE var/unknown_implants = 0 for(var/obj/limb/limb in human_target_mob.limbs) - var/internal_bleeding_check = FALSE + var/internal_bleeding_check = FALSE //do they have internal bleeding in this limb for(var/datum/effects/bleeding/internal/ib in limb.bleeding_effects_list) internal_bleeding = TRUE - if(detail_level >= DETAIL_LEVEL_BODYSCAN) - internal_bleeding_check = TRUE + internal_bleeding_check = TRUE break if(limb.hidden) unknown_implants++ diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index e8d96d683107..49dc25bd57ea 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -149,6 +149,11 @@ var/list/ai_verbs_default = list( /mob/living/silicon/ai/Destroy() ai_list -= src + QDEL_NULL(aiMulti) + if(aiRadio) + aiRadio.myAi = null + QDEL_NULL(aiRadio) + QDEL_NULL(aiCamera) . = ..() /mob/living/silicon/ai/proc/SetName(pickedName as text) diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm index df41b68e7c36..abd07e056be7 100644 --- a/code/modules/mob/living/silicon/decoy/decoy.dm +++ b/code/modules/mob/living/silicon/decoy/decoy.dm @@ -1,13 +1,3 @@ -/mob/living/silicon/decoy/ship_ai //For the moment, pending better pathing. - var/silent_announcement_cooldown = 0 - -/mob/living/silicon/decoy/ship_ai/Initialize() - . = ..() - name = MAIN_AI_SYSTEM - desc = "This is the artificial intelligence system for the [MAIN_SHIP_NAME]. Like many other military-grade AI systems, this one was manufactured by Weyland-Yutani." - ai_headset = new(src) - ai_mob_list += src - //Should likely just replace this with an actual AI mob in the future. Might as well. /mob/living/silicon/decoy name = "AI" @@ -21,6 +11,23 @@ custom_slashed_sound = "alien_claw_metal" var/obj/item/device/radio/headset/almayer/mcom/ai/ai_headset //The thing it speaks into. +/mob/living/silicon/decoy/ship_ai //For the moment, pending better pathing. + var/silent_announcement_cooldown = 0 + +/mob/living/silicon/decoy/ship_ai/Initialize() + . = ..() + name = MAIN_AI_SYSTEM + desc = "This is the artificial intelligence system for the [MAIN_SHIP_NAME]. Like many other military-grade AI systems, this one was manufactured by Weyland-Yutani." + ai_headset = new(src) + ai_mob_list += src + +/mob/living/silicon/decoy/ship_ai/Destroy() + QDEL_NULL(ai_headset) +#ifdef UNIT_TESTS + ai_mob_list -= src // Or should we always remove them? +#endif + return ..() + /mob/living/silicon/decoy/Life(delta_time) if(stat == DEAD) return FALSE diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index 4390d2c198e6..1baec99bb0a9 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -20,6 +20,11 @@ /datum/robot_component/New(mob/living/silicon/robot/R) src.owner = R +/datum/robot_component/Destroy(force, ...) + . = ..() + owner = null + QDEL_NULL(wrapped) + /datum/robot_component/proc/install() /datum/robot_component/proc/uninstall() diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 3ec91da9b219..1fa07ae0bc85 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -88,6 +88,15 @@ aiCamera = new/obj/item/device/camera/siliconcam/drone_camera(src) playsound(src.loc, 'sound/machines/twobeep.ogg', 25, 0) +/mob/living/silicon/robot/drone/Destroy() + QDEL_NULL(aiCamera) + stack_metal = null + stack_wood = null + stack_glass = null + stack_plastic = null + decompiler = null + return ..() + //Redefining some robot procs... /mob/living/silicon/robot/drone/updatename() var/new_name = "XP-45 Engineering Drone ([nicknumber])" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index e7aa27e7ce55..7edcb7d4fede 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -150,10 +150,22 @@ var/list/robot_verbs_default = list( //Improved /N /mob/living/silicon/robot/Destroy() if(mmi)//Safety for when a cyborg gets dust()ed. Or there is no MMI inside. - var/turf/T = get_turf(loc)//To hopefully prevent run time errors. - if(T) mmi.forceMove(T) + var/turf/turf = get_turf(loc)//To hopefully prevent run time errors. + if(turf) mmi.forceMove(turf) if(mind) mind.transfer_to(mmi.brainmob) mmi = null + QDEL_NULL(aiCamera) + QDEL_NULL(spark_system) + QDEL_NULL(module) + module_active = null + module_state_1 = null + module_state_2 = null + module_state_3 = null + QDEL_NULL(radio) + connected_ai = null + QDEL_NULL(cell) + QDEL_NULL(camera) + QDEL_LIST_ASSOC_VAL(components) . = ..() /mob/living/silicon/robot/proc/pick_module() @@ -695,14 +707,6 @@ var/list/robot_verbs_default = list( else overlays += "ov-openpanel -c" -//Call when target overlay should be added/removed -/mob/living/silicon/robot/update_targeted() - if(!targeted_by && target_locked) - QDEL_NULL(target_locked) - update_icons() - if (targeted_by && target_locked) - overlays += target_locked - /mob/living/silicon/robot/proc/installed_modules() if(weapon_lock) to_chat(src, SPAN_DANGER("Weapon lock active, unable to use modules! Count:[weaponlock_time]")) diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 8a90da51e6c2..c10d4f8327a0 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -29,6 +29,12 @@ udder.my_atom = src . = ..() +/mob/living/simple_animal/hostile/retaliate/goat/Destroy() + if(udder) + udder.my_atom = null + QDEL_NULL(udder) + return ..() + /mob/living/simple_animal/hostile/retaliate/goat/Life(delta_time) . = ..() if(.) @@ -111,6 +117,12 @@ udder.my_atom = src ..() +/mob/living/simple_animal/cow/Destroy() + if(udder) + udder.my_atom = null + QDEL_NULL(udder) + return ..() + /mob/living/simple_animal/cow/attackby(obj/item/O as obj, mob/user as mob) var/obj/item/reagent_container/glass/G = O if(stat == CONSCIOUS && istype(G) && G.is_open_container()) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm index 25a21cff2874..9266e67db495 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm @@ -46,7 +46,7 @@ max_n2 = 0 minbodytemp = 0 - var/has_loot = 1 + var/has_loot = TRUE faction = "malf_drone" /mob/living/simple_animal/hostile/retaliate/malf_drone/Initialize() @@ -161,54 +161,59 @@ ..(null,"suddenly breaks apart.") qdel(src) -/mob/living/simple_animal/hostile/retaliate/malf_drone/Destroy() - //some random debris left behind - if(has_loot) - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(3, 1, src) - s.start() - var/obj/O - - //shards - O = new /obj/item/shard(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(75)) - O = new /obj/item/shard(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(50)) - O = new /obj/item/shard(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(25)) - O = new /obj/item/shard(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - - //rods - O = new /obj/item/stack/rods(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(75)) - O = new /obj/item/stack/rods(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(50)) - O = new /obj/item/stack/rods(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(25)) - O = new /obj/item/stack/rods(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - - //plasteel - O = new /obj/item/stack/sheet/plasteel(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(75)) - O = new /obj/item/stack/sheet/plasteel(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(50)) - O = new /obj/item/stack/sheet/plasteel(src.loc) - step_to(O, get_turf(pick(view(7, src)))) - if(prob(25)) - O = new /obj/item/stack/sheet/plasteel(src.loc) - step_to(O, get_turf(pick(view(7, src)))) +/mob/living/simple_animal/hostile/retaliate/malf_drone/Destroy(force) + QDEL_NULL(ion_trail) - . = ..() + if(!has_loot || force) + return ..() + + //some random debris left behind + var/datum/effect_system/spark_spread/spark = new /datum/effect_system/spark_spread + spark.set_up(3, 1, src) + spark.start() + spark.holder = null + var/obj/loot + + //shards + loot = new /obj/item/shard(loc) + step_to(loot, get_turf(pick(view(7, src)))) + if(prob(75)) + loot = new /obj/item/shard(loc) + step_to(loot, get_turf(pick(view(7, src)))) + if(prob(50)) + loot = new /obj/item/shard(loc) + step_to(loot, get_turf(pick(view(7, src)))) + if(prob(25)) + loot = new /obj/item/shard(loc) + step_to(loot, get_turf(pick(view(7, src)))) + + //rods + loot = new /obj/item/stack/rods(loc) + step_to(loot, get_turf(pick(view(7, src)))) + if(prob(75)) + loot = new /obj/item/stack/rods(loc) + step_to(loot, get_turf(pick(view(7, src)))) + if(prob(50)) + loot = new /obj/item/stack/rods(loc) + step_to(loot, get_turf(pick(view(7, src)))) + if(prob(25)) + loot = new /obj/item/stack/rods(loc) + step_to(loot, get_turf(pick(view(7, src)))) + + //plasteel + loot = new /obj/item/stack/sheet/plasteel(loc) + step_to(loot, get_turf(pick(view(7, src)))) + if(prob(75)) + loot = new /obj/item/stack/sheet/plasteel(loc) + step_to(loot, get_turf(pick(view(7, src)))) + if(prob(50)) + loot = new /obj/item/stack/sheet/plasteel(loc) + step_to(loot, get_turf(pick(view(7, src)))) + if(prob(25)) + loot = new /obj/item/stack/sheet/plasteel(loc) + step_to(loot, get_turf(pick(view(7, src)))) + + return ..() /obj/item/projectile/beam/drone damage = 15 diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 2bf44188eff4..8b1cc1e26be2 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -341,14 +341,6 @@ return (0) return (1) -//Call when target overlay should be added/removed -/mob/living/simple_animal/update_targeted() - if(!targeted_by && target_locked) - QDEL_NULL(target_locked) - overlays = null - if (targeted_by && target_locked) - overlays += target_locked - /mob/living/simple_animal/say(message) if(stat) return diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index f834b2289e4a..652d11b2a70b 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -3,6 +3,7 @@ GLOB.dead_mob_list -= src GLOB.alive_mob_list -= src GLOB.player_list -= src + GLOB.freed_mob_list -= src ghostize(FALSE) @@ -21,6 +22,7 @@ QDEL_NULL_LIST(viruses) resistances?.Cut() QDEL_LIST_ASSOC_VAL(implants) + qdel(hud_used) // The hud will null it . = ..() @@ -354,6 +356,9 @@ SEND_SIGNAL(client, COMSIG_CLIENT_RESET_VIEW, A) return +/mob/proc/reset_observer_view_on_deletion(atom/deleted, force) + SIGNAL_HANDLER + reset_view(null) /mob/proc/show_inv(mob/user) user.set_interaction(src) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 80bac5eb282b..b469052104fd 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -125,6 +125,7 @@ var/life_steps_total = 0 var/life_kills_total = 0 var/life_damage_taken_total = 0 + var/life_revives_total = 0 var/festivizer_hits_total = 0 var/life_value = 1 // when killed, the killee gets this much added to its life_kills_total diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index fa8d286f659b..c3266982b20d 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -168,7 +168,6 @@ if((mob.flags_atom & DIRLOCK) && mob.dir != direct) move_delay += MOVE_REDUCTION_DIRECTION_LOCKED // by Geeves - mob.last_move_intent = world.time + 10 mob.cur_speed = Clamp(10/(move_delay + 0.5), MIN_SPEED, MAX_SPEED) //We are now going to move moving = TRUE diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index ad60dcbebf51..9f88f0f9d611 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -20,7 +20,6 @@ if(ready) readied_players-- GLOB.new_player_list -= src - GLOB.dead_mob_list -= src return ..() /mob/new_player/verb/new_player_panel() @@ -244,7 +243,7 @@ spawning = TRUE close_spawn_windows() - var/mob/living/carbon/human/character = create_character() //creates the human and transfers vars and mind + var/mob/living/carbon/human/character = create_character(TRUE) //creates the human and transfers vars and mind RoleAuthority.equip_role(character, RoleAuthority.roles_for_mode[rank], late_join = TRUE) EquipCustomItems(character) @@ -263,12 +262,13 @@ if(SSticker.mode.latejoin_larva_drop && SSticker.mode.latejoin_tally >= SSticker.mode.latejoin_larva_drop) SSticker.mode.latejoin_tally -= SSticker.mode.latejoin_larva_drop - var/datum/hive_status/HS + var/datum/hive_status/hive for(var/hivenumber in GLOB.hive_datum) - HS = GLOB.hive_datum[hivenumber] - if(length(HS.totalXenos)) - HS.stored_larva++ - HS.hive_ui.update_burrowed_larva() + hive = GLOB.hive_datum[hivenumber] + if(hive.latejoin_burrowed == TRUE) + if(length(hive.totalXenos) && (hive.hive_location || ROUND_TIME < XENO_ROUNDSTART_PROGRESS_TIME_2)) + hive.stored_larva++ + hive.hive_ui.update_burrowed_larva() if(character.mind && character.mind.player_entity) var/datum/entity/player_entity/player = character.mind.player_entity @@ -349,7 +349,7 @@ show_browser(src, dat, "Late Join", "latechoices", "size=420x700") -/mob/new_player/proc/create_character() +/mob/new_player/proc/create_character(is_late_join = FALSE) spawning = TRUE close_spawn_windows() @@ -368,7 +368,7 @@ new_character.lastarea = get_area(loc) - client.prefs.copy_all_to(new_character) + client.prefs.copy_all_to(new_character, job, is_late_join) if (client.prefs.be_random_body) var/datum/preferences/TP = new() @@ -444,7 +444,7 @@ /mob/proc/close_spawn_windows() // Somehow spawn menu stays open for non-newplayers close_browser(src, "latechoices") //closes late choices window close_browser(src, "playersetup") //closes the player setup window - src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // Stops lobby music. + src << sound(null, repeat = 0, wait = 0, volume = 85, channel = SOUND_CHANNEL_LOBBY) // Stops lobby music. if(src.open_uis) for(var/datum/nanoui/ui in src.open_uis) if(ui.allowed_user_stat == -1) diff --git a/code/modules/nightmare/nmnodes/components.dm b/code/modules/nightmare/nmnodes/components.dm index 27ddd590d699..f0ad9acc6fc3 100644 --- a/code/modules/nightmare/nmnodes/components.dm +++ b/code/modules/nightmare/nmnodes/components.dm @@ -24,6 +24,9 @@ /datum/component/nmnode_cond/proc/check_for_cond(datum/nmnode/source, datum/nmcontext/context) SIGNAL_HANDLER var/value = context.get_scenario_value(src.pname) +#if defined(UNIT_TESTS) + return // Force true for testing (this could potentially make false positives though) +#endif if(!(negate ^ (value == pvalue))) return COMPONENT_ABORT_NMNODE @@ -45,5 +48,8 @@ /datum/element/nmnode_prob/proc/check_prob(datum/nmnode/source) SIGNAL_HANDLER +#if defined(UNIT_TESTS) + return // Force true for testing +#endif if(rand() > probvalue) return COMPONENT_ABORT_NMNODE diff --git a/code/modules/nightmare/nmnodes/flow.dm b/code/modules/nightmare/nmnodes/flow.dm index 832269451dc3..1ca8c48f88b8 100644 --- a/code/modules/nightmare/nmnodes/flow.dm +++ b/code/modules/nightmare/nmnodes/flow.dm @@ -71,6 +71,9 @@ pickables[node] = node.raw["weight"] var/list/datum/nmnode/picked = list() var/remaining = src.amount +#if defined(UNIT_TESTS) + remaining = length(pickables) // Force all to be picked for testing (this could potentially make false positives though) +#endif while(length(pickables) && remaining > 0) var/datum/nmnode/node = pickweight(pickables) remaining-- diff --git a/code/modules/nightmare/nmnodes/mapload.dm b/code/modules/nightmare/nmnodes/mapload.dm index 6d1682811be6..6f75a46ed125 100644 --- a/code/modules/nightmare/nmnodes/mapload.dm +++ b/code/modules/nightmare/nmnodes/mapload.dm @@ -67,7 +67,9 @@ weights += w sum += w var/roll = rand(1, sum) +#if !defined(UNIT_TESTS) sum = 0 +#endif // Remove the possibility of chance for testing for(var/i in 1 to length(filelist)) sum += weights[i] if(sum >= roll && matcher.Find(filelist[i])) @@ -97,9 +99,11 @@ for(var/filename in dircontents) if(!matcher.Find(filename)) continue +#if !defined(UNIT_TESTS) var/fprob = Clamp(text2num(matcher.group[1]) / 100, 0, 1) if(fprob < rand()) continue +#endif // Remove the possibility of chance for testing var/landmark = matcher.group[3] var/keep = (matcher.group[2] == "+") var/datum/nmtask/mapload/task = new("[name] @ [landmark]", "[dir_path][matcher.match]", landmark, keep) diff --git a/code/modules/organs/limbs.dm b/code/modules/organs/limbs.dm index e3b98b99a232..dae33bea8157 100644 --- a/code/modules/organs/limbs.dm +++ b/code/modules/organs/limbs.dm @@ -65,6 +65,8 @@ var/list/bleeding_effects_list = list() + var/can_bleed_internally = TRUE + var/destroyed = FALSE var/status = LIMB_ORGANIC var/processing = FALSE @@ -249,7 +251,7 @@ */ /obj/limb/proc/take_damage(brute, burn, sharp, edge, used_weapon = null,\ list/forbidden_limbs = list(), - no_limb_loss, damage_source = "dismemberment",\ + no_limb_loss, damage_source = create_cause_data("amputation"),\ mob/attack_source = null,\ brute_reduced_by = -1, burn_reduced_by = -1) if((brute <= 0) && (burn <= 0)) @@ -355,22 +357,17 @@ if(CONFIG_GET(flag/limbs_can_break) && brute_dam >= max_damage * CONFIG_GET(number/organ_health_multiplier)) var/cut_prob = brute/max_damage * 5 if(prob(cut_prob)) - var/obj/item/clothing/head/helmet/owner_helmet = owner.head - if(istype(owner_helmet) && owner.allow_gun_usage) - if(!(owner_helmet.flags_inventory & FULL_DECAP_PROTECTION)) - owner.visible_message("[owner]'s [owner_helmet] goes flying off from the impact!", SPAN_USERDANGER("Your [owner_helmet] goes flying off from the impact!")) - owner.drop_inv_item_on_ground(owner_helmet) - INVOKE_ASYNC(owner_helmet, TYPE_PROC_REF(/atom/movable, throw_atom), pick(range(get_turf(loc), 1)), 1, SPEED_FAST) - playsound(owner, 'sound/effects/helmet_noise.ogg', 100) - else - droplimb(0, 0, damage_source) - return + limb_delimb(damage_source) SEND_SIGNAL(src, COMSIG_LIMB_TAKEN_DAMAGE, is_ff, previous_brute, previous_burn) owner.updatehealth() update_icon() start_processing() +///Special delimbs for different limbs +/obj/limb/proc/limb_delimb(damage_source) + droplimb(0, 0, damage_source) + /obj/limb/proc/heal_damage(brute, burn, robo_repair = FALSE) if(status & (LIMB_ROBOT|LIMB_SYNTHSKIN) && !robo_repair) return @@ -516,6 +513,9 @@ This function completely restores a damaged organ to perfect condition. if(status & (LIMB_ROBOT|LIMB_SYNTHSKIN)) return + if(internal && !can_bleed_internally) + internal = FALSE + if(length(bleeding_effects_list)) if(!internal) for(var/datum/effects/bleeding/external/B in bleeding_effects_list) @@ -1220,7 +1220,7 @@ treat_grafted var tells it to apply to grafted but unsalved wounds, for burn kit user.visible_message(SPAN_WARNING("[user] fumbles with [S]"), SPAN_WARNING("You fumble with [S]...")) time_to_take = 15 SECONDS - if(do_after(user, time_to_take * user.get_skill_duration_multiplier(SKILL_MEDICAL), INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, target, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) + if(do_after(user, time_to_take * user.get_skill_duration_multiplier(SKILL_MEDICAL), INTERRUPT_NEEDHAND, BUSY_ICON_FRIENDLY, target, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) var/possessive = "[user == target ? "your" : "\the [target]'s"]" var/possessive_their = "[user == target ? user.gender == MALE ? "his" : "her" : "\the [target]'s"]" user.affected_message(target, @@ -1283,6 +1283,7 @@ treat_grafted var tells it to apply to grafted but unsalved wounds, for burn kit display_name = "foot" max_damage = 30 min_broken_damage = 20 + can_bleed_internally = FALSE /obj/limb/arm name = "arm" @@ -1295,6 +1296,7 @@ treat_grafted var tells it to apply to grafted but unsalved wounds, for burn kit display_name = "hand" max_damage = 30 min_broken_damage = 20 + can_bleed_internally = FALSE /obj/limb/arm/l_arm name = "l_arm" @@ -1461,3 +1463,18 @@ treat_grafted var tells it to apply to grafted but unsalved wounds, for burn kit return "an incomplete surgical operation" if(2, 3) return "several incomplete surgical operations" + +/obj/limb/head/limb_delimb(damage_source) + var/obj/item/clothing/head/helmet/owner_helmet = owner.head + + if(!istype(owner_helmet) || !owner.allow_gun_usage) + droplimb(0, 0, damage_source) + return + + if(owner_helmet.flags_inventory & FULL_DECAP_PROTECTION) + return + + owner.visible_message("[owner]'s [owner_helmet] goes flying off from the impact!", SPAN_USERDANGER("Your [owner_helmet] goes flying off from the impact!")) + owner.drop_inv_item_on_ground(owner_helmet) + INVOKE_ASYNC(owner_helmet, TYPE_PROC_REF(/atom/movable, throw_atom), pick(range(get_turf(loc), 1)), 1, SPEED_FAST) + playsound(owner, 'sound/effects/helmet_noise.ogg', 100) diff --git a/code/modules/paperwork/notepad.dm b/code/modules/paperwork/notepad.dm index d3d8b6f0305d..f30d56c4a7eb 100644 --- a/code/modules/paperwork/notepad.dm +++ b/code/modules/paperwork/notepad.dm @@ -14,12 +14,14 @@ var/page = 1 var/screen = 0 - var/list/color_types = list("red", "green", "black", "blue") + var/list/cover_colours = list("red", "green", "black", "blue") + var/cover_colour /obj/item/notepad/Initialize(mapload, ...) . = ..() - - icon_state = initial(icon_state) + "_[pick(color_types)]" + if(!cover_colour) + cover_colour = pick(cover_colours) + icon_state = initial(icon_state) + "_[cover_colour]" for(var/i = 1 to paper_left) new /obj/item/paper(src) @@ -125,3 +127,15 @@ if((loc == usr && usr.stat == CONSCIOUS)) name = "[(n_name ? text("[n_name]") : "notepad")]" add_fingerprint(usr) + +/obj/item/notepad/black + cover_colour = "black" + +/obj/item/notepad/blue + cover_colour = "blue" + +/obj/item/notepad/green + cover_colour = "green" + +/obj/item/notepad/red + cover_colour = "red" diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 74d805e92d3f..094cdf5ac9ac 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -758,6 +758,7 @@ power_channel = POWER_CHANNEL_LIGHT //Lights are calc'd via area so they dont need to be in the machine list unslashable = TRUE unacidable = TRUE + var/obj/docking_port/stationary/marine_dropship/linked_port = null //Don't allow blowing those up, so Marine nades don't fuck them /obj/structure/machinery/landinglight/ex_act(severity) @@ -767,6 +768,12 @@ . = ..() turn_off() +/obj/structure/machinery/landinglight/Destroy() + . = ..() + if(linked_port) + linked_port.landing_lights -= src + linked_port = null + /obj/structure/machinery/landinglight/proc/turn_off() icon_state = initial(icon_state) SetLuminosity(0) diff --git a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm index 30f7f1928182..ff90a6659fb2 100644 --- a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm @@ -144,7 +144,7 @@ empty = TRUE /obj/item/ammo_box/magazine/m4ra/ext - name = "\improper magazine box (Ext M4RA x 16)" + name = "\improper magazine box (Ext M4RA x 12)" overlay_ammo_type = "_ext" num_of_magazines = 12 magazine_type = /obj/item/ammo_magazine/rifle/m4ra/ext diff --git a/code/modules/projectiles/full_auto.dm b/code/modules/projectiles/full_auto.dm index 9d3b374d4ff6..ad3e037b68e6 100644 --- a/code/modules/projectiles/full_auto.dm +++ b/code/modules/projectiles/full_auto.dm @@ -90,10 +90,7 @@ return user.face_atom(fa_target) - if(user.gun_mode && !(fa_target in target)) - PreFire(fa_target, user, fa_params) - else - Fire(fa_target, user, fa_params) + Fire(fa_target, user, fa_params) addtimer(CALLBACK(src, PROC_REF(repeat_fire), user), fa_delay) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index ab2715ed3c9b..5528755cf87c 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -472,10 +472,6 @@ /obj/item/weapon/gun/equipped(mob/user, slot) if(flags_item & NODROP) return - if(slot != WEAR_L_HAND && slot != WEAR_R_HAND) - stop_aim() - if (user.client) - user.update_gun_icons() unwield(user) pull_time = world.time + wield_delay @@ -918,8 +914,6 @@ User can be passed as null, (a gun reloading itself for instance), so we need to to_chat(user, SPAN_HIGHDANGER("Help intent safety is on! Switch to another intent to fire your weapon.")) click_empty(user) return FALSE - else if(user.gun_mode && !(A in target)) - PreFire(A,user,params) //They're using the new gun system, locate what they're aiming at. else Fire(A,user,params) //Otherwise, fire normally. return TRUE diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 22da1976ddbe..0baf6f527d4b 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -732,6 +732,29 @@ Defined in conflicts.dm of the #defines folder. to_chat(user, SPAN_NOTICE("Hold on there cowboy, that grip is bolted on. You are unable to modify it.")) return +/obj/item/attachable/flashlight/laser_light_combo //Unique attachment for the VP78 based on the fact it has a Laser-Light Module in AVP2010 + name = "VP78 Laser-Light Module" + desc = "A Laser-Light module for the VP78 Service Pistol which is currently undergoing limited field testing as part of the USCMs next generation pistol program. All VP78 pistols come equipped with the module." + icon = 'icons/obj/items/weapons/guns/attachments/under.dmi' + icon_state = "vplaserlight" + attach_icon = "vplaserlight_a" + slot = "under" + original_state = "vplaserlight" + original_attach = "vplaserlight_a" + +/obj/item/attachable/flashlight/laser_light_combo/New() + ..() + accuracy_mod = HIT_ACCURACY_MULT_TIER_1 + movement_onehanded_acc_penalty_mod = -MOVEMENT_ACCURACY_PENALTY_MULT_TIER_5 + scatter_mod = -SCATTER_AMOUNT_TIER_10 + scatter_unwielded_mod = -SCATTER_AMOUNT_TIER_9 + accuracy_unwielded_mod = HIT_ACCURACY_MULT_TIER_1 + +/obj/item/attachable/flashlight/laser_light_combo/attackby(obj/item/combo_light, mob/user) + if(HAS_TRAIT(combo_light, TRAIT_TOOL_SCREWDRIVER)) + to_chat(user, SPAN_NOTICE("You are unable to modify it.")) + return + /obj/item/attachable/magnetic_harness name = "magnetic harness" desc = "A magnetically attached harness kit that attaches to the rail mount of a weapon. When dropped, the weapon will sling to any set of USCM armor." diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm index d33c93c5680c..98d1be3a9c64 100644 --- a/code/modules/projectiles/gun_helpers.dm +++ b/code/modules/projectiles/gun_helpers.dm @@ -143,10 +143,6 @@ As sniper rifles have both and weapon mods can change them as well. ..() deals w /obj/item/weapon/gun/dropped(mob/user) . = ..() - stop_aim() - if (user && user.client) - user.update_gun_icons() - turn_off_light(user) var/delay_left = (last_fired + fire_delay + additional_fire_group_delay) - world.time @@ -261,9 +257,6 @@ As sniper rifles have both and weapon mods can change them as well. ..() deals w /obj/item/weapon/gun/attack_self(mob/user) ..() - if (target) - lower_aim() - return //There are only two ways to interact here. if(flags_item & TWOHANDED) diff --git a/code/modules/projectiles/guns/pistols.dm b/code/modules/projectiles/guns/pistols.dm index d6ab3e6aa866..e7e20526b31f 100644 --- a/code/modules/projectiles/guns/pistols.dm +++ b/code/modules/projectiles/guns/pistols.dm @@ -578,7 +578,7 @@ /obj/item/weapon/gun/pistol/vp78 name = "\improper VP78 pistol" - desc = "A massive, formidable automatic handgun chambered in 9mm squash-head rounds. Commonly seen in the hands of wealthy Weyland-Yutani members." + desc = "A massive, formidable semi-automatic handgun chambered in 9mm squash-head rounds. A common sight throughout both UA and 3WE space, often held by both Weyland-Yutani PMC units and corporate executives. This weapon is also undergoing limited field testing as part of the USCM's next generation pistol program. The slide is engraved with the Weyland-Yutani logo reminding you who's really in charge." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "vp78" item_state = "vp78" @@ -595,14 +595,14 @@ /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/compensator, - /obj/item/attachable/lasersight, + /obj/item/attachable/flashlight/laser_light_combo, /obj/item/attachable/extended_barrel, /obj/item/attachable/heavy_barrel, ) /obj/item/weapon/gun/pistol/vp78/handle_starting_attachment() ..() - var/obj/item/attachable/lasersight/VP = new(src) + var/obj/item/attachable/flashlight/laser_light_combo/VP = new(src) VP.flags_attach_features &= ~ATTACH_REMOVABLE VP.hidden = FALSE VP.Attach(src) diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 9b8986896265..ab2602204f72 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -257,6 +257,10 @@ map_specific_decoration = FALSE starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible) +/obj/item/weapon/gun/rifle/m41a/corporate/no_lock //for PMC nightmares. + desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm 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/rifle/m41a/corporate/detainer //for chem ert current_mag = /obj/item/ammo_magazine/rifle/ap random_spawn_rail = list( diff --git a/code/modules/projectiles/guns/smartgun.dm b/code/modules/projectiles/guns/smartgun.dm index 7d8378d8c5c7..4378a41aac19 100644 --- a/code/modules/projectiles/guns/smartgun.dm +++ b/code/modules/projectiles/guns/smartgun.dm @@ -88,7 +88,7 @@ burst_delay = FIRE_DELAY_TIER_9 fa_delay = FIRE_DELAY_TIER_SG fa_scatter_peak = FULL_AUTO_SCATTER_PEAK_TIER_8 - fa_max_scatter = SCATTER_AMOUNT_TIER_3 + fa_max_scatter = SCATTER_AMOUNT_TIER_9 if(accuracy_improvement) accuracy_mult += HIT_ACCURACY_MULT_TIER_3 else diff --git a/code/modules/projectiles/item_to_box_mapping.dm b/code/modules/projectiles/item_to_box_mapping.dm index 85e11bad7612..45277d194b38 100644 --- a/code/modules/projectiles/item_to_box_mapping.dm +++ b/code/modules/projectiles/item_to_box_mapping.dm @@ -29,7 +29,7 @@ /datum/item_to_box_mapping/New() //Ammo magazine boxes, minus loose ammo boxes - for(var/obj/item/ammo_box/magazine/ammo_box as anything in typesof(/obj/item/ammo_box/magazine)) + for(var/obj/item/ammo_box/magazine/ammo_box as anything in typesof(/obj/item/ammo_box/magazine) - /obj/item/ammo_box/magazine/misc) if(initial(ammo_box.empty)) //Ignore all the empty boxes continue diff --git a/code/modules/projectiles/targeting.dm b/code/modules/projectiles/targeting.dm deleted file mode 100644 index 2fcc6170fa3c..000000000000 --- a/code/modules/projectiles/targeting.dm +++ /dev/null @@ -1,309 +0,0 @@ -/obj/item/weapon/gun/verb/lower_aim() - set name = "Lower Aim" - set category = "Object" - set src in usr - if(target) - stop_aim() - usr.visible_message(SPAN_NOTICE("\The [usr] lowers \the [src]...")) - -//Removes lock fro mall targets -/obj/item/weapon/gun/proc/stop_aim() - if(target) - for(var/mob/living/M in target) - if(M) - M.NotTargeted(src) //Untargeting people. - target = null - -//Compute how to fire..... -/obj/item/weapon/gun/proc/PreFire(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, params) - //Lets not spam it. - if(lock_time > world.time - 2) return - . - if(ismob(A) && isliving(A) && !(A in target)) - Aim(A) //Clicked a mob, aim at them - else //Didn't click someone, check if there is anyone along that guntrace - var/mob/living/M = GunTrace(user.x,user.y,A.x,A.y,user.z,user) //Find dat mob. - if(M && isliving(M) && (M in view(user)) && !(M in target)) - Aim(M) //Aha! Aim at them! - else if(!ismob(M) || (ismob(M) && !(M in view(user)))) //Nope! They weren't there! - Fire(A,user,params) //Fire like normal, then. - user.setDir(get_cardinal_dir(src, A)) - -//Aiming at the target mob. -/obj/item/weapon/gun/proc/Aim(mob/living/M) - if(!target || !(M in target)) - lock_time = world.time - if(target && !automatic) //If they're targeting someone and they have a non automatic weapon. - for(var/mob/living/L in target) - if(L) - L.NotTargeted(src) - target = null - usr.visible_message(SPAN_DANGER("[usr] turns \the [src] on [M]!")) - else - usr.visible_message(SPAN_DANGER("[usr] aims \a [src] at [M]!")) - M.Targeted(src) - -//HE MOVED, SHOOT HIM! -/obj/item/weapon/gun/proc/TargetActed(mob/living/T) - var/mob/living/M = loc - if(M == T) return - if(!istype(M)) return - if(src != M.get_held_item()) - stop_aim() - return - M.last_move_intent = world.time - if(src.in_chamber && (T in view(5,M))) - Fire(T,usr,reflex = 1) - else - click_empty(M) - - usr.setDir(get_cardinal_dir(src, T)) - -//Yay, math! - -/// Gets the sign of x, returns -1 if negative, 0 if 0, 1 if positive -#define SIGN(x) ( ((x) > 0) - ((x) < 0) ) - -/proc/GunTrace(X1,Y1,X2,Y2,Z=1,exc_obj,PX1=16,PY1=16,PX2=16,PY2=16) - //bluh << "Tracin' [X1],[Y1] to [X2],[Y2] on floor [Z]." - var/turf/T - var/mob/living/M - if(X1==X2) - if(Y1==Y2) return 0 //Light cannot be blocked on same tile - else - var/s = SIGN(Y2-Y1) - Y1+=s - while(1) - T = locate(X1,Y1,Z) - if(!T) return 0 - M = locate() in T - if(M) return M - M = locate() in orange(1,T)-exc_obj - if(M) return M - Y1+=s - else - var/m=(32*(Y2-Y1)+(PY2-PY1))/(32*(X2-X1)+(PX2-PX1)) - var/b=(Y1+PY1/32-0.015625)-m*(X1+PX1/32-0.015625) //In tiles - var/signX = SIGN(X2-X1) - var/signY = SIGN(Y2-Y1) - if(X1= 5) - if(ismob(I.loc)) - to_chat(loc, "You can only target 5 people at once!") - return - else - return - for(var/mob/living/K in viewers(usr)) - K << 'sound/weapons/TargetOn.ogg' - - if(!targeted_by) targeted_by = list() - targeted_by += I - I.lock_time = world.time + 20 //Target has 2 second to realize they're targeted and stop (or target the opponent). - to_chat(src, SPAN_HIGHDANGER("You are being targeted! You have 2 seconds to stop any click or move actions.")) - - if(targeted_by.len == 1) - spawn(0) - if(istype(I,/obj/item/weapon/gun/energy/yautja/plasma_caster)) - target_locked = image("icon" = 'icons/effects/Targeted.dmi', "icon_state" = "locking-y") - else - target_locked = image("icon" = 'icons/effects/Targeted.dmi', "icon_state" = "locking") - update_targeted() - spawn(0) - sleep(20) - if(target_locked) - if(istype(I,/obj/item/weapon/gun/energy/yautja/plasma_caster)) - target_locked = image("icon" = 'icons/effects/Targeted.dmi', "icon_state" = "locked-y") - else - target_locked = image("icon" = 'icons/effects/Targeted.dmi', "icon_state" = "locked") - update_targeted() - - //Adding the buttons to the controller person - var/mob/living/T = I.loc - if(T) - if(T.client) - T.update_gun_icons() - else - I.lower_aim() - return - - //Processing the aiming. Should be probably in separate object with process() but lasy. - while(targeted_by && T.client) - if(last_move_intent > I.lock_time + 10 && !T.target_can_move) //If target moved when not allowed to - I.TargetActed(src) - if(I.last_moved_mob == src) //If they were the last ones to move, give them more of a grace period, so that an automatic weapon can hold down a room better. - I.lock_time = world.time + 5 - I.lock_time = world.time + 5 - I.last_moved_mob = src - else if(last_move_intent > I.lock_time + 10 && !T.target_can_run) //If the target ran while targeted - I.TargetActed(src) - if(I.last_moved_mob == src) //If they were the last ones to move, give them more of a grace period, so that an automatic weapon can hold down a room better. - I.lock_time = world.time + 5 - I.lock_time = world.time + 5 - I.last_moved_mob = src - if(last_target_click > I.lock_time + 10 && !T.target_can_click) //If the target clicked the map to pick something up/shoot/etc - I.TargetActed(src) - if(I.last_moved_mob == src) //If they were the last ones to move, give them more of a grace period, so that an automatic weapon can hold down a room better. - I.lock_time = world.time + 5 - I.lock_time = world.time + 5 - I.last_moved_mob = src - sleep(1) - -/mob/living/proc/NotTargeted(obj/item/weapon/gun/I) - if( !(I.flags_gun_features & GUN_SILENCED) ) - for(var/mob/living/M in viewers(src)) - M << 'sound/weapons/TargetOff.ogg' - if(!isnull(targeted_by)) - targeted_by -= I - - if(I.target)//To prevent runtimes. This whole thing is such an awful mess. Might come back to later, sigh. ~N - I.target.Remove(src) //De-target them - if(!I.target.len) - I.target = null - - var/mob/living/T = I.loc //Remove the targeting icons - if(istype(T) && T.client && !I.target) - T.update_gun_icons() - if(!targeted_by.len) - qdel(target_locked) //Remove the overlay - target_locked = null - targeted_by = null - spawn(1) update_targeted() - -/mob/living/Move() - . = ..() - for(var/obj/item/weapon/gun/G in targeted_by) //Handle moving out of the gunner's view. - var/mob/living/M = G.loc - if(!(M in view(src))) - NotTargeted(G) - for(var/obj/item/weapon/gun/G in src) //Handle the gunner loosing sight of their target/s - if(G.target) - for(var/mob/living/M in G.target) - if(M && !(M in view(src))) - M.NotTargeted(G) - - -/mob/proc/ToggleGunMode() - gun_mode = !gun_mode - if(gun_mode) - to_chat(src, "You will now take people captive.") - else - to_chat(src, "You will now shoot where you target.") - for(var/obj/item/weapon/gun/G in src) - G.stop_aim() - update_gun_icons() - -/mob/proc/update_gun_icons() - if(hud_used) - if(hud_used.gun_setting_icon) - hud_used.gun_setting_icon.update_icon(src) - if(hud_used.gun_item_use_icon) - hud_used.gun_item_use_icon.update_icon(src) - if(hud_used.gun_move_icon) - hud_used.gun_move_icon.update_icon(src) - if(hud_used.gun_run_icon) - hud_used.gun_run_icon.update_icon(src) - - -/mob/proc/AllowTargetMove() - - //Changing client's permissions - target_can_move = !target_can_move - if(target_can_move) - to_chat(src, "Target may now walk.") - else - to_chat(src, "Target may no longer move.") - target_can_run = 0 - if(hud_used && hud_used.gun_run_icon) - hud_used.gun_run_icon.update_icon(src) - - //Updating walking permission button - if(hud_used && hud_used.gun_move_icon) - hud_used.gun_move_icon.update_icon(src) - - //Handling change for all the guns on client - for(var/obj/item/weapon/gun/G in src) - G.lock_time = world.time + 5 - if(G.target) - for(var/mob/living/carbon/human/M in G.target) - if(target_can_move) - to_chat(M, "Your character may now walk at the discretion of their targeter.") - if(!target_can_run) - to_chat(M, SPAN_WARNING("Your move intent is now set to walk, as your targeter permits it.")) - else - to_chat(M, SPAN_DANGER("Your character will now be shot if they move.")) - -/mob/proc/AllowTargetRun() - //Changing client's permissions - target_can_run = !target_can_run - if(target_can_run) - to_chat(src, "Target may now run.") - else - to_chat(src, "Target may no longer run.") - - //Updating running permission button - if(hud_used && hud_used.gun_run_icon) - hud_used.gun_run_icon.update_icon(src) - - //Handling change for all the guns on client - for(var/obj/item/weapon/gun/G in src) - G.lock_time = world.time + 5 - if(G.target) - for(var/mob/living/M in G.target) - if(target_can_run) - to_chat(M, "Your character may now run at the discretion of their targeter.") - else - to_chat(M, SPAN_DANGER("Your character will now be shot if they run.")) - -/mob/proc/AllowTargetClick() - - //Changing client's permissions - target_can_click = !target_can_click - if(target_can_click) - to_chat(usr, "Target may now use items.") - else - to_chat(usr, "Target may no longer use items.") - - if(hud_used && hud_used.gun_item_use_icon) - hud_used.gun_item_use_icon.update_icon(src) - - //Handling change for all the guns on client - for(var/obj/item/weapon/gun/G in src) - G.lock_time = world.time + 5 - if(G.target) - for(var/mob/living/M in G.target) - if(target_can_click) - to_chat(M, "Your character may now use items at the discretion of their targeter.") - else - to_chat(M, SPAN_DANGER("Your character will now be shot if they use items.")) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 1ea8ba529ebf..643130559e94 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -23,68 +23,11 @@ /datum/reagents/New(maximum=100) maximum_volume = maximum + +#ifdef UNIT_TESTS if(!chemical_reagents_list || !chemical_reactions_filtered_list || !chemical_properties_list) - global_prepare_properties() - global_prepare_reagents() - -// TODO - This should be -/proc/global_prepare_properties() - //Chemical Properties - Initialises all /datum/chem_property into a list indexed by property name - var/paths = typesof(/datum/chem_property) - chemical_properties_list = list() - //Some filters - chemical_properties_list["negative"] = list() - chemical_properties_list["neutral"] = list() - chemical_properties_list["positive"] = list() - chemical_properties_list["rare"] = list() - //Save - for(var/path in paths) - var/datum/chem_property/P = new path() - if(!P.name) - continue - chemical_properties_list[P.name] = P - if(P.starter) - //Add a separate instance to the chemical property database - var/datum/chem_property/D = new path() - D.level = 0 - chemical_data.research_property_data += D - if(P.rarity > PROPERTY_DISABLED) - //Filters for the generator picking properties - if(P.rarity == PROPERTY_RARE || P.rarity == PROPERTY_LEGENDARY) - chemical_properties_list["rare"][P.name] = P - else if(isNegativeProperty(P)) - chemical_properties_list["negative"][P.name] = P - else if(isNeutralProperty(P)) - chemical_properties_list["neutral"][P.name] = P - else if(isPositiveProperty(P)) - chemical_properties_list["positive"][P.name] = P - -/proc/global_prepare_reagents() - //I dislike having these here but map-objects are initialised before world/New() is called. >_> - set waitfor = 0 - //Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id - //Generated chemicals should be initialized last, hence the substract then readd. - var/list/paths = subtypesof(/datum/reagent) - typesof(/datum/reagent/generated) - subtypesof(/datum/reagent/generated) + subtypesof(/datum/reagent/generated) - chemical_reagents_list = list() - for(var/path in paths) - var/datum/reagent/D = new path() - D.save_chemclass() - chemical_reagents_list[D.id] = D - - //Chemical Reactions - Initialises all /datum/chemical_reaction into a list - // It is filtered into multiple lists within a list. - // For example: - // chemical_reaction_list["phoron"] is a list of all reactions relating to phoron - var/list/regular_paths = subtypesof(/datum/chemical_reaction) - typesof(/datum/chemical_reaction/generated) - var/list/generated_paths = subtypesof(/datum/chemical_reaction/generated) //Generated chemicals should be initialized last - chemical_reactions_filtered_list = list() - chemical_reactions_list = list() - - for(paths in list(regular_paths, generated_paths)) - for(var/path in paths) - var/datum/chemical_reaction/D = new path() - chemical_reactions_list[D.id] = D - D.add_to_filtered_list() + CRASH("Chemistry reagents are not set up!") +#endif /datum/reagents/Destroy() QDEL_NULL_LIST(reagent_list) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index e22b414d61b5..7f659c54c40d 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -296,21 +296,23 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent()) /datum/reagent/proc/properties_to_datums() - if(chemical_properties_list) - var/new_properties = list() - for(var/P in properties) - if(istype(P, /datum/chem_property)) - new_properties += P - continue - var/datum/chem_property/D = chemical_properties_list[P] - if(D) - D = new D.type() - D.level = properties[P] - D.holder = src - new_properties += D - return new_properties - else - return properties +#ifdef UNIT_TESTS + if(!chemical_properties_list) + CRASH("Chemistry reagents are not set up!") +#endif + + var/new_properties = list() + for(var/prop in properties) + if(istype(prop, /datum/chem_property)) + new_properties += prop + continue + var/datum/chem_property/chem = chemical_properties_list[prop] + if(chem) + chem = new chem.type() + chem.level = properties[prop] + chem.holder = src + new_properties += chem + return new_properties /datum/reagent/proc/properties_to_assoc() var/new_properties = list() diff --git a/code/modules/reagents/chemical_research/Chemical-Research.dm b/code/modules/reagents/chemical_research/Chemical-Research.dm index bdf552445aeb..0b1152154dc3 100644 --- a/code/modules/reagents/chemical_research/Chemical-Research.dm +++ b/code/modules/reagents/chemical_research/Chemical-Research.dm @@ -98,47 +98,61 @@ var/global/datum/chemical_data/chemical_data = new /datum/chemical_data research_property_data += P //Chem storage for various chem dispensers -/datum/chemical_data/proc/add_chem_storage(obj/structure/machinery/chem_storage/C) - if(chemical_networks.Find(C.network)) +/datum/chemical_data/proc/add_chem_storage(obj/structure/machinery/chem_storage/storage) + if(chemical_networks.Find(storage.network)) return FALSE else - chemical_networks[C.network] = C + chemical_networks[storage.network] = storage + +/datum/chemical_data/proc/remove_chem_storage(obj/structure/machinery/chem_storage/storage) + if(!istype(storage)) + return FALSE + return chemical_networks.Remove(storage.network) /datum/chemical_data/proc/connect_chem_storage(network) - var/obj/structure/machinery/chem_storage/C = chemical_networks[network] - if(!C) + var/obj/structure/machinery/chem_storage/storage = chemical_networks[network] + if(!storage) return FALSE //Make the chem storage scale with number of dispensers - C.recharge_rate += 5 - C.max_energy += 50 - C.energy = C.max_energy - return C - + storage.recharge_rate += 5 + storage.max_energy += 50 + storage.energy = storage.max_energy + return storage + +/datum/chemical_data/proc/disconnect_chem_storage(network) + var/obj/structure/machinery/chem_storage/storage = chemical_networks[network] + if(!storage) + return FALSE + //Make the chem storage scale with number of dispensers + storage.recharge_rate -= 5 + storage.max_energy -= 50 + storage.energy = storage.max_energy + return TRUE -/datum/chemical_data/proc/complete_chemical(datum/reagent/S) +/datum/chemical_data/proc/complete_chemical(datum/reagent/chem) update_credits(2) - chemical_identified_list[S.id] = S.objective_value - chemical_not_completed_objective_list -= S.id + chemical_identified_list[chem.id] = chem.objective_value + chemical_not_completed_objective_list -= chem.id SSobjectives.statistics["chemicals_completed"]++ - SSobjectives.statistics["chemicals_total_points_earned"] += S.objective_value + SSobjectives.statistics["chemicals_total_points_earned"] += chem.objective_value var/datum/techtree/tree = GET_TREE(TREE_MARINE) - tree.add_points(S.objective_value) + tree.add_points(chem.objective_value) -/datum/chemical_data/proc/add_chemical_objective(datum/reagent/S) - chemical_objective_list[S.id] = S.objective_value - chemical_not_completed_objective_list[S.id] = S.objective_value +/datum/chemical_data/proc/add_chemical_objective(datum/reagent/chem) + chemical_objective_list[chem.id] = chem.objective_value + chemical_not_completed_objective_list[chem.id] = chem.objective_value /datum/chemical_data/proc/get_tgui_data(chemid) - var/datum/reagent/S = chemical_reagents_list[chemid] - if(!S) + var/datum/reagent/chem = chemical_reagents_list[chemid] + if(!chem) error("Invalid chemid [chemid]") return var/list/clue = list() - clue["text"] = S.name + clue["text"] = chem.name return clue diff --git a/code/modules/reagents/chemistry_machinery/chem_dispenser.dm b/code/modules/reagents/chemistry_machinery/chem_dispenser.dm index 2e6ac84e1f08..8de20ca2b79a 100644 --- a/code/modules/reagents/chemistry_machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry_machinery/chem_dispenser.dm @@ -36,6 +36,11 @@ dispensable_reagents = sortList(dispensable_reagents) start_processing() +/obj/structure/machinery/chem_dispenser/Destroy() + if(!chem_storage) + chem_storage = chemical_data.disconnect_chem_storage(network) + return ..() + /obj/structure/machinery/chem_dispenser/ex_act(severity) switch(severity) if(EXPLOSION_THRESHOLD_LOW to EXPLOSION_THRESHOLD_MEDIUM) diff --git a/code/modules/reagents/chemistry_machinery/chem_storage.dm b/code/modules/reagents/chemistry_machinery/chem_storage.dm index 731d9e57f8fa..3a05201dea25 100644 --- a/code/modules/reagents/chemistry_machinery/chem_storage.dm +++ b/code/modules/reagents/chemistry_machinery/chem_storage.dm @@ -34,6 +34,10 @@ chemical_data.add_chem_storage(src) start_processing() +/obj/structure/machinery/chem_storage/Destroy() + chemical_data.remove_chem_storage(src) + return ..() + /obj/structure/machinery/chem_storage/get_examine_text(mob/user) . = ..() if(in_range(user, src) || istype(user, /mob/dead/observer)) diff --git a/code/modules/reagents/chemistry_machinery/reagent_analyzer.dm b/code/modules/reagents/chemistry_machinery/reagent_analyzer.dm index d64611753bbd..8b781407aec4 100644 --- a/code/modules/reagents/chemistry_machinery/reagent_analyzer.dm +++ b/code/modules/reagents/chemistry_machinery/reagent_analyzer.dm @@ -1,5 +1,5 @@ /obj/structure/machinery/reagent_analyzer - name = "Advanced XRF Scanner" + name = "\improper XRF scanner" desc = "A spectrometer that bombards a sample in high energy radiation to detect emitted fluorescent x-ray patterns. By using the emission spectrum of the sample it can identify its chemical composition." icon = 'icons/obj/structures/machinery/science_machines.dmi' icon_state = "reagent_analyzer" diff --git a/code/modules/reagents/chemistry_reactions/other.dm b/code/modules/reagents/chemistry_reactions/other.dm index 3956a4d9dc5c..6b60ae89059c 100644 --- a/code/modules/reagents/chemistry_reactions/other.dm +++ b/code/modules/reagents/chemistry_reactions/other.dm @@ -114,6 +114,13 @@ required_reagents = list("mercury" = 1, "sugar" = 1, "lithium" = 1) result_amount = 3 +/datum/chemical_reaction/sleen + name = "Sleen" + id = "sleen" + result = "sleen" + required_reagents = list("oxycodone" = 1, "souto_lime" = 1) + result_amount = 2 + /datum/chemical_reaction/pacid name = "Polytrinic acid" id = "pacid" diff --git a/code/modules/reagents/chemistry_reagents/medical.dm b/code/modules/reagents/chemistry_reagents/medical.dm index c9d94ea4f9c9..f69d1b952c43 100644 --- a/code/modules/reagents/chemistry_reagents/medical.dm +++ b/code/modules/reagents/chemistry_reagents/medical.dm @@ -54,7 +54,7 @@ id = "oxycodone" description = "Oxycodone is an opioid agonist with addiction potential similar to that of morphine. It is approved for the treatment of patients with moderate to severe pain who are expected to need continuous opioids for an extended period of time. Overdosing on oxycodone can cause hallucinations, brain damage and be highly toxic." reagent_state = LIQUID - color = "#C805DC" + color = "#E01D25" custom_metabolism = AMOUNT_PER_TIME(15, 5 MINUTES) // Lasts 5 minutes for 15 units overdose = MED_REAGENTS_OVERDOSE overdose_critical = MED_REAGENTS_OVERDOSE_CRITICAL @@ -205,7 +205,7 @@ /datum/reagent/medical/russianred name = "Russian Red" id = "russianred" - description = "An emergency radiation treatment, however it has extreme side effects." + description = "An emergency radiation treatment. The list of potential side effects include retinal damage and unconsciousness." reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 custom_metabolism = AMOUNT_PER_TIME(1, 2 SECONDS) @@ -251,7 +251,7 @@ /datum/reagent/medical/bicaridine // yes it cures IB, it's located in some other part of wound code for whatever reason name = "Bicaridine" id = "bicaridine" - description = "Bicaridine is an analgesic medication and can be used to treat severe external blunt trauma and to stabilize patients. Overdosing will cause caustic burns, but can mend internal broken bloodvessels." + description = "Bicaridine is an analgesic medication and can be used to treat severe external blunt trauma and to stabilize patients. Overdosing on Bicaridine will cause caustic burns and toxins." reagent_state = LIQUID color = "#E8756C" overdose = REAGENTS_OVERDOSE @@ -339,7 +339,7 @@ /datum/reagent/medical/rezadone name = "Rezadone" id = "rezadone" - description = "A powder derived from fish toxin, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." + description = "A powder derived from fish toxin, this substance can effectively treat genetic damage in humanoids. Excessive consumption may cause disastrous side effects." reagent_state = SOLID color = "#669900" // rgb: 102, 153, 0 overdose = REAGENTS_OVERDOSE @@ -405,7 +405,7 @@ /datum/reagent/medical/antized name = "Anti-Zed" id = "antiZed" - description = "Destroy the zombie virus in living humans and prevents regeneration for those who have already turned." + description = "An experimental drug that destroys the zombie virus in living humans and prevents regeneration for those who have already turned." reagent_state = LIQUID color = "#C8A5DC" custom_metabolism = AMOUNT_PER_TIME(1, 200 SECONDS) diff --git a/code/modules/reagents/chemistry_reagents/other.dm b/code/modules/reagents/chemistry_reagents/other.dm index aaf9901f46af..a7f0a1143428 100644 --- a/code/modules/reagents/chemistry_reagents/other.dm +++ b/code/modules/reagents/chemistry_reagents/other.dm @@ -42,14 +42,14 @@ name = "Green Blood" id = "greenblood" description = "A thick green blood, definitely not human." - color = "#20d450" + color = BLOOD_COLOR_YAUTJA chemclass = CHEM_CLASS_SPECIAL objective_value = OBJECTIVE_HIGH_VALUE /datum/reagent/blood/synth_blood name = "Synthetic Blood" id = "whiteblood" - color = "#EEEEEE" + color = BLOOD_COLOR_SYNTHETIC description = "A synthetic blood-like liquid used by all Synthetics. Very effective as a medium for liquid cooling of electronics." chemclass = CHEM_CLASS_NONE @@ -63,7 +63,7 @@ /datum/reagent/blood/xeno_blood name = "Acidic Blood" id = "xenoblood" - color = "#dffc00" + color = BLOOD_COLOR_XENO description = "A corrosive blood like substance. Makeup appears to be made out of acids and blood plasma." chemclass = CHEM_CLASS_SPECIAL objective_value = OBJECTIVE_HIGH_VALUE @@ -72,7 +72,7 @@ /datum/reagent/blood/xeno_blood/royal name = "Dark Acidic Blood" id = "xenobloodroyal" - color = "#bbb900" + color = BLOOD_COLOR_XENO_ROYAL chemclass = CHEM_CLASS_SPECIAL objective_value = OBJECTIVE_EXTREME_VALUE properties = list(PROPERTY_CORROSIVE = 6) @@ -159,6 +159,17 @@ chemclass = CHEM_CLASS_UNCOMMON properties = list(PROPERTY_HALLUCINOGENIC = 2) +/datum/reagent/sleen + name = "Sleen" + id = "sleen" + description = " A favorite of marine medics, it is an illicit mixture of name brand lime soda and oxycodone, known for it's distinct red hue. Overdosing can cause hallucinations, loss of coordination, seizures, brain damage, respiratory failure, and death." + reagent_state = LIQUID + color = "#C21D24" // rgb: 194, 29, 36 + overdose = MED_REAGENTS_OVERDOSE + overdose_critical = MED_REAGENTS_OVERDOSE_CRITICAL + chemclass = CHEM_CLASS_UNCOMMON + properties = list(PROPERTY_PAINKILLING = 6) + /datum/reagent/serotrotium name = "Serotrotium" id = "serotrotium" diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index a41f1944f565..19d9abfd81b4 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -243,7 +243,7 @@ hijack(xeno) return -/obj/structure/machinery/computer/shuttle/dropship/flight/proc/hijack(mob/user) +/obj/structure/machinery/computer/shuttle/dropship/flight/proc/hijack(mob/user, force = FALSE) // select crash location var/turf/source_turf = get_turf(src) @@ -251,11 +251,11 @@ var/result = tgui_input_list(user, "Where to 'land'?", "Dropship Hijack", almayer_ship_sections , timeout = 10 SECONDS) if(!result) return - if(result) - if(!user.Adjacent(source_turf)) - return + if(!user.Adjacent(source_turf) && !force) + return if(dropship.is_hijacked) return + var/datum/dropship_hijack/almayer/hijack = new() dropship.hijack = hijack hijack.shuttle = dropship @@ -270,9 +270,12 @@ marine_announcement("Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.", "Dropship Alert", 'sound/AI/hijack.ogg') var/mob/living/carbon/xenomorph/xeno = user - xeno_message(SPAN_XENOANNOUNCE("The Queen has commanded the metal bird to depart for the metal hive in the sky! Rejoice!"), 3, xeno.hivenumber) - xeno_message(SPAN_XENOANNOUNCE("The hive swells with power! You will now steadily gain pooled larva over time."), 2, xeno.hivenumber) - xeno.hive.abandon_on_hijack() + var/hivenumber = XENO_HIVE_NORMAL + if(istype(xeno)) + hivenumber = xeno.hivenumber + xeno_message(SPAN_XENOANNOUNCE("The Queen has commanded the metal bird to depart for the metal hive in the sky! Rejoice!"), 3, hivenumber) + xeno_message(SPAN_XENOANNOUNCE("The hive swells with power! You will now steadily gain pooled larva over time."), 2, hivenumber) + GLOB.hive_datum[hivenumber].abandon_on_hijack() // Notify the yautja too so they stop the hunt message_all_yautja("The serpent Queen has commanded the landing shuttle to depart.") diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index e8faca015528..7bd3bcb5df7c 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -38,6 +38,21 @@ All ShuttleMove procs go here M.gib() else //non-living mobs shouldn't be affected by shuttles, which is why this is an else + if(thing.anchored) + // Ordered by most likely: + if(istype(thing, /obj/structure/machinery/landinglight)) + continue + if(istype(thing, /obj/docking_port)) + continue + if(istype(thing, /obj/structure/machinery/camera)) + continue + if(istype(thing, /obj/structure/machinery/floodlight/landing/floor)) + continue + + // SSshuttle also removes these in remove_ripples, but its timing is weird + if(!istype(thing, /obj/effect)) + log_debug("[shuttle] deleted an anchored [thing]") + qdel(thing) // Called on the old turf to move the turf data diff --git a/code/modules/shuttle/ripple.dm b/code/modules/shuttle/ripple.dm index 832a80871b18..e54ecc1ea15c 100644 --- a/code/modules/shuttle/ripple.dm +++ b/code/modules/shuttle/ripple.dm @@ -4,17 +4,20 @@ visual disturbances. It's probably best not to be on top of these \ when whatever is tunneling comes through." icon = 'icons/effects/effects.dmi' - icon_state = "" //somebody make an icon state for "medi_holo" instead of "". + icon_state = "shield" anchored = TRUE density = FALSE layer = RIPPLE_LAYER mouse_opacity = MOUSE_OPACITY_ICON alpha = 0 +/obj/effect/abstract/ripple/shadow + name = "looming shadow" + desc = "Something big is looming above. It's probably best \ + not to be under it." + icon = 'icons/effects/effects.dmi' + icon_state = "shadow_square" + /obj/effect/abstract/ripple/Initialize(mapload, time_left) . = ..() - animate(src, alpha=255, time=time_left) - addtimer(CALLBACK(src, PROC_REF(stop_animation)), 8, TIMER_CLIENT_TIME) - -/obj/effect/abstract/ripple/proc/stop_animation() - icon_state = "medi_holo_no_anim" + animate(src, alpha=255, time=time_left) // I wish the loop argument would override the sprite's setting diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 16a1b9b8ac50..0582c1dbcc06 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -644,7 +644,7 @@ return FALSE var/list/turfs = ripple_area(S1) for(var/t in turfs) - ripples += new /obj/effect/abstract/ripple(t, animate_time) + ripples += new /obj/effect/abstract/ripple/shadow(t, animate_time) return TRUE /obj/docking_port/mobile/proc/remove_ripples() @@ -727,7 +727,7 @@ /obj/docking_port/mobile/proc/check_effects() if(!ripples.len) - if((mode == SHUTTLE_CALL) || (mode == SHUTTLE_RECALL)) + if((mode == SHUTTLE_PREARRIVAL)) var/tl = timeLeft(1) if(tl <= SHUTTLE_RIPPLE_TIME) create_ripples(destination, tl) diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index 010a6fabd8a5..12f33d779661 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -77,10 +77,29 @@ /obj/docking_port/mobile/marine_dropship/proc/is_door_locked(direction) return door_control.is_door_locked(direction) +/obj/docking_port/mobile/marine_dropship/enterTransit() + . = ..() + if(SSticker?.mode && !(SSticker.mode.flags_round_type & MODE_DS_LANDED)) //Launching on first drop. + SSticker.mode.ds_first_drop(src) + /obj/docking_port/mobile/marine_dropship/beforeShuttleMove(turf/newT, rotation, move_mode, obj/docking_port/mobile/moving_dock) . = ..() control_doors("force-lock-launch", "all", force=TRUE, asynchronous = FALSE) + if(is_hijacked) + return + + for(var/area/checked_area in shuttle_areas) + for(var/mob/living/carbon/xenomorph/checked_xeno in checked_area) + if(checked_xeno.stat == DEAD) + continue + + 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') + set_security_level(SEC_LEVEL_RED) + return + /obj/docking_port/mobile/marine_dropship/alamo name = "Alamo" id = DROPSHIP_ALAMO @@ -148,6 +167,14 @@ . = ..() link_landing_lights() +/obj/docking_port/stationary/marine_dropship/Destroy() + . = ..() + for(var/obj/structure/machinery/landinglight/light in landing_lights) + light.linked_port = null + if(landing_lights) + landing_lights.Cut() + landing_lights = null // We didn't make them, so lets leave them + /obj/docking_port/stationary/marine_dropship/proc/link_landing_lights() var/list/coords = return_coords() var/scan_range = 5 @@ -159,8 +186,9 @@ for(var/xscan = x0; xscan < x1; xscan++) for(var/yscan = y0; yscan < y1; yscan++) var/turf/searchspot = locate(xscan, yscan, src.z) - for(var/obj/structure/machinery/landinglight/L in searchspot) - landing_lights += L + for(var/obj/structure/machinery/landinglight/light in searchspot) + landing_lights += light + light.linked_port = src /obj/docking_port/stationary/marine_dropship/proc/turn_on_landing_lights() for(var/obj/structure/machinery/landinglight/light in landing_lights) @@ -187,11 +215,12 @@ console?.update_equipment() if(is_ground_level(z) && !SSobjectives.first_drop_complete) SSticker.mode.ds_first_landed(src) + SSticker.mode.flags_round_type |= MODE_DS_LANDED + if(xeno_announce) xeno_announcement(SPAN_XENOANNOUNCE("The dropship has landed."), "everything") xeno_announce = FALSE - /obj/docking_port/stationary/marine_dropship/on_dock_ignition(obj/docking_port/mobile/departing_shuttle) . = ..() turn_on_landing_lights() diff --git a/code/modules/shuttle/shuttles/escape_shuttle.dm b/code/modules/shuttle/shuttles/escape_shuttle.dm index d1dc52dd8465..a4bce9910bb7 100644 --- a/code/modules/shuttle/shuttles/escape_shuttle.dm +++ b/code/modules/shuttle/shuttles/escape_shuttle.dm @@ -1,3 +1,5 @@ +#define CRASH_LAND_PROBABILITY 50 + /obj/docking_port/mobile/escape_shuttle name = "Escape Pod" id = ESCAPE_SHUTTLE @@ -5,13 +7,13 @@ width = 4 height = 5 preferred_direction = SOUTH - callTime = DROPSHIP_TRANSIT_DURATION rechargeTime = SHUTTLE_RECHARGE ignitionTime = 8 SECONDS ignition_sound = 'sound/effects/escape_pod_warmup.ogg' var/datum/door_controller/single/door_handler = new() var/launched = FALSE + var/crash_land = FALSE var/evac_set = FALSE /obj/docking_port/mobile/escape_shuttle/Initialize(mapload) @@ -46,12 +48,14 @@ if(mode == SHUTTLE_CRASHED) return + if(launched) + return + var/obj/structure/machinery/computer/shuttle/escape_pod_panel/panel = getControlConsole() if(panel.pod_state == STATE_DELAYED) return door_handler.control_doors("force-lock-launch") - destination = null var/occupant_count = 0 var/list/cryos = list() for(var/area/interior_area in shuttle_areas) @@ -71,11 +75,103 @@ door_handler.control_doors("force-unlock") return + destination = null + if(prob(CRASH_LAND_PROBABILITY)) + create_crash_point() + set_mode(SHUTTLE_IGNITING) on_ignition() setTimer(ignitionTime) launched = TRUE +/obj/docking_port/mobile/escape_shuttle/proc/create_crash_point() + for(var/i = 1 to 10) + var/list/all_ground_levels = SSmapping.levels_by_trait(ZTRAIT_GROUND) + var/ground_z_level = all_ground_levels[1] + + var/list/area/potential_areas = SSmapping.areas_in_z["[ground_z_level]"] + + var/area/area_picked = pick(potential_areas) + + var/list/potential_turfs = list() + + for(var/turf/turf_in_area in area_picked) + potential_turfs += turf_in_area + + if(!length(potential_turfs)) + continue + + var/turf/turf_picked = pick(potential_turfs) + + var/obj/docking_port/stationary/escape_pod/crash_land/temp_escape_pod_port = new(turf_picked) + temp_escape_pod_port.width = width + temp_escape_pod_port.height = height + temp_escape_pod_port.id = id + + if(!check_crash_point(temp_escape_pod_port)) + qdel(temp_escape_pod_port) + continue + + destination = temp_escape_pod_port + break + + if(destination) + crash_land = TRUE + +/obj/docking_port/mobile/escape_shuttle/proc/check_crash_point(obj/docking_port/stationary/escape_pod/crash_land/checked_escape_pod_port) + for(var/turf/found_turf as anything in checked_escape_pod_port.return_turfs()) + var/area/found_area = get_area(found_turf) + if(found_area.flags_area & AREA_NOTUNNEL) + return FALSE + + if(!found_area.can_build_special) + return FALSE + + if(istype(found_turf, /turf/closed/wall)) + var/turf/closed/wall/found_closed_turf = found_turf + if(found_closed_turf.hull) + return FALSE + + if(istype(found_turf, /turf/closed/shuttle)) + return FALSE + + return TRUE + +/obj/docking_port/mobile/escape_shuttle/enterTransit() + . = ..() + + if(!crash_land) + return + + for(var/area/shuttle_area in shuttle_areas) + shuttle_area.flags_alarm_state |= ALARM_WARNING_FIRE + shuttle_area.updateicon() + for(var/mob/evac_mob in shuttle_area) + if(evac_mob.client) + playsound_client(evac_mob.client, 'sound/effects/bomb_fall.ogg', vol = 50) + + for(var/turf/found_turf as anything in destination.return_turfs()) + if(istype(found_turf, /turf/closed)) + found_turf.ChangeTurf(/turf/open/floor) + + cell_explosion(destination.return_center_turf(), 300, 25, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data("evac pod crash")) + +/obj/docking_port/mobile/escape_shuttle/on_prearrival() + . = ..() + + if(!crash_land) + return + + movement_force = list("KNOCKDOWN" = 0, "THROW" = 5) + + for(var/area/shuttle_area in shuttle_areas) + for(var/mob/evac_mob in shuttle_area) + shake_camera(evac_mob, 20, 2) + if(evac_mob.client) + playsound_client(evac_mob.client, get_sfx("bigboom"), vol = 50) + + door_handler.control_doors("force-unlock") + /obj/docking_port/mobile/escape_shuttle/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) . = ..() playsound(src,'sound/effects/escape_pod_launch.ogg', 50, 1) @@ -138,6 +234,23 @@ width = 4 height = 5 +/obj/docking_port/stationary/escape_pod/crash_land + name = "Crash Escape Pod Dock" + +/obj/docking_port/stationary/escape_pod/crash_land/on_arrival(obj/docking_port/mobile/arriving_shuttle) + . = ..() + + if(istype(arriving_shuttle, /obj/docking_port/mobile/escape_shuttle)) + var/obj/docking_port/mobile/escape_shuttle/escape_shuttle = arriving_shuttle + escape_shuttle.door_handler.control_doors("force-unlock") + + for(var/area/shuttle_area in arriving_shuttle.shuttle_areas) + shuttle_area.SetDynamicLighting() + shuttle_area.SetLightLevel(0) + + shuttle_area.flags_alarm_state &= ~ALARM_WARNING_FIRE + shuttle_area.updateicon() + /datum/map_template/shuttle/escape_pod_w name = "Escape Pod W" shuttle_id = ESCAPE_SHUTTLE_WEST @@ -157,3 +270,6 @@ /datum/map_template/shuttle/escape_pod_e_cl name = "Escape Pod E CL" shuttle_id = ESCAPE_SHUTTLE_EAST_CL + + +#undef CRASH_LAND_PROBABILITY diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm index c6ffb9e52a41..f87caaa54758 100644 --- a/code/modules/surgery/bones.dm +++ b/code/modules/surgery/bones.dm @@ -128,6 +128,7 @@ tools = list( /obj/item/tool/surgery/bonesetter = SURGERY_TOOL_MULT_IDEAL, /obj/item/tool/wrench = SURGERY_TOOL_MULT_SUBSTITUTE, + /obj/item/maintenance_jack = SURGERY_TOOL_MULT_BAD_SUBSTITUTE, ) time = 4 SECONDS preop_sound = 'sound/surgery/hemostat1.ogg' diff --git a/code/modules/surgery/chestburster.dm b/code/modules/surgery/chestburster.dm index 366f47410e8f..a840bd026c40 100644 --- a/code/modules/surgery/chestburster.dm +++ b/code/modules/surgery/chestburster.dm @@ -57,7 +57,7 @@ if(prob(60) && !victim.stat && victim.pain.feels_pain) INVOKE_ASYNC(victim, TYPE_PROC_REF(/mob, emote), "scream") //Topkek victim.take_limb_damage(0, 12) //Sizzledam! This automagically burns a random existing body part. - victim.add_blood("#dffc00", BLOOD_BODY) + victim.add_blood(BLOOD_COLOR_XENO, BLOOD_BODY) playsound(victim, "acid_sizzle", 25, TRUE) animation_flash_color(victim, "#FF0000") //pain hit flicker diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 4a44c3ce7b67..767f50fc9750 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -176,9 +176,25 @@ SPAN_NOTICE("[user] clamps bleeders in your [parse_zone(target_zone)]."), SPAN_NOTICE("[user] clamps bleeders in [target]'s [parse_zone(target_zone)].")) - surgery.affected_limb.remove_all_bleeding(TRUE, FALSE) log_interact(user, target, "[key_name(user)] clamped bleeders in [key_name(target)]'s [surgery.affected_limb.display_name], possibly ending [surgery].") + var/surface_modifier = target.buckled?.surgery_duration_multiplier + if(!surface_modifier) + surface_modifier = SURGERY_SURFACE_MULT_AWFUL + for(var/obj/surface in get_turf(target)) + if(surface_modifier > surface.surgery_duration_multiplier) + surface_modifier = surface.surgery_duration_multiplier + + if(surface_modifier == SURGERY_SURFACE_MULT_IDEAL) + surgery.affected_limb.remove_all_bleeding(TRUE, FALSE) + return + + var/bleeding_multiplier_bad_surface = surface_modifier - 1 + for(var/datum/effects/bleeding/external/external_bleed in surgery.affected_limb.bleeding_effects_list) + external_bleed.blood_loss *= bleeding_multiplier_bad_surface + to_chat(user, SPAN_WARNING("Stopping blood loss is less effective in these conditions.")) + + /datum/surgery_step/clamp_bleeders_step/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) user.affected_message(target, SPAN_WARNING("Your hand slips, tearing blood vessels in [target]'s [surgery.affected_limb.display_name] and causing massive bleeding!"), diff --git a/code/modules/surgery/surgery_steps.dm b/code/modules/surgery/surgery_steps.dm index ee6a0b1056e8..b58c62b57f68 100644 --- a/code/modules/surgery/surgery_steps.dm +++ b/code/modules/surgery/surgery_steps.dm @@ -114,6 +114,10 @@ affected_limb, or location vars. Also, in that case there may be a wait between step_duration *= surface_modifier + var/list/human_modifiers = list("surgery_speed" = 1.0, "pain_reduction" = 0) + SEND_SIGNAL(user, COMSIG_HUMAN_SURGERY_APPLY_MODIFIERS, human_modifiers) + step_duration *= human_modifiers["surgery_speed"] + var/try_to_fail if(user.a_intent != INTENT_HELP) try_to_fail = TRUE @@ -145,7 +149,7 @@ affected_limb, or location vars. Also, in that case there may be a wait between to_chat(user, SPAN_WARNING("[capitalize(english_list(message, final_comma_text = ","))].")) var/advance //Whether to continue to the next step afterwards. - var/pain_failure_chance = max(0, target.pain?.feels_pain ? surgery.pain_reduction_required - target.pain.reduction_pain : 0) * 2 //Each extra pain unit increases the chance by 2 + var/pain_failure_chance = max(0, (target.pain?.feels_pain ? surgery.pain_reduction_required - target.pain.reduction_pain : 0) * 2 - human_modifiers["pain_reduction"]) //Each extra pain unit increases the chance by 2 play_preop_sound(user, target, target_zone, tool, surgery) diff --git a/code/modules/tents/blockers.dm b/code/modules/tents/blockers.dm new file mode 100644 index 000000000000..3301768d9147 --- /dev/null +++ b/code/modules/tents/blockers.dm @@ -0,0 +1,38 @@ +/// Invisible Blocker Walls, they link up with the main tent and collapse with it +/obj/structure/blocker/tent + name = "Tent Blocker" + icon = 'icons/obj/structures/barricades.dmi' + icon_state = "folding_0" // for map editing only + flags_atom = ON_BORDER + invisibility = INVISIBILITY_MAXIMUM + density = TRUE + opacity = FALSE // Unfortunately this doesn't behave as we'd want with ON_BORDER so we can't make tent opaque + /// The tent this blocker relates to, will be destroyed along with it + var/obj/structure/tent/linked_tent + +/obj/structure/blocker/tent/Initialize(mapload, ...) + . = ..() + icon_state = null + linked_tent = locate(/obj/structure/tent) in loc + if(!linked_tent) + return INITIALIZE_HINT_QDEL + RegisterSignal(linked_tent, COMSIG_PARENT_QDELETING, PROC_REF(collapse)) + +/obj/structure/blocker/tent/Destroy(force) + . = ..() + linked_tent = null + +/obj/structure/blocker/tent/proc/collapse() + SIGNAL_HANDLER + qdel(src) + +/obj/structure/blocker/tent/initialize_pass_flags(datum/pass_flags_container/PF) + ..() + if (PF) + PF.flags_can_pass_all = NONE + PF.flags_can_pass_front = NONE + PF.flags_can_pass_behind = NONE + +/obj/structure/blocker/tent/get_projectile_hit_boolean(obj/item/projectile/P) + . = ..() + return FALSE // Always fly through the tent diff --git a/code/modules/tents/deployed_tents.dm b/code/modules/tents/deployed_tents.dm new file mode 100644 index 000000000000..c81beb318d5a --- /dev/null +++ b/code/modules/tents/deployed_tents.dm @@ -0,0 +1,124 @@ +/// Structures serving as landmarks and providing a buff to its users. +/// A notable code feature is that they use a separate roof image that phases out when you enter the tent. +/obj/structure/tent + name = "tent" + icon = 'icons/obj/structures/tents_deployed_classic.dmi' + opacity = FALSE // Seems only the initial turf blocks light, not all of the multitile. Therefore, useless. + layer = INTERIOR_WALL_SOUTH_LAYER // This should be below FLY_LAYER but just thank chairs and other bs + health = 200 + appearance_flags = TILE_BOUND + + /// Turf dimensions along the X axis, beginning from left, at ground level + var/x_dim = 2 + /// Turf dimensions along the Y axis, beginning from bottom, at ground level + var/y_dim = 3 + + /// How much cold protection to add to entering humans - Full body clothing means complete (1) protection + var/cold_protection_factor = 0.4 + + /// Roof display icon_state or null to disable + var/roof_state + /// Roof image displayed on the roof plane + var/image/roof_image + +/obj/structure/tent/Initialize(mapload, ...) + . = ..() + bound_width = x_dim * world.icon_size + bound_height = y_dim * world.icon_size + register_turf_signals() + RegisterSignal(src, COMSIG_ATOM_TURF_CHANGE, PROC_REF(register_turf_signals)) + + switch(SSmapping.configs[GROUND_MAP].camouflage_type) + if("jungle") + icon = 'icons/obj/structures/tents_deployed_jungle.dmi' + if("desert") + icon = 'icons/obj/structures/tents_deployed_desert.dmi' + if("snow") + icon = 'icons/obj/structures/tents_deployed_snow.dmi' + if("urban") + icon = 'icons/obj/structures/tents_deployed_urban.dmi' + + if(roof_state) + roof_image = image(icon, src, roof_state) + roof_image.plane = ROOF_PLANE + roof_image.appearance_flags = KEEP_APART + src.overlays += roof_image + +/obj/structure/tent/proc/register_turf_signals() + SIGNAL_HANDLER + for(var/turf/turf in locs) + RegisterSignal(turf, COMSIG_TURF_ENTERED, PROC_REF(movable_entering_tent), override = TRUE) + +/obj/structure/tent/proc/movable_entering_tent(turf/hooked, atom/movable/subject) + SIGNAL_HANDLER + if(!ismob(subject)) + return + var/mob/subject_mob = subject + RegisterSignal(subject_mob, list(COMSIG_MOVABLE_TURF_ENTERED, COMSIG_GHOST_MOVED), PROC_REF(mob_moved), override = TRUE) // Must override because we can't know if mob was already inside tent without keeping an awful ref list + var/atom/movable/screen/plane_master/roof/roof_plane = subject_mob.hud_used.plane_masters["[ROOF_PLANE]"] + roof_plane?.invisibility = INVISIBILITY_MAXIMUM + if(ishuman(subject)) + RegisterSignal(subject, COMSIG_HUMAN_COLD_PROTECTION_APPLY_MODIFIERS, PROC_REF(cold_protection), override = TRUE) + +/obj/structure/tent/proc/cold_protection(mob/source, list/protection_data) + SIGNAL_HANDLER + protection_data["protection"] += cold_protection_factor + +/obj/structure/tent/proc/mob_moved(mob/subject, turf/target_turf) + SIGNAL_HANDLER + if(!(target_turf in locs)) // Exited the tent + mob_exited_tent(subject) + +/obj/structure/tent/proc/mob_exited_tent(mob/subject) + UnregisterSignal(subject, list(COMSIG_MOVABLE_TURF_ENTERED, COMSIG_GHOST_MOVED, COMSIG_HUMAN_COLD_PROTECTION_APPLY_MODIFIERS)) + var/atom/movable/screen/plane_master/roof/roof_plane = subject.hud_used.plane_masters["[ROOF_PLANE]"] + roof_plane?.invisibility = 0 + +/obj/structure/tent/attack_alien(mob/living/carbon/xenomorph/M) + if(unslashable) + return + health -= 20 + if(health <= 0) + visible_message(SPAN_BOLDWARNING("The [src] collapses!")) + qdel(src) + +/// Command tent, providing basics for field command: a phone, and an overwatch console +/obj/structure/tent/cmd + icon_state = "cmd_interior" + roof_state = "cmd_top" + desc = "A standard USCM Command Tent. This one comes equipped with a self-powered Overwatch Console and a Telephone. It is very frail, do not burn, expose to sharp objects, or explosives." + +/// Medical tent, procures a buff to surgery speed +/obj/structure/tent/med + icon_state = "med_interior" + roof_state = "med_top" + desc = "A standard USCM Medical Tent. This one comes equipped with advanced field surgery facilities. It is very fragile however and won't withstand the rigors of war." + var/surgery_speed_mult = 0.9 + var/surgery_pain_reduction = 5 + +/obj/structure/tent/med/movable_entering_tent(turf/hooked, atom/movable/subject) + . = ..() + if(ishuman(subject)) + RegisterSignal(subject, COMSIG_HUMAN_SURGERY_APPLY_MODIFIERS, PROC_REF(apply_surgery_modifiers), override = TRUE) + +/obj/structure/tent/med/mob_exited_tent(mob/subject) + . = ..() + UnregisterSignal(subject, COMSIG_HUMAN_SURGERY_APPLY_MODIFIERS) + +/obj/structure/tent/med/proc/apply_surgery_modifiers(mob/living/carbon/human/source, list/surgery_data) + SIGNAL_HANDLER + surgery_data["surgery_speed"] *= surgery_speed_mult + surgery_data["pain_reduction"] += surgery_pain_reduction + +/// Big Tent. It's just Big. Use it for shelter or organization! +/obj/structure/tent/big + icon_state = "big_interior" + roof_state = "big_top" + x_dim = 3 + y_dim = 3 + +/obj/structure/tent/reqs + icon_state = "reqs_interior" + roof_state = "reqs_top" + x_dim = 4 + y_dim = 3 diff --git a/code/modules/tents/equipment.dm b/code/modules/tents/equipment.dm new file mode 100644 index 000000000000..f2f9175a240e --- /dev/null +++ b/code/modules/tents/equipment.dm @@ -0,0 +1,113 @@ +/// Component to handle power requirements following removal of the tent +/datum/component/tent_powered_machine + dupe_mode = COMPONENT_DUPE_HIGHLANDER + var/obj/structure/tent/linked_tent + +/datum/component/tent_powered_machine/Initialize(...) + . = ..() + if(!istype(parent, /obj/structure/machinery)) + return COMPONENT_INCOMPATIBLE + var/obj/structure/machinery/machine = parent + var/obj/structure/tent/located_tent = locate(/obj/structure/tent) in machine.loc + if(located_tent) + linked_tent = located_tent + machine.needs_power = FALSE + RegisterSignal(linked_tent, COMSIG_PARENT_QDELETING, PROC_REF(enable_power_requirement)) + +/datum/component/tent_powered_machine/proc/enable_power_requirement() + SIGNAL_HANDLER + var/obj/structure/machinery/machine = parent + machine.needs_power = TRUE + +/// Component to handle destruction of objects following removal of the tent +/datum/component/tent_supported_object + dupe_mode = COMPONENT_DUPE_HIGHLANDER + var/obj/structure/tent/linked_tent + +/datum/component/tent_supported_object/Initialize(...) + . = ..() + if(!istype(parent, /atom/movable)) + return COMPONENT_INCOMPATIBLE + var/atom/movable/source = parent + var/obj/structure/tent/located_tent = locate(/obj/structure/tent) in source.loc + if(located_tent) + linked_tent = located_tent + RegisterSignal(linked_tent, COMSIG_PARENT_QDELETING, PROC_REF(tent_collapse)) + +/datum/component/tent_supported_object/proc/tent_collapse() + SIGNAL_HANDLER + qdel(parent) + +/// Groundside console +/obj/structure/machinery/computer/overwatch/tent/Initialize(mapload, ...) + AddComponent(/datum/component/tent_supported_object) + return ..() + +/// Telephone +/obj/structure/transmitter/tent + layer = INTERIOR_WALLMOUNT_LAYER +/obj/structure/transmitter/tent/Initialize(mapload, ...) + AddComponent(/datum/component/tent_supported_object) + return ..() + +/// ASRS request console +/obj/structure/machinery/computer/ordercomp/tent + icon_state = "request_wall" + density = FALSE + deconstructible = FALSE + needs_power = FALSE + indestructible = TRUE // Goes with the tent instead + layer = INTERIOR_WALLMOUNT_LAYER +/obj/structure/machinery/computer/ordercomp/tent/Initialize() + AddComponent(/datum/component/tent_supported_object) + return ..() + +/// NanoMED +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/tent + unacidable = FALSE + layer = INTERIOR_WALLMOUNT_LAYER + needs_power = FALSE +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/tent/Initialize() + AddComponent(/datum/component/tent_supported_object) + return ..() + +/// Closeable curtains +/obj/structure/tent_curtain + icon = 'icons/obj/structures/tents_equipment.dmi' + icon_state = "curtains-classic-o" + desc = "USCM Curtains for USCM Tents used by USCM Personnel. Close this with right-click to ensure USCM Contents are contained." + flags_atom = ON_BORDER + layer = INTERIOR_DOOR_INSIDE_LAYER + dir = SOUTH + density = FALSE + alpha = 180 + +/obj/structure/tent_curtain/Initialize(mapload, ...) + . = ..() + AddComponent(/datum/component/tent_supported_object) + update_icon() + +/obj/structure/tent_curtain/get_projectile_hit_boolean(obj/item/projectile/P) + return FALSE + +/obj/structure/tent_curtain/update_icon() + . = ..() + var/camo = SSmapping.configs[GROUND_MAP].camouflage_type + if(density) + icon_state = "curtains-[camo]" + else + icon_state = "curtains-[camo]-o" + +/obj/structure/tent_curtain/attack_hand(mob/user) + . = ..() + if(!.) + playsound(loc, "rustle", 10, TRUE, 4) + density = !density + update_icon() + return TRUE + +/obj/structure/tent_curtain/attack_alien(mob/living/carbon/xenomorph/M) + if(unslashable) + return + visible_message(SPAN_BOLDWARNING("[src] gets torn to shreds!")) + qdel(src) diff --git a/code/modules/tents/folded_tents.dm b/code/modules/tents/folded_tents.dm new file mode 100644 index 000000000000..d1f922703500 --- /dev/null +++ b/code/modules/tents/folded_tents.dm @@ -0,0 +1,165 @@ +/obj/item/folded_tent + name = "Folded Abstract Tent" + icon = 'icons/obj/structures/tents_folded.dmi' + w_class = SIZE_LARGE + /// Required cleared area along X axis + var/dim_x = 1 + /// Required cleared area along Y axis + var/dim_y = 1 + /// Deployment X offset + var/off_x = 0 + /// Deployment Y offset + var/off_y = 0 + /// Map Template to use for the tent + var/template + +/// Check an area is clear for deployment of the tent +/obj/item/folded_tent/proc/check_area(turf/ref_turf, mob/message_receiver, display_error = FALSE) + SHOULD_NOT_SLEEP(TRUE) + . = TRUE + var/list/turf_block = get_deployment_area(ref_turf) + for(var/turf/turf as anything in turf_block) + var/area/area = get_area(turf) + if(!area.can_build_special) + if(message_receiver) + to_chat(message_receiver, SPAN_WARNING("You cannot deploy tents on restricted areas.")) + if(display_error) + new /obj/effect/overlay/temp/tent_deployment_area/error(turf) + return FALSE + if(istype(turf, /turf/open/shuttle)) + if(message_receiver) + to_chat(message_receiver, SPAN_BOLDWARNING("What are you doing?!! Don't build that on the shuttle please!")) + return FALSE + if(turf.density) + if(message_receiver) + to_chat(message_receiver, SPAN_WARNING("You cannot deploy the [src] here, something ([turf]) is in the way.")) + if(display_error) + new /obj/effect/overlay/temp/tent_deployment_area/error(turf) + return FALSE + for(var/atom/movable/atom as anything in turf) + if(isliving(atom) || (atom.density && atom.can_block_movement) || istype(atom, /obj/structure/tent)) + if(message_receiver) + to_chat(message_receiver, SPAN_WARNING("You cannot deploy the [src] here, something ([atom.name]) is in the way.")) + if(display_error) + new /obj/effect/overlay/temp/tent_deployment_area/error(turf) + return FALSE + return TRUE + +/obj/item/folded_tent/proc/unfold(turf/ref_turf) + var/datum/map_template/template_instance = new template() + template_instance.load(ref_turf, FALSE, FALSE) + +/obj/item/folded_tent/proc/get_deployment_area(turf/ref_turf) + RETURN_TYPE(/list/turf) + var/turf/block_end_turf = locate(ref_turf.x + dim_x - 1, ref_turf.y + dim_y - 1, ref_turf.z) + return block(ref_turf, block_end_turf) + +/obj/item/folded_tent/attack_self(mob/living/user) + . = ..() + var/turf/deploy_turf = user.loc + if(!istype(deploy_turf)) + return // In a locker or something. Get lost you already have a home. + + switch(user.dir) // Fix up offset deploy location so tent is better centered + can be deployed under all angles + if(NORTH) + deploy_turf = locate(deploy_turf.x + off_x, deploy_turf.y + 1, deploy_turf.z) + if(SOUTH) + deploy_turf = locate(deploy_turf.x + off_x, deploy_turf.y - dim_y, deploy_turf.z) + if(EAST) + deploy_turf = locate(deploy_turf.x + 1, deploy_turf.y + off_y, deploy_turf.z) + if(WEST) + deploy_turf = locate(deploy_turf.x - dim_x, deploy_turf.y + off_y, deploy_turf.z) + + if(!istype(deploy_turf) || (deploy_turf.x + dim_x > world.maxx) || (deploy_turf.y + dim_y > world.maxy)) // Map border basically + return + + if(!is_ground_level(deploy_turf.z)) + to_chat(user, SPAN_WARNING("USCM Operational Tents are intended for operations, not ship or space recreation.")) + return + + var/list/obj/effect/overlay/temp/tent_deployment_area/turf_overlay = list() + var/list/turf/deployment_area = get_deployment_area(deploy_turf) + + if(!check_area(deploy_turf, user, TRUE)) + for(var/turf/turf in deployment_area) + new /obj/effect/overlay/temp/tent_deployment_area(turf) // plus error in check_area + return + + for(var/turf/turf in deployment_area) + turf_overlay += new /obj/effect/overlay/temp/tent_deployment_area/casting(turf) + + user.visible_message(SPAN_INFO("[user] starts deploying the [src]..."), \ + SPAN_WARNING("You start assembling the [src]... Stand still, it might take a bit to figure it out...")) + if(!do_after(user, 6 SECONDS, INTERRUPT_ALL, BUSY_ICON_BUILD)) + to_chat(user, SPAN_WARNING("You were interrupted!")) + for(var/gfx in turf_overlay) + qdel(gfx) + return + + if(!check_area(deploy_turf, user, TRUE)) + for(var/gfx in turf_overlay) + QDEL_IN(gfx, 1.5 SECONDS) + return + + unfold(deploy_turf) + user.visible_message(SPAN_INFO("[user] finishes deploying the [src]!"), SPAN_INFO("You finish deploying the [src]!")) + for(var/gfx in turf_overlay) + qdel(gfx) + qdel(src) // Success! + +/obj/item/folded_tent/cmd + name = "folded USCM Command Tent" + icon_state = "cmd" + desc = "A standard USCM Command Tent. This one comes equipped with a self-powered Overwatch Console and a Telephone. Unfold in a suitable location to maximize usefulness. Staff Officer not included. ENTRANCE TO THE SOUTH." + dim_x = 2 + dim_y = 3 + off_x = -1 + template = /datum/map_template/tent/cmd + +/obj/item/folded_tent/med + name = "folded USCM Medical Tent" + icon_state = "med" + desc = "A standard USCM Medical Tent. This one comes equipped with advanced field surgery facilities. Unfold in a suitable location to maximize health gains. Surgical Tray not included. ENTRANCE TO THE SOUTH." + dim_x = 2 + dim_y = 3 + template = /datum/map_template/tent/med + +/obj/item/folded_tent/reqs + name = "folded USCM Requisitions Tent" + icon_state = "req" + desc = "A standard USCM Requisitions Tent. Now, you can enjoy req line anywhere you go! Unfold in a suitable location to maximize resource distribution. ASRS not included. ENTRANCE TO THE SOUTH." + dim_x = 4 + dim_y = 3 + off_x = -2 + template = /datum/map_template/tent/reqs + +/obj/item/folded_tent/big + name = "folded USCM Big Tent" + icon_state = "big" + desc = "A standard USCM Tent. This one is just a bigger, general purpose version. Unfold in a suitable location for maximum FOB vibes. Mess Tech not included. ENTRANCE TO THE SOUTH." + dim_x = 3 + dim_y = 3 + off_x = -2 + template = /datum/map_template/tent/big + +/obj/effect/overlay/temp/tent_deployment_error + icon = 'icons/effects/effects.dmi' + icon_state = "placement_zone" + color = "#bb0000" + effect_duration = 1.5 SECONDS + layer = ABOVE_FLY_LAYER + +/obj/effect/overlay/temp/tent_deployment_area + icon = 'icons/effects/effects.dmi' + icon_state = "placement_zone" + color = "#f39e00" + effect_duration = 1.5 SECONDS + layer = FLY_LAYER + +/obj/effect/overlay/temp/tent_deployment_area/casting + effect_duration = 10 SECONDS + color = "#228822" + +/obj/effect/overlay/temp/tent_deployment_area/error + layer = ABOVE_FLY_LAYER + color = "#bb0000" diff --git a/code/modules/tents/templates.dm b/code/modules/tents/templates.dm new file mode 100644 index 000000000000..c32c0214999e --- /dev/null +++ b/code/modules/tents/templates.dm @@ -0,0 +1,23 @@ +/datum/map_template/tent + name = "Base Tent" + var/map_id = "change this" + +/datum/map_template/tent/New() + mappath = "maps/tents/[map_id].dmm" + return ..() + +/datum/map_template/tent/cmd + name = "CMD Tent" + map_id = "tent_cmd" + +/datum/map_template/tent/med + name = "MED Tent" + map_id = "tent_med" + +/datum/map_template/tent/big + name = "Big Tent" + map_id = "tent_big" + +/datum/map_template/tent/reqs + name = "Reqs Tent" + map_id = "tent_reqs" diff --git a/code/modules/tgs/LICENSE b/code/modules/tgs/LICENSE index 221f9e1deb21..2bedf9a63aa0 100644 --- a/code/modules/tgs/LICENSE +++ b/code/modules/tgs/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2017 Jordan Brown +Copyright (c) 2017-2023 Jordan Brown Permission is hereby granted, free of charge, to any person obtaining a copy of this software and diff --git a/code/modules/tgs/v3210/api.dm b/code/modules/tgs/v3210/api.dm index b881662d71cc..666201a32256 100644 --- a/code/modules/tgs/v3210/api.dm +++ b/code/modules/tgs/v3210/api.dm @@ -179,7 +179,7 @@ /datum/tgs_api/v3210/Revision() if(!warned_revison) var/datum/tgs_version/api_version = ApiVersion() - TGS_ERROR_LOG("Use of TgsRevision on [api_version.deprefixed_parameter] origin_commit only points to master!") + TGS_WARNING_LOG("Use of TgsRevision on [api_version.deprefixed_parameter] origin_commit only points to master!") warned_revison = TRUE var/datum/tgs_revision_information/ri = new ri.commit = commit diff --git a/code/modules/tgs/v4/api.dm b/code/modules/tgs/v4/api.dm index 2f05c3863380..b9a75c4abb48 100644 --- a/code/modules/tgs/v4/api.dm +++ b/code/modules/tgs/v4/api.dm @@ -263,7 +263,12 @@ for(var/I in channels) var/datum/tgs_chat_channel/channel = I ids += channel.id + message = UpgradeDeprecatedChatMessage(message) + + if (!length(channels)) + return + message = list("message" = message.text, "channelIds" = ids) if(intercepted_message_queue) intercepted_message_queue += list(message) @@ -276,7 +281,12 @@ var/datum/tgs_chat_channel/channel = I if (!channel.is_private_channel && ((channel.is_admin_channel && admin_only) || (!channel.is_admin_channel && !admin_only))) channels += channel.id + message = UpgradeDeprecatedChatMessage(message) + + if (!length(channels)) + return + message = list("message" = message.text, "channelIds" = channels) if(intercepted_message_queue) intercepted_message_queue += list(message) diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm index 6ef7c86ef75b..5d3d491a7362 100644 --- a/code/modules/tgs/v5/__interop_version.dm +++ b/code/modules/tgs/v5/__interop_version.dm @@ -1 +1 @@ -"5.6.0" +"5.6.1" diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm index a3f949081f16..c7213cc24699 100644 --- a/code/modules/tgs/v5/_defines.dm +++ b/code/modules/tgs/v5/_defines.dm @@ -75,7 +75,7 @@ #define DMAPI5_TOPIC_COMMAND_INSTANCE_RENAMED 4 #define DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE 5 #define DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE 6 -#define DMAPI5_TOPIC_COMMAND_HEARTBEAT 7 +#define DMAPI5_TOPIC_COMMAND_HEALTHCHECK 7 #define DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH 8 #define DMAPI5_TOPIC_COMMAND_SEND_CHUNK 9 #define DMAPI5_TOPIC_COMMAND_RECEIVE_CHUNK 10 diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm index 517240f12f8a..926ea10a8f27 100644 --- a/code/modules/tgs/v5/api.dm +++ b/code/modules/tgs/v5/api.dm @@ -166,6 +166,10 @@ ids += channel.id message = UpgradeDeprecatedChatMessage(message) + + if (!length(channels)) + return + message = message._interop_serialize() message[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = ids if(intercepted_message_queue) @@ -181,6 +185,10 @@ channels += channel.id message = UpgradeDeprecatedChatMessage(message) + + if (!length(channels)) + return + message = message._interop_serialize() message[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = channels if(intercepted_message_queue) @@ -199,6 +207,7 @@ /datum/tgs_api/v5/ChatChannelInfo() RequireInitialBridgeResponse() + WaitForReattach(TRUE) return chat_channels.Copy() /datum/tgs_api/v5/proc/DecodeChannels(chat_update_json) diff --git a/code/modules/tgs/v5/bridge.dm b/code/modules/tgs/v5/bridge.dm index b3cf77593974..37f58bcdf632 100644 --- a/code/modules/tgs/v5/bridge.dm +++ b/code/modules/tgs/v5/bridge.dm @@ -59,18 +59,22 @@ var/json = json_encode(data) return json -/datum/tgs_api/v5/proc/PerformBridgeRequest(bridge_request) +/datum/tgs_api/v5/proc/WaitForReattach(require_channels = FALSE) if(detached) // Wait up to one minute for(var/i in 1 to 600) sleep(1) - if(!detached) + if(!detached && (!require_channels || length(chat_channels))) break - // dad went out for milk cigarettes 20 years ago... + // dad went out for milk and cigarettes 20 years ago... + // yes, this affects all other waiters, intentional if(i == 600) detached = FALSE +/datum/tgs_api/v5/proc/PerformBridgeRequest(bridge_request) + WaitForReattach(FALSE) + // This is an infinite sleep until we get a response var/export_response = world.Export(bridge_request) if(!export_response) diff --git a/code/modules/tgs/v5/topic.dm b/code/modules/tgs/v5/topic.dm index 28fcc14aef87..56c1824fd97d 100644 --- a/code/modules/tgs/v5/topic.dm +++ b/code/modules/tgs/v5/topic.dm @@ -71,6 +71,7 @@ var/list/event_call = list(event_type) if (event_type == TGS_EVENT_WATCHDOG_DETACH) detached = TRUE + chat_channels.Cut() // https://github.com/tgstation/tgstation-server/issues/1490 if(event_parameters) event_call += event_parameters @@ -136,7 +137,9 @@ server_port = new_port return TopicResponse() - if(DMAPI5_TOPIC_COMMAND_HEARTBEAT) + if(DMAPI5_TOPIC_COMMAND_HEALTHCHECK) + if(event_handler?.receive_health_checks) + event_handler.HandleEvent(TGS_EVENT_HEALTH_CHECK) return TopicResponse() if(DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH) diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm index e3455b69d1c6..c679737dfc49 100644 --- a/code/modules/tgs/v5/undefs.dm +++ b/code/modules/tgs/v5/undefs.dm @@ -75,7 +75,7 @@ #undef DMAPI5_TOPIC_COMMAND_INSTANCE_RENAMED #undef DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE #undef DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE -#undef DMAPI5_TOPIC_COMMAND_HEARTBEAT +#undef DMAPI5_TOPIC_COMMAND_HEALTHCHECK #undef DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH #undef DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 93cf3cc994e0..be92afffb898 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -76,6 +76,7 @@ #include "create_and_destroy.dm" #include "focus_only_tests.dm" +#include "missing_icons.dm" #include "resist.dm" #include "spritesheets.dm" #include "subsystem_init.dm" @@ -83,6 +84,7 @@ #include "timer_sanity.dm" #include "unit_test.dm" #include "spawn_humans.dm" +#include "check_runtimes.dm" #undef TEST_ASSERT #undef TEST_ASSERT_EQUAL diff --git a/code/modules/unit_tests/check_runtimes.dm b/code/modules/unit_tests/check_runtimes.dm new file mode 100644 index 000000000000..23d497375846 --- /dev/null +++ b/code/modules/unit_tests/check_runtimes.dm @@ -0,0 +1,17 @@ +/datum/unit_test/check_runtimes + priority = TEST_LONGER + + ///Regex patterns if we must satisfy checks with runtimes present + var/list/whitelisted_regex = list() + +/datum/unit_test/check_runtimes/Run() + for(var/runtime as anything in GLOB.STUI.runtime) + if(!is_whitelisted(runtime)) + TEST_FAIL(runtime) + +/datum/unit_test/check_runtimes/proc/is_whitelisted(message) + for(var/pattern as anything in whitelisted_regex) + var/regex/regex = new(pattern) + if(regex.Find(message)) + return TRUE + return FALSE diff --git a/code/modules/unit_tests/create_and_destroy.dm b/code/modules/unit_tests/create_and_destroy.dm index ecec6b0e2575..46f900eee71e 100644 --- a/code/modules/unit_tests/create_and_destroy.dm +++ b/code/modules/unit_tests/create_and_destroy.dm @@ -15,6 +15,7 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE) // These use walkaway() after initialization, which causes false positives /obj/item/explosive/grenade/flashbang/cluster/segment, /obj/item/explosive/grenade/flashbang/cluster_piece, + /obj/effect/fake_attacker, ) //This turf existing is an error in and of itself ignore += typesof(/turf/baseturf_skipover) @@ -59,34 +60,50 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE) var/list/to_del = spawn_at.contents - cached_contents if(length(to_del)) for(var/atom/to_kill in to_del) - qdel(to_kill) + if(!QDELETED(to_kill)) + qdel(to_kill) GLOB.running_create_and_destroy = FALSE //Hell code, we're bound to have ended the round somehow so let's stop if from ending while we work SSticker.delay_end = TRUE + + // Drastically lower the amount of time it takes to GC, since we don't have clients that can hold it up. + SSgarbage.collection_timeout[GC_QUEUE_CHECK] = 10 SECONDS //Prevent the garbage subsystem from harddeling anything, if only to save time SSgarbage.collection_timeout[GC_QUEUE_HARDDELETE] = 10000 HOURS //Clear it, just in case cached_contents.Cut() + var/list/queues_we_care_about = list() + // All up to harddel + for(var/i in 1 to GC_QUEUE_HARDDELETE - 1) + queues_we_care_about += i + //Now that we've qdel'd everything, let's sleep until the gc has processed all the shit we care about - var/time_needed = SSgarbage.collection_timeout[GC_QUEUE_CHECK] + // + 2 seconds to ensure that everything gets in the queue. + var/time_needed = 2 SECONDS + for(var/index in queues_we_care_about) + time_needed += SSgarbage.collection_timeout[index] + var/start_time = world.time var/garbage_queue_processed = FALSE sleep(time_needed) while(!garbage_queue_processed) - var/list/queue_to_check = SSgarbage.queues[GC_QUEUE_CHECK] - //How the hell did you manage to empty this? Good job! - if(!length(queue_to_check)) - garbage_queue_processed = TRUE - break + var/oldest_packet_creation = INFINITY + for(var/index in queues_we_care_about) + var/list/queue_to_check = SSgarbage.queues[index] + if(!length(queue_to_check)) + continue + + var/list/oldest_packet = queue_to_check[1] + //Pull out the time we inserted at + var/qdeld_at = oldest_packet[GC_QUEUE_ITEM_GCD_DESTROYED] + + oldest_packet_creation = min(qdeld_at, oldest_packet_creation) - var/list/oldest_packet = queue_to_check[1] - //Pull out the time we deld at - var/qdeld_at = oldest_packet[1] //If we've found a packet that got del'd later then we finished, then all our shit has been processed - if(qdeld_at > start_time) + if(oldest_packet_creation > start_time) garbage_queue_processed = TRUE break @@ -122,4 +139,5 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE) SSticker.delay_end = FALSE //This shouldn't be needed, but let's be polite - SSgarbage.collection_timeout[GC_QUEUE_HARDDELETE] = 10 SECONDS + SSgarbage.collection_timeout[GC_QUEUE_CHECK] = GC_CHECK_QUEUE + SSgarbage.collection_timeout[GC_QUEUE_HARDDELETE] = GC_DEL_QUEUE diff --git a/code/modules/unit_tests/missing_icons.dm b/code/modules/unit_tests/missing_icons.dm new file mode 100644 index 000000000000..53abbed70d6a --- /dev/null +++ b/code/modules/unit_tests/missing_icons.dm @@ -0,0 +1,55 @@ +/// Makes sure objects actually have icons that exist! +/datum/unit_test/missing_icons + var/static/list/possible_icon_states = list() + /// additional_icon_location is for downstream modularity support. + /// Make sure this location is also present in tools/deploy.sh + /// If you need additional paths ontop of this second one, you can add another generate_possible_icon_states_list("your/folder/path/") below the if(additional_icon_location) block in Run(), and make sure to add that path to tools/deploy.sh as well. + var/additional_icon_location = null + +/datum/unit_test/missing_icons/proc/generate_possible_icon_states_list(directory_path) + if(!directory_path) + directory_path = "icons/obj/" + for(var/file_path in flist(directory_path)) + if(findtext(file_path, ".dmi")) + for(var/sprite_icon in icon_states("[directory_path][file_path]", 1)) //2nd arg = 1 enables 64x64+ icon support, otherwise you'll end up with "sword0_1" instead of "sword" + possible_icon_states[sprite_icon] += list("[directory_path][file_path]") + else + possible_icon_states += generate_possible_icon_states_list("[directory_path][file_path]") + +/datum/unit_test/missing_icons/Run() + generate_possible_icon_states_list() + generate_possible_icon_states_list("icons/effects/") + if(additional_icon_location) + generate_possible_icon_states_list(additional_icon_location) + + //Add EVEN MORE paths if needed here! + //generate_possible_icon_states_list("your/folder/path/") + var/list/bad_list = list() + for(var/obj/obj_path as anything in subtypesof(/obj)) + if(ispath(obj_path, /obj/item)) + var/obj/item/item_path = obj_path + if(initial(item_path.flags_item) & ITEM_ABSTRACT) + continue + + var/icon = initial(obj_path.icon) + if(isnull(icon)) + continue + var/icon_state = initial(obj_path.icon_state) + if(isnull(icon_state)) + continue + + if(length(bad_list) && (icon_state in bad_list[icon])) + continue + + if(icon_exists(icon, icon_state)) + continue + + bad_list[icon] += list(icon_state) + + var/match_message + if(icon_state in possible_icon_states) + for(var/file_place in possible_icon_states[icon_state]) + match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'") + + TEST_FAIL("Missing icon_state for [obj_path] in '[icon]'.\n\ticon_state = \"[icon_state]\"[match_message]") + diff --git a/code/modules/unit_tests/spawn_humans.dm b/code/modules/unit_tests/spawn_humans.dm index 71b67ced106a..5f327b141754 100644 --- a/code/modules/unit_tests/spawn_humans.dm +++ b/code/modules/unit_tests/spawn_humans.dm @@ -4,4 +4,4 @@ for(var/I in 1 to 5) new /mob/living/carbon/human(pick(locs)) - sleep(5 SECONDS) + sleep(60 SECONDS) diff --git a/code/modules/vehicles/interior/interactable/vendors.dm b/code/modules/vehicles/interior/interactable/vendors.dm index 57b0d0f98d77..7ee37cf6fa28 100644 --- a/code/modules/vehicles/interior/interactable/vendors.dm +++ b/code/modules/vehicles/interior/interactable/vendors.dm @@ -69,8 +69,8 @@ /obj/structure/machinery/cm_vending/sorted/medical/vehicle/populate_product_list(scale) listed_products = list( list("FIELD SUPPLIES", -1, null, null), - list("Advanced Burn Kit", round(scale * 4), /obj/item/stack/medical/advanced/ointment, VENDOR_ITEM_REGULAR), - list("Advanced Trauma Kit", round(scale * 4), /obj/item/stack/medical/advanced/bruise_pack, VENDOR_ITEM_REGULAR), + list("Burn Kit", round(scale * 4), /obj/item/stack/medical/advanced/ointment, VENDOR_ITEM_REGULAR), + list("Trauma Kit", round(scale * 4), /obj/item/stack/medical/advanced/bruise_pack, VENDOR_ITEM_REGULAR), list("Ointment", round(scale * 5), /obj/item/stack/medical/ointment, VENDOR_ITEM_REGULAR), list("Roll of Gauze", round(scale * 5), /obj/item/stack/medical/bruise_pack, VENDOR_ITEM_REGULAR), list("Splints", round(scale * 5), /obj/item/stack/medical/splint, VENDOR_ITEM_REGULAR), @@ -382,3 +382,78 @@ updateUsrDialog() return TRUE//We found our item, no reason to go on. + +/// Modified Restockable APC-based vendor for use by Req in the deployable tent +/obj/structure/machinery/cm_vending/sorted/vehicle_supply/tent + desc = "An automated restockable storage vendor for use in organizing FOB supplies." + req_access = list(ACCESS_MARINE_CARGO) + density = TRUE + indestructible = TRUE // Deleted with the tent instead + needs_power = FALSE + +/obj/structure/machinery/cm_vending/sorted/vehicle_supply/tent/Initialize() + . = ..() + var/obj/structure/tent/located_tent = locate(/obj/structure/tent) in loc + if(!located_tent) + return INITIALIZE_HINT_QDEL + RegisterSignal(located_tent, COMSIG_PARENT_QDELETING, PROC_REF(begin_unloading)) + +//combined from req guns and ammo vendors +/obj/structure/machinery/cm_vending/sorted/vehicle_supply/tent/populate_product_list(scale) + listed_products = list( + list("BUILDING MATERIALS", -1, null, null), + list("Cardboard x10", 1, /obj/item/stack/sheet/cardboard/small_stack, VENDOR_ITEM_REGULAR), + list("Barbed Wire x10", 0, /obj/item/stack/barbed_wire/small_stack, VENDOR_ITEM_REGULAR), + list("Metal x10", 0, /obj/item/stack/sheet/metal/small_stack, VENDOR_ITEM_REGULAR), + list("Plasteel x10", 0, /obj/item/stack/sheet/plasteel/small_stack, VENDOR_ITEM_REGULAR), + list("Sandbags (empty) x10", 0, /obj/item/stack/sandbags_empty/small_stack, VENDOR_ITEM_REGULAR), + list("Sandbags (full) x5", 0, /obj/item/stack/sandbags/small_stack, VENDOR_ITEM_REGULAR), + + list("AMMUNITION", -1, null, null), + list("Box Of Buckshot Shells", 0, /obj/item/ammo_magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR), + list("Box Of Flechette Shells", 0, /obj/item/ammo_magazine/shotgun/flechette, VENDOR_ITEM_REGULAR), + list("Box Of Shotgun Slugs", 0, /obj/item/ammo_magazine/shotgun/slugs, VENDOR_ITEM_REGULAR), + list("M4RA Magazine (10x24mm)", 0, /obj/item/ammo_magazine/rifle/m4ra, VENDOR_ITEM_REGULAR), + list("M41A MK2 Magazine (10x24mm)", 0, /obj/item/ammo_magazine/rifle, VENDOR_ITEM_REGULAR), + list("M39 HV Magazine (10x20mm)", 0, /obj/item/ammo_magazine/smg/m39, VENDOR_ITEM_REGULAR), + list("M44 Speed Loader (.44)", 0, /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), + list("M4A3 Magazine (9mm)", 0, /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), + list("M56D Drum Magazine", 0, /obj/item/ammo_magazine/m56d, VENDOR_ITEM_REGULAR), + list("M2C Box Magazine", 0, /obj/item/ammo_magazine/m2c, VENDOR_ITEM_REGULAR), + + list("ARMOR", -1, null, null), + list("M10 Pattern Marine Helmet", 0, /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR), + list("M3 Pattern Carrier Marine Armor", 0, /obj/item/clothing/suit/storage/marine/carrier, VENDOR_ITEM_REGULAR), + list("M3 Pattern Padded Marine Armor", 0, /obj/item/clothing/suit/storage/marine/padded, VENDOR_ITEM_REGULAR), + list("M3 Pattern Padless Marine Armor", 0, /obj/item/clothing/suit/storage/marine/padless, VENDOR_ITEM_REGULAR), + list("M3 Pattern Ridged Marine Armor", 0, /obj/item/clothing/suit/storage/marine/padless_lines, VENDOR_ITEM_REGULAR), + list("M3 Pattern Skull Marine Armor", 0, /obj/item/clothing/suit/storage/marine/skull, VENDOR_ITEM_REGULAR), + list("M3-EOD Pattern Heavy Armor", 0, /obj/item/clothing/suit/storage/marine/heavy, VENDOR_ITEM_REGULAR), + list("M3-L Pattern Light Armor", 0, /obj/item/clothing/suit/storage/marine/light, VENDOR_ITEM_REGULAR), + + list("MISCELLANEOUS", -1, null, null), + list("Box Of MREs", 0, /obj/item/ammo_box/magazine/misc/mre, VENDOR_ITEM_REGULAR), + list("Box Of M94 Marking Flare Packs", 0, /obj/item/ammo_box/magazine/misc/flares, VENDOR_ITEM_REGULAR), + list("M89-S Signal Flare Pack", 0, /obj/item/storage/box/m94/signal, VENDOR_ITEM_REGULAR), + list("M94 Marking Flare Pack", 0, /obj/item/storage/box/m94, VENDOR_ITEM_REGULAR), + list("Flashlights", 1, /obj/item/device/flashlight, VENDOR_ITEM_REGULAR), + list("MB-6 Folding Barricades (x3)", 0, /obj/item/stack/folding_barricade/three, VENDOR_ITEM_REGULAR), + list("Entrenching Tool", 0, /obj/item/tool/shovel/etool, VENDOR_ITEM_REGULAR), + list("Roller Bed", 0, /obj/item/roller, VENDOR_ITEM_REGULAR), + list("Table", 3, /obj/item/frame/table, VENDOR_ITEM_REGULAR), + list("Rack", 3, /obj/item/frame/rack, VENDOR_ITEM_REGULAR), + list("Cliboard", 4, /obj/item/clipboard, VENDOR_ITEM_REGULAR), + list("Pen", 4, /obj/item/tool/pen, VENDOR_ITEM_REGULAR), + list("Chair", 2, /obj/item/weapon/twohanded/folded_metal_chair, VENDOR_ITEM_REGULAR), + + list("AMMUNITION BOXES", -1, null, null), + list("Shotgun Shell Box (Buckshot x 100)", 0, /obj/item/ammo_box/magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Box (Flechette x 100)", 0, /obj/item/ammo_box/magazine/shotgun/flechette, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Box (Slugs x 100)", 0, /obj/item/ammo_box/magazine/shotgun, VENDOR_ITEM_REGULAR), + list("Rifle Ammunition Box (10x24mm)", 0, /obj/item/ammo_box/rounds, VENDOR_ITEM_REGULAR), + list("SMG Ammunition Box (10x20mm HV)", 0, /obj/item/ammo_box/rounds/smg, VENDOR_ITEM_REGULAR), + ) + +/obj/structure/machinery/cm_vending/sorted/vehicle_supply/tent/proc/begin_unloading() + SIGNAL_HANDLER + INVOKE_ASYNC(src, PROC_REF(catastrophic_failure), TRUE, TRUE) diff --git a/code/modules/vehicles/interior/objects/fancy_locker.dm b/code/modules/vehicles/interior/objects/fancy_locker.dm index 9f43d71f7cc1..f1068812a793 100644 --- a/code/modules/vehicles/interior/objects/fancy_locker.dm +++ b/code/modules/vehicles/interior/objects/fancy_locker.dm @@ -11,7 +11,10 @@ /obj/structure/closet/fancy/Initialize() . = ..() + return INITIALIZE_HINT_LATELOAD +/obj/structure/closet/fancy/LateInitialize() + . = ..() interior = new(src) INVOKE_ASYNC(src, PROC_REF(do_create_interior)) @@ -28,7 +31,6 @@ if(!succ) break - /obj/structure/interior_exit/fancy name = "fancy wooden door" icon = 'icons/obj/structures/doors/mineral_doors.dmi' diff --git a/code/modules/vehicles/multitile/multitile.dm b/code/modules/vehicles/multitile/multitile.dm index 6b8cd21509ec..7802d9a7edbd 100644 --- a/code/modules/vehicles/multitile/multitile.dm +++ b/code/modules/vehicles/multitile/multitile.dm @@ -163,10 +163,6 @@ /obj/vehicle/multitile/Initialize() . = ..() - if(interior_map) - interior = new(src) - INVOKE_ASYNC(src, PROC_REF(do_create_interior)) - var/angle_to_turn = turning_angle(SOUTH, dir) rotate_entrances(angle_to_turn) rotate_bounds(angle_to_turn) @@ -176,6 +172,15 @@ GLOB.all_multi_vehicles += src + return INITIALIZE_HINT_LATELOAD + +/obj/vehicle/multitile/LateInitialize() + . = ..() + + if(interior_map) + interior = new(src) + INVOKE_ASYNC(src, PROC_REF(do_create_interior)) + /obj/vehicle/multitile/proc/do_create_interior() interior.create_interior(interior_map) @@ -192,7 +197,7 @@ GLOB.all_multi_vehicles -= src - . = ..() + return ..() /obj/vehicle/multitile/proc/initialize_cameras() return diff --git a/code/span_macros.dm b/code/span_macros.dm index 110da044e74a..d5e9cdcb9c36 100644 --- a/code/span_macros.dm +++ b/code/span_macros.dm @@ -102,3 +102,5 @@ #define SPAN_ORANGE(X) "[X]" #define SPAN_PURPLE(X) "[X]" #define SPAN_MAROON(X) "[X]" + +#define SPAN_STAFF_IC(X) "[X]" diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 60fe1c0f9917..8e1ce4069b10 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -30,6 +30,7 @@ em {font-style: normal; font-weight: bold;} .mentorhelp {color: #009900; font-weight: bold;} .mentorstaff {color: #b5850d; font-weight: bold;} .staffsay {color: #b5850d; font-weight: bold;} +.staff_ic {color: #000099;} .name { font-weight: bold;} diff --git a/colonialmarines.dme b/colonialmarines.dme index f8c06ba3d841..9feb76faf408 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -13,6 +13,7 @@ // BEGIN_INCLUDE #include "code\_byond_version_compat.dm" #include "code\_compile_options.dm" +#include "code\_experiments.dm" #include "code\_macros.dm" #include "code\global.dm" #include "code\names.dm" @@ -40,6 +41,7 @@ #include "code\__DEFINES\chat.dm" #include "code\__DEFINES\chemistry.dm" #include "code\__DEFINES\clans.dm" +#include "code\__DEFINES\client_prefs.dm" #include "code\__DEFINES\colours.dm" #include "code\__DEFINES\combat.dm" #include "code\__DEFINES\configuration.dm" @@ -259,6 +261,7 @@ #include "code\controllers\subsystem\predships.dm" #include "code\controllers\subsystem\projectiles.dm" #include "code\controllers\subsystem\quadtrees.dm" +#include "code\controllers\subsystem\reagents.dm" #include "code\controllers\subsystem\redis.dm" #include "code\controllers\subsystem\round_recording.dm" #include "code\controllers\subsystem\shuttle.dm" @@ -453,6 +456,7 @@ #include "code\datums\emergency_calls\dutch.dm" #include "code\datums\emergency_calls\emergency_call.dm" #include "code\datums\emergency_calls\feral_xenos.dm" +#include "code\datums\emergency_calls\forsaken_xenos.dm" #include "code\datums\emergency_calls\goons.dm" #include "code\datums\emergency_calls\hefa_knight.dm" #include "code\datums\emergency_calls\inspection.dm" @@ -569,6 +573,7 @@ #include "code\datums\statistics\random_facts\damage_fact.dm" #include "code\datums\statistics\random_facts\kills_fact.dm" #include "code\datums\statistics\random_facts\random_fact.dm" +#include "code\datums\statistics\random_facts\revives_fact.dm" #include "code\datums\supply_packs\_supply_packs.dm" #include "code\datums\supply_packs\ammo.dm" #include "code\datums\supply_packs\attachments.dm" @@ -946,7 +951,6 @@ #include "code\game\objects\effects\spawners\vaultspawner.dm" #include "code\game\objects\effects\spawners\wo_spawners\players.dm" #include "code\game\objects\effects\spawners\wo_spawners\supplies.dm" -#include "code\game\objects\items\artifacts.dm" #include "code\game\objects\items\ashtray.dm" #include "code\game\objects\items\backpack_sprayers.dm" #include "code\game\objects\items\bodybag.dm" @@ -2040,7 +2044,6 @@ #include "code\modules\projectiles\homing_projectile_component.dm" #include "code\modules\projectiles\item_to_box_mapping.dm" #include "code\modules\projectiles\projectile.dm" -#include "code\modules\projectiles\targeting.dm" #include "code\modules\projectiles\ammo_boxes\ammo_boxes.dm" #include "code\modules\projectiles\ammo_boxes\box_structures.dm" #include "code\modules\projectiles\ammo_boxes\grenade_packets.dm" @@ -2165,6 +2168,11 @@ #include "code\modules\teleporters\teleporter_admin_verbs.dm" #include "code\modules\teleporters\teleporter_console.dm" #include "code\modules\teleporters\teleporter_landmarks.dm" +#include "code\modules\tents\blockers.dm" +#include "code\modules\tents\deployed_tents.dm" +#include "code\modules\tents\equipment.dm" +#include "code\modules\tents\folded_tents.dm" +#include "code\modules\tents\templates.dm" #include "code\modules\tgchat\cm_shims.dm" #include "code\modules\tgchat\message.dm" #include "code\modules\tgchat\to_chat.dm" diff --git a/html/changelogs/AutoChangeLog-pr-3373.yml b/html/changelogs/AutoChangeLog-pr-3373.yml deleted file mode 100644 index 14ea508111ff..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3373.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "morrowwolf" -delete-after: True -changes: - - balance: "DS part fabricator, chem simulator, chem storage are now unslashable/unacidable" \ No newline at end of file diff --git a/html/changelogs/archive/2023-05.yml b/html/changelogs/archive/2023-05.yml index 45e4db3949d3..12389c68cd12 100644 --- a/html/changelogs/archive/2023-05.yml +++ b/html/changelogs/archive/2023-05.yml @@ -373,3 +373,213 @@ 2023-05-21: BeagleGaming1: - qol: lets player facehuggers see their lifetime hugs on the status panel +2023-05-22: + Huffie56: + - bugfix: remove the luminosity when torch and plant that produce the light are + destroy. + morrowwolf: + - balance: DS part fabricator, chem simulator, chem storage are now unslashable/unacidable +2023-05-23: + Emanthealmighty: + - bugfix: Fixed huggers not passively dying if they fail to attach to a target. + Hopek: + - balance: Zombies now have their own language and don't understand English + - rscadd: Medics finally get medic clothing racks on WO + - bugfix: Xeno Directional attack no longer friendly fires their own walls and doors. + You need to actually click on the sprite if you mean to destroy it + Huffie56: + - bugfix: fix the dead will now be properly turn into zombie when infected by black + go virus. + LynxSolstice: + - rscadd: Added an M276 Pattern Combat Toolbelt rig to the SEA's vendor machine. + Morrow: + - balance: Acid blood damage from 12 to 20. + NewyearnewmeUwu: + - rscadd: Adds the basis for CO (and other) faction preferences + Segrain: + - bugfix: Boiler's slowdown for zooming now properly resets on unzooming regardless + of what causes it. + - bugfix: Trapper's zoomed vision is no longer unintentionally offset. + - bugfix: Trapper no longer gets globber's Acid Shroud ability messing its keybinds. + - rscadd: Using Show Held Item is now visible in abovehead popup. + - bugfix: IV drips work with xenomorphs once again. + SpartanBobby: + - rscadd: Added two books to the USS Almayer + - maptweak: made instances of books and magazines on the USS Almayer into actual + items + TOBKA4: + - admin: Larva surge can now be toggled per-hive with the no_burrowed var + TopHatPenguin: + - bugfix: Adds missing fire shutters to a number of key areas in the upper deck + and removes duplicate ones. + fluffe9911: + - bugfix: Zombies should no longer randomly decide to take a hour to revive. + realforest2001: + - admin: Added more ticket autoreplies and re-ordered the interaction buttons. + stanalbatross: + - spellcheck: renamed the advanced burn kit and advanced trauma kit to burn kit + and trauma kit. tweaked some first-aid kit descriptions. + - spellcheck: renamed the "Advanced XRF scanner" to "XRF scanner" +2023-05-24: + Morrow: + - rscdel: Aim mode removal + - balance: Yautja armor rebalance + c4xmaniac2: + - mapadd: added 4 new NM inserts to Science Annex + - maptweak: sentry in the park no longer terrorizes new players, and the stupid + fucking console doesn't block movement. +2023-05-26: + Drathek: + - bugfix: Fix shuttle landing lights getting stuck on + - imageadd: Added a transparent gray sprite to act as a shadow when a shuttle or + something is looming over that tile + - code_imp: Added unit_testing to annotate and fail for runtimes, added a unit_test + for 515, and improved debug information for reference lookups. + - code_imp: Moved chemistry list setup to a new reagents subsystem rather than potentially + before every reagents initialization. + - code_imp: Ported many updates to SSgarbage, SSatoms, and create_and_destroy fixing + inconsistent garbage handling, an edge case with atoms late loading, and improved + speed. + - bugfix: Fix nightmare inserts not occurring during unit testing (they will also + ignore probabilities for testing now). + - bugfix: Fix runtimes for bad deletes and various hard deletes. + - maptweak: Fix some nightmare inserts causing errors. + - server: Initialize log for errors/warnings for SSatoms is now in each round's + respective log folder. + harryob: + - bugfix: fixed some objects with icon states unassigned + - ui: the portable vendor for CLs is now tgui + spartanbobby: + - rscadd: Adds a new flavour of Kepler to the game "Kepler Flamehot" +2023-05-27: + BeagleGaming1: + - balance: Unsplinted broken bones that are not hands or feet can now cause IB + - balance: bloodbag capacity raised to 300u + Diegoflores31: + - balance: Whiskey Outpost will start on Global Hardcore mode by default. + Katskan: + - rscadd: Synthetic gets a chance to dodge xeno acid blood spray + Morrow: + - bugfix: Fixed helmets stopping all of your limbs from being delimbed + - bugfix: Fixed a runtime due to lack of cause data for head delimb + Warfan1815: + - qol: 'Two improved strip systems: the one in the player panel now doesn''t strip + IDs, and there is a new one that strips all in view.' + - qol: Removed now obsolete "cryo clf" roles from the gear list + - qol: changed multiple single letter definitions to more apt definitions + - rscadd: Added a new selection to the create-humans panel where the spawning admin + gets to choose the level of equipment ("full equipment", "no weapons", "no equipment") + - admin: made IDs exempt from being removed by the strip verbs + realforest2001: + - rscadd: Added the ability for carbon mobs to have special blood. + - code_imp: Updated the get_blood_id proc for xenos to check a variable rather than + hard-code overrides for Queen and Praetorian. + - code_imp: Changed most references to blood color to use defines. +2023-05-28: + Drathek: + - bugfix: Fixed the emergency locker sometimes hard deleting + Huffie56: + - refactor: Refactored predator flaying. Should be a lot less janky across the board. + Flaying can be paused and resumed. + - rscadd: Rope + flaying messages are now also shown to witnesses, instead of just + the predator. Flaying has been given RED TEXT to make it clear something bad + is going on. + - bugfix: Predators can no longer flay someone who has already been flayed, or queue + up multiple flayings at once. + - bugfix: Predators can no longer scalp someone who has no head. + - bugfix: Decapitated and flayed bodies no longer appear to have a head. + - bugfix: Using the ceremonial dagger or rope no longer hits people before applying. + Katskan: + - balance: synthetic pilot skill increased from 1 to 2 + LunaMayn: + - rscadd: Added dartboards and darts to throw at your friends. + NewyearnewmeUwu: + - rscadd: You can now hide small items in potted plants. + - rscadd: Fire alarms now announce who activates/deactivates them. + TenguHangover: + - rscadd: added sleen as a reagent, 1:1 lime souto and oxycodone. Slightly less + painkilling than oxy, and slightly addictive. + - rscadd: corrects oxycodone color to red dye instead of purple. + ihatethisengine: + - balance: reduced the medevac cooldown from 60 seconds to 20 seconds. + - rscadd: anyone with the skills of a doctor or a pilot can manage the medevac by + interacting with the system itself. + - qol: medical stretcher automatically activates when deployed. +2023-05-29: + Huffie56: + - bugfix: Fix Inconsistencies with text when toggling lights while being inside + a closet for example. + Khadd: + - bugfix: fixed upp synths having 2 different names and clf synths now get a name + when they're given the equipment preset + Morrow: + - balance: Without a hive core Xenos no longer get stored larva from latejoin marines + or bursts + NewyearnewmeUwu: + - rscadd: Added armor preference as an option in the preferences menu + - code_imp: Changed the way armor variation is handled upon initializing. Also, + surplus uniform vendors now use an essentials set to randomly pick an armor + set regardless of your preferences. +2023-05-30: + BeagleGaming1: + - admin: Deferring to mentorhelp gives a specific message instead of a generic resolution + message + Drathek: + - bugfix: Fixed non-queen xeno overwatch persisting on a dead xeno + LynxSolstice, Sionnach: + - rscadd: Adds a new IMP framed back item, the Ammo Rack. + - balance: Added the new Ammo Rack to the Req vendor. At a scaling of (round*1), + it should be pretty scarce. The ammo rack also is unthrowable and adds a flat + .5 second increase to movement delay. + - imageadd: Added icons for Ammo_Pack_ and onmobs for each state (0, 1, 2, and 3) + Morrow: + - rscadd: Adds buyable blood bags to corpsmen vendors + - rscadd: Adds a revive fun fact + SpartanBobby: + - rscadd: Adds Laser-Light Combo attachment unique to VP78 + - rscadd: Adds new description to VP78 + fira: + - bugfix: XvX end and Admin ending round won't play nuclear detonation sequence + music anymore. + - bugfix: Fixed a bug in radio signaling cleanup that was notably preventing signallers + from working as intended, and likely caused issues for other devices. + ghostsheet: + - rscadd: Added ARES conclusion announcement for marine major. + - rscadd: Added a harmless smoke cloud to Acid Runner's "For the Hive" ability. + - rscadd: Added a M89-S Signal Flare pack to SL essential kit. + harryob: + - bugfix: there's less random vendors on WO +2023-05-31: + BeagleGaming1: + - admin: Allows auto rename VV to not be encoded + - rscdel: Removes certain parts of the black market + Drathek: + - balance: Acid Runner's For the Hive ability now clears its slowdown effect when + canceled + - admin: USCM cryo spawns (Foxtrot) that normally inject into the manifest will + now also get their money accounts set up automatically + Huffie56: + - bugfix: trijent shuttle apc can now be properly fixed... + - maptweak: added a scenery around the fix to make it look more natural. + LynxSolstice: + - rscadd: Field kit for all roles. (spawner with a map). Sandbags and E-Tool buyable + in the rifleman vendor. + - code_imp: Moved the map from a _KIT bitflag to a new bitflag, added the fieldkit + to all squad roles. + - balance: Added half stacks of sandbags to the rifleman vendor, buyable for one + stack each for 5 points. + Morrow: + - admin: Adds logging for buying tech + - balance: Made more areas in LV522 reactor OB-able + - balance: Removes addictive from sleen + NewyearnewmeUwu: + - bugfix: You can restock vendors with armors again. + Segrain: + - bugfix: Removed an exploit involving closets/crates. + TenguHangover: + - bugfix: Corrected the nurse's starting descriptor in line with IB changes. + ihatethisengine: + - spellcheck: damage taken fun fact now correctly states that player "took" so many + damage instead of "did". + realforest2001: + - bugfix: SG vendor no longer has Burstfire Adapter as SG cannot use it diff --git a/html/changelogs/archive/2023-06.yml b/html/changelogs/archive/2023-06.yml new file mode 100644 index 000000000000..f6d3931d5272 --- /dev/null +++ b/html/changelogs/archive/2023-06.yml @@ -0,0 +1,173 @@ +2023-06-02: + Drathek: + - bugfix: Fix runtime with a timer to fade out on screen orders again? + Morrow: + - rscadd: Added tunnels to the xeno tracker + - bugfix: Fixed xeno trackers on some maps + - balance: Placed resin walls now destroy nodes underneath them. +2023-06-03: + Drathek: + - admin: Admin get log verbs now use FTP instead of run (offers save location rather + than just opening) + Khadd: + - bugfix: fix xenos being able to build over tunnels + Morrow: + - balance: Removes warrior cooldown reduction on slash + - balance: Warrior slightly lowered fling and punch cooldowns + - balance: Lowers fling stun to a micro stun and adds a slow + - balance: Decreases warrior lunge range to 4 tiles + NewyearnewmeUwu: + - bugfix: fixed armor prefs not giving the right thing + - bugfix: ERTs now use their arrivals messages. + ihatethisengine: + - spellcheck: direction tip now uses the correct order. +2023-06-04: + Huffie56: + - bugfix: remove items anchored and on the LZ's on fiorina map. + Morrow: + - rscdel: Removed field kits + - rscdel: removed recommend tag from etool/sandbags + - rscdel: Removed the change stone + fira: + - bugfix: Fixed incorrect coordinates in Admin Niche log for signal flares. +2023-06-05: + Drathek: + - admin: Fixed the force dropship verb (now known as Force Hijack) requiring the + admin to be adjacent to the console and runtiming. + - bugfix: Fixed xenos being able to use abilities on their UI; They will target + the turf under it. + - bugfix: Clients should hopefully avoid disconnection when observing someone that + is deleted. + Khadd: + - bugfix: largecrates now take damage and break if hit enough times by a projectile + - bugfix: construction nodes cant be placed inside of walls and such anymore + - bugfix: sandbags cant be fully built up with just one bag anymore + LynxSolstice: + - maptweak: Replaced the IFF locked M41As in the PMC nightmare that spawn on the + ground with the new no_lock variant. + Morrow: + - bugfix: Increases amount of survivor spawns on shivas to required level + - rscadd: Added automatic forsaken spawns groundside during hijack + NewyearnewmeUwu: + - balance: Headbite has a 10 second cooldown. + SpartanBobby: + - maptweak: LZ1 Bigred and west medical warehouse now has a glass ceiling + - maptweak: More sidewalks and pathways on big red + - maptweak: various minor turf edits to big red + - maptweak: places warning stripes tile under all doors on big red + - maptweak: adds glass ceilings to multiple fringe buildings on the outskirts of + LV624 + fira: + - bugfix: Fixed going down ASRS elevator spamming computer messages. + - bugfix: To the joy of conspiracy theorists everywhere, USCM dropships can now + be caught on tape again. +2023-06-06: + Huffie56: + - qol: increase minimum paygrade for every marines + Segrain: + - rscadd: Expanded the list of custom loadout items. + - qol: Custom loadout is now sorted into sections. + realforest2001: + - rscadd: Adds a staff to IC chat tab setting for faxes and prayers. +2023-06-07: + Morrow: + - balance: HPR is now only found in requisitions. +2023-06-08: + BeagleGaming1: + - balance: Maintenance Jack can pry flooring and do wrench surgery + Khadd: + - qol: transfer direction & rate are now listed in the description of reagent tanks + - bugfix: fixes being able to make others pick up chairs + Morrow: + - balance: Hand and feet now cannot get IB + Segrain: + - bugfix: Queen Eye no longer repeatedly throws runtime errors. + Steelpoint: + - maptweak: Fixed landing strip lights on most maps + fira: + - bugfix: Lobby Music is a bit quieter and should now stop properly when you spawn + in. + - bugfix: Fixed signallers hijacking radio headsets filters, bricking the frequency + for radio usage. They now have their own radio filter. + nauticall: + - imageadd: 'Resprited the following items: large colony floodlights, the large + colony floodlight switch, newscasters, and ATMs.' + realforest2001: + - rscadd: Adds an admin button for global blurb alerts. (Visual on game screen) + wHO_TOOKthejam: + - rscadd: gives DCC and PO the same armor choices +2023-06-09: + Al-1ce: + - bugfix: Bicaridine no-longer says it can fix IB. + - spellcheck: RR, Bica, Rezadone and Anti-Zed are now more informative about their + side effects. + Drathek: + - bugfix: Fix xenos being unable to point and marines unable to open bags with MMB + - bugfix: Fix ghosts interacting with ghost join abilities and teleporting to UI + icons. + - bugfix: Disabled xenos transferring plasma to self (it just wasted plasma) + - ui: Vanguard dash now uses a different icon state while waiting for second use + (or timeout) + fira: + - qol: Reduced USCM SG max scattering on Full Auto fire so you don't have to periodically + let go of the fire button to keep it from firing way wide. +2023-06-10: + Firartix , Thwomper and Sammy: + - rscadd: Added four types of tents to liven up FOB. They provide cold protection + and benefits depending on their type. The tents spawn in Requisitions roundstart + near the mortar. They're vulnerable to explosives and xenomorphs, and NON REPLACEABLE. + Mind where you put them! + - rscadd: The Command tent comes equipped with an overwatch console and a phone. + - rscadd: The Medical tent provides a small boost to surgery speed/pain carried + out inside it. + - rscadd: The Requisitions tent provides a restockable vendor, desk, and furniture + for organization. + - rscadd: The Big tent is just a big tent, and provides you a slate to organize + the way you want. + Huffie56: + - refactor: create many sub-type for item to clean the code. + Morrow: + - rscadd: Brought back the USCM blurb on first drop + - rscadd: Drop pouch is now buyable by riflemen + - rscadd: Reintroduced auto red alert when xenos are aboard a dropship + - rscdel: Removes fourth awkward LZ2 Soro communication relay + - balance: Burrowers are now unable to burrow while inside a non-burrow area + - rscadd: You can now find internal bleeding via Health Scanner + fira: + - rscadd: Added optional adaptive client zooming to match in-game zoom. This allows + display to be pixel perfect on most monitors if enabled, it removes blurring + of game introduced by Stretch to Fit mode, at the cost of slightly reduced vertical + size. It is best used with Auto Fit viewport feature enabled. +2023-06-11: + Al-1ce: + - spellcheck: Polykevlon no-longer uses an underscore in its name. + BeagleGaming1: + - bugfix: Acid pillars can now target crit burning friendly xenos + Morrow: + - rscadd: Forsaken ERT is now weighted by type + - bugfix: Fixed medical holocards + - rscadd: Escape pods now have a 50% chance to crash land to the surface + - bugfix: Escape pods will no longer relaunch when evacuation is complete + - rscadd: Cryopods now give a slight glow when occupied + - rscdel: Removed ability to high toss over ultra reinforced windows + - balance: Clamping bleeding in surgery is now less effective in bad conditions + - bugfix: Removed some broken forsaken ERT code + NewyearnewmeUwu: + - bugfix: fixed a bug with armor prefs +2023-06-12: + Segrain: + - rscadd: Jobs can now be assigned specific character slots, which will be automatically + loaded when joining as that role. + TheGamerdk: + - bugfix: Your fluff security record from preferences is now visible to MPs. + - bugfix: You can now plant hardy weeds on colony turfs on Chances Claim + - bugfix: Data detector no longer triggers on empty vial boxes + - bugfix: Sentries now work correctly on dropships. + - bugfix: Xenos are no longer notified each time a sister destroys a large crate. + fira: + - bugfix: Handling C4 and Breaching Charges should not zealously trigger antigrief + protection anymore + - rscadd: Added a map override for Admins allowing them to load in maps directly + as ground or ship during the next round. + ihatethisengine: + - bugfix: MMB cannot be used to attack again diff --git a/html/create_humans.html b/html/create_humans.html index a7d71e75eadb..ed9361fc6f25 100644 --- a/html/create_humans.html +++ b/html/create_humans.html @@ -18,7 +18,14 @@ Freed mob
ERT

- Search for equipment:
+ + Spawn mobs with:
+ Full Equipment
+ No Weapons
+ No Equipment +

+ + Search for equipment and skills:

diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index ace3515d2f58..692fc5e49405 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ diff --git a/icons/landmarks.dmi b/icons/landmarks.dmi index c9529c55f675..8898783f74c2 100644 Binary files a/icons/landmarks.dmi and b/icons/landmarks.dmi differ diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index fa06d7c8bc8f..fe04c9d66dc3 100644 Binary files a/icons/mob/humans/onmob/back.dmi and b/icons/mob/humans/onmob/back.dmi differ diff --git a/icons/mob/humans/onmob/suit_slot.dmi b/icons/mob/humans/onmob/suit_slot.dmi index bd6adc7ab88e..df588b9b59ca 100644 Binary files a/icons/mob/humans/onmob/suit_slot.dmi and b/icons/mob/humans/onmob/suit_slot.dmi differ diff --git a/icons/obj/items/clothing/backpacks.dmi b/icons/obj/items/clothing/backpacks.dmi index c8cb85a7914a..8dbba91502fe 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/clothing/pouches.dmi b/icons/obj/items/clothing/pouches.dmi index ca060e63b063..6a7af0d3e049 100644 Binary files a/icons/obj/items/clothing/pouches.dmi and b/icons/obj/items/clothing/pouches.dmi differ diff --git a/icons/obj/items/food.dmi b/icons/obj/items/food.dmi index 8ccdab988439..ac802dc66a9a 100644 Binary files a/icons/obj/items/food.dmi and b/icons/obj/items/food.dmi differ diff --git a/icons/obj/items/items.dmi b/icons/obj/items/items.dmi index a744ccf9f7ed..ec1209a3bf68 100644 Binary files a/icons/obj/items/items.dmi and b/icons/obj/items/items.dmi differ diff --git a/icons/obj/items/trash.dmi b/icons/obj/items/trash.dmi index 759a1d52501f..f9efbc2fadfb 100644 Binary files a/icons/obj/items/trash.dmi and b/icons/obj/items/trash.dmi differ diff --git a/icons/obj/items/weapons/grenade.dmi b/icons/obj/items/weapons/grenade.dmi index 7d648059ac88..704028b82f98 100644 Binary files a/icons/obj/items/weapons/grenade.dmi and b/icons/obj/items/weapons/grenade.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/under.dmi b/icons/obj/items/weapons/guns/attachments/under.dmi index cb9ff5107d6a..8cbf735ac96b 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/machinery/big_floodlight.dmi b/icons/obj/structures/machinery/big_floodlight.dmi index db12877f329f..b76f63956a2c 100644 Binary files a/icons/obj/structures/machinery/big_floodlight.dmi and b/icons/obj/structures/machinery/big_floodlight.dmi differ diff --git a/icons/obj/structures/machinery/computer.dmi b/icons/obj/structures/machinery/computer.dmi index e214d7bf29d9..54c99e3186d9 100644 Binary files a/icons/obj/structures/machinery/computer.dmi and b/icons/obj/structures/machinery/computer.dmi differ diff --git a/icons/obj/structures/machinery/power.dmi b/icons/obj/structures/machinery/power.dmi index a2f37647bbea..88ebf9012524 100644 Binary files a/icons/obj/structures/machinery/power.dmi and b/icons/obj/structures/machinery/power.dmi differ diff --git a/icons/obj/structures/machinery/terminals.dmi b/icons/obj/structures/machinery/terminals.dmi index ab3d80a03c42..1318babb5b22 100644 Binary files a/icons/obj/structures/machinery/terminals.dmi and b/icons/obj/structures/machinery/terminals.dmi differ diff --git a/icons/obj/structures/props/props.dmi b/icons/obj/structures/props/props.dmi index 6a2304b6d630..bd22e985b2ae 100644 Binary files a/icons/obj/structures/props/props.dmi and b/icons/obj/structures/props/props.dmi differ diff --git a/icons/obj/structures/tents_deployed_classic.dmi b/icons/obj/structures/tents_deployed_classic.dmi new file mode 100644 index 000000000000..4a7575aff833 Binary files /dev/null and b/icons/obj/structures/tents_deployed_classic.dmi differ diff --git a/icons/obj/structures/tents_deployed_desert.dmi b/icons/obj/structures/tents_deployed_desert.dmi new file mode 100644 index 000000000000..60269580d208 Binary files /dev/null and b/icons/obj/structures/tents_deployed_desert.dmi differ diff --git a/icons/obj/structures/tents_deployed_jungle.dmi b/icons/obj/structures/tents_deployed_jungle.dmi new file mode 100644 index 000000000000..429377c4d9ed Binary files /dev/null and b/icons/obj/structures/tents_deployed_jungle.dmi differ diff --git a/icons/obj/structures/tents_deployed_snow.dmi b/icons/obj/structures/tents_deployed_snow.dmi new file mode 100644 index 000000000000..106ca3f1e997 Binary files /dev/null and b/icons/obj/structures/tents_deployed_snow.dmi differ diff --git a/icons/obj/structures/tents_deployed_urban.dmi b/icons/obj/structures/tents_deployed_urban.dmi new file mode 100644 index 000000000000..a73d79eb3cbe Binary files /dev/null and b/icons/obj/structures/tents_deployed_urban.dmi differ diff --git a/icons/obj/structures/tents_equipment.dmi b/icons/obj/structures/tents_equipment.dmi new file mode 100644 index 000000000000..d1dfb64309df Binary files /dev/null and b/icons/obj/structures/tents_equipment.dmi differ diff --git a/icons/obj/structures/tents_folded.dmi b/icons/obj/structures/tents_folded.dmi new file mode 100644 index 000000000000..e9f4555ae6a1 Binary files /dev/null and b/icons/obj/structures/tents_folded.dmi differ diff --git a/icons/turf/ground_map.dmi b/icons/turf/ground_map.dmi index d5a8d73e4a04..1970ad966106 100644 Binary files a/icons/turf/ground_map.dmi and b/icons/turf/ground_map.dmi differ diff --git a/libmariadb.dll b/libmariadb.dll deleted file mode 100644 index 7472264d89b8..000000000000 Binary files a/libmariadb.dll and /dev/null differ diff --git a/libmysql.dll b/libmysql.dll deleted file mode 100644 index 746f19ef9d9f..000000000000 Binary files a/libmysql.dll and /dev/null differ diff --git a/maps/Nightmare/maps/DesertDam/nightmare.json b/maps/Nightmare/maps/DesertDam/nightmare.json index 33854cada347..e1b1e5123ac0 100644 --- a/maps/Nightmare/maps/DesertDam/nightmare.json +++ b/maps/Nightmare/maps/DesertDam/nightmare.json @@ -1,13 +1,8 @@ [ { "type": "pick", "choices": [ - { "type": "map_insert", "landmark": "green-east-bridge", "path": "greenriver/bridgerepaired.dmm" }, { "type": "map_insert", "landmark": "green-new-bridge", "path": "greenriver/newbridge.dmm" } ], "chance": 0.5 }, { "type": "pick", "choices": [ - { "weight": 1, "type": "map_insert", "landmark": "purple-center-bridge", "path": "purpleriver/bridgerepaired.dmm" }, - { "weight": 1, "type": "map_insert", "landmark": "purple-center-bridge", "path": "purpleriver/bridgedamaged.dmm" }, - { "weight": 1, "type": "map_insert", "landmark": "purple-south-bridge", "path": "purpleriver/bridgedamaged.dmm" }, - { "weight": 1, "type": "map_insert", "landmark": "purple-south-bridge", "path": "purpleriver/bridgerepaired.dmm" }, { "weight": 2, "type": "map_insert", "landmark": "purple-new-bridge", "path": "purpleriver/newbridge.dmm" } ], "chance": 0.6 }, { "type": "map_sprinkle", "path": "sprinkles/" } diff --git a/maps/Nightmare/maps/Whiskey_Outpost_v2/nightmare.json b/maps/Nightmare/maps/Whiskey_Outpost_v2/nightmare.json index 3ae3439adcc7..54c13d429c0e 100644 --- a/maps/Nightmare/maps/Whiskey_Outpost_v2/nightmare.json +++ b/maps/Nightmare/maps/Whiskey_Outpost_v2/nightmare.json @@ -1,3 +1,3 @@ [ - { "type": "map_sprinkle", "path": "map_files/Whiskey_Outpost_v2/sprinkles/" } + { "type": "map_sprinkle", "path": "sprinkles/" } ] diff --git a/maps/bigredv2.json b/maps/bigredv2.json index 26bb4ef3d6f1..ecb2e1472c57 100644 --- a/maps/bigredv2.json +++ b/maps/bigredv2.json @@ -35,6 +35,7 @@ "xeno_hive_charlie": 0, "xeno_hive_delta": 100 }, + "camouflage": "desert", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/corsat.json b/maps/corsat.json index 7b6068b2b801..e8192644054a 100644 --- a/maps/corsat.json +++ b/maps/corsat.json @@ -42,6 +42,7 @@ "xeno_hive_charlie": 0, "xeno_hive_delta": 0 }, + "camouflage": "snow", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/desert_dam.json b/maps/desert_dam.json index 792ba07d5b1d..b4e535e893d6 100644 --- a/maps/desert_dam.json +++ b/maps/desert_dam.json @@ -36,6 +36,7 @@ "xeno_hive_charlie": 0, "xeno_hive_delta": 100 }, + "camouflage": "desert", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/fiorina_sciannex.json b/maps/fiorina_sciannex.json index 4941a1c124fd..dfc73655414d 100644 --- a/maps/fiorina_sciannex.json +++ b/maps/fiorina_sciannex.json @@ -33,6 +33,7 @@ "xeno_hive_bravo": 0, "xeno_hive_charlie": 0 }, + "camouflage": "classic", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/ice_colony_v2.json b/maps/ice_colony_v2.json index 51c3d607b308..d8baaab7dcd4 100644 --- a/maps/ice_colony_v2.json +++ b/maps/ice_colony_v2.json @@ -35,6 +35,7 @@ "xeno_hive_delta": 0 }, "nightmare_path": "maps/Nightmare/maps/Ice_Colony_v2/", + "camouflage": "snow", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/kutjevo.json b/maps/kutjevo.json index f8184e048c5e..83a0ff90c575 100644 --- a/maps/kutjevo.json +++ b/maps/kutjevo.json @@ -29,6 +29,7 @@ ], "traits": [{ "Ground": true }], "nightmare_path": "maps/Nightmare/maps/Kutjevo/", + "camouflage": "desert", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/lv522_chances_claim.json b/maps/lv522_chances_claim.json index 581a2555800d..077596d14eca 100644 --- a/maps/lv522_chances_claim.json +++ b/maps/lv522_chances_claim.json @@ -37,6 +37,7 @@ "xeno_hive_charlie": 0, "xeno_hive_delta": 0 }, + "camouflage": "classic", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/lv624.json b/maps/lv624.json index 9259ab8bb3df..bec99892a347 100644 --- a/maps/lv624.json +++ b/maps/lv624.json @@ -32,6 +32,7 @@ "xeno_hive_bravo": 0, "xeno_hive_charlie": 70 }, + "camouflage": "jungle", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index bd8669081641..9153eb912a24 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -308,7 +308,7 @@ name = "\improper Spaceport" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/space_port) "aaX" = ( @@ -935,7 +935,7 @@ }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/telecomm) "acS" = ( @@ -1054,7 +1054,9 @@ /area/bigredv2/outside/marshal_office) "adi" = ( /obj/item/shard, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "adj" = ( /obj/item/shard, @@ -1358,7 +1360,7 @@ name = "\improper Telecommunications" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/telecomm) "aed" = ( @@ -1441,8 +1443,7 @@ name = "\improper Marshal Office Prison" }, /turf/open/floor{ - dir = 5; - icon_state = "whitegreenfull" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "aen" = ( @@ -1452,8 +1453,7 @@ name = "\improper Marshal Office Prison" }, /turf/open/floor{ - dir = 5; - icon_state = "whitegreenfull" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "aeo" = ( @@ -1462,7 +1462,7 @@ name = "\improper Marshal Office Prison Toilet" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "aep" = ( @@ -1718,17 +1718,6 @@ /obj/structure/window/framed/solaris/reinforced, /turf/open/floor/plating, /area/bigredv2/caves/lambda/xenobiology) -"afe" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/obj/structure/machinery/door/poddoor/almayer/closed{ - id = "eta"; - name = "Eta Lockdown" - }, -/turf/open/floor{ - dir = 4; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lz2_south_cas) "aff" = ( /obj/effect/decal/cleanable/mucus, /obj/structure/surface/table, @@ -1990,8 +1979,7 @@ name = "\improper Marshal Office Prison" }, /turf/open/floor{ - dir = 5; - icon_state = "whitegreenfull" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "afQ" = ( @@ -2002,8 +1990,7 @@ name = "\improper Marshal Office Prison" }, /turf/open/floor{ - dir = 5; - icon_state = "whitegreenfull" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "afR" = ( @@ -2088,7 +2075,9 @@ dir = 1; name = "\improper Lambda Lab Storage" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/lambda/xenobiology) "agf" = ( /obj/structure/surface/table/reinforced, @@ -2110,7 +2099,7 @@ name = "\improper Lambda Lab Chemistry Lab" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/xenobiology) "agh" = ( @@ -2170,32 +2159,23 @@ }, /area/bigredv2/outside/space_port) "agq" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, /turf/open/floor{ dir = 9; icon_state = "asteroidwarning" }, -/area/bigredv2/outside/space_port) +/area/bigredv2/outside/n) "agr" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, +/turf/open/floor/plating, /area/bigredv2/outside/space_port) "ags" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, /turf/open/floor{ dir = 5; icon_state = "asteroidwarning" }, -/area/bigredv2/outside/space_port) +/area/bigredv2/outside/n) "agt" = ( /obj/structure/surface/table/woodentable/fancy, /turf/open/floor{ @@ -2317,7 +2297,7 @@ name = "\improper Marshal Head Office" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "agK" = ( @@ -2341,7 +2321,7 @@ name = "\improper Lambda Lab Surgery" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/xenobiology) "agN" = ( @@ -2473,7 +2453,7 @@ dir = 8; icon_state = "asteroidwarning" }, -/area/bigredv2/outside/space_port) +/area/bigredv2/outside/n) "ahf" = ( /obj/structure/surface/table, /turf/open/floor, @@ -2611,7 +2591,7 @@ name = "\improper Lambda Lab Surgery" }, /turf/open/floor{ - icon_state = "darkpurple2" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/xenobiology) "ahC" = ( @@ -2674,9 +2654,9 @@ /area/bigredv2/caves/lambda/xenobiology) "ahK" = ( /turf/open/floor{ - icon_state = "darkish" + icon_state = "delivery" }, -/area/bigredv2/caves/lambda/xenobiology) +/area/bigredv2/outside/space_port) "ahL" = ( /turf/open/floor{ dir = 4; @@ -2689,7 +2669,7 @@ name = "\improper Lambda Lab Cell" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/xenobiology) "ahN" = ( @@ -2718,11 +2698,11 @@ }, /area/bigredv2/outside/nw) "ahS" = ( -/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/n) "ahT" = ( /turf/open/floor{ dir = 6; @@ -2743,7 +2723,9 @@ "ahW" = ( /obj/item/stack/rods, /obj/effect/decal/cleanable/dirt, -/turf/open/mars, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/nw) "ahX" = ( /obj/effect/decal/cleanable/dirt, @@ -2753,13 +2735,17 @@ /obj/item/stack/sheet/metal, /obj/item/stack/rods, /obj/effect/decal/cleanable/dirt, -/turf/open/mars, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/nw) "ahZ" = ( /obj/item/stack/rods, /obj/item/stack/rods, /obj/effect/decal/cleanable/dirt, -/turf/open/mars, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/nw) "aia" = ( /obj/structure/machinery/door_control{ @@ -2817,7 +2803,7 @@ name = "\improper Marshal Office Armory" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "aii" = ( @@ -2825,7 +2811,9 @@ dir = 1; name = "\improper Marshal Office Equipment" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "aij" = ( /obj/effect/landmark/hunter_secondary, @@ -2866,7 +2854,9 @@ dir = 1; name = "\improper Lambda Lab Maintenance" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/lambda/xenobiology) "aio" = ( /turf/open/floor{ @@ -3066,7 +3056,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Marshal Office" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "aiR" = ( /obj/structure/machinery/light{ @@ -3081,7 +3073,7 @@ /obj/effect/landmark/corpsespawner/scientist, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/caves/lambda/xenobiology) "aiT" = ( @@ -3096,7 +3088,7 @@ name = "\improper Lambda Lab Prison Restroom" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/xenobiology) "aiV" = ( @@ -3251,7 +3243,7 @@ name = "\improper Lambda Lab Prisoner Room" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/xenobiology) "ajs" = ( @@ -3399,7 +3391,7 @@ name = "\improper Marshal Office Armory" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "ajL" = ( @@ -3457,8 +3449,8 @@ /turf/open/floor, /area/bigredv2/outside/marshal_office) "ajT" = ( +/obj/structure/barricade/wooden, /turf/open/floor{ - dir = 5; icon_state = "asteroidwarning" }, /area/bigredv2/outside/n) @@ -3637,7 +3629,9 @@ name = "\improper Marshal Office" }, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "akw" = ( /obj/effect/decal/cleanable/dirt, @@ -3785,7 +3779,9 @@ dir = 1; name = "\improper Marshal Office" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "akS" = ( /obj/structure/bed/chair, @@ -3927,7 +3923,7 @@ name = "\improper Marshal Office Evidence Room" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "alq" = ( @@ -4192,8 +4188,7 @@ dir = 4 }, /turf/open/floor{ - dir = 8; - icon_state = "red" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "ame" = ( @@ -4290,7 +4285,9 @@ /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ name = "\improper Marshal Office Courtroom" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "amu" = ( /obj/structure/bed/chair{ @@ -4524,8 +4521,7 @@ name = "\improper Marshal Office" }, /turf/open/floor{ - dir = 8; - icon_state = "red" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "anb" = ( @@ -4627,11 +4623,13 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Lambda Lab Maintenance Storage" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/lambda/xenobiology) "anp" = ( /turf/closed/wall/solaris/reinforced, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "anq" = ( /obj/structure/machinery/light{ dir = 8 @@ -4690,7 +4688,7 @@ name = "\improper Marshal Office Holding Cell" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "any" = ( @@ -4699,8 +4697,7 @@ name = "\improper Marshal Office Checkpoint" }, /turf/open/floor{ - dir = 9; - icon_state = "redfull" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "anz" = ( @@ -4709,7 +4706,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Marshal Office" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "anB" = ( /obj/structure/machinery/light{ @@ -5252,7 +5251,9 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Dormitories EVA Maintenance" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/general_offices) "apk" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -5278,7 +5279,7 @@ name = "\improper Dormitories EVA" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/general_offices) "apn" = ( @@ -5404,15 +5405,13 @@ name = "\improper Medical Clinic" }, /turf/open/floor{ - dir = 1; - icon_state = "warnwhite" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "apF" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - dir = 1; - icon_state = "warnwhite" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "apG" = ( @@ -5423,7 +5422,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Marshal Office" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "apI" = ( /turf/closed/wall/solaris/reinforced/hull, @@ -5455,7 +5456,7 @@ name = "\improper Dormitories Lavatory" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/general_offices) "apN" = ( @@ -5795,7 +5796,8 @@ dir = 5 }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/n) "aqH" = ( @@ -5807,28 +5809,23 @@ }, /area/bigredv2/outside/n) "aqI" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, /turf/open/floor{ dir = 6; icon_state = "asteroidwarning" }, /area/bigredv2/outside/n) "aqJ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, +/obj/effect/decal/cleanable/dirt, /turf/open/mars_cave{ icon_state = "mars_dirt_4" }, -/area/bigredv2/outside/n) +/area/bigredv2/outside/nw) "aqK" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/mars_cave{ - icon_state = "mars_dirt_4" +/turf/open/floor{ + icon_state = "asteroidwarning" }, /area/bigredv2/outside/n) "aqL" = ( @@ -5837,8 +5834,8 @@ }, /area/bigredv2/outside/n) "aqM" = ( -/turf/open/mars{ - icon_state = "mars_dirt_12" +/turf/open/floor{ + icon_state = "asteroidwarning" }, /area/bigredv2/outside/n) "aqN" = ( @@ -5848,7 +5845,9 @@ health = 25000 }, /obj/structure/barricade/wooden, -/turf/open/mars, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/n) "aqO" = ( /obj/structure/barricade/wooden, @@ -6300,14 +6299,9 @@ icon_state = "mars_dirt_9" }, /area/bigredv2/outside/n) -"asb" = ( -/turf/open/mars{ - icon_state = "mars_dirt_11" - }, -/area/bigredv2/outside/n) "asc" = ( /turf/open/floor{ - dir = 9; + dir = 1; icon_state = "asteroidwarning" }, /area/bigredv2/outside/n) @@ -6327,9 +6321,9 @@ }, /area/bigredv2/outside/n) "asf" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden, /turf/open/floor{ - dir = 5; + dir = 4; icon_state = "asteroidwarning" }, /area/bigredv2/outside/n) @@ -6344,7 +6338,10 @@ dir = 8; health = 25000 }, -/turf/open/mars, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/n) "ash" = ( /obj/structure/barricade/wooden{ @@ -6352,7 +6349,10 @@ dir = 1; health = 25000 }, -/turf/open/mars, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/n) "asi" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -6360,7 +6360,9 @@ dir = 1; name = "\improper Dormitories Tool Storage Maintenance" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/general_offices) "asj" = ( /obj/structure/window/framed/solaris, @@ -6377,7 +6379,7 @@ name = "\improper Dormitories EVA" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/general_offices) "asl" = ( @@ -6755,12 +6757,12 @@ }, /area/bigredv2/caves_lambda) "atl" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden, /turf/open/floor{ - dir = 9; + dir = 8; icon_state = "asteroidwarning" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/n) "atm" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -6925,8 +6927,7 @@ name = "\improper Lambda Lab Secure Storage" }, /turf/open/floor{ - dir = 1; - icon_state = "elevatorshaft" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/breakroom) "atJ" = ( @@ -6943,7 +6944,9 @@ dir = 1; name = "\improper Lambda Lab Administration Office" }, -/turf/open/floor/wood, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/lambda/breakroom) "atL" = ( /obj/structure/bed/chair{ @@ -7030,7 +7033,7 @@ name = "\improper Medical Clinic CMO's Office" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "atW" = ( @@ -7040,7 +7043,7 @@ name = "\improper Medical Clinic Morgue" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "atX" = ( @@ -7063,7 +7066,7 @@ name = "\improper Dormitories Bedroom" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/dorms) "aua" = ( @@ -7150,7 +7153,9 @@ /obj/structure/machinery/door/airlock/almayer/research/glass/colony{ name = "\improper Lambda Lab Administration Office" }, -/turf/open/floor/wood, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/lambda/breakroom) "aun" = ( /obj/structure/closet/firecloset/full, @@ -7290,12 +7295,12 @@ }, /area/bigredv2/caves/lambda/breakroom) "auE" = ( -/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 1; + dir = 8; icon_state = "asteroidwarning" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/n) "auF" = ( /turf/open/floor{ dir = 5; @@ -7408,20 +7413,22 @@ name = "\improper Dormitories Bedroom" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/dorms) "auV" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Dormitories Tool Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/general_offices) "auW" = ( /turf/closed/wall/solaris/reinforced/hull, /area/bigredv2/outside/c) "auX" = ( -/obj/structure/window/framed/solaris/reinforced/hull, +/obj/structure/window/framed/solaris/reinforced, /turf/open/floor/plating, /area/bigredv2/outside/c) "auY" = ( @@ -7476,7 +7483,7 @@ name = "\improper Lambda Lab Administration Wing" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/breakroom) "avf" = ( @@ -7584,26 +7591,19 @@ /obj/structure/window_frame/solaris, /turf/open/floor/plating, /area/bigredv2/outside/office_complex) -"avs" = ( -/turf/open/floor/plating{ - dir = 1; - icon_state = "warnplate" - }, -/area/bigredv2/outside/nw) "avt" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/plating{ - dir = 1; - icon_state = "warnplate" +/turf/open/floor{ + icon_state = "delivery" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "avu" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ dir = 1; name = "\improper Medical Clinic Chemistry" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "avv" = ( @@ -7732,7 +7732,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{ name = "\improper Lambda Lab Relaxation Room" }, -/turf/open/floor/wood, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/lambda/breakroom) "avP" = ( /obj/structure/machinery/light{ @@ -7769,17 +7771,17 @@ /area/bigredv2/outside/office_complex) "avT" = ( /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "avU" = ( /obj/structure/machinery/light{ dir = 1 }, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "avV" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "avW" = ( /obj/structure/surface/table, /obj/item/trash/burger, @@ -7891,7 +7893,7 @@ name = "\improper Medical Clinic Scanner Room" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "awk" = ( @@ -8211,7 +8213,9 @@ dir = 1; name = "\improper Dormitories" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/dorms) "axi" = ( /obj/structure/machinery/light, @@ -8311,11 +8315,10 @@ }, /area/bigredv2/outside/nw) "axv" = ( -/turf/open/floor/plating{ - dir = 8; - icon_state = "warnplate" +/turf/open/floor{ + icon_state = "delivery" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "axw" = ( /obj/structure/surface/table, /obj/item/storage/firstaid/adv, @@ -8336,7 +8339,7 @@ name = "\improper Medical Clinic Treatment" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "axz" = ( @@ -8382,7 +8385,10 @@ "axF" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden, -/turf/open/mars, +/turf/open/floor{ + dir = 4; + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/n) "axG" = ( /obj/structure/machinery/camera/autoname{ @@ -8461,7 +8467,7 @@ name = "\improper Dormitories Bedroom" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/general_offices) "axS" = ( @@ -8469,7 +8475,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Dormitories" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/general_offices) "axT" = ( /obj/effect/landmark/xeno_spawn, @@ -8490,14 +8498,11 @@ }, /area/bigredv2/caves_lambda) "axW" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, /turf/open/floor{ - dir = 8; + dir = 6; icon_state = "asteroidwarning" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/c) "axX" = ( /turf/closed/wall/solaris/reinforced, /area/bigredv2/outside/engineering) @@ -8505,28 +8510,27 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor/plating{ - dir = 8; - icon_state = "warnplate" +/turf/open/floor{ + icon_state = "delivery" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "axZ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "aya" = ( /obj/effect/landmark/hunter_primary, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "ayb" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "ayc" = ( /obj/structure/window/framed/solaris/reinforced/hull, /turf/open/floor/plating, @@ -8540,7 +8544,7 @@ name = "\improper Medical Clinic" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "aye" = ( @@ -8794,8 +8798,7 @@ /area/bigredv2/outside/medical) "ayN" = ( /turf/open/floor{ - dir = 4; - icon_state = "warnwhite" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "ayO" = ( @@ -8986,11 +8989,11 @@ dir = 8 }, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "azo" = ( /obj/structure/cargo_container/horizontal/blue/top, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "azp" = ( /obj/structure/bed/roller, /obj/effect/decal/cleanable/blood, @@ -9083,8 +9086,7 @@ name = "\improper Medical Clinic Treatment" }, /turf/open/floor{ - dir = 4; - icon_state = "warnwhite" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "azA" = ( @@ -9141,9 +9143,8 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Medical Clinic Power Station" }, -/turf/open/floor/plating{ - dir = 8; - icon_state = "warnplate" +/turf/open/floor{ + icon_state = "delivery" }, /area/bigredv2/outside/medical) "azK" = ( @@ -9270,7 +9271,9 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Bar Maintenance" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/dorms) "aAd" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -9350,14 +9353,14 @@ "aAq" = ( /obj/structure/cargo_container/horizontal/blue/middle, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "aAr" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ - name = "\improper Medical Clinic Operating Theatre"; - dir = 2 + dir = 2; + name = "\improper Medical Clinic Operating Theatre" }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "aAs" = ( @@ -9443,7 +9446,7 @@ name = "\improper Dormitories Restroom" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/dorms) "aAE" = ( @@ -9452,7 +9455,7 @@ name = "\improper Recreation" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/dorms) "aAF" = ( @@ -9602,11 +9605,11 @@ "aAZ" = ( /obj/structure/cargo_container/horizontal/blue/bottom, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "aBa" = ( /obj/structure/machinery/light, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "aBb" = ( /obj/structure/bed/chair, /turf/open/floor{ @@ -9634,7 +9637,7 @@ name = "\improper Medical Clinic" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "aBf" = ( @@ -9776,7 +9779,9 @@ dir = 1; name = "\improper Greenhouse" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/hydroponics) "aBy" = ( /obj/structure/window/framed/solaris/reinforced, @@ -9905,8 +9910,9 @@ /turf/open/mars, /area/bigredv2/outside/c) "aBS" = ( +/obj/effect/landmark/hunter_secondary, /turf/open/floor{ - dir = 9; + dir = 4; icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) @@ -9914,7 +9920,9 @@ /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Dormitories Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/dorms) "aBU" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -10052,7 +10060,9 @@ /area/bigredv2/caves/lambda/research) "aCr" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/engine, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/lambda/research) "aCs" = ( /obj/effect/decal/warning_stripes{ @@ -10111,14 +10121,10 @@ }, /area/bigredv2/caves/lambda/research) "aCy" = ( -/obj/structure/machinery/door/airlock/almayer/research/glass/colony{ - dir = 1; - name = "\improper Lambda Lab Anomaly Chamber" - }, /turf/open/floor{ - icon_state = "podhatchfloor" + icon_state = "delivery" }, -/area/bigredv2/caves/lambda/research) +/area/bigredv2/caves/lambda/xenobiology) "aCz" = ( /obj/structure/machinery/power/port_gen/pacman, /obj/effect/decal/warning_stripes{ @@ -10158,7 +10164,7 @@ name = "\improper Medical Clinic Storage" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "aCD" = ( @@ -10193,7 +10199,7 @@ name = "\improper Medical Clinic Storage" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "aCH" = ( @@ -10245,7 +10251,7 @@ name = "\improper Dormitories Restroom" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/dorms) "aCR" = ( @@ -10275,7 +10281,9 @@ dir = 1; name = "\improper Bar Maintenance" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/bar) "aCV" = ( /obj/effect/landmark/hunter_primary, @@ -10348,7 +10356,7 @@ name = "\improper Library Backroom" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/library) "aDg" = ( @@ -10493,9 +10501,9 @@ }, /turf/open/floor{ dir = 1; - icon_state = "asteroidwarning" + icon_state = "asteroidfloor" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/e) "aDz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green{ @@ -10503,7 +10511,7 @@ }, /turf/open/floor{ dir = 1; - icon_state = "asteroidwarning" + icon_state = "asteroidfloor" }, /area/bigredv2/outside/nw) "aDA" = ( @@ -10511,7 +10519,7 @@ dir = 10 }, /turf/open/floor{ - dir = 5; + dir = 4; icon_state = "asteroidwarning" }, /area/bigredv2/outside/nw) @@ -10696,7 +10704,7 @@ name = "\improper Bar Backroom" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/bar) "aEa" = ( @@ -10964,7 +10972,7 @@ name = "\improper Dormitories Toilet" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/dorms) "aEO" = ( @@ -11233,7 +11241,7 @@ name = "\improper Medical Clinic Operating Theatre" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "aFB" = ( @@ -11332,7 +11340,9 @@ /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Dormitories Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/dorms) "aFP" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -11428,7 +11438,9 @@ dir = 1; name = "\improper Greenhouse Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/hydroponics) "aGb" = ( /obj/effect/decal/cleanable/dirt, @@ -11445,7 +11457,7 @@ name = "\improper Greenhouse Storage" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/library) "aGd" = ( @@ -11685,7 +11697,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Dormitories" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/dorms) "aGG" = ( /obj/structure/surface/table/woodentable, @@ -11762,7 +11776,8 @@ dir = 1 }, /turf/open/floor{ - icon_state = "darkish" + dir = 4; + icon_state = "darkpurplecorners2" }, /area/bigredv2/caves/lambda/research) "aGV" = ( @@ -12045,7 +12060,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Kitchen Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/hydroponics) "aHM" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -12076,7 +12093,8 @@ /area/bigredv2/caves/lambda/research) "aHQ" = ( /turf/open/floor{ - icon_state = "darkish" + dir = 4; + icon_state = "darkpurplecorners2" }, /area/bigredv2/caves/lambda/research) "aHR" = ( @@ -12208,8 +12226,7 @@ name = "Virology Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "aIi" = ( @@ -12430,7 +12447,7 @@ dir = 1 }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/caves/lambda/research) "aIP" = ( @@ -12629,7 +12646,7 @@ name = "\improper Medical Clinic" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "aJm" = ( @@ -12677,7 +12694,7 @@ name = "\improper Bar Backroom" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/bar) "aJs" = ( @@ -12694,17 +12711,6 @@ icon_state = "freezerfloor" }, /area/bigredv2/outside/hydroponics) -"aJu" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Kitchen Storage" - }, -/turf/open/floor{ - icon_state = "freezerfloor" - }, -/area/bigredv2/outside/hydroponics) "aJv" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -12733,7 +12739,7 @@ "aJy" = ( /obj/structure/surface/table/woodentable, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "aJz" = ( @@ -12744,7 +12750,7 @@ name = "\improper Kitchen Storage" }, /turf/open/floor{ - icon_state = "yellowfull" + icon_state = "delivery" }, /area/bigredv2/outside/hydroponics) "aJA" = ( @@ -13044,8 +13050,8 @@ pixel_x = 32 }, /turf/open/floor{ - dir = 8; - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aKn" = ( @@ -13072,8 +13078,8 @@ pixel_x = -32 }, /turf/open/floor{ - dir = 4; - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aKr" = ( @@ -13353,7 +13359,7 @@ name = "\improper Medical Command Complex" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aLf" = ( @@ -13792,8 +13798,7 @@ name = "\improper Lambda Lab" }, /turf/open/floor{ - dir = 8; - icon_state = "darkpurple2" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/research) "aMr" = ( @@ -13869,17 +13874,6 @@ icon_state = "whitegreen" }, /area/bigredv2/caves/lambda/virology) -"aMA" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/research/colony{ - dir = 1; - name = "\improper Virology Lab Decontamination" - }, -/turf/open/floor{ - dir = 1; - icon_state = "warnwhite" - }, -/area/bigredv2/outside/virology) "aMB" = ( /obj/structure/surface/table, /obj/effect/decal/cleanable/dirt, @@ -13896,7 +13890,9 @@ dir = 1; name = "\improper General Store" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/general_store) "aMF" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -13904,7 +13900,7 @@ name = "\improper Operations" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aMG" = ( @@ -14146,12 +14142,6 @@ "aNo" = ( /turf/open/floor, /area/bigredv2/outside/general_store) -"aNp" = ( -/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ - name = "\improper General Store" - }, -/turf/open/floor, -/area/bigredv2/outside/general_store) "aNq" = ( /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..."; @@ -14295,7 +14285,7 @@ dir = 4 }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aNI" = ( @@ -14717,7 +14707,7 @@ name = "\improper Operations Bedroom" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aOO" = ( @@ -14764,7 +14754,9 @@ dir = 1; name = "\improper Crew Habitation Complex" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/hydroponics) "aOV" = ( /obj/structure/bed/chair{ @@ -14980,7 +14972,7 @@ name = "\improper Virology Lab Decontamination" }, /turf/open/floor{ - icon_state = "warnwhite" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "aPu" = ( @@ -15657,7 +15649,6 @@ /area/bigredv2/outside/admin_building) "aRf" = ( /obj/structure/surface/table, -/obj/item/changestone, /turf/open/floor{ icon_state = "wood" }, @@ -15722,7 +15713,7 @@ name = "\improper Bar" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/bar) "aRp" = ( @@ -15731,7 +15722,7 @@ name = "\improper Kitchen" }, /turf/open/floor{ - icon_state = "yellowfull" + icon_state = "delivery" }, /area/bigredv2/outside/hydroponics) "aRq" = ( @@ -15763,7 +15754,7 @@ name = "\improper Library" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/library) "aRv" = ( @@ -16006,21 +15997,25 @@ dir = 1; name = "\improper Operations EVA" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/admin_building) "aSc" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Bar" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/bar) "aSe" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Kitchen" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/hydroponics) "aSf" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -16170,7 +16165,7 @@ name = "\improper Virology Lab Cell" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "aSB" = ( @@ -16316,7 +16311,7 @@ name = "\improper General Store Security" }, /turf/open/floor{ - icon_state = "yellowfull" + icon_state = "delivery" }, /area/bigredv2/outside/general_store) "aSQ" = ( @@ -16325,7 +16320,7 @@ name = "\improper Operations" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aSR" = ( @@ -16419,8 +16414,8 @@ "aTe" = ( /obj/effect/decal/cleanable/blood/gibs/xeno/limb, /turf/open/floor{ - dir = 10; - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aTf" = ( @@ -16428,7 +16423,8 @@ dir = 5 }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aTg" = ( @@ -16439,8 +16435,8 @@ dir = 4 }, /turf/open/floor{ - dir = 6; - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aTh" = ( @@ -16456,7 +16452,8 @@ dir = 1 }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aTj" = ( @@ -16465,7 +16462,8 @@ dir = 4 }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aTk" = ( @@ -16482,7 +16480,8 @@ dir = 4 }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/e) "aTo" = ( @@ -16515,12 +16514,10 @@ }, /area/bigredv2/outside/e) "aTs" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" + icon_state = "delivery" }, -/area/bigredv2/outside/e) +/area/bigred/ground/garage_workshop) "aTt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, @@ -16810,8 +16807,9 @@ /area/bigredv2/outside/c) "aUi" = ( /obj/effect/decal/cleanable/blood/xeno, -/turf/open/mars_cave{ - icon_state = "mars_dirt_4" +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aUk" = ( @@ -16893,8 +16891,7 @@ name = "Lambda Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/lambda_cave_cas) "aUv" = ( @@ -16917,8 +16914,7 @@ name = "Lambda Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/lambda_cave_cas) "aUx" = ( @@ -17038,9 +17034,10 @@ }, /area/bigredv2/outside/virology) "aUQ" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 9; - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/w) "aUS" = ( @@ -17221,8 +17218,9 @@ /area/bigredv2/outside/admin_building) "aVn" = ( /obj/effect/landmark/hunter_primary, -/turf/open/mars{ - icon_state = "mars_dirt_10" +/turf/open/floor{ + dir = 9; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) "aVo" = ( @@ -17365,7 +17363,7 @@ name = "\improper General Store" }, /turf/open/floor{ - icon_state = "bar" + icon_state = "delivery" }, /area/bigredv2/outside/general_store) "aVK" = ( @@ -17645,7 +17643,9 @@ dir = 1; name = "\improper Operations Armory" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/admin_building) "aWD" = ( /obj/structure/machinery/computer3/server, @@ -17684,7 +17684,7 @@ /area/bigredv2/outside/admin_building) "aWI" = ( /turf/open/floor{ - dir = 6; + dir = 9; icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) @@ -17734,7 +17734,7 @@ name = "\improper Virology Lab Chemistry" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "aWQ" = ( @@ -17793,11 +17793,12 @@ }, /area/bigredv2/outside/w) "aWW" = ( +/obj/effect/landmark/crap_item, /turf/open/floor{ - dir = 10; + dir = 1; icon_state = "asteroidwarning" }, -/area/bigredv2/outside/w) +/area/bigredv2/outside/c) "aWX" = ( /obj/structure/surface/table, /obj/item/toy/prize/ripley, @@ -17901,7 +17902,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Office Complex" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/office_complex) "aXr" = ( /turf/open/floor, @@ -17929,7 +17932,7 @@ name = "\improper Virology Lab Cell" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "aXy" = ( @@ -18089,8 +18092,9 @@ }, /area/bigredv2/outside/e) "aXY" = ( -/turf/open/mars{ - icon_state = "mars_dirt_3" +/turf/open/floor{ + dir = 10; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/w) "aXZ" = ( @@ -18099,7 +18103,9 @@ dir = 1; name = "\improper General Store Maintenance" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/general_store) "aYc" = ( /obj/structure/machinery/light, @@ -18149,7 +18155,7 @@ name = "\improper Operations Office" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aYo" = ( @@ -18157,7 +18163,7 @@ name = "\improper Operations Toilet" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aYp" = ( @@ -18406,12 +18412,12 @@ name = "\improper Chapel" }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "delivery" }, /area/bigredv2/outside/chapel) "aZi" = ( /turf/open/floor{ - icon_state = "darkish" + icon_state = "delivery" }, /area/bigredv2/outside/chapel) "aZj" = ( @@ -18431,7 +18437,7 @@ name = "\improper Virology Lab Decontamination" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "aZl" = ( @@ -18569,7 +18575,7 @@ dir = 6 }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "aZK" = ( @@ -18577,7 +18583,7 @@ dir = 9 }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "aZL" = ( @@ -18586,7 +18592,9 @@ dir = 1; name = "\improper General Store Maintenance" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "aZM" = ( /obj/effect/landmark/crap_item, @@ -18682,8 +18690,8 @@ "baa" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor{ - dir = 8; - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "bac" = ( @@ -18875,7 +18883,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ name = "\improper Operations" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/admin_building) "baJ" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -19000,7 +19010,9 @@ dir = 1; name = "\improper Cargo Bay" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bbh" = ( /obj/effect/landmark/survivor_spawner, @@ -19204,13 +19216,13 @@ dir = 4 }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "bbG" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "bbH" = ( @@ -19219,7 +19231,7 @@ }, /obj/effect/landmark/crap_item, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "bbI" = ( @@ -19227,7 +19239,7 @@ dir = 8 }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "bbJ" = ( @@ -19235,22 +19247,6 @@ icon_state = "mars_dirt_14" }, /area/bigredv2/outside/w) -"bbK" = ( -/turf/open/floor{ - dir = 9; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/cargo) -"bbL" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/cargo) "bbM" = ( /obj/structure/machinery/camera/autoname{ dir = 4 @@ -19396,7 +19392,9 @@ dir = 1; name = "\improper Private Office" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/office_complex) "bcl" = ( /obj/structure/bed/chair/wood/normal{ @@ -19429,14 +19427,15 @@ /area/bigredv2/outside/w) "bcq" = ( /obj/effect/landmark/crap_item, -/turf/open/mars{ - icon_state = "mars_dirt_10" +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/w) "bcr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 8; + dir = 1; icon_state = "asteroidwarning" }, /area/bigredv2/outside/cargo) @@ -19453,7 +19452,10 @@ dir = 8; health = 25000 }, -/turf/open/floor/plating, +/turf/open/floor{ + dir = 4; + icon_state = "loadingarea" + }, /area/bigredv2/outside/cargo) "bcu" = ( /obj/structure/barricade/wooden{ @@ -19523,7 +19525,9 @@ dir = 1; name = "\improper Cargo Bay Offices" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bcE" = ( /obj/structure/surface/table, @@ -19588,7 +19592,7 @@ name = "\improper Operations Office" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "bcL" = ( @@ -19729,7 +19733,9 @@ dir = 1; name = "\improper Cargo Bay Offices" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bdk" = ( /obj/effect/landmark/crap_item, @@ -19756,7 +19762,9 @@ /obj/structure/machinery/door/airlock/almayer/command/colony{ name = "\improper Operations Meeting Room" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/admin_building) "bdo" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -19844,7 +19852,9 @@ /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Private Office" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/office_complex) "bdD" = ( /obj/structure/machinery/light{ @@ -19869,13 +19879,13 @@ "bdF" = ( /obj/structure/machinery/light, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "bdG" = ( /obj/structure/machinery/power/apc, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "bdI" = ( @@ -19884,7 +19894,7 @@ pixel_y = -30 }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "bdK" = ( @@ -20002,11 +20012,15 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ name = "\improper Operations" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/admin_building) "bek" = ( /obj/structure/machinery/deployable/barrier, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/admin_building) "bel" = ( /obj/structure/machinery/autolathe, @@ -20025,7 +20039,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Robotics" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/office_complex) "bep" = ( /turf/open/floor{ @@ -20056,20 +20072,17 @@ "beu" = ( /obj/effect/landmark/hunter_primary, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "asteroidwarning" }, /area/bigredv2/outside/w) "bev" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "asteroidwarning" }, /area/bigredv2/outside/w) "bew" = ( /turf/open/floor{ - dir = 8; icon_state = "asteroidwarning" }, /area/bigredv2/outside/cargo) @@ -20118,7 +20131,8 @@ dir = 9 }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "beF" = ( @@ -20186,8 +20200,8 @@ /area/bigredv2/outside/office_complex) "beP" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - icon_state = "asteroidwarning" +/turf/open/mars_cave{ + icon_state = "mars_dirt_4" }, /area/bigredv2/outside/w) "beQ" = ( @@ -20196,9 +20210,8 @@ }, /area/bigredv2/outside/w) "beR" = ( -/turf/open/floor{ - dir = 10; - icon_state = "asteroidwarning" +/turf/open/mars_cave{ + icon_state = "mars_dirt_4" }, /area/bigredv2/outside/cargo) "beS" = ( @@ -20207,6 +20220,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ + dir = 8; icon_state = "asteroidwarning" }, /area/bigredv2/outside/cargo) @@ -20226,10 +20240,13 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Cargo Offices" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "beW" = ( /obj/structure/machinery/computer/cameras, +/obj/structure/surface/table, /turf/open/floor, /area/bigredv2/outside/cargo) "beX" = ( @@ -20314,7 +20331,9 @@ /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Office Complex Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/office_complex) "bfj" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -20552,8 +20571,7 @@ name = "\improper Office Complex Janitor Room" }, /turf/open/floor{ - dir = 4; - icon_state = "whiteyellowfull" + icon_state = "delivery" }, /area/bigredv2/outside/office_complex) "bfR" = ( @@ -20620,7 +20638,9 @@ /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ name = "\improper Cargo Bay Security" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bgb" = ( /obj/structure/surface/table, @@ -21185,25 +21205,19 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, +/turf/open/mars, /area/bigredv2/outside/c) "bhP" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, +/turf/open/mars, /area/bigredv2/outside/c) "bhQ" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + dir = 8; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) "bhR" = ( @@ -21219,9 +21233,8 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/floor{ - dir = 5; - icon_state = "asteroidwarning" +/turf/open/mars{ + icon_state = "mars_dirt_12" }, /area/bigredv2/outside/c) "bhT" = ( @@ -21229,13 +21242,15 @@ icon_state = "gib6" }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "bhU" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "bhX" = ( @@ -21334,7 +21349,9 @@ dir = 4; health = 25000 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bix" = ( /obj/structure/closet/secure_closet/freezer/fridge, @@ -21374,13 +21391,17 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Office Complex" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/office_complex) "biE" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Office Complex Janitor Room" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/office_complex) "biH" = ( /obj/structure/machinery/landinglight/ds2{ @@ -21432,8 +21453,7 @@ dir = 5 }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) "biT" = ( @@ -21468,7 +21488,7 @@ "biY" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - dir = 4; + dir = 1; icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) @@ -21717,7 +21737,9 @@ dir = 1; name = "\improper Cargo Bay Quartermaster" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bjX" = ( /turf/open/floor/plating{ @@ -21730,11 +21752,12 @@ }, /area/bigredv2/outside/s) "bjZ" = ( +/obj/structure/barricade/wooden, /turf/open/floor{ - dir = 6; - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, -/area/bigredv2/outside/s) +/area/bigredv2/outside/c) "bka" = ( /turf/open/mars{ icon_state = "mars_dirt_3" @@ -21762,16 +21785,18 @@ "bke" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - dir = 4; - icon_state = "asteroidwarning" +/turf/open/mars{ + icon_state = "mars_dirt_12" }, /area/bigredv2/outside/c) "bkf" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_y = -32 }, -/turf/open/mars, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, /area/bigredv2/outside/c) "bkg" = ( /obj/structure/machinery/light, @@ -21809,7 +21834,9 @@ dir = 1; name = "\improper Cargo Bay Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bkp" = ( /turf/open/mars{ @@ -21838,14 +21865,18 @@ dir = 1; name = "\improper Atmospherics Condenser" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "bkw" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 1; name = "\improper Atmospherics Condenser" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "bkx" = ( /obj/effect/spawner/gibspawner/human, @@ -21854,7 +21885,9 @@ dir = 1; name = "\improper Atmospherics Condenser" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "bky" = ( /turf/open/mars_cave{ @@ -21865,7 +21898,9 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Cargo Bay Quartermaster" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bkA" = ( /obj/structure/bed/chair/office/dark, @@ -22163,18 +22198,10 @@ }, /turf/open/floor/plating, /area/bigredv2/outside/filtration_plant) -"blK" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Engineering Complex" - }, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/engineering) "blL" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/engineering) "blT" = ( @@ -22513,7 +22540,9 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Atmospherics Condenser Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "bnl" = ( /obj/effect/decal/cleanable/dirt, @@ -22542,6 +22571,7 @@ /area/bigredv2/outside/filtration_plant) "bnp" = ( /obj/structure/machinery/computer/area_atmos/area, +/obj/structure/surface/table, /turf/open/floor, /area/bigredv2/outside/filtration_plant) "bnq" = ( @@ -22558,7 +22588,9 @@ dir = 1; name = "\improper Engineering SMES" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bnt" = ( /obj/effect/decal/cleanable/dirt, @@ -22618,7 +22650,9 @@ dir = 1; name = "\improper Atmospherics Condenser" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "bnB" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -22704,7 +22738,9 @@ /obj/structure/machinery/door/airlock/almayer/secure/colony{ name = "\improper Engineering Secure Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bnV" = ( /obj/structure/sign/safety/electronics{ @@ -22892,14 +22928,18 @@ dir = 1; name = "\improper Chief Engineer's Office" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "boV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Engineering Complex" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "boW" = ( /obj/structure/closet/secure_closet/atmos_personal, @@ -22964,7 +23004,9 @@ dir = 1; name = "\improper Engineering Tool Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bpl" = ( /obj/structure/machinery/light{ @@ -23033,7 +23075,9 @@ dir = 1; name = "\improper Engineering Lockers" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bpA" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -23041,7 +23085,9 @@ dir = 1; name = "\improper Engineering Lockers" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bpC" = ( /obj/structure/reagent_dispensers/fueltank, @@ -23228,7 +23274,9 @@ dir = 1; name = "\improper Engineering Break Room" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bqg" = ( /turf/open/floor/plating{ @@ -23313,7 +23361,9 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Engineering Workshop" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bqM" = ( /obj/effect/decal/cleanable/dirt, @@ -23335,7 +23385,9 @@ name = "\improper Engine Reactor Control" }, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bqT" = ( /obj/effect/decal/cleanable/dirt, @@ -23387,7 +23439,9 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Engineering Workshop" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "brg" = ( /obj/structure/machinery/light{ @@ -23487,9 +23541,7 @@ /turf/open/floor, /area/bigredv2/outside/filtration_plant) "brD" = ( -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor/plating, /area/bigredv2/outside/filtration_cave_cas) "brE" = ( /turf/open/floor/greengrid, @@ -23682,9 +23734,7 @@ /area/bigredv2/outside/filtration_plant) "bsH" = ( /obj/effect/landmark/hunter_primary, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigredv2/outside/filtration_cave_cas) "bsI" = ( /turf/open/mars{ @@ -23739,13 +23789,17 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Engineering Complex" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bsY" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Atmospherics Condenser" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "bsZ" = ( /obj/structure/janitorialcart, @@ -23860,7 +23914,9 @@ dir = 1; name = "\improper Engineering Complex" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "btJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -23890,7 +23946,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Engineering Complex" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bub" = ( /turf/open/mars_cave{ @@ -23943,7 +24001,10 @@ /area/bigredv2/caves_sw) "buB" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/mars, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, /area/bigredv2/outside/n) "buJ" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -23986,13 +24047,6 @@ icon_state = "mars_cave_16" }, /area/bigredv2/outside/s) -"bvm" = ( -/obj/structure/machinery/door/airlock/almayer/engineering/colony{ - dir = 1; - name = "\improper Power Substation" - }, -/turf/open/floor, -/area/bigredv2/outside/lz2_south_cas) "bvv" = ( /obj/structure/machinery/light{ dir = 1 @@ -24012,8 +24066,7 @@ name = "Eta Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/eta) "bvD" = ( @@ -24041,7 +24094,9 @@ dir = 1; name = "\improper Power Substation" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/lz2_south_cas) "bvO" = ( /turf/open/mars{ @@ -24166,12 +24221,12 @@ name = "\improper Eta Lab Storage Bay" }, /turf/open/floor{ - icon_state = "loadingarea" + icon_state = "delivery" }, /area/bigredv2/caves/eta/storage) "bwH" = ( /turf/open/floor{ - icon_state = "loadingarea" + icon_state = "delivery" }, /area/bigredv2/caves/eta/storage) "bwI" = ( @@ -24180,7 +24235,7 @@ name = "\improper Eta Lab Decontamination" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/caves/eta/research) "bwK" = ( @@ -24192,7 +24247,8 @@ dir = 5 }, /turf/open/floor{ - icon_state = "delivery" + dir = 1; + icon_state = "loadingarea" }, /area/bigredv2/caves/eta/storage) "bwM" = ( @@ -24200,7 +24256,8 @@ dir = 4 }, /turf/open/floor{ - icon_state = "delivery" + dir = 1; + icon_state = "loadingarea" }, /area/bigredv2/caves/eta/storage) "bwN" = ( @@ -24399,7 +24456,9 @@ /obj/structure/machinery/door/airlock/almayer/research/glass/colony{ name = "\improper Eta Lab Robotics" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/eta/storage) "bxs" = ( /obj/effect/decal/cleanable/dirt, @@ -24814,7 +24873,7 @@ name = "\improper Eta Lab Technical Storage" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/research) "byF" = ( @@ -24824,7 +24883,7 @@ name = "\improper Eta Lab Dormitories" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/caves/eta/research) "byG" = ( @@ -25139,7 +25198,7 @@ name = "\improper Eta Lab Armory" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/research) "bzt" = ( @@ -25327,7 +25386,7 @@ name = "\improper Eta Lab Server" }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "delivery" }, /area/bigredv2/caves/eta/storage) "bzR" = ( @@ -25337,7 +25396,7 @@ name = "\improper Eta Lab Security Office" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/storage) "bzT" = ( @@ -25578,7 +25637,7 @@ name = "\improper Eta Lab Director's Office" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/research) "bAE" = ( @@ -25865,7 +25924,7 @@ name = "\improper Eta Lab Maintenance Storage" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/storage) "bBA" = ( @@ -25896,7 +25955,7 @@ name = "\improper Eta Lab Cell" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/research) "bBI" = ( @@ -25956,7 +26015,7 @@ name = "\improper Eta Lab Cell" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/xenobiology) "bBT" = ( @@ -26206,7 +26265,7 @@ name = "\improper Eta Lab Xenobiology Lab" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/xenobiology) "bCA" = ( @@ -26306,7 +26365,7 @@ name = "\improper Eta Lab" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/living) "bCS" = ( @@ -26660,7 +26719,7 @@ name = "\improper Eta Lab Research Office" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/caves/eta/living) "bDP" = ( @@ -26668,7 +26727,9 @@ dir = 1; name = "\improper Eta Lab Canteen" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/eta/living) "bDQ" = ( /turf/open/floor{ @@ -26798,7 +26859,7 @@ name = "\improper Eta Lab Restroom" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/living) "bEk" = ( @@ -26962,7 +27023,9 @@ /obj/structure/machinery/door/airlock/almayer/research/glass/colony{ name = "\improper Eta Lab Relaxation" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/eta/living) "bEI" = ( /obj/structure/bed/chair/comfy/orange{ @@ -27047,6 +27110,11 @@ /obj/structure/machinery/light, /turf/open/floor, /area/bigredv2/caves/eta/living) +"bET" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/office_complex) "bFh" = ( /obj/structure/surface/table, /turf/open/floor{ @@ -27110,6 +27178,12 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_plant) +"bMz" = ( +/turf/open/floor{ + dir = 5; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/ne) "bNl" = ( /turf/open/mars_cave{ icon_state = "mars_cave_2" @@ -27232,7 +27306,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "bZL" = ( /obj/effect/landmark/monkey_spawn, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -27282,6 +27356,11 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"cgt" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/dorms) "chq" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -27341,17 +27420,6 @@ icon_state = "mars_cave_2" }, /area/space) -"cnm" = ( -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "eta"; - name = "Eta Lockdown" - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lz2_south_cas) "cns" = ( /obj/effect/landmark/nightmare{ insert_tag = "se-checkpoint" @@ -27589,6 +27657,12 @@ icon_state = "dark" }, /area/bigredv2/outside/marshal_office) +"cNH" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/bar) "cOl" = ( /turf/open/mars_cave{ icon_state = "mars_cave_18" @@ -27598,6 +27672,14 @@ /obj/structure/sign/poster/clf, /turf/closed/wall/solaris/reinforced, /area/bigredv2/caves/mining) +"cOJ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/caves/eta/research) "cPZ" = ( /obj/structure/window/framed/solaris/reinforced, /obj/effect/decal/cleanable/dirt, @@ -27660,6 +27742,14 @@ "cVY" = ( /turf/open/mars, /area/bigredv2/outside/space_port_lz2) +"cYI" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/hydroponics) "cYJ" = ( /turf/open/mars_cave{ icon_state = "mars_cave_2" @@ -27818,6 +27908,12 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"dvC" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/filtration_plant) "dwL" = ( /obj/structure/bed/chair{ buckling_y = 5; @@ -27849,7 +27945,6 @@ "dzY" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - dir = 6; icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) @@ -27955,6 +28050,9 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"dIb" = ( +/turf/open/floor, +/area/bigredv2/caves) "dIz" = ( /turf/open/mars_cave{ icon_state = "mars_cave_8" @@ -28085,7 +28183,9 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "dSg" = ( /obj/effect/landmark/crap_item, @@ -28116,6 +28216,12 @@ icon_state = "mars_cave_5" }, /area/bigredv2/outside/lz2_south_cas) +"dWg" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/mars{ + icon_state = "mars_dirt_12" + }, +/area/bigredv2/outside/c) "dWl" = ( /obj/structure/closet/toolcloset, /turf/open/floor, @@ -28300,6 +28406,9 @@ icon_state = "mars_cave_9" }, /area/bigredv2/caves/mining) +"erf" = ( +/turf/closed/wall/solaris, +/area/bigredv2/outside/c) "ers" = ( /obj/effect/landmark/nightmare{ insert_tag = "etatunnel" @@ -28696,8 +28805,8 @@ /obj/structure/machinery/door/airlock/almayer/research/glass/colony{ name = "\improper Lambda Lab Server Room" }, -/turf/open/floor/bluegrid{ - icon_state = "bcircuitoff" +/turf/open/floor{ + icon_state = "delivery" }, /area/bigredv2/caves/lambda/research) "fgE" = ( @@ -28731,7 +28840,7 @@ /area/bigredv2/outside/w) "fjP" = ( /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves) "fmd" = ( @@ -28819,6 +28928,17 @@ icon_state = "mars_cave_7" }, /area/bigredv2/caves_virology) +"fwD" = ( +/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 = 4; + health = 25000 + }, +/turf/open/floor{ + dir = 8; + icon_state = "loadingarea" + }, +/area/bigredv2/outside/cargo) "fwO" = ( /obj/structure/prop/almayer/cannon_cables{ name = "\improper Cables" @@ -28834,9 +28954,7 @@ /area/bigredv2/oob) "fwV" = ( /obj/structure/surface/table, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigredv2/caves) "fxh" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -28886,6 +29004,9 @@ /obj/structure/pipes/standard/tank/phoron, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"fCb" = ( +/turf/open/floor, +/area/bigredv2/outside/filtration_cave_cas) "fDr" = ( /turf/open/floor{ dir = 1; @@ -29060,6 +29181,12 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"fSJ" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/space_port) "fST" = ( /obj/structure/machinery/light, /turf/open/floor{ @@ -29117,6 +29244,11 @@ icon_state = "mars_dirt_10" }, /area/bigredv2/outside/eta) +"gad" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/filtration_plant) "gan" = ( /obj/structure/platform_decoration/shiva{ dir = 1 @@ -29189,6 +29321,16 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"gkD" = ( +/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 = 4; + health = 25000 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/cargo) "glB" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/solaris/reinforced, @@ -29218,6 +29360,12 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"gpt" = ( +/obj/effect/landmark/crap_item, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/c) "gpB" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_6" @@ -29245,8 +29393,7 @@ name = "Virology Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "gsW" = ( @@ -29494,8 +29641,7 @@ name = "Lambda Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/caves_lambda) "heU" = ( @@ -29518,16 +29664,6 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/outside/lz1_north_cas) -"hhW" = ( -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "eta"; - name = "Eta Lockdown" - }, -/turf/open/floor{ - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lz2_south_cas) "hiP" = ( /obj/structure/sign/safety/one{ pixel_x = 16 @@ -29853,8 +29989,7 @@ name = "Virology Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "hUh" = ( @@ -29879,6 +30014,7 @@ /area/bigredv2/caves/mining) "hYI" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor{ icon_state = "white" }, @@ -30134,6 +30270,11 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/lambda_cave_cas) +"iyd" = ( +/obj/structure/machinery/computer/general_air_control, +/obj/structure/surface/table, +/turf/open/floor, +/area/bigredv2/outside/filtration_plant) "iyY" = ( /turf/open/mars_cave{ icon_state = "mars_cave_13" @@ -30298,6 +30439,7 @@ /area/bigredv2/caves/eta/research) "iRG" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/mars_cave{ icon_state = "mars_cave_2" }, @@ -30368,9 +30510,7 @@ /area/bigredv2/outside/lambda_cave_cas) "iZA" = ( /obj/structure/surface/rack, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigredv2/caves) "jbU" = ( /obj/effect/decal/cleanable/blood{ @@ -30400,7 +30540,10 @@ /obj/effect/landmark/nightmare{ insert_tag = "crashlanding-offices" }, -/turf/open/mars, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, /area/bigredv2/outside/c) "jdQ" = ( /obj/structure/prop/dam/truck/mining{ @@ -30413,6 +30556,12 @@ icon_state = "mars_dirt_3" }, /area/bigredv2/outside/s) +"jfr" = ( +/turf/open/floor{ + dir = 5; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/se) "jgw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -30755,8 +30904,7 @@ name = "Eta Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/lz2_south_cas) "jOS" = ( @@ -30920,6 +31068,14 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/caves/mining) +"jZp" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/dorms) "jZy" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 1 @@ -31118,6 +31274,11 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"kmm" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/admin_building) "knN" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -31400,9 +31561,7 @@ /area/bigredv2/outside/filtration_cave_cas) "kTs" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigredv2/outside/filtration_cave_cas) "kVS" = ( /obj/effect/landmark/crap_item, @@ -31598,17 +31757,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/mars, /area/bigredv2/outside/se) -"lvX" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/obj/structure/machinery/door/poddoor/almayer/closed{ - id = "eta"; - name = "Eta Lockdown" - }, -/turf/open/floor{ - dir = 8; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lz2_south_cas) "lwT" = ( /obj/structure/machinery/light{ dir = 8 @@ -31700,17 +31848,6 @@ icon_state = "redfull" }, /area/bigredv2/caves/eta/research) -"lEb" = ( -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "lambda"; - name = "Lambda Lockdown" - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lambda_cave_cas) "lEw" = ( /obj/item/tool/pickaxe{ pixel_y = -3 @@ -31720,6 +31857,11 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"lGt" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/caves/eta/living) "lIe" = ( /obj/item/weapon/twohanded/folded_metal_chair, /obj/effect/decal/cleanable/dirt, @@ -31906,6 +32048,11 @@ icon_state = "mars_cave_23" }, /area/bigredv2/caves/mining) +"maD" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/engineering) "maF" = ( /obj/item/frame/rack, /obj/effect/landmark/good_item, @@ -32111,6 +32258,11 @@ icon_state = "mars_cave_15" }, /area/bigredv2/caves/mining) +"myY" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/filtration_cave_cas) "mzV" = ( /turf/open/mars, /area/bigredv2/outside/filtration_plant) @@ -32156,7 +32308,9 @@ /area/bigredv2/outside/lz1_north_cas) "mGS" = ( /obj/effect/landmark/static_comms/net_one, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/admin_building) "mHp" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -32237,9 +32391,7 @@ "mRD" = ( /obj/structure/surface/table, /obj/structure/machinery/computer/atmos_alert, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigredv2/caves) "mSn" = ( /obj/effect/decal/cleanable/blood/oil/streak, @@ -32259,7 +32411,7 @@ name = "\improper Operations" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "mWt" = ( @@ -32397,6 +32549,13 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/caves_research) +"nnK" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/e) "npz" = ( /obj/structure/surface/table, /obj/item/spacecash/c100, @@ -32554,8 +32713,7 @@ name = "Filtration Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/filtration_cave_cas) "nKL" = ( @@ -32610,6 +32768,11 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"nRT" = ( +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/chapel) "nSP" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_7" @@ -32732,6 +32895,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/bigredv2/caves/eta/research) +"ocA" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/library) "ocG" = ( /obj/structure/bookcase/manuals/research_and_development, /obj/item/storage/fancy/vials/random, @@ -32963,13 +33131,10 @@ }, /area/bigredv2/caves/mining) "ovq" = ( -/obj/structure/window/framed/solaris/reinforced, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "Engineering"; - name = "\improper Engineering Shutters" +/turf/open/floor{ + icon_state = "delivery" }, -/turf/open/floor, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/general_offices) "ovB" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave{ @@ -33034,6 +33199,7 @@ /area/bigredv2/caves_virology) "ozQ" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/mars_cave{ icon_state = "mars_cave_2" }, @@ -33612,9 +33778,7 @@ "pQv" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigredv2/caves) "pQE" = ( /obj/effect/decal/cleanable/dirt, @@ -33759,7 +33923,7 @@ "qaR" = ( /obj/vehicle/powerloader/ft, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "qez" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave{ @@ -33982,8 +34146,7 @@ name = "Eta Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/lz2_south_cas) "qzY" = ( @@ -34013,8 +34176,7 @@ name = "\improper Workshop Garage" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigred/ground/garage_workshop) "qFg" = ( @@ -34314,9 +34476,7 @@ /area/bigredv2/caves/mining) "rjw" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigredv2/outside/filtration_cave_cas) "rjF" = ( /obj/structure/sign/safety/bathunisex{ @@ -34533,7 +34693,10 @@ /area/bigredv2/outside/filtration_plant) "rHD" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/mars, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, /area/bigredv2/outside/c) "rIl" = ( /turf/closed/wall/solaris/reinforced/hull, @@ -35023,7 +35186,9 @@ dir = 1; name = "\improper Engineering Workshop" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigred/ground/garage_workshop) "svp" = ( /obj/structure/surface/table, @@ -35074,8 +35239,7 @@ name = "Lambda Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/caves_lambda) "szw" = ( @@ -35226,6 +35390,14 @@ icon_state = "mars_cave_10" }, /area/bigredv2/caves_east) +"sPv" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/bar) "sQw" = ( /turf/open/mars_cave{ icon_state = "mars_cave_23" @@ -35534,6 +35706,20 @@ icon_state = "mars_cave_14" }, /area/bigredv2/outside/lz2_south_cas) +"tuu" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/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 = 4; + health = 25000 + }, +/turf/open/floor{ + dir = 8; + icon_state = "loadingarea" + }, +/area/bigredv2/outside/cargo) "tuN" = ( /obj/structure/machinery/light/small, /turf/open/mars_cave, @@ -35560,8 +35746,8 @@ "tAW" = ( /obj/effect/landmark/lv624/xeno_tunnel, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + dir = 4; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/ne) "tBb" = ( @@ -35716,6 +35902,11 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"tKR" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/hydroponics) "tLt" = ( /turf/open/mars_cave{ icon_state = "mars_cave_14" @@ -35925,8 +36116,7 @@ name = "Filtration Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/filtration_cave_cas) "ujU" = ( @@ -35979,6 +36169,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor, /area/bigred/ground/garage_workshop) +"upV" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/admin_building) "usg" = ( /obj/item/tool/warning_cone, /turf/open/floor{ @@ -36275,8 +36471,8 @@ /area/bigredv2/caves_sw) "vbi" = ( /turf/open/floor{ - dir = 4; - icon_state = "darkpurplecorners2" + dir = 5; + icon_state = "darkpurple2" }, /area/bigredv2/caves/lambda/research) "vcm" = ( @@ -36355,6 +36551,15 @@ icon_state = "mars_cave_13" }, /area/bigredv2/caves/mining) +"vis" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + dir = 4; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/c) "viN" = ( /obj/structure/machinery/door_control{ id = "workshop_br_g"; @@ -36368,7 +36573,7 @@ dir = 1; icon_state = "asteroidwarning" }, -/area/bigred/ground/garage_workshop) +/area/bigredv2/outside/nw) "vjc" = ( /obj/item/tool/warning_cone{ pixel_x = -13; @@ -36404,6 +36609,13 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"vmm" = ( +/obj/structure/barricade/wooden, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/c) "vmI" = ( /obj/item/device/flashlight/lantern, /turf/open/mars_cave{ @@ -36451,8 +36663,7 @@ name = "Eta Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/eta) "vqY" = ( @@ -36477,7 +36688,7 @@ name = "\improper Eta Lab Cell" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/xenobiology) "vuz" = ( @@ -36729,7 +36940,7 @@ /turf/open/floor{ icon_state = "asteroidwarning" }, -/area/bigred/ground/garage_workshop) +/area/bigredv2/outside/nw) "vYw" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave{ @@ -36825,6 +37036,7 @@ /area/bigredv2/caves/eta/research) "wfC" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /obj/effect/landmark/queen_spawn, /turf/open/mars_cave{ icon_state = "mars_cave_2" @@ -37119,6 +37331,14 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"wLU" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/cargo) "wMg" = ( /obj/item/tool/warning_cone{ pixel_x = 5; @@ -37134,17 +37354,6 @@ icon_state = "mars_cave_9" }, /area/bigredv2/caves_north) -"wMP" = ( -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "lambda"; - name = "Lambda Lockdown" - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/outside/lambda_cave_cas) "wMQ" = ( /obj/structure/largecrate/random/secure, /turf/open/floor, @@ -37156,7 +37365,7 @@ name = "Lambda Lockdown" }, /turf/open/floor{ - icon_state = "asteroidwarning" + icon_state = "delivery" }, /area/bigredv2/outside/lambda_cave_cas) "wNA" = ( @@ -37611,9 +37820,22 @@ icon_state = "platingdmg3" }, /area/bigredv2/oob) +"xDW" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/engineering) "xFZ" = ( /turf/open/mars_cave, /area/bigredv2/caves_lambda) +"xGT" = ( +/turf/open/floor{ + dir = 9; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/w) "xIo" = ( /obj/structure/window/framed/solaris/reinforced/hull, /turf/open/floor/plating{ @@ -37704,6 +37926,14 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"xNL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/caves/lambda/research) "xPg" = ( /obj/structure/barricade/handrail/wire, /turf/open/mars_cave{ @@ -37959,6 +38189,14 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"yhV" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/filtration_plant) "yjU" = ( /obj/item/weapon/broken_bottle, /turf/open/floor/plating{ @@ -42424,7 +42662,7 @@ aJg aJg aJg aLU -aMA +aPt aNb aOr aPt @@ -43254,7 +43492,7 @@ aae aao qsE qsE -vLd +aTs suV qsE qsE @@ -43479,7 +43717,7 @@ clB uIB shV qsE -vLd +aTs suV qsE qsE @@ -45219,9 +45457,9 @@ pdN aeI aeI aeI -aiz -ahP -atl +aoO +aiw +aqp aqp aqp aiw @@ -45421,37 +45659,37 @@ aam aam ago aae -aeI +ahR aeI aeI aeI aeI auF -aiy -akd -aiy -aiy +ajx +aoN +ajx +ajx ahT aeI aeI aeI aeI -aiA -aoO -aoN -aoN +ajy +ajx aoN akd +akd +akd aiy aoN ajx amc aix aix -alm -alm -alm -alm +aix +aix +aix +aix aDx aDw ahP @@ -45638,7 +45876,7 @@ aah aah aeG aae -aeI +ahR aeI aeI aeI @@ -45653,23 +45891,23 @@ aeI aeI aeI aiz -aoO -ajx -ajx +ajy ajx -atm -ahP -ahP -aoO -aiw -axW -aiw -ahQ -ahP +ahR ahP +aqJ ahP ahP -aDy +ajy +ajx +ajY +ajx +ajx +ajx +ajx +ajx +ajx +ajY akK ahP auF @@ -45701,14 +45939,14 @@ aSB aSB aSB aSB -aVF -aVI -aVI -aWk -aWk -aWk -aWk -aWk +beP +beP +beP +aSB +aSB +aSB +aSB +aSB bgX bhz bie @@ -45855,7 +46093,7 @@ aah aah aeG aae -ahO +ahR aeI aeI aeI @@ -45872,20 +46110,20 @@ aeI aiA ajy aoN -aoN -atm -ahP -ahP -ahP -ajy +akK +aqJ +aoO +aiw +aiw +ajx ajx ajY ajx -ahR -ahP -ahP -ahP -ahP +ajx +ajx +ajx +ajx +ajx aDz aEv ahP @@ -45918,15 +46156,15 @@ aWk aVI aWk aWk -aVH -bdZ -bdZ -bev -bev -bdZ -bdZ -bdZ -bgX +aVI +aWk +aWk +aVI +aVI +aWk +aWk +aWk +eWd bhA bie bie @@ -46072,7 +46310,7 @@ aah aah aeG aae -ahP +ahR ahO aeI aeI @@ -46091,7 +46329,7 @@ ajz ajx akK ahP -ahV +ajy anp anp anp @@ -46102,8 +46340,8 @@ anp anp anp anp -ahP -aDy +ajx +ajY akK ahP ahP @@ -46133,17 +46371,17 @@ aXA aWV bba aXA -aXA -aWV -aVG +bdZ +aUQ bdZ bdZ bdZ +aXA aWV aXA aXA aXA -bgX +eWd bhv bie bie @@ -46289,7 +46527,7 @@ aah aah aeG aae -ahQ +ahR ahP ahO aeI @@ -46308,7 +46546,7 @@ ajy ajx akK aln -aeI +ajy anp avT bZp @@ -46319,8 +46557,8 @@ azn avT avT anp -ahP -aDy +ajx +ajY ahR ahP ahP @@ -46350,10 +46588,10 @@ aYE aYE aYE aSB -aSB -aSB aVG bdZ +bdZ +bdZ beu beP aSB @@ -46525,7 +46763,7 @@ ajy ajx ahR aln -aeI +ajy bFw bjj bjj @@ -46536,8 +46774,8 @@ azo aAq aAZ anp -ahP -aDy +ajx +ajY ajx aiw aiw @@ -46555,21 +46793,21 @@ aEu aEu aEu aEu +aWk aUQ -aVI +bdZ +aWk +aWk +aWk +aWk +aWk aWk -aWW -aSB aXY aYF -aYF -aYF -aYF -aYF bbJ -aSB -aSB -aVH +aVG +bdZ +aUQ bdZ bev beP @@ -46721,9 +46959,9 @@ aah aah aah aah -agq -ahe -ahQ +aeG +ahK +ajx aiw aiw aiw @@ -46742,7 +46980,7 @@ ajx ajx akK aln -aeI +ajy bFw kRo joi @@ -46753,7 +46991,7 @@ avT avT avT anp -ahP +ajx aDA alm alm @@ -46781,12 +47019,12 @@ aoH asK asK asK +beQ aYF aYF -aYF -bcp -aSB -aVH +aVG +bdZ +aUQ bdZ bev beP @@ -46939,8 +47177,8 @@ aah aah aah agr -aeg -ahS +fSJ +aix aix aix aix @@ -46959,7 +47197,7 @@ ajx aoN ahR aln -aeI +ajy bFw kRo kRo @@ -46970,7 +47208,7 @@ avT avT avT anp -ahV +ahR ahV ahV ahV @@ -46998,20 +47236,20 @@ aoH aXH aXH asK +beQ aYF aYF -aYF -bcp -aSB -aVH +aVG +bdZ +aUQ bdZ bev -beQ aSB aSB aSB -aSB -bgX +xGT +aWk +eWd eWd kHK kHK @@ -47155,9 +47393,9 @@ aah acx aah aah -ags -aam -ahT +aeG +ahK +ajx aiy aiy ajx @@ -47176,7 +47414,7 @@ aiy akd atm aln -aeI +ajy bFw rhx bjv @@ -47187,7 +47425,7 @@ azo aAq aAZ anp -aeI +ahR aeI aeI ahi @@ -47215,22 +47453,22 @@ aoH aXH aXH asK -aYF +beQ aYF aYF bcq -aSB -aVG +bdZ +bdZ bdZ bev -beQ aSB aSB aSB +aVG asK asK asK -aZu +bdg bbg asK atw @@ -47349,7 +47587,7 @@ pXu rgp aae aaw -aaO +ahK aaW aaw aaw @@ -47393,7 +47631,7 @@ ahP ahP ahP ahP -aog +ajy anp avT avT @@ -47404,7 +47642,7 @@ avT avT avT anp -aeI +ahR aeI aeI aeI @@ -47432,18 +47670,18 @@ aoH aXH aXH asK -aYF +beQ bbb aYF -bcp -aSB aVG bdZ +bdZ +bdZ bev -beQ aSB -bfU aSB +bfU +aVG asK svp svp @@ -47591,7 +47829,7 @@ aah aah aeG aae -ahT +ahR ahP ahP ajy @@ -47610,7 +47848,7 @@ ahP ahP ahP ahP -aoO +ajy anp avU avT @@ -47621,7 +47859,7 @@ avT avT aBa anp -aeI +ahR aeI aeI aeI @@ -47649,18 +47887,18 @@ aoH aXH aXH asK -aYF +beQ aYF bbc -aSB -aSB aVG bdZ bdZ +bdZ beQ aSB aSB aSB +aVG asK bhb bhb @@ -47808,7 +48046,7 @@ afg afg adl aae -ahV +ahR ahV ahP ajy @@ -47827,8 +48065,8 @@ aiw aiw aiw aiw -ajy -avs +ajx +axv avT avT avT @@ -47838,7 +48076,7 @@ avT avT avT anp -aeI +ahR aeI aeI aeI @@ -47866,18 +48104,18 @@ aXZ aYG aXH asK -aYF +beQ bbc aSB -aSB -aSB aVG bdZ bdZ +bdZ beQ aSB aSB aSB +aVG asK bhc bbe @@ -47908,7 +48146,7 @@ brG brG brG brG -lvX +qzO cHn cHn cHn @@ -48044,8 +48282,8 @@ ajx ajx ajx ajx -ajy -avs +ajx +axv avT avT avT @@ -48055,7 +48293,7 @@ avT avT avT anp -aeI +ahR aeI aeI aeI @@ -48083,18 +48321,18 @@ aoH aYH aXH asK -bax +beQ aSB -bbK -bcr -bcr -bcr +beR bcr +bcs +bcs +bcs bew beR aSB aSB -aSB +aVG asK bhd bhD @@ -48242,7 +48480,7 @@ aah afM agw agv -ahX +akK ahX aiA ajy @@ -48261,7 +48499,7 @@ alm alm alm alm -auE +aix avt avV avV @@ -48272,7 +48510,7 @@ avT avT avT anp -aeI +ahR aeI aeI aeI @@ -48300,18 +48538,18 @@ aoH aYI aXH asK -aSB -aSB -bbL +bdZ +aWk +beS bcs bdf bdf beb bdf beS -aSB -aSB -aSB +aWk +aWk +bdZ asK oEJ oEJ @@ -48342,7 +48580,7 @@ heU heU heU heU -afe +qzO bGL bGL bGL @@ -48478,7 +48716,7 @@ ahV ahP ahP ahP -auF +ajy anp avT avT @@ -48489,7 +48727,7 @@ avT avT avT anp -aeI +ahR aeI aeI aeI @@ -48532,7 +48770,7 @@ atw asK asK asK -baz +wLU bbg asK asK @@ -48564,7 +48802,7 @@ rJJ bGL bGL bGL -bvm +bvK rdR rdR bvK @@ -48676,7 +48914,7 @@ aah aah afM agw -aeI +ahR ahX aiA ajy @@ -48695,7 +48933,7 @@ aeI aiB ahV ahV -ahV +ajy anp avU avT @@ -48706,7 +48944,7 @@ avT avT aBa anp -aeI +ahR aeI aeI aeI @@ -48912,7 +49150,7 @@ aeI aeI aeI aeI -aeI +ajy anp avT avT @@ -48923,7 +49161,7 @@ avT avT avT anp -aeI +ahR aeI aeI aeI @@ -48994,10 +49232,10 @@ bme bme aao glB -cnm jOc jOc -hhW +jOc +jOc keg xIP xIP @@ -49110,7 +49348,7 @@ aah aah afM ahh -ahX +akK aeI aiA ajy @@ -49129,7 +49367,7 @@ aeI aeI aeI aeI -aeI +ajy anp qaR avT @@ -49140,7 +49378,7 @@ azo aAq aAZ anp -aeI +ahR aeI aeI aeI @@ -49327,7 +49565,7 @@ aae aae aae aae -ahX +atm aeI aiA ajz @@ -49346,7 +49584,7 @@ aeI aeI aeI aeI -aeI +ajy anp avT avT @@ -49357,7 +49595,7 @@ avT avT avT anp -aeI +ahR aeI aeI aeI @@ -49563,18 +49801,18 @@ aeI aeI aeI aeI -aeI +ajy anp anp alX -aqw +ayN ayd alX anp anp anp anp -aeI +ahR aeI aeI ahi @@ -49780,18 +50018,18 @@ aeI aeI aeI aeI -aeI -aeI -aeI +ajy +ajx +ajx alu aqw azv alu -aeI -aeI -aeI -aeI -aeI +ajx +ajx +ajx +ajx +ahR aeI aeI aeI @@ -49997,18 +50235,18 @@ aiw aiw aiw aiw -aiw -aiw -aiw +ajx +ajx +ajx alu aqw aye alu -aiw -aiw -aiw -aiw -aiw +ajx +ajx +ajx +ajx +ajx aiw aiw aiw @@ -50073,7 +50311,7 @@ bmi bmi brI bmi -ovq +azb bpx bpx bpx @@ -50218,7 +50456,7 @@ alu alu alu alu -aqw +ayN ayd alu alu @@ -50290,7 +50528,7 @@ bmi bmi bmg bmi -ovq +azb kdh aao aao @@ -50470,7 +50708,7 @@ aXH asK asK atA -aZu +bdg bbg auk asK @@ -50493,7 +50731,7 @@ bfz aZO aZu bli -blK +bsX bmg bmO bmy @@ -51105,8 +51343,8 @@ aBR aBR aMc aoH -aNp -aNp +aVJ +aVJ aoH aQO aOC @@ -51121,7 +51359,7 @@ aXH asK asK atA -aZu +bdg bbg auk asK @@ -51709,13 +51947,13 @@ adi adz adz acp -agu -aeI -aeI -aeI -aeI -aeI -aeI +aao +aiw +aiw +aiw +aiw +aiw +ahQ aeI aeI aeI @@ -51756,8 +51994,8 @@ aBR aBR aMc aoH -aNp -aNp +aVJ +aVJ aoH aQR aNo @@ -51932,7 +52170,7 @@ acp agy agy acp -aeI +ahR aeI aeI aeI @@ -51997,11 +52235,11 @@ asK aZu beh aZO -aZu +bdg aZO bbO aZu -aZu +bdg aZu aZO biq @@ -52149,7 +52387,7 @@ afO adk adS acp -aeI +ahR aeI aeI aeI @@ -52171,7 +52409,7 @@ auK aqw azv arR -aqw +ayN arR arR azu @@ -52366,8 +52604,8 @@ aeJ adS adk acp -aeI -aeI +ajx +ahQ aeI aeI aiz @@ -52584,13 +52822,13 @@ agz ahj acp acp +ajx aiw aiw aiw aiw -aiw -aiw -aiw +ajx +ajx aiw aiw ajx @@ -53087,8 +53325,8 @@ bfH bgb bei asK -aZu -bbi +bdg +gkD biw asK eLq @@ -53293,7 +53531,7 @@ atw atw atw asK -aZu +bdg bcD asK atw @@ -53304,9 +53542,9 @@ asK asK asK asK -bbi -bbi -biw +fwD +fwD +tuu asK asK asK @@ -53525,12 +53763,12 @@ bgF bgF bhR biR -aHF +aMg +bjx +bjx +bjx +bjx bjw -bjY -bka -bjA -bjA axX dWl bmi @@ -53742,12 +53980,12 @@ aVo aIn biy biS -aMg -bjx -bjZ +aIn +bjy +bjy bjy bjB -bjA +blq axX bmp bmi @@ -53964,7 +54202,7 @@ bjy bjy bjy bkp -bjA +blq axX bmq bmi @@ -54138,11 +54376,11 @@ aFG aFG aHz alu -aHD -aBR -aBR -aBR -aBS +aHF +aFM +aFM +aFM +aFM aFM aOE aFM @@ -54181,7 +54419,7 @@ bjz bjz bkp bjA -bjA +blq axX trr bmg @@ -54355,11 +54593,11 @@ aqw aqw awO alu -aHD -aBR -aLd -aKl -aMc +aHF +aHF +aHF +aHF +aHF apC apC apC @@ -54398,7 +54636,7 @@ bjA bjA bjA bjA -bkC +blq axX bms bmg @@ -54572,10 +54810,10 @@ aEE aGB aHA alu -aHD -aKl -aIn -aIn +aHF +aHF +aHF +aHF apC apC aOF @@ -54615,7 +54853,7 @@ bjB bjA bjA bkC -bkd +blq axX axX axX @@ -54791,8 +55029,8 @@ alu alu alu aKm -aFM -aFM +aHF +aHF uRE aGD aMf @@ -55440,11 +55678,11 @@ arR arl arR aDN -aqw +ayN aKp aQW aMf -aMf +kmm aNA aMf aMf @@ -55830,7 +56068,7 @@ aao aao aao aao -acP +alF buB acp afl @@ -55876,8 +56114,8 @@ aqw aIk alu aKq -aMg -aMg +aHF +aHF apC aNC aMf @@ -56048,7 +56286,7 @@ aao aao aao acP -acP +asc acp afm afS @@ -56092,9 +56330,9 @@ aqw arl aqw alu -aIn -aIn -aKt +aHF +aHF +aHF apD aND aMf @@ -56265,7 +56503,7 @@ aao aao aao acP -acP +asc acp xyu afS @@ -56309,9 +56547,9 @@ arl aqw aIl alu -aIn -aIp -aBR +aHF +aHF +aHF apD aNE aOH @@ -56352,13 +56590,13 @@ bkc bkc bkc blt -bmz +xDW bmz bna bmz boc bmz -bmz +xDW bop bpO bop @@ -56482,7 +56720,7 @@ aao aao acP acP -acP +asc acp afn afT @@ -56526,9 +56764,9 @@ alu alu alu alu -aIp -aBR -aBR +aHF +aHF +aHF apC aOM aOM @@ -56699,7 +56937,7 @@ aao acP acP acP -acP +asc acp afo afT @@ -56734,18 +56972,18 @@ ayV ayV bBg alu -aBR -aBR -aBR -aBR -aCM -aBR -aBR -aBR -aBR -aBR -aBR -aBR +aHF +aMg +aMg +aMg +aBS +aMg +aMg +aMg +aMg +aMg +aMg +aHF apC aOM aOM @@ -56795,7 +57033,7 @@ bjx bjx bjx bjx -bjx +bjw axX bru bmg @@ -56806,7 +57044,7 @@ axX axX axX axX -bjA +bjY bjA bjA bjA @@ -56916,7 +57154,7 @@ acP acP acP acP -acP +asc acp afp afT @@ -56951,7 +57189,7 @@ ayW ayV bBg alu -aBR +aHD aBR aBR aBR @@ -56962,7 +57200,7 @@ aBR aBR aBR aFL -aBS +aMc apC aNG aOI @@ -57012,7 +57250,7 @@ bjA bjA bjA bjA -bjA +blq axX brv bmi @@ -57023,7 +57261,7 @@ bop bop boq axX -bjA +bjY bjA bjA bjA @@ -57133,7 +57371,7 @@ acP acP acP acP -acP +asc acp afo afT @@ -57168,7 +57406,7 @@ alu alu alu alu -aBR +aHD aBR aBR aBR @@ -57229,7 +57467,7 @@ bjA bjA bjA bjA -bjA +blq axX brw bmi @@ -57240,7 +57478,7 @@ bpC bmi bor axX -bjA +bjY bjA bjA bkC @@ -57347,10 +57585,10 @@ aao aao aao acP -acP -acP -acP -acP +agq +ahe +ahe +ahS acp afq afS @@ -57370,22 +57608,22 @@ aoj aoj apH aqG -aqL -aqL -asa -acP -acP -acP -acP -acP -acP +alF +alF +alF +alF +alF +alF +alF +alF +alF axF -aqO -acP -azK -acP -acP -aBR +asf +alF +akw +alF +alF +axW aBR aBR aBR @@ -57446,7 +57684,7 @@ bjA bjA bjA bjA -bjA +blq axX axX axX @@ -57454,10 +57692,10 @@ axX axX axX axX -bmi +maD btH axX -bjA +bjY bjA bkC bjy @@ -57564,7 +57802,7 @@ aao aao aao acP -acP +asc acp acp acp @@ -57582,10 +57820,10 @@ acp alv amq ahj -adS +aeJ adS aoW -adS +aeJ aqH aqL arZ @@ -57663,18 +57901,18 @@ bjA bjA bjA bjA -bjA -blv -bjy -bjy -bjy +blu +bjx +bjx +bjx +bjw ayr bmq bmq bmi bor ayr -bkr +bjY bkr bjy bjy @@ -57781,7 +58019,7 @@ aao aao aao acP -acP +asc acp adQ aep @@ -57803,7 +58041,7 @@ acp acp acp acp -aqI +aqH aqL asa acP @@ -57862,8 +58100,8 @@ aBR aBR aBR aBR -aBS -aHF +aBR +aMc aHD aIn bjD @@ -57884,14 +58122,14 @@ bjA bjA bjH bjy -bkd +blq ayr bmq bqo bmi btJ ayr -bkb +bjw bun btD btD @@ -57998,7 +58236,7 @@ aao aao acP acP -acP +asc acp adR aeq @@ -58020,23 +58258,23 @@ aer afS cLZ acp -aqJ +aqH arp -acP -acP -acP -acP -acP -acP -acP -acP -acP -aqO -acP -acP -azK -acP -aBS +agq +ahe +ahe +ahe +ahe +ahe +ahe +ahe +ahe +atl +ahe +ahe +auE +ahe +aFM aCN aCN aCN @@ -58080,7 +58318,7 @@ aBR aBR aBR bhO -aVp +biY dzY bpT bjG @@ -58215,7 +58453,7 @@ aao aao acP acP -acP +asc acp adS adS @@ -58237,9 +58475,9 @@ anx afS akM acp -aqJ +aqH arp -acP +asc amn amV amV @@ -58297,8 +58535,8 @@ aBR aBR aBR bhP -aHD -bdk +aMc +gpt aKt bjy bjy @@ -58319,12 +58557,12 @@ bjy bjy bjy blq -bmi +maD bmi bmi bsu bor -bmi +maD bjw bjw bjx @@ -58432,7 +58670,7 @@ aao aao acP acP -acP +asc acp adT adT @@ -58454,9 +58692,9 @@ aer afS aoT acp -aqJ +aqH aqL -asb +asc amn vti atY @@ -58514,8 +58752,8 @@ aBR aBR aBR bhP +aMc aHD -aWJ aBR bjH bkd @@ -58649,7 +58887,7 @@ aao aao aao acP -acP +asc acp acr aer @@ -58671,9 +58909,9 @@ acp acp acp acp -aqJ -aqL +aqH aqL +asc amn aty atY @@ -58731,18 +58969,18 @@ bfI bfI bfI bhQ -aHD -aWJ -aBR -aVo -aMc +aHF +aHF +aFM +aFM +aHF awp awp axr axr axr awp -bkE +gad bnA awp awp @@ -58866,7 +59104,7 @@ aao aao aao acP -acP +asc acp acl aes @@ -58888,9 +59126,9 @@ anB alx alx acr -aqJ -aqL +aqH aqL +asc amn atY atY @@ -58947,12 +59185,12 @@ aNw aNw aMg aMg -bhR +vis aHF -aFM -aFM -aFM aHF +aMg +aMg +aMg awp bkD blx @@ -59083,7 +59321,7 @@ aao aao aao acP -acP +asc acq acv adW @@ -59105,7 +59343,7 @@ adk alx alx alZ -aqJ +aqH aqL asc amn @@ -59150,7 +59388,7 @@ aOM aOM aOM aZZ -baJ +upV baJ bcb bcR @@ -59163,12 +59401,12 @@ aIn aIn aKt aKt -aIn +aKt bhS biY -biY -biY -biY +dzY +dWg +dWg bke bku bmF @@ -59300,7 +59538,7 @@ aao aao aao acP -acP +asc adG adW aet @@ -59379,14 +59617,14 @@ aIn aKt aIp aBR -aBR -aYK -aKt -aKt -aKt -aKt -aKt -aKt +aWI +aFM +aFM +aHF +aHF +aFM +aFM +aFM awp bkE bly @@ -59404,7 +59642,7 @@ bnF bry bnF bof -bmF +dvC bmF bmF btB @@ -59517,7 +59755,7 @@ aao aao aao acP -acP +asc acq adX aeu @@ -59539,7 +59777,7 @@ anC alz alz amb -aqL +aqM aqL ase asJ @@ -59596,14 +59834,14 @@ aWJ aBR aBR aBR -aBR -auW +aMc +erf auX auX auX auX -auW -aBR +erf +aHF awp bkG blX @@ -59734,7 +59972,7 @@ aao aao aao acP -acP +asc acp adY jGn @@ -59758,7 +59996,7 @@ alA acr aqM aqL -asf +ase amn amn amn @@ -59811,9 +60049,9 @@ apC aTh aIn aKl -aKl aIm aBR +aMc auX gpR gpR @@ -59951,7 +60189,7 @@ aao aao aao acP -acP +asc acp acp acp @@ -59973,9 +60211,9 @@ adk adk adS alZ -acP +aqM arr -aqL +asc amI aty atY @@ -59994,7 +60232,7 @@ asJ aua aua asJ -asJ +cgt aHD aIn aIn @@ -60028,16 +60266,16 @@ bej beE aFM aFM -aFM aHC aBR +aMc auX gpR gpR gpR gpR auX -aBR +aHF awM awM awM @@ -60049,7 +60287,7 @@ awM awM awp awp -bpo +yhV bnA awp awp @@ -60168,13 +60406,13 @@ aao aao aao acP -acP -acP -acP -acP -acP -acP -acP +ags +alF +alF +alF +alF +alF +ahS acr ahu adS @@ -60190,9 +60428,9 @@ anE aok adk acr +aqM acP -acP -arr +asc amI atB atY @@ -60242,19 +60480,19 @@ aYO aTa aYO bek -beF -aMg +bjZ aMg aHF aHD aBR +aMc auX gpR gpR gpR gpR auX -aBR +aHF awM bkI bkI @@ -60391,7 +60629,7 @@ acP acP acP acP -acP +asc acr ahu adS @@ -60407,9 +60645,9 @@ anF aol adS acr +aqM acP -acP -acP +asc amn atz atY @@ -60450,7 +60688,7 @@ apJ apC apC apC -aOM +kmm mWg apC apC @@ -60461,17 +60699,17 @@ apC apC beF bfb -aIn aMc aHD aIm +aMc auX gpR gpR gpR gpR auX -aBR +aHF awM bkJ bkJ @@ -60608,7 +60846,7 @@ acP acP acP acP -acP +asc acr acr acr @@ -60624,9 +60862,9 @@ acr acr acr acr +aqM acP -acP -acP +asc amn aty atY @@ -60667,8 +60905,8 @@ aMg aMg aMg aMg -aMg -aMg +aHF +aHF aMg aMg aMg @@ -60678,17 +60916,17 @@ aMg aMg beG aIn -bfb -aMc -aHD -aIn -auW +vmm +aHF +aFM +aHF +erf auX auX auX auX -auW -aBR +erf +aHF awM awM awM @@ -60825,10 +61063,10 @@ acP acP acP acP -acP -acP -acP -acP +ags +alF +alF +ahS acr adS ajL @@ -60841,9 +61079,9 @@ aom aoX apb acr +aqM acP -acP -acP +asc amn tmH atY @@ -60884,8 +61122,8 @@ aVo aIn aWJ aBR -aBR -aBR +aMc +aHD aBR aBR aVo @@ -60895,17 +61133,17 @@ aWJ aBR aBR bfc -bfb -aMc -aHD -aIn -aBR -aBR -aBR -aBR -aBR -aBR -aBR +vmm +aHF +aMg +aHF +aHF +aHF +aHF +aHF +aHF +aHF +aHF awp bkK blB @@ -61045,7 +61283,7 @@ acP acP acP acP -acP +asc acr adS ajR @@ -61058,7 +61296,7 @@ alB alB adW acr -acP +aqM acP asg amI @@ -61101,8 +61339,8 @@ aIn aIn aIn aKl -aKl -aKl +aMc +aHD aKl aKl aIn @@ -61112,17 +61350,17 @@ aIn aKl aKl aIn -aIn aMc aHD aIn -auW +aMc +erf auX auX auX auX -auW -aBR +erf +aHF awp bkK blX @@ -61262,7 +61500,7 @@ acP acP acP acP -acP +asc acr adS ajS @@ -61275,7 +61513,7 @@ alC aon aoY acr -acP +aqM acP ash amI @@ -61312,13 +61550,13 @@ aBR aBR aBR aVn -aBS aFM aFM aFM aFM aFM aFM +aHF baa aFM aFM @@ -61329,17 +61567,17 @@ aFM aFM aFM aFM -aFM aHF aHD aWJ +aMc auX gpR gpR gpR gpR auX -aBR +aHF awp bkL bkE @@ -61407,7 +61645,7 @@ xpl bCs xpl xpl -ioS +lGt ioS ioS ioS @@ -61479,7 +61717,7 @@ acP acP acP acP -acP +asc aiQ adS adk @@ -61528,7 +61766,6 @@ aBR aBR aBR aBR -aVo aMc aHF aMg @@ -61548,15 +61785,16 @@ aMg aMg aMg aMg -aWI +axW aIp +aMc auX gpR gpR gpR gpR auX -aBR +aHF awp bkM bkE @@ -61696,8 +61934,8 @@ acP acP acP acP -acP -adS +asc +aeJ adS adk akc @@ -61709,9 +61947,9 @@ anH agt apa acr -aqO -acP +ajT acP +asc amI aty atY @@ -61745,7 +61983,6 @@ aBR aBR aBR aBR -aVo aMc aHD aIn @@ -61754,6 +61991,7 @@ aIn aIn aIn aIn +aIn aKt aKt aKt @@ -61766,14 +62004,14 @@ aKt aKt aIp aBR -aBR +aMc auX gpR gpR gpR gpR auX -aBR +aHF awp qeK ccP @@ -61784,8 +62022,8 @@ bnH bkE box bkE -bnH -bnH +iyd +iyd eKU bkE bkE @@ -61834,7 +62072,7 @@ bAR aBv aBA aCh -qZo +cOJ aCh aBA aBA @@ -61913,7 +62151,7 @@ acP acP acP acP -acP +asc acr ajj adk @@ -61926,9 +62164,9 @@ akS agO aCk acr +aqM acP -acP -acP +asc amI atB atY @@ -61962,9 +62200,9 @@ aFM aFM aHC aBR -aVo aMc aHD +aIn aXo aKt aKt @@ -61983,14 +62221,14 @@ aBR aBR aBR aBR -aFL +aWW auX gpR gpR gpR gpR auX -aBR +aHF awp awp awp @@ -62130,7 +62368,7 @@ aao acP acP acP -acP +asc acr acr acr @@ -62143,9 +62381,9 @@ akj akj akj acr +aqM acP -acP -acP +asc amn atB atY @@ -62179,9 +62417,9 @@ anJ anJ aHD aBR -aVo aMc aHD +aIn aWJ aBR aBR @@ -62200,14 +62438,14 @@ aBR aBR aBR aBR -aBR -auW +aMc +erf auX auX auX auX -auW -aBR +erf +aHF awp bkO blC @@ -62347,10 +62585,10 @@ aao aao acP acP -acP -acP -acP -ajT +ags +alF +alF +alF akw akw alF @@ -62359,10 +62597,10 @@ akw akw akw akw -acP -acP +alF +aqI amD -acP +asc amn aty atY @@ -62396,13 +62634,11 @@ aEO anJ aTc aBR -aVo aMc aHD +aIn aWJ -aBR -aBS -aFM +aWI aFM aFM aFM @@ -62419,12 +62655,14 @@ aFM aFM aFM aFM -aHC -aBR -aBR +aHF +aHF +aHF +aHF +aHF jdj -aBR -aBR +aHF +aHF awp bkE hsF @@ -62579,7 +62817,7 @@ acP acP acP acP -acP +asc amn lyx atY @@ -62613,11 +62851,11 @@ aEO aqz aHD aKl -aIn aMc aHD +aIn aWJ -aBR +aMc asv asv asv @@ -62636,9 +62874,9 @@ atJ atJ asv asv -aHD -aBR -aBR +aHF +aHF +aHF asv awf awf @@ -62796,7 +63034,7 @@ acP acP acP acP -acP +asc amI vti atY @@ -62830,11 +63068,11 @@ aEO anJ aTd aIn -aIn aMc aHD +aIn aWJ -aBR +aMc asv aYX aZE @@ -62853,9 +63091,9 @@ bgc bfe bgI asv -aHD -aBR -aBR +aHF +aHF +aHF asv bjJ bgx @@ -63006,14 +63244,14 @@ acP acP acP acP -acP -acP -acP -acP -acP -acP -acP -acP +agq +ahe +ahe +ahe +ahe +ahe +ahe +ahS amI aty atY @@ -63047,11 +63285,11 @@ aRj aqz aHD aUh -aIn aMc aHD +aIn aWJ -aFL +aWW asH aYY aZE @@ -63070,9 +63308,9 @@ bgd bgd aLf asH -aHD -aBR -aBR +aHF +aHF +aHF asv beI bgx @@ -63223,7 +63461,7 @@ acP akV acP acP -acP +asc ako ako ako @@ -63264,11 +63502,11 @@ aEO anJ aHD aIn -aIn aMc aHD +aIn aWJ -aBR +aMc asH aYZ aZE @@ -63288,8 +63526,8 @@ bgs bfM avr bhT -aBR -aBR +aHF +aHF asv beI bgx @@ -63440,7 +63678,7 @@ acP acP acP acP -acP +asc aku aoo apc @@ -63453,7 +63691,7 @@ atC ars amn amn -aws +jZp axh amn amn @@ -63481,11 +63719,11 @@ aRk anJ aTe aFM -aFM aHF aHD +aIn aWJ -aBR +aMc asH aZa aZE @@ -63504,9 +63742,9 @@ bgc bgc bgK asH -aHD -aBR -aBR +aHF +aHF +aHF asv bjK aZF @@ -63657,7 +63895,7 @@ acP acP acP acP -acP +asc aku aop apc @@ -63696,13 +63934,13 @@ aLr aPY aEO aSc -aHD aHF aHF aHF aHD +aIn aWJ -aBR +aMc asv aYY aZE @@ -63722,7 +63960,7 @@ bgt bgL asv bhU -aBR +aHF rHD asv bjL @@ -63874,7 +64112,7 @@ acP acP acP acP -acP +asc aku aop apc @@ -63912,14 +64150,14 @@ aNU aEO aEO aRl -aER +cNH aTf aHF aHF -aHF aHD +aIn aWJ -aBR +aMc asv aZb aZE @@ -64091,7 +64329,7 @@ acP acP acP acP -acP +asc aku aoq apd @@ -64131,12 +64369,12 @@ aDW aRm anJ aTg -aMg aHF aHF -aWI +aHD +aIn aWJ -aBR +aMc asv asv asv @@ -64308,7 +64546,7 @@ aao acP acP acP -acP +asc ako ako ako @@ -64347,15 +64585,15 @@ aEO aNS aEO anJ -aTh +bhR aUi -aMc +aHF aHD aIn aIp -aBR -aBR -aBR +aMc +aHF +aHF asv baf bac @@ -64525,7 +64763,7 @@ aao acP acP acP -acP +asc ako aor ape @@ -64564,15 +64802,15 @@ aKx aNS aRn aqz -aTh -aIn -aMc -aHD -aWJ -aBR -aBR -aBR -aBR +bhR +aHF +aHF +aHF +aFM +aFM +aHF +aHF +aHF asv bag bac @@ -64742,7 +64980,7 @@ aao aao acP acP -acP +asc ako aos ape @@ -64781,11 +65019,11 @@ aKx aNS aEO anJ -aTh -aIn -aMc -aHD -aIn +bhR +aHF +aHF +aHF +aHF asv asv asv @@ -64798,7 +65036,7 @@ aZE aXr aXr aXU -aXr +bET beI bft asv @@ -64808,10 +65046,10 @@ bgN bgg bhX asv -bja -bfw -bfw -bfw +bqa +bep +bep +bqa awp bkU bkU @@ -64959,7 +65197,7 @@ aao aao aao acP -acP +asc ako aos ape @@ -64998,11 +65236,11 @@ aKx aNS aRk anJ -aTh -aIn -aMc -aHD -aIn +bhR +aHF +aHF +aHF +aHF asv aXS aYs @@ -65026,9 +65264,9 @@ bgf bgg asH bjb -bes -bes -bes +bfw +bfw +bpX awp bkT blG @@ -65176,7 +65414,7 @@ aao aao aao acP -acP +asc ako aos apf @@ -65216,10 +65454,10 @@ aNS aEO aqz aTi -bfI aVp aVp -bfI +aVp +aVp aXq bcX bcX @@ -65245,7 +65483,7 @@ asv bjb bes bes -bes +bpX awp awp awp @@ -65429,15 +65667,15 @@ anJ anJ anJ anJ -aNS +sPv aRo anJ aTj aMg aMg aMg -aMg -aXr +aHF +bET aXr aXr aXU @@ -65462,16 +65700,16 @@ asH bjb bjl bes -bes -bki -bes -bes -bes -bes -bes -bes -bes -bpX +jfr +bep +bep +bep +bep +bep +bep +bep +bep +bqa bWk bMf xJC @@ -65621,7 +65859,7 @@ ako asQ atE atE -apc +ovq apc aop apc @@ -65653,7 +65891,7 @@ aTk aQu aQu aQu -aQu +aTr asH aXU aYt @@ -65870,7 +66108,7 @@ aTk aQu aVq aVq -aQu +aTr asv aXV aYu @@ -66087,7 +66325,7 @@ aTk aUk aKP aKP -aWK +aTr asv asv asv @@ -66297,16 +66535,16 @@ anT anT anT anT -aQc +cYI aRp anT aTk aUk aKP aVY -aKP -aSh -aTr +aXW +aSg +aTq aTq aTq asv @@ -66326,7 +66564,7 @@ bfP bfP bhl bbB -aXr +bET bqa bja beq @@ -66518,11 +66756,11 @@ aQd aIE anT aTk -aUl -aOk -aOk -aOk -aQu +aUk +aKP +aKP +aKP +aSh aTr aTq aTq @@ -66735,11 +66973,11 @@ aQe aQm aqU aTk -aTu -aTu -aTu -aTu -aTu +aUl +aOk +aOk +aOk +aQu aTr aTq aTq @@ -66927,7 +67165,7 @@ ako avJ apc axl -apc +ovq ayz ayz aAh @@ -66952,12 +67190,12 @@ aQf aQh aqU aTl -aSg -aSg -aSg -aSg -aSg -aTr +aTu +aTu +aTu +aTu +aTu +aTq aTq aTq asv @@ -67168,13 +67406,13 @@ aOY aQg aCo aqU -aTk -aQu -aVq -aVq -aVq -aQu -aTr +aDy +aSg +aSg +aSg +aSg +aSg +aTq aTq aTq asv @@ -67386,11 +67624,11 @@ aMQ aMN aqU aTk -aUk -aKP -aKP -aKP -aSh +aQu +aVq +aVq +aVq +aQu aTr aTq aTq @@ -67411,7 +67649,7 @@ bgA bgU bhn bgB -aXr +bET gSg bja bjm @@ -67622,7 +67860,7 @@ aXr asv beI bbB -bfR +bET bfR bgB bgB @@ -67642,11 +67880,11 @@ ujD ujD vVZ rjw -brD +fCb aao -brD -brD -brD +fCb +fCb +fCb aao pcF kBn @@ -67858,17 +68096,17 @@ uij uij uVe brD -brD -brD +fCb +fCb rjw -brD -brD +fCb +fCb rjw -brD +fCb pcF kBn iZA -fjP +dIb pQv fwV fwV @@ -68035,7 +68273,7 @@ aOd aPb aQj aRr -aCZ +tKR aTk aQu aUk @@ -68077,17 +68315,17 @@ iXp aao aao rjw -brD +fCb aao aao aao aao pcF fjP -fjP -fjP -fjP -fjP +dIb +dIb +dIb +dIb fwV kBn aao @@ -68238,7 +68476,7 @@ anT anY anY anY -aQa +cYI aGa anY anT @@ -68293,19 +68531,19 @@ ujD ujD vVZ brE -brD -brD +fCb +fCb rjw -brD +fCb aao aao pcF kBn -fjP -fjP -fjP -fjP -fjP +dIb +dIb +dIb +dIb +dIb kBn aao aao @@ -68460,7 +68698,7 @@ aCo aGL anT anT -aJu +aJz anT anT aIE @@ -68512,16 +68750,16 @@ vVZ vVZ vVZ vVZ -brD +fCb vVZ vVZ vVZ pcF kBn -fjP -fjP -fjP -fjP +dIb +dIb +dIb +dIb iZA kBn aao @@ -68726,19 +68964,19 @@ mDs mDs ooD vVZ -brD -brD -brD -brD -brD -brD +fCb +fCb +fCb +fCb +fCb +fCb aao pcF kBn -fjP -fjP -fjP -fjP +dIb +dIb +dIb +dIb kBn kBn kSL @@ -68942,20 +69180,20 @@ cAs mDs mDs ooD -brD +myY kTs -brD +fCb bsH -brD -brD +fCb +fCb aao aao pcF kBn fwV -fjP -fjP -fjP +dIb +dIb +dIb ssE kSL fOx @@ -69109,7 +69347,7 @@ aDa aFa aEU aCZ -aCZ +tKR aIC aJx aKH @@ -69159,10 +69397,10 @@ cAs mDs mDs ooD -brD -brD -brD -brD +myY +fCb +fCb +fCb aao aao aao @@ -69170,9 +69408,9 @@ aao pcF kBn mRD -fjP -fjP -fjP +dIb +dIb +dIb ssE kSL fOx @@ -69377,7 +69615,7 @@ mDs mDs ooD vVZ -brD +fCb kTs kTs aao @@ -69387,8 +69625,8 @@ aao pcF kBn fwV -fjP -fjP +dIb +dIb kBn kBn fOx @@ -69595,11 +69833,11 @@ bpZ qkC vVZ kTs -brD -brD -brD -brD -brD +fCb +fCb +fCb +fCb +fCb brE pcF kBn @@ -70222,8 +70460,8 @@ aZe aTu aZe aZe -aVv -bes +aTu +kwQ bes bes bes @@ -70404,7 +70642,7 @@ arD arD arD arD -arD +aMk anW aDc aEi @@ -70422,8 +70660,8 @@ aDc aEi aQr anW -aQu -aTr +aTq +aTq aTk aUk aKP @@ -70440,7 +70678,7 @@ atP atP atb iIp -bes +bja bes bes bes @@ -70621,7 +70859,7 @@ arD arD arD arD -arD +aMk anW aDc aEi @@ -70639,8 +70877,8 @@ aDc aEi aEi aqx -aQu -aTr +aTq +aTq aUp aUk aKP @@ -70657,7 +70895,7 @@ bal bal bdE atb -bes +bja bes bes bes @@ -70838,7 +71076,7 @@ arD arD arD arD -arD +aMk anW aDc aEi @@ -70856,8 +71094,8 @@ aLF aPk aEi aqx -aQu -aTr +aTq +aTq aUp aQu aVr @@ -70866,15 +71104,15 @@ aKP aKP aTr atd -aZi +nRT bam bal bbD bal bdd -aZi +nRT atb -bes +bja bes bes bes @@ -71055,7 +71293,7 @@ arD arD arD arD -arD +aMk anW aDc aEi @@ -71073,8 +71311,8 @@ aOi aPl aQs anW -aQu -aTs +aTq +aTp aUp aQu aUk @@ -71083,15 +71321,15 @@ aKP aKP aTr atd -aZi +nRT ban baR bbE baR baR -aZi +nRT atb -bes +bja bes bes bes @@ -71272,7 +71510,7 @@ arD arD arD arD -arD +aMk anW aDd aEi @@ -71290,7 +71528,7 @@ aOj aPm aQt aRu -aSf +nnK aTt aUq aQu @@ -71300,7 +71538,7 @@ aKP aMR aTr atb -aZi +nRT bao baS bbF @@ -71308,7 +71546,7 @@ bao baS bdF atb -bes +bja bes bes aEX @@ -71489,7 +71727,7 @@ arD arD arD arD -arD +aMk anW aDe aQt @@ -71506,8 +71744,8 @@ aEi aOj aPn aEi -aEi -aSg +ocA +aTq aTp aUr aQu @@ -71517,15 +71755,15 @@ aOk aQu aTr atd -aZi +nRT bap baT bbF bap baT -aZi +nRT atb -bes +bja bes bes aEX @@ -71706,7 +71944,7 @@ arD arD arD arD -arD +aMk anW aDf anW @@ -71724,8 +71962,8 @@ aOj aPo aQs anW -aQu -aTr +aTq +aTq aUs aSf aSf @@ -71734,15 +71972,15 @@ aSf aSf aYv atd -aZi +nRT baq baU bbF bar baU -aZi +nRT atb -bes +bja bes bes bes @@ -71923,7 +72161,7 @@ aao arD arD arD -arD +aMk anW aDg aEk @@ -71941,8 +72179,8 @@ aGO aPp aEi aqx -aQu -aTr +aTq +aTq foT aSg aSg @@ -71951,15 +72189,15 @@ aSg aSg qhl atb -aZi +nRT bap baT bbF bcl baT -aZi +nRT atb -bes +bja bes bes bes @@ -72140,7 +72378,7 @@ aao arD arD arD -arD +aMk anW aDh aEl @@ -72158,8 +72396,8 @@ aEi aEi aEi aqx -aQu -aTr +aTq +aTq aUp aQu aVq @@ -72168,15 +72406,15 @@ aQu aQu aYx atd -aZi +nRT bar baU bbF bar baU -aZi +nRT atb -bes +bja bes bes bes @@ -72357,7 +72595,7 @@ aao aao aao arD -arD +aMk anW anW anW @@ -72375,8 +72613,8 @@ aoc aoc anW anW -aQu -aTs +aTq +aTp aUp aUk aKP @@ -72385,7 +72623,7 @@ aWK aQu aYx atd -aZi +nRT bap baT bbF @@ -72393,7 +72631,7 @@ bap baT bdG atb -bes +bja bes bes bes @@ -72574,26 +72812,26 @@ aao aao aao arD -arD -arD -arD -arD -arD -arD -arD -arD -arD -arD -aKP -aKP -aKP -aKP -aKP -aKP -aKP -aKP -aSh -aTs +bMz +aqa +aqa +aqa +aqa +aqa +aqa +aqa +aqa +aqa +aSg +aSg +aSg +aSg +aSg +aSg +aSg +aSg +aSg +aTp aUp aUk aKP @@ -72608,9 +72846,9 @@ baV bbG bar baU -aZi +nRT atb -bes +bja bes bes bes @@ -72825,9 +73063,9 @@ baT bbF bap baT -aZi +nRT atb -bes +bja bes bes bes @@ -73042,9 +73280,9 @@ baU bbH bar baU -aZi +nRT atb -bes +bja bes bes aEX @@ -73243,8 +73481,8 @@ aOk aOk aQu kYd -lEb -wMP +wNw +wNw aUu wNw kYd @@ -73261,7 +73499,7 @@ bap baT bdF atb -bes +bja bes aEX aEX @@ -73476,9 +73714,9 @@ baS bbF bao baS -aZi +nRT atb -bes +bja bes aEX aEX @@ -73677,8 +73915,8 @@ aao aao aao apI -lEb -wMP +wNw +wNw aUw wNw apI @@ -73687,15 +73925,15 @@ aXt aXX aTr aZi -aZi +nRT bat baW bbI bat baW -aZi +nRT atb -bes +bja bes aEX bes @@ -73904,15 +74142,15 @@ aXt aXt aTr atb -aZi +nRT aJy aJy -aZi +nRT aJy aJy bdI atb -bes +bja bes bes bes @@ -74129,7 +74367,7 @@ atb atb atb atb -bes +bja bes bes bes @@ -75582,7 +75820,7 @@ adZ adZ adZ adZ -agQ +aCy ahB adZ aev @@ -75821,7 +76059,7 @@ aev adZ aup agd -aqc +auy auY aqc aqc @@ -76263,7 +76501,7 @@ amk amk anI anL -aAO +hmm aCr anL anI @@ -76926,7 +77164,7 @@ aIK aJE aKQ aKQ -aKQ +hmm aMT aOn aOn @@ -77338,7 +77576,7 @@ aao azm amk amk -agd +auy ave amk amk @@ -77753,7 +77991,7 @@ adZ adZ adZ agX -ahK +agc aio adZ adZ @@ -77971,7 +78209,7 @@ aao adZ adZ ahL -ahK +agc aiR adZ adZ @@ -78440,7 +78678,7 @@ poF aFk aGg aGU -aGU +xNL aIO tkN anI @@ -78623,7 +78861,7 @@ adZ adZ adZ adZ -agc +aCy ajr adZ afd @@ -78658,7 +78896,7 @@ anI anI vbi aHQ -aHQ +hWa wko anI aao @@ -79953,7 +80191,7 @@ eFh anL aAT aAY -aCy +aPq aDq hWa aFm @@ -81472,7 +81710,7 @@ eFh anL aAY aAU -aCy +aPq aDq hWa aFo diff --git a/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm b/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm index 2ff5c47fb6c7..b1a2ababa604 100644 --- a/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm +++ b/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm @@ -658,12 +658,7 @@ /turf/open/floor, /area/bigredv2/outside/engineering) "dj" = ( -/obj/effect/decal/cleanable/dirt{ - acid_damage = 1; - icon_state = "greenglow"; - luminosity = 1; - name = "glowing goo" - }, +/obj/effect/decal/cleanable/dirt/greenglow, /turf/open/gm/river, /area/bigredv2/outside/engineering) "dk" = ( @@ -693,12 +688,7 @@ /area/bigredv2/outside/engineering) "dq" = ( /obj/item/bananapeel, -/obj/effect/decal/cleanable/dirt{ - acid_damage = 1; - icon_state = "greenglow"; - luminosity = 1; - name = "glowing goo" - }, +/obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/plating, /area/bigredv2/outside/engineering) "dr" = ( @@ -718,12 +708,7 @@ /turf/open/floor/plating, /area/bigredv2/outside/engineering) "dx" = ( -/obj/effect/decal/cleanable/dirt{ - acid_damage = 1; - icon_state = "greenglow"; - luminosity = 1; - name = "glowing goo" - }, +/obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -815,33 +800,18 @@ /turf/open/floor/plating, /area/bigredv2/outside/engineering) "dY" = ( -/obj/effect/decal/cleanable/dirt{ - acid_damage = 1; - icon_state = "greenglow"; - luminosity = 1; - name = "glowing goo" - }, +/obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor{ icon_state = "wall_thermite" }, /area/bigredv2/outside/engineering) "dZ" = ( -/obj/effect/decal/cleanable/dirt{ - acid_damage = 1; - icon_state = "greenglow"; - luminosity = 1; - name = "glowing goo" - }, +/obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/plating, /area/bigredv2/outside/engineering) "eb" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt{ - acid_damage = 1; - icon_state = "greenglow"; - luminosity = 1; - name = "glowing goo" - }, +/obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -862,12 +832,7 @@ /area/bigredv2/outside/engineering) "eh" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt{ - acid_damage = 1; - icon_state = "greenglow"; - luminosity = 1; - name = "glowing goo" - }, +/obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/plating, /area/bigredv2/outside/engineering) "ei" = ( @@ -913,12 +878,7 @@ /turf/open/floor/plating, /area/bigredv2/outside/engineering) "eo" = ( -/obj/effect/decal/cleanable/dirt{ - acid_damage = 1; - icon_state = "greenglow"; - luminosity = 1; - name = "glowing goo" - }, +/obj/effect/decal/cleanable/dirt/greenglow, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave{ icon_state = "mars_cave_7" @@ -958,12 +918,7 @@ /area/bigredv2/outside/engineering) "ex" = ( /obj/effect/decal/cleanable/molten_item, -/obj/effect/decal/cleanable/dirt{ - acid_damage = 1; - icon_state = "greenglow"; - luminosity = 1; - name = "glowing goo" - }, +/obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor{ icon_state = "wall_thermite" }, @@ -990,12 +945,7 @@ }, /area/bigredv2/outside/engineering) "eB" = ( -/obj/effect/decal/cleanable/dirt{ - acid_damage = 1; - icon_state = "greenglow"; - luminosity = 1; - name = "glowing goo" - }, +/obj/effect/decal/cleanable/dirt/greenglow, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave, /area/bigredv2/outside/lz2_south_cas) @@ -1028,12 +978,7 @@ /area/bigredv2/outside/telecomm/engi) "eG" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt{ - acid_damage = 1; - icon_state = "greenglow"; - luminosity = 1; - name = "glowing goo" - }, +/obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor{ icon_state = "wall_thermite" }, @@ -1056,12 +1001,7 @@ /area/bigredv2/outside/engineering) "eK" = ( /obj/effect/decal/cleanable/molten_item, -/obj/effect/decal/cleanable/dirt{ - acid_damage = 1; - icon_state = "greenglow"; - luminosity = 1; - name = "glowing goo" - }, +/obj/effect/decal/cleanable/dirt/greenglow, /turf/open/gm/river, /area/bigredv2/outside/engineering) "eL" = ( @@ -1071,22 +1011,12 @@ }, /area/bigredv2/outside/engineering) "eM" = ( -/obj/effect/decal/cleanable/dirt{ - acid_damage = 1; - icon_state = "greenglow"; - luminosity = 1; - name = "glowing goo" - }, +/obj/effect/decal/cleanable/dirt/greenglow, /obj/effect/decal/cleanable/molten_item, /turf/open/gm/river, /area/bigredv2/outside/engineering) "eN" = ( -/obj/effect/decal/cleanable/dirt{ - acid_damage = 1; - icon_state = "greenglow"; - luminosity = 1; - name = "glowing goo" - }, +/obj/effect/decal/cleanable/dirt/greenglow, /turf/open/mars_cave{ icon_state = "mars_cave_5" }, diff --git a/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm b/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm index 1f5792284797..7acf197b3ddb 100644 --- a/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm +++ b/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm @@ -52,7 +52,6 @@ }, /area/bigredv2/outside/chapel) "aj" = ( -/obj/item/changestone, /turf/open/floor{ icon_state = "darkish" }, diff --git a/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm b/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm index 01e35b6a6faf..8907ab630fcb 100644 --- a/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm +++ b/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm @@ -5,18 +5,14 @@ pixel_y = 28; start_charge = 0 }, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "aN" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/secure_data{ dir = 8 }, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "bp" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ @@ -24,16 +20,12 @@ locked = 0; name = "\improper Checkpoint Office" }, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "bx" = ( /obj/structure/surface/table/almayer, /obj/item/device/motiondetector, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "cO" = ( /obj/effect/decal/cleanable/dirt, @@ -53,9 +45,7 @@ "el" = ( /obj/structure/surface/table/almayer, /obj/item/handcuffs, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "ge" = ( /obj/structure/closet/secure_closet/marshal, @@ -68,7 +58,7 @@ }, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigred/ground/security) "ie" = ( @@ -81,8 +71,8 @@ /obj/structure/surface/table/almayer, /obj/structure/transmitter/colony_net/rotary{ phone_category = "Solaris Ridge"; - phone_id = "Filtration Checkpoint"; - phone_color = "red" + phone_color = "red"; + phone_id = "Filtration Checkpoint" }, /turf/open/floor/greengrid, /area/bigred/ground/security) @@ -133,9 +123,7 @@ "pV" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/tool, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "qg" = ( /obj/effect/decal/cleanable/dirt, @@ -146,17 +134,13 @@ "qy" = ( /obj/item/device/radio, /obj/structure/surface/table/almayer, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "rD" = ( /obj/structure/machinery/camera/autoname{ dir = 8 }, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "rF" = ( /obj/structure/machinery/deployable/barrier, @@ -169,15 +153,12 @@ name = "Filtration Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/filtration_cave_cas) "uk" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "uF" = ( /obj/structure/surface/table/almayer, @@ -190,21 +171,17 @@ name = "\improper Checkpoint Office" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigred/ground/security) "vH" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "vO" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/metal/small_stack, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "wi" = ( /obj/effect/decal/cleanable/dirt, @@ -220,9 +197,7 @@ /obj/structure/bed/chair/office/light{ dir = 4 }, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "xr" = ( /obj/structure/surface/rack, @@ -231,9 +206,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "zE" = ( /obj/effect/decal/cleanable/dirt, @@ -250,9 +223,7 @@ }, /area/bigredv2/outside/filtration_cave_cas) "AY" = ( -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "AZ" = ( /turf/open/floor{ @@ -309,18 +280,14 @@ "KO" = ( /obj/item/trash/sosjerky, /obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "LX" = ( /obj/structure/machinery/light{ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "Mq" = ( /obj/structure/surface/table/almayer, @@ -335,9 +302,7 @@ dir = 8 }, /obj/structure/machinery/vending/security, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "OD" = ( /turf/open/floor{ @@ -355,9 +320,7 @@ "Pf" = ( /obj/effect/decal/cleanable/blood, /obj/effect/spawner/gibspawner/human, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "PS" = ( /turf/open/mars, @@ -370,8 +333,7 @@ name = "Filtration Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/filtration_cave_cas) "Qo" = ( @@ -384,9 +346,7 @@ }, /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "SF" = ( /obj/structure/window/framed/solaris/reinforced, @@ -413,9 +373,7 @@ /area/bigred/ground/security) "VI" = ( /obj/structure/largecrate, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "Wa" = ( /turf/open/floor{ @@ -432,9 +390,7 @@ "Yo" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "YZ" = ( /obj/structure/surface/table/almayer, @@ -456,9 +412,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) (1,1,1) = {" @@ -522,7 +476,7 @@ uk AY uk uk -xa +AY hz "} (5,1,1) = {" diff --git a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm index 622307f8e8e9..e712260a4947 100644 --- a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm +++ b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm @@ -1,15 +1,10 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aa" = ( -/turf/open/floor{ - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/c) "ab" = ( /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 6 + dir = 5; + icon_state = "asteroidwarning" }, -/area/bigredv2/outside/c) +/area/bigredv2/outside/e) "ac" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_4" @@ -23,14 +18,8 @@ "ae" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 8 - }, -/area/bigredv2/outside/c) -"af" = ( -/turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 4 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "ag" = ( @@ -39,10 +28,11 @@ }, /area/bigredv2/outside/e) "ah" = ( -/turf/open/mars{ - icon_state = "mars_dirt_14" +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" }, -/area/bigredv2/outside/e) +/area/bigredv2/outside/c) "ai" = ( /turf/open/mars, /area/bigredv2/outside/e) @@ -53,14 +43,14 @@ /area/bigredv2/outside/e) "ak" = ( /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 8 + dir = 8; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/e) "al" = ( /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 4 + dir = 4; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/e) "am" = ( @@ -74,7 +64,10 @@ }, /area/bigredv2/outside/c) "ao" = ( -/turf/open/mars, +/turf/open/floor{ + dir = 9; + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/c) "ap" = ( /turf/closed/wall/solaris, @@ -108,7 +101,10 @@ /area/bigredv2/outside/e) "au" = ( /obj/effect/landmark/crap_item, -/turf/open/mars, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/c) "av" = ( /obj/structure/machinery/vending/snack, @@ -152,14 +148,15 @@ /area/bigredv2/outside/office_complex) "aA" = ( /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 1 + dir = 1; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/e) "aB" = ( +/obj/effect/landmark/lv624/xeno_tunnel, /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 9 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aC" = ( @@ -184,14 +181,14 @@ /area/bigredv2/outside/office_complex) "aG" = ( /turf/open/floor{ - icon_state = "asteroidfloor"; - dir = 1 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/e) "aH" = ( /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 8 + dir = 8; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) "aI" = ( @@ -439,8 +436,8 @@ "bx" = ( /obj/item/shard, /turf/open/floor{ - icon_state = "asteroidfloor"; - dir = 1 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/e) "by" = ( @@ -556,8 +553,8 @@ "bR" = ( /obj/item/shard, /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 8 + dir = 8; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) "bS" = ( @@ -604,8 +601,8 @@ /area/bigredv2/outside/office_complex) "bY" = ( /turf/open/floor{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/bigredv2/outside/office_complex) "bZ" = ( @@ -768,8 +765,8 @@ /area/bigredv2/outside/office_complex) "cw" = ( /obj/item/weapon/gun/rifle/nsg23/no_lock/stripped{ - name = "smashed NSG 23 assault rifle"; - desc = "A rare sight, this rifle is seen most commonly in the hands of Weyland-Yutani PMCs. Compared to the M41A MK2, it has noticeably improved handling and vastly improved performance at long and medium range, but compares similarly up close. This one seems to have been heavily damaged from impact, you can still see some debris that resembles a scope and underbarrel attachment point on it." + desc = "A rare sight, this rifle is seen most commonly in the hands of Weyland-Yutani PMCs. Compared to the M41A MK2, it has noticeably improved handling and vastly improved performance at long and medium range, but compares similarly up close. This one seems to have been heavily damaged from impact, you can still see some debris that resembles a scope and underbarrel attachment point on it."; + name = "smashed NSG 23 assault rifle" }, /turf/open/shuttle/dropship{ icon_state = "rasputin12" @@ -936,8 +933,8 @@ "cV" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/bigredv2/outside/office_complex) "cW" = ( @@ -950,8 +947,8 @@ /area/bigredv2/outside/office_complex) "cX" = ( /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 10 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "cY" = ( @@ -959,13 +956,15 @@ icon_state = "gib6" }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "cZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "da" = ( @@ -1083,7 +1082,9 @@ "dt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/mars, +/turf/open/mars{ + icon_state = "mars_dirt_12" + }, /area/bigredv2/outside/se) "du" = ( /obj/effect/decal/cleanable/dirt, @@ -1099,15 +1100,15 @@ /area/bigredv2/outside/se) "dw" = ( /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 10 + dir = 10; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/se) "dx" = ( /obj/item/tool/warning_cone, /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 6 + dir = 6; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/se) "dz" = ( @@ -1146,8 +1147,8 @@ /area/bigredv2/outside/office_complex) "dE" = ( /obj/effect/decal/cleanable/blood{ - icon_state = "gib6"; - dir = 1 + dir = 1; + icon_state = "gib6" }, /turf/open/shuttle/dropship{ icon_state = "rasputin3" @@ -1286,15 +1287,15 @@ "dW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 1 + dir = 4; + icon_state = "asteroidwarning" }, -/area/bigredv2/outside/e) +/area/bigredv2/outside/se) "dX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "asteroidfloor"; - dir = 1 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/e) "dY" = ( @@ -1359,8 +1360,8 @@ "eg" = ( /obj/item/stack/rods, /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 8 + dir = 8; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) "eh" = ( @@ -1435,8 +1436,8 @@ /area/bigredv2/outside/office_complex) "jx" = ( /obj/effect/decal/cleanable/blood{ - icon_state = "gib6"; - dir = 1 + dir = 1; + icon_state = "gib6" }, /obj/item/limb/leg/l_leg, /turf/open/shuttle/dropship{ @@ -1506,11 +1507,9 @@ /area/bigredv2/outside/office_complex) "uC" = ( /obj/effect/spawner/gibspawner/human, -/obj/item/weapon/gun/rifle/m41a/corporate{ - current_mag = /obj/item/ammo_magazine/rifle/rubber; - name = "battered M41A pulse rifle MK2"; - pixel_x = 4; - desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition. It seems to be pretty battered and broken up." +/obj/item/weapon/gun/rifle/m41a/corporate/no_lock{ + desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition. The IFF electronics appear to be non-functional."; + name = "battered M41A pulse rifle Mk2" }, /turf/open/shuttle/dropship{ icon_state = "rasputin3" @@ -1570,11 +1569,9 @@ }, /area/bigredv2/outside/office_complex) "GG" = ( -/obj/item/weapon/gun/rifle/m41a/corporate{ - current_mag = /obj/item/ammo_magazine/rifle/rubber; - name = "battered M41A pulse rifle MK2"; - pixel_x = 4; - desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition. It seems to be pretty battered and broken up." +/obj/item/weapon/gun/rifle/m41a/corporate/no_lock{ + desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition. The IFF electronics appear to be non-functional."; + name = "battered M41A pulse rifle Mk2" }, /turf/open/shuttle/dropship{ icon_state = "rasputin3" @@ -1583,8 +1580,8 @@ "Ha" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "asteroidfloor"; - dir = 1 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/se) "Lk" = ( @@ -1607,8 +1604,8 @@ /area/bigredv2/outside/office_complex) "PR" = ( /turf/open/floor{ - icon_state = "asteroidfloor"; - dir = 1 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/se) "Qc" = ( @@ -1635,18 +1632,12 @@ icon_state = "floor8" }, /area/bigredv2/outside/office_complex) -"ZG" = ( -/obj/effect/landmark/objective_landmark/close, -/turf/open/mars_cave{ - icon_state = "mars_dirt_4" - }, -/area/bigredv2/outside/e) (1,1,1) = {" -aa +ac ad ao -aB +aH aH aH aH @@ -1662,17 +1653,17 @@ bR aH eg aH -aH -aH cX -ao -ao -ao +cX +cX +cX +cX +cX "} (2,1,1) = {" -aa +ac ad -ao +ah ap ap ap @@ -1691,15 +1682,15 @@ ax aY ap ap -aa -ao -ao +cX +cX +cX ap "} (3,1,1) = {" -aa +ac ad -ao +ah ap aI aR @@ -1718,13 +1709,13 @@ cq ca cH ap -aa -ao -ao +cX +cX +cX ap "} (4,1,1) = {" -aa +ac ad au as @@ -1745,15 +1736,15 @@ ck ej cI as -aa -ao -ao +cX +cX +cX ap "} (5,1,1) = {" -aa +ac ad -ao +ah as aK bB @@ -1773,14 +1764,14 @@ ek cm cR cY -ao -ao +cX +cX ap "} (6,1,1) = {" -aa +ac ad -ao +ah as aL aR @@ -1799,15 +1790,15 @@ eh aS ed as -aa -ao -ao +cX +cX +cX ap "} (7,1,1) = {" -aa +ac ad -ao +ah ap aJ aR @@ -1827,14 +1818,14 @@ cr cr ap cZ -ao -ao +cX +aB ap "} (8,1,1) = {" -aa +ac ad -ao +ah ap aM aS @@ -1859,9 +1850,9 @@ ap ap "} (9,1,1) = {" -ab +ac ad -ao +ah ap ap ap @@ -1888,9 +1879,9 @@ dr (10,1,1) = {" ac an -ao -ao -ao +ah +cX +cX ap aC bj @@ -1913,11 +1904,11 @@ bu ar "} (11,1,1) = {" -ad -ao -ao -ao -ao +aH +aH +cX +cX +cX by aN id @@ -1940,7 +1931,7 @@ bI bI "} (12,1,1) = {" -ac +cX ap ap ap @@ -1964,10 +1955,10 @@ id yS cE dm -ds +dW "} (13,1,1) = {" -ac +cX ap av ar @@ -2021,7 +2012,7 @@ do ds "} (15,1,1) = {" -af +cX ar bt aD @@ -2048,7 +2039,7 @@ dp du "} (16,1,1) = {" -ag +aA ba bb aE @@ -2075,7 +2066,7 @@ dm dv "} (17,1,1) = {" -ZG +aA ap az bu @@ -2102,7 +2093,7 @@ dn dw "} (18,1,1) = {" -ah +aA ap ap ap @@ -2129,11 +2120,11 @@ do dq "} (19,1,1) = {" -ai -at -dW -dX -dX +ab +al +aG +aG +aG dY aN fv diff --git a/maps/map_files/BigRed/standalone/lambda-graveyard.dmm b/maps/map_files/BigRed/standalone/lambda-graveyard.dmm index 42e8b1d8b683..8dc12acf8d53 100644 --- a/maps/map_files/BigRed/standalone/lambda-graveyard.dmm +++ b/maps/map_files/BigRed/standalone/lambda-graveyard.dmm @@ -2,28 +2,16 @@ "a" = ( /turf/open/mars, /area/bigredv2/outside/se) -"b" = ( -/obj/structure/prop/dam/wide_boulder/boulder1, -/turf/open/mars, -/area/bigredv2/outside/se) -"c" = ( -/turf/open/mars{ - icon_state = "mars_dirt_13" - }, -/area/bigredv2/outside/se) -"d" = ( -/turf/open/mars{ - icon_state = "mars_dirt_10" - }, -/area/bigredv2/outside/se) "e" = ( -/turf/open/mars{ - icon_state = "mars_dirt_14" +/turf/open/floor{ + icon_state = "asteroidwarning" }, /area/bigredv2/outside/se) "f" = ( /obj/item/stool, -/turf/open/mars, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/se) "g" = ( /turf/open/mars{ @@ -103,7 +91,7 @@ /area/bigredv2/caves) (1,1,1) = {" -a +e a a a @@ -115,7 +103,7 @@ a D "} (2,1,1) = {" -a +e a a a @@ -127,7 +115,7 @@ a s "} (3,1,1) = {" -a +e a a a @@ -139,7 +127,7 @@ a a "} (4,1,1) = {" -a +e a a a @@ -151,7 +139,7 @@ a a "} (5,1,1) = {" -b +e a a o @@ -163,7 +151,7 @@ a a "} (6,1,1) = {" -a +e a a o @@ -175,7 +163,7 @@ o a "} (7,1,1) = {" -a +e a a a @@ -187,7 +175,7 @@ o o "} (8,1,1) = {" -c +e g l a @@ -199,7 +187,7 @@ a t "} (9,1,1) = {" -d +e h m a @@ -223,7 +211,7 @@ a t "} (11,1,1) = {" -a +e a a a @@ -235,7 +223,7 @@ a t "} (12,1,1) = {" -a +e a a a @@ -247,7 +235,7 @@ a t "} (13,1,1) = {" -a +e a a o @@ -259,7 +247,7 @@ r t "} (14,1,1) = {" -a +e a o o @@ -271,7 +259,7 @@ a t "} (15,1,1) = {" -a +e j o o @@ -295,7 +283,7 @@ s s "} (17,1,1) = {" -a +e a p a @@ -307,7 +295,7 @@ s s "} (18,1,1) = {" -a +e a a a diff --git a/maps/map_files/BigRed/standalone/medbay-passage.dmm b/maps/map_files/BigRed/standalone/medbay-passage.dmm index a8dbb6c719e5..75d323f0116d 100644 --- a/maps/map_files/BigRed/standalone/medbay-passage.dmm +++ b/maps/map_files/BigRed/standalone/medbay-passage.dmm @@ -2,12 +2,6 @@ "a" = ( /turf/template_noop, /area/template_noop) -"b" = ( -/turf/open/floor{ - dir = 8; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/c) "c" = ( /obj/structure/sign/safety/medical{ pixel_x = 0; @@ -43,12 +37,6 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) -"g" = ( -/turf/open/floor{ - dir = 4; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/c) "h" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -99,9 +87,9 @@ (1,1,1) = {" a a -b -b -b +l +l +l R "} (2,1,1) = {" @@ -139,8 +127,8 @@ R (6,1,1) = {" a a -g -g -g +l +l +l R "} diff --git a/maps/map_files/BigRed/standalone/medbay-v3.dmm b/maps/map_files/BigRed/standalone/medbay-v3.dmm index e14dc4671a7e..aded8e8bb7cb 100644 --- a/maps/map_files/BigRed/standalone/medbay-v3.dmm +++ b/maps/map_files/BigRed/standalone/medbay-v3.dmm @@ -20,15 +20,15 @@ name = "\improper Medical Clinic" }, /turf/open/floor{ - icon_state = "warnwhite"; - dir = 1 + dir = 1; + icon_state = "warnwhite" }, /area/bigredv2/outside/medical) "ae" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "warnwhite"; - dir = 1 + dir = 1; + icon_state = "warnwhite" }, /area/bigredv2/outside/medical) "af" = ( @@ -37,8 +37,8 @@ "ag" = ( /obj/structure/closet/secure_closet/chemical, /turf/open/floor{ - icon_state = "whitepurplecorner"; - dir = 1 + dir = 1; + icon_state = "whitepurplecorner" }, /area/bigredv2/outside/medical) "ah" = ( @@ -60,8 +60,8 @@ /area/bigredv2/outside/medical) "ak" = ( /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "al" = ( @@ -78,16 +78,16 @@ "an" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "ao" = ( /obj/structure/machinery/chem_master, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "ap" = ( @@ -137,14 +137,14 @@ "aw" = ( /obj/structure/machinery/chem_dispenser, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "ax" = ( /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "ay" = ( @@ -158,15 +158,15 @@ "az" = ( /obj/structure/bed, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "aA" = ( /obj/structure/surface/table, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "aB" = ( @@ -196,8 +196,8 @@ /obj/item/storage/box/beakers, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "whitepurplecorner"; - dir = 1 + dir = 1; + icon_state = "whitepurplecorner" }, /area/bigredv2/outside/medical) "aF" = ( @@ -242,8 +242,8 @@ amount = 1 }, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "aL" = ( @@ -254,8 +254,8 @@ /area/bigredv2/outside/medical) "aM" = ( /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "aN" = ( @@ -284,8 +284,8 @@ "aQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "aR" = ( @@ -309,30 +309,30 @@ /area/bigredv2/outside/medical) "aU" = ( /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "aV" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "aX" = ( /obj/structure/window_frame/solaris, /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "aY" = ( /obj/item/shard, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "aZ" = ( @@ -376,15 +376,15 @@ "bf" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "bg" = ( /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "bh" = ( @@ -396,8 +396,8 @@ "bi" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "bj" = ( @@ -411,8 +411,8 @@ /obj/effect/decal/cleanable/dirt, /obj/item/frame/table, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "bl" = ( @@ -490,22 +490,22 @@ }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "bw" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "bx" = ( /obj/item/stack/rods, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "by" = ( @@ -517,8 +517,8 @@ /area/bigredv2/outside/medical) "bz" = ( /turf/open/floor{ - icon_state = "whitegreen"; - dir = 5 + dir = 5; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "bA" = ( @@ -584,8 +584,8 @@ /obj/item/shard, /obj/item/frame/table, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "bJ" = ( @@ -605,8 +605,8 @@ /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 1 + dir = 1; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "bM" = ( @@ -618,8 +618,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 1 + dir = 1; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "bN" = ( @@ -647,8 +647,8 @@ "bQ" = ( /obj/structure/machinery/light, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "bR" = ( @@ -769,8 +769,8 @@ "cj" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 4 + dir = 4; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "ck" = ( @@ -820,15 +820,15 @@ "cq" = ( /obj/item/ammo_casing/bullet, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "cr" = ( /obj/item/ammo_casing/bullet, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "cs" = ( @@ -846,15 +846,15 @@ "cu" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "cv" = ( /obj/item/ammo_casing/bullet, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "cw" = ( @@ -868,15 +868,15 @@ "cx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "cy" = ( /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 4 + dir = 4; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "cz" = ( @@ -885,8 +885,8 @@ }, /obj/item/shard, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 1 + dir = 1; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "cA" = ( @@ -910,8 +910,8 @@ icon_state = "coil2" }, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "cC" = ( @@ -920,8 +920,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "cD" = ( @@ -934,8 +934,8 @@ icon_state = "coil2" }, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "cE" = ( @@ -954,8 +954,8 @@ "cF" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 1 + dir = 1; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "cH" = ( @@ -965,8 +965,8 @@ icon_state = "coil2" }, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "cI" = ( @@ -979,8 +979,8 @@ icon_state = "coil2" }, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "cJ" = ( @@ -992,8 +992,8 @@ icon_state = "coil2" }, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "cK" = ( @@ -1008,8 +1008,8 @@ }, /obj/item/ammo_casing/bullet, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "cL" = ( @@ -1052,8 +1052,8 @@ "cR" = ( /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "cS" = ( @@ -1067,8 +1067,8 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "cU" = ( @@ -1091,16 +1091,16 @@ "cW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "cX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "cY" = ( @@ -1115,8 +1115,8 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "db" = ( @@ -1193,8 +1193,8 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "dn" = ( @@ -1225,8 +1225,8 @@ }, /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "dq" = ( @@ -1241,8 +1241,8 @@ /obj/effect/decal/cleanable/dirt, /obj/item/ammo_casing/bullet, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "ds" = ( @@ -1264,8 +1264,8 @@ pixel_x = 30 }, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "du" = ( @@ -1312,8 +1312,8 @@ }, /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "dA" = ( @@ -1337,16 +1337,16 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/objective_landmark/science, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "dD" = ( /obj/structure/surface/table, /obj/item/device/autopsy_scanner, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "dE" = ( @@ -1391,8 +1391,8 @@ /obj/effect/decal/cleanable/dirt, /obj/item/ammo_casing/bullet, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "dL" = ( @@ -1436,8 +1436,8 @@ /obj/structure/surface/table, /obj/item/reagent_container/food/snacks/sliceable/pizza/margherita, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "dT" = ( @@ -1466,8 +1466,8 @@ /obj/structure/machinery/body_scanconsole, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 6 + dir = 6; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "dX" = ( @@ -1485,8 +1485,8 @@ "dZ" = ( /obj/structure/bed/chair, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "ea" = ( @@ -1528,15 +1528,15 @@ /area/bigredv2/outside/medical) "ef" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, /obj/item/tool/surgery/scalpel/manager, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "eg" = ( @@ -1634,20 +1634,20 @@ /obj/structure/bed/chair, /obj/item/shard, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "es" = ( /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "et" = ( /obj/item/reagent_container/spray/cleaner{ - name = "Surgery 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." + 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{ icon_state = "white" @@ -1675,8 +1675,8 @@ "ew" = ( /obj/structure/surface/table, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "ex" = ( @@ -1684,23 +1684,23 @@ /obj/item/storage/box/masks, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "ey" = ( /obj/effect/decal/cleanable/dirt, /obj/item/frame/table, /turf/open/floor{ - icon_state = "whitepurplecorner"; - dir = 1 + dir = 1; + icon_state = "whitepurplecorner" }, /area/bigredv2/outside/medical) "ez" = ( /obj/item/device/healthanalyzer, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 4 + dir = 4; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "eA" = ( @@ -1742,15 +1742,15 @@ "eE" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "eF" = ( /obj/structure/closet/secure_closet/medical1, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "eG" = ( @@ -1758,8 +1758,8 @@ stored_metal = 1000 }, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "eH" = ( @@ -1774,8 +1774,8 @@ "eI" = ( /obj/structure/curtain/medical, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "eJ" = ( @@ -1798,8 +1798,8 @@ }, /obj/item/shard, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "eM" = ( @@ -1820,16 +1820,16 @@ "eO" = ( /obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "eP" = ( /obj/effect/decal/cleanable/dirt, /obj/item/ammo_casing/bullet, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "eQ" = ( @@ -1838,8 +1838,8 @@ /obj/effect/decal/cleanable/dirt, /obj/item/frame/table, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 9 + dir = 9; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "eR" = ( @@ -1889,16 +1889,16 @@ dir = 6 }, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "eY" = ( /obj/structure/bed, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 4 + dir = 4; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "eZ" = ( @@ -1906,8 +1906,8 @@ dir = 5 }, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "fa" = ( @@ -1918,8 +1918,8 @@ name = "\improper Medical Clinic Operating Theatre" }, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "fb" = ( @@ -1978,8 +1978,8 @@ "fj" = ( /obj/effect/decal/cleanable/vomit, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "fk" = ( @@ -2019,8 +2019,8 @@ /obj/structure/machinery/light, /obj/item/tool/surgery/cautery, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "fp" = ( @@ -2050,6 +2050,12 @@ icon_state = "platingdmg1" }, /area/bigredv2/outside/medical) +"hn" = ( +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/medical) "om" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor{ @@ -2066,27 +2072,27 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "MK" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "Xh" = ( /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Solaris Ridge"; phone_color = "green"; - phone_id = "Clinic Labs" + phone_id = "Clinic Labs"; + pixel_y = 24 }, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) @@ -2620,7 +2626,7 @@ ai ai dP ab -eU +hn "} (20,1,1) = {" af @@ -2648,7 +2654,7 @@ fg fg dP aa -eU +hn "} (21,1,1) = {" af @@ -2676,7 +2682,7 @@ eY fn fq aa -eU +hn "} (22,1,1) = {" af diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index 87a316e30c59..bddc64a61ad2 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -634,7 +634,7 @@ /obj/structure/window/reinforced{ layer = 3.8 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/gamma/foyer) "ace" = ( /obj/structure/machinery/landinglight/ds1/delayone{ @@ -829,7 +829,7 @@ /obj/structure/window/reinforced{ layer = 3.8 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/gamma/foyer) "acB" = ( /obj/structure/machinery/door/window/southleft{ @@ -1448,7 +1448,7 @@ /obj/structure/window/reinforced{ layer = 3.8 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/gamma/foyer) "aew" = ( /obj/effect/landmark/teleporter_loc/corsat_sigma_remote{ @@ -2506,7 +2506,7 @@ layer = 3.8 }, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/gamma/foyer) "ahw" = ( /turf/closed/wall/biodome, @@ -2530,7 +2530,7 @@ /obj/structure/window/reinforced{ layer = 3.8 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/gamma/hallwaysouth) "ahz" = ( /turf/closed/wall/r_wall/biodome/biodome_unmeltable, @@ -5960,11 +5960,11 @@ }, /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "arC" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "arE" = ( /obj/structure/window/reinforced{ @@ -5973,7 +5973,7 @@ }, /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "arF" = ( /obj/structure/machinery/light/small{ @@ -6017,7 +6017,7 @@ dir = 8 }, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "arN" = ( /turf/closed/wall/biodome, @@ -6051,7 +6051,7 @@ "arT" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "arU" = ( /obj/structure/machinery/washing_machine, @@ -6078,7 +6078,7 @@ }, /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "asa" = ( /turf/open/floor/corsat{ @@ -6130,7 +6130,7 @@ }, /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "asi" = ( /obj/structure/window/reinforced{ @@ -6138,7 +6138,7 @@ health = 80 }, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "asj" = ( /obj/structure/machinery/power/apc/hyper{ @@ -6161,7 +6161,7 @@ "asn" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "aso" = ( /turf/open/floor/corsat{ @@ -6263,7 +6263,7 @@ layer = 3.8 }, /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "asJ" = ( /turf/closed/wall/r_wall/biodome/biodome_unmeltable, @@ -6276,7 +6276,7 @@ layer = 3.8 }, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "asM" = ( /obj/structure/window/reinforced{ @@ -6288,7 +6288,7 @@ }, /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "asN" = ( /obj/structure/surface/table/woodentable, @@ -12923,7 +12923,7 @@ }, /area/corsat/theta/airlock/control) "aJZ" = ( -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "aKa" = ( /obj/structure/window/framed/corsat/security, @@ -12967,48 +12967,31 @@ /turf/open/floor/plating, /area/corsat/theta/airlock/control) "aKh" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "aKi" = ( /turf/open/gm/dirt, /area/corsat/theta/biodome) "aKj" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "aKk" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "aKl" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "aKm" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "aKn" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "aKo" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "aKp" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/corsat/theta/biodome) "aKq" = ( /turf/closed/wall/biodome, @@ -14979,10 +14962,8 @@ /area/corsat/gamma/foyer) "aPG" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "aPH" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -14993,15 +14974,9 @@ }, /area/corsat/gamma/hangar/checkpoint) "aPJ" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/alienplant1, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "aPK" = ( /obj/structure/surface/table/reinforced, @@ -15034,7 +15009,7 @@ "aPN" = ( /obj/effect/landmark/yautja_teleport, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "aPO" = ( /obj/structure/window/framed/corsat/security, @@ -18751,7 +18726,7 @@ "aZm" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "aZn" = ( /obj/structure/platform{ @@ -20308,60 +20283,43 @@ }, /area/corsat/theta/biodome/complex) "bcD" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "bcE" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "bcF" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "bcG" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "bcH" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "bcI" = ( /obj/structure/flora/jungle/plantbot1, /turf/open/gm/dirt, /area/corsat/theta/biodome) "bcJ" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "bcK" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "bcL" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "bcM" = ( /obj/structure/fence, @@ -20370,7 +20328,7 @@ "bcN" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bcO" = ( /obj/structure/sign/safety/airlock{ @@ -20402,35 +20360,22 @@ /area/corsat/gamma/freezer) "bcR" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/corsat/theta/biodome) "bcS" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "bcT" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/corsat/theta/biodome) "bcU" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "bcV" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "bcW" = ( /obj/structure/fence, @@ -20440,38 +20385,31 @@ /obj/structure/machinery/colony_floodlight{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "bcY" = ( /obj/structure/machinery/colony_floodlight{ dir = 4 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "bcZ" = ( /obj/structure/machinery/colony_floodlight{ dir = 8 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "bda" = ( /obj/structure/machinery/colony_floodlight{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "bdb" = ( /obj/structure/machinery/colony_floodlight{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "bdc" = ( /obj/structure/fence, @@ -20588,114 +20526,72 @@ }, /area/corsat/sigma/biodome/gunrange) "bdx" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "bdy" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "bdz" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/corsat/theta/biodome) "bdA" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/corsat/theta/biodome) "bdB" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/corsat/theta/biodome) "bdC" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/corsat/theta/biodome) "bdD" = ( /turf/open/gm/river, /area/corsat/theta/biodome) "bdE" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/corsat/theta/biodome) "bdF" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/corsat/theta/biodome) "bdG" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/corsat/theta/biodome) "bdI" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/corsat/theta/biodome) "bdJ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "bdK" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "bdL" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/corsat/theta/biodome) "bdM" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, -/area/corsat/theta/biodome) -"bdN" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner/south_west, /area/corsat/theta/biodome) "bdO" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/corsat/theta/biodome) "bdP" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass/weedable, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bdQ" = ( /turf/closed/gm/dense, /area/corsat/theta/biodome) "bdR" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bdS" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bdT" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "bdU" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -20703,65 +20599,45 @@ /area/corsat/theta/biodome) "bdV" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "bdW" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "bdX" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "bdY" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "bdZ" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bea" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "beb" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "bec" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "bed" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "bee" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "bef" = ( /turf/open/mars_cave{ @@ -20770,15 +20646,15 @@ /area/corsat/sigma/biodome/gunrange) "beg" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "beh" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bei" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bej" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -20804,23 +20680,17 @@ /turf/open/gm/dirt, /area/corsat/theta/biodome) "bem" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, -/turf/open/gm/grass/weedable, +/obj/structure/flora/jungle/alienplant1, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "ben" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/corsat/theta/biodome) "beo" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bep" = ( /obj/structure/flora/jungle/planttop1, @@ -20832,10 +20702,7 @@ }, /area/corsat/sigma/biodome/gunrange) "ber" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/dirt, /area/corsat/theta/biodome) "bes" = ( @@ -20862,19 +20729,15 @@ /area/corsat/sigma/biodome/gunrange) "bev" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "bew" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "bex" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/corsat/theta/biodome) "bey" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, @@ -20889,56 +20752,40 @@ /turf/open/gm/river, /area/corsat/theta/biodome) "beB" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/corsat/theta/biodome) "beD" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "beE" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "beF" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/gm/dirt, /area/corsat/theta/biodome) "beG" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "beH" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "beI" = ( -/obj/structure/flora/jungle/vines, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass/weedable, +/obj/structure/flora/jungle/vines/light_1, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "beJ" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "beK" = ( /turf/open/mars_cave{ @@ -20972,16 +20819,11 @@ /area/corsat/gamma/biodome) "beQ" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "beR" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "beS" = ( /obj/structure/machinery/colony_floodlight, @@ -20989,10 +20831,7 @@ /area/corsat/theta/biodome) "beT" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "beU" = ( /obj/structure/target, @@ -21016,10 +20855,7 @@ /area/corsat/gamma/biodome) "beY" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "beZ" = ( /turf/closed/ice_rock/corners, @@ -23718,10 +23554,6 @@ icon_state = "red" }, /area/corsat/gamma/hangar/arrivals) -"bmQ" = ( -/obj/structure/lattice, -/turf/open/space, -/area/space) "bmS" = ( /obj/structure/window/framed/corsat, /turf/open/floor/plating, @@ -24151,9 +23983,7 @@ /obj/structure/sign/safety/airlock{ pixel_x = -32 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "boA" = ( /obj/structure/sign/safety/airlock{ @@ -24170,9 +24000,7 @@ /obj/effect/landmark/nightmare{ insert_tag = "lockdown-theta-east" }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "boD" = ( /obj/structure/machinery/disposal, @@ -34230,7 +34058,7 @@ "bUJ" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bUK" = ( /obj/structure/flora/jungle/plantbot1, @@ -34467,7 +34295,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bVG" = ( /obj/structure/machinery/door_control{ @@ -34483,7 +34311,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bVI" = ( /obj/structure/pipes/standard/manifold/hidden/green, @@ -34578,7 +34406,7 @@ "bVX" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bWb" = ( /obj/structure/surface/table/almayer, @@ -36157,7 +35985,7 @@ /area/corsat/gamma/residential/west) "cbW" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "cce" = ( /obj/effect/landmark/survivor_spawner, @@ -36168,10 +35996,7 @@ /area/corsat/gamma/residential/showers) "ccq" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "cec" = ( /turf/open/floor/corsat{ @@ -36660,7 +36485,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "cvW" = ( /obj/structure/machinery/door/window/westleft, @@ -36939,7 +36764,7 @@ "cMa" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "cMv" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ @@ -37324,9 +37149,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "ddo" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -37478,7 +37301,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "diI" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -37841,6 +37664,7 @@ dir = 4 }, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -37976,7 +37800,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "dzX" = ( /turf/open/floor/corsat{ @@ -38283,9 +38107,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "dOq" = ( /obj/structure/bed/chair/office/light{ @@ -38367,6 +38189,7 @@ dir = 4 }, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -38796,7 +38619,7 @@ "ehg" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/vents/pump, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "ehj" = ( /obj/structure/flora/pottedplant, @@ -38848,15 +38671,13 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "eiG" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "eiQ" = ( /obj/structure/machinery/power/apc/high{ @@ -38954,6 +38775,7 @@ /area/corsat/gamma/airlock/south/id) "elG" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -39108,7 +38930,7 @@ "eql" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "eqt" = ( /obj/structure/pipes/vents/pump{ @@ -39417,9 +39239,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/corsat/theta/biodome) "eBl" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -39484,10 +39304,8 @@ /area/corsat/omega/complex) "eDM" = ( /obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "eDP" = ( /obj/structure/bed/chair/office/light, @@ -39553,10 +39371,7 @@ /area/corsat/sigma/cargo) "eIL" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/corsat/theta/biodome) "eJg" = ( /turf/open/floor/corsat{ @@ -39644,7 +39459,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "eMI" = ( /obj/structure/showcase{ @@ -39687,7 +39502,7 @@ "eNM" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "eOe" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -39712,7 +39527,7 @@ /area/corsat/gamma/medbay) "eOZ" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "ePL" = ( /obj/structure/closet/l3closet/general, @@ -39987,9 +39802,7 @@ "eZQ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "fax" = ( /obj/structure/machinery/light{ @@ -40231,7 +40044,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "fkn" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -40293,7 +40106,7 @@ health = 80 }, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/gamma/foyer) "flt" = ( /obj/vehicle/train/cargo/trolley, @@ -40434,11 +40247,11 @@ }, /area/corsat/gamma/foyer) "fpI" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "fpL" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -40503,6 +40316,7 @@ /area/corsat/gamma/hallwaysouth) "fst" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -40597,9 +40411,9 @@ }, /area/corsat/omega/airlocknorth/id) "fwq" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "fwQ" = ( /turf/open/floor/corsat{ @@ -40663,10 +40477,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "fzm" = ( /obj/structure/surface/table/almayer, @@ -40990,7 +40801,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "fOh" = ( /obj/effect/landmark/corpsespawner/prisoner, @@ -41078,9 +40889,7 @@ /area/corsat/gamma/hallwaysouth) "fSA" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "fSB" = ( /turf/open/floor/corsat{ @@ -41419,10 +41228,7 @@ /area/corsat/gamma/airlock/south) "geN" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "geV" = ( /obj/effect/landmark/corpsespawner/scientist, @@ -41454,10 +41260,7 @@ dir = 4; network = list("theta") }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "gfM" = ( /obj/structure/machinery/smartfridge/seeds, @@ -41643,10 +41446,7 @@ /area/corsat/gamma/airlock/south/id) "glr" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "gne" = ( /turf/open/floor/corsat{ @@ -41736,7 +41536,7 @@ /area/corsat/sigma/south/engineering) "gpP" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "gqd" = ( /obj/structure/surface/table/reinforced, @@ -41792,11 +41592,11 @@ "gqT" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/vents/pump, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "gqV" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "gra" = ( /turf/open/floor/corsat{ @@ -41839,7 +41639,7 @@ "grD" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "grK" = ( /turf/open/floor/corsat{ @@ -42181,18 +41981,14 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "gEU" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "gEV" = ( /turf/open/floor/corsat{ @@ -42201,10 +41997,7 @@ }, /area/corsat/gamma/airlock/control) "gFh" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, @@ -42389,11 +42182,9 @@ }, /area/corsat/sigma/north) "gOk" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "gOx" = ( /obj/structure/machinery/light{ @@ -42981,10 +42772,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "hfG" = ( /obj/structure/bed/chair{ @@ -43084,13 +42872,11 @@ /turf/open/floor/wood, /area/corsat/theta/biodome/complex) "hkp" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "hkZ" = ( /turf/open/floor/corsat{ @@ -43159,7 +42945,7 @@ "hnR" = ( /obj/structure/flora/jungle/plantbot1, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "hoh" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -43244,10 +43030,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "hqX" = ( /turf/open/floor/corsat, @@ -43705,13 +43488,11 @@ /turf/open/floor/corsat, /area/corsat/gamma/cargo/disposal) "hDO" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "hDX" = ( /turf/open/floor/corsat{ @@ -43796,10 +43577,7 @@ /area/corsat/omega/security) "hGf" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "hGg" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -43890,9 +43668,7 @@ /area/corsat/gamma/hangar/flightcontrol) "hJw" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "hJG" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -43945,7 +43721,7 @@ "hKH" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "hKZ" = ( /obj/structure/largecrate/random/barrel, @@ -44015,7 +43791,7 @@ /obj/structure/tunnel{ id = "hole3" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "hOb" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -44563,10 +44339,7 @@ /area/corsat/omega/checkpoint) "iiI" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "iiS" = ( /obj/structure/surface/table/reinforced, @@ -44699,10 +44472,7 @@ /area/corsat/gamma/biodome) "imz" = ( /obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "imK" = ( /obj/structure/surface/table/reinforced, @@ -44887,6 +44657,7 @@ "iuD" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "retrosquareslight" }, @@ -45045,7 +44816,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "iBo" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -45167,7 +44938,7 @@ /obj/structure/pipes/vents/pump{ dir = 1 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "iEN" = ( /obj/structure/surface/table/almayer, @@ -45219,9 +44990,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "iHY" = ( /turf/open/floor/corsat{ @@ -45338,9 +45107,7 @@ /area/corsat/gamma/administration) "iNk" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "iNl" = ( /obj/structure/machinery/constructable_frame, @@ -45451,9 +45218,9 @@ }, /area/corsat/gamma/residential/researcher) "iQH" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "iQL" = ( /obj/structure/closet/wardrobe/robotics_black, @@ -45520,10 +45287,7 @@ /area/corsat/gamma/airlock/north/id) "iTW" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/corsat/theta/biodome) "iVp" = ( /obj/structure/machinery/light, @@ -45921,7 +45685,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "jnb" = ( /obj/structure/machinery/light{ @@ -46000,7 +45764,7 @@ /area/corsat/theta/airlock/west) "jqz" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "jrQ" = ( /obj/structure/bed/stool{ @@ -46418,6 +46182,7 @@ /area/corsat/omega/hallways) "jJm" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/plating{ dir = 8; icon_state = "platingdmg3" @@ -46887,10 +46652,7 @@ /area/corsat/theta/biodome/hydroeast) "keE" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "kfc" = ( /obj/structure/flora/pottedplant{ @@ -47142,7 +46904,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "koV" = ( /obj/structure/bed/chair/office/light{ @@ -47310,7 +47072,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "kuO" = ( /obj/structure/surface/table/reinforced, @@ -47407,9 +47169,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "kzN" = ( /obj/structure/bed/chair, @@ -47484,7 +47244,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "kCq" = ( /turf/open/floor/corsat{ @@ -47502,17 +47262,12 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "kDL" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "kEj" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -47560,10 +47315,7 @@ /area/corsat/gamma/biodome/toxins) "kFZ" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "kGi" = ( /obj/structure/barricade/handrail{ @@ -47618,10 +47370,7 @@ /area/corsat/sigma/airlock/control) "kHP" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "kIz" = ( /turf/open/floor/corsat{ @@ -48092,7 +47841,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "laV" = ( /obj/structure/surface/table/almayer, @@ -48391,9 +48140,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "lko" = ( /obj/structure/pipes/vents/pump{ @@ -48604,7 +48351,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "lsH" = ( /obj/structure/pipes/vents/pump{ @@ -49123,7 +48870,7 @@ /area/corsat/sigma/hangar) "lKy" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "lKC" = ( /obj/structure/pipes/vents/pump{ @@ -49428,9 +49175,7 @@ /area/corsat/sigma/hangar/checkpoint) "lVF" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "lVW" = ( /obj/structure/platform, @@ -49503,10 +49248,7 @@ "lYc" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "lYd" = ( /obj/structure/surface/table/reinforced, @@ -50063,7 +49805,7 @@ /area/corsat/gamma/cargo/disposal) "msP" = ( /obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "msY" = ( /turf/open/floor/corsat{ @@ -50485,10 +50227,7 @@ "mIY" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "mJa" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -50727,10 +50466,7 @@ /area/corsat/gamma/residential/east) "mSo" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "mSz" = ( /obj/structure/machinery/chem_master, @@ -50761,6 +50497,7 @@ "mTz" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /obj/effect/landmark/queen_spawn, /turf/open/floor/corsat{ icon_state = "retrosquareslight" @@ -50967,11 +50704,11 @@ /area/corsat/theta/biodome) "nck" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "ncR" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -51155,14 +50892,14 @@ "nlm" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "nln" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/vents/pump{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "nls" = ( /obj/structure/bed/sofa/south/grey/right, @@ -51499,9 +51236,7 @@ /area/corsat/gamma/residential/east) "nwj" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "nws" = ( /turf/open/floor/corsat{ @@ -51769,7 +51504,7 @@ /area/corsat/gamma/medbay/morgue) "nFc" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "nFt" = ( /obj/structure/surface/table/reinforced, @@ -51840,10 +51575,7 @@ "nIy" = ( /obj/structure/flora/bush/ausbushes/grassybush, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "nIF" = ( /obj/structure/surface/table/almayer, @@ -51969,9 +51701,7 @@ /area/corsat/gamma/biodome/toxins) "nMk" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "nMP" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -52447,7 +52177,7 @@ "oge" = ( /obj/structure/flora/jungle/vines/heavy, /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "ohe" = ( /turf/open/floor/corsat{ @@ -52632,11 +52362,11 @@ }, /area/corsat/gamma/sigmaremote) "ooX" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "opf" = ( /obj/structure/prop/almayer/computers/sensor_computer1{ @@ -52741,9 +52471,7 @@ /area/corsat/sigma/south/complex) "osY" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "otC" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -53181,13 +52909,8 @@ }, /area/corsat/sigma/biodome/gunrange) "oLe" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/obj/structure/flora/jungle/alienplant1, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "oLg" = ( /obj/effect/alien/weeds/node, @@ -53358,7 +53081,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "oQO" = ( /turf/open/floor/corsat{ @@ -53431,9 +53154,9 @@ }, /area/corsat/gamma/cargo) "oUJ" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "oVe" = ( /obj/structure/machinery/light{ @@ -53462,7 +53185,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "oVM" = ( /obj/structure/bed/sofa/vert/grey/bot, @@ -53600,17 +53323,14 @@ /area/corsat/gamma/residential/west) "oZW" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "paH" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "pbS" = ( /turf/open/floor/corsat{ @@ -53769,7 +53489,7 @@ "pgO" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "pgV" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -53893,9 +53613,7 @@ /obj/structure/machinery/light/small{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "pmf" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -53919,10 +53637,7 @@ /area/corsat/omega/complex) "pnQ" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "pov" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -54065,7 +53780,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "pwd" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -54701,10 +54416,7 @@ /area/corsat/sigma/south/complex) "pWR" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "pXp" = ( /obj/effect/landmark/corpsespawner/scientist, @@ -54715,9 +54427,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "pXU" = ( /obj/structure/barricade/handrail{ @@ -54888,9 +54598,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "qcR" = ( /obj/structure/surface/table/woodentable, @@ -55638,7 +55346,7 @@ dir = 8; network = list("theta") }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "qFp" = ( /obj/structure/bed/chair/office/light{ @@ -55690,9 +55398,7 @@ "qGz" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "qGF" = ( /obj/structure/janitorialcart, @@ -55731,6 +55437,7 @@ /area/corsat/omega/airlocknorth) "qIr" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -56093,9 +55800,7 @@ dir = 1; network = list("theta") }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "qVz" = ( /obj/effect/landmark/corpsespawner/pmc, @@ -56817,10 +56522,8 @@ }, /area/corsat/sigma/hangar/security) "rzy" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "rzU" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ @@ -57053,7 +56756,7 @@ "rJo" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "rJu" = ( /obj/effect/landmark/corpsespawner/scientist, @@ -57136,6 +56839,7 @@ /area/corsat/omega/maint) "rMq" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/ice, /area/corsat/gamma/biodome) "rMD" = ( @@ -57287,10 +56991,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/corsat/theta/biodome) "rSz" = ( /obj/structure/closet/wardrobe/white, @@ -57345,11 +57046,11 @@ }, /area/corsat/gamma/residential/west) "rTj" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "rTo" = ( /turf/open/floor/corsat{ @@ -57382,18 +57083,18 @@ }, /area/corsat/gamma/medbay/lobby) "rUq" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "rUH" = ( /obj/structure/pipes/vents/pump{ dir = 4 }, /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "rUK" = ( /obj/structure/machinery/light{ @@ -57685,9 +57386,7 @@ /area/corsat/gamma/biodome/complex) "sem" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "sez" = ( /obj/structure/surface/table/reinforced, @@ -57816,9 +57515,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/corsat/theta/biodome) "siU" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -57957,7 +57654,7 @@ /area/corsat/sigma/hangar/office) "smP" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "snc" = ( /obj/structure/morgue, @@ -58072,21 +57769,17 @@ /area/corsat/gamma/biodome/virology) "spU" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "sqn" = ( /obj/structure/machinery/colony_floodlight{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "sqr" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "sqY" = ( /turf/open/floor/corsat{ @@ -58134,7 +57827,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "sum" = ( /turf/open/floor/corsat{ @@ -58414,9 +58107,7 @@ /area/corsat/gamma/rnr/library) "sGQ" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "sGV" = ( /obj/structure/machinery/door/airlock/almayer/command/colony{ @@ -58948,10 +58639,7 @@ /area/corsat/gamma/biodome/virology) "sZg" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "tad" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -59108,10 +58796,7 @@ /area/corsat/gamma/hallwaysouth) "tfu" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "tfz" = ( /obj/structure/surface/table/almayer, @@ -59361,10 +59046,7 @@ /area/corsat/sigma/hangar/office) "tpF" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "tpH" = ( /obj/structure/pipes/vents/pump{ @@ -59488,10 +59170,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "tvG" = ( /obj/structure/pipes/vents/pump{ @@ -59533,7 +59212,7 @@ "twS" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/pipes/vents/pump/on, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "twW" = ( /obj/structure/window/framed/corsat, @@ -59604,14 +59283,14 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "tAF" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "tBh" = ( /turf/open/floor/corsat{ @@ -59701,11 +59380,8 @@ }, /area/corsat/gamma/hangar/checkpoint) "tDK" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "tDQ" = ( /obj/structure/bed/chair{ @@ -59753,10 +59429,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "tGq" = ( /obj/structure/largecrate/random/barrel/green, @@ -59780,16 +59453,14 @@ /area/corsat/gamma/medbay/lobby) "tGV" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "tHy" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/vents/pump{ dir = 1 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "tHC" = ( /obj/structure/bed/chair{ @@ -59830,15 +59501,9 @@ icon_state = "whitetan" }, /area/corsat/gamma/residential/west) -"tJe" = ( -/turf/open/ice, -/area/corsat/gamma/biodome) "tJf" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "tJs" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -59936,10 +59601,10 @@ }, /area/corsat/sigma/biodome) "tNp" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/vents/pump, /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "tNJ" = ( /obj/structure/surface/table/reinforced, @@ -60033,10 +59698,7 @@ /area/corsat/gamma/biodome) "tQk" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "tQs" = ( /obj/effect/landmark/corpsespawner/scientist, @@ -60109,9 +59771,7 @@ /area/corsat/sigma/southeast/datamaint) "tTd" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "tTf" = ( /obj/structure/machinery/light{ @@ -60536,7 +60196,7 @@ /area/corsat/sigma/south/robotics) "ukb" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "ukf" = ( /obj/effect/landmark/monkey_spawn, @@ -60572,7 +60232,7 @@ /area/corsat/gamma/residential/west) "uli" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "ulq" = ( /turf/open/floor/corsat{ @@ -60671,11 +60331,11 @@ dir = 4 }, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "upr" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "upA" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -60743,13 +60403,8 @@ }, /area/corsat/sigma/checkpoint) "usK" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/obj/structure/flora/jungle/alienplant1, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "usS" = ( /obj/structure/flora/jungle/vines/heavy, @@ -60759,7 +60414,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "usW" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -61008,12 +60663,9 @@ }, /area/corsat/gamma/residential/showers) "uBH" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "uCn" = ( /obj/structure/fence, @@ -61151,10 +60803,7 @@ /area/corsat/sigma/south/engineering) "uIh" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/corsat/theta/biodome) "uIJ" = ( /obj/structure/fence, @@ -61255,6 +60904,7 @@ /area/corsat/sigma/dorms) "uLV" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -61416,10 +61066,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "uRC" = ( /obj/structure/machinery/botany{ @@ -61504,10 +61151,7 @@ /area/corsat/gamma/residential/researcher) "uTf" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "uTg" = ( /obj/structure/safe, @@ -61764,16 +61408,16 @@ }, /area/corsat/theta/biodome/complex) "vcx" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/vents/pump, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "vcy" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "vcJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -61903,11 +61547,8 @@ }, /area/corsat/theta/airlock/control) "vhZ" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "vic" = ( /obj/structure/showcase{ @@ -62018,12 +61659,6 @@ icon_state = "retrosquareslight" }, /area/corsat/gamma/biodome/virology) -"vkS" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/corsat{ - icon_state = "plate" - }, -/area/corsat/omega/biodome) "vkW" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -62067,10 +61702,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/corsat/theta/biodome) "vnF" = ( /obj/structure/bed/chair/office/light{ @@ -62336,7 +61968,7 @@ /obj/structure/flora/jungle/vines/heavy, /obj/structure/pipes/vents/pump, /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "vzc" = ( /obj/structure/machinery/light, @@ -62372,7 +62004,7 @@ /area/corsat/sigma/hangar/id) "vzK" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "vzV" = ( /obj/structure/machinery/disposal, @@ -62643,9 +62275,7 @@ /area/corsat/gamma/hangar/cargo) "vKH" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "vKN" = ( /turf/open/floor/corsat{ @@ -62800,7 +62430,7 @@ "vQg" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "vQs" = ( /obj/structure/surface/table/reinforced, @@ -63016,10 +62646,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/corsat/theta/biodome) "wbK" = ( /obj/structure/flora/pottedplant{ @@ -63157,9 +62784,7 @@ /area/corsat/gamma/biodome) "wiJ" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "wiQ" = ( /obj/structure/machinery/light{ @@ -63229,10 +62854,7 @@ /area/corsat/sigma/hangar/office) "wkm" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "wkr" = ( /obj/structure/reagent_dispensers/water_cooler, @@ -63277,10 +62899,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "wmf" = ( /obj/effect/landmark/hunter_secondary, @@ -63454,9 +63073,7 @@ /obj/structure/pipes/vents/pump{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "wrR" = ( /obj/structure/largecrate/random, @@ -63628,10 +63245,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "wxi" = ( /mob/living/carbon/human/yiren, @@ -63747,11 +63361,11 @@ }, /area/corsat/gamma/medbay/morgue) "wCI" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "wCJ" = ( /obj/structure/closet/emcloset, @@ -64156,17 +63770,13 @@ /area/corsat/sigma/cargo) "wSb" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "wSg" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/corsat/theta/biodome) "wSq" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -64441,7 +64051,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "xdB" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -64777,7 +64387,7 @@ /area/corsat/gamma/sigmaremote) "xsU" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "xsZ" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -64902,10 +64512,7 @@ /area/corsat/gamma/hangar) "xxO" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "xxZ" = ( /turf/open/floor/corsat{ @@ -65210,7 +64817,7 @@ health = 80 }, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/gamma/hallwaysouth) "xKC" = ( /obj/structure/machinery/camera/autoname{ @@ -65399,10 +65006,7 @@ /area/corsat/gamma/hallwaysouth) "xRq" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "xRM" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -65713,10 +65317,8 @@ }, /area/corsat/gamma/airlock/control) "yfH" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "yfO" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -65853,9 +65455,7 @@ /area/corsat/omega/control) "yle" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "ylo" = ( /turf/open/space, @@ -67475,7 +67075,7 @@ bfc bfc bfc sFF -tJe +bfc bfc sFF bfc @@ -69280,7 +68880,7 @@ aFe hwe avX aFe -vkS +aFe aFe aFe avX @@ -88834,7 +88434,7 @@ bdD bdD bdD bdD -bdN +bcT vnc aKi aKi diff --git a/maps/map_files/CORSAT/standalone/lockdown_thetaeast.dmm b/maps/map_files/CORSAT/standalone/lockdown_thetaeast.dmm index f44a5f1cebc1..61645f5a5b3b 100644 --- a/maps/map_files/CORSAT/standalone/lockdown_thetaeast.dmm +++ b/maps/map_files/CORSAT/standalone/lockdown_thetaeast.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "b" = ( /turf/closed/wall/r_wall/biodome/biodome_unmeltable, @@ -74,9 +74,7 @@ /obj/structure/sign/safety/airlock{ pixel_x = 32 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "n" = ( /obj/structure/window/framed/corsat/security, diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index 978d61ddfbed..db6ec755f363 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -108,11 +108,13 @@ /turf/open/floor/plating, /area/desert_dam/building/substation/northwest) "aav" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 4 + }, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" + icon_state = "cement_sunbleached9" }, -/area/desert_dam/exterior/landing_pad_one) +/area/desert_dam/exterior/landing_pad_two) "aaw" = ( /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached1" @@ -135,11 +137,11 @@ }, /area/desert_dam/interior/caves/east_caves) "aaA" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, -/turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal11" }, -/area/desert_dam/exterior/landing_pad_one) +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_northwest) "aaB" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal9" @@ -300,9 +302,7 @@ }, /area/desert_dam/exterior/river/riverside_central_north) "aba" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt{ dir = 4; icon_state = "desert_transition_edge1" @@ -546,9 +546,7 @@ }, /area/desert_dam/exterior/valley/valley_labs) "abN" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/desert/dirt{ dir = 5; icon_state = "desert_transition_edge1" @@ -567,9 +565,9 @@ }, /area/desert_dam/exterior/valley/valley_labs) "abQ" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/ds1/delayone, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" + icon_state = "cement_sunbleached4" }, /area/desert_dam/exterior/landing_pad_one) "abR" = ( @@ -581,11 +579,11 @@ }, /area/desert_dam/exterior/valley/valley_labs) "abS" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/ds2, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached12" }, -/area/desert_dam/exterior/landing_pad_one) +/area/desert_dam/exterior/landing_pad_two) "abT" = ( /obj/structure/machinery/conveyor{ id = "anomalybelt" @@ -934,7 +932,7 @@ /area/desert_dam/interior/dam_interior/hanger) "adb" = ( /obj/structure/machinery/floodlight/landing, -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 8 }, /turf/open/floor{ @@ -956,13 +954,11 @@ }, /area/desert_dam/exterior/valley/valley_labs) "adf" = ( -/obj/structure/machinery/landinglight/ds1{ - dir = 4 - }, +/obj/structure/machinery/landinglight/ds2/delayone, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached9" + icon_state = "cement_sunbleached12" }, -/area/desert_dam/exterior/landing_pad_one) +/area/desert_dam/exterior/landing_pad_two) "adg" = ( /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/asphalt/cement_sunbleached{ @@ -1891,9 +1887,7 @@ }, /area/desert_dam/building/administration/control_room) "afX" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_labs) "afY" = ( @@ -1919,15 +1913,11 @@ /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_northwest) "agb" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "agc" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_labs) "agd" = ( @@ -2058,9 +2048,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "agw" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_labs) "agx" = ( @@ -2077,9 +2065,7 @@ /area/desert_dam/exterior/valley/valley_northwest) "agz" = ( /obj/structure/disposalpipe/segment, -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "agA" = ( @@ -3518,9 +3504,7 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_excavation) "akJ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt{ icon_state = "dirt2" }, @@ -3678,13 +3662,13 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_excavation) "alh" = ( -/obj/structure/machinery/landinglight/ds1{ - dir = 8 +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 }, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached2" + icon_state = "cement_sunbleached12" }, -/area/desert_dam/exterior/landing_pad_one) +/area/desert_dam/exterior/landing_pad_two) "ali" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -3950,9 +3934,7 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_east_hallway) "alU" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt{ icon_state = "dirt2" }, @@ -4260,7 +4242,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_wilderness) "amN" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "amO" = ( @@ -4360,9 +4342,7 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_containment) "anb" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt{ icon_state = "dirt2" }, @@ -4577,15 +4557,11 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_east_hallway) "anE" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_labs) "anF" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_12" - }, +/obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "anG" = ( @@ -5059,9 +5035,7 @@ }, /area/desert_dam/interior/dam_interior/hanger) "apc" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "apd" = ( @@ -5277,9 +5251,7 @@ }, /area/desert_dam/exterior/valley/valley_northwest) "apP" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_7" - }, +/obj/structure/flora/grass/desert/lightgrass_7, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "apR" = ( @@ -5497,9 +5469,7 @@ }, /area/desert_dam/exterior/valley/valley_northwest) "aqz" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "aqA" = ( @@ -6287,9 +6257,7 @@ /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/floodgate_control) "asP" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt{ icon_state = "dirt2" }, @@ -6876,9 +6844,7 @@ }, /area/desert_dam/interior/dam_interior/west_tunnel) "auu" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/rock, /area/desert_dam/interior/dam_interior/west_tunnel) "auv" = ( @@ -7535,9 +7501,7 @@ }, /area/desert_dam/exterior/valley/valley_mining) "awp" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/rock/deep{ icon_state = "rock3" }, @@ -8736,9 +8700,7 @@ /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "azW" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "azX" = ( @@ -10408,13 +10370,11 @@ /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_crashsite) "aFb" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aFc" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_5" - }, +/obj/structure/flora/grass/desert/lightgrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aFd" = ( @@ -10463,9 +10423,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aFk" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_7" - }, +/obj/structure/flora/grass/desert/lightgrass_7, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aFl" = ( @@ -10611,9 +10569,7 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_east_hallway) "aFG" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt{ dir = 6; icon_state = "desert_transition_edge1" @@ -10687,13 +10643,11 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aFS" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "aFT" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aFU" = ( @@ -10728,9 +10682,7 @@ /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_crashsite) "aFZ" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/interior/dam_interior/south_tunnel_entrance) "aGa" = ( @@ -10741,9 +10693,7 @@ /turf/open/asphalt, /area/desert_dam/interior/dam_interior/south_tunnel_entrance) "aGb" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_7" - }, +/obj/structure/flora/grass/desert/lightgrass_7, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "aGc" = ( @@ -10819,9 +10769,7 @@ /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_crashsite) "aGp" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aGq" = ( @@ -10829,9 +10777,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aGr" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aGs" = ( @@ -10939,9 +10885,7 @@ }, /area/desert_dam/interior/caves/central_caves) "aGJ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "aGK" = ( @@ -10972,9 +10916,7 @@ /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "aGO" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "aGP" = ( @@ -11222,9 +11164,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aHz" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aHA" = ( @@ -11239,9 +11179,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aHC" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aHD" = ( @@ -11263,9 +11201,7 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) "aHG" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aHH" = ( @@ -11317,9 +11253,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aHN" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "aHO" = ( @@ -11349,9 +11283,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aHS" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aHT" = ( @@ -11371,9 +11303,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aHW" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "aHX" = ( @@ -11469,9 +11399,7 @@ /turf/open/desert/rock, /area/desert_dam/exterior/valley/valley_crashsite) "aIk" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aIl" = ( @@ -11492,9 +11420,7 @@ /turf/open/desert/rock, /area/desert_dam/exterior/valley/valley_crashsite) "aIp" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aIq" = ( @@ -11519,9 +11445,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aIu" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aIv" = ( @@ -11940,9 +11864,7 @@ }, /area/desert_dam/interior/caves/central_caves) "aJS" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_12" - }, +/obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aJT" = ( @@ -12172,9 +12094,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aKD" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_5" - }, +/obj/structure/flora/grass/desert/heavygrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aKE" = ( @@ -12195,9 +12115,7 @@ /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_crashsite) "aKH" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_12" - }, +/obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "aKI" = ( @@ -12323,9 +12241,7 @@ /obj/effect/decal/sand_overlay/sand1{ dir = 9 }, -/turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached20" - }, +/turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/landing_pad_two) "aKZ" = ( /turf/open/floor{ @@ -12334,14 +12250,11 @@ }, /area/desert_dam/building/lab_northwest/west_lab_xenoflora) "aLa" = ( -/obj/structure/machinery/landinglight/ds2, -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, +/obj/structure/machinery/landinglight/ds1/delaythree, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached2" + icon_state = "cement_sunbleached4" }, -/area/desert_dam/exterior/landing_pad_two) +/area/desert_dam/exterior/landing_pad_one) "aLb" = ( /obj/structure/machinery/power/apc{ dir = 1; @@ -12541,11 +12454,10 @@ /area/desert_dam/exterior/valley/valley_crashsite) "aLy" = ( /obj/effect/decal/sand_overlay/sand1{ - dir = 1 + dir = 4 }, -/obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached9" + icon_state = "cement_sunbleached1" }, /area/desert_dam/exterior/landing_pad_two) "aLz" = ( @@ -12637,7 +12549,7 @@ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached20" + icon_state = "cement_sunbleached1" }, /area/desert_dam/exterior/landing_pad_two) "aLL" = ( @@ -14608,6 +14520,7 @@ /area/desert_dam/exterior/valley/valley_crashsite) "aRV" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/desert/dirt{ icon_state = "desert_transition_corner1" }, @@ -18032,9 +17945,7 @@ /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/hallway) "bdc" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_wilderness) "bdd" = ( @@ -18359,9 +18270,7 @@ }, /area/desert_dam/building/administration/meetingrooom) "bej" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "bek" = ( @@ -18479,9 +18388,7 @@ /turf/open/desert/rock, /area/desert_dam/exterior/valley/valley_telecoms) "beD" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "beE" = ( @@ -18593,15 +18500,11 @@ /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_one) "beU" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_10" - }, +/obj/structure/flora/grass/desert/heavygrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "beV" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_6" - }, +/obj/structure/flora/grass/desert/heavygrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "beW" = ( @@ -18737,9 +18640,7 @@ }, /area/desert_dam/exterior/landing_pad_one) "bfp" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_9" - }, +/obj/structure/flora/grass/desert/heavygrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "bfq" = ( @@ -20948,7 +20849,7 @@ /turf/open/floor/plating, /area/desert_dam/exterior/valley/valley_crashsite) "bmC" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt{ icon_state = "desert_transition_edge1" }, @@ -21071,9 +20972,7 @@ /turf/open/floor/interior/wood, /area/desert_dam/building/security/marshals_office) "bmY" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "bnb" = ( @@ -21218,9 +21117,7 @@ }, /area/desert_dam/exterior/river/filtration_a) "bny" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "bnz" = ( @@ -22091,12 +21988,11 @@ }, /area/desert_dam/exterior/valley/valley_telecoms) "bqk" = ( -/obj/structure/machinery/floodlight/landing, -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds1/delaythree{ dir = 4 }, -/turf/open/floor{ - icon_state = "asteroidplating" +/turf/open/asphalt/cement_sunbleached{ + icon_state = "cement_sunbleached15" }, /area/desert_dam/exterior/landing_pad_one) "bql" = ( @@ -22626,11 +22522,11 @@ }, /area/desert_dam/interior/dam_interior/engine_west_wing) "brW" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight/ds1/delayone{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached15" + icon_state = "cement_sunbleached9" }, /area/desert_dam/exterior/landing_pad_one) "brX" = ( @@ -24175,7 +24071,7 @@ }, /area/desert_dam/interior/dam_interior/auxilary_tool_storage) "bxj" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight/ds1/delayone{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -25173,7 +25069,7 @@ /turf/open/floor/wood, /area/desert_dam/building/administration/overseer_office) "bAF" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -25707,9 +25603,7 @@ }, /area/desert_dam/exterior/valley/valley_mining) "bCK" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_mining) "bCM" = ( @@ -26044,7 +25938,7 @@ /turf/open/floor/prison, /area/desert_dam/building/security/staffroom) "bDO" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds1/delaythree{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -26506,7 +26400,7 @@ }, /area/desert_dam/building/security/holding) "bFg" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/ds1{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -30003,9 +29897,7 @@ /turf/open/gm/river/desert/shallow, /area/desert_dam/interior/dam_interior/western_dam_cave) "bQQ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt{ dir = 10; icon_state = "desert_transition_edge1" @@ -30989,7 +30881,7 @@ }, /area/desert_dam/interior/dam_interior/primary_tool_storage) "bTR" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/north_valley_dam) "bTU" = ( @@ -31112,15 +31004,11 @@ }, /area/desert_dam/interior/dam_interior/auxilary_tool_storage) "bUt" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bUu" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bUv" = ( @@ -31432,21 +31320,15 @@ }, /area/desert_dam/interior/dam_interior/central_tunnel) "bVr" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_12" - }, +/obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bVs" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bVt" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bVu" = ( @@ -31721,21 +31603,15 @@ }, /area/desert_dam/interior/dam_interior/central_tunnel) "bWi" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_5" - }, +/obj/structure/flora/grass/desert/heavygrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bWj" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_7" - }, +/obj/structure/flora/grass/desert/lightgrass_7, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bWk" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bWm" = ( @@ -31966,9 +31842,7 @@ }, /area/desert_dam/interior/dam_interior/central_tunnel) "bXc" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bXd" = ( @@ -34430,9 +34304,7 @@ }, /area/desert_dam/exterior/river/riverside_central_south) "cej" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_medical) "cek" = ( @@ -37459,13 +37331,11 @@ }, /area/desert_dam/exterior/valley/valley_medical) "coI" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_medical) "coJ" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_medical) "coK" = ( @@ -37571,7 +37441,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) "cpa" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cpb" = ( @@ -37673,9 +37543,7 @@ }, /area/desert_dam/building/warehouse/breakroom) "cpu" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/north_valley_dam) "cpv" = ( @@ -37837,9 +37705,7 @@ /turf/open/floor/prison, /area/desert_dam/building/substation/west) "cpT" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cpU" = ( @@ -37981,9 +37847,7 @@ }, /area/desert_dam/exterior/valley/valley_telecoms) "cqq" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "cqr" = ( @@ -38137,9 +38001,7 @@ }, /area/desert_dam/exterior/valley/valley_wilderness) "cqT" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cqU" = ( @@ -38266,15 +38128,11 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "cru" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "crv" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "crw" = ( @@ -38453,21 +38311,15 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) "csa" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "csb" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "csc" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cse" = ( @@ -38625,9 +38477,7 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "csE" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "csF" = ( @@ -40394,9 +40244,7 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "cxT" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "cxU" = ( @@ -40655,9 +40503,7 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "cyN" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "cyP" = ( @@ -40665,9 +40511,7 @@ /turf/open/gm/river/desert/shallow_edge/covered, /area/desert_dam/exterior/river/riverside_central_north) "cyQ" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_5" - }, +/obj/structure/flora/grass/desert/heavygrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "cyR" = ( @@ -40820,7 +40664,7 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "czv" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "czw" = ( @@ -40833,9 +40677,7 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "czx" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "czy" = ( @@ -41083,9 +40925,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "cAd" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "cAe" = ( @@ -41342,9 +41182,7 @@ }, /area/desert_dam/building/medical/emergency_room) "cAL" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cAM" = ( @@ -41782,9 +41620,7 @@ }, /area/desert_dam/building/bar/bar) "cBY" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_5" - }, +/obj/structure/flora/grass/desert/lightgrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "cBZ" = ( @@ -42103,36 +41939,26 @@ }, /area/desert_dam/building/mining/workshop_foyer) "cCY" = ( -/obj/structure/machinery/landinglight/ds2, -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" - }, -/area/desert_dam/exterior/landing_pad_two) +/turf/open/desert/dirt, +/area/desert_dam/exterior/rock) "cCZ" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 4 }, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" + icon_state = "cement_sunbleached9" }, /area/desert_dam/exterior/landing_pad_two) "cDb" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, /obj/effect/decal/sand_overlay/sand1{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" + icon_state = "cement_sunbleached4" }, /area/desert_dam/exterior/landing_pad_two) "cDc" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "cDd" = ( @@ -42353,27 +42179,20 @@ }, /area/desert_dam/building/medical/east_wing_hallway) "cDK" = ( -/obj/structure/machinery/landinglight/ds2/delayone, -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, +/obj/structure/machinery/landinglight/ds2, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" + icon_state = "cement_sunbleached14" }, /area/desert_dam/exterior/landing_pad_two) "cDL" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 4 }, -/obj/structure/machinery/landinglight/ds2, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" + icon_state = "cement_sunbleached15" }, /area/desert_dam/exterior/landing_pad_two) "cDM" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, /obj/structure/machinery/landinglight/ds2/delaythree, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached12" @@ -42427,12 +42246,9 @@ }, /area/desert_dam/interior/dam_interior/CE_office) "cDV" = ( -/obj/structure/machinery/floodlight/landing, -/obj/structure/machinery/landinglight/ds2/delayone{ - dir = 4 - }, -/turf/open/floor{ - icon_state = "asteroidplating" +/obj/structure/machinery/landinglight/ds2/delaytwo, +/turf/open/asphalt/cement_sunbleached{ + icon_state = "cement_sunbleached15" }, /area/desert_dam/exterior/landing_pad_two) "cDX" = ( @@ -42462,14 +42278,11 @@ }, /area/desert_dam/building/bar/bar) "cEc" = ( -/obj/structure/machinery/floodlight/landing, -/obj/structure/machinery/landinglight/ds2/delayone{ - dir = 8 - }, -/turf/open/floor{ - icon_state = "asteroidplating" +/obj/structure/machinery/landinglight/ds1, +/turf/open/asphalt/cement_sunbleached{ + icon_state = "cement_sunbleached4" }, -/area/desert_dam/exterior/landing_pad_two) +/area/desert_dam/exterior/landing_pad_one) "cEd" = ( /obj/structure/prop/dam/wide_boulder/boulder1, /turf/open/desert/dirt{ @@ -42759,17 +42572,16 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) "cEZ" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/floodlight/landing, +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 }, -/turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached9" +/turf/open/floor{ + icon_state = "asteroidplating" }, /area/desert_dam/exterior/landing_pad_two) "cFa" = ( -/obj/docking_port/stationary/marine_dropship/lz2{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz2, /turf/open/floor/plating, /area/desert_dam/exterior/landing_pad_two) "cFb" = ( @@ -43212,17 +43024,13 @@ }, /area/desert_dam/building/medical/treatment_room) "cGh" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt{ icon_state = "desert_transition_edge1" }, /area/desert_dam/exterior/valley/valley_cargo) "cGi" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_5" - }, +/obj/structure/flora/grass/desert/lightgrass_5, /turf/open/desert/dirt{ dir = 10; icon_state = "desert_transition_edge1" @@ -43484,11 +43292,9 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "cGS" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ - dir = 4 - }, +/obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached15" + icon_state = "cement_sunbleached12" }, /area/desert_dam/exterior/landing_pad_two) "cGT" = ( @@ -43615,9 +43421,7 @@ }, /area/desert_dam/building/medical/east_wing_hallway) "cHl" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt{ icon_state = "desert_transition_edge1" }, @@ -43720,7 +43524,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_cargo) "cHC" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "cHD" = ( @@ -43731,9 +43535,7 @@ /turf/open/asphalt/cement, /area/desert_dam/interior/dam_interior/workshop) "cHE" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "cHF" = ( @@ -43877,21 +43679,15 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "cId" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_5" - }, +/obj/structure/flora/grass/desert/heavygrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "cIe" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "cIg" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "cIh" = ( @@ -44221,9 +44017,7 @@ }, /area/desert_dam/building/church) "cJl" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_12" - }, +/obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cJm" = ( @@ -44777,9 +44571,7 @@ }, /area/desert_dam/building/security/deathrow) "cLa" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt{ icon_state = "desert_transition_edge1" }, @@ -44916,7 +44708,7 @@ /turf/open/asphalt, /area/desert_dam/building/warehouse/warehouse) "cLL" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -45126,7 +44918,7 @@ }, /area/desert_dam/exterior/landing_pad_two) "cMD" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -45140,9 +44932,7 @@ /turf/open/asphalt, /area/desert_dam/building/warehouse/loading) "cMF" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "cMI" = ( @@ -45158,7 +44948,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_cargo) "cML" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/ds2/delaythree{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -45289,7 +45079,7 @@ /turf/open/floor/plating, /area/desert_dam/building/medical/virology_isolation) "cNb" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/ds2{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -45334,24 +45124,24 @@ }, /area/desert_dam/interior/dam_interior/central_tunnel) "cNh" = ( -/obj/structure/machinery/landinglight/ds2{ - dir = 1 - }, /obj/structure/desertdam/decals/road_edge, /obj/structure/desertdam/decals/road_stop{ dir = 1; icon_state = "stop_decal5" }, -/turf/open/asphalt, -/area/desert_dam/exterior/landing_pad_two) -"cNi" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 1 }, +/turf/open/asphalt, +/area/desert_dam/exterior/landing_pad_two) +"cNi" = ( /obj/structure/desertdam/decals/road_stop{ dir = 1; icon_state = "stop_decal5" }, +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 1 + }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) "cNj" = ( @@ -45398,9 +45188,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "cNu" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_12" - }, +/obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "cNv" = ( @@ -45419,13 +45207,13 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_cargo) "cNx" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ - dir = 1 - }, /obj/structure/desertdam/decals/road_stop{ dir = 1; icon_state = "stop_decal5" }, +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 1 + }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) "cNy" = ( @@ -45580,9 +45368,7 @@ }, /area/desert_dam/building/church) "cNV" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt{ dir = 8; icon_state = "desert_transition_edge1" @@ -46074,9 +45860,7 @@ /turf/open/asphalt, /area/desert_dam/building/warehouse/loading) "cPz" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cPB" = ( @@ -46118,13 +45902,13 @@ }, /area/desert_dam/building/substation/southwest) "cPI" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ - dir = 1 - }, /obj/structure/desertdam/decals/road_stop{ dir = 1; icon_state = "stop_decal5" }, +/obj/structure/machinery/landinglight/ds2{ + dir = 1 + }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) "cPJ" = ( @@ -46222,9 +46006,6 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "cPW" = ( -/obj/structure/machinery/landinglight/ds2{ - dir = 1 - }, /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" }, @@ -46232,6 +46013,9 @@ dir = 1; icon_state = "stop_decal5" }, +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 1 + }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) "cPX" = ( @@ -46464,9 +46248,7 @@ }, /area/desert_dam/building/bar/bar_restroom) "cQK" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cQL" = ( @@ -46915,9 +46697,7 @@ /turf/open/floor/plating, /area/desert_dam/interior/dam_interior/south_tunnel_entrance) "cSp" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "cSq" = ( @@ -47130,9 +46910,7 @@ }, /area/desert_dam/building/mining/workshop) "cTh" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_10" - }, +/obj/structure/flora/grass/desert/heavygrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "cTi" = ( @@ -52779,9 +52557,7 @@ }, /area/desert_dam/building/cafeteria/cafeteria) "dzE" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "dzO" = ( @@ -53155,9 +52931,7 @@ /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_medical) "dBQ" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_medical) "dBR" = ( @@ -54065,9 +53839,7 @@ }, /area/desert_dam/exterior/valley/valley_civilian) "dGU" = ( -/obj/docking_port/stationary/marine_dropship/lz1{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz1, /turf/open/floor/plating, /area/desert_dam/exterior/landing_pad_one) "dGV" = ( @@ -57678,8 +57450,7 @@ "dUe" = ( /obj/structure/surface/table/reinforced, /obj/structure/machinery/door/poddoor/shutters{ - dir = 2; - icon_state = "shutter1" + dir = 2 }, /turf/open/floor/prison{ icon_state = "sterile_white" @@ -57689,8 +57460,7 @@ /obj/structure/surface/table/reinforced, /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/poddoor/shutters{ - dir = 2; - icon_state = "shutter1" + dir = 2 }, /turf/open/floor/prison{ icon_state = "sterile_white" @@ -59057,7 +58827,7 @@ }, /area/desert_dam/exterior/valley/valley_civilian) "dZl" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) @@ -60937,6 +60707,7 @@ "fHX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison{ dir = 10; icon_state = "bright_clean" @@ -60971,9 +60742,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "fSc" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_12" - }, +/obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "fTk" = ( @@ -61603,6 +61372,7 @@ /area/desert_dam/interior/caves/temple) "hRU" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison{ dir = 10; icon_state = "bright_clean" @@ -61784,6 +61554,7 @@ /area/desert_dam/interior/dam_interior/garage) "isZ" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison{ icon_state = "bright_clean2" }, @@ -61900,9 +61671,7 @@ /turf/open/desert/desert_shore/shore_edge1, /area/desert_dam/interior/caves/temple) "iOa" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "iPJ" = ( @@ -61998,9 +61767,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "jlP" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_5" - }, +/obj/structure/flora/grass/desert/heavygrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "jmd" = ( @@ -62098,9 +61865,7 @@ /turf/closed/wall, /area/desert_dam/building/dorms/hallway_northwing) "jFf" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "jHR" = ( @@ -62404,9 +62169,7 @@ }, /area/desert_dam/exterior/valley/south_valley_dam) "kWh" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "lcj" = ( @@ -62529,9 +62292,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "lrY" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "ltq" = ( @@ -62598,9 +62359,7 @@ }, /area/desert_dam/building/water_treatment_one/breakroom) "lDT" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "lFc" = ( @@ -62713,9 +62472,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) "lYv" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/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) @@ -62804,9 +62561,7 @@ }, /area/desert_dam/interior/dam_interior/garage) "mkJ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "mkU" = ( @@ -63151,9 +62906,7 @@ }, /area/desert_dam/exterior/valley/south_valley_dam) "nvr" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "nyN" = ( @@ -63610,7 +63363,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "plo" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/telecomm/lz1_xenoflora) "poi" = ( @@ -63909,6 +63662,12 @@ icon_state = "cement_sunbleached4" }, /area/desert_dam/exterior/valley/valley_crashsite) +"qoJ" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo, +/turf/open/asphalt/cement_sunbleached{ + icon_state = "cement_sunbleached4" + }, +/area/desert_dam/exterior/landing_pad_one) "qqR" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal4" @@ -64011,9 +63770,7 @@ }, /area/desert_dam/building/administration/archives) "qHF" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "qJI" = ( @@ -64383,7 +64140,7 @@ }, /area/desert_dam/exterior/valley/valley_hydro) "rUK" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "rUZ" = ( @@ -64506,6 +64263,7 @@ /area/desert_dam/exterior/valley/valley_hydro) "smJ" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /obj/effect/landmark/queen_spawn, /turf/open/floor/prison{ dir = 10; @@ -64730,6 +64488,7 @@ "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{ icon_state = "cement_sunbleached12" }, @@ -64779,15 +64538,11 @@ /turf/open/gm/river/desert/deep/covered, /area/desert_dam/exterior/river/riverside_south) "tii" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/telecomm/lz2_storage) "tjX" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "tlh" = ( @@ -65252,9 +65007,7 @@ }, /area/desert_dam/interior/dam_interior/tech_storage) "uRz" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "uTo" = ( @@ -65344,6 +65097,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"vpn" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 8 + }, +/obj/structure/machinery/floodlight/landing, +/turf/open/floor{ + icon_state = "asteroidplating" + }, +/area/desert_dam/exterior/landing_pad_two) "vpz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -65559,9 +65321,7 @@ }, /area/desert_dam/interior/caves/temple) "wav" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "waC" = ( @@ -65636,9 +65396,7 @@ /turf/closed/wall/r_wall/bunker, /area/desert_dam/interior/dam_interior/garage) "wpW" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "wqM" = ( @@ -65802,12 +65560,20 @@ /obj/structure/flora/grass/tallgrass/desert, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) +"wRg" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 8 + }, +/turf/open/asphalt/cement_sunbleached{ + icon_state = "cement_sunbleached2" + }, +/area/desert_dam/exterior/landing_pad_two) "wRi" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/building/hydroponics/hydroponics_loading) "wRR" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "wRX" = ( @@ -65875,9 +65641,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_telecoms) "xdj" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_5" - }, +/obj/structure/flora/grass/desert/lightgrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "xgA" = ( @@ -66145,9 +65909,7 @@ }, /area/desert_dam/interior/dam_interior/garage) "xLS" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_5" - }, +/obj/structure/flora/grass/desert/lightgrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "xMr" = ( @@ -66158,11 +65920,12 @@ /turf/open/asphalt, /area/desert_dam/exterior/river/riverside_central_north) "xNB" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/floodlight/landing, +/obj/structure/machinery/landinglight/ds1{ dir = 4 }, -/turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached9" +/turf/open/floor{ + icon_state = "asteroidplating" }, /area/desert_dam/exterior/landing_pad_one) "xOb" = ( @@ -69803,6 +69566,7 @@ dTs dTs cwz aKY +cMq cGu cGu cGu @@ -69815,8 +69579,7 @@ cGu cGu cGu cGu -cMq -cGu +aLy cGu cGu cGu @@ -70036,29 +69799,29 @@ cAa dTs dTs csD +alh cMC -cEZ -cGG -cGG +aav cFI cFS cGG cFc -cGG +cFI cFS cGG cFc -cGS -cDV -cEZ -cFc cFI cFS +cLe +cEZ +cCZ +cFS cGG cFc cFI cFS -cLe +cGG +cDL cMC cgh cUl @@ -70270,8 +70033,8 @@ doE crr dTs dTs -aLa -cDY +cDb +cDK cDY cDY cDY @@ -70504,7 +70267,8 @@ doE doE dTs dTs -cCZ +cDb +cDM cDY cDY cDY @@ -70526,7 +70290,6 @@ cDY cDY cDY cFa -cDY cML cBS cUl @@ -70739,7 +70502,7 @@ cSR dTs dTs cDb -cDY +cGS cDY cDY cDY @@ -70972,8 +70735,8 @@ cji ckp crr dTs -cDK -cDY +cDb +adf cDY cDY cDY @@ -71205,9 +70968,9 @@ cRM cRM dFn doE -dTs cCY -cDY +cDb +abS cDY cDY cDY @@ -71440,8 +71203,8 @@ crx dFo doE doE -cCZ -cDY +cDb +cDM cDY cDY cDY @@ -71675,7 +71438,7 @@ dFo doE doE cDb -cDY +cGS cDY cDY cDY @@ -71908,8 +71671,8 @@ crx dFo cOj doE -cDK -cDY +cDb +adf cDY cDY cDY @@ -72142,8 +71905,8 @@ crx dFo doE doE -cDL -cDY +cDb +abS cDY cDY cDY @@ -72376,6 +72139,7 @@ crx dFo doE doE +cDb cDM cDY cDY @@ -72398,7 +72162,6 @@ cDY cDY cDY cDY -cDY cML cBS cUl @@ -72610,8 +72373,8 @@ crx dFo doE cDc -aLy -cDY +cDb +cDV cDY cDY cDY @@ -72664,6 +72427,7 @@ aSY aQg aUi aUC +aVg aQX aVg aVg @@ -72686,7 +72450,6 @@ aVg aVg aVg aVg -aVg aQX aVg aRZ @@ -72844,8 +72607,9 @@ crx dFo doE doE +alh cMC -cFb +wRg cGQ cFe cFP @@ -72857,7 +72621,7 @@ cGa cGQ cFe cHn -cEc +vpn cFb cFe cFP @@ -72865,7 +72629,6 @@ cGa cGQ cFe cFP -cGa cLL cMC cgh @@ -72897,11 +72660,10 @@ aSx aQV aQV aUi -aSa +aUD +aVh aQY -adf -bpQ -aNv +brW bhv boV bpQ @@ -72909,18 +72671,19 @@ aNv bhv boV bpQ -vRc +aNv +bhv bqk xNB -bpQ -aNv +brW bhv boV bpQ aNv bhv boV -brW +bpQ +vRc aQY aUD aVh @@ -73091,7 +72854,7 @@ cDX cDX cDX cDX -cES +cDX cDX cDX cDX @@ -73132,6 +72895,7 @@ aQV aQV aUi aUD +aVj acI aWh aWh @@ -73154,7 +72918,6 @@ aWh aWh aWh aWh -aWh bAF aVi aVh @@ -73364,9 +73127,10 @@ auy aPJ aql ara -asa -aUD -aaA +asc +auy +arZ +aLa aWh aWh aWh @@ -73388,7 +73152,6 @@ aWh aWh aWh dGU -aWh bDO aVi aVh @@ -73598,10 +73361,10 @@ aDb aqg aqg aqg +agV +aqg asa -aUD -abQ -aWh +qoJ aWh aWh aWh @@ -73832,10 +73595,10 @@ aDc aqg aqg aqg +agV +aqg asa -aUD -abS -aWh +abQ aWh aWh aWh @@ -73857,7 +73620,7 @@ aWh aWh aWh aWh -bFB +bGY aQV beT aQg @@ -74066,10 +73829,10 @@ aSc aIJ aql ara +agV +aqg asa -aUD -aav -aWh +cEc aWh aWh aWh @@ -74091,7 +73854,7 @@ aWh aWh aWh aWh -bGY +bJQ aQV beT aQg @@ -74300,10 +74063,10 @@ aSd apz aqg aqg +aqg +aqg asa -aUD -aaA -aWh +aLa aWh aWh aWh @@ -74325,7 +74088,7 @@ aWh aWh aWh aWh -bJQ +bKC aQV beT aQg @@ -74534,10 +74297,10 @@ aIa apz aqg aqg +agV +aqg asa -aUD -abQ -aWh +qoJ aWh aWh aWh @@ -74559,7 +74322,7 @@ aWh aWh aWh aWh -bKC +bFB aQV beT aQg @@ -74768,10 +74531,10 @@ aIa apz aql ara +agV +aqg asa -aUD -abS -aWh +abQ aWh aWh aWh @@ -74793,7 +74556,7 @@ aWh aWh aWh aWh -bFB +bGY aQV beT aQg @@ -75002,10 +74765,10 @@ aIa apz aqg aqg +agV +aqg asa -aUD -aav -aWh +cEc aWh aWh aWh @@ -75236,10 +74999,10 @@ aIa apz aqg aqg -asa -aUD +asd +auz aaA -aWh +aLa aWh aWh aWh @@ -75472,6 +75235,7 @@ aql ara asa aUD +aVg acJ aWh aWh @@ -75494,7 +75258,6 @@ aWh aWh aWh aWh -aWh bFg aVi aVh @@ -75705,9 +75468,10 @@ apz aqg aqg asa -aSa +aUD +aVh aQY -alh +oCD bpT aWi blD @@ -75727,7 +75491,6 @@ bpu bpT aWi blD -bpu bxj aQY aUD @@ -75940,6 +75703,7 @@ aqg aqg asa aUE +aVj aQX aVj aVj @@ -75962,7 +75726,6 @@ aVj aVj aVj aVj -aVj aQX aVj aVG 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 73369ec8bd39..9cba60a14b40 100644 --- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm +++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm @@ -9954,7 +9954,7 @@ }, /area/prison/residential/north) "aBn" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/organic/grass, /area/prison/residential/north) "aBo" = ( @@ -29380,10 +29380,6 @@ }, /turf/open/floor/wood, /area/prison/residential/south) -"bHd" = ( -/obj/structure/lattice, -/turf/open/space, -/area/space) "bHf" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -33380,7 +33376,7 @@ }, /area/prison/residential/south) "bTF" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/organic/grass, /area/prison/residential/south) "bTG" = ( @@ -36181,10 +36177,6 @@ }, /turf/open/floor/wood, /area/prison/residential/south) -"ccz" = ( -/obj/structure/monorail, -/turf/open/space, -/area/space) "ccA" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "Engineering Hallway" @@ -42247,6 +42239,7 @@ dir = 10 }, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/plating, /area/prison/pirate) "cwm" = ( @@ -43520,6 +43513,7 @@ /area/prison/storage/vip) "dqf" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/plating, /area/prison/hanger/main) "duu" = ( @@ -44094,6 +44088,7 @@ /area/prison/cellblock/mediumsec/east) "fGf" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" @@ -48617,10 +48612,6 @@ icon_state = "bright_clean2" }, /area/prison/residential/north) -"tVW" = ( -/obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/organic/grass, -/area/prison/residential/north) "tWR" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/prison{ @@ -48821,6 +48812,7 @@ icon_state = "wood_siding2" }, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor{ icon_state = "asteroid" }, @@ -49093,10 +49085,6 @@ icon_state = "yellowfull" }, /area/prison/cellblock/protective) -"vwO" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/supply, -/turf/open/floor/plating/plating_catwalk/prison, -/area/prison/cellblock/mediumsec/south) "vxy" = ( /obj/structure/reagent_dispensers/water_cooler/stacks, /turf/open/floor/prison{ @@ -57264,7 +57252,7 @@ wUz esR aBm aBn -tVW +aDE fkx avN aFg @@ -62851,7 +62839,7 @@ bWH bXN bYJ oog -ccz +bDE btd bTP bVa @@ -73693,7 +73681,7 @@ obV cxc cyj ctW -vwO +cwL cyG obV cxc diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index 2ed52e789840..867e3f7f48a0 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -306,7 +306,6 @@ "aif" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -639,6 +638,12 @@ }, /turf/open/floor/prison, /area/fiorina/station/medbay) +"arn" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "researchprestine" + }, +/turf/closed/wall/prison, +/area/fiorina/station/research_cells) "arq" = ( /obj/effect/decal/cleanable/blood{ dir = 4; @@ -888,7 +893,6 @@ "ayX" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -1475,7 +1479,6 @@ "aMM" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -2249,9 +2252,7 @@ }, /area/fiorina/station/lowsec) "bju" = ( -/obj/docking_port/stationary/marine_dropship/lz1{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz1, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) "bjx" = ( @@ -3434,6 +3435,13 @@ icon_state = "kitchen" }, /area/fiorina/station/lowsec) +"bYS" = ( +/obj/structure/monorail{ + dir = 4; + name = "launch track" + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "bZu" = ( /obj/structure/sink{ dir = 8; @@ -3621,15 +3629,6 @@ icon_state = "whitepurple" }, /area/fiorina/station/research_cells) -"chQ" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/lz/near_lzI) "chS" = ( /obj/structure/window, /turf/open/floor/prison{ @@ -4109,6 +4108,12 @@ }, /turf/open/floor/prison, /area/fiorina/lz/near_lzI) +"cvL" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "gamertime" + }, +/turf/closed/wall/prison, +/area/fiorina/tumor/servers) "cwB" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -4348,7 +4353,6 @@ /area/fiorina/station/civres_blue) "cDl" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -4484,7 +4488,6 @@ /area/fiorina/station/security) "cHD" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/prison, @@ -5731,7 +5734,6 @@ /area/fiorina/tumor/fiberbush) "dwT" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -6664,13 +6666,6 @@ icon_state = "floor_plate" }, /area/fiorina/station/disco) -"ebT" = ( -/obj/structure/monorail{ - dir = 6; - name = "launch track" - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) "ecd" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, @@ -7219,6 +7214,16 @@ icon_state = "floor_plate" }, /area/fiorina/tumor/ice_lab) +"evv" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/obj/effect/landmark/nightmare{ + insert_tag = "nogear" + }, +/turf/open/floor/prison, +/area/fiorina/station/security) "evD" = ( /obj/structure/lz_sign/prison_sign, /turf/open/floor/prison, @@ -7415,6 +7420,12 @@ icon_state = "green" }, /area/fiorina/station/transit_hub) +"eAM" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) "eAQ" = ( /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison{ @@ -7839,6 +7850,12 @@ /obj/item/prop/helmetgarb/riot_shield, /turf/open/floor/prison, /area/fiorina/station/security) +"eSF" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) "eSZ" = ( /obj/structure/bed/roller, /turf/open/floor/prison{ @@ -8127,7 +8144,7 @@ }, /area/fiorina/station/botany) "eZN" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 }, /turf/open/floor/prison{ @@ -9221,6 +9238,14 @@ icon_state = "floor_plate" }, /area/fiorina/station/security) +"fHV" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzII) "fIj" = ( /obj/item/clothing/suit/storage/hazardvest, /turf/open/floor/prison, @@ -9758,7 +9783,7 @@ /turf/open/floor/carpet, /area/fiorina/station/security/wardens) "fZd" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 1 }, /turf/open/floor/plating/prison, @@ -9915,7 +9940,6 @@ "gfh" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -11932,7 +11956,8 @@ "hpJ" = ( /obj/structure/bed/roller, /obj/structure/machinery/filtration/console{ - pixel_y = 22 + pixel_y = 22; + can_block_movement = 0 }, /obj/item/trash/used_stasis_bag, /turf/open/floor/plating/prison, @@ -12461,6 +12486,13 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) +"hHh" = ( +/obj/structure/machinery/landinglight/ds1/delayone, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "hHq" = ( /obj/structure/closet/cabinet, /obj/effect/landmark/objective_landmark/close, @@ -12561,7 +12593,7 @@ /turf/closed/wall/prison, /area/fiorina/lz/near_lzII) "hLK" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2{ dir = 8 }, /turf/open/floor/prison{ @@ -12597,6 +12629,12 @@ /obj/item/clothing/head/helmet/marine/specialist/hefa, /turf/open/floor/prison, /area/fiorina/station/park) +"hMK" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "pizzatime" + }, +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/power_ring) "hMX" = ( /obj/item/weapon/twohanded/spear, /turf/open/floor/prison{ @@ -12757,6 +12795,14 @@ icon_state = "squares" }, /area/fiorina/station/telecomm/lz1_cargo) +"hTm" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzII) "hTr" = ( /obj/structure/closet, /obj/item/clothing/mask/gas/clown_hat, @@ -12850,7 +12896,6 @@ "hVG" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -12882,18 +12927,6 @@ icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) -"hWL" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/obj/structure/machinery/landinglight/ds1/delaytwo{ - dir = 8 - }, -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzII) "hWU" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ @@ -14074,6 +14107,10 @@ icon_state = "darkpurplefull2" }, /area/fiorina/station/research_cells) +"iOa" = ( +/obj/structure/machinery/floodlight/landing/floor, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) "iOe" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ @@ -14754,7 +14791,6 @@ /area/fiorina/station/transit_hub) "jjs" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -15277,7 +15313,6 @@ "jwc" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -15409,6 +15444,13 @@ icon_state = "damaged2" }, /area/fiorina/station/security) +"jCp" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "jCt" = ( /obj/structure/machinery/light/small{ dir = 4; @@ -15532,14 +15574,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"jFw" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/monorail{ - dir = 10; - name = "launch track" - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) "jFN" = ( /obj/item/explosive/grenade/high_explosive/m15, /obj/effect/decal/cleanable/blood/splatter, @@ -15548,13 +15582,10 @@ }, /area/fiorina/tumor/aux_engi) "jFO" = ( -/obj/structure/machinery/defenses/sentry/premade/dumb{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkbrown2" +/obj/effect/landmark/nightmare{ + insert_tag = "poolparty" }, +/turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/park) "jGd" = ( /obj/structure/machinery/light/double/blue{ @@ -16438,9 +16469,7 @@ }, /area/fiorina/station/power_ring) "kfE" = ( -/obj/docking_port/stationary/marine_dropship/lz2{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz2, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) "kfF" = ( @@ -18941,6 +18970,16 @@ icon_state = "floor_plate" }, /area/fiorina/station/telecomm/lz1_cargo) +"lGh" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "lGm" = ( /obj/structure/platform{ dir = 1 @@ -19075,7 +19114,7 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) "lLv" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2{ dir = 8 }, /turf/open/floor/prison, @@ -19426,6 +19465,15 @@ icon_state = "floor_plate" }, /area/fiorina/station/security) +"lYA" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "lZf" = ( /turf/closed/shuttle/elevator{ dir = 10 @@ -19525,8 +19573,7 @@ /area/fiorina/station/medbay) "mbp" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - dir = 1; - locked = 0 + dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/oob) @@ -19788,7 +19835,6 @@ "mhM" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -22060,6 +22106,15 @@ icon_state = "bluefull" }, /area/fiorina/station/power_ring) +"nBR" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "nBV" = ( /turf/open/floor/prison{ icon_state = "darkpurple2" @@ -22161,6 +22216,15 @@ icon_state = "floor_plate" }, /area/fiorina/station/medbay) +"nGk" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "nGq" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber, /turf/open/floor/prison, @@ -22719,6 +22783,12 @@ /obj/structure/machinery/computer/arcade, /turf/open/floor/plating/prison, /area/fiorina/maintenance) +"obI" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "engineeroffice" + }, +/turf/closed/wall/prison, +/area/fiorina/tumor/civres) "obL" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ @@ -23407,12 +23477,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) -"ovo" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) "ovr" = ( /obj/structure/girder/displaced, /turf/open/floor/plating/prison, @@ -23481,6 +23545,13 @@ icon_state = "whitegreen" }, /area/fiorina/station/medbay) +"owG" = ( +/obj/structure/machinery/landinglight/ds1, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "oxg" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -24093,6 +24164,13 @@ icon_state = "redfull" }, /area/fiorina/station/lowsec) +"oSK" = ( +/obj/structure/monorail{ + dir = 9; + name = "launch track" + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "oSR" = ( /obj/item/device/flashlight, /turf/open/floor/prison{ @@ -24142,6 +24220,13 @@ "oUg" = ( /turf/closed/wall/prison, /area/fiorina/station/telecomm/lz1_cargo) +"oUP" = ( +/obj/structure/lattice, +/obj/effect/landmark/nightmare{ + insert_tag = "wardenofficedecorated" + }, +/turf/open/space, +/area/fiorina/oob) "oVn" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/close, @@ -24677,7 +24762,6 @@ /area/fiorina/lz/near_lzII) "ppI" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -25035,6 +25119,15 @@ icon_state = "floor_plate" }, /area/fiorina/station/flight_deck) +"pAN" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "pAO" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -25906,14 +25999,6 @@ /obj/effect/spawner/random/pills/highchance, /turf/open/floor/plating/prison, /area/fiorina/station/security/wardens) -"qeR" = ( -/obj/structure/machinery/landinglight/ds1{ - dir = 8 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/lz/near_lzII) "qeU" = ( /obj/structure/window/reinforced{ dir = 8; @@ -28766,6 +28851,16 @@ icon_state = "darkpurplefull2" }, /area/fiorina/tumor/ice_lab) +"rPu" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "rPI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/souto/cherry{ @@ -28887,7 +28982,6 @@ "rSr" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -29594,16 +29688,6 @@ /obj/item/tool/crowbar/red, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"ssi" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ - dir = 4 - }, -/obj/structure/machinery/landinglight/ds1/delayone, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) "sso" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/bag/plants, @@ -29838,7 +29922,6 @@ "sBA" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -29898,7 +29981,6 @@ "sDL" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -30024,7 +30106,7 @@ }, /area/fiorina/tumor/civres) "sIT" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 4 }, /turf/open/floor/prison{ @@ -30059,13 +30141,6 @@ icon_state = "floorscorched1" }, /area/fiorina/station/chapel) -"sJI" = ( -/obj/structure/machinery/landinglight/ds1/delayone, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) "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." @@ -30107,6 +30182,15 @@ icon_state = "yellow" }, /area/fiorina/station/disco) +"sLo" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "sLx" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -30936,7 +31020,6 @@ /area/fiorina/station/security) "tpa" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -31063,13 +31146,13 @@ /turf/open/floor/prison, /area/fiorina/station/park) "tts" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/ds2, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/lz/near_lzII) "ttK" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/ds2/delaythree, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -31462,6 +31545,10 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) +"tFu" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) "tFA" = ( /obj/structure/platform{ dir = 4 @@ -31820,6 +31907,15 @@ icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) +"tPi" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) "tPz" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/flashlight/lamp/candelabra{ @@ -32168,7 +32264,7 @@ /turf/open/floor/prison, /area/fiorina/station/security) "tZs" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 8 }, /turf/open/floor/prison{ @@ -32186,6 +32282,15 @@ icon_state = "platingdmg1" }, /area/fiorina/tumor/civres) +"tZV" = ( +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "tZW" = ( /obj/item/tool/wet_sign, /turf/open/floor/almayer{ @@ -32384,6 +32489,15 @@ /obj/structure/window_frame/prison/reinforced, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) +"uhH" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "uin" = ( /obj/item/ammo_box/magazine/misc/flares/empty{ pixel_x = -1; @@ -32572,6 +32686,15 @@ /obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison, /area/fiorina/station/power_ring) +"uol" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "upt" = ( /obj/structure/platform, /turf/open/floor/prison, @@ -32984,6 +33107,12 @@ icon_state = "sterile_white" }, /area/fiorina/station/medbay) +"uCD" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "medicalhold" + }, +/turf/closed/wall/prison, +/area/fiorina/station/medbay) "uCW" = ( /obj/item/reagent_container/glass/bucket/janibucket, /turf/open/floor/prison{ @@ -33001,7 +33130,7 @@ }, /area/fiorina/station/security) "uEN" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -33443,7 +33572,7 @@ }, /area/fiorina/tumor/ship) "uVo" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds2/delaythree{ dir = 4 }, /turf/open/floor/prison, @@ -33933,8 +34062,11 @@ }, /area/fiorina/tumor/servers) "viV" = ( -/obj/structure/machinery/floodlight/landing, -/turf/open/floor/plating/prison, +/obj/structure/monorail{ + dir = 5; + name = "launch track" + }, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "vjl" = ( /obj/structure/closet/crate/trashcart, @@ -34047,6 +34179,9 @@ }, /area/fiorina/station/research_cells) "vmj" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "podholder" + }, /turf/closed/shuttle/ert{ icon_state = "leftengine_1" }, @@ -34343,8 +34478,8 @@ /turf/open/space/basic, /area/fiorina/oob) "vuE" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds2/delayone, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) "vuW" = ( @@ -34696,7 +34831,6 @@ "vFs" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -34980,7 +35114,7 @@ }, /area/fiorina/station/botany) "vPA" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/ds2/delayone, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) "vPM" = ( @@ -35357,14 +35491,6 @@ icon_state = "greenfull" }, /area/fiorina/station/botany) -"wdg" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/monorail{ - dir = 4; - name = "launch track" - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) "wdA" = ( /obj/item/trash/used_stasis_bag, /turf/open/floor/prison{ @@ -35464,7 +35590,7 @@ }, /area/fiorina/station/chapel) "wfp" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/ds1/delaythree{ dir = 8 }, /turf/open/floor/prison{ @@ -35492,6 +35618,12 @@ /obj/item/device/flashlight/flare/on, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) +"wgi" = ( +/obj/effect/landmark/nightmare{ + insert_tag = "scavshipholder" + }, +/turf/open/space, +/area/fiorina/oob) "wgH" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ @@ -36272,6 +36404,13 @@ name = "astroturf" }, /area/fiorina/station/research_cells) +"wJf" = ( +/obj/structure/machinery/landinglight/ds1/delaythree, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "wJt" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/prison{ @@ -36371,7 +36510,6 @@ /area/fiorina/tumor/servers) "wMi" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -36524,6 +36662,10 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison, /area/fiorina/station/park) +"wQN" = ( +/obj/structure/machinery/floodlight/landing/floor, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) "wQT" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/prison, @@ -36575,7 +36717,6 @@ "wRP" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -36951,10 +37092,6 @@ icon_state = "blue_plate" }, /area/fiorina/station/botany) -"xgl" = ( -/obj/structure/machinery/floodlight/landing, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzII) "xgn" = ( /obj/structure/machinery/optable, /turf/open/floor/corsat{ @@ -36996,7 +37133,6 @@ /area/fiorina/station/security) "xja" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -37011,6 +37147,15 @@ icon_state = "cell_stripe" }, /area/fiorina/station/power_ring) +"xjw" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "xjK" = ( /turf/open/floor/prison{ dir = 10; @@ -37326,6 +37471,12 @@ /obj/structure/platform/stair_cut/alt, /turf/open/floor/plating/prison, /area/fiorina/station/disco) +"xrH" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) "xrJ" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison{ @@ -39513,7 +39664,7 @@ bQM bQM bQM bQM -bQM +wgi bQM bQM bQM @@ -46658,7 +46809,7 @@ fBP dIo dIo dIo -dIo +obI wlz dXG qty @@ -51207,7 +51358,7 @@ lRI uGM cdD ajK -itN +jFO itN itN itN @@ -57131,7 +57282,7 @@ aRT kjT qun oyC -jFO +cdD ajK aRT kjT @@ -58702,7 +58853,7 @@ gEF jXz jXz jXz -jXz +cvL lwK hoZ fGb @@ -67503,7 +67654,7 @@ ceC xNm ceC ceC -flC +evv fnB fnB bZY @@ -67544,7 +67695,7 @@ aPH aPH aPH aPH -kPz +oUP kPz bQM bQM @@ -68490,7 +68641,7 @@ oZz vWe hVI hVI -hVI +uCD hVI hVI hVI @@ -71750,31 +71901,31 @@ hxy pax aWR hxy +tFu hxy -hxy -fpM -fpM +eZN +sIT uVo +hTm eZN sIT fpM -sIT +hTm eZN sIT fpM -fpM +hTm eZN sIT -sIT -sIT -sIT -sIT +fpM +hTm +eZN sIT uVo -sIT -eZN -ovo +hTm eZN +hxy +aWR aWR aWR aWR @@ -71964,9 +72115,9 @@ aWR aWR aWR tts +wQN wSm wSm -xnU wSm wSm wSm @@ -71983,11 +72134,11 @@ wSm wSm wSm wSm -xnU wSm +wQN +eAM wSm wSm -fZd wSm wSm vzB @@ -72178,8 +72329,9 @@ aWR ttK wSm wSm +xnU +wSm wSm -xgl wSm wSm wSm @@ -72189,19 +72341,18 @@ wSm wSm wSm wSm -xgl wSm wSm wSm wSm -xgl +xnU wSm kfE +eSF qnB fHB -hWL -hWL -hWL +fHB +fHB ssD iSi ssD @@ -72409,9 +72560,9 @@ wSm wSm wSm wSm +xrH gAS wSm -fZd wSm wSm vzB @@ -72621,9 +72772,9 @@ wSm wSm wSm wSm +fZd gAS wSm -fZd wSm wSm vzB @@ -72833,9 +72984,9 @@ wSm wSm wSm kHG +eAM gAS wSm -fZd wSm wSm vzB @@ -73045,9 +73196,9 @@ wSm wSm wSm wSm +eSF gAS wSm -fZd wSm wSm vzB @@ -73257,9 +73408,9 @@ wSm wSm wSm wSm +xrH gAS wSm -fZd wSm wSm vzB @@ -73469,9 +73620,9 @@ wSm wSm wSm wSm +fZd gAS wSm -fZd wSm wSm vzB @@ -73681,9 +73832,9 @@ wSm wSm wSm wSm +eAM kAr wSm -fZd wSm wSm vzB @@ -73874,8 +74025,9 @@ aWR ttK wSm wSm +xnU +wSm wSm -xgl wSm wSm wSm @@ -73885,19 +74037,18 @@ wSm wSm wSm wSm -xgl wSm wSm wSm wSm -xgl +xnU wSm wSm +eSF mmP fHB -hWL -hWL -hWL +fHB +fHB ssD iSi ssD @@ -74084,9 +74235,9 @@ hxy aWR aWR uEN +wQN wSm wSm -xnU wSm wSm wSm @@ -74103,11 +74254,11 @@ wSm wSm wSm wSm -xnU wSm +wQN +xrH wSm wSm -fZd wSm wSm vzB @@ -74296,29 +74447,29 @@ mxQ vMK hxy hxy +tZs hLK -hLK -qeR yfC +fHV tZs lLv -qeR yfC +fHV tZs hLK -hLK yfC +fHV tZs hLK -qeR yfC +fHV tZs hLK -qeR yfC +fHV tZs -tZs -tZs +aWR +aWR aWR aWR aWR @@ -74835,7 +74986,7 @@ tOp cKa kzh tOp -cKa +arn jXD roY nhz @@ -84476,7 +84627,7 @@ mxQ iyf bzO bzO -bzO +hMK bQM bQM bQM @@ -87567,28 +87718,28 @@ vzB gws vzB iJf +hKI +hsA wFk +nGk +uhH +uol wFk +nGk +uhH +uol wFk +nGk +uhH +uol wFk +nGk +uhH +uol wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk +nGk +uhH +uol wFk hsA hlK @@ -87778,10 +87929,12 @@ bQM vzB gws vzB -ssi +iJf +hKI +owG +iOa xeO xeO -cCx xeO xeO xeO @@ -87798,11 +87951,9 @@ xeO xeO xeO xeO -cCx -xeO xeO -xeO -aVK +iOa +nBR hlK hKI hKI @@ -87990,11 +88141,13 @@ hbC ssD iSi ssD -yls -tHU +tPi +viV +wJf xeO xeO -viV +cCx +xeO xeO xeO xeO @@ -88004,17 +88157,15 @@ xeO xeO xeO xeO -viV xeO xeO xeO xeO -viV +xeO +cCx xeO bju -ebT -yls -aVK +sLo hlK hKI iWW @@ -88202,8 +88353,9 @@ bQM vzB gws vzB -sJI -rUr +iJf +bYS +jCp xeO xeO xeO @@ -88224,9 +88376,8 @@ xeO xeO xeO xeO -rUr xeO -aVK +pAN hlK hjW iWW @@ -88414,8 +88565,9 @@ bQM vzB gws vzB -sJI -rUr +iJf +bYS +hHh xeO xeO xeO @@ -88436,7 +88588,6 @@ xeO xeO xeO xeO -rUr xeO aVK hlK @@ -88626,8 +88777,9 @@ bQM vzB gws vzB -sJI -rUr +iJf +bYS +owG xeO xeO xeO @@ -88647,10 +88799,9 @@ xeO xeO xeO xeO -mUA -rUr xeO -aVK +mUA +nBR hlK hjW iWW @@ -88838,8 +88989,9 @@ bQM vzB gws vzB -sJI -rUr +iJf +bYS +wJf xeO xeO xeO @@ -88860,9 +89012,8 @@ xeO xeO xeO xeO -rUr xeO -aVK +sLo hlK hKI iWW @@ -89050,8 +89201,9 @@ bQM vzB gws vzB -sJI -rUr +iJf +bYS +jCp xeO xeO xeO @@ -89072,9 +89224,8 @@ xeO xeO xeO xeO -rUr xeO -aVK +pAN hlK hjW iWW @@ -89249,8 +89400,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -89262,8 +89413,9 @@ bQM vzB gws vzB -sJI -rUr +iJf +bYS +hHh xeO xeO xeO @@ -89284,7 +89436,6 @@ xeO xeO xeO xeO -rUr xeO aVK hlK @@ -89461,8 +89612,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -89474,8 +89625,9 @@ bQM vzB gws vzB -ssi -rUr +iJf +bYS +owG xeO xeO xeO @@ -89496,9 +89648,8 @@ xeO xeO xeO xeO -wdg xeO -aVK +rPu hlK hjW iWW @@ -89673,8 +89824,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -89686,11 +89837,13 @@ hbC ssD iSi ssD -yls -qDc +tPi +oSK +wJf +doA xeO +cCx xeO -viV xeO xeO xeO @@ -89700,17 +89853,15 @@ xeO xeO xeO xeO -viV xeO xeO xeO xeO -viV xeO +cCx xeO -jFw -yls -aVK +xeO +lGh hlK hKI iWW @@ -89885,8 +90036,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -89898,10 +90049,12 @@ bQM vzB gws vzB -sJI -doA +iJf +hKI +jCp +iOa +xeO xeO -cCx xeO xeO xeO @@ -89918,11 +90071,9 @@ xeO xeO xeO xeO -cCx -xeO -xeO xeO -aVK +iOa +pAN hlK hKI hKI @@ -90097,8 +90248,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -90111,29 +90262,29 @@ vzB gws vzB iJf +hKI +hsA +tZV +lYA wfp +xjw +tZV +lYA wfp +xjw +tZV +lYA wfp +xjw +tZV +lYA wfp +xjw +tZV +lYA wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -chQ -chQ +xjw +tZV hsA hlK sEi @@ -90309,8 +90460,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -90521,8 +90672,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -90733,8 +90884,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -90945,9 +91096,9 @@ bQM bQM bQM bQM -bQM -bQM -bQM +cAW +cAW +cAW 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 new file mode 100644 index 000000000000..916fe313fb33 --- /dev/null +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/10.podholder.dmm @@ -0,0 +1,175 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1; + name = "\improper ambulance pod hatch" + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"b" = ( +/turf/closed/shuttle/ert{ + icon_state = "wy25" + }, +/area/template_noop) +"e" = ( +/turf/closed/shuttle/ert{ + icon_state = "wy27" + }, +/area/template_noop) +"g" = ( +/obj/structure/blocker/invisible_wall, +/turf/closed/shuttle/ert{ + icon_state = "rightengine_1"; + opacity = 0 + }, +/area/template_noop) +"h" = ( +/turf/closed/shuttle/ert{ + icon_state = "leftengine_1" + }, +/area/template_noop) +"l" = ( +/obj/structure/bed/roller, +/obj/structure/machinery/filtration/console{ + pixel_y = 22; + can_block_movement = 0 + }, +/obj/item/trash/used_stasis_bag, +/obj/effect/spawner/random/sentry/midchance, +/turf/open/floor/plating/prison, +/area/template_noop) +"n" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer{ + icon_state = "security_det"; + name = "Shuttle control deck"; + pixel_y = 6 + }, +/obj/structure/machinery/light/small{ + dir = 8; + pixel_x = -11; + pixel_y = 10 + }, +/obj/item/ashtray/plastic{ + pixel_x = 8; + pixel_y = -7 + }, +/obj/item/clothing/mask/cigarette/cigar{ + desc = "Manufactured in New Space Cuba, a product of Castro LTD."; + name = "comically large cigar"; + pixel_x = 14; + pixel_y = 1 + }, +/obj/item/tool/weldingtool{ + pixel_x = -12; + pixel_y = 6 + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"o" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 8; + pixel_x = 7 + }, +/turf/closed/shuttle/ert{ + icon_state = "wy4" + }, +/area/template_noop) +"w" = ( +/obj/item/trash/cigbutt/ucigbutt, +/obj/item/trash/cigbutt/ucigbutt{ + pixel_x = 5; + pixel_y = 12 + }, +/obj/structure/barricade/metal/wired, +/turf/open/floor/plating/prison, +/area/template_noop) +"y" = ( +/turf/closed/shuttle/ert{ + icon_state = "wy_rightengine" + }, +/area/template_noop) +"F" = ( +/turf/closed/shuttle/ert{ + icon_state = "wy_leftengine" + }, +/area/template_noop) +"H" = ( +/turf/closed/shuttle/ert{ + icon_state = "wy2" + }, +/area/template_noop) +"K" = ( +/obj/structure/prop/invuln{ + desc = "An inflated membrane. This one is puncture proof. Wow!"; + icon = 'icons/obj/items/inflatable.dmi'; + icon_state = "wall" + }, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/almayer_hull, +/area/template_noop) +"P" = ( +/turf/closed/shuttle/ert{ + icon_state = "wy20" + }, +/area/template_noop) +"T" = ( +/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/template_noop) +"V" = ( +/obj/structure/machinery/light/small{ + dir = 8; + pixel_x = -11; + pixel_y = 10 + }, +/obj/structure/bed/chair/dropship/pilot{ + dir = 1 + }, +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/plating/prison, +/area/template_noop) +"Z" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 4; + pixel_x = -7 + }, +/turf/closed/shuttle/ert{ + icon_state = "wy5" + }, +/area/template_noop) + +(1,1,1) = {" +P +o +o +F +h +"} +(2,1,1) = {" +e +n +V +H +K +"} +(3,1,1) = {" +e +l +w +a +T +"} +(4,1,1) = {" +b +Z +Z +y +g +"} diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/10.scavshipholder.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/10.scavshipholder.dmm new file mode 100644 index 000000000000..b2a660473a19 --- /dev/null +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/10.scavshipholder.dmm @@ -0,0 +1,1033 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aE" = ( +/obj/structure/machinery/light/small{ + dir = 8; + pixel_x = -11; + pixel_y = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/template_noop) +"aN" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan20" + }, +/area/template_noop) +"aW" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"bh" = ( +/turf/closed/wall/strata_ice/jungle{ + desc = "It is made of Fiberbush(tm). It contains asbestos."; + name = "synthetic vegetation" + }, +/area/template_noop) +"bw" = ( +/obj/structure/machinery/filtration/console{ + pixel_y = 22 + }, +/turf/open/floor/almayer, +/area/template_noop) +"bC" = ( +/obj/item/tool/wet_sign, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"eF" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"fE" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"fI" = ( +/obj/structure/machinery/light/small{ + dir = 8; + pixel_x = -11; + pixel_y = 10 + }, +/obj/structure/largecrate/random/mini/ammo{ + pixel_y = 8; + pixel_x = -9 + }, +/obj/structure/largecrate/random/mini/ammo{ + pixel_y = -3; + pixel_x = -9 + }, +/obj/structure/largecrate/random/mini/ammo{ + pixel_y = 8; + pixel_x = 8 + }, +/obj/structure/largecrate/random/mini/ammo{ + pixel_y = -3; + pixel_x = 7 + }, +/obj/structure/largecrate/random/mini/ammo{ + pixel_y = 7; + pixel_x = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"fN" = ( +/obj/structure/largecrate/random/barrel{ + pixel_x = -1; + pixel_y = 17 + }, +/obj/structure/largecrate/random/barrel{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/structure/largecrate/random/barrel{ + pixel_x = -18; + pixel_y = -1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/template_noop) +"ga" = ( +/obj/structure/barricade/sandbags/wired{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"gi" = ( +/obj/structure/girder/displaced, +/turf/open/floor/plating/prison, +/area/template_noop) +"hP" = ( +/obj/structure/inflatable, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"iT" = ( +/obj/structure/barricade/metal/wired{ + dir = 4 + }, +/obj/item/tool/pen/blue{ + pixel_x = -15; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"iU" = ( +/turf/open/floor/plating/plating_catwalk/prison, +/area/template_noop) +"jZ" = ( +/turf/closed/shuttle/ert{ + icon_state = "rightengine_1"; + opacity = 0 + }, +/area/template_noop) +"kA" = ( +/obj/structure/bed/chair/dropship/pilot, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"kO" = ( +/obj/structure/machinery/light/small{ + dir = 8; + pixel_x = -11; + pixel_y = 10 + }, +/obj/structure/largecrate/supply/weapons/pistols, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"kR" = ( +/obj/structure/machinery/light/small{ + dir = 4; + pixel_x = 11; + pixel_y = 10 + }, +/obj/structure/sign/poster/safety{ + pixel_y = 29; + pixel_x = 5 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"lI" = ( +/obj/structure/largecrate/random/barrel{ + pixel_y = 12; + layer = 3.1; + pixel_x = -6 + }, +/obj/structure/largecrate/random/barrel{ + layer = 3.1; + pixel_x = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/template_noop) +"mz" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/accessory/storage/webbing, +/obj/item/clothing/under/marine/veteran/mercenary/support{ + layer = 2.9; + pixel_y = 6 + }, +/obj/item/clothing/head/helmet/marine/veteran/mercenary/support/engineer{ + pixel_y = 8; + armor_bio = 25; + armor_bomb = 10; + armor_bullet = 20; + armor_energy = 0; + armor_internaldamage = 20; + armor_melee = 20; + armor_rad = 10; + desc = "A sturdy helmet worn by an unknown mercenary group. Features a toggleable welding screen for eye protection. This one has seen better days, don't count on the protection you've heard from the rumors!" + }, +/obj/item/clothing/suit/storage/marine/veteran/mercenary/support{ + pixel_y = -4; + armor_bio = 25; + armor_bullet = 20; + armor_energy = 0; + armor_internaldamage = 25; + armor_melee = 25; + armor_rad = 15; + desc = "A set of blue armor with yellow highlights built for protection while building or carrying out medical treatment in highly dangerous environments. It is a specialized uniform of an unknown mercenary group working in the sector. This one has seen better days, don't count on the protection you've heard from the rumors!" + }, +/obj/structure/machinery/defenses/sentry/premade/dumb{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/template_noop) +"nF" = ( +/turf/closed/shuttle/ert, +/area/template_noop) +"nV" = ( +/obj/structure/machinery/power/apc, +/turf/open/floor/almayer, +/area/template_noop) +"od" = ( +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/plating/plating_catwalk, +/area/template_noop) +"oh" = ( +/turf/open/floor/plating/prison, +/area/template_noop) +"om" = ( +/obj/structure/machinery/light/small{ + dir = 8; + pixel_x = -11; + pixel_y = 10 + }, +/obj/structure/largecrate/black_market/secured_wildlife, +/turf/open/floor/almayer, +/area/template_noop) +"oH" = ( +/turf/open/floor/plating/plating_catwalk, +/area/template_noop) +"pw" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/med_data/laptop{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/template_noop) +"pV" = ( +/obj/structure/machinery/light/small{ + dir = 4; + pixel_x = 11; + pixel_y = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/template_noop) +"qn" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"qI" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan22" + }, +/area/template_noop) +"rv" = ( +/obj/structure/bed/chair/dropship/pilot{ + dir = 1 + }, +/obj/structure/machinery/light/small{ + dir = 8; + pixel_x = -11; + pixel_y = 10 + }, +/turf/open/floor/almayer, +/area/template_noop) +"rK" = ( +/obj/structure/largecrate/random/barrel{ + pixel_x = -6; + pixel_y = 21 + }, +/obj/structure/largecrate/random/barrel{ + pixel_x = 12; + pixel_y = 17 + }, +/obj/structure/largecrate/random/barrel{ + pixel_x = -7; + pixel_y = -1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"tp" = ( +/turf/open/floor/almayer, +/area/template_noop) +"tD" = ( +/obj/structure/lattice, +/turf/open/space, +/area/template_noop) +"tZ" = ( +/obj/item/tool/extinguisher/mini{ + pixel_x = 14; + pixel_y = -14 + }, +/turf/open/floor/almayer, +/area/template_noop) +"vI" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"wO" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_leftengine" + }, +/area/template_noop) +"xR" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan5" + }, +/area/template_noop) +"xS" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_white_t_up" + }, +/area/template_noop) +"xW" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/toolbox/syndicate{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/item/storage/toolbox/syndicate{ + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/template_noop) +"yv" = ( +/obj/structure/sign/poster{ + pixel_y = 30 + }, +/turf/open/floor/almayer, +/area/template_noop) +"BC" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan9" + }, +/area/template_noop) +"Cc" = ( +/obj/structure/surface/rack, +/obj/item/ammo_magazine/sentry/premade/dumb{ + pixel_x = -11; + pixel_y = 3 + }, +/obj/item/ammo_magazine/sentry/premade/dumb{ + pixel_x = 6; + pixel_y = 3 + }, +/turf/open/floor/almayer, +/area/template_noop) +"CG" = ( +/obj/structure/sign/poster/clf{ + pixel_y = 30; + pixel_x = -2 + }, +/turf/open/floor/almayer, +/area/template_noop) +"CM" = ( +/turf/closed/shuttle/ert{ + icon_state = "leftengine_1"; + opacity = 0 + }, +/area/template_noop) +"DS" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan27" + }, +/area/template_noop) +"EF" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/template_noop) +"EW" = ( +/turf/closed/shuttle/ert{ + icon_state = "leftengine_3"; + opacity = 0 + }, +/area/template_noop) +"Fd" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"FV" = ( +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/template_noop) +"Gu" = ( +/obj/structure/prop/structure_lattice{ + dir = 4 + }, +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"Hb" = ( +/obj/structure/machinery/light/small{ + dir = 8; + pixel_x = -11; + pixel_y = 10 + }, +/turf/open/floor/almayer, +/area/template_noop) +"HH" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_l_w" + }, +/area/template_noop) +"Ia" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan8" + }, +/area/template_noop) +"Iu" = ( +/obj/structure/sign/safety/bulkhead_door, +/turf/closed/wall/r_wall/prison_unmeltable, +/area/template_noop) +"Jg" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan1" + }, +/area/template_noop) +"Jv" = ( +/obj/structure/barricade/metal/wired{ + dir = 4 + }, +/obj/structure/barricade/plasteel/wired{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/template_noop) +"JA" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating/plating_catwalk/prison, +/area/template_noop) +"JE" = ( +/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."; + icon_state = "fullgrass_2"; + name = "Fiberbush(tm) tubers" + }, +/turf/open/organic/grass{ + desc = "It'll get in your shoes no matter what you do."; + name = "astroturf" + }, +/area/template_noop) +"JP" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"Ki" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/plating/plating_catwalk, +/area/template_noop) +"Ks" = ( +/obj/structure/machinery/light/small{ + dir = 8; + pixel_x = -11; + pixel_y = 10 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/effect/spawner/random/toolbox, +/obj/item/clothing/head/soft/ferret{ + pixel_y = 7 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"Ky" = ( +/obj/structure/bed, +/obj/item/bedsheet/blue, +/obj/effect/landmark/wo_supplies/guns/common/m41a, +/turf/open/floor/almayer, +/area/template_noop) +"KC" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/template_noop) +"KG" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan2" + }, +/area/template_noop) +"Ld" = ( +/turf/open/space, +/area/template_noop) +"Lz" = ( +/obj/structure/prop/invuln/fire{ + pixel_y = -15 + }, +/turf/closed/shuttle/ert{ + icon_state = "stan22" + }, +/area/template_noop) +"LG" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan23" + }, +/area/template_noop) +"Nm" = ( +/obj/structure/prop/invuln/fire{ + pixel_y = -15 + }, +/turf/closed/shuttle/ert{ + icon_state = "stan23" + }, +/area/template_noop) +"NV" = ( +/turf/closed/wall/mineral/bone_resin, +/area/template_noop) +"Ok" = ( +/obj/structure/surface/rack, +/obj/structure/machinery/light/small{ + dir = 8; + pixel_x = -11; + pixel_y = 10 + }, +/obj/item/storage/firstaid/adv{ + pixel_x = 3; + pixel_y = 5 + }, +/obj/item/storage/firstaid/adv, +/obj/item/device/healthanalyzer{ + pixel_y = -9 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"ON" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_inner_w_1" + }, +/area/template_noop) +"OP" = ( +/obj/structure/barricade/metal/wired{ + dir = 4 + }, +/obj/item/paper_bin{ + pixel_x = -22; + pixel_y = -2 + }, +/obj/structure/barricade/metal/wired, +/turf/open/floor/plating/plating_catwalk, +/area/template_noop) +"QZ" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"Sh" = ( +/obj/structure/machinery/light/small{ + dir = 4; + pixel_x = 11; + pixel_y = 10 + }, +/obj/structure/surface/rack, +/obj/item/tank/oxygen, +/turf/open/floor/plating/plating_catwalk, +/area/template_noop) +"ST" = ( +/obj/structure/surface/table/reinforced/prison{ + icon_state = "prisonflip2"; + dir = 4 + }, +/turf/open/floor/almayer, +/area/template_noop) +"TS" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/template_noop) +"Uh" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan3" + }, +/area/template_noop) +"UJ" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_inner_w_2" + }, +/area/template_noop) +"UQ" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_inner_t_right" + }, +/area/template_noop) +"Vg" = ( +/obj/structure/barricade/metal/wired{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"Vh" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/template_noop) +"VB" = ( +/obj/structure/machinery/light/small, +/obj/structure/machinery/defenses/sentry/premade/dumb{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/template_noop) +"VD" = ( +/obj/structure/bed, +/obj/item/bedsheet/rd, +/obj/item/toy/katana, +/obj/structure/sign/poster/pinup{ + pixel_y = 30 + }, +/turf/open/floor/almayer, +/area/template_noop) +"VW" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer{ + icon_state = "security_det"; + name = "Shuttle control deck"; + pixel_y = 6 + }, +/obj/structure/machinery/light/small{ + dir = 8; + pixel_x = -11; + pixel_y = 10 + }, +/obj/item/coin/uranium{ + desc = "You found one of the three uranium coins. It is entirely worthless." + }, +/obj/item/storage/fancy/cigar/tarbacks{ + pixel_x = -11 + }, +/obj/structure/prop/invuln/fire{ + pixel_y = 1 + }, +/turf/open/floor/almayer, +/area/template_noop) +"Wd" = ( +/turf/closed/shuttle/ert{ + icon_state = "rightengine_3"; + opacity = 0 + }, +/area/template_noop) +"Wt" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_rightengine" + }, +/area/template_noop) +"WN" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan25" + }, +/area/template_noop) +"Xf" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_inner_s_w" + }, +/area/template_noop) +"Xm" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/plating/prison, +/area/template_noop) +"Yj" = ( +/turf/closed/shuttle/ert{ + icon_state = "stan_r_w" + }, +/area/template_noop) +"YV" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ + pixel_y = 25 + }, +/obj/item/device/flashlight/lamp{ + pixel_x = -11 + }, +/turf/open/floor/plating/plating_catwalk, +/area/template_noop) + +(1,1,1) = {" +NV +Ld +Ld +Ld +NV +NV +tD +Ld +aN +nF +nF +Yj +nF +nF +Jg +Ld +Ld +Ld +Ld +Ld +Ld +"} +(2,1,1) = {" +NV +NV +Ld +Ld +NV +NV +tD +Ld +DS +aE +Cc +ON +rK +fI +KG +Ld +Ld +Ld +Ld +Ld +Ld +"} +(3,1,1) = {" +NV +NV +Ld +NV +NV +NV +NV +Ld +DS +Ki +tp +JP +fN +lI +UQ +nF +Jg +Ld +Ld +Ld +Ld +"} +(4,1,1) = {" +NV +NV +NV +NV +aN +nF +nF +Yj +qI +od +bC +xS +UJ +UJ +Xf +om +Ia +Jg +Ld +Ld +Ld +"} +(5,1,1) = {" +NV +NV +NV +aN +qI +Ok +eF +ON +kO +QZ +tp +ON +qn +Ks +ON +ga +Fd +Ia +wO +EW +CM +"} +(6,1,1) = {" +NV +NV +aN +qI +kA +pw +oH +ON +yv +oH +QZ +KC +oH +oH +KC +oH +QZ +BC +Wt +Wd +jZ +"} +(7,1,1) = {" +aN +nF +Lz +bw +oH +tp +tp +ON +QZ +xW +nV +ON +VD +Ky +ON +tp +QZ +KG +NV +NV +Ld +"} +(8,1,1) = {" +DS +VW +rv +tZ +oH +oH +QZ +ON +YV +mz +QZ +xS +UJ +UJ +qI +CG +VB +KG +NV +NV +NV +"} +(9,1,1) = {" +WN +xR +Nm +bw +QZ +tp +tp +KC +Vg +ST +OP +JP +tp +tp +Hb +Jv +Vg +KG +NV +NV +NV +"} +(10,1,1) = {" +NV +NV +WN +LG +kR +oH +oH +ON +iT +pV +Vg +ON +Sh +oH +oH +oH +oH +Ia +wO +EW +CM +"} +(11,1,1) = {" +NV +NV +NV +WN +LG +vI +BC +HH +TS +xR +TS +HH +LG +QZ +Vg +Vg +QZ +BC +Wt +Wd +jZ +"} +(12,1,1) = {" +bh +NV +NV +NV +WN +xR +Uh +hP +iU +aW +iU +hP +WN +xR +TS +TS +xR +Uh +NV +NV +NV +"} +(13,1,1) = {" +bh +NV +NV +NV +NV +NV +Gu +hP +JA +aW +iU +hP +Gu +oh +oh +oh +oh +Gu +NV +NV +NV +"} +(14,1,1) = {" +JE +NV +FV +EF +FV +aW +aW +Iu +fE +Vh +fE +Iu +Xm +oh +oh +gi +oh +oh +oh +bh +bh +"} diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/15.nogear.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/15.nogear.dmm new file mode 100644 index 000000000000..f9a376869849 --- /dev/null +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/15.nogear.dmm @@ -0,0 +1,324 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/wall/r_wall/prison, +/area/template_noop) +"b" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison, +/area/template_noop) +"c" = ( +/turf/open/floor/prison, +/area/template_noop) +"d" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null + }, +/obj/item/clothing/under/color/orange, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/template_noop) +"e" = ( +/turf/closed/wall/prison, +/area/template_noop) +"g" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"i" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ + dir = 1; + req_access = null; + req_one_access = null + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"k" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null + }, +/obj/item/clothing/shoes/galoshes{ + pixel_y = -6 + }, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/template_noop) +"l" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null + }, +/obj/item/clothing/shoes/dress/commander{ + pixel_y = -9 + }, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/template_noop) +"m" = ( +/obj/structure/closet/secure_closet/security_empty, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/storage/box/flashbangs, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/template_noop) +"n" = ( +/obj/item/stack/folding_barricade, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"r" = ( +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/template_noop) +"s" = ( +/obj/structure/machinery/power/apc{ + dir = 4 + }, +/turf/open/floor/prison, +/area/template_noop) +"t" = ( +/obj/structure/window/reinforced, +/turf/open/floor/prison, +/area/template_noop) +"u" = ( +/obj/structure/closet/secure_closet/security_empty, +/obj/item/clothing/accessory/storage/holster, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/template_noop) +"v" = ( +/obj/item/clothing/under/color/orange, +/turf/open/floor/prison, +/area/template_noop) +"w" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"x" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison, +/area/template_noop) +"y" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"z" = ( +/obj/item/clothing/shoes/black{ + pixel_x = -1; + pixel_y = -17 + }, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/prison, +/area/template_noop) +"B" = ( +/obj/item/tool/kitchen/knife{ + pixel_x = -7; + pixel_y = -15 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"C" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/template_noop) +"D" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/prison, +/area/template_noop) +"E" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/turf/open/floor/prison, +/area/template_noop) +"F" = ( +/obj/item/prop/helmetgarb/riot_shield, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"I" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null + }, +/obj/effect/spawner/random/gun/pistol/lowchance, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/template_noop) +"J" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/prison, +/area/template_noop) +"K" = ( +/obj/item/clothing/under/color/orange, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"L" = ( +/obj/structure/window/framed/prison/reinforced, +/turf/open/floor/prison, +/area/template_noop) +"R" = ( +/obj/structure/extinguisher_cabinet, +/turf/closed/wall/r_wall/prison, +/area/template_noop) +"S" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/flora/pottedplant{ + pixel_y = 9 + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/template_noop) +"U" = ( +/obj/effect/landmark/corpsespawner/ua_riot, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"V" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/template_noop) +"W" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null + }, +/obj/item/clothing/shoes/black{ + pixel_x = 2; + pixel_y = -9 + }, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/template_noop) +"X" = ( +/obj/item/frame/rack, +/turf/open/floor/prison{ + icon_state = "redfull" + }, +/area/template_noop) +"Z" = ( +/obj/effect/landmark/corpsespawner/ua_riot, +/turf/open/floor/prison, +/area/template_noop) + +(1,1,1) = {" +s +S +a +a +R +a +a +C +"} +(2,1,1) = {" +a +a +a +I +d +k +a +a +"} +(3,1,1) = {" +n +K +y +B +y +y +X +a +"} +(4,1,1) = {" +D +z +I +d +r +c +X +a +"} +(5,1,1) = {" +Z +b +J +E +I +v +X +a +"} +(6,1,1) = {" +L +L +V +t +l +c +a +e +"} +(7,1,1) = {" +w +U +i +v +x +v +i +y +"} +(8,1,1) = {" +g +F +V +d +W +I +a +u +"} +(9,1,1) = {" +V +V +V +a +V +V +a +m +"} diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/15.wardenofficedecorated.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/15.wardenofficedecorated.dmm new file mode 100644 index 000000000000..bd9ec72717b3 --- /dev/null +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/15.wardenofficedecorated.dmm @@ -0,0 +1,212 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/template_noop) +"b" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/item/weapon/telebaton, +/turf/open/floor/wood, +/area/template_noop) +"c" = ( +/turf/open/floor/carpet, +/area/template_noop) +"d" = ( +/obj/effect/decal/hefa_cult_decals/d96, +/obj/item/device/flashlight/lamp/candelabra, +/turf/open/floor/carpet, +/area/template_noop) +"e" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine, +/turf/open/floor/wood, +/area/template_noop) +"j" = ( +/obj/item/prop/alien/hugger, +/turf/open/floor/carpet, +/area/template_noop) +"s" = ( +/obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/wood, +/area/template_noop) +"t" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/storage/box/matches{ + pixel_x = -6 + }, +/obj/item/device/flashlight/lamp/green{ + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/template_noop) +"w" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/device/flashlight/lamp/candelabra, +/turf/open/floor/carpet, +/area/template_noop) +"x" = ( +/obj/structure/window/framed/prison/reinforced/hull, +/turf/open/floor/plating/prison, +/area/template_noop) +"y" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/carpet, +/area/template_noop) +"A" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/carpet, +/area/template_noop) +"E" = ( +/turf/open/floor/wood, +/area/template_noop) +"K" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/wood, +/area/template_noop) +"L" = ( +/obj/structure/lattice, +/turf/open/space, +/area/template_noop) +"O" = ( +/obj/structure/xenoautopsy/tank/broken, +/turf/open/floor/carpet, +/area/template_noop) +"R" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/weapon/unathiknife{ + name = "ceremonial knife"; + pixel_x = 7; + pixel_y = -2 + }, +/obj/item/organ/heart{ + pixel_x = -5 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/carpet, +/area/template_noop) +"S" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/obj/structure/machinery/power/apc{ + dir = 8 + }, +/turf/open/floor/wood, +/area/template_noop) +"T" = ( +/obj/effect/landmark/corpsespawner/prison_security, +/obj/item/clothing/head/helmet/warden{ + pixel_x = -9; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating, +/area/template_noop) +"U" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/obj/structure/surface/table/woodentable/fancy, +/obj/item/weapon/gun/pistol/highpower/tactical, +/turf/open/floor/plating, +/area/template_noop) +"W" = ( +/obj/structure/machinery/door/airlock/almayer/command{ + dir = 2; + name = "Warden's Office"; + req_access = null + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"Z" = ( +/obj/item/device/flashlight/lamp/candelabra, +/turf/open/floor/carpet, +/area/template_noop) + +(1,1,1) = {" +L +a +a +a +a +a +L +"} +(2,1,1) = {" +a +a +S +E +E +x +x +"} +(3,1,1) = {" +a +E +c +R +c +E +x +"} +(4,1,1) = {" +W +c +w +c +d +b +x +"} +(5,1,1) = {" +W +y +c +T +O +s +x +"} +(6,1,1) = {" +W +c +Z +j +Z +K +x +"} +(7,1,1) = {" +a +E +c +c +A +E +x +"} +(8,1,1) = {" +a +a +U +e +t +x +x +"} +(9,1,1) = {" +L +a +x +x +x +x +L +"} diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.gamertime.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.gamertime.dmm new file mode 100644 index 000000000000..c9f19cbe91e5 --- /dev/null +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.gamertime.dmm @@ -0,0 +1,713 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ah" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkpurple2" + }, +/area/template_noop) +"aA" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/floor/prison, +/area/template_noop) +"da" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/template_noop) +"dv" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras{ + dir = 1 + }, +/turf/open/floor/prison, +/area/template_noop) +"fi" = ( +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, +/area/template_noop) +"gB" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 4; + icon_state = "commb"; + layer = 4 + }, +/obj/item/reagent_container/food/drinks/cans/boda{ + pixel_y = 9; + pixel_x = 9 + }, +/turf/open/floor/prison, +/area/template_noop) +"hT" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" + }, +/area/template_noop) +"jh" = ( +/obj/item/trash/pistachios, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"ji" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 4; + icon_state = "commb" + }, +/obj/item/holder/mouse{ + pixel_x = 4; + pixel_y = 18; + desc = "Wait, why won't it work with my computer?" + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"kU" = ( +/obj/structure/machinery/deployable/barrier, +/turf/open/floor/plating/prison, +/area/template_noop) +"lm" = ( +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"mN" = ( +/obj/structure/machinery/computer3/server/rack, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"na" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison, +/area/template_noop) +"np" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 4; + icon_state = "commb"; + layer = 4 + }, +/obj/item/reagent_container/food/drinks/cans/dr_gibb{ + pixel_y = 10 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" + }, +/area/template_noop) +"nZ" = ( +/obj/structure/machinery/deployable/barrier, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"pq" = ( +/obj/structure/prop/dam/crane, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/template_noop) +"sl" = ( +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkpurple2" + }, +/area/template_noop) +"sF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 8; + icon_state = "commb" + }, +/obj/item/device/encryptionkey/WY{ + pixel_x = 4; + pixel_y = -8 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/template_noop) +"tg" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"tn" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/template_noop) +"tH" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkpurple2" + }, +/area/template_noop) +"uf" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/template_noop) +"ur" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/faxmachine, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"uD" = ( +/obj/item/trash/wy_chips_pepper, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"uO" = ( +/obj/item/stock_parts/manipulator/pico, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, +/area/template_noop) +"va" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/landmark/corpsespawner/ua_riot, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkpurple2" + }, +/area/template_noop) +"wj" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkpurple2" + }, +/area/template_noop) +"xH" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/landmark/corpsespawner/ua_riot/burst, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"yS" = ( +/turf/closed/wall/prison, +/area/template_noop) +"zv" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/effect/landmark/corpsespawner/prisoner, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"zL" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"CE" = ( +/obj/structure/machinery/deployable/barrier, +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkpurple2" + }, +/area/template_noop) +"CO" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkpurple2" + }, +/area/template_noop) +"CV" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 8; + icon_state = "commb" + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"DF" = ( +/obj/structure/bed/chair/comfy, +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/engineer, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, +/area/template_noop) +"DV" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"El" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/prison, +/area/template_noop) +"Ep" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"Fp" = ( +/turf/open/floor/prison, +/area/template_noop) +"Ft" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"Jv" = ( +/obj/item/trash/chunk, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/template_noop) +"Kd" = ( +/obj/structure/prop/structure_lattice{ + dir = 4; + health = 300 + }, +/obj/structure/prop/structure_lattice{ + dir = 4; + layer = 3.1; + pixel_y = 10 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"Mn" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"MZ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 8; + icon_state = "commb"; + layer = 2.99 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkpurple2" + }, +/area/template_noop) +"Ng" = ( +/obj/structure/machinery/deployable/barrier, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkpurple2" + }, +/area/template_noop) +"Ot" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 4; + icon_state = "commb" + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"Oy" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/chips, +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkpurple2" + }, +/area/template_noop) +"OG" = ( +/turf/closed/wall/mineral/bone_resin, +/area/template_noop) +"OH" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/prison, +/area/template_noop) +"Qw" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras{ + dir = 1 + }, +/obj/item/holder/mouse{ + pixel_x = 12; + pixel_y = 12; + desc = "Wait, why won't it work with my computer?" + }, +/turf/open/floor/prison, +/area/template_noop) +"QB" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"QF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/newspaper, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"QG" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkpurple2" + }, +/area/template_noop) +"Rd" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/prisoner, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkpurple2" + }, +/area/template_noop) +"RW" = ( +/turf/open/floor/bluegrid, +/area/template_noop) +"Ss" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkpurple2" + }, +/area/template_noop) +"SF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 8; + icon_state = "commb"; + layer = 4 + }, +/obj/item/reagent_container/food/drinks/cans/souto/blue{ + pixel_x = 8; + pixel_y = 16 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"Tl" = ( +/obj/structure/computer3frame, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"TI" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"Vc" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"VZ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 8; + icon_state = "commb" + }, +/obj/item/reagent_container/food/drinks/cans/classcola{ + pixel_x = -10; + pixel_y = 17 + }, +/turf/open/floor/prison, +/area/template_noop) +"Wu" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 4; + icon_state = "commb" + }, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkpurple2" + }, +/area/template_noop) +"WV" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/template_noop) +"XD" = ( +/obj/structure/machinery/deployable/barrier, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, +/area/template_noop) +"Yj" = ( +/obj/structure/bed/chair/comfy, +/turf/open/floor/prison{ + icon_state = "darkpurple2" + }, +/area/template_noop) +"Za" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/golden_cup{ + pixel_y = 11 + }, +/turf/open/floor/prison, +/area/template_noop) +"Zj" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/obj/structure/machinery/computer3/server/rack, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"Zn" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/deployable/barrier, +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/template_noop) + +(1,1,1) = {" +da +yS +yS +yS +Kd +kU +nZ +kU +Kd +yS +yS +yS +yS +"} +(2,1,1) = {" +yS +mN +lm +jh +lm +lm +lm +lm +zL +zL +Mn +ur +QF +"} +(3,1,1) = {" +yS +Vc +Fp +lm +va +Ft +El +xH +uf +tn +lm +tn +pq +"} +(4,1,1) = {" +yS +Tl +lm +wj +VZ +MZ +SF +CV +sF +Jv +lm +tn +tn +"} +(5,1,1) = {" +yS +lm +fi +Za +RW +RW +RW +RW +RW +WV +lm +WV +Zn +"} +(6,1,1) = {" +yS +tg +Yj +Qw +RW +RW +RW +RW +RW +Ss +Fp +CO +CE +"} +(7,1,1) = {" +kU +lm +DF +dv +RW +RW +RW +RW +RW +fi +Fp +tH +XD +"} +(8,1,1) = {" +Kd +lm +uO +na +RW +RW +RW +RW +RW +fi +aA +tH +XD +"} +(9,1,1) = {" +Kd +lm +lm +Oy +gB +Wu +ji +Ot +np +fi +Fp +hT +XD +"} +(10,1,1) = {" +yS +QB +Fp +lm +Rd +TI +OH +zv +ah +sl +OG +QG +Ng +"} +(11,1,1) = {" +yS +Zj +tg +lm +lm +DV +lm +uD +OG +OG +OG +OG +OG +"} +(12,1,1) = {" +da +da +Ep +Ep +Ep +yS +da +OG +OG +OG +OG +OG +OG +"} diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.medicalhold.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.medicalhold.dmm new file mode 100644 index 000000000000..61fd7320e1ce --- /dev/null +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.medicalhold.dmm @@ -0,0 +1,1178 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aG" = ( +/obj/structure/bed/chair{ + layer = 2.7; + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/template_noop) +"aZ" = ( +/obj/structure/bed/roller, +/obj/structure/machinery/iv_drip{ + pixel_y = 19 + }, +/obj/item/bedsheet/medical, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"bl" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" + }, +/area/template_noop) +"bm" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottom" + }, +/obj/structure/inflatable/door, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"bs" = ( +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/template_noop) +"bv" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"bN" = ( +/obj/structure/bed/chair{ + dir = 4; + pixel_y = 4 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/template_noop) +"cO" = ( +/obj/structure/machinery/door/airlock/almayer/marine{ + icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi'; + icon_state = "door_open" + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"dg" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"dp" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" + }, +/area/template_noop) +"dK" = ( +/obj/structure/machinery/medical_pod/sleeper, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitegreen" + }, +/area/template_noop) +"eb" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ + dir = 1; + req_access = null; + req_one_access = null + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"eO" = ( +/obj/structure/largecrate/supply/supplies/tables_racks, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/template_noop) +"fn" = ( +/obj/structure/inflatable, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/template_noop) +"go" = ( +/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." + }, +/turf/closed/wall/r_wall/prison_unmeltable, +/area/template_noop) +"gC" = ( +/obj/structure/largecrate/supply/medicine/medkits, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"ir" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" + }, +/area/template_noop) +"it" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitegreen" + }, +/area/template_noop) +"iK" = ( +/obj/structure/janitorialcart, +/turf/open/floor/prison, +/area/template_noop) +"jy" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" + }, +/area/template_noop) +"kE" = ( +/turf/closed/wall/prison, +/area/template_noop) +"kG" = ( +/obj/structure/inflatable/popped/door, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"kK" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"kY" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalleft" + }, +/obj/structure/inflatable/door, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"kZ" = ( +/obj/structure/inflatable/door, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"lm" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottom" + }, +/obj/structure/inflatable/popped, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"nj" = ( +/obj/structure/bed/chair/janicart, +/turf/open/floor/prison, +/area/template_noop) +"no" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/door/window/eastright, +/obj/item/reagent_container/food/drinks/coffeecup{ + pixel_x = 7; + pixel_y = 14 + }, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/plating/prison, +/area/template_noop) +"nx" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno/limb, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreencorner" + }, +/area/template_noop) +"nJ" = ( +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"nR" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/drip, +/obj/structure/largecrate/random/barrel, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/template_noop) +"nX" = ( +/obj/structure/bed/roller, +/obj/structure/machinery/iv_drip{ + pixel_y = 19 + }, +/obj/item/bedsheet/medical, +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"of" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/obj/item/storage/beer_pack{ + pixel_y = 6; + layer = 3.1 + }, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitegreen" + }, +/area/template_noop) +"oy" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/template_noop) +"ph" = ( +/obj/structure/inflatable/door, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/template_noop) +"pR" = ( +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" + }, +/area/template_noop) +"qb" = ( +/obj/structure/inflatable/popped, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" + }, +/area/template_noop) +"qe" = ( +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" + }, +/area/template_noop) +"qS" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/template_noop) +"sk" = ( +/obj/structure/bed/roller, +/obj/structure/machinery/iv_drip{ + pixel_y = 19 + }, +/obj/item/bedsheet/medical, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"tE" = ( +/obj/structure/machinery/cm_vending/sorted/medical/no_access, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"tL" = ( +/obj/structure/inflatable, +/turf/open/floor/prison{ + icon_state = "whitegreencorner" + }, +/area/template_noop) +"uE" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" + }, +/area/template_noop) +"uG" = ( +/obj/effect/decal/prints{ + pixel_y = -10 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"uU" = ( +/obj/item/storage/pill_bottle/tramadol/skillless, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"vA" = ( +/obj/structure/inflatable/popped, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"xC" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/book/manual/surgery{ + pixel_y = 4 + }, +/obj/item/storage/surgical_tray, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/template_noop) +"xY" = ( +/obj/structure/largecrate/random/case/double{ + pixel_y = 8; + pixel_x = -5 + }, +/obj/structure/largecrate/random/case/double{ + pixel_y = -4; + pixel_x = -5 + }, +/obj/structure/largecrate/random/case/double{ + pixel_y = -17; + pixel_x = -5 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"zm" = ( +/obj/structure/machinery/optable, +/obj/item/bedsheet/rainbow, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/template_noop) +"zG" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreencorner" + }, +/area/template_noop) +"Be" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/template_noop) +"BS" = ( +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/template_noop) +"Cr" = ( +/obj/structure/largecrate/random/barrel/yellow{ + pixel_x = 6; + pixel_y = -11; + layer = 2.8 + }, +/obj/structure/largecrate/random/barrel/yellow{ + pixel_x = -13; + pixel_y = -4; + layer = 2.9 + }, +/obj/structure/largecrate/random/barrel/yellow{ + pixel_x = 6; + pixel_y = 6; + layer = 2.7 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"CA" = ( +/obj/structure/extinguisher_cabinet, +/turf/closed/wall/r_wall/prison_unmeltable, +/area/template_noop) +"Df" = ( +/obj/structure/largecrate/supply/supplies/water, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" + }, +/area/template_noop) +"Es" = ( +/obj/item/reagent_container/glass/bucket/mopbucket, +/obj/item/tool/mop, +/turf/open/floor/prison, +/area/template_noop) +"EB" = ( +/obj/structure/bed/chair{ + dir = 4; + layer = 2.7 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"ES" = ( +/obj/structure/platform{ + dir = 8 + }, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottomleft" + }, +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/template_noop) +"EZ" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/template_noop) +"Gl" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/phone{ + pixel_x = -3; + pixel_y = 13 + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"GI" = ( +/obj/structure/stairs/perspective, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/inflatable/door, +/turf/open/floor/plating/prison, +/area/template_noop) +"GL" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/fancy/vials/random, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/template_noop) +"GT" = ( +/obj/structure/machinery/cryo_cell, +/turf/open/floor/plating/plating_catwalk/prison, +/area/template_noop) +"Hq" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottomleft" + }, +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" + }, +/area/template_noop) +"Hw" = ( +/obj/item/ammo_casing{ + icon_state = "cartridge_1" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/template_noop) +"HS" = ( +/obj/structure/inflatable/door, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" + }, +/area/template_noop) +"IK" = ( +/obj/structure/platform{ + dir = 1; + layer = 2.8 + }, +/obj/structure/largecrate/random/barrel{ + pixel_x = -8; + layer = 2.9 + }, +/obj/structure/largecrate/random/barrel{ + pixel_x = 13; + layer = 2.9 + }, +/obj/structure/largecrate/random/barrel{ + pixel_x = 3; + layer = 2.9; + pixel_y = -8 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/template_noop) +"JJ" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 4; + layer = 2.8 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/template_noop) +"JL" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/obj/structure/inflatable, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/template_noop) +"JW" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottom" + }, +/obj/structure/inflatable/popped, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreen" + }, +/area/template_noop) +"Kk" = ( +/obj/structure/machinery/door/airlock/almayer/marine{ + icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi' + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"Kp" = ( +/obj/structure/largecrate/random, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottomright" + }, +/obj/item/reagent_container/food/drinks/coffee{ + pixel_y = 13 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/template_noop) +"Ky" = ( +/obj/structure/inflatable/popped/door, +/turf/open/floor/prison{ + icon_state = "whitegreencorner" + }, +/area/template_noop) +"KF" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"KJ" = ( +/obj/structure/inflatable/door, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreencorner" + }, +/area/template_noop) +"Mi" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/obj/structure/largecrate/supply/supplies/flares, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" + }, +/area/template_noop) +"NV" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/obj/structure/largecrate/supply/medicine/blood, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitegreen" + }, +/area/template_noop) +"Od" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/template_noop) +"Ou" = ( +/obj/structure/bed/chair{ + dir = 8; + layer = 2.7 + }, +/obj/effect/decal/cleanable/mucus{ + pixel_x = -16 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"OH" = ( +/obj/structure/largecrate/random/case/double{ + pixel_y = 8 + }, +/obj/structure/largecrate/random/case/double{ + pixel_y = -4 + }, +/obj/structure/largecrate/random/case/double{ + pixel_y = -18 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"Pa" = ( +/obj/structure/largecrate/supply/weapons/pistols, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/template_noop) +"Pd" = ( +/obj/structure/machinery/medical_pod/bodyscanner, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreen" + }, +/area/template_noop) +"Pt" = ( +/obj/structure/inflatable/popped/door, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/template_noop) +"PE" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"PS" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottom" + }, +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"PV" = ( +/obj/structure/inflatable/popped, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitegreencorner" + }, +/area/template_noop) +"QG" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/template_noop) +"Ro" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/template_noop) +"RG" = ( +/obj/structure/largecrate/supply/medicine/iv, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"Sz" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/largecrate/random/barrel, +/obj/structure/largecrate/random/barrel{ + pixel_x = 16; + layer = 3.1; + pixel_y = -4 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/template_noop) +"Tb" = ( +/obj/structure/bed/chair{ + dir = 8; + layer = 2.7 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"TF" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalleft" + }, +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitegreen" + }, +/area/template_noop) +"TV" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"UI" = ( +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/template_noop) +"US" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalleft" + }, +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"Va" = ( +/obj/structure/extinguisher_cabinet, +/turf/closed/wall/prison, +/area/template_noop) +"Vp" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitegreen" + }, +/area/template_noop) +"VD" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "whitegreen" + }, +/area/template_noop) +"WP" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaldir" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/template_noop) +"WY" = ( +/obj/structure/inflatable, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"Xl" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalleft" + }, +/obj/structure/inflatable/popped/door, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"Yy" = ( +/obj/structure/largecrate/supply/supplies/mre, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitegreenfull" + }, +/area/template_noop) +"Yz" = ( +/obj/structure/window/framed/prison/cell, +/turf/open/floor/plating/prison, +/area/template_noop) +"Zg" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, +/turf/closed/wall/prison, +/area/template_noop) +"Zp" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/structure/machinery/defenses/bell_tower/md, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) + +(1,1,1) = {" +Hw +oy +bs +bv +WP +Be +Vp +nx +zG +uE +Kp +kE +Gl +no +Va +kE +kE +kE +"} +(2,1,1) = {" +kE +kE +kE +go +Hq +qe +KJ +kG +WY +PV +JW +ir +qe +qe +Df +Mi +Pa +kE +"} +(3,1,1) = {" +bN +Be +kE +kE +IK +TV +TV +TV +TV +TV +lm +TV +TV +TV +TV +eO +Yy +kE +"} +(4,1,1) = {" +GL +Be +eb +GI +JJ +TV +Zp +nJ +kK +TV +bm +TV +TV +TV +kK +UI +kE +kE +"} +(5,1,1) = {" +Be +oy +kE +kE +Sz +dg +TV +TV +TV +TV +bm +kK +TV +TV +TV +VD +kE +kE +"} +(6,1,1) = {" +kE +kE +kE +kE +nR +dg +TV +TV +TV +Cr +PS +EB +EB +EB +TV +JL +xC +Od +"} +(7,1,1) = {" +iK +kE +Ro +ES +TF +Xl +kY +US +US +Zg +Zg +aZ +TV +aZ +TV +PV +jy +Pd +"} +(8,1,1) = {" +nj +kE +EZ +Be +QG +TV +TV +uG +tE +kE +kE +sk +TV +aZ +TV +kZ +nJ +UI +"} +(9,1,1) = {" +Es +kE +GT +Be +QG +TV +kK +KF +RG +Zg +Zg +aZ +TV +nX +TV +Ky +TV +zm +"} +(10,1,1) = {" +kE +kE +GT +Be +BS +OH +TV +TV +TV +gC +WY +Ou +Tb +Tb +dg +fn +uU +UI +"} +(11,1,1) = {" +kE +Be +Be +Be +QG +xY +dg +TV +TV +TV +kZ +TV +TV +kK +dg +tL +dp +dK +"} +(12,1,1) = {" +PE +ph +Be +qS +QG +kK +TV +TV +TV +TV +vA +TV +TV +TV +TV +aG +CA +Od +"} +(13,1,1) = {" +kE +Be +Pt +bs +it +bl +pR +pR +pR +pR +pR +NV +qb +HS +pR +of +Od +Od +"} +(14,1,1) = {" +Od +Kk +cO +Kk +Od +Od +Yz +Yz +Yz +Yz +Yz +Od +cO +Kk +Kk +Od +Od +Od +"} diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm new file mode 100644 index 000000000000..22c8cb543d98 --- /dev/null +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm @@ -0,0 +1,2013 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aj" = ( +/obj/structure/window/framed/prison, +/turf/open/floor/plating/prison, +/area/template_noop) +"az" = ( +/obj/structure/bed/chair/comfy{ + dir = 1 + }, +/turf/open/floor/wood, +/area/template_noop) +"bD" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood, +/area/template_noop) +"bO" = ( +/obj/item/storage/belt/marine/quackers, +/turf/open/gm/river{ + name = "pool" + }, +/area/template_noop) +"cb" = ( +/obj/item/trash/barcardine{ + pixel_y = -9; + pixel_x = -15 + }, +/turf/open/floor/wood, +/area/template_noop) +"ci" = ( +/obj/item/toy/gun, +/turf/open/floor/wood, +/area/template_noop) +"cj" = ( +/obj/item/trash/crushed_cup{ + pixel_y = -7; + pixel_x = -1 + }, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/template_noop) +"cq" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/head/cueball{ + pixel_x = 32; + pixel_y = -2 + }, +/obj/item/reagent_container/food/drinks/bottle/beer/craft/tuxedo{ + pixel_x = -9; + pixel_y = 9 + }, +/turf/open/floor/wood, +/area/template_noop) +"cK" = ( +/obj/structure/platform_decoration, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/template_noop) +"cU" = ( +/obj/structure/machinery/power/apc, +/turf/open/floor/wood, +/area/template_noop) +"dB" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "darkbrown2" + }, +/area/template_noop) +"ef" = ( +/obj/item/toy/beach_ball, +/turf/open/gm/river{ + name = "pool" + }, +/area/template_noop) +"el" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/template_noop) +"fv" = ( +/obj/item/toy/crossbow_ammo{ + pixel_x = -16 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrowncorners2" + }, +/area/template_noop) +"fL" = ( +/obj/structure/grille, +/obj/item/reagent_container/food/snacks/carpmeat{ + pixel_x = -5; + pixel_y = 13 + }, +/obj/item/reagent_container/food/snacks/carpmeat{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/structure/prop/invuln/fire{ + layer = 2.9 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrowncorners2" + }, +/area/template_noop) +"fN" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"fX" = ( +/turf/closed/wall/mineral/bone_resin, +/area/template_noop) +"gs" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/template_noop) +"gV" = ( +/turf/open/space, +/area/template_noop) +"hf" = ( +/turf/open/gm/river{ + name = "pool" + }, +/area/template_noop) +"hP" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/prison, +/area/template_noop) +"hY" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 + }, +/turf/open/floor/wood, +/area/template_noop) +"ij" = ( +/obj/item/toy/crossbow_ammo{ + pixel_y = 18; + pixel_x = 24; + layer = 2.5 + }, +/turf/open/floor/wood, +/area/template_noop) +"ik" = ( +/obj/item/trash/syndi_cakes{ + pixel_x = -13; + pixel_y = -11 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/template_noop) +"is" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkbrown2" + }, +/area/template_noop) +"iC" = ( +/obj/item/tool/mop{ + pixel_x = 11; + layer = 2.9; + pixel_y = 3 + }, +/obj/item/reagent_container/glass/bucket/mopbucket{ + pixel_x = 9; + pixel_y = -5 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/template_noop) +"iK" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/template_noop) +"iY" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cup{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/reagent_container/food/drinks/cup{ + pixel_x = 15; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/template_noop) +"jt" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/wood, +/area/template_noop) +"jW" = ( +/obj/item/trash/crushed_cup{ + pixel_y = 6; + pixel_x = 6 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/template_noop) +"kb" = ( +/obj/item/trash/crushed_cup{ + pixel_y = -65; + pixel_x = 29 + }, +/turf/open/gm/river{ + name = "pool" + }, +/area/template_noop) +"kA" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"lc" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/toy/deck, +/obj/item/toy/dice{ + pixel_x = 11; + pixel_y = 7 + }, +/turf/open/floor/wood, +/area/template_noop) +"lh" = ( +/obj/item/trash/cigbutt{ + pixel_x = 31; + pixel_y = -16 + }, +/turf/open/floor/wood, +/area/template_noop) +"ly" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/prison, +/area/template_noop) +"lS" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/cheeseburger{ + pixel_x = -6; + pixel_y = 12 + }, +/obj/item/reagent_container/food/snacks/cheeseburger{ + pixel_x = 9; + pixel_y = 12 + }, +/obj/item/reagent_container/food/snacks/cheeseburger{ + pixel_x = 9; + pixel_y = 1 + }, +/obj/item/reagent_container/food/snacks/cheeseburger{ + pixel_x = -6; + pixel_y = 2 + }, +/turf/open/floor/wood, +/area/template_noop) +"mc" = ( +/obj/item/trash/kepler{ + pixel_x = 13 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/template_noop) +"mj" = ( +/obj/structure/prop/souto_land/pole, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/template_noop) +"mk" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/obj/item/trash/crushed_cup{ + pixel_y = -7; + pixel_x = 7 + }, +/turf/open/floor/wood, +/area/template_noop) +"mq" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrowncorners2" + }, +/area/template_noop) +"mu" = ( +/turf/open/floor/plating/prison, +/area/template_noop) +"nf" = ( +/turf/open/floor/wood, +/area/template_noop) +"ng" = ( +/obj/item/trash/cigbutt{ + pixel_x = 31; + pixel_y = -16 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/template_noop) +"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, +/area/template_noop) +"or" = ( +/obj/structure/prop/souto_land/pole{ + dir = 1 + }, +/turf/open/floor/wood, +/area/template_noop) +"ou" = ( +/obj/structure/platform, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/template_noop) +"oL" = ( +/obj/structure/lattice, +/turf/open/space, +/area/template_noop) +"pt" = ( +/obj/structure/bed/chair/comfy{ + layer = 2.9 + }, +/turf/open/floor/wood, +/area/template_noop) +"pB" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "bright_clean2" + }, +/area/template_noop) +"pG" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/stair_cut, +/turf/open/floor/plating/prison, +/area/template_noop) +"pH" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/template_noop) +"ql" = ( +/obj/item/trash/sosjerky{ + pixel_x = -14; + pixel_y = -20 + }, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/template_noop) +"qm" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/template_noop) +"qG" = ( +/obj/item/trash/crushed_cup{ + pixel_y = 16 + }, +/obj/item/trash/hotdog{ + pixel_x = 7; + pixel_y = -8 + }, +/obj/item/trash/hotdog{ + pixel_x = -4; + pixel_y = -11 + }, +/obj/item/trash/hotdog{ + pixel_x = 2; + pixel_y = -2 + }, +/turf/open/floor/wood, +/area/template_noop) +"ro" = ( +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"rp" = ( +/obj/item/reagent_container/glass/bucket/janibucket, +/turf/open/floor/prison, +/area/template_noop) +"rq" = ( +/obj/item/trash/semki{ + pixel_x = 15 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/template_noop) +"rt" = ( +/obj/item/trash/crushed_cup{ + pixel_x = -2; + pixel_y = 36 + }, +/turf/open/gm/river{ + name = "pool" + }, +/area/template_noop) +"rU" = ( +/obj/structure/grille, +/obj/item/reagent_container/food/snacks/bearmeat{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/reagent_container/food/snacks/meat/human{ + pixel_x = -7; + pixel_y = 3 + }, +/obj/structure/prop/invuln/fire{ + layer = 2.9 + }, +/turf/open/floor/prison{ + icon_state = "darkbrowncorners2" + }, +/area/template_noop) +"rW" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/open/floor/wood, +/area/template_noop) +"so" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/wood, +/area/template_noop) +"tb" = ( +/obj/item/trash/wy_chips_pepper{ + pixel_x = 18; + layer = 2.5 + }, +/turf/open/floor/wood, +/area/template_noop) +"tw" = ( +/obj/item/toy/crossbow_ammo{ + pixel_x = -7; + pixel_y = -11 + }, +/turf/open/floor/wood, +/area/template_noop) +"ty" = ( +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/prison, +/area/template_noop) +"tz" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/wood, +/area/template_noop) +"tD" = ( +/obj/item/trash/plate{ + pixel_x = -9 + }, +/turf/open/floor/prison{ + icon_state = "darkbrowncorners2" + }, +/area/template_noop) +"tM" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrowncorners2" + }, +/area/template_noop) +"tT" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/wood, +/area/template_noop) +"uw" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrowncorners2" + }, +/area/template_noop) +"vd" = ( +/obj/structure/prop/souto_land/pole, +/obj/structure/prop/souto_land/pole{ + dir = 4; + pixel_y = 24 + }, +/obj/item/toy/plushie_cade{ + pixel_x = 1; + pixel_y = -9 + }, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/template_noop) +"vf" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"vU" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/hotdog{ + pixel_x = 6; + pixel_y = 16 + }, +/obj/item/reagent_container/food/snacks/hotdog{ + pixel_x = -7; + pixel_y = 16 + }, +/obj/item/reagent_container/food/snacks/hotdog{ + pixel_x = 6; + pixel_y = 12 + }, +/obj/item/reagent_container/food/snacks/hotdog{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/item/reagent_container/food/snacks/hotdog{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/reagent_container/food/snacks/hotdog{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/reagent_container/food/snacks/hotdog{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/reagent_container/food/snacks/hotdog{ + pixel_x = 6; + pixel_y = 2 + }, +/turf/open/floor/wood, +/area/template_noop) +"vX" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/obj/structure/prop/souto_land/pole{ + dir = 1 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 9 + }, +/obj/item/tool/hand_labeler{ + pixel_x = -5; + pixel_y = 7 + }, +/turf/open/floor/wood, +/area/template_noop) +"wS" = ( +/turf/open/floor/prison{ + dir = 6; + icon_state = "darkbrown2" + }, +/area/template_noop) +"wV" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"xz" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 9 + }, +/turf/open/floor/wood, +/area/template_noop) +"xQ" = ( +/obj/item/reagent_container/food/drinks/cans/beer, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/template_noop) +"xS" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/wood, +/area/template_noop) +"yx" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/template_noop) +"yL" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"zc" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/template_noop) +"zR" = ( +/obj/item/trash/cigbutt{ + pixel_x = 10; + pixel_y = -11 + }, +/turf/open/floor/wood, +/area/template_noop) +"Aj" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison, +/area/template_noop) +"Ao" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/wood, +/area/template_noop) +"Bf" = ( +/obj/structure/window/framed/prison/reinforced/hull, +/turf/open/floor/plating/prison, +/area/template_noop) +"Bj" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/template_noop) +"Bm" = ( +/obj/structure/prop/souto_land/pole{ + dir = 1 + }, +/obj/structure/prop/souto_land/pole{ + dir = 8; + pixel_y = 24 + }, +/obj/item/toy/plushie_cade{ + pixel_x = -3; + pixel_y = -9 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/template_noop) +"Bv" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 9 + }, +/obj/item/toy/gun_ammo{ + pixel_y = 66 + }, +/turf/open/floor/wood, +/area/template_noop) +"BK" = ( +/obj/structure/prop/souto_land/pole, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/turf/open/floor/wood, +/area/template_noop) +"BY" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/bottle/beer/craft/mono{ + pixel_x = 6; + pixel_y = 5; + layer = 3.1 + }, +/obj/item/toy/farwadoll{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/trash/cigbutt{ + pixel_x = -6; + pixel_y = 11 + }, +/turf/open/floor/wood, +/area/template_noop) +"Ci" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/beer_pack{ + pixel_y = 5; + layer = 4 + }, +/turf/open/floor/wood, +/area/template_noop) +"Cq" = ( +/obj/item/toy/crossbow_ammo{ + pixel_x = -17; + pixel_y = 41 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/template_noop) +"Cx" = ( +/obj/item/weapon/baseballbat/metal, +/turf/open/floor/wood, +/area/template_noop) +"Dd" = ( +/obj/item/trash/crushed_cup{ + pixel_x = -20 + }, +/turf/open/gm/river{ + name = "pool" + }, +/area/template_noop) +"DN" = ( +/obj/structure/platform_decoration, +/turf/open/floor/prison{ + icon_state = "darkbrowncorners2" + }, +/area/template_noop) +"DT" = ( +/obj/structure/platform, +/turf/open/gm/river{ + name = "pool" + }, +/area/template_noop) +"Fj" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/wood, +/area/template_noop) +"Fl" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/storage/pill_bottle/kelotane/skillless, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison, +/area/template_noop) +"Fo" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/template_noop) +"Fy" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/template_noop) +"Fz" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 9 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/template_noop) +"FD" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/toy/therapy_blue{ + pixel_y = 4 + }, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + pixel_x = 10; + pixel_y = 4 + }, +/obj/item/clothing/head/bowlerhat{ + pixel_y = 16; + layer = 3.1 + }, +/turf/open/floor/wood, +/area/template_noop) +"FN" = ( +/obj/item/toy/crossbow{ + pixel_x = 11; + pixel_y = -8 + }, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/template_noop) +"Gi" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"Gp" = ( +/obj/effect/landmark/objective_landmark/medium, +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate{ + pixel_x = -7 + }, +/obj/item/trash/plate{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/item/trash/plate{ + pixel_x = -7; + pixel_y = 9 + }, +/obj/item/trash/plate{ + pixel_x = 7 + }, +/obj/item/trash/plate{ + pixel_x = 7; + pixel_y = 4 + }, +/obj/item/trash/plate{ + pixel_x = 7; + pixel_y = 9 + }, +/turf/open/floor/wood, +/area/template_noop) +"Gu" = ( +/obj/item/trash/crushed_cup{ + pixel_y = -2; + pixel_x = -12 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/template_noop) +"GO" = ( +/obj/item/toy/crossbow_ammo{ + pixel_y = -14; + pixel_x = -15 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/template_noop) +"Hn" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 9 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"HP" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/obj/item/trash/crushed_cup{ + pixel_y = 3; + pixel_x = -4 + }, +/turf/open/floor/wood, +/area/template_noop) +"ID" = ( +/obj/item/trash/crushed_cup{ + pixel_y = -6; + pixel_x = -8 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/template_noop) +"IU" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/wood, +/area/template_noop) +"Jf" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cup{ + pixel_x = -17; + pixel_y = -21 + }, +/obj/item/reagent_container/food/drinks/bottle/beer/craft/tazhushka{ + pixel_x = 10; + pixel_y = 20 + }, +/turf/open/floor/wood, +/area/template_noop) +"Jr" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrowncorners2" + }, +/area/template_noop) +"Jw" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/wood, +/area/template_noop) +"JQ" = ( +/obj/item/clipboard, +/turf/open/floor/prison, +/area/template_noop) +"JR" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/template_noop) +"Ke" = ( +/obj/item/toy/crossbow_ammo{ + pixel_x = 19; + pixel_y = 9 + }, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/template_noop) +"Kx" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"KL" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cup{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/reagent_container/food/drinks/cup{ + pixel_x = -12; + pixel_y = -1 + }, +/obj/item/reagent_container/food/drinks/cup{ + pixel_x = -21; + pixel_y = -1 + }, +/obj/item/reagent_container/food/drinks/cup{ + pixel_x = -16; + pixel_y = -6 + }, +/turf/open/floor/wood, +/area/template_noop) +"KM" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/template_noop) +"KO" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cup{ + pixel_x = -8; + layer = 3.2 + }, +/obj/item/reagent_container/food/drinks/cup{ + pixel_x = -13; + pixel_y = 6; + layer = 3.1 + }, +/turf/open/floor/wood, +/area/template_noop) +"La" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/gm/river{ + name = "pool" + }, +/area/template_noop) +"Ls" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/prop/souto_land/pole{ + dir = 1 + }, +/obj/structure/prop/souto_land/streamer{ + dir = 9 + }, +/turf/open/floor/wood, +/area/template_noop) +"LI" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_y = 11; + pixel_x = 9 + }, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_y = 11; + pixel_x = 1 + }, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_y = 11; + pixel_x = -7 + }, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_y = 4; + pixel_x = 9 + }, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_y = 4; + pixel_x = 1 + }, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_y = 4; + pixel_x = -7 + }, +/turf/open/floor/wood, +/area/template_noop) +"LW" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/template_noop) +"Mn" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 10 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"MS" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 6 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"ND" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkbrown2" + }, +/area/template_noop) +"NQ" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 10; + icon_state = "darkbrown2" + }, +/area/template_noop) +"Oz" = ( +/obj/item/trash/crushed_cup{ + pixel_y = 5; + pixel_x = 11 + }, +/turf/open/gm/river{ + name = "pool" + }, +/area/template_noop) +"PA" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "darkbrown2" + }, +/area/template_noop) +"PR" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + icon_state = "darkbrowncorners2" + }, +/area/template_noop) +"Qn" = ( +/turf/open/floor/prison, +/area/template_noop) +"QF" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrowncorners2" + }, +/area/template_noop) +"QO" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/template_noop) +"Rg" = ( +/obj/structure/prop/souto_land/pole{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/template_noop) +"Ro" = ( +/obj/item/toy/bikehorn/rubberducky{ + pixel_x = -2; + pixel_y = -15 + }, +/turf/open/gm/river{ + name = "pool" + }, +/area/template_noop) +"Rr" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"Rs" = ( +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/template_noop) +"RW" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cup{ + pixel_x = 6; + layer = 3.2 + }, +/obj/item/reagent_container/food/drinks/cup{ + pixel_x = 15; + layer = 3.2 + }, +/obj/item/reagent_container/food/drinks/cup{ + pixel_x = 11; + pixel_y = 6; + layer = 3.1 + }, +/turf/open/floor/wood, +/area/template_noop) +"Sg" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrowncorners2" + }, +/area/template_noop) +"SC" = ( +/obj/effect/landmark/corpsespawner/ua_riot/burst, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/template_noop) +"SO" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/obj/structure/prop/souto_land/pole, +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/obj/item/trash/cigbutt{ + pixel_x = 31; + pixel_y = -16 + }, +/turf/open/floor/wood, +/area/template_noop) +"SW" = ( +/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 + }, +/obj/item/toy/plushie_cade{ + pixel_x = 1; + pixel_y = -9 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/template_noop) +"Th" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/template_noop) +"Tq" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "cell_stripe" + }, +/area/template_noop) +"TO" = ( +/obj/structure/prop/souto_land/streamer{ + dir = 6 + }, +/turf/open/floor/wood, +/area/template_noop) +"TS" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform, +/turf/open/floor/plating/prison, +/area/template_noop) +"Us" = ( +/obj/item/toy/syndicateballoon{ + pixel_x = 14; + pixel_y = -5 + }, +/turf/open/floor/wood, +/area/template_noop) +"UN" = ( +/obj/item/trash/crushed_cup{ + pixel_x = -13; + pixel_y = 48 + }, +/turf/open/gm/river{ + name = "pool" + }, +/area/template_noop) +"Vi" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/bottle/cognac{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/reagent_container/food/drinks/drinkingglass{ + pixel_x = -3; + pixel_y = 13; + layer = 4 + }, +/obj/item/reagent_container/food/drinks/drinkingglass{ + pixel_x = -10; + pixel_y = 1; + layer = 4 + }, +/turf/open/floor/wood, +/area/template_noop) +"Vx" = ( +/obj/structure/bed/chair/comfy{ + dir = 1 + }, +/obj/item/weapon/gun/shotgun/merc{ + pixel_x = 1; + pixel_y = 25 + }, +/turf/open/floor/wood, +/area/template_noop) +"VV" = ( +/obj/structure/platform_decoration, +/turf/open/floor/prison, +/area/template_noop) +"Wa" = ( +/obj/structure/closet/basketball{ + pixel_x = -8; + pixel_y = -2 + }, +/obj/item/weapon/gun/pistol/heavy, +/obj/item/weapon/gun/revolver/cmb, +/turf/open/floor/wood, +/area/template_noop) +"We" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/prison, +/area/template_noop) +"Wh" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkbrown2" + }, +/area/template_noop) +"Wx" = ( +/obj/structure/platform, +/obj/item/trash/crushed_cup{ + pixel_y = 13; + pixel_x = 45 + }, +/turf/open/gm/river{ + name = "pool" + }, +/area/template_noop) +"WY" = ( +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/template_noop) +"Xn" = ( +/obj/item/storage/belt/shotgun/full/quackers{ + layer = 3.1 + }, +/obj/item/trash/crushed_cup{ + pixel_y = 6; + pixel_x = -30 + }, +/obj/item/reagent_container/food/drinks/cans/beer{ + pixel_y = 4; + pixel_x = 1 + }, +/turf/open/gm/river{ + name = "pool" + }, +/area/template_noop) +"Xu" = ( +/obj/structure/platform, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "darkbrown2" + }, +/area/template_noop) +"Xw" = ( +/obj/item/toy/beach_ball/holoball{ + pixel_x = -10; + pixel_y = -7 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/template_noop) +"XM" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "darkbrown2" + }, +/area/template_noop) +"XS" = ( +/obj/effect/landmark/corpsespawner/prisoner, +/turf/open/floor/wood, +/area/template_noop) +"XU" = ( +/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 + }, +/obj/item/toy/plushie_cade{ + pixel_x = -1; + pixel_y = -9 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkbrown2" + }, +/area/template_noop) +"XX" = ( +/obj/structure/platform_decoration, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"Yd" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/wood, +/area/template_noop) +"Yh" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/wood, +/area/template_noop) +"YB" = ( +/turf/open/floor/plating/plating_catwalk/prison, +/area/template_noop) +"YG" = ( +/obj/structure/platform, +/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, +/turf/open/floor/plating/prison, +/area/template_noop) +"Zr" = ( +/obj/structure/bed/chair/comfy, +/turf/open/floor/wood, +/area/template_noop) +"ZB" = ( +/obj/structure/platform, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) + +(1,1,1) = {" +Rs +Qn +Fl +Qn +rp +fX +fX +fX +fX +Wh +cK +hP +hP +ly +Qn +Qn +Qn +Aj +Qn +Wh +Rs +Fy +"} +(2,1,1) = {" +Rs +Qn +JQ +Qn +VV +fN +fX +ni +ni +YP +TS +ni +ni +kA +Kx +XX +hP +hP +ly +Wh +Rs +so +"} +(3,1,1) = {" +Rs +Qn +VV +fN +MS +ni +aj +ni +SO +el +mj +hY +ni +YP +Rr +TS +ni +ni +kA +Wh +Rs +dB +"} +(4,1,1) = {" +Rs +Qn +ZB +ni +aj +ni +nf +nf +nf +ql +Rs +nf +BK +TO +HP +nS +Wa +aj +kA +Wh +Rs +mu +"} +(5,1,1) = {" +Rs +VV +MS +aj +jt +az +dB +yx +XM +tM +QF +XM +Xw +NQ +nf +IU +nf +aj +kA +Wh +mu +fX +"} +(6,1,1) = {" +Rs +ZB +ni +ni +XS +nf +GO +PR +Fo +Fo +jW +Fo +mq +Ke +lh +nf +Cx +aj +kA +ND +Fo +fX +"} +(7,1,1) = {" +cK +MS +aj +nf +tz +nf +Th +Rs +pG +Gi +Gi +qm +Wh +Rs +nf +tz +nf +aj +Hn +Fj +nf +fX +"} +(8,1,1) = {" +ou +ni +ni +Zr +FD +az +Wh +xQ +La +kb +hf +DT +Wh +Rs +Zr +Ci +az +ni +ni +kA +nf +Wh +"} +(9,1,1) = {" +Xu +ni +mk +nf +rW +nf +Cq +Rs +La +Dd +ef +DT +Wh +Rs +nf +rW +nf +Yd +ni +wV +nf +Wh +"} +(10,1,1) = {" +uw +SW +ng +yx +yx +mc +Jr +Rs +La +bO +rt +DT +Wh +fL +XM +yx +yx +vd +pB +pH +XM +Jr +"} +(11,1,1) = {" +DN +XU +JR +Fo +Fo +Fo +Sg +Bj +La +hf +UN +Wx +Wh +rU +KM +Fo +Gu +Bm +yL +LW +Fo +Fo +"} +(12,1,1) = {" +Xu +ni +Jw +nf +tz +nf +Wh +Rs +La +Oz +Xn +DT +SC +Rs +nf +tz +nf +Yd +ni +xS +nf +nf +"} +(13,1,1) = {" +ou +ni +ni +pt +LI +Vx +Wh +FN +La +Ro +hf +DT +Wh +cj +Zr +BY +az +cb +Fy +Bf +Bf +Bf +"} +(14,1,1) = {" +WY +Mn +aj +nf +rW +nf +rq +Rs +nC +Rr +Rr +TS +Wh +QO +nf +rW +nf +cU +Fy +gV +gV +gV +"} +(15,1,1) = {" +Rs +ZB +aj +nf +ij +tT +iK +fv +gs +XM +XM +XM +Jr +Rs +nf +tb +nf +nf +Fy +Bf +Bf +Bf +"} +(16,1,1) = {" +Rs +YG +aj +lc +ci +tT +ND +iC +ID +mq +tD +Fo +ik +wS +iY +cq +RW +nf +nf +nf +Gp +Bf +"} +(17,1,1) = {" +Rs +YG +aj +Ls +xz +Bv +or +zR +nf +Th +Rs +nf +tw +XS +KL +Jf +KO +bD +nf +nf +lS +Bf +"} +(18,1,1) = {" +Rs +YG +ni +ni +pG +Gi +qm +ni +vX +Fz +Rg +Ao +Fy +nf +lh +nf +nf +nf +nf +qG +vU +Bf +"} +(19,1,1) = {" +Rs +We +ty +ty +vf +Kx +ZB +ni +ni +pG +zc +ni +Fy +Zr +Vi +az +Fy +Bf +Bf +Bf +Bf +Bf +"} +(20,1,1) = {" +wS +Qn +Qn +Qn +Aj +Qn +We +ro +ro +PA +is +ro +Fy +nf +Yh +Us +Fy +gV +gV +oL +gV +gV +"} +(21,1,1) = {" +Tq +YB +YB +Tq +YB +YB +Tq +YB +YB +Tq +Tq +YB +Fy +Fy +Fy +Fy +Fy +gV +gV +oL +gV +gV +"} diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm new file mode 100644 index 000000000000..8df7c92de478 --- /dev/null +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm @@ -0,0 +1,1355 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"aU" = ( +/obj/structure/sign/poster{ + icon_state = "poster12"; + pixel_x = 6; + pixel_y = 8 + }, +/turf/open/space/basic, +/area/template_noop) +"bz" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/template_noop) +"bO" = ( +/turf/open/floor/prison{ + icon_state = "floorscorched1" + }, +/area/template_noop) +"bZ" = ( +/turf/open/floor/prison{ + icon_state = "floorscorched2" + }, +/area/template_noop) +"cz" = ( +/obj/structure/machinery/vending/sovietsoda, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"cL" = ( +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"cM" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" + }, +/area/template_noop) +"dR" = ( +/obj/structure/bookcase/manuals/research_and_development{ + pixel_y = 10 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" + }, +/area/template_noop) +"eG" = ( +/obj/structure/closet/secure_closet/guncabinet{ + req_access = null + }, +/obj/item/prop/helmetgarb/riot_shield, +/obj/item/prop/helmetgarb/riot_shield, +/obj/item/clothing/under/marine/ua_riot, +/obj/item/clothing/head/helmet/marine/veteran/ua_riot, +/obj/item/clothing/suit/storage/marine/veteran/ua_riot, +/obj/item/clothing/suit/storage/marine/veteran/ua_riot, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"eQ" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"fg" = ( +/obj/item/device/flashlight/lamp/tripod, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, +/area/template_noop) +"fk" = ( +/obj/item/explosive/grenade/incendiary/molotov{ + pixel_x = 8; + pixel_y = 7 + }, +/turf/open/space/basic, +/area/template_noop) +"gy" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurple" + }, +/area/template_noop) +"gB" = ( +/obj/effect/decal/cleanable/blood/tracks/footprints, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"gR" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = 29 + }, +/obj/structure/machinery/door/airlock/prison/horizontal{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"hq" = ( +/obj/structure/machinery/door/airlock/prison/horizontal{ + dir = 4; + icon_state = "door_open" + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"jt" = ( +/obj/structure/barricade/metal/wired{ + dir = 4; + health = 150 + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" + }, +/area/template_noop) +"jM" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/reagent_container/food/snacks/wrapped/barcardine, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/template_noop) +"ke" = ( +/obj/effect/decal/cleanable/blood/gibs/body, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"ks" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/card/id/visa, +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" + }, +/area/template_noop) +"kx" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"kY" = ( +/turf/open/floor/prison{ + icon_state = "platingdmg1" + }, +/area/template_noop) +"me" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno/body, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/template_noop) +"mu" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/effect/spawner/random/pills/lowchance, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" + }, +/area/template_noop) +"mz" = ( +/obj/item/tool/kitchen/utensil/pspoon, +/turf/open/space/basic, +/area/template_noop) +"no" = ( +/obj/structure/barricade/metal/wired{ + dir = 4; + health = 200 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"nw" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" + }, +/area/template_noop) +"on" = ( +/obj/structure/barricade/metal/wired{ + dir = 1; + health = 55 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" + }, +/area/template_noop) +"oR" = ( +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/template_noop) +"pp" = ( +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged1" + }, +/area/template_noop) +"pP" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurplecorner" + }, +/area/template_noop) +"qk" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/template_noop) +"qu" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "damaged1" + }, +/area/template_noop) +"qL" = ( +/turf/open/floor/prison{ + icon_state = "panelscorched" + }, +/area/template_noop) +"rb" = ( +/obj/structure/toilet{ + dir = 8; + pixel_y = 8 + }, +/obj/effect/decal/cleanable/blood/writing{ + dir = 6 + }, +/obj/effect/landmark/corpsespawner/prisoner, +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" + }, +/area/template_noop) +"sa" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" + }, +/area/template_noop) +"tc" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/toy/deck, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/template_noop) +"tr" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitepurple" + }, +/area/template_noop) +"tB" = ( +/obj/structure/barricade/metal/wired{ + dir = 1; + health = 65 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"tD" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, +/area/template_noop) +"tI" = ( +/obj/effect/landmark/corpsespawner/prisoner, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" + }, +/area/template_noop) +"tN" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"ux" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/obj/effect/spawner/random/pills/lowchance, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" + }, +/area/template_noop) +"uF" = ( +/obj/effect/decal/prints{ + pixel_y = 3; + pixel_x = -10 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurple" + }, +/area/template_noop) +"uM" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/effect/spawner/random/goggles/lowchance, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/template_noop) +"we" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"wv" = ( +/obj/structure/machinery/vending/cigarette/colony, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"wy" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/implant/loyalty{ + pixel_x = -8; + pixel_y = 8 + }, +/obj/item/implant/loyalty{ + pixel_x = 4; + pixel_y = 8 + }, +/obj/item/implanter{ + pixel_x = -4 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"xy" = ( +/obj/structure/grille, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"yv" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/template_noop) +"zj" = ( +/obj/item/stack/sheet/metal{ + pixel_y = -9; + pixel_x = 8 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" + }, +/area/template_noop) +"zA" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" + }, +/area/template_noop) +"zT" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" + }, +/area/template_noop) +"Bl" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/template_noop) +"Bx" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurple" + }, +/area/template_noop) +"Dq" = ( +/obj/structure/barricade/metal/wired{ + dir = 4; + health = 50 + }, +/obj/item/stack/sheet/metal{ + pixel_y = 4; + pixel_x = -10 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"Dt" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/toy/beach_ball/holoball, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/template_noop) +"DE" = ( +/obj/structure/toilet{ + dir = 4; + pixel_y = 8 + }, +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" + }, +/area/template_noop) +"DV" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" + }, +/area/template_noop) +"EQ" = ( +/obj/effect/decal/cleanable/blood/gibs/limb, +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" + }, +/area/template_noop) +"ES" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" + }, +/area/template_noop) +"Fc" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" + }, +/area/template_noop) +"FP" = ( +/obj/structure/barricade/metal/wired{ + dir = 4; + health = 55 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"Gy" = ( +/obj/structure/machinery/vending/coffee, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"GR" = ( +/turf/closed/wall/r_wall/prison_unmeltable{ + desc = "A huge chunk of metal used to seperate rooms."; + name = "metal wall" + }, +/area/template_noop) +"Hf" = ( +/obj/effect/decal/cleanable/blood/tracks/footprints, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" + }, +/area/template_noop) +"Hp" = ( +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, +/area/template_noop) +"Hw" = ( +/obj/structure/toilet{ + dir = 8; + pixel_y = 8 + }, +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" + }, +/area/template_noop) +"HN" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"Id" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"Ig" = ( +/obj/structure/machinery/vending/snack/packaged, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"Io" = ( +/obj/effect/landmark/corpsespawner/prisoner, +/turf/open/floor/prison{ + icon_state = "floorscorched1" + }, +/area/template_noop) +"Ix" = ( +/obj/structure/machinery/door/airlock/prison/horizontal, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"IN" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/prison{ + dir = 1; + icon_state = "whitepurple" + }, +/area/template_noop) +"IW" = ( +/turf/open/floor/prison{ + icon_state = "damaged2" + }, +/area/template_noop) +"Jm" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/gibs, +/obj/effect/landmark/corpsespawner/prisoner, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/template_noop) +"JQ" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "whitepurple" + }, +/area/template_noop) +"Kc" = ( +/obj/structure/barricade/metal/wired, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"Kj" = ( +/obj/effect/decal/cleanable/blood/gibs/core, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitepurple" + }, +/area/template_noop) +"KF" = ( +/turf/open/floor/prison{ + icon_state = "damaged3" + }, +/area/template_noop) +"LM" = ( +/turf/closed/wall/prison, +/area/template_noop) +"LQ" = ( +/obj/structure/machinery/door/airlock/prison/horizontal{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"Mj" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/storage/fancy/crayons, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/template_noop) +"Mo" = ( +/obj/structure/window/framed/prison/cell, +/turf/open/floor/plating/prison, +/area/template_noop) +"MD" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"MI" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno/core, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"MO" = ( +/obj/structure/barricade/metal/wired, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"Nr" = ( +/obj/structure/machinery/light/double/blue, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, +/area/template_noop) +"Ns" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/obj/item/handcuffs{ + pixel_x = -3; + pixel_y = 10 + }, +/obj/item/handcuffs{ + pixel_x = 4 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"NI" = ( +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"Oo" = ( +/obj/effect/spawner/gibspawner/human, +/turf/open/space/basic, +/area/template_noop) +"Pd" = ( +/obj/effect/decal/cleanable/blood/tracks/footprints, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitepurple" + }, +/area/template_noop) +"Pk" = ( +/obj/effect/decal/cleanable/spiderling_remains, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/template_noop) +"PS" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/ammo_magazine/shotgun/buckshot, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"Qc" = ( +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" + }, +/area/template_noop) +"Qn" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/prison{ + dir = 4; + icon_state = "whitepurple" + }, +/area/template_noop) +"QF" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{ + icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' + }, +/turf/open/floor/prison{ + dir = 10; + icon_state = "sterile_white" + }, +/area/template_noop) +"QU" = ( +/obj/effect/landmark/corpsespawner/ua_riot, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"Sx" = ( +/obj/effect/landmark/corpsespawner/ua_riot, +/turf/open/floor/prison{ + icon_state = "floorscorched2" + }, +/area/template_noop) +"TD" = ( +/obj/effect/decal/cleanable/blood/tracks/footprints, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, +/area/template_noop) +"TE" = ( +/obj/structure/barricade/metal/wired{ + dir = 1; + health = 150 + }, +/turf/open/floor/prison{ + icon_state = "darkpurplefull2" + }, +/area/template_noop) +"TH" = ( +/turf/open/floor/prison{ + icon_state = "platingdmg3" + }, +/area/template_noop) +"VP" = ( +/obj/structure/barricade/metal/wired{ + dir = 8; + health = 200 + }, +/turf/open/floor/prison{ + dir = 9; + icon_state = "whitepurple" + }, +/area/template_noop) +"VQ" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/prison{ + dir = 8; + icon_state = "whitepurple" + }, +/area/template_noop) +"Wo" = ( +/obj/structure/toilet{ + dir = 8; + pixel_y = 8 + }, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison{ + dir = 5; + icon_state = "whitepurple" + }, +/area/template_noop) +"Yw" = ( +/obj/structure/extinguisher_cabinet, +/turf/closed/wall/prison, +/area/template_noop) +"Yx" = ( +/obj/structure/barricade/metal/wired{ + dir = 8; + health = 55 + }, +/turf/open/floor/prison{ + icon_state = "whitepurple" + }, +/area/template_noop) +"YY" = ( +/turf/open/floor/prison{ + icon_state = "platingdmg2" + }, +/area/template_noop) +"Zi" = ( +/turf/open/space/basic, +/area/template_noop) +"Zw" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/storage/fancy/cigar/tarbacks, +/turf/open/floor/prison{ + dir = 6; + icon_state = "whitepurple" + }, +/area/template_noop) + +(1,1,1) = {" +LM +LM +ks +ES +Ix +aa +NI +tD +LM +LQ +Mo +LM +LQ +Mo +LM +LQ +Mo +LM +"} +(2,1,1) = {" +NI +LM +dR +Hp +Mo +DV +Sx +Yx +LM +Fc +nw +LM +Qc +nw +LM +Fc +nw +LM +"} +(3,1,1) = {" +cL +LM +Hw +yv +Mo +jt +no +Hp +LM +Hw +yv +LM +Hw +yv +LM +Hw +yv +LM +"} +(4,1,1) = {" +cL +Yw +LM +LM +LM +DV +NI +Nr +Yw +LM +LM +LM +LM +LM +LM +LM +LM +LM +"} +(5,1,1) = {" +cL +LM +DE +JQ +LM +DV +qL +Hp +LM +DE +JQ +LM +DE +JQ +LM +DE +JQ +LM +"} +(6,1,1) = {" +cL +LM +zA +qk +LM +IN +NI +Hp +LM +zA +qk +LM +zA +qk +LM +zA +uM +LM +"} +(7,1,1) = {" +tN +LM +LQ +Mo +LM +DV +NI +fg +LM +hq +Mo +LM +LQ +Mo +LM +LQ +Mo +LM +"} +(8,1,1) = {" +Kc +QF +Fc +VQ +gy +Io +NI +pP +gy +uF +ES +gB +KF +gy +gy +TH +ES +TE +"} +(9,1,1) = {" +MO +NI +pp +tr +tr +tr +tr +Kj +tr +qu +Pk +cL +zA +Pd +tr +Qn +oR +tB +"} +(10,1,1) = {" +MD +GR +hq +Mo +GR +gR +Mo +LM +cL +cL +kx +LM +hq +Mo +LM +LQ +Mo +LM +"} +(11,1,1) = {" +NI +GR +Fc +cM +GR +Fc +nw +LM +cL +YY +cL +LM +zT +mu +LM +Fc +nw +LM +"} +(12,1,1) = {" +PS +GR +Hw +yv +GR +Hw +yv +LM +eQ +cL +cL +LM +rb +yv +LM +Hw +Bl +LM +"} +(13,1,1) = {" +Ig +GR +GR +GR +GR +LM +LM +LM +Ns +cL +tN +Yw +LM +LM +LM +LM +LM +LM +"} +(14,1,1) = {" +cz +GR +mz +Zi +GR +DE +JQ +LM +wy +cL +bZ +LM +DE +JQ +LM +DE +JQ +LM +"} +(15,1,1) = {" +Gy +GR +Oo +Zi +GR +zA +jM +LM +eG +HN +cL +LM +zA +qk +LM +zA +tc +LM +"} +(16,1,1) = {" +wv +GR +aU +fk +GR +LQ +Mo +LM +we +cL +Id +LM +LQ +Mo +LM +LQ +Mo +LM +"} +(17,1,1) = {" +bz +GR +GR +GR +GR +cL +cL +cL +cL +YY +cL +cL +Fc +Bx +gy +bO +zj +QU +"} +(18,1,1) = {" +bz +LM +LM +LM +xy +kY +cL +ke +cL +cL +MI +cL +EQ +YY +tr +tr +me +Dq +"} +(19,1,1) = {" +bz +LM +LM +LM +LM +cL +cL +cL +LM +LQ +Mo +LM +LQ +Mo +LM +hq +Mo +LM +"} +(20,1,1) = {" +bz +LM +LM +LM +xy +VP +gy +on +LM +Fc +nw +LM +Fc +nw +LM +Fc +nw +LM +"} +(21,1,1) = {" +bz +LM +LM +LM +LM +DV +aa +Hp +LM +Wo +yv +LM +Hw +yv +LM +Hw +Jm +LM +"} +(22,1,1) = {" +bz +LM +LM +LM +LM +Hf +FP +Hp +Yw +LM +LM +LM +LM +LM +LM +LM +LM +LM +"} +(23,1,1) = {" +bz +LM +DE +sa +LM +DV +NI +Hp +LM +DE +JQ +LM +DE +JQ +LM +DE +ux +LM +"} +(24,1,1) = {" +bz +LM +zA +Dt +LM +tI +IW +TD +LM +zA +Zw +LM +zA +Mj +LM +zA +qk +LM +"} +(25,1,1) = {" +bz +LM +LQ +Mo +LM +DV +NI +Hp +LM +LQ +Mo +LM +LQ +Mo +LM +LQ +Mo +LM +"} diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/30.engineeroffice.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/30.engineeroffice.dmm new file mode 100644 index 000000000000..408bccfc7eea --- /dev/null +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/30.engineeroffice.dmm @@ -0,0 +1,291 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/wall/prison, +/area/template_noop) +"e" = ( +/turf/open/floor/plating/prison, +/area/template_noop) +"h" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/template_noop) +"k" = ( +/obj/structure/sign/poster/hero/voteno{ + pixel_y = 29 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/template_noop) +"n" = ( +/obj/structure/machinery/power/apc, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/template_noop) +"o" = ( +/turf/closed/wall/mineral/bone_resin, +/area/template_noop) +"s" = ( +/turf/open/floor/prison{ + dir = 9; + icon_state = "greenfull" + }, +/area/template_noop) +"t" = ( +/obj/structure/filingcabinet{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/structure/filingcabinet{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"x" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/cell/super{ + pixel_y = 12 + }, +/obj/item/cell/super, +/obj/item/storage/pill_bottle/happy{ + layer = 2.8; + pixel_y = -7 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/template_noop) +"z" = ( +/obj/structure/coatrack, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/obj/item/clothing/suit/storage/bomber, +/obj/item/clothing/head/beret/centcom/officer{ + pixel_x = -2; + pixel_y = 13 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/template_noop) +"D" = ( +/obj/structure/closet/secure_closet/freezer/fridge/groceries, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/template_noop) +"E" = ( +/obj/structure/machinery/photocopier, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/obj/item/paper{ + desc = "The image appears to be someone's backside, the page number is labled as 259." + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"F" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/toolbox/electrical{ + pixel_x = -1; + pixel_y = 11 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 5; + pixel_x = -1 + }, +/obj/item/storage/toolbox/syndicate{ + pixel_x = -1 + }, +/obj/structure/sign/poster/music{ + pixel_y = 29 + }, +/obj/item/weapon/butterfly{ + pixel_x = 17 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/template_noop) +"O" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/microwave{ + icon_state = "mwo"; + pixel_y = 6 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/template_noop) +"Q" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 2; + name = "Residential Apartment" + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"S" = ( +/obj/item/storage/firstaid/regular/empty{ + pixel_x = 14 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/template_noop) +"T" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"V" = ( +/obj/structure/filingcabinet{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/structure/filingcabinet{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/effect/landmark/objective_landmark/close, +/obj/item/pamphlet/engineer, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"X" = ( +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/obj/effect/landmark/objective_landmark/medium, +/obj/item/storage/backpack/marine/engineerpack/satchel, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/template_noop) +"Z" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/head/beret/eng{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/book/manual/engineering_guide{ + pixel_x = -4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/template_noop) + +(1,1,1) = {" +a +a +a +a +a +a +a +"} +(2,1,1) = {" +Q +h +n +a +F +S +Q +"} +(3,1,1) = {" +a +O +D +a +x +z +a +"} +(4,1,1) = {" +a +a +a +a +a +a +a +"} +(5,1,1) = {" +Q +h +Z +a +V +h +Q +"} +(6,1,1) = {" +a +k +X +a +t +E +a +"} +(7,1,1) = {" +a +a +a +a +a +a +a +"} +(8,1,1) = {" +o +o +o +o +o +e +e +"} +(9,1,1) = {" +T +o +T +s +s +s +s +"} diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm new file mode 100644 index 000000000000..101db372897e --- /dev/null +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm @@ -0,0 +1,504 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/kitchenspike, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"b" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, +/turf/open/floor/prison{ + dir = 10; + icon_state = "blue" + }, +/area/template_noop) +"c" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/meat{ + pixel_x = -1; + pixel_y = 2 + }, +/obj/item/reagent_container/food/snacks/meat{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/reagent_container/food/snacks/meat{ + pixel_x = -1; + pixel_y = 6 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"d" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza, +/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza{ + pixel_y = 3 + }, +/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza{ + pixel_y = 6 + }, +/obj/item/reagent_container/food/snacks/sliceable/pizza/meatpizza{ + pixel_y = 10 + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"e" = ( +/obj/effect/decal/cleanable/flour, +/turf/open/floor/prison{ + dir = 9; + icon_state = "blue" + }, +/area/template_noop) +"f" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/chem_dispenser/soda, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"g" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/sliceable/flatdough{ + pixel_y = 7 + }, +/obj/item/reagent_container/food/snacks/sliceable/flatdough{ + pixel_y = -2 + }, +/obj/item/tool/kitchen/rollingpin, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"i" = ( +/turf/open/space, +/area/template_noop) +"j" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/kitchen/utensil/knife{ + pixel_x = 9 + }, +/obj/item/reagent_container/food/snacks/tomatomeat{ + pixel_x = -6 + }, +/obj/item/reagent_container/food/snacks/tomatomeat{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/reagent_container/food/snacks/tomatomeat{ + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/prison{ + dir = 6; + icon_state = "blue" + }, +/area/template_noop) +"k" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/sink{ + pixel_y = 32 + }, +/obj/item/tool/kitchen/knife/butcher, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"l" = ( +/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/item/reagent_container/food/condiment/enzyme, +/obj/item/reagent_container/food/condiment/enzyme, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"m" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, +/obj/effect/landmark/objective_landmark/close, +/obj/item/reagent_container/food/snacks/grown/tomato, +/obj/item/reagent_container/food/snacks/grown/tomato, +/obj/item/reagent_container/food/snacks/grown/tomato, +/obj/item/reagent_container/food/snacks/grown/tomato, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"o" = ( +/obj/effect/landmark/corpsespawner/pizza/burst, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"p" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cans/dr_gibb{ + pixel_x = 8; + pixel_y = 7 + }, +/obj/item/reagent_container/food/drinks/cans/space_mountain_wind{ + pixel_y = 7 + }, +/obj/item/reagent_container/food/drinks/cans/space_up{ + pixel_x = -9; + pixel_y = 7 + }, +/obj/item/reagent_container/food/drinks/cans/classcola{ + pixel_x = 8 + }, +/obj/item/reagent_container/food/drinks/cans/cola, +/obj/item/reagent_container/food/drinks/cans/starkist{ + pixel_x = -9 + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"q" = ( +/obj/item/reagent_container/food/snacks/cheesewedge/verymature{ + pixel_y = -16; + pixel_x = 9 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"r" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" + }, +/area/template_noop) +"s" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, +/turf/open/floor/plating/prison, +/area/template_noop) +"t" = ( +/turf/open/floor/prison{ + dir = 5; + icon_state = "blue" + }, +/area/template_noop) +"u" = ( +/obj/effect/decal/cleanable/flour, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" + }, +/area/template_noop) +"v" = ( +/obj/structure/window/framed/prison, +/turf/open/floor/plating/prison, +/area/template_noop) +"w" = ( +/obj/structure/window/framed/prison/reinforced/hull, +/turf/open/floor/plating/prison, +/area/template_noop) +"x" = ( +/obj/structure/machinery/reagentgrinder/industrial{ + pixel_y = 10 + }, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"y" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_container/food/snacks/sliceable/pizza/margherita, +/obj/item/reagent_container/food/snacks/sliceable/pizza/margherita, +/obj/item/reagent_container/food/snacks/sliceable/pizza/margherita, +/obj/item/reagent_container/food/snacks/sliceable/pizza/margherita, +/obj/item/reagent_container/food/snacks/sliceable/pizza/margherita, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"z" = ( +/turf/closed/wall/prison, +/area/template_noop) +"A" = ( +/turf/open/floor/prison{ + dir = 1; + icon_state = "blue" + }, +/area/template_noop) +"B" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/cups{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/storage/box/cups, +/obj/item/toy/deck{ + pixel_x = 12; + pixel_y = -2 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"C" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/sliceable/cheesewheel{ + pixel_y = -8 + }, +/obj/item/reagent_container/food/snacks/sliceable/cheesewheel{ + pixel_y = -3 + }, +/obj/item/reagent_container/food/snacks/sliceable/cheesewheel{ + pixel_y = 2 + }, +/obj/item/reagent_container/food/snacks/sliceable/cheesewheel{ + pixel_y = 7 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"D" = ( +/obj/item/stool, +/turf/open/floor/prison{ + dir = 8; + icon_state = "blue" + }, +/area/template_noop) +"E" = ( +/obj/structure/machinery/gibber, +/obj/effect/decal/cleanable/egg_smudge, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"G" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/pizzabox/margherita, +/obj/item/pizzabox/mystery{ + pixel_y = 3 + }, +/obj/item/pizzabox/vegetable{ + pixel_y = 7 + }, +/obj/item/reagent_container/food/condiment/saltshaker{ + pixel_y = 13; + pixel_x = -7 + }, +/obj/item/reagent_container/food/condiment/peppermill{ + pixel_x = 6; + pixel_y = 13 + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"H" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_container/food/snacks/sliceable/pizza/mushroompizza, +/obj/item/reagent_container/food/snacks/sliceable/pizza/mushroompizza, +/obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza, +/obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"I" = ( +/obj/effect/decal/cleanable/egg_smudge, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"K" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, +/obj/item/weapon/pizza_cutter, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"L" = ( +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"M" = ( +/obj/structure/sign/safety/fridge, +/turf/closed/wall/prison, +/area/template_noop) +"N" = ( +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" + }, +/area/template_noop) +"O" = ( +/obj/item/card/id/pizza, +/turf/open/floor/prison{ + dir = 4; + icon_state = "blue" + }, +/area/template_noop) +"P" = ( +/obj/structure/lattice, +/turf/open/space, +/area/template_noop) +"Q" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 3 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"S" = ( +/obj/effect/decal/cleanable/blood/writing{ + icon_state = "u_psycopath_l"; + pixel_y = 4 + }, +/obj/effect/decal/cleanable/blood/writing{ + icon_state = "u_ketchup_l"; + pixel_x = 8; + pixel_y = 4 + }, +/obj/effect/decal/cleanable/blood/writing{ + icon_state = "u_guilty_l"; + pixel_x = -12; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/flour, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/template_noop) +"T" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/template_noop) +"U" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/pizzabox/mystery/stack, +/obj/item/reagent_container/food/snacks/vegetablepizzaslice{ + pixel_x = -7; + pixel_y = 10 + }, +/obj/item/reagent_container/food/snacks/vegetablepizzaslice{ + pixel_x = 5; + pixel_y = 7 + }, +/turf/open/floor/plating/prison, +/area/template_noop) +"X" = ( +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/template_noop) +"Y" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, +/turf/open/floor/prison{ + icon_state = "blue" + }, +/area/template_noop) + +(1,1,1) = {" +z +U +d +G +p +z +s +T +T +T +"} +(2,1,1) = {" +v +e +D +r +r +r +r +r +b +w +"} +(3,1,1) = {" +v +A +X +X +B +f +X +X +Y +w +"} +(4,1,1) = {" +v +t +O +N +N +u +N +N +j +w +"} +(5,1,1) = {" +z +l +I +a +z +M +s +T +T +T +"} +(6,1,1) = {" +z +k +o +C +T +m +L +y +T +i +"} +(7,1,1) = {" +z +x +S +c +T +K +q +H +T +i +"} +(8,1,1) = {" +z +E +g +Q +T +w +w +w +T +i +"} +(9,1,1) = {" +T +T +w +T +T +i +i +i +P +i +"} diff --git a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm index e6a6ba9a1135..df2c3e618917 100644 --- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm +++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm @@ -124,11 +124,7 @@ /turf/open/ice, /area/ice_colony/exterior/surface/clearing/north) "aaA" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer2, /area/ice_colony/exterior/surface/clearing/north) "aaB" = ( @@ -546,11 +542,7 @@ /turf/open/floor/plating/icefloor, /area/ice_colony/surface/requesitions) "acl" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer3, /area/ice_colony/exterior/surface/valley/northwest) "acm" = ( @@ -753,11 +745,7 @@ /turf/open/floor/plating/icefloor, /area/ice_colony/surface/requesitions) "acV" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /obj/structure/machinery/power/apc{ dir = 1; pixel_y = 24; @@ -790,11 +778,7 @@ }, /area/ice_colony/surface/requesitions) "ada" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /obj/structure/machinery/computer/shuttle_control/ice_colony/elevator4{ pixel_y = 30 }, @@ -1325,11 +1309,7 @@ }, /area/ice_colony/surface/engineering/generator) "aey" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer1, /area/ice_colony/exterior/surface/valley/northwest) "aez" = ( @@ -1375,11 +1355,7 @@ /turf/open/floor/plating/icefloor, /area/ice_colony/surface/requesitions) "aeF" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, @@ -1814,11 +1790,7 @@ /turf/open/floor/plating/icefloor, /area/ice_colony/surface/requesitions) "afN" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, @@ -1993,11 +1965,7 @@ /turf/closed/wall, /area/ice_colony/surface/engineering) "agj" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer2, /area/ice_colony/exterior/surface/valley/northwest) "agk" = ( @@ -2116,11 +2084,7 @@ /turf/open/floor/plating/icefloor, /area/ice_colony/surface/requesitions) "agA" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/floor/plating/icefloor, /area/ice_colony/surface/requesitions) "agB" = ( @@ -2348,19 +2312,11 @@ /turf/open/auto_turf/snow/layer1, /area/ice_colony/exterior/surface/clearing/north) "ahh" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer3, /area/ice_colony/exterior/surface/clearing/north) "ahi" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer1, /area/ice_colony/exterior/surface/clearing/north) "ahj" = ( @@ -2382,11 +2338,7 @@ }, /area/ice_colony/surface/engineering/generator) "ahn" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer1, /area/ice_colony/exterior/surface/clearing/north) "aho" = ( @@ -2521,11 +2473,7 @@ /turf/open/floor/plating, /area/ice_colony/surface/hydroponics/north) "ahJ" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer2, /area/ice_colony/exterior/surface/clearing/north) "ahK" = ( @@ -2712,10 +2660,10 @@ /area/ice_colony/surface/hydroponics/north) "aig" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/north) "aih" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/north) "aii" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -2858,11 +2806,7 @@ }, /area/ice_colony/surface/substation/smes) "aiC" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/clearing/north) "aiD" = ( @@ -2951,7 +2895,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/north) "aiO" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -3069,11 +3013,7 @@ }, /area/ice_colony/surface/substation/smes) "ajf" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer3, /area/ice_colony/exterior/surface/clearing/north) "ajg" = ( @@ -3084,11 +3024,7 @@ /turf/open/auto_turf/snow/layer3, /area/ice_colony/exterior/surface/valley/northeast) "ajj" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer3, /area/ice_colony/exterior/surface/valley/northeast) "ajl" = ( @@ -3272,7 +3208,7 @@ /area/ice_colony/surface/substation/smes) "ajF" = ( /obj/item/disk/botany, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/north) "ajG" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -3319,11 +3255,7 @@ }, /area/ice_colony/surface/engineering) "ajM" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/snow/layer1, /area/ice_colony/exterior/surface/clearing/north) @@ -3617,11 +3549,7 @@ /turf/open/auto_turf/snow/layer1, /area/ice_colony/exterior/surface/clearing/north) "akB" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -3991,11 +3919,7 @@ /turf/open/ice, /area/ice_colony/surface/mining) "alI" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer3, /area/ice_colony/exterior/surface/valley/southeast) "alJ" = ( @@ -4189,11 +4113,7 @@ }, /area/ice_colony/surface/dorms/restroom_e) "aml" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer2, /area/ice_colony/exterior/surface/valley/southeast) "amm" = ( @@ -4219,11 +4139,7 @@ /turf/open/auto_turf/snow/layer3, /area/ice_colony/exterior/surface/valley/southeast) "amq" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/clearing/north) "amr" = ( @@ -5065,11 +4981,7 @@ /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/clearing/pass) "aoK" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer2, /area/ice_colony/exterior/surface/clearing/pass) "aoL" = ( @@ -5705,7 +5617,7 @@ /area/ice_colony/exterior/surface/valley/west) "aqt" = ( /obj/item/storage/bag/plants, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/north) "aqu" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -6676,11 +6588,7 @@ }, /area/ice_colony/surface/dorms) "asV" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/clearing/pass) "asW" = ( @@ -7050,11 +6958,7 @@ /turf/open/auto_turf/snow/layer2, /area/ice_colony/exterior/surface/clearing/south) "atW" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer2, /area/ice_colony/exterior/surface/clearing/south) "atX" = ( @@ -7162,14 +7066,14 @@ /obj/structure/machinery/light{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/lobby) "auk" = ( /mob/living/simple_animal/cow, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/lobby) "aul" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/lobby) "aum" = ( /obj/structure/bed/chair{ @@ -7237,11 +7141,7 @@ /turf/open/floor/wood, /area/ice_colony/surface/dorms) "auu" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/clearing/south) "auw" = ( @@ -7277,13 +7177,13 @@ /area/ice_colony/surface/clinic/lobby) "auA" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/lobby) "auB" = ( /obj/structure/machinery/light{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/lobby) "auC" = ( /obj/structure/flora/pottedplant, @@ -7402,11 +7302,7 @@ /turf/open/auto_turf/snow/layer1, /area/ice_colony/exterior/surface/clearing/south) "auQ" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/valley/southwest) "auR" = ( @@ -7464,7 +7360,7 @@ /obj/item/stack/rods{ amount = 25 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/lobby) "auZ" = ( /turf/open/floor{ @@ -7665,11 +7561,7 @@ /turf/open/auto_turf/snow/layer3, /area/ice_colony/exterior/surface/clearing/south) "avx" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer1, /area/ice_colony/exterior/surface/valley/southwest) "avy" = ( @@ -7809,11 +7701,7 @@ }, /area/ice_colony/surface/hydroponics/lobby) "avO" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer1, /area/ice_colony/exterior/surface/valley/southwest) "avP" = ( @@ -7943,11 +7831,7 @@ /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/valley/southwest) "awd" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer1, /area/ice_colony/exterior/surface/clearing/south) "awe" = ( @@ -8100,7 +7984,7 @@ /area/ice_colony/exterior/surface/valley/southeast) "awA" = ( /obj/structure/machinery/light, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/lobby) "awB" = ( /obj/structure/bed/chair{ @@ -8156,11 +8040,7 @@ }, /area/ice_colony/surface/hydroponics/lobby) "awJ" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/snow/layer1, @@ -8240,11 +8120,7 @@ /turf/open/auto_turf/snow/layer3, /area/ice_colony/exterior/surface/clearing/south) "awY" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer3, /area/ice_colony/exterior/surface/clearing/south) "awZ" = ( @@ -8608,11 +8484,7 @@ /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/valley/southwest) "ayb" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/valley/southwest) "ayc" = ( @@ -8620,11 +8492,7 @@ /turf/open/auto_turf/snow/layer3, /area/ice_colony/exterior/surface/valley/southwest) "ayd" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/snow/layer1, @@ -8747,11 +8615,7 @@ }, /area/ice_colony/surface/dorms/lavatory) "ayv" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/clearing/south) "ayw" = ( @@ -8772,11 +8636,7 @@ }, /area/ice_colony/surface/dorms/canteen) "ayy" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer3, /area/ice_colony/exterior/surface/valley/southwest) "ayz" = ( @@ -8823,11 +8683,7 @@ /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/clearing/south) "ayF" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, @@ -8837,11 +8693,7 @@ /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/clearing/south) "ayG" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer2, /area/ice_colony/exterior/surface/valley/south) "ayH" = ( @@ -9077,11 +8929,7 @@ /turf/open/auto_turf/snow/layer1, /area/ice_colony/exterior/surface/valley/south) "azp" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer1, /area/ice_colony/exterior/surface/valley/south) "azq" = ( @@ -9117,10 +8965,10 @@ /area/ice_colony/surface/disposals) "azw" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/south) "azx" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/south) "azy" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -9172,11 +9020,7 @@ /turf/open/auto_turf/snow/layer2, /area/ice_colony/exterior/surface/valley/south) "azH" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/valley/south) "azI" = ( @@ -9206,7 +9050,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/south) "azM" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ @@ -9535,11 +9379,7 @@ /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/valley/south/excavation) "aAE" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer0, /area/ice_colony/exterior/surface/valley/south/excavation) "aAF" = ( @@ -9964,11 +9804,7 @@ }, /area/ice_colony/surface/garage/repair) "aBM" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer1, /area/ice_colony/exterior/surface/valley/south/excavation) "aBN" = ( @@ -11092,7 +10928,7 @@ /area/ice_colony/exterior/surface/valley/southeast) "aED" = ( /obj/item/tool/hatchet, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/south) "aEE" = ( /obj/structure/disposalpipe/segment, @@ -16403,11 +16239,7 @@ }, /area/ice_colony/exterior/surface/cliff) "aVf" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/ice, /area/ice_colony/exterior/surface/landing_pad_external) "aVg" = ( @@ -17794,11 +17626,7 @@ /turf/open/floor/plating/icefloor, /area/ice_colony/exterior/surface/container_yard) "aZt" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/floor/plating/icefloor, /area/ice_colony/exterior/surface/container_yard) "aZu" = ( @@ -35021,6 +34849,7 @@ "qEB" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/plating/icefloor, /area/ice_colony/surface/requesitions) "qRy" = ( @@ -35048,6 +34877,7 @@ /area/ice_colony/exterior/surface/valley/northwest) "rAm" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor{ icon_state = "dark2" }, @@ -35130,6 +34960,7 @@ /area/ice_colony/underground/hangar) "tEG" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /obj/effect/landmark/queen_spawn, /turf/open/ice, /area/ice_colony/exterior/underground/caves/open) @@ -35193,10 +35024,12 @@ "uUv" = ( /obj/effect/alien/weeds/node, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/ice, /area/ice_colony/exterior/underground/caves/open) "vcU" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/ice, /area/ice_colony/exterior/underground/caves/open) "vhS" = ( @@ -35265,6 +35098,7 @@ /area/ice_colony/surface/tcomms) "xWm" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/ice, /area/ice_colony/exterior/surface/landing_pad_external) "ygw" = ( diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index a4d5e333cb69..ffe690c84baa 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -18,11 +18,7 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/interior/colony/medseceng) "aaf" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_s_research) "aag" = ( @@ -633,11 +629,7 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/interior/colony/research_hab) "abZ" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) "aca" = ( @@ -1345,7 +1337,7 @@ }, /area/shiva/interior/colony/research_hab) "afA" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) "afC" = ( @@ -1560,11 +1552,7 @@ }, /area/shiva/interior/colony/central) "agy" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_s_research) "agz" = ( @@ -1591,6 +1579,15 @@ dir = 1 }, /area/shiva/interior/colony/medseceng) +"agF" = ( +/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "agJ" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/technology_scanner, @@ -1699,6 +1696,7 @@ /area/shiva/interior/colony/medseceng) "ahy" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/shiva{ dir = 1 }, @@ -2033,11 +2031,7 @@ }, /area/shiva/interior/colony/research_hab) "aiW" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_lz2) "aiZ" = ( @@ -2182,11 +2176,7 @@ /turf/open/floor/plating, /area/shiva/interior/colony/medseceng) "ajT" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/colony/medseceng) "ajU" = ( @@ -2239,11 +2229,7 @@ }, /area/shiva/interior/colony/medseceng) "akf" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_s_research) "akh" = ( @@ -2707,11 +2693,7 @@ }, /area/shiva/interior/colony/medseceng) "amQ" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) "amR" = ( @@ -3671,11 +3653,7 @@ /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "atv" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_lz2) "aty" = ( @@ -3729,9 +3707,7 @@ /turf/open/auto_turf/ice/layer0, /area/shiva/interior/caves/cp_camp) "atJ" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/research_alley) "atK" = ( @@ -4005,6 +3981,7 @@ /area/shiva/exterior/cp_lz2) "axd" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/shiva{ icon_state = "wredfull" }, @@ -4404,9 +4381,7 @@ }, /area/shiva/interior/garage) "azx" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) "azy" = ( @@ -4911,7 +4886,6 @@ "aDS" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ id = "st_17"; - locked = 0; name = "Power Storage Unit" }, /turf/open/floor/plating, @@ -4934,9 +4908,7 @@ /turf/closed/wall/shiva/prefabricated/white, /area/shiva/interior/lz2_habs) "aEq" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "aEr" = ( @@ -4949,7 +4921,7 @@ /area/shiva/exterior/cp_lz2) "aEu" = ( /obj/structure/prop/ice_colony/ground_wire, -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "aEB" = ( @@ -4986,16 +4958,13 @@ /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) "aEV" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "aEW" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ dir = 2; id = "st_18"; - locked = 0; name = "Disposals Storage Unit" }, /turf/open/floor/plating, @@ -5075,9 +5044,7 @@ }, /area/shiva/interior/colony/botany) "aFz" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "aFA" = ( @@ -5100,7 +5067,7 @@ /turf/open/auto_turf/snow/layer0, /area/shiva/interior/bar) "aFJ" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/colony/medseceng) "aFK" = ( @@ -5186,9 +5153,7 @@ /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_s_research) "aGI" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_lz2) "aHb" = ( @@ -5216,7 +5181,7 @@ }, /area/shiva/interior/bar) "aHz" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/research_alley) "aHB" = ( @@ -5231,6 +5196,14 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) +"aHQ" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "aIh" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/barbed_wire, @@ -5284,9 +5257,7 @@ }, /area/shiva/interior/colony/medseceng) "aJy" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_5" - }, +/obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "aJB" = ( @@ -5310,9 +5281,7 @@ }, /area/shiva/interior/bar) "aJG" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/colony/medseceng) "aJM" = ( @@ -6636,6 +6605,15 @@ icon_state = "floor3" }, /area/shiva/interior/colony/research_hab) +"aWv" = ( +/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "aWB" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out" @@ -7291,6 +7269,14 @@ "bjv" = ( /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/cp_colony_grounds) +"bjP" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "bks" = ( /obj/structure/morgue{ dir = 8 @@ -7347,11 +7333,7 @@ }, /area/shiva/interior/colony/medseceng) "bnD" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) "bnS" = ( @@ -7373,9 +7355,7 @@ /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) "boD" = ( -/obj/docking_port/stationary/marine_dropship/lz1{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz1, /turf/open/floor/plating, /area/shiva/exterior/lz1_valley) "boS" = ( @@ -7523,9 +7503,7 @@ }, /area/shiva/interior/lz2_habs) "bwP" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) "bxb" = ( @@ -7558,6 +7536,7 @@ /area/shiva/interior/colony/research_hab) "byr" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) "byG" = ( @@ -7910,9 +7889,7 @@ /turf/open/floor/plating, /area/shiva/interior/colony/n_admin) "bRU" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_5" - }, +/obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) "bSB" = ( @@ -8014,7 +7991,6 @@ "bXo" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating, @@ -8446,9 +8422,7 @@ }, /area/shiva/interior/caves/research_caves) "cAH" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_5" - }, +/obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) "cAW" = ( @@ -8489,6 +8463,12 @@ icon_state = "multi_tiles" }, /area/shiva/exterior/lz2_fortress) +"cBF" = ( +/obj/structure/machinery/landinglight/ds2/delayone, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "cBG" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light/double{ @@ -8574,7 +8554,6 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{ dir = 1; name = "\improper Aurora Medical Clinic Treatment"; - req_access = null; req_one_access = null }, /turf/open/floor/plating, @@ -8687,9 +8666,7 @@ /turf/open/gm/river/no_overlay, /area/shiva/interior/caves/cp_camp) "cMr" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_colony_grounds) "cMs" = ( @@ -8715,9 +8692,7 @@ /turf/closed/wall/shiva/prefabricated/reinforced/hull, /area/shiva/interior/oob) "cOU" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) "cOX" = ( @@ -8929,6 +8904,17 @@ /obj/item/device/multitool, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) +"cYR" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 8 + }, +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "cYT" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 10 @@ -8995,9 +8981,7 @@ }, /area/shiva/interior/colony/medseceng) "dcu" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) "dcG" = ( @@ -9695,9 +9679,7 @@ /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) "eab" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/colony/medseceng) "eal" = ( @@ -9839,11 +9821,7 @@ /turf/open/floor/wood, /area/shiva/interior/bar) "ejX" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_colony_grounds) "ekH" = ( @@ -9991,7 +9969,6 @@ "esf" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating, @@ -10130,9 +10107,7 @@ }, /area/shiva/interior/bar) "eCr" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "eET" = ( @@ -10410,6 +10385,14 @@ "eUT" = ( /turf/closed/wall/shiva/prefabricated/white, /area/shiva/exterior/cp_lz2) +"eVa" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 8 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/exterior/lz2_fortress) "eVG" = ( /obj/structure/largecrate/random, /turf/open/floor/shiva, @@ -10482,6 +10465,7 @@ /area/shiva/interior/warehouse) "faM" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/medseceng_caves) "faR" = ( @@ -10632,9 +10616,7 @@ }, /area/shiva/interior/colony/research_hab) "fiy" = ( -/obj/docking_port/stationary/marine_dropship/lz2{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz2, /turf/open/floor/plating, /area/shiva/exterior/lz2_fortress) "fiK" = ( @@ -10872,6 +10854,15 @@ }, /turf/open/floor/plating, /area/shiva/interior/colony/botany) +"fxw" = ( +/obj/structure/machinery/landinglight/ds2/spoke, +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "fxy" = ( /obj/item/lightstick/variant/planted, /turf/open/auto_turf/snow/layer1, @@ -11050,9 +11041,7 @@ /turf/open/floor/wood, /area/shiva/interior/colony/s_admin) "fGG" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer3, /area/shiva/interior/colony/medseceng) "fGT" = ( @@ -11121,6 +11110,12 @@ /obj/structure/fence, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/lz1_valley) +"fKx" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/shiva{ + icon_state = "greenfull" + }, +/area/shiva/interior/colony/n_admin) "fKy" = ( /obj/item/tool/pen/blue{ pixel_x = 5 @@ -11160,6 +11155,17 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) +"fLz" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 4 + }, +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "fLX" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 8 @@ -11229,7 +11235,6 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 8; name = "\improper Colony Power Substation"; - req_access = null; req_one_access = null }, /turf/open/floor/plating, @@ -11273,11 +11278,7 @@ }, /area/shiva/interior/bar) "fUZ" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard/cp_bar) "fVl" = ( @@ -11563,6 +11564,12 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_colony_grounds) +"gkK" = ( +/obj/structure/machinery/landinglight/ds2/delaythree, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/exterior/lz2_fortress) "gkL" = ( /obj/structure/machinery/medical_pod/sleeper, /turf/open/floor/shiva{ @@ -11833,9 +11840,7 @@ /turf/open/floor/plating/plating_catwalk/shiva, /area/shiva/interior/telecomm/lz1_biceps) "gBp" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) "gBr" = ( @@ -12282,11 +12287,7 @@ }, /area/shiva/interior/lz2_habs) "gYu" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_colony_grounds) "gZG" = ( @@ -12396,11 +12397,7 @@ }, /area/shiva/exterior/lz2_fortress) "hkC" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) "hkS" = ( @@ -12523,6 +12520,15 @@ }, /turf/open/gm/river/no_overlay, /area/shiva/interior/colony/central) +"hpN" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 4 + }, +/obj/structure/machinery/landinglight/ds2/delaytwo, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "hqd" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 6; @@ -12624,9 +12630,7 @@ /turf/closed/wall/shiva/prefabricated/blue, /area/shiva/interior/warehouse) "huF" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) "hvZ" = ( @@ -12672,9 +12676,7 @@ /turf/open/floor/plating, /area/shiva/interior/colony/central) "hxY" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) "hyu" = ( @@ -12927,11 +12929,7 @@ /turf/open/asphalt/cement, /area/shiva/interior/warehouse) "hIz" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_colony_grounds) "hIC" = ( @@ -12941,9 +12939,7 @@ }, /area/shiva/interior/garage) "hIM" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) "hJd" = ( @@ -13073,6 +13069,14 @@ /obj/structure/cargo_container/horizontal/blue/top, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) +"hSq" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 4 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/exterior/lz2_fortress) "hSW" = ( /obj/item/lightstick/red/spoke/planted{ layer = 2.99; @@ -13131,6 +13135,7 @@ /area/shiva/exterior/cp_lz2) "hUG" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/shiva{ dir = 8; icon_state = "multi_tiles" @@ -13226,6 +13231,17 @@ icon_state = "floor3" }, /area/shiva/interior/colony/botany) +"hZu" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 1 + }, +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "hZI" = ( /obj/structure/largecrate/random/mini/small_case/b{ pixel_x = -9 @@ -13265,9 +13281,7 @@ }, /area/shiva/interior/colony/deck) "idG" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) "idR" = ( @@ -13801,11 +13815,7 @@ }, /area/shiva/interior/colony/botany) "iCF" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer4, /area/shiva/exterior/cp_colony_grounds) "iCJ" = ( @@ -13827,9 +13837,7 @@ /turf/open/floor/wood, /area/shiva/interior/bar) "iDa" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard/cp_bar) "iDn" = ( @@ -13898,6 +13906,13 @@ }, /turf/open/floor/shiva, /area/shiva/interior/bar) +"iHN" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "green" + }, +/area/shiva/interior/colony/botany) "iHV" = ( /obj/structure/largecrate/random{ anchored = 1; @@ -14079,6 +14094,14 @@ /obj/structure/girder, /turf/open/floor/plating, /area/shiva/interior/caves/research_caves) +"iUk" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "iVj" = ( /turf/open/floor/shiva{ dir = 4; @@ -14292,11 +14315,7 @@ }, /area/shiva/interior/colony/medseceng) "jaF" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/valley) "jaU" = ( @@ -14615,11 +14634,7 @@ /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) "jxh" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/valley) "jxJ" = ( @@ -14665,6 +14680,14 @@ dir = 1 }, /area/shiva/interior/colony/s_admin) +"jBN" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "jCe" = ( /obj/structure/machinery/light/double, /turf/open/floor/shiva{ @@ -14811,6 +14834,14 @@ /obj/structure/fence, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/junkyard) +"jLc" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "jLn" = ( /obj/structure/closet/secure_closet/engineering_welding, /obj/effect/landmark/objective_landmark/far, @@ -15006,9 +15037,7 @@ }, /area/shiva/interior/lz2_habs) "jXD" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) "jYO" = ( @@ -15119,6 +15148,15 @@ icon_state = "yellowfull" }, /area/shiva/interior/colony/medseceng) +"kcB" = ( +/obj/structure/machinery/landinglight/ds2/spoke, +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "kdd" = ( /obj/effect/landmark/nightmare{ insert_tag = "lz2-east-gate" @@ -15221,9 +15259,7 @@ /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard/cp_bar) "kgP" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_5" - }, +/obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) "khw" = ( @@ -15253,6 +15289,12 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/wood, /area/shiva/interior/colony/botany) +"kiv" = ( +/obj/structure/machinery/landinglight/ds2, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "kiB" = ( /obj/structure/machinery/alarm{ pixel_y = 24 @@ -15381,11 +15423,7 @@ }, /area/shiva/interior/colony/s_admin) "kri" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/valley) "krm" = ( @@ -15411,9 +15449,7 @@ /turf/open/asphalt/cement, /area/shiva/interior/warehouse) "krZ" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_5" - }, +/obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/colony/medseceng) "ksu" = ( @@ -15462,7 +15498,7 @@ }, /area/shiva/interior/colony/deck) "kuS" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) "kuY" = ( @@ -15731,9 +15767,7 @@ /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) "kGW" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) "kHB" = ( @@ -15768,6 +15802,14 @@ icon_state = "red" }, /area/shiva/interior/colony/medseceng) +"kIH" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "kJi" = ( /obj/structure/closet/crate/hydroponics, /obj/item/reagent_container/glass/watertank, @@ -15803,6 +15845,14 @@ /obj/item/lightstick/red/variant, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/lz1_valley) +"kLa" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 8 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/exterior/lz2_fortress) "kLi" = ( /obj/structure/surface/rack, /obj/item/clothing/suit/storage/snow_suit/doctor{ @@ -15994,9 +16044,7 @@ }, /area/shiva/interior/colony/research_hab) "kSh" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) "kSO" = ( @@ -16247,6 +16295,17 @@ /obj/structure/fence, /turf/open/auto_turf/snow/layer4, /area/shiva/exterior/junkyard) +"lgx" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 1 + }, +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "lgN" = ( /turf/closed/wall/shiva/prefabricated/reinforced/hull, /area/shiva/exterior/junkyard/fortbiceps) @@ -16491,6 +16550,20 @@ /obj/structure/machinery/space_heater, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard/fortbiceps) +"luR" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) +"lvj" = ( +/obj/structure/machinery/landinglight/ds2, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/exterior/lz2_fortress) "lvq" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/far, @@ -16578,6 +16651,14 @@ /obj/item/lightstick/red/variant/planted, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/cp_camp) +"lBC" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "lCb" = ( /obj/item/tool/pickaxe, /turf/open/auto_turf/ice/layer0, @@ -17379,9 +17460,7 @@ }, /area/shiva/interior/colony/botany) "msh" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) "msu" = ( @@ -17576,6 +17655,14 @@ }, /turf/open/floor/wood, /area/shiva/interior/colony/botany) +"mEp" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "mEw" = ( /obj/structure/cargo_container/wy/left, /turf/open/auto_turf/snow/layer3, @@ -17822,6 +17909,14 @@ /obj/effect/landmark/hunter_primary, /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/valley) +"mQl" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "mQs" = ( /obj/structure/machinery/light/double{ dir = 1; @@ -17857,9 +17952,7 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/interior/oob/dev_room) "mRv" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) "mRU" = ( @@ -18221,6 +18314,15 @@ }, /turf/open/gm/river/no_overlay, /area/shiva/interior/caves/cp_camp) +"nlG" = ( +/obj/structure/machinery/landinglight/ds2/spoke, +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "nmi" = ( /obj/item/weapon/twohanded/spear, /turf/open/floor/shiva{ @@ -19052,7 +19154,7 @@ /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_colony_grounds) "oiH" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) "oiX" = ( @@ -19126,9 +19228,7 @@ /turf/open/floor/interior/plastic, /area/shiva/interior/warehouse) "opa" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_5" - }, +/obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer3, /area/shiva/interior/colony/central) "opM" = ( @@ -19138,9 +19238,7 @@ }, /area/shiva/interior/colony/s_admin) "oqf" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) "oqt" = ( @@ -19315,9 +19413,7 @@ /turf/open/floor/plating, /area/shiva/exterior/telecomm/lz2_northeast) "oxP" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) "oyc" = ( @@ -19742,9 +19838,7 @@ /turf/open/floor/wood, /area/shiva/interior/colony/medseceng) "pcT" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard/cp_bar) "pcY" = ( @@ -20201,6 +20295,15 @@ icon_state = "multi_tiles" }, /area/shiva/interior/bar) +"pBl" = ( +/obj/structure/machinery/landinglight/ds2/spoke, +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "pBy" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/effect/landmark/objective_landmark/far, @@ -20349,6 +20452,12 @@ icon_state = "wred" }, /area/shiva/interior/colony/medseceng) +"pGg" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "pGj" = ( /obj/item/weapon/ice_axe/red, /turf/open/auto_turf/snow/layer0, @@ -20545,9 +20654,7 @@ }, /area/shiva/interior/colony/medseceng) "pNs" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) "pNx" = ( @@ -20667,7 +20774,7 @@ }, /area/shiva/interior/colony/central) "pUp" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "pUx" = ( @@ -21440,9 +21547,7 @@ /turf/open/auto_turf/snow/layer4, /area/shiva/exterior/cp_lz2) "qNj" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_5" - }, +/obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) "qNn" = ( @@ -21919,7 +22024,7 @@ }, /area/shiva/exterior/junkyard/fortbiceps) "rli" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) "rnz" = ( @@ -22169,9 +22274,7 @@ /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) "rEQ" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) "rEV" = ( @@ -22463,6 +22566,12 @@ dir = 5 }, /area/shiva/interior/aerodrome) +"rXp" = ( +/obj/structure/machinery/landinglight/ds2/delayone, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/exterior/lz2_fortress) "rXt" = ( /obj/structure/cable/heavyduty{ icon_state = "0-8" @@ -22594,9 +22703,7 @@ }, /area/shiva/interior/colony/medseceng) "sev" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_colony_grounds) "seW" = ( @@ -22760,7 +22867,7 @@ }, /area/shiva/interior/colony/research_hab) "snN" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) "snX" = ( @@ -23127,9 +23234,7 @@ /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) "sJo" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) "sJs" = ( @@ -23378,6 +23483,14 @@ /obj/item/clothing/shoes/snow, /turf/open/floor/interior/plastic/alt, /area/shiva/interior/warehouse) +"sZx" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "tad" = ( /obj/structure/platform/strata{ dir = 1 @@ -23787,9 +23900,7 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/interior/warehouse/caves) "tuT" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard/cp_bar) "tvo" = ( @@ -24724,6 +24835,17 @@ icon_state = "bluefull" }, /area/shiva/interior/colony/n_admin) +"ujV" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 1 + }, +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "ukp" = ( /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/cp_s_research) @@ -25023,9 +25145,7 @@ /turf/open/floor/wood, /area/shiva/interior/colony/botany) "uCs" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) "uCO" = ( @@ -25412,9 +25532,7 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/right_spiders) "uTu" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard/cp_bar) "uTB" = ( @@ -25473,7 +25591,7 @@ /turf/open/auto_turf/snow/layer0, /area/shiva/interior/caves/cp_camp) "uWj" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) "uWA" = ( @@ -25706,9 +25824,7 @@ }, /area/shiva/interior/colony/botany) "vhM" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) "vhQ" = ( @@ -25749,11 +25865,7 @@ }, /area/shiva/interior/colony/research_hab) "vjy" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) "vjH" = ( @@ -26277,9 +26389,7 @@ /turf/open/gm/river, /area/shiva/exterior/cp_lz2) "vSL" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) "vTc" = ( @@ -26364,6 +26474,13 @@ dir = 1 }, /area/shiva/interior/colony/medseceng) +"vXk" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/botany) "vXl" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassbb_1" @@ -26453,6 +26570,14 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating, /area/shiva/interior/colony/medseceng) +"wfO" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 4 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/exterior/lz2_fortress) "wfP" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -16; @@ -26617,6 +26742,15 @@ icon_state = "multi_tiles" }, /area/shiva/interior/colony/botany) +"wpl" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "wpG" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ name = "\improper Colony Security Checkpoint" @@ -27542,7 +27676,7 @@ /turf/closed/wall/shiva/ice, /area/shiva/interior/oob) "xAP" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) "xAS" = ( @@ -27612,6 +27746,14 @@ icon_state = "purplefull" }, /area/shiva/interior/colony/research_hab) +"xEd" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "xEu" = ( /obj/structure/morgue, /turf/open/floor/shiva{ @@ -28075,6 +28217,12 @@ dir = 1 }, /area/shiva/interior/colony/medseceng) +"ylP" = ( +/obj/structure/machinery/landinglight/ds2/delaythree, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "ylU" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 4 @@ -30530,27 +30678,27 @@ mFm mFm mhP mhP -sxD -mFm -mFm -mFm -mFm -mFm -mFm -sxD -iuK -iuK -sxD -mFm -mFm -mFm -mFm -mFm -mFm -mFm -mFm -mFm -sxD +cYR +jBN +lBC +mQl +bjP +jBN +lBC +nlG +kLa +eVa +pBl +mQl +bjP +jBN +lBC +mQl +bjP +jBN +lBC +mQl +aWv mhP mhP mFm @@ -30691,9 +30839,9 @@ caS mFm mFm mhP -sxD -mFm +hZu mFm +sxD mFm mFm mFm @@ -30711,9 +30859,9 @@ mFm mFm mFm mFm -mFm -mFm sxD +mFm +wpl mhP mFm iuK @@ -30853,8 +31001,8 @@ caS mFm mFm mhP -mFm -mFm +sZx +sxD mFm mFm mFm @@ -30874,8 +31022,8 @@ gkY gkY mFm mFm -mFm -mFm +sxD +cBF mhP mFm iuK @@ -31015,7 +31163,7 @@ mFm mFm mFm mhP -mFm +jLc mFm mFm aar @@ -31037,7 +31185,7 @@ gkY mFm aar fiy -mFm +kiv mhP mFm iuK @@ -31177,7 +31325,7 @@ mFm mFm mFm mhP -mFm +mEp mFm mFm mFm @@ -31199,7 +31347,7 @@ gkY gkY mFm gkY -mFm +ylP mhP mFm axq @@ -31339,7 +31487,7 @@ caS mFm mFm mhP -mFm +iUk gkY gkY gkY @@ -31361,7 +31509,7 @@ gkY gkY gkY gkY -mFm +pGg mhP mFm iuK @@ -31501,7 +31649,7 @@ caS mFm mFm mhP -mFm +sZx gkY gkY gkY @@ -31523,7 +31671,7 @@ gkY gkY iuK iuK -iuK +rXp mhP mFm rSL @@ -31663,7 +31811,7 @@ caS mFm mFm mhP -mFm +jLc gkY gkY gkY @@ -31685,7 +31833,7 @@ gkY gkY iuK iuK -iuK +lvj mhP mFm iuK @@ -31825,7 +31973,7 @@ caS mFm mFm mhP -mFm +mEp gkY gkY gkY @@ -31847,7 +31995,7 @@ gkY gkY iuK iuK -iuK +gkK mhP mFm iuK @@ -31987,7 +32135,7 @@ caS mFm mFm mhP -mFm +iUk gkY gkY gkY @@ -32009,7 +32157,7 @@ gkY gkY gkY gkY -mFm +pGg mhP otV iuK @@ -32149,7 +32297,7 @@ mFm mFm mFm mhP -mFm +sZx mFm mFm mFm @@ -32171,7 +32319,7 @@ gkY gkY mFm gkY -mFm +cBF mhP apY iuK @@ -32311,7 +32459,7 @@ mFm mFm mFm mhP -mFm +jLc mFm mFm aar @@ -32333,7 +32481,7 @@ gkY mFm aar gkY -mFm +kiv mhP mFm iuK @@ -32473,8 +32621,8 @@ caS mFm mFm mhP -mFm -mFm +mEp +sxD mFm mFm mFm @@ -32494,8 +32642,8 @@ gkY gkY mFm mFm -mFm -mFm +sxD +ylP mhP mFm qyC @@ -32635,9 +32783,9 @@ caS mFm mFm mhP -sxD -mFm +lgx mFm +sxD mFm mFm mFm @@ -32655,9 +32803,9 @@ mFm mFm mFm mFm -mFm -mFm sxD +mFm +hpN mhP mFm wgX @@ -32798,27 +32946,27 @@ mFm mFm mhP mhP -sxD -mFm -mFm -mFm -mFm -mFm -mFm -sxD -iuK -iuK -sxD -mFm -mFm -mFm -mFm -mFm -mFm -mFm -mFm -mFm -sxD +ujV +kIH +aHQ +luR +xEd +kIH +aHQ +fxw +hSq +wfO +kcB +luR +xEd +fLz +aHQ +luR +xEd +kIH +aHQ +luR +agF mhP mhP mFm @@ -43550,7 +43698,7 @@ rBH lmL ejt lmL -bJF +vXk gjY vHM gjY @@ -44334,7 +44482,7 @@ kJi cCI axf cCI -axf +fKx cCI axf gZG @@ -46792,7 +46940,7 @@ mqe rFA rBH joh -aUM +iHN krM nOd nOd diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index ad61580eda28..d7d69fd34bc8 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -27,9 +27,7 @@ /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/complex/botany) "abG" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) "abS" = ( @@ -88,7 +86,7 @@ /obj/structure/flora/bush/ausbushes/ppflowers{ icon_state = "brflowers_1" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "ahD" = ( /obj/structure/bed/chair{ @@ -292,9 +290,7 @@ /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/cells) "asT" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ - dir = 8 - }, +/obj/structure/machinery/landinglight/ds1/delaythree, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) "atn" = ( @@ -537,7 +533,7 @@ /turf/closed/wall/kutjevo/colony/reinforced/hull, /area/kutjevo/interior/power) "aIu" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) "aIw" = ( @@ -567,6 +563,12 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) +"aKl" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 1 + }, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/exterior/lz_dunes) "aKH" = ( /obj/structure/machinery/light, /turf/open/floor/kutjevo/multi_tiles, @@ -1182,7 +1184,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "bGX" = ( /obj/effect/decal/cleanable/blood/oil, @@ -1466,7 +1468,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_north) "ccs" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -1672,7 +1674,7 @@ /obj/structure/flora/bush/ausbushes/ppflowers{ icon_state = "fullgrass_1" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "csE" = ( /obj/structure/girder, @@ -1772,9 +1774,7 @@ /obj/structure/flora/bush/desert{ icon_state = "tree_3" }, -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) "cyc" = ( @@ -1788,9 +1788,7 @@ /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/complex/botany) "cAK" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) "cBd" = ( @@ -2102,6 +2100,7 @@ /area/kutjevo/interior/foremans_office) "cSJ" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_South) "cTj" = ( @@ -2302,9 +2301,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power) "ddq" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/lz_river) "ddx" = ( @@ -2377,7 +2374,7 @@ /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/exterior/Northwest_Colony) "dhL" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -2458,6 +2455,12 @@ dir = 9 }, /area/kutjevo/exterior/runoff_river) +"dpt" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 1 + }, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/exterior/Northwest_Colony) "dpH" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/kutjevo/tan, @@ -2486,7 +2489,7 @@ }, /area/kutjevo/interior/colony_South/power2) "dqK" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/oob/dev_room) @@ -2710,8 +2713,8 @@ /turf/open/gm/river/desert/shallow, /area/kutjevo/exterior/Northwest_Colony) "dEI" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds1/delayone, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) "dFc" = ( @@ -2799,9 +2802,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/exterior/runoff_bridge) "dKr" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) "dKs" = ( @@ -2955,9 +2956,7 @@ }, /area/kutjevo/interior/colony_South/power2) "dUE" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) "dUP" = ( @@ -3328,9 +3327,7 @@ }, /area/kutjevo/interior/oob) "eqJ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) "eqQ" = ( @@ -3995,7 +3992,7 @@ }, /area/kutjevo/interior/complex/med/auto_doc) "ffP" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/ds1/delaythree{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -4488,9 +4485,7 @@ /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) "fRu" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) "fRI" = ( @@ -4501,7 +4496,7 @@ /obj/structure/flora/bush/ausbushes/ppflowers{ icon_state = "brflowers_3" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "fRZ" = ( /obj/structure/platform/kutjevo/smooth{ @@ -4962,9 +4957,7 @@ /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_S_East) "gBV" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) "gCb" = ( @@ -5047,9 +5040,7 @@ }, /area/kutjevo/interior/complex/Northwest_Flight_Control) "gHh" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_north) "gHm" = ( @@ -5176,9 +5167,7 @@ /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/med/cells) "gSr" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/oob/dev_room) @@ -5299,14 +5288,12 @@ /turf/open/floor/kutjevo/colors/red, /area/kutjevo/interior/complex/botany) "gZj" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) "gZq" = ( /obj/structure/bed/chair, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "han" = ( /obj/structure/platform_decoration/kutjevo/rock{ @@ -5895,7 +5882,7 @@ dir = 8; icon_state = "p_stair_sn_full_cap" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "hVQ" = ( /obj/structure/machinery/light{ @@ -6247,9 +6234,7 @@ }, /area/kutjevo/interior/power) "iCQ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /obj/effect/decal/cleanable/blood/oil, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/Northwest_Colony) @@ -6285,9 +6270,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/med/triage) "iIn" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_dunes) "iIz" = ( @@ -7035,9 +7018,7 @@ /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/colony_central) "jIN" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) "jIR" = ( @@ -7159,7 +7140,7 @@ }, /area/kutjevo/interior/complex/botany/east) "jUK" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2{ dir = 8 }, /turf/open/floor/kutjevo/multi_tiles, @@ -7169,7 +7150,7 @@ dir = 1; icon_state = "p_stair_full" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "jWM" = ( /obj/structure/platform/kutjevo{ @@ -7398,7 +7379,7 @@ }, /area/kutjevo/interior/construction) "kne" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_dunes) "kni" = ( @@ -7922,9 +7903,7 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/exterior/Northwest_Colony) "kVH" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) "kVJ" = ( @@ -8497,6 +8476,12 @@ /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 + }, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/exterior/Northwest_Colony) "lNt" = ( /obj/structure/platform/kutjevo/smooth{ dir = 8 @@ -8743,9 +8728,7 @@ /turf/open/floor/kutjevo/colors/cyan/tile, /area/kutjevo/interior/complex/med/auto_doc) "mfd" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) "mfk" = ( @@ -9251,6 +9234,10 @@ }, /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/interior/complex/med/auto_doc) +"mIT" = ( +/obj/structure/machinery/landinglight/ds2/delayone, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/exterior/Northwest_Colony) "mJq" = ( /obj/structure/machinery/computer/cameras/telescreen/entertainment{ icon_state = "ai_bsod"; @@ -9341,9 +9328,7 @@ /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/complex/med/triage) "mPL" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) "mPP" = ( @@ -9899,9 +9884,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/foremans_office) "nFO" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_dunes) "nFY" = ( @@ -10228,9 +10211,7 @@ /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/cells) "nZl" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) "nZv" = ( @@ -10303,9 +10284,7 @@ }, /area/kutjevo/exterior/scrubland) "ofn" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) "ofs" = ( @@ -10444,7 +10423,7 @@ /obj/structure/bed/chair{ dir = 1 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "oor" = ( /obj/structure/surface/rack, @@ -11380,9 +11359,7 @@ /turf/open/asphalt/cement_sunbleached, /area/kutjevo/exterior/scrubland) "pDi" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) "pDk" = ( @@ -11587,9 +11564,7 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/complex/med/locks) "pNW" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/stonyfields) "pOi" = ( @@ -11610,7 +11585,7 @@ }, /area/kutjevo/interior/power/comms) "pPz" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 8 }, /turf/open/floor/kutjevo/multi_tiles, @@ -11728,7 +11703,7 @@ dir = 4; pixel_y = 13 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "pZx" = ( /obj/structure/platform_decoration/kutjevo, @@ -12312,7 +12287,7 @@ /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) "qTI" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2/delaythree{ dir = 1 }, /turf/open/floor/kutjevo/multi_tiles, @@ -12394,9 +12369,7 @@ /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/power_pt2_electric_boogaloo) "qZO" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) "raA" = ( @@ -12525,9 +12498,7 @@ }, /area/kutjevo/interior/oob) "rkt" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/oob/dev_room) @@ -12877,9 +12848,7 @@ /turf/open/floor/kutjevo/tiles, /area/kutjevo/exterior/Northwest_Colony) "rLy" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/lz_dunes) "rLD" = ( @@ -12897,9 +12866,11 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) "rMV" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 8 + }, /turf/open/floor/kutjevo/multi_tiles, -/area/kutjevo/exterior/Northwest_Colony) +/area/kutjevo/exterior/lz_dunes) "rMZ" = ( /obj/structure/platform/kutjevo{ dir = 1 @@ -13109,7 +13080,7 @@ }, /area/kutjevo/interior/colony_central) "saK" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/Northwest_Colony) "sbb" = ( @@ -13245,7 +13216,9 @@ }, /area/kutjevo/interior/colony_South/power2) "slB" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 1 + }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) "slF" = ( @@ -13631,8 +13604,8 @@ /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/cells) "sLf" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds2/delayone, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/Northwest_Colony) "sLx" = ( @@ -14006,9 +13979,7 @@ /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) "tka" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/oob/dev_room) "tld" = ( @@ -14201,6 +14172,7 @@ /area/kutjevo/exterior/lz_dunes) "tzQ" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_S_East) "tAQ" = ( @@ -14322,7 +14294,7 @@ /turf/open/floor/kutjevo/plate, /area/kutjevo/exterior/Northwest_Colony) "tHI" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 8 }, /turf/open/floor/kutjevo/multi_tiles, @@ -14352,9 +14324,7 @@ /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/complex/botany/east) "tIF" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) "tIY" = ( @@ -14688,7 +14658,7 @@ /area/kutjevo/interior/complex/med) "ujo" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "ujG" = ( /obj/structure/platform_decoration/kutjevo/rock{ @@ -14817,7 +14787,7 @@ /obj/structure/flora/bush/ausbushes/ppflowers{ icon_state = "fullgrass_3" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "urm" = ( /obj/structure/stairs/perspective/kutjevo{ @@ -14852,6 +14822,12 @@ icon_state = "8,8" }, /area/kutjevo/interior/colony_north) +"usd" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 1 + }, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/exterior/lz_dunes) "ush" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, @@ -15053,9 +15029,7 @@ }, /area/kutjevo/interior/complex/Northwest_Dorms) "uHo" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/construction) "uHJ" = ( @@ -15247,9 +15221,7 @@ /turf/open/gm/river/desert/shallow, /area/kutjevo/exterior/runoff_dunes) "uQJ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) "uRm" = ( @@ -15474,9 +15446,7 @@ /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/lz_dunes) "ven" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) "veI" = ( @@ -15864,9 +15834,7 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power) "vGf" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) "vGx" = ( @@ -16347,7 +16315,7 @@ }, /area/kutjevo/exterior/complex_border/med_park) "wrk" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -16428,7 +16396,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/exterior/runoff_bridge) "wvX" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/ds2, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/Northwest_Colony) "wwc" = ( @@ -16591,9 +16559,7 @@ }, /area/kutjevo/interior/complex/med) "wFQ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_dunes) "wGD" = ( @@ -16612,9 +16578,7 @@ /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) "wJZ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/oob/dev_room) @@ -16708,6 +16672,7 @@ /area/kutjevo/interior/construction) "wTr" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_N_East) "wTt" = ( @@ -16752,6 +16717,12 @@ "wXd" = ( /turf/closed/wall/kutjevo/rock, /area/kutjevo/interior/colony_South) +"wXf" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 1 + }, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/exterior/Northwest_Colony) "wXy" = ( /obj/effect/landmark/static_comms/net_two, /turf/open/auto_turf/sand/layer2, @@ -16776,7 +16747,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/med) "wYp" = ( -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "wYE" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -17036,9 +17007,7 @@ /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/construction) "xrT" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/Northwest_Colony) "xti" = ( @@ -17570,6 +17539,7 @@ /area/kutjevo/interior/colony_South/power2) "ykY" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) "ylf" = ( @@ -19565,7 +19535,6 @@ wGH cWV swZ ffP -ffP tld ptH sKo @@ -19574,18 +19543,19 @@ tld ptH sKo ffP -ffP +tld ptH sKo ffP tld -sKo +ptH sKo ffP tld ptH -ptH -ptH +sKo +ffP +tld swZ cWV wGH @@ -19730,7 +19700,7 @@ wGH wGH wGH cWV -uhO +exI nbV nbV umo @@ -19897,7 +19867,7 @@ prJ wGH wGH cWV -rPq +asT nbV nbV nbV @@ -19920,7 +19890,7 @@ nbV nbV jZJ nbV -qVc +usd cWV aRu vei @@ -20064,7 +20034,7 @@ vei wGH wGH cWV -exI +uhO nbV nbV nbV @@ -20087,7 +20057,7 @@ lAI nbV lAI nbV -qVc +slB cWV aRu wGH @@ -20254,7 +20224,7 @@ lAI lAI lAI nbV -qVc +aKl cWV aRu qnU @@ -20398,7 +20368,7 @@ wGH wGH maE cWV -uhO +exI nbV lAI lAI @@ -20565,7 +20535,7 @@ vei wGH wGH cWV -rPq +asT nbV lAI lAI @@ -20588,7 +20558,7 @@ lAI nbV nbV nbV -qVc +usd cWV aRu qnU @@ -20637,26 +20607,26 @@ oJE xBm tGE hnq -hnq -wrk dhL +wrk ccs hnq -wrk dhL +wrk ccs hnq -hnq dhL +wrk ccs hnq +dhL wrk ccs -ccs hnq -wrk -dhL dhL +wrk +ccs +hnq dhL tGE xBm @@ -20732,7 +20702,7 @@ wGH wGH wGH cWV -exI +uhO nbV lAI lAI @@ -20755,7 +20725,7 @@ lAI nbV nbV nbV -qVc +slB cWV aRu wGH @@ -20825,7 +20795,7 @@ hzN wqk hzN hzN -qTI +dpt xBm huR huR @@ -20899,7 +20869,7 @@ prJ wGH maE cWV -slB +rPq nbV lAI lAI @@ -20922,7 +20892,7 @@ lAI lAI lAI nbV -qVc +aKl cWV aRu gZj @@ -20969,7 +20939,7 @@ sVF hrz sVF xBm -rMV +sUt hzN hzN hzN @@ -20992,7 +20962,7 @@ hzN hzN kvd hzN -qTI +lNl xBm huR huR @@ -21066,7 +21036,7 @@ prJ wGH maE cWV -uhO +exI nbV nbV nbV @@ -21233,7 +21203,7 @@ dxF vei maE cWV -rPq +asT nbV nbV nbV @@ -21256,7 +21226,7 @@ nbV nbV lAI cBF -qVc +usd cWV aRu wGH @@ -21326,7 +21296,7 @@ ppX ppX ppX hzN -qTI +wXf xBm huR huR @@ -21400,7 +21370,7 @@ dxF dxF wGH cWV -exI +uhO bbc nbV umo @@ -21423,7 +21393,7 @@ nbV umo nbV nbV -qVc +slB cWV wGH wGH @@ -21493,7 +21463,7 @@ ppX hzN eBI hzN -qTI +dpt xBm huR huR @@ -21569,27 +21539,27 @@ wGH cWV swZ yaE -yaE qzr -asT +rMV dIo yaE qzr -asT +rMV dIo yaE -yaE -asT +qzr +rMV dIo yaE qzr -asT +rMV dIo yaE qzr -asT -dIo +rMV dIo +yaE +qzr swZ cWV wGH @@ -21637,7 +21607,7 @@ sVF hrz oJE xBm -rMV +sUt hzN ppX ppX @@ -21660,7 +21630,7 @@ ppX hzN hzN hzN -qTI +lNl xBm huR huR @@ -21971,7 +21941,7 @@ hrz hrz oJE xBm -sUt +mIT hzN ppX ppX @@ -21994,7 +21964,7 @@ ppX ppX ppX hzN -qTI +wXf xBm huR huR @@ -22161,7 +22131,7 @@ ppX hzN ppX eBI -qTI +dpt xBm huR huR @@ -22305,7 +22275,7 @@ hrz hrz iin xBm -rMV +sUt hzN hzN hzN @@ -22328,7 +22298,7 @@ hzN hzN ppX eBI -qTI +lNl xBm huR huR @@ -22640,28 +22610,28 @@ sVF oJE xBm tGE +pPz jUK -jUK -tHI xDR +tHI pPz jUK -tHI xDR +tHI pPz jUK -jUK xDR +tHI pPz jUK -tHI xDR +tHI pPz jUK -tHI xDR +tHI pPz -pPz +jUK tGE xBm huR 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 9c218b15f473..5f412c49c5dc 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -54,8 +54,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "abX" = ( @@ -149,8 +148,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "afn" = ( @@ -233,8 +231,7 @@ "agM" = ( /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "ahH" = ( @@ -270,8 +267,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "aij" = ( @@ -356,8 +352,7 @@ /area/lv522/oob) "alJ" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/oob) "amc" = ( @@ -400,8 +395,7 @@ layer = 3.1; name = "synthethic potted plant"; pixel_x = -7; - pixel_y = 9; - tag = null + pixel_y = 9 }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) @@ -454,8 +448,7 @@ "anH" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "anM" = ( @@ -481,8 +474,7 @@ /obj/structure/machinery/light, /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "apc" = ( @@ -503,8 +495,7 @@ "api" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/outdoors/n_rockies) "apt" = ( @@ -547,8 +538,7 @@ pixel_y = 6 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/oob) "arq" = ( @@ -613,7 +603,6 @@ /area/lv522/indoors/a_block/security) "att" = ( /obj/structure/prop/invuln/lifeboat_hatch_placeholder/terminal{ - icon_state = "closed"; layer = 2.1 }, /obj/structure/barricade/handrail{ @@ -633,8 +622,7 @@ /obj/item/tool/pickaxe/silver, /obj/item/tool/pickaxe/silver, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "atV" = ( @@ -643,8 +631,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/n_rockies) "aut" = ( @@ -670,8 +657,7 @@ /obj/item/stack/sheet/metal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "awj" = ( @@ -696,8 +682,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "axC" = ( @@ -707,8 +692,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "axD" = ( @@ -765,16 +749,14 @@ /area/lv522/indoors/c_block/mining) "aAN" = ( /obj/structure/cargo_container/wy/mid{ - health = 5000; - unacidable = 0 + health = 5000 }, /turf/open/auto_turf/shale/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "aAW" = ( /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "aBm" = ( @@ -815,8 +797,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "aDf" = ( @@ -904,8 +885,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "aFf" = ( @@ -924,8 +904,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/n_rockies) "aFN" = ( @@ -958,8 +937,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "aGE" = ( @@ -1010,8 +988,7 @@ /obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "aIf" = ( @@ -1035,13 +1012,11 @@ /area/lv522/indoors/c_block/mining) "aII" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "aIY" = ( @@ -1069,8 +1044,7 @@ /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/far, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "aJT" = ( @@ -1097,8 +1071,7 @@ stat = 2 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "aKK" = ( @@ -1113,8 +1086,7 @@ /area/lv522/atmos/north_command_centre) "aKO" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison{ dir = 1; @@ -1151,8 +1123,7 @@ layer = 3.1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "aNr" = ( @@ -1260,8 +1231,7 @@ /obj/structure/machinery/telecomms/bus/preset_one, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "aQH" = ( @@ -1292,8 +1262,7 @@ /area/lv522/indoors/a_block/medical) "aRi" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "aRH" = ( @@ -1389,8 +1358,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "aUb" = ( @@ -1421,8 +1389,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "aVa" = ( @@ -1528,8 +1495,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "aWJ" = ( @@ -1583,8 +1549,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "aZj" = ( @@ -1663,8 +1628,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "bbL" = ( @@ -1725,8 +1689,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/c_block/t_comm) "bdj" = ( @@ -1736,8 +1699,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "bdv" = ( @@ -1787,8 +1749,7 @@ "bel" = ( /obj/structure/machinery/computer/crew/colony, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "ben" = ( @@ -1866,8 +1827,7 @@ /obj/item/newspaper, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "bgS" = ( @@ -1926,8 +1886,7 @@ }, /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "bhL" = ( @@ -1959,8 +1918,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 8; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "bjF" = ( @@ -1995,8 +1953,7 @@ /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "bkf" = ( @@ -2064,13 +2021,11 @@ /obj/structure/machinery/light/double, /obj/structure/window/reinforced{ dir = 1; - layer = 3; - tag = null + layer = 3 }, /obj/structure/machinery/computer3/server/rack, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/indoors/c_block/mining) "bmg" = ( @@ -2090,15 +2045,13 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "bnf" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "bnz" = ( @@ -2114,8 +2067,7 @@ /mob/living/simple_animal/mouse, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "bnP" = ( @@ -2202,8 +2154,7 @@ /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "buD" = ( @@ -2242,8 +2193,7 @@ pixel_x = 9 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "bwd" = ( @@ -2268,8 +2218,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "bwH" = ( @@ -2285,8 +2234,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "bwU" = ( @@ -2302,8 +2250,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "bxr" = ( @@ -2339,8 +2286,7 @@ }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "byJ" = ( @@ -2350,8 +2296,7 @@ /obj/item/circuitboard/machine/ghettosmes, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "byR" = ( @@ -2361,8 +2306,7 @@ /obj/item/ore/silver, /obj/item/ore/silver, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "bzC" = ( @@ -2385,8 +2329,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "bAc" = ( @@ -2418,8 +2361,7 @@ dir = 10 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/oob) "bBe" = ( @@ -2495,8 +2437,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "bDn" = ( @@ -2530,8 +2471,7 @@ /obj/structure/barricade/wooden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "bDR" = ( @@ -2579,8 +2519,7 @@ /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "bGN" = ( @@ -2594,8 +2533,7 @@ /obj/effect/landmark/objective_landmark/close, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "bGT" = ( @@ -2638,8 +2576,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "bIe" = ( @@ -2654,8 +2591,7 @@ }, /obj/item/tool/pen/red/clicky, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "bIr" = ( @@ -2730,8 +2666,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "bJZ" = ( @@ -2789,8 +2724,7 @@ /obj/structure/machinery/light, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "bLV" = ( @@ -2803,8 +2737,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "bMa" = ( @@ -2858,8 +2791,7 @@ "bNA" = ( /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "bNE" = ( @@ -2899,8 +2831,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "bPH" = ( @@ -2940,8 +2871,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "bQl" = ( @@ -2986,8 +2916,7 @@ /area/lv522/atmos/north_command_centre) "bRP" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison, /area/lv522/indoors/a_block/security) @@ -3079,8 +3008,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "bUJ" = ( @@ -3132,8 +3060,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "bVF" = ( @@ -3175,8 +3102,7 @@ pixel_y = 11 }, /obj/structure/sink/puddle{ - layer = 2.1; - name = "puddle" + layer = 2.1 }, /turf/open/organic/grass, /area/lv522/indoors/a_block/garden) @@ -3185,8 +3111,7 @@ dir = 9 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "bXl" = ( @@ -3209,8 +3134,7 @@ pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "bXq" = ( @@ -3262,8 +3186,7 @@ /obj/structure/cargo_container/wy/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "bYy" = ( @@ -3310,8 +3233,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "bZK" = ( @@ -3640,8 +3562,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "cjv" = ( @@ -3708,8 +3629,7 @@ /area/lv522/outdoors/colony_streets/north_west_street) "cmc" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/strata{ icon_state = "multi_tiles" @@ -3739,8 +3659,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "cnN" = ( @@ -3756,8 +3675,7 @@ pixel_x = -2 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "con" = ( @@ -3769,8 +3687,7 @@ /obj/structure/ore_box, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "cpk" = ( @@ -3865,8 +3782,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "cqr" = ( @@ -3888,8 +3804,7 @@ /area/lv522/outdoors/colony_streets/central_streets) "cqH" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "cqL" = ( @@ -3988,8 +3903,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "ctE" = ( @@ -4000,8 +3914,7 @@ /obj/structure/cargo_container/horizontal/blue/top, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "cuF" = ( @@ -4014,8 +3927,7 @@ /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "cve" = ( @@ -4040,8 +3952,7 @@ /obj/structure/machinery/portable_atmospherics/canister/empty/oxygen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "cwq" = ( @@ -4059,8 +3970,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "cwO" = ( @@ -4089,8 +3999,7 @@ pixel_x = -3 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "cxE" = ( @@ -4121,8 +4030,7 @@ /obj/structure/cargo_container/wy/left, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "cys" = ( @@ -4159,8 +4067,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "cyV" = ( @@ -4186,8 +4093,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "czC" = ( @@ -4261,8 +4167,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "cAy" = ( @@ -4275,8 +4180,7 @@ /obj/structure/cargo_container/kelland/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "cBi" = ( @@ -4302,8 +4206,7 @@ /obj/item/clothing/head/helmet/riot, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/kitchen) "cCC" = ( @@ -4424,8 +4327,7 @@ /obj/structure/cargo_container/wy/mid, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "cFP" = ( @@ -4452,8 +4354,7 @@ /obj/structure/prop/server_equipment/laptop/on, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "cGw" = ( @@ -4528,8 +4429,7 @@ }, /turf/open/floor/plating{ dir = 8; - icon_state = "platingdmg3"; - tag = null + icon_state = "platingdmg3" }, /area/lv522/indoors/a_block/dorms) "cHL" = ( @@ -4637,8 +4537,7 @@ /obj/effect/decal/cleanable/cobweb, /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "cIV" = ( @@ -4716,8 +4615,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "cKi" = ( @@ -4809,8 +4707,7 @@ /area/lv522/indoors/b_block/bar) "cLx" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "cLB" = ( @@ -4841,8 +4738,7 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "cMt" = ( @@ -4901,8 +4797,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "cOZ" = ( @@ -4947,8 +4842,7 @@ /area/lv522/oob) "cPO" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ dir = 1; @@ -4957,8 +4851,7 @@ /area/lv522/oob) "cPU" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ dir = 4; @@ -4973,8 +4866,7 @@ pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "cQc" = ( @@ -5020,8 +4912,7 @@ /obj/structure/surface/rack, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "cQW" = ( @@ -5035,8 +4926,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "cRB" = ( @@ -5072,7 +4962,6 @@ /area/lv522/atmos/north_command_centre) "cRT" = ( /obj/structure/prop/vehicles/crawler{ - density = 1; dir = 8; layer = 3.1 }, @@ -5100,8 +4989,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "cTf" = ( @@ -5181,8 +5069,7 @@ pixel_y = 11 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/t_comm) "cVc" = ( @@ -5249,8 +5136,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "cWr" = ( @@ -5314,8 +5200,7 @@ /area/lv522/atmos/filt) "cXf" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "cXm" = ( @@ -5363,8 +5248,7 @@ /obj/structure/cargo_container/wy/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "cYG" = ( @@ -5395,8 +5279,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "cZu" = ( @@ -5420,8 +5303,7 @@ /obj/structure/cargo_container/horizontal/blue/top, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "cZN" = ( @@ -5469,8 +5351,8 @@ }, /area/lv522/oob) "das" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, /obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1/delayone, /turf/open/floor/plating, /area/lv522/landing_zone_1) "daz" = ( @@ -5490,16 +5372,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "daG" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "daL" = ( @@ -5520,8 +5400,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/central_streets) "dbi" = ( @@ -5663,8 +5542,7 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "ddq" = ( @@ -5672,8 +5550,7 @@ /obj/item/device/analyzer, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "ddr" = ( @@ -5683,15 +5560,13 @@ pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ddy" = ( /turf/open/floor/prison{ dir = 1; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/atmos/cargo_intake) "ddC" = ( @@ -5848,8 +5723,7 @@ }, /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "dgq" = ( @@ -5869,8 +5743,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 1; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/atmos/cargo_intake) "dgO" = ( @@ -5943,8 +5816,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "dip" = ( @@ -5961,8 +5833,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "diT" = ( @@ -6101,8 +5972,7 @@ }, /obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "dlM" = ( @@ -6132,8 +6002,7 @@ /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "dmx" = ( @@ -6202,8 +6071,7 @@ pixel_y = 26 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "dnA" = ( @@ -6327,8 +6195,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "dqr" = ( @@ -6361,8 +6228,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "drS" = ( @@ -6389,8 +6255,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "dsl" = ( @@ -6409,8 +6274,7 @@ /obj/item/stack/sheet/mineral/platinum, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "dsu" = ( @@ -6437,8 +6301,7 @@ /area/lv522/indoors/a_block/admin) "dsQ" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/hallway) @@ -6453,8 +6316,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "dtb" = ( @@ -6494,8 +6356,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "dua" = ( @@ -6572,8 +6433,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "dxl" = ( @@ -6590,12 +6450,10 @@ pixel_y = 16 }, /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "dya" = ( @@ -6641,8 +6499,7 @@ /obj/item/paper, /obj/item/tool/pen/blue/clicky, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "dzv" = ( @@ -6686,8 +6543,7 @@ pixel_y = 10 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "dBb" = ( @@ -6709,8 +6565,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "dBd" = ( @@ -6727,8 +6582,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "dBo" = ( @@ -6766,8 +6620,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness/glass) "dCY" = ( @@ -6797,8 +6650,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "dDC" = ( @@ -6878,8 +6730,7 @@ /obj/item/prop/colony/used_flare, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "dEP" = ( @@ -6973,8 +6824,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) "dGV" = ( @@ -7014,8 +6864,7 @@ /area/lv522/outdoors/colony_streets/north_street) "dHy" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /obj/item/clothing/suit/storage/snow_suit/survivor/parka/red, /turf/open/floor/carpet, @@ -7070,8 +6919,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "dIG" = ( @@ -7085,8 +6933,7 @@ pixel_y = 3 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "dIK" = ( @@ -7113,18 +6960,15 @@ /area/lv522/atmos/east_reactor) "dJn" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/nw_rockies) "dJp" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "dJs" = ( @@ -7168,8 +7012,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness/glass) "dKF" = ( @@ -7275,8 +7118,7 @@ "dMy" = ( /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "dMN" = ( @@ -7330,8 +7172,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security/glass) "dOa" = ( @@ -7348,8 +7189,7 @@ dir = 9 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/hydro) "dOI" = ( @@ -7361,8 +7201,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/shuttle/drop2/lv522) "dOK" = ( @@ -7413,8 +7252,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "dPP" = ( @@ -7440,8 +7278,7 @@ /area/lv522/atmos/east_reactor/west) "dQh" = ( /obj/structure/machinery/light{ - dir = 1; - tag = null + dir = 1 }, /obj/structure/machinery/disposal, /turf/open/floor/strata{ @@ -7488,8 +7325,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "dQQ" = ( @@ -7687,13 +7523,11 @@ "dWG" = ( /obj/structure/window/reinforced{ dir = 1; - layer = 3; - tag = null + layer = 3 }, /obj/structure/machinery/computer3/server/rack, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/indoors/c_block/mining) "dWT" = ( @@ -7789,8 +7623,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "dZs" = ( @@ -7830,8 +7663,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "dZP" = ( @@ -7859,22 +7691,19 @@ icon_state = "pottedplant_21"; layer = 3.1; name = "synthethic potted plant"; - pixel_y = 14; - tag = null + pixel_y = 14 }, /obj/item/prop/alien/hugger, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "eai" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/outdoor) "eam" = ( @@ -7895,8 +7724,7 @@ "eaG" = ( /obj/structure/ore_box, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) "ebn" = ( @@ -7929,8 +7757,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "ebP" = ( @@ -7947,8 +7774,7 @@ /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "ecm" = ( @@ -7968,8 +7794,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "ecP" = ( @@ -8191,8 +8016,7 @@ /obj/structure/surface/table/almayer, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "egD" = ( @@ -8212,8 +8036,7 @@ pixel_y = 29 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "egP" = ( @@ -8315,8 +8138,7 @@ }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "ejN" = ( @@ -8350,8 +8172,7 @@ /area/lv522/oob) "ekO" = ( /obj/structure/bed/chair/wood/normal{ - dir = 8; - tag = null + dir = 8 }, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) @@ -8366,8 +8187,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "elq" = ( @@ -8399,8 +8219,7 @@ /obj/structure/surface/table/almayer, /obj/item/clothing/suit/storage/CMB, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "emb" = ( @@ -8431,8 +8250,7 @@ /obj/structure/cargo_container/grant/rightmid, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "emz" = ( @@ -8485,8 +8303,7 @@ "enD" = ( /obj/structure/curtain/red, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "enG" = ( @@ -8495,13 +8312,6 @@ icon_state = "browncorner" }, /area/lv522/atmos/north_command_centre) -"enJ" = ( -/obj/effect/decal/warning_stripes, -/obj/structure/machinery/landinglight/ds1{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1) "enP" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -8584,6 +8394,7 @@ /area/lv522/atmos/west_reactor) "epb" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -8647,8 +8458,7 @@ pixel_y = 3 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway/damage) "equ" = ( @@ -8662,8 +8472,7 @@ "eqE" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/nw_rockies) "eqM" = ( @@ -8693,8 +8502,7 @@ /obj/structure/cargo_container/watatsumi/rightmid, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "erZ" = ( @@ -8734,8 +8542,7 @@ "esF" = ( /obj/structure/surface/rack, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "etn" = ( @@ -8829,8 +8636,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "evx" = ( @@ -8984,8 +8790,8 @@ }, /area/lv522/outdoors/colony_streets/central_streets) "eyy" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, /obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1, /turf/open/floor/plating, /area/lv522/landing_zone_1) "eyM" = ( @@ -9041,16 +8847,14 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ezH" = ( /obj/structure/cargo_container/watatsumi/rightmid, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "ezU" = ( @@ -9224,8 +9028,7 @@ /obj/structure/machinery/light, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "eDL" = ( @@ -9235,8 +9038,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "eEv" = ( @@ -9328,8 +9130,7 @@ "eHu" = ( /obj/structure/closet/secure_closet/miner, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "eHy" = ( @@ -9346,8 +9147,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "eHF" = ( @@ -9357,8 +9157,7 @@ "eHI" = ( /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "eHR" = ( @@ -9382,16 +9181,14 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "eIk" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms/glass) "eIn" = ( @@ -9401,8 +9198,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "eIF" = ( @@ -9475,8 +9271,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "eKe" = ( @@ -9588,8 +9383,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "eMY" = ( @@ -9624,8 +9418,7 @@ stat = 2 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "eOe" = ( @@ -9646,8 +9439,7 @@ }, /obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "eOl" = ( @@ -9656,8 +9448,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "eOn" = ( @@ -9686,8 +9477,7 @@ }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ePc" = ( @@ -9700,8 +9490,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "ePl" = ( @@ -9760,8 +9549,7 @@ pixel_y = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "eQY" = ( @@ -9771,8 +9559,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "eRg" = ( @@ -9825,8 +9612,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "eSQ" = ( @@ -9835,8 +9621,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "eSY" = ( @@ -9892,8 +9677,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "eUh" = ( @@ -9934,8 +9718,7 @@ icon_state = "pottedplant_21"; layer = 3.1; name = "synthethic potted plant"; - pixel_y = 28; - tag = null + pixel_y = 28 }, /turf/open/floor/plating{ icon_state = "platebot" @@ -10088,20 +9871,17 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/n_rockies) "eZK" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "eZM" = ( /obj/structure/bed/chair/wood/normal{ - dir = 4; - tag = null + dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -10139,8 +9919,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "faK" = ( @@ -10217,8 +9996,7 @@ "fcd" = ( /obj/vehicle/train/cargo/trolley, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "fcv" = ( @@ -10227,8 +10005,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "fcV" = ( @@ -10285,8 +10062,7 @@ "fdT" = ( /obj/structure/closet/crate, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "fdZ" = ( @@ -10303,8 +10079,7 @@ /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "feF" = ( @@ -10318,8 +10093,7 @@ /area/lv522/atmos/east_reactor/west) "ffb" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "ffj" = ( @@ -10404,8 +10178,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "fhQ" = ( @@ -10422,8 +10195,7 @@ /obj/item/tool/pickaxe, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "fib" = ( @@ -10628,8 +10400,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "fmL" = ( @@ -10702,8 +10473,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "foX" = ( @@ -10712,13 +10482,11 @@ pixel_y = 16 }, /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "fpl" = ( @@ -10743,8 +10511,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "fpB" = ( @@ -10785,8 +10552,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms/glass) "frc" = ( @@ -10899,8 +10665,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ftK" = ( @@ -11076,8 +10841,7 @@ "fxl" = ( /obj/vehicle/train/cargo/engine, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "fxq" = ( @@ -11121,8 +10885,7 @@ /obj/structure/barricade/wooden, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "fzf" = ( @@ -11260,8 +11023,8 @@ }, /area/lv522/outdoors/colony_streets/east_central_street) "fBL" = ( -/obj/structure/machinery/landinglight/ds1, /obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1/delaytwo, /turf/open/floor/prison{ dir = 4; icon_state = "greenfull" @@ -11294,8 +11057,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/kitchen/glass) "fCE" = ( @@ -11325,8 +11087,7 @@ "fCU" = ( /obj/effect/decal/cleanable/blood{ desc = "Watch your step."; - icon_state = "gib6"; - tag = null + icon_state = "gib6" }, /turf/open/asphalt/cement{ icon_state = "cement12" @@ -11334,8 +11095,7 @@ /area/lv522/outdoors/colony_streets/south_west_street) "fCW" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) "fDg" = ( @@ -11457,8 +11217,7 @@ pixel_y = 13 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "fEY" = ( @@ -11590,15 +11349,13 @@ "fIr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "fIx" = ( /obj/structure/closet/emcloset, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "fII" = ( @@ -11701,8 +11458,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "fLF" = ( @@ -11807,8 +11563,7 @@ pixel_y = 10 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "fMT" = ( @@ -11831,8 +11586,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "fOc" = ( @@ -11846,8 +11600,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "fOl" = ( @@ -11871,8 +11624,7 @@ "fOX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "fPa" = ( @@ -11894,8 +11646,7 @@ /obj/structure/bed/chair, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "fPH" = ( @@ -11923,15 +11674,13 @@ pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "fRc" = ( /obj/structure/machinery/mill, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "fRd" = ( @@ -11961,7 +11710,6 @@ /area/lv522/indoors/a_block/admin) "fRP" = ( /obj/structure/prop/vehicles/crawler{ - density = 1; layer = 3.3 }, /obj/structure/barricade/wooden{ @@ -11987,8 +11735,8 @@ }, /area/lv522/atmos/east_reactor/east) "fSo" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, /obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1, /turf/open/floor/prison{ dir = 4; icon_state = "greenfull" @@ -12004,8 +11752,7 @@ "fSv" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "fSR" = ( @@ -12015,8 +11762,7 @@ icon_state = "pottedplant_21"; layer = 3.1; name = "synthethic potted plant"; - pixel_y = 12; - tag = null + pixel_y = 12 }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -12051,8 +11797,7 @@ icon_state = "p_stair_full" }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "fTs" = ( @@ -12127,8 +11872,7 @@ /obj/structure/closet, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "fVU" = ( @@ -12164,8 +11908,7 @@ /obj/structure/machinery/vending/snack, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "fXn" = ( @@ -12213,8 +11956,7 @@ "fXS" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "fXU" = ( @@ -12254,8 +11996,7 @@ /obj/item/clothing/glasses/meson, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "fYD" = ( @@ -12282,8 +12023,7 @@ "fZd" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/t_comm) "fZy" = ( @@ -12304,8 +12044,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/c_block/mining) "gat" = ( @@ -12323,8 +12062,7 @@ /obj/item/prop/alien/hugger, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "gaS" = ( @@ -12349,8 +12087,7 @@ /obj/structure/machinery/recharge_station, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "gbk" = ( @@ -12453,8 +12190,7 @@ /obj/structure/foamed_metal, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms/glass) "gcO" = ( @@ -12568,8 +12304,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "geH" = ( @@ -12626,15 +12361,13 @@ "ggj" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "ggp" = ( /obj/structure/machinery/floodlight, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "ggH" = ( @@ -12693,8 +12426,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "ghy" = ( @@ -12767,8 +12499,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/t_comm) "gjV" = ( @@ -12813,8 +12544,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "gkY" = ( @@ -12895,15 +12625,13 @@ /obj/effect/landmark/objective_landmark/close, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "gny" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges) "gnA" = ( @@ -12929,8 +12657,7 @@ "gou" = ( /turf/open/floor/prison{ dir = 9; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "goK" = ( @@ -12969,8 +12696,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "goT" = ( @@ -12984,8 +12710,7 @@ /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "gpp" = ( @@ -12994,8 +12719,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "gpu" = ( @@ -13138,8 +12862,7 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "gts" = ( @@ -13158,8 +12881,7 @@ pixel_y = 20 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "gug" = ( @@ -13202,8 +12924,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "guR" = ( @@ -13292,7 +13013,6 @@ /area/lv522/indoors/c_block/cargo) "gwR" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ - locked = 0; name = "\improper Marshal Office Holding Cell" }, /obj/structure/pipes/standard/simple/hidden/green{ @@ -13339,8 +13059,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "gxE" = ( @@ -13505,8 +13224,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "gCE" = ( @@ -13554,15 +13272,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/kitchen/glass) "gDA" = ( /obj/structure/platform, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "gDL" = ( @@ -13593,7 +13309,6 @@ "gEA" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ dir = 8; - locked = 0; name = "\improper Marshall Head Office" }, /obj/structure/pipes/standard/simple/hidden/green{ @@ -13627,8 +13342,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "gES" = ( @@ -13705,8 +13419,7 @@ pixel_y = 18 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "gGk" = ( @@ -13789,8 +13502,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "gIa" = ( @@ -13858,8 +13570,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "gJM" = ( @@ -13869,8 +13580,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "gKg" = ( @@ -14011,8 +13721,7 @@ /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "gNe" = ( @@ -14148,8 +13857,7 @@ /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "gPQ" = ( @@ -14201,8 +13909,7 @@ "gRp" = ( /obj/structure/machinery/floodlight/landing, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "gRs" = ( @@ -14233,8 +13940,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "gRV" = ( @@ -14260,8 +13966,7 @@ layer = 3.1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "gTw" = ( @@ -14290,8 +13995,7 @@ /obj/structure/ore_box, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "gUi" = ( @@ -14332,8 +14036,7 @@ /obj/structure/machinery/recharge_station, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "gUQ" = ( @@ -14405,8 +14108,7 @@ "gWh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "gWq" = ( @@ -14422,8 +14124,7 @@ pixel_x = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "gWI" = ( @@ -14532,8 +14233,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "gYM" = ( @@ -14545,14 +14245,12 @@ /area/lv522/atmos/cargo_intake) "gYO" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "gYT" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/command_centre) @@ -14580,8 +14278,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "gZh" = ( @@ -14605,8 +14302,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "gZL" = ( @@ -14626,8 +14322,8 @@ }, /area/lv522/indoors/b_block/bridge) "haf" = ( -/obj/structure/machinery/landinglight/ds1, /obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1/delaytwo, /turf/open/floor/plating, /area/lv522/landing_zone_1) "hag" = ( @@ -14639,8 +14335,7 @@ /area/lv522/indoors/a_block/admin) "hai" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ icon_state = "plate" @@ -14728,8 +14423,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "hbu" = ( @@ -14742,15 +14436,13 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "hbF" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ dir = 9; @@ -14792,8 +14484,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "hcx" = ( @@ -14848,8 +14539,7 @@ "hdq" = ( /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "hds" = ( @@ -14904,8 +14594,7 @@ "heC" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "heF" = ( @@ -15081,8 +14770,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "hiB" = ( @@ -15169,8 +14857,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "hku" = ( @@ -15193,8 +14880,7 @@ pixel_y = 3 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "hkw" = ( @@ -15295,8 +14981,7 @@ /obj/structure/surface/table/almayer, /obj/item/device/binoculars, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "hlH" = ( @@ -15378,8 +15063,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "hnD" = ( @@ -15446,8 +15130,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "hoZ" = ( @@ -15465,8 +15148,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "hpq" = ( @@ -15483,8 +15165,7 @@ "hpH" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "hpO" = ( @@ -15523,13 +15204,6 @@ icon_state = "browncorner" }, /area/lv522/atmos/command_centre) -"hqY" = ( -/obj/effect/decal/warning_stripes, -/obj/structure/machinery/landinglight/ds1{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1) "hqZ" = ( /obj/structure/bed/chair/wheelchair, /turf/open/auto_turf/shale/layer1, @@ -15550,8 +15224,7 @@ pixel_y = 3 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "hry" = ( @@ -15566,8 +15239,7 @@ "hrU" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "hsh" = ( @@ -15580,8 +15252,7 @@ /obj/structure/machinery/floodlight, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "hsA" = ( @@ -15598,8 +15269,7 @@ }, /turf/open/floor/plating{ dir = 8; - icon_state = "platingdmg3"; - tag = null + icon_state = "platingdmg3" }, /area/lv522/indoors/a_block/admin) "htu" = ( @@ -15662,8 +15332,7 @@ "huF" = ( /obj/structure/machinery/space_heater/radiator/red, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "huN" = ( @@ -15806,8 +15475,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "hyE" = ( @@ -15833,15 +15501,13 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "hzc" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "hzk" = ( @@ -15863,8 +15529,7 @@ /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "hzA" = ( @@ -15885,8 +15550,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "hzO" = ( @@ -15980,8 +15644,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "hAK" = ( @@ -15994,8 +15657,7 @@ /obj/item/weapon/gun/boltaction, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "hBf" = ( @@ -16013,8 +15675,7 @@ /obj/structure/dispenser/oxygen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "hBB" = ( @@ -16141,8 +15802,7 @@ /area/lv522/indoors/c_block/mining) "hFm" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin4"; - tag = null + icon_state = "rasputin4" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "hFu" = ( @@ -16154,8 +15814,7 @@ "hFG" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "hFL" = ( @@ -16211,8 +15870,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "hHN" = ( @@ -16230,8 +15888,7 @@ /area/lv522/atmos/command_centre) "hIf" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "hIp" = ( @@ -16252,8 +15909,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "hID" = ( @@ -16287,8 +15943,7 @@ }, /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "hJq" = ( @@ -16327,8 +15982,7 @@ /obj/item/explosive/plastic, /obj/item/explosive/plastic, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) "hJZ" = ( @@ -16348,15 +16002,13 @@ /obj/item/trash/ceramic_plate, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "hKy" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "hKz" = ( @@ -16395,8 +16047,7 @@ layer = 3.1; name = "synthethic potted plant"; pixel_x = -2; - pixel_y = 10; - tag = null + pixel_y = 10 }, /turf/open/floor/prison{ dir = 9; @@ -16409,8 +16060,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "hLl" = ( @@ -16420,8 +16070,7 @@ }, /turf/open/floor/prison{ dir = 8; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) "hLm" = ( @@ -16475,8 +16124,7 @@ /obj/item/clothing/glasses/kutjevo, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "hMz" = ( @@ -16567,8 +16215,7 @@ /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "hOl" = ( @@ -16699,8 +16346,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/nw_rockies) "hQE" = ( @@ -16753,8 +16399,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "hRG" = ( @@ -16796,13 +16441,11 @@ "hTd" = ( /obj/structure/window/reinforced{ dir = 1; - layer = 3; - tag = null + layer = 3 }, /obj/structure/machinery/computer3/server/rack, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/command_centre) "hTe" = ( @@ -16849,8 +16492,7 @@ pixel_x = -4 }, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "hTW" = ( @@ -16878,8 +16520,7 @@ /obj/structure/foamed_metal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "hUq" = ( @@ -16888,8 +16529,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "hUM" = ( @@ -16915,8 +16555,7 @@ }, /obj/structure/prop/almayer/computers/sensor_computer1, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "hUZ" = ( @@ -16941,8 +16580,7 @@ "hVk" = ( /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "hVu" = ( @@ -16995,8 +16633,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/casino) "hWV" = ( @@ -17088,14 +16725,12 @@ name = "weak acid" }, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "hYf" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "hYk" = ( @@ -17104,8 +16739,7 @@ }, /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "hYn" = ( @@ -17160,8 +16794,7 @@ pixel_x = -4 }, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "hZK" = ( @@ -17172,14 +16805,12 @@ pixel_x = -16 }, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "hZL" = ( /obj/structure/bed/chair/wood/normal{ - dir = 4; - tag = null + dir = 4 }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -17213,8 +16844,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/oob) "iam" = ( @@ -17316,8 +16946,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "idq" = ( @@ -17365,8 +16994,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "iel" = ( @@ -17378,8 +17006,7 @@ /area/lv522/oob) "ier" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ dir = 9; @@ -17450,8 +17077,7 @@ /area/lv522/outdoors/colony_streets/north_east_street) "igp" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ dir = 1; @@ -17519,8 +17145,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "ihy" = ( @@ -17537,8 +17162,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "iiz" = ( @@ -17628,8 +17252,7 @@ /area/lv522/indoors/a_block/corpo/glass) "ijJ" = ( /obj/structure/machinery/light{ - dir = 4; - tag = null + dir = 4 }, /obj/structure/machinery/disposal, /turf/open/floor/strata{ @@ -17736,8 +17359,7 @@ /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "imh" = ( @@ -17764,8 +17386,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges/dorms_fitness) "imT" = ( @@ -17824,8 +17445,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "ipf" = ( @@ -17934,8 +17554,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "irx" = ( @@ -17970,16 +17589,14 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "iso" = ( /obj/structure/cargo_container/lockmart/left, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "iss" = ( @@ -18020,8 +17637,7 @@ "isG" = ( /obj/structure/largecrate/random/barrel, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "iti" = ( @@ -18097,8 +17713,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "iuv" = ( @@ -18152,8 +17767,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ivk" = ( @@ -18187,8 +17801,7 @@ pixel_y = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "iwb" = ( @@ -18297,8 +17910,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "iyC" = ( @@ -18349,8 +17961,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/garage) "izz" = ( @@ -18387,8 +17998,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "iAZ" = ( @@ -18422,8 +18032,7 @@ /obj/item/clothing/under/overalls, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "iBr" = ( @@ -18452,8 +18061,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/bed/chair, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/t_comm) "iBY" = ( @@ -18487,8 +18095,7 @@ /obj/effect/landmark/survivor_spawner, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "iCR" = ( @@ -18509,8 +18116,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "iDg" = ( @@ -18551,8 +18157,7 @@ /obj/structure/cargo_container/lockmart/mid, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "iFB" = ( @@ -18566,16 +18171,14 @@ /obj/item/explosive/mine/active, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "iFO" = ( /obj/structure/surface/rack, /obj/item/clothing/under/colonist, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "iFV" = ( @@ -18616,8 +18219,7 @@ "iGr" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "iGD" = ( @@ -18650,8 +18252,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "iGM" = ( @@ -18694,8 +18295,7 @@ name = "inventory computer" }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "iHw" = ( @@ -18958,8 +18558,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "iMS" = ( @@ -18976,8 +18575,7 @@ /obj/structure/machinery/space_heater, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "iNb" = ( @@ -19005,8 +18603,7 @@ "iNX" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security/glass) "iOi" = ( @@ -19062,8 +18659,7 @@ /obj/structure/cargo_container/lockmart/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "iPu" = ( @@ -19177,8 +18773,7 @@ /area/lv522/atmos/east_reactor) "iSc" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ dir = 5; @@ -19191,8 +18786,7 @@ /area/lv522/outdoors/colony_streets/north_west_street) "iSu" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin8"; - tag = null + icon_state = "rasputin8" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "iSF" = ( @@ -19213,9 +18807,7 @@ }, /area/lv522/indoors/c_block/mining) "iTn" = ( -/obj/structure/bed/chair/comfy{ - tag = null - }, +/obj/structure/bed/chair/comfy, /turf/open/floor/corsat{ dir = 10; icon_state = "brown" @@ -19250,16 +18842,14 @@ /obj/structure/surface/rack, /obj/item/clothing/suit/storage/hazardvest, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) "iUj" = ( /obj/item/prop/colony/used_flare, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "iUk" = ( @@ -19274,8 +18864,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 6; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "iUT" = ( @@ -19307,9 +18896,7 @@ }, /area/lv522/indoors/a_block/hallway) "iVk" = ( -/obj/structure/bed/chair/comfy{ - tag = null - }, +/obj/structure/bed/chair/comfy, /turf/open/floor/corsat{ dir = 6; icon_state = "brown" @@ -19331,8 +18918,7 @@ pixel_x = 6 }, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/indoors/a_block/admin) "iVU" = ( @@ -19362,8 +18948,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/oob) "iWh" = ( @@ -19383,8 +18968,7 @@ /obj/structure/foamed_metal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "iWu" = ( @@ -19393,8 +18977,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/oob) "iWy" = ( @@ -19628,15 +19211,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "jbm" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "jbn" = ( @@ -19687,8 +19268,7 @@ /area/lv522/outdoors/nw_rockies) "jbO" = ( /obj/structure/pipes/standard/simple/visible{ - dir = 6; - tag = null + dir = 6 }, /turf/open/floor/strata{ icon_state = "white_cyan3" @@ -19728,8 +19308,7 @@ }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "jdf" = ( @@ -19737,8 +19316,7 @@ /obj/effect/landmark/static_comms/net_two, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/c_block/t_comm) "jdl" = ( @@ -19757,8 +19335,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/t_comm) "jdq" = ( @@ -19804,8 +19381,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "jey" = ( @@ -19828,8 +19404,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "jeI" = ( @@ -19843,8 +19418,7 @@ "jeJ" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "jft" = ( @@ -19881,8 +19455,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "jgV" = ( @@ -19905,8 +19478,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "jhl" = ( @@ -19916,7 +19488,6 @@ /area/lv522/indoors/a_block/dorms) "jhp" = ( /obj/structure/prop/invuln/lifeboat_hatch_placeholder/terminal{ - icon_state = "closed"; layer = 2.1 }, /obj/structure/barricade/handrail{ @@ -19975,8 +19546,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/oob) "jis" = ( @@ -19985,8 +19555,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/oob) "jix" = ( @@ -20000,8 +19569,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "jiF" = ( @@ -20062,8 +19630,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "jjo" = ( @@ -20172,8 +19739,7 @@ /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "jlc" = ( @@ -20231,8 +19797,7 @@ pixel_y = 5 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "jmd" = ( @@ -20291,8 +19856,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "jnb" = ( @@ -20332,8 +19896,7 @@ /obj/structure/machinery/floodlight, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "jnB" = ( @@ -20398,8 +19961,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "jpa" = ( @@ -20482,8 +20044,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "jru" = ( @@ -20527,8 +20088,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "jrL" = ( @@ -20540,8 +20100,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "jrT" = ( @@ -20619,8 +20178,7 @@ "jub" = ( /obj/structure/machinery/floodlight, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "jud" = ( @@ -20628,8 +20186,7 @@ dir = 1 }, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/indoors/a_block/admin) "jur" = ( @@ -20719,8 +20276,7 @@ "jvG" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "jwM" = ( @@ -20810,8 +20366,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "jyF" = ( @@ -20820,8 +20375,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "jyM" = ( @@ -20938,8 +20492,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "jBw" = ( @@ -21004,8 +20557,7 @@ /area/lv522/landing_zone_1/tunnel) "jCq" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ icon_state = "squares" @@ -21161,8 +20713,7 @@ /area/lv522/atmos/east_reactor/south) "jFu" = ( /obj/structure/morgue{ - dir = 8; - tag = null + dir = 8 }, /turf/open/floor/strata{ dir = 4; @@ -21173,8 +20724,7 @@ /obj/structure/machinery/space_heater, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "jFG" = ( @@ -21249,8 +20799,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "jHy" = ( @@ -21294,15 +20843,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "jII" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/n_rockies) "jIQ" = ( @@ -21342,8 +20889,7 @@ pixel_y = 27 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "jJi" = ( @@ -21389,8 +20935,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "jKm" = ( @@ -21435,8 +20980,7 @@ "jLk" = ( /obj/structure/cargo_container/wy/left, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "jLD" = ( @@ -21445,8 +20989,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "jLF" = ( @@ -21522,8 +21065,7 @@ "jNk" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; - name = "\improper Westlock"; - welded = null + name = "\improper Westlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -21544,8 +21086,7 @@ layer = 3.1; name = "synthethic potted plant"; pixel_x = -2; - pixel_y = 16; - tag = null + pixel_y = 16 }, /turf/open/floor/prison{ dir = 1; @@ -21583,8 +21124,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "jOw" = ( @@ -21649,8 +21189,7 @@ }, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "jPk" = ( @@ -21686,8 +21225,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/engineering) "jQa" = ( @@ -21748,16 +21286,14 @@ /obj/structure/machinery/disposal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "jSG" = ( /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/engineering) "jSR" = ( @@ -21806,8 +21342,7 @@ "jTr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "jTx" = ( @@ -21840,8 +21375,7 @@ "jTJ" = ( /obj/structure/cargo_container/watatsumi/leftmid, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "jTS" = ( @@ -21849,8 +21383,7 @@ /obj/item/circuitboard/apc, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "jUe" = ( @@ -21862,8 +21395,7 @@ "jUk" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "jUn" = ( @@ -21878,24 +21410,21 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/n_rockies) "jUy" = ( /obj/structure/machinery/power/port_gen/pacman/super, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "jUI" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "jUO" = ( @@ -21946,8 +21475,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "jVC" = ( @@ -22015,8 +21543,7 @@ }, /turf/open/floor/prison{ dir = 8; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "jXc" = ( @@ -22051,8 +21578,7 @@ pixel_y = 6 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "jYr" = ( @@ -22114,8 +21640,7 @@ /obj/structure/cargo_container/watatsumi/leftmid, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "jZo" = ( @@ -22127,8 +21652,7 @@ "jZA" = ( /obj/item/prop/colony/used_flare, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "jZD" = ( @@ -22324,8 +21848,7 @@ /area/lv522/landing_zone_2) "kcS" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kdi" = ( @@ -22337,8 +21860,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "kdm" = ( @@ -22364,8 +21886,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "kdx" = ( @@ -22427,8 +21948,7 @@ /obj/structure/closet/toolcloset, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "kfq" = ( @@ -22444,8 +21964,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "kfu" = ( @@ -22536,8 +22055,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "khd" = ( @@ -22547,8 +22065,7 @@ /obj/structure/prop/server_equipment, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "kho" = ( @@ -22606,8 +22123,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "kih" = ( @@ -22642,8 +22158,7 @@ icon_state = "medium" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "kiG" = ( @@ -22671,8 +22186,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kiY" = ( @@ -22686,8 +22200,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "kjj" = ( @@ -22754,20 +22267,17 @@ icon_state = "pottedplant_21"; layer = 3.1; name = "synthethic potted plant"; - pixel_y = 14; - tag = null + pixel_y = 14 }, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kkP" = ( /obj/structure/surface/rack, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "kkS" = ( @@ -22789,8 +22299,7 @@ "klj" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/atmos/outdoor) "kll" = ( @@ -22805,8 +22314,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "klx" = ( @@ -22894,8 +22402,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "kmH" = ( @@ -22931,8 +22438,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kne" = ( @@ -22965,8 +22471,7 @@ }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "knS" = ( @@ -23012,8 +22517,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "koG" = ( @@ -23021,8 +22525,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges/corpo) "koM" = ( @@ -23054,8 +22557,7 @@ }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "kpB" = ( @@ -23178,8 +22680,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "ksf" = ( @@ -23223,8 +22724,7 @@ }, /obj/structure/platform_decoration{ dir = 10; - layer = 3.51; - tag = null + layer = 3.51 }, /turf/open/floor/plating, /area/lv522/oob) @@ -23268,8 +22768,7 @@ /obj/structure/surface/table/almayer, /obj/item/device/camera, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "kup" = ( @@ -23320,8 +22819,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "kwc" = ( @@ -23350,8 +22848,7 @@ }, /obj/structure/platform_decoration{ dir = 6; - layer = 3.51; - tag = null + layer = 3.51 }, /turf/open/floor/plating, /area/lv522/oob) @@ -23400,16 +22897,14 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "kxW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "kyb" = ( @@ -23525,8 +23020,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "kAj" = ( @@ -23641,8 +23135,7 @@ /obj/effect/landmark/objective_landmark/close, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "kCf" = ( @@ -23654,8 +23147,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "kCC" = ( @@ -23667,8 +23159,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "kCD" = ( @@ -23711,15 +23202,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kDH" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kDQ" = ( @@ -23762,8 +23251,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "kEl" = ( @@ -23967,8 +23455,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "kIj" = ( @@ -23984,8 +23471,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "kIM" = ( @@ -24037,8 +23523,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kJh" = ( @@ -24064,8 +23549,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/oob) "kKc" = ( @@ -24113,8 +23597,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kLk" = ( @@ -24215,8 +23698,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) "kNL" = ( @@ -24224,8 +23706,7 @@ /obj/item/clothing/gloves/yellow, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "kNM" = ( @@ -24243,8 +23724,7 @@ /obj/structure/closet/crate/explosives, /obj/item/storage/box/explosive_mines, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "kOa" = ( @@ -24260,16 +23740,14 @@ pixel_y = -9 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/t_comm) "kOz" = ( /obj/structure/machinery/vending/cigarette/colony, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "kOE" = ( @@ -24312,8 +23790,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "kPG" = ( @@ -24350,8 +23827,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "kPV" = ( @@ -24360,15 +23836,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kQc" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "kQw" = ( @@ -24506,8 +23980,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "kRZ" = ( @@ -24525,8 +23998,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "kSm" = ( @@ -24574,8 +24046,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "kSZ" = ( @@ -24604,8 +24075,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security/glass) "kTn" = ( @@ -24618,8 +24088,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "kTF" = ( @@ -24640,15 +24109,13 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "kUf" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "kUo" = ( @@ -24711,8 +24178,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "kVG" = ( @@ -24757,8 +24223,7 @@ /obj/structure/pipes/standard/manifold/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kWp" = ( @@ -24789,20 +24254,17 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kXa" = ( /obj/structure/window/reinforced{ dir = 1; - layer = 3; - tag = null + layer = 3 }, /obj/structure/machinery/computer3/server/rack, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor/south) "kXc" = ( @@ -24886,8 +24348,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "kYM" = ( @@ -24997,8 +24458,7 @@ icon_state = "medium" }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "lbo" = ( @@ -25046,8 +24506,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/atmos/outdoor) "lcK" = ( @@ -25082,8 +24541,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ldg" = ( @@ -25091,8 +24549,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "ldu" = ( @@ -25135,8 +24592,7 @@ "leg" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness/glass) "leh" = ( @@ -25150,15 +24606,13 @@ "lek" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "lel" = ( /obj/structure/machinery/floodlight, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "lep" = ( @@ -25185,8 +24639,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "leO" = ( @@ -25257,8 +24710,7 @@ /obj/effect/decal/cleanable/blood/xeno, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "lhC" = ( @@ -25279,8 +24731,7 @@ /obj/structure/cargo_container/hd/left/alt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "lhI" = ( @@ -25289,8 +24740,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "lhK" = ( @@ -25309,16 +24759,14 @@ /area/lv522/indoors/a_block/medical) "lhT" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) "liD" = ( /obj/item/prop/alien/hugger, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "liN" = ( @@ -25399,8 +24847,7 @@ /obj/effect/decal/cleanable/blood/drip, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/kitchen) "llJ" = ( @@ -25453,8 +24900,7 @@ layer = 3.1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "lmu" = ( @@ -25478,8 +24924,7 @@ /obj/item/folder/black_random, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "lmF" = ( @@ -25498,8 +24943,7 @@ stat = 2 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "lmJ" = ( @@ -25546,8 +24990,7 @@ /obj/structure/surface/table/almayer, /obj/item/ore/gold, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "lnL" = ( @@ -25617,8 +25060,7 @@ /obj/structure/cargo_container/watatsumi/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "lpH" = ( @@ -25671,8 +25113,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) "lrG" = ( @@ -25725,8 +25166,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "ltf" = ( @@ -25750,8 +25190,7 @@ /area/lv522/indoors/a_block/dorms) "ltI" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Westlock"; - welded = null + name = "\improper Westlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -25813,8 +25252,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/nw_rockies) "lvX" = ( @@ -25854,8 +25292,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "lwW" = ( @@ -25890,8 +25327,7 @@ /obj/structure/surface/table/almayer, /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "lxI" = ( @@ -25956,8 +25392,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "lzk" = ( @@ -25986,8 +25421,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2/dynamic, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "lzB" = ( @@ -26022,8 +25456,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "lAj" = ( @@ -26032,8 +25465,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "lAk" = ( @@ -26053,8 +25485,7 @@ /area/lv522/indoors/a_block/fitness/glass) "lAn" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "lAD" = ( @@ -26077,8 +25508,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "lBl" = ( @@ -26168,8 +25598,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "lDc" = ( @@ -26242,14 +25671,12 @@ pixel_y = 3 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "lEF" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/bridges/dorms_fitness) "lER" = ( @@ -26289,8 +25716,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "lGx" = ( @@ -26385,8 +25811,7 @@ "lHH" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "lHL" = ( @@ -26416,8 +25841,7 @@ "lId" = ( /obj/structure/largecrate/random/barrel, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "lIB" = ( @@ -26484,8 +25908,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "lKl" = ( @@ -26504,8 +25927,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "lKC" = ( @@ -26522,8 +25944,7 @@ /obj/effect/landmark/survivor_spawner/lv522_forecon_marksman, /turf/open/floor/plating{ dir = 8; - icon_state = "platingdmg3"; - tag = null + icon_state = "platingdmg3" }, /area/lv522/indoors/a_block/admin) "lKH" = ( @@ -26547,8 +25968,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "lMH" = ( @@ -26592,7 +26012,6 @@ "lNb" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 8; - locked = 0; name = "\improper Wildcatters Office"; panel_open = 1 }, @@ -26706,8 +26125,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "lPY" = ( @@ -26747,8 +26165,7 @@ pixel_y = 3 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "lRF" = ( @@ -26843,14 +26260,12 @@ /obj/effect/landmark/static_comms/net_one, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "lUi" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -26946,8 +26361,7 @@ "lVV" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "lVY" = ( @@ -26956,8 +26370,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "lVZ" = ( @@ -27047,8 +26460,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "lYR" = ( @@ -27279,8 +26691,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "mdD" = ( @@ -27317,8 +26728,7 @@ /area/lv522/atmos/filt) "meq" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms/glass) "mev" = ( @@ -27439,8 +26849,7 @@ "miW" = ( /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "miZ" = ( @@ -27452,7 +26861,6 @@ /area/lv522/outdoors/colony_streets/south_east_street) "mji" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - locked = 0; name = "\improper Corporation Dome"; req_access_txt = "100" }, @@ -27494,8 +26902,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "mjT" = ( @@ -27586,8 +26993,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "mlE" = ( @@ -27615,8 +27021,7 @@ pixel_y = 6 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "mlQ" = ( @@ -27663,8 +27068,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "mmw" = ( @@ -27722,16 +27126,14 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "mnN" = ( /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "mnX" = ( @@ -28054,8 +27456,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "mwp" = ( @@ -28090,8 +27491,7 @@ /obj/item/tool/pickaxe, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "mxp" = ( @@ -28107,8 +27507,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/c_block/cargo) "mxz" = ( @@ -28150,8 +27549,7 @@ "myC" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "myE" = ( @@ -28241,8 +27639,7 @@ /area/lv522/outdoors/nw_rockies) "mBc" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -28273,8 +27670,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness/glass) "mCq" = ( @@ -28335,8 +27731,7 @@ /obj/structure/bed/chair, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "mEx" = ( @@ -28361,8 +27756,7 @@ /obj/structure/cargo_container/grant/left, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "mFm" = ( @@ -28412,8 +27806,7 @@ /obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/nw_rockies) "mGN" = ( @@ -28433,8 +27826,7 @@ "mHa" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms/glass) "mHo" = ( @@ -28482,8 +27874,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "mIU" = ( @@ -28578,8 +27969,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "mKN" = ( @@ -28596,8 +27986,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "mLp" = ( @@ -28669,8 +28058,7 @@ "mMQ" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "mMU" = ( @@ -28703,8 +28091,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "mNy" = ( @@ -28829,8 +28216,7 @@ }, /obj/structure/foamed_metal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "mPc" = ( @@ -28852,8 +28238,7 @@ "mPy" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "mPz" = ( @@ -28871,13 +28256,11 @@ "mPL" = ( /obj/structure/surface/rack, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "mPQ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - locked = 0; welded = 1 }, /obj/structure/pipes/standard/simple/hidden/green, @@ -28926,8 +28309,7 @@ pixel_y = 6 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "mQo" = ( @@ -28945,8 +28327,7 @@ /obj/item/prop/colony/used_flare, /turf/open/floor/prison{ dir = 5; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "mQw" = ( @@ -29038,8 +28419,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "mTd" = ( @@ -29051,8 +28431,7 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/outdoor) "mTx" = ( @@ -29138,8 +28517,7 @@ "mUG" = ( /obj/structure/platform_decoration, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "mUS" = ( @@ -29158,8 +28536,7 @@ "mVi" = ( /obj/structure/platform, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "mVj" = ( @@ -29205,8 +28582,7 @@ "mVH" = ( /obj/structure/surface/table/almayer, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "mWc" = ( @@ -29220,8 +28596,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "mWw" = ( @@ -29242,8 +28617,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "mXn" = ( @@ -29310,8 +28684,7 @@ "mZE" = ( /obj/structure/foamed_metal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "mZJ" = ( @@ -29369,8 +28742,7 @@ pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "naw" = ( @@ -29378,8 +28750,7 @@ current_rounds = 0 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "nax" = ( @@ -29417,8 +28788,8 @@ }, /area/lv522/indoors/a_block/hallway) "naS" = ( -/obj/structure/machinery/landinglight/ds1/delayone, /obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1/delaythree, /turf/open/floor/plating, /area/lv522/landing_zone_1) "naZ" = ( @@ -29442,8 +28813,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "nbj" = ( @@ -29458,8 +28828,7 @@ }, /turf/open/floor/plating{ dir = 8; - icon_state = "platingdmg3"; - tag = null + icon_state = "platingdmg3" }, /area/lv522/indoors/a_block/admin) "nbn" = ( @@ -29527,8 +28896,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "ncA" = ( @@ -29546,8 +28914,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/nw_rockies) "ndb" = ( @@ -29603,8 +28970,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "neO" = ( @@ -29650,8 +29016,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "nfm" = ( @@ -29709,8 +29074,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "ngL" = ( @@ -29729,10 +29093,10 @@ /turf/open/floor/plating, /area/lv522/atmos/filt) "nhi" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 4 }, -/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1) "nhs" = ( @@ -29791,8 +29155,7 @@ "niE" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "niL" = ( @@ -29832,8 +29195,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "njW" = ( @@ -29892,8 +29254,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "nlz" = ( @@ -29940,8 +29301,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nlV" = ( @@ -30166,8 +29526,7 @@ layer = 3.1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "npT" = ( @@ -30200,8 +29559,7 @@ "nqw" = ( /obj/structure/girder, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "nqy" = ( @@ -30251,8 +29609,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nrh" = ( @@ -30269,8 +29626,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nru" = ( @@ -30287,8 +29643,7 @@ /obj/structure/surface/rack, /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) "nrJ" = ( @@ -30343,8 +29698,7 @@ "nti" = ( /obj/structure/bed/chair, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "ntq" = ( @@ -30494,8 +29848,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nwR" = ( @@ -30515,8 +29868,7 @@ /obj/structure/platform_decoration, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "nxj" = ( @@ -30555,8 +29907,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "nyJ" = ( @@ -30572,8 +29923,7 @@ /obj/structure/surface/table/almayer, /obj/item/device/radio, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nzt" = ( @@ -30599,8 +29949,7 @@ "nzU" = ( /obj/structure/barricade/deployable, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "nzZ" = ( @@ -30844,21 +30193,18 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nHi" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "nHA" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "nHT" = ( @@ -30938,8 +30284,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) "nKk" = ( @@ -31031,8 +30376,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nLW" = ( @@ -31054,8 +30398,7 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "nMt" = ( @@ -31081,8 +30424,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nMC" = ( @@ -31093,8 +30435,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nMP" = ( @@ -31124,8 +30465,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nNh" = ( @@ -31152,8 +30492,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nNA" = ( @@ -31162,8 +30501,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "nNH" = ( @@ -31214,8 +30552,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nOl" = ( @@ -31228,8 +30565,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "nOB" = ( @@ -31240,8 +30576,7 @@ /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "nOS" = ( @@ -31256,8 +30591,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nOT" = ( @@ -31299,8 +30633,7 @@ icon_state = "pottedplant_21"; layer = 3.1; name = "synthethic potted plant"; - pixel_y = 14; - tag = null + pixel_y = 14 }, /turf/open/floor/prison{ icon_state = "darkredfull2" @@ -31384,8 +30717,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nRJ" = ( @@ -31484,6 +30816,7 @@ /area/lv522/indoors/a_block/dorm_north) "nTl" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -31566,8 +30899,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "nVh" = ( @@ -31604,16 +30936,14 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "nVW" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/fence, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/outdoor) "nVX" = ( @@ -31621,8 +30951,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "nWl" = ( @@ -31638,8 +30967,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nWp" = ( @@ -31658,8 +30986,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "nWq" = ( @@ -31714,8 +31041,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nXi" = ( @@ -31728,8 +31054,7 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "nXl" = ( @@ -31780,8 +31105,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "nXO" = ( @@ -31809,8 +31133,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/c_block/cargo) "nYv" = ( @@ -31840,8 +31163,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "nYU" = ( @@ -31889,14 +31211,12 @@ /obj/item/ore/uranium, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "nZF" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "oaa" = ( @@ -31917,8 +31237,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/central_streets) "oaq" = ( @@ -31984,8 +31303,7 @@ /obj/structure/machinery/telecomms/bus/preset_one, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "oce" = ( @@ -32020,8 +31338,7 @@ "odi" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "odt" = ( @@ -32070,8 +31387,7 @@ "odZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges/dorms_fitness) "oem" = ( @@ -32128,8 +31444,7 @@ }, /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "oeN" = ( @@ -32168,8 +31483,7 @@ "ofy" = ( /obj/structure/bed/chair/wood/normal{ dir = 4; - pixel_x = -9; - tag = null + pixel_x = -9 }, /turf/open/auto_turf/shale/layer0, /area/lv522/outdoors/colony_streets/central_streets) @@ -32183,8 +31497,7 @@ /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "ofX" = ( @@ -32206,23 +31519,20 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "oga" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "ogf" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) "ogA" = ( @@ -32324,8 +31634,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "ohX" = ( @@ -32390,8 +31699,7 @@ /obj/structure/prop/turbine_extras/border, /obj/structure/prop/turbine, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "oiP" = ( @@ -32407,8 +31715,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "oiW" = ( @@ -32468,8 +31775,7 @@ icon_state = "medium" }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ojy" = ( @@ -32483,8 +31789,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "okA" = ( @@ -32514,8 +31819,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "olz" = ( @@ -32604,15 +31908,13 @@ "oot" = ( /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "oow" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "ooG" = ( @@ -32680,8 +31982,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "oqp" = ( @@ -32740,8 +32041,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "ora" = ( @@ -32751,8 +32051,7 @@ layer = 3.1; name = "synthethic potted plant"; pixel_x = -17; - pixel_y = 9; - tag = null + pixel_y = 9 }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) @@ -32820,8 +32119,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "osN" = ( @@ -32833,16 +32131,14 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "osV" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "ote" = ( @@ -32944,8 +32240,7 @@ "ouI" = ( /obj/structure/cargo_container/kelland/right, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "ouO" = ( @@ -33038,8 +32333,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "oyf" = ( @@ -33115,8 +32409,7 @@ "ozw" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "ozF" = ( @@ -33188,8 +32481,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "oBf" = ( @@ -33243,8 +32535,7 @@ /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "oCt" = ( @@ -33280,8 +32571,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "oEw" = ( @@ -33334,8 +32624,7 @@ "oFU" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "oGl" = ( @@ -33345,15 +32634,13 @@ /obj/effect/decal/cleanable/liquid_fuel, /turf/open/floor/plating{ dir = 8; - icon_state = "platingdmg3"; - tag = null + icon_state = "platingdmg3" }, /area/lv522/indoors/a_block/kitchen/damage) "oGp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) "oGE" = ( @@ -33375,8 +32662,7 @@ pixel_y = -7 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "oGY" = ( @@ -33385,8 +32671,7 @@ pixel_y = 26 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "oGZ" = ( @@ -33401,8 +32686,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "oHl" = ( @@ -33421,8 +32705,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "oHB" = ( @@ -33445,8 +32728,7 @@ "oIr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms/glass) "oIu" = ( @@ -33468,8 +32750,7 @@ "oIP" = ( /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "oJj" = ( @@ -33505,8 +32786,7 @@ pixel_y = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "oJQ" = ( @@ -33553,8 +32833,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "oKG" = ( @@ -33587,8 +32866,7 @@ /obj/structure/machinery/autolathe, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "oKQ" = ( @@ -33703,8 +32981,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "oNe" = ( @@ -33725,15 +33002,13 @@ /obj/effect/decal/cleanable/dirt, /obj/item/storage/firstaid/adv/empty, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "oNM" = ( /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "oNQ" = ( @@ -33763,8 +33038,7 @@ /obj/structure/machinery/space_heater/radiator/red, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "oPs" = ( @@ -33806,8 +33080,7 @@ /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "oQs" = ( @@ -33848,15 +33121,13 @@ }, /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "oRr" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "oRt" = ( @@ -33867,8 +33138,7 @@ /obj/structure/machinery/light, /obj/structure/machinery/space_heater/radiator/red, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "oRG" = ( @@ -33918,8 +33188,7 @@ /area/lv522/outdoors/colony_streets/south_street) "oSH" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/bridges) "oSX" = ( @@ -33947,8 +33216,7 @@ /area/lv522/outdoors/colony_streets/north_west_street) "oTg" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "oTl" = ( @@ -33956,8 +33224,7 @@ /obj/effect/decal/cleanable/cobweb2/dynamic, /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "oTp" = ( @@ -33982,14 +33249,12 @@ /obj/structure/largecrate/random, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "oTI" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/hydro) "oTJ" = ( @@ -33998,16 +33263,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "oTL" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "oTX" = ( @@ -34045,8 +33308,7 @@ /obj/vehicle/train/cargo/trolley, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "oVk" = ( @@ -34093,8 +33355,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "oVS" = ( @@ -34107,8 +33368,7 @@ /obj/effect/landmark/static_comms/net_one, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/engineering) "oWq" = ( @@ -34122,8 +33382,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "oWK" = ( @@ -34268,15 +33527,13 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "paK" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "paT" = ( @@ -34305,16 +33562,14 @@ /obj/item/stack/sheet/wood, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "pck" = ( /obj/structure/largecrate/random/barrel/white, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "pcr" = ( @@ -34338,8 +33593,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "pcO" = ( @@ -34381,8 +33635,7 @@ stat = 2 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pdv" = ( @@ -34396,8 +33649,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "pdB" = ( @@ -34406,8 +33658,7 @@ }, /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pdF" = ( @@ -34417,8 +33668,7 @@ }, /obj/structure/machinery/light/small, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "pdO" = ( @@ -34493,8 +33743,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pfj" = ( @@ -34568,8 +33817,7 @@ /obj/item/prop/alien/hugger, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pfX" = ( @@ -34578,8 +33826,7 @@ /area/lv522/indoors/a_block/admin) "pgl" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/strata{ dir = 4; @@ -34611,8 +33858,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "pgs" = ( @@ -34622,8 +33868,7 @@ }, /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "pgt" = ( @@ -34644,16 +33889,14 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "pgL" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/outdoor) "pha" = ( @@ -34677,8 +33920,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "phn" = ( @@ -34761,8 +34003,7 @@ /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "pjT" = ( @@ -34791,15 +34032,13 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "pka" = ( /obj/structure/platform_decoration, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "pkB" = ( @@ -34836,8 +34075,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "pme" = ( @@ -34846,8 +34084,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "pmg" = ( @@ -34861,13 +34098,11 @@ /area/lv522/indoors/a_block/hallway) "png" = ( /obj/structure/cargo_container/wy/mid{ - health = 5000; - unacidable = 0 + health = 5000 }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "pni" = ( @@ -34878,8 +34113,7 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "pnu" = ( @@ -34940,8 +34174,7 @@ icon_state = "pottedplant_21"; layer = 3.1; name = "synthethic potted plant"; - pixel_y = 14; - tag = null + pixel_y = 14 }, /obj/effect/decal/cleanable/cobweb2, /obj/effect/spider/spiderling/nogrow, @@ -34968,8 +34201,7 @@ flipped = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ppD" = ( @@ -35006,8 +34238,7 @@ /obj/item/spacecash/c1000, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "pqA" = ( @@ -35022,8 +34253,7 @@ /obj/item/newspaper, /obj/item/tool/pen/blue/clicky, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "pqI" = ( @@ -35157,8 +34387,7 @@ /area/lv522/outdoors/colony_streets/south_east_street) "psT" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "ptc" = ( @@ -35174,8 +34403,7 @@ /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "ptU" = ( @@ -35202,8 +34430,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "puu" = ( @@ -35246,10 +34473,10 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "pvd" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1/delayone{ dir = 4 }, -/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 4; icon_state = "greenfull" @@ -35279,8 +34506,7 @@ }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "pwk" = ( @@ -35293,8 +34519,7 @@ /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "pwu" = ( @@ -35315,10 +34540,10 @@ }, /area/lv522/indoors/a_block/fitness) "pwH" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /obj/structure/machinery/landinglight/ds1/delayone{ dir = 8 }, -/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 4; icon_state = "greenfull" @@ -35328,8 +34553,7 @@ /obj/structure/prop/dam/crane/damaged, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) "pwW" = ( @@ -35377,8 +34601,7 @@ "pxS" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "pxY" = ( @@ -35459,8 +34682,7 @@ pixel_y = 15 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "pzo" = ( @@ -35471,8 +34693,7 @@ /obj/structure/barricade/wooden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "pzH" = ( @@ -35508,8 +34729,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pAW" = ( @@ -35532,8 +34752,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/miner, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "pBF" = ( @@ -35542,8 +34761,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pBK" = ( @@ -35564,15 +34782,13 @@ icon_state = "p_stair_full" }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "pBT" = ( /turf/open/floor/prison{ dir = 6; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "pCb" = ( @@ -35682,8 +34898,7 @@ "pDh" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "pDA" = ( @@ -35710,8 +34925,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pDU" = ( @@ -35736,8 +34950,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pEk" = ( @@ -35746,8 +34959,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "pEm" = ( @@ -35768,8 +34980,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pEs" = ( @@ -35781,8 +34992,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pEu" = ( @@ -35799,8 +35009,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pEA" = ( @@ -35831,8 +35040,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "pFH" = ( @@ -35885,8 +35093,7 @@ pixel_y = 5 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "pGY" = ( @@ -35912,8 +35119,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/bridges/dorms_fitness) "pIu" = ( @@ -35935,8 +35141,7 @@ pixel_y = 21 }, /obj/structure/bed/chair/dropship/pilot{ - dir = 1; - tag = null + dir = 1 }, /obj/structure/machinery/light/double{ dir = 1; @@ -35949,8 +35154,7 @@ pixel_y = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "pJd" = ( @@ -36001,8 +35205,7 @@ }, /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pJW" = ( @@ -36036,8 +35239,7 @@ pixel_y = 16 }, /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison{ dir = 1; @@ -36090,7 +35292,6 @@ "pLN" = ( /obj/structure/machinery/door/airlock/almayer/medical{ dir = 2; - locked = 0; name = "Medical Airlock" }, /obj/structure/pipes/standard/simple/hidden/green, @@ -36151,7 +35352,6 @@ "pMt" = ( /obj/structure/machinery/door/airlock/almayer/medical{ dir = 2; - locked = 0; name = "Medical Airlock" }, /turf/open/floor/corsat{ @@ -36259,8 +35459,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pON" = ( @@ -36284,8 +35483,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pPt" = ( @@ -36296,8 +35494,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pPC" = ( @@ -36313,8 +35510,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pPV" = ( @@ -36331,8 +35527,7 @@ "pQx" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "pQA" = ( @@ -36366,8 +35561,7 @@ /obj/structure/surface/table/almayer, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "pQQ" = ( @@ -36395,8 +35589,7 @@ /obj/item/clothing/gloves/black, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pRi" = ( @@ -36432,8 +35625,7 @@ /obj/effect/spawner/gibspawner/xeno, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) "pRT" = ( @@ -36470,7 +35662,6 @@ /area/lv522/indoors/a_block/dorms) "pTa" = ( /obj/structure/prop/vehicles/crawler{ - density = 1; layer = 3.1 }, /turf/open/asphalt/cement{ @@ -36480,8 +35671,7 @@ "pTj" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "pTl" = ( @@ -36494,15 +35684,13 @@ /obj/item/trash/plate, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pTH" = ( /obj/structure/machinery/door/airlock/hatch/cockpit/two, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "pTO" = ( @@ -36533,8 +35721,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pTW" = ( @@ -36556,8 +35743,7 @@ /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pUo" = ( @@ -36581,8 +35767,7 @@ "pVb" = ( /obj/item/prop/colony/used_flare, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "pVn" = ( @@ -36626,8 +35811,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "pVA" = ( @@ -36667,8 +35851,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "pWR" = ( @@ -36688,8 +35871,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "pWX" = ( @@ -36706,8 +35888,7 @@ /obj/structure/machinery/cell_charger, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "pXq" = ( @@ -36755,8 +35936,7 @@ /obj/vehicle/train/cargo/engine, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "pYj" = ( @@ -36802,8 +35982,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "pZb" = ( @@ -36858,8 +36037,7 @@ /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp/green, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qaT" = ( @@ -36898,8 +36076,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "qbD" = ( @@ -36991,8 +36168,7 @@ /obj/structure/machinery/photocopier, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "qda" = ( @@ -37051,8 +36227,7 @@ dir = 6 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qfu" = ( @@ -37106,8 +36281,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "qhm" = ( @@ -37136,8 +36310,7 @@ "qig" = ( /obj/structure/bed/chair/wood/normal{ dir = 4; - pixel_x = -8; - tag = null + pixel_x = -8 }, /turf/open/auto_turf/shale/layer0, /area/lv522/outdoors/colony_streets/central_streets) @@ -37162,8 +36335,7 @@ /obj/structure/machinery/recharger, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "qiC" = ( @@ -37191,8 +36363,7 @@ "qiJ" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qiN" = ( @@ -37213,8 +36384,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "qjr" = ( @@ -37269,8 +36439,7 @@ stat = 2 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "qkw" = ( @@ -37335,8 +36504,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qmr" = ( @@ -37355,8 +36523,7 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "qmD" = ( @@ -37369,8 +36536,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "qmM" = ( @@ -37396,7 +36562,6 @@ /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/overwatch/almayer/broken{ dir = 8; - layer = 2.98; pixel_x = -12; pixel_y = 1 }, @@ -37446,8 +36611,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "qnM" = ( @@ -37466,8 +36630,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "qnU" = ( @@ -37484,8 +36647,7 @@ }, /obj/effect/decal/cleanable/blood/splatter, /turf/open/shuttle/dropship{ - icon_state = "rasputin6"; - tag = null + icon_state = "rasputin6" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qnY" = ( @@ -37493,8 +36655,7 @@ /obj/item/prop/alien/hugger, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qot" = ( @@ -37509,14 +36670,12 @@ "qpc" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) "qpg" = ( /turf/open/shuttle/dropship{ - icon_state = "floor8"; - tag = null + icon_state = "floor8" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qpq" = ( @@ -37555,8 +36714,7 @@ /obj/structure/filingcabinet, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "qqk" = ( @@ -37604,8 +36762,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/garage) "qqS" = ( @@ -37613,8 +36770,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin7"; - tag = null + icon_state = "rasputin7" }, /area/lv522/outdoors/w_rockies) "qqW" = ( @@ -37639,8 +36795,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "qrj" = ( @@ -37652,8 +36807,7 @@ /area/lv522/outdoors/w_rockies) "qsd" = ( /obj/structure/pipes/standard/simple/visible{ - dir = 10; - tag = null + dir = 10 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata{ @@ -37707,8 +36861,7 @@ }, /obj/structure/machinery/light/small, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "qsU" = ( @@ -37716,8 +36869,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "qtc" = ( @@ -37736,8 +36888,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "qtl" = ( @@ -37813,15 +36964,13 @@ /obj/structure/largecrate, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "qvA" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "qvJ" = ( @@ -37833,8 +36982,7 @@ /obj/structure/cargo_container/grant/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "qvM" = ( @@ -37874,8 +37022,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qxf" = ( @@ -37939,8 +37086,7 @@ /obj/structure/machinery/microwave, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "qxF" = ( @@ -37978,8 +37124,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qyG" = ( @@ -38017,12 +37162,10 @@ /area/lv522/indoors/a_block/fitness/glass) "qzp" = ( /obj/structure/machinery/door/airlock/dropship_hatch/two{ - dir = 8; - locked = 0 + dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qzw" = ( @@ -38099,8 +37242,7 @@ "qAy" = ( /obj/item/toy/beach_ball, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges/dorms_fitness) "qAF" = ( @@ -38109,8 +37251,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "qAX" = ( @@ -38177,8 +37318,7 @@ /area/lv522/oob) "qBR" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Northlock"; - welded = null + name = "\improper Northlock" }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -38188,8 +37328,7 @@ "qBW" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "qCd" = ( @@ -38231,8 +37370,7 @@ pixel_y = -8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "qCL" = ( @@ -38335,8 +37473,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qET" = ( @@ -38393,8 +37530,7 @@ }, /obj/structure/barricade/wooden, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qGC" = ( @@ -38426,8 +37562,7 @@ "qHa" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qHg" = ( @@ -38496,8 +37631,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "qIJ" = ( @@ -38506,15 +37640,13 @@ }, /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "qJl" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qJp" = ( @@ -38545,8 +37677,7 @@ name = "\improper UA jacket" }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qJy" = ( @@ -38562,8 +37693,7 @@ "qJH" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "qJK" = ( @@ -38628,8 +37758,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "qLd" = ( @@ -38658,8 +37787,7 @@ "qLy" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "qLz" = ( @@ -38760,8 +37888,7 @@ /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "qNG" = ( @@ -38873,8 +38000,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "qOS" = ( @@ -38934,8 +38060,7 @@ /area/lv522/landing_zone_1/tunnel) "qPS" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - locked = 0 + dir = 1 }, /turf/open/floor/corsat{ icon_state = "marked" @@ -39054,8 +38179,7 @@ }, /turf/open/floor/prison{ dir = 8; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "qRB" = ( @@ -39096,8 +38220,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "qSj" = ( @@ -39116,8 +38239,7 @@ "qSu" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "qSw" = ( @@ -39143,8 +38265,7 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "qSP" = ( @@ -39173,8 +38294,7 @@ }, /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "qTh" = ( @@ -39264,8 +38384,7 @@ pixel_y = -15 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qUf" = ( @@ -39289,8 +38408,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qUh" = ( @@ -39321,8 +38439,7 @@ pixel_y = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qUL" = ( @@ -39352,8 +38469,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qVl" = ( @@ -39380,8 +38496,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "qWt" = ( @@ -39434,8 +38549,7 @@ }, /obj/structure/closet, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qXY" = ( @@ -39457,8 +38571,7 @@ }, /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "qYo" = ( @@ -39514,8 +38627,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "qZh" = ( @@ -39524,8 +38636,7 @@ /obj/effect/landmark/objective_landmark/medium, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qZu" = ( @@ -39567,8 +38678,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qZY" = ( @@ -39699,13 +38809,11 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "rbV" = ( /obj/structure/prop/vehicles/crawler{ - density = 1; dir = 8; layer = 3.1 }, @@ -39780,8 +38888,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "rdq" = ( @@ -39854,8 +38961,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "rex" = ( @@ -39884,8 +38990,7 @@ /area/lv522/indoors/a_block/dorm_north) "rfe" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges/corpo) "rfg" = ( @@ -39896,8 +39001,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "rfi" = ( @@ -39951,8 +39055,7 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "rfW" = ( @@ -39981,8 +39084,7 @@ "rgk" = ( /obj/structure/machinery/power/port_gen/pacman/mrs, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "rgA" = ( @@ -40007,8 +39109,7 @@ }, /obj/item/toy/farwadoll, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "rhh" = ( @@ -40018,19 +39119,18 @@ /obj/structure/bed/chair/wheelchair, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "rhk" = ( -/obj/structure/machinery/door/airlock/dropship_hatch/two{ - dir = 8 +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 4 }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" }, -/area/lv522/landing_zone_forecon/UD6_Typhoon) +/area/lv522/landing_zone_1) "rhz" = ( /obj/structure/pipes/standard/tank/oxygen{ dir = 1 @@ -40042,8 +39142,7 @@ /area/lv522/indoors/a_block/medical/glass) "rhB" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rhF" = ( @@ -40067,8 +39166,7 @@ current_rounds = 0 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rii" = ( @@ -40092,8 +39190,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "riZ" = ( @@ -40146,8 +39243,7 @@ /area/lv522/outdoors/colony_streets/east_central_street) "rjP" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rkd" = ( @@ -40163,8 +39259,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rkV" = ( @@ -40253,8 +39348,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "rng" = ( @@ -40273,8 +39367,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/n_rockies) "rnq" = ( @@ -40365,8 +39458,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "rpe" = ( @@ -40410,8 +39502,7 @@ /area/lv522/indoors/a_block/fitness) "rqn" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2) "rqs" = ( @@ -40422,8 +39513,7 @@ "rqA" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "rqP" = ( @@ -40450,8 +39540,7 @@ /obj/structure/machinery/disposal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "rrI" = ( @@ -40460,8 +39549,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "rrN" = ( @@ -40536,8 +39624,7 @@ pixel_y = 24 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rtr" = ( @@ -40574,8 +39661,7 @@ "rtX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "ruc" = ( @@ -40603,8 +39689,7 @@ "rus" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "ruv" = ( @@ -40637,8 +39722,7 @@ /obj/effect/landmark/objective_landmark/close, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "ruY" = ( @@ -40720,8 +39804,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "rwx" = ( @@ -40789,16 +39872,14 @@ /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/snacks/tofukabob, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rxo" = ( /obj/structure/surface/table/almayer, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "rxu" = ( @@ -40845,8 +39926,7 @@ "ryb" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "ryj" = ( @@ -40878,8 +39958,7 @@ /obj/item/ore/silver, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "ryv" = ( @@ -40916,8 +39995,7 @@ "ryW" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "rza" = ( @@ -40938,8 +40016,7 @@ /obj/structure/surface/table/almayer, /obj/item/storage/beer_pack, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rzR" = ( @@ -40963,8 +40040,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "rAt" = ( @@ -40993,8 +40069,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/bridges) "rAX" = ( @@ -41034,8 +40109,7 @@ /obj/structure/closet/secure_closet/atmos_personal, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "rCi" = ( @@ -41048,8 +40122,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rCE" = ( @@ -41082,8 +40155,7 @@ "rDb" = ( /obj/item/device/m56d_post, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rDu" = ( @@ -41098,8 +40170,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rDz" = ( @@ -41107,8 +40178,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rDM" = ( @@ -41116,8 +40186,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "rEc" = ( @@ -41139,8 +40208,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/t_comm) "rEo" = ( @@ -41171,8 +40239,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "rFp" = ( @@ -41202,8 +40269,7 @@ "rGm" = ( /obj/item/tool/weldingtool, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "rGD" = ( @@ -41221,8 +40287,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rHl" = ( @@ -41240,8 +40305,7 @@ pixel_y = 6 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rHX" = ( @@ -41268,8 +40332,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/outdoors/colony_streets/south_west_street) "rIn" = ( @@ -41279,8 +40342,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "rIr" = ( @@ -41300,16 +40362,14 @@ /obj/structure/machinery/disposal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "rIB" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "rIH" = ( @@ -41319,8 +40379,7 @@ pixel_y = 24 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rIM" = ( @@ -41340,8 +40399,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rJf" = ( @@ -41358,8 +40416,7 @@ /obj/structure/surface/rack, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "rJv" = ( @@ -41406,8 +40463,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "rKg" = ( @@ -41431,8 +40487,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "rKW" = ( @@ -41548,8 +40603,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "rMr" = ( @@ -41590,8 +40644,7 @@ "rNs" = ( /obj/item/stack/sheet/wood, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "rNv" = ( @@ -41627,8 +40680,7 @@ /area/lv522/indoors/c_block/cargo) "rOb" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "rOf" = ( @@ -41661,8 +40713,7 @@ }, /obj/structure/platform_decoration{ dir = 6; - layer = 3.51; - tag = null + layer = 3.51 }, /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/asphalt/cement, @@ -41715,8 +40766,7 @@ "rQd" = ( /obj/structure/closet/secure_closet/quartermaster, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "rQg" = ( @@ -41767,8 +40817,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rRr" = ( @@ -41795,8 +40844,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "rRJ" = ( @@ -41814,8 +40862,7 @@ pixel_y = 2 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/t_comm) "rRP" = ( @@ -41835,8 +40882,7 @@ /obj/structure/closet, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "rSd" = ( @@ -41890,8 +40936,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "rSW" = ( @@ -41940,8 +40985,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "rUr" = ( @@ -41982,8 +41026,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rWu" = ( @@ -41996,8 +41039,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "rWP" = ( @@ -42013,8 +41055,7 @@ }, /obj/structure/ore_box, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "rXb" = ( @@ -42024,8 +41065,7 @@ "rXE" = ( /obj/item/stack/sheet/wood, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "rXH" = ( @@ -42054,8 +41094,7 @@ pixel_y = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "rYq" = ( @@ -42126,8 +41165,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "rZF" = ( @@ -42145,8 +41183,7 @@ /area/lv522/outdoors/colony_streets/south_street) "rZL" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "sag" = ( @@ -42170,8 +41207,7 @@ /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "saz" = ( @@ -42217,8 +41253,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "saY" = ( @@ -42250,8 +41285,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/n_rockies) "sbx" = ( @@ -42262,8 +41296,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "sbG" = ( @@ -42313,8 +41346,7 @@ pixel_y = -5 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "scw" = ( @@ -42322,8 +41354,7 @@ current_rounds = 0 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "scy" = ( @@ -42335,8 +41366,7 @@ pixel_y = -5 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "scM" = ( @@ -42363,8 +41393,7 @@ /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "sdN" = ( @@ -42394,8 +41423,7 @@ "seA" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "seG" = ( @@ -42404,8 +41432,7 @@ }, /turf/open/floor/prison{ dir = 8; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "seJ" = ( @@ -42476,8 +41503,7 @@ pixel_y = 2 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "sgT" = ( @@ -42495,8 +41521,7 @@ "sha" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "shc" = ( @@ -42505,8 +41530,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "shm" = ( @@ -42565,8 +41589,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "siX" = ( @@ -42599,8 +41622,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "sjp" = ( @@ -42611,8 +41633,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "sjy" = ( @@ -42644,8 +41665,7 @@ layer = 3.1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "sjS" = ( @@ -42653,8 +41673,7 @@ /obj/item/device/sentry_computer, /obj/item/defenses/handheld/sentry, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "sjY" = ( @@ -42741,8 +41760,7 @@ pixel_y = 21 }, /obj/structure/bed/chair/dropship/pilot{ - dir = 1; - tag = null + dir = 1 }, /obj/structure/machinery/light/double{ dir = 1; @@ -42755,8 +41773,7 @@ pixel_y = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "slO" = ( @@ -42844,8 +41861,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) "snR" = ( @@ -42854,8 +41870,7 @@ /obj/item/tank/oxygen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "snX" = ( @@ -42908,8 +41923,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "spz" = ( @@ -42938,8 +41952,7 @@ "spM" = ( /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "spW" = ( @@ -42950,14 +41963,12 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "sqd" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bridge) "sql" = ( @@ -42988,8 +41999,7 @@ pixel_x = 7 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "srJ" = ( @@ -43027,8 +42037,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "ssl" = ( @@ -43062,8 +42071,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "suh" = ( @@ -43179,8 +42187,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "swF" = ( @@ -43199,8 +42206,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "swY" = ( @@ -43242,8 +42248,7 @@ /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "syy" = ( @@ -43252,8 +42257,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "syB" = ( @@ -43322,8 +42326,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "sAp" = ( @@ -43355,20 +42358,17 @@ icon_state = "pottedplant_21"; layer = 3.1; name = "synthethic potted plant"; - pixel_y = 14; - tag = null + pixel_y = 14 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "sAT" = ( /obj/structure/surface/table/almayer, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "sAU" = ( @@ -43382,8 +42382,7 @@ pixel_x = -16 }, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "sBt" = ( @@ -43431,15 +42430,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "sCk" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1{ dir = 8 }, -/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1) "sCp" = ( @@ -43491,8 +42489,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "sDS" = ( @@ -43521,8 +42518,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "sEc" = ( @@ -43541,8 +42537,7 @@ }, /obj/item/tool/weldingtool, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/kitchen/glass) "sED" = ( @@ -43551,8 +42546,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "sFf" = ( @@ -43578,8 +42572,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/hydro) "sFG" = ( @@ -43608,8 +42601,7 @@ /obj/item/tool/pickaxe/silver, /obj/item/tool/pickaxe/silver, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "sGt" = ( @@ -43625,8 +42617,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "sGQ" = ( @@ -43640,15 +42631,13 @@ /obj/structure/barricade/deployable, /obj/effect/decal/cleanable/blood/splatter, /turf/open/shuttle/dropship{ - icon_state = "rasputin4"; - tag = null + icon_state = "rasputin4" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "sGY" = ( /obj/structure/barricade/deployable, /turf/open/shuttle/dropship{ - icon_state = "floor8"; - tag = null + icon_state = "floor8" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "sHb" = ( @@ -43673,8 +42662,7 @@ "sHg" = ( /obj/structure/barricade/deployable, /turf/open/shuttle/dropship{ - icon_state = "rasputin8"; - tag = null + icon_state = "rasputin8" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "sHk" = ( @@ -43690,8 +42678,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "sHY" = ( @@ -43705,8 +42692,7 @@ }, /obj/structure/platform_decoration{ dir = 10; - layer = 3.51; - tag = null + layer = 3.51 }, /turf/open/floor/plating, /area/lv522/indoors/c_block/garage) @@ -43714,8 +42700,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "sIr" = ( @@ -43771,8 +42756,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "sJI" = ( @@ -43875,8 +42859,7 @@ /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "sKS" = ( @@ -43885,8 +42868,7 @@ pixel_y = 11 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "sKU" = ( @@ -43934,8 +42916,7 @@ "sLQ" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "sLR" = ( @@ -43966,8 +42947,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/nw_rockies) "sMa" = ( @@ -43983,8 +42963,7 @@ }, /obj/structure/machinery/light/small, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "sML" = ( @@ -44046,8 +43025,7 @@ pixel_y = 27 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "sNU" = ( @@ -44085,8 +43063,7 @@ /obj/structure/closet/crate, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "sOA" = ( @@ -44119,8 +43096,7 @@ /area/lv522/landing_zone_1) "sON" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "sOR" = ( @@ -44146,16 +43122,14 @@ /obj/structure/machinery/vending/cola, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "sPb" = ( /obj/structure/barricade/wooden, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "sPh" = ( @@ -44237,8 +43211,7 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "sQI" = ( @@ -44267,8 +43240,7 @@ /obj/structure/surface/table/almayer, /obj/item/folder/black_random, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "sQT" = ( @@ -44284,8 +43256,7 @@ /obj/item/weapon/twohanded/folded_metal_chair, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "sRd" = ( @@ -44329,8 +43300,7 @@ /obj/structure/cargo_container/wy/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "sSk" = ( @@ -44361,8 +43331,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "sSQ" = ( @@ -44393,8 +43362,7 @@ /obj/item/ore/silver, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "sTr" = ( @@ -44463,8 +43431,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 8; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/c_block/cargo) "sUN" = ( @@ -44508,8 +43475,7 @@ pixel_y = 16 }, /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison{ dir = 1; @@ -44531,8 +43497,7 @@ /obj/item/newspaper, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "sXo" = ( @@ -44541,8 +43506,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "sXM" = ( @@ -44551,8 +43515,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "sXQ" = ( @@ -44566,8 +43529,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "sXZ" = ( @@ -44579,8 +43541,7 @@ "sYh" = ( /obj/structure/machinery/door/airlock/hatch/cockpit/two, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "sYk" = ( @@ -44600,8 +43561,7 @@ /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "sZq" = ( @@ -44700,8 +43660,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "tcj" = ( @@ -44728,8 +43687,7 @@ /obj/item/prop/colony/used_flare, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "tcz" = ( @@ -44815,8 +43773,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "tdT" = ( @@ -44836,8 +43793,7 @@ /area/lv522/indoors/a_block/admin) "teh" = ( /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "tek" = ( @@ -44848,8 +43804,7 @@ }, /obj/item/tool/pen/blue/clicky, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tew" = ( @@ -44886,8 +43841,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "tfb" = ( @@ -44912,8 +43866,7 @@ /obj/effect/landmark/railgun_camera_pos, /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_1/ceiling) "tfP" = ( @@ -44939,8 +43892,7 @@ "tfZ" = ( /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "tgj" = ( @@ -44952,8 +43904,7 @@ /obj/structure/surface/rack, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "tgM" = ( @@ -44977,8 +43928,7 @@ /obj/structure/foamed_metal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "the" = ( @@ -45032,8 +43982,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "tiQ" = ( @@ -45066,8 +44015,7 @@ "tjh" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "tjx" = ( @@ -45113,8 +44061,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "tkA" = ( @@ -45150,8 +44097,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tlr" = ( @@ -45192,8 +44138,7 @@ pixel_y = 5 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "tlX" = ( @@ -45287,8 +44232,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tni" = ( @@ -45315,8 +44259,7 @@ "tnL" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "tnM" = ( @@ -45399,8 +44342,7 @@ /obj/item/clipboard, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "tpz" = ( @@ -45430,8 +44372,7 @@ /obj/structure/barricade/deployable, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "tqG" = ( @@ -45452,8 +44393,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness/glass) "tra" = ( @@ -45489,8 +44429,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "trW" = ( @@ -45514,8 +44453,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tsx" = ( @@ -45546,8 +44484,7 @@ /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tsM" = ( @@ -45586,8 +44523,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "tti" = ( @@ -45632,8 +44568,7 @@ /obj/structure/cargo_container/hd/right/alt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "tuJ" = ( @@ -45653,8 +44588,7 @@ "tuK" = ( /obj/structure/ore_box, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "tvi" = ( @@ -45669,8 +44603,7 @@ /obj/structure/prop/turbine_extras/border, /obj/structure/prop/turbine, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "tvn" = ( @@ -45697,16 +44630,14 @@ /obj/structure/bed/chair, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "tvz" = ( /obj/structure/surface/table/almayer, /obj/structure/foamed_metal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "tvO" = ( @@ -45738,8 +44669,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "twq" = ( @@ -45817,8 +44747,7 @@ /obj/structure/closet/crate, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "typ" = ( @@ -45854,8 +44783,7 @@ pixel_y = -5 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "tzz" = ( @@ -45875,8 +44803,7 @@ current_mag = null }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "tzF" = ( @@ -45884,8 +44811,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "tzY" = ( @@ -45898,8 +44824,7 @@ pixel_y = 25 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tAh" = ( @@ -45930,8 +44855,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "tBb" = ( @@ -45940,7 +44864,6 @@ /area/lv522/outdoors/colony_streets/south_east_street) "tBw" = ( /obj/structure/prop/invuln/lifeboat_hatch_placeholder{ - icon_state = "closed"; layer = 2.1 }, /obj/structure/barricade/handrail{ @@ -45960,8 +44883,7 @@ /area/lv522/outdoors/colony_streets/central_streets) "tBM" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin6"; - tag = null + icon_state = "rasputin6" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "tBQ" = ( @@ -45980,15 +44902,13 @@ /obj/item/prop/alien/hugger, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "tBT" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; - name = "\improper Eastlock"; - welded = null + name = "\improper Eastlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -46023,8 +44943,7 @@ /area/lv522/outdoors/colony_streets/south_east_street) "tCR" = ( /turf/open/shuttle/dropship{ - icon_state = "floor8"; - tag = null + icon_state = "floor8" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "tCX" = ( @@ -46041,8 +44960,7 @@ /area/lv522/outdoors/colony_streets/central_streets) "tDm" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin7"; - tag = null + icon_state = "rasputin7" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "tDq" = ( @@ -46150,8 +45068,7 @@ "tEW" = ( /obj/structure/machinery/vending/cigarette/colony, /obj/structure/machinery/light{ - dir = 4; - tag = null + dir = 4 }, /turf/open/floor/strata{ dir = 4; @@ -46200,8 +45117,7 @@ /obj/item/storage/bag/ore, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "tFx" = ( @@ -46252,7 +45168,6 @@ /area/lv522/outdoors/colony_streets/north_street) "tGm" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - locked = 0; name = "\improper Corporate Liason" }, /turf/open/floor/corsat{ @@ -46267,8 +45182,7 @@ /obj/item/stack/sheet/wood, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "tGI" = ( @@ -46305,8 +45219,7 @@ layer = 3.1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "tGY" = ( @@ -46335,8 +45248,7 @@ /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "tID" = ( @@ -46348,8 +45260,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "tIM" = ( @@ -46424,8 +45335,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "tKo" = ( @@ -46463,8 +45373,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_1/ceiling) "tLl" = ( @@ -46514,8 +45423,7 @@ /obj/structure/cargo_container/horizontal/blue/bottom, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "tLL" = ( @@ -46571,8 +45479,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "tMS" = ( @@ -46635,8 +45542,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "tOo" = ( @@ -46745,8 +45651,7 @@ "tQp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "tQC" = ( @@ -46821,8 +45726,7 @@ "tSn" = ( /obj/structure/girder, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "tSo" = ( @@ -46836,8 +45740,7 @@ pixel_y = -5 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "tSL" = ( @@ -46854,8 +45757,7 @@ pixel_y = -5 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "tTr" = ( @@ -46888,8 +45790,7 @@ icon_state = "medium" }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tTZ" = ( @@ -46945,8 +45846,7 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) "tVv" = ( @@ -46999,8 +45899,7 @@ /obj/item/storage/backpack, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "tXa" = ( @@ -47048,8 +45947,7 @@ "tXg" = ( /obj/structure/barricade/wooden, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tXG" = ( @@ -47060,8 +45958,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_1/ceiling) "tXS" = ( @@ -47129,8 +46026,7 @@ "tZc" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bridge) "tZh" = ( @@ -47183,8 +46079,7 @@ /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "tZR" = ( @@ -47284,8 +46179,7 @@ "ucx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/fitness) "ucD" = ( @@ -47347,8 +46241,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "udR" = ( @@ -47467,8 +46360,7 @@ "ufs" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "ufu" = ( @@ -47535,8 +46427,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "ugo" = ( @@ -47544,8 +46435,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "ugu" = ( @@ -47558,8 +46448,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "ugG" = ( @@ -47567,8 +46456,7 @@ /obj/effect/spawner/random/tool, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "ugN" = ( @@ -47592,16 +46480,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "uhf" = ( /obj/item/prop/alien/hugger, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "uhv" = ( @@ -47658,8 +46544,7 @@ pixel_y = 26 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "uic" = ( @@ -47672,8 +46557,7 @@ pixel_y = 26 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "uie" = ( @@ -47776,8 +46660,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "ujy" = ( @@ -47796,8 +46679,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "ukp" = ( @@ -47823,8 +46705,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ukK" = ( @@ -47843,8 +46724,7 @@ "ulL" = ( /turf/open/floor/prison{ dir = 8; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "ulZ" = ( @@ -47887,8 +46767,7 @@ /area/lv522/indoors/c_block/cargo) "unE" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2; - locked = 0 + dir = 2 }, /turf/open/floor/corsat{ icon_state = "marked" @@ -47911,8 +46790,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "unS" = ( @@ -47925,8 +46803,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "uog" = ( @@ -47996,8 +46873,7 @@ pixel_x = 16 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "upl" = ( @@ -48102,8 +46978,7 @@ dir = 4 }, /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) @@ -48127,8 +47002,7 @@ /area/lv522/indoors/a_block/security) "urY" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "usn" = ( @@ -48137,8 +47011,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "usy" = ( @@ -48152,8 +47025,7 @@ /area/lv522/indoors/a_block/fitness) "usz" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/fitness) "usJ" = ( @@ -48180,8 +47052,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "utd" = ( @@ -48325,8 +47196,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "uvC" = ( @@ -48423,15 +47293,13 @@ /area/lv522/outdoors/colony_streets/south_east_street) "uya" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "uye" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "uyt" = ( @@ -48446,8 +47314,7 @@ /obj/structure/machinery/disposal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "uyM" = ( @@ -48465,8 +47332,7 @@ pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "uyN" = ( @@ -48584,8 +47450,7 @@ /area/lv522/indoors/c_block/mining) "uCr" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ icon_state = "marked" @@ -48612,8 +47477,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "uDP" = ( @@ -48622,8 +47486,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "uDT" = ( @@ -48681,8 +47544,7 @@ "uEC" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "uEE" = ( @@ -48694,23 +47556,23 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "uEH" = ( -/obj/structure/bed/chair/comfy{ - dir = 1; - tag = null +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 8 }, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/dorms) +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/landing_zone_1) "uEP" = ( /obj/structure/machinery/disposal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "uEV" = ( @@ -48773,8 +47635,7 @@ "uFF" = ( /obj/vehicle/train/cargo/trolley, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "uFG" = ( @@ -48810,8 +47671,7 @@ "uGl" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "uGO" = ( @@ -48824,8 +47684,7 @@ pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "uGT" = ( @@ -48847,8 +47706,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "uHn" = ( @@ -48869,8 +47727,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "uHE" = ( @@ -48892,8 +47749,7 @@ }, /obj/structure/machinery/light/small, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "uIe" = ( @@ -48910,8 +47766,7 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "uIr" = ( @@ -48929,8 +47784,7 @@ /obj/structure/surface/rack, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "uIF" = ( @@ -48954,8 +47808,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "uIW" = ( @@ -48988,23 +47841,20 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "uJr" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 8; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "uJY" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "uKa" = ( @@ -49047,8 +47897,7 @@ /area/lv522/indoors/c_block/cargo) "uKQ" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "uKR" = ( @@ -49102,7 +47951,7 @@ /area/lv522/indoors/a_block/bridges/corpo_fitness) "uLz" = ( /obj/effect/landmark/hunter_secondary, -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds1{ dir = 4 }, /turf/open/floor/plating, @@ -49223,8 +48072,7 @@ pixel_y = 6 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "uOd" = ( @@ -49303,8 +48151,7 @@ /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "uPo" = ( @@ -49312,8 +48159,7 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) "uPy" = ( @@ -49335,8 +48181,7 @@ /obj/structure/surface/table/almayer, /obj/item/paper/janitor, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "uQf" = ( @@ -49433,8 +48278,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "uRB" = ( @@ -49448,8 +48292,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "uRL" = ( @@ -49466,8 +48309,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "uRR" = ( @@ -49501,8 +48343,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "uSB" = ( @@ -49594,8 +48435,7 @@ /obj/structure/surface/table/almayer, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "uTY" = ( @@ -49616,8 +48456,7 @@ /area/lv522/indoors/a_block/security/glass) "uUk" = ( /obj/structure/bed/chair/wood/normal{ - dir = 4; - tag = null + dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, @@ -49631,8 +48470,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "uUB" = ( @@ -49659,8 +48497,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/c_block/mining) "uVy" = ( @@ -49685,8 +48522,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "uVU" = ( @@ -49710,15 +48546,13 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "uWh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/strata{ dir = 4; @@ -49772,14 +48606,12 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "uXj" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "uXp" = ( @@ -49810,8 +48642,7 @@ /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "uYq" = ( @@ -49837,8 +48668,7 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "uZO" = ( @@ -49882,8 +48712,7 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "vaZ" = ( @@ -49900,8 +48729,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "vbm" = ( @@ -49948,8 +48776,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vbV" = ( @@ -49958,8 +48785,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "vbX" = ( @@ -49980,16 +48806,14 @@ /obj/structure/barricade/wooden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vcJ" = ( /obj/structure/closet/secure_closet/miner, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "vcR" = ( @@ -50038,8 +48862,7 @@ /obj/effect/landmark/objective_landmark/close, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "vdH" = ( @@ -50048,8 +48871,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vdP" = ( @@ -50067,8 +48889,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/reagent_container/food/snacks/cheesyfries, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vdZ" = ( @@ -50088,8 +48909,7 @@ }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "veD" = ( @@ -50174,8 +48994,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "vga" = ( @@ -50330,8 +49149,7 @@ "vjn" = ( /obj/structure/surface/rack, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "vjr" = ( @@ -50349,8 +49167,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "vjv" = ( @@ -50375,8 +49192,7 @@ pixel_y = 27 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "vjB" = ( @@ -50392,8 +49208,7 @@ "vjF" = ( /obj/structure/cargo_container/horizontal/blue/bottom, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "vjG" = ( @@ -50441,8 +49256,7 @@ /obj/structure/window/reinforced, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "vlp" = ( @@ -50453,8 +49267,7 @@ /obj/structure/bed/chair, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "vlv" = ( @@ -50465,8 +49278,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "vlN" = ( @@ -50490,8 +49302,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "vmo" = ( @@ -50504,9 +49315,7 @@ }, /area/lv522/indoors/a_block/fitness) "vmp" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - locked = 0 - }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -50525,8 +49334,7 @@ /obj/item/stack/sheet/cardboard/full_stack, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "vmQ" = ( @@ -50540,8 +49348,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vne" = ( @@ -50602,14 +49409,12 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vou" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "vov" = ( @@ -50706,8 +49511,7 @@ /obj/vehicle/train/cargo/trolley, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "vqm" = ( @@ -50740,8 +49544,7 @@ "vqW" = ( /obj/structure/barricade/wooden, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vra" = ( @@ -50803,8 +49606,7 @@ layer = 2.9 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "vsk" = ( @@ -50823,8 +49625,7 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) "vss" = ( @@ -50863,8 +49664,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges/corpo) "vtp" = ( @@ -50907,8 +49707,7 @@ /area/lv522/indoors/b_block/hydro/glass) "vuc" = ( /obj/structure/bed/chair/comfy{ - dir = 8; - tag = null + dir = 8 }, /obj/structure/machinery/light{ dir = 1 @@ -50930,8 +49729,7 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) "vuY" = ( @@ -50943,8 +49741,7 @@ stat = 2 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "vvi" = ( @@ -51090,8 +49887,7 @@ /obj/structure/closet/wardrobe/engineering_yellow, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "vzg" = ( @@ -51131,8 +49927,7 @@ "vzu" = ( /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "vzw" = ( @@ -51173,8 +49968,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "vzZ" = ( @@ -51197,8 +49991,7 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) "vBa" = ( @@ -51212,8 +50005,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "vBd" = ( @@ -51244,8 +50036,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vBB" = ( @@ -51276,8 +50067,7 @@ }, /turf/open/floor/prison{ dir = 8; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) "vBN" = ( @@ -51346,8 +50136,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vDr" = ( @@ -51413,12 +50202,11 @@ "vEK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/hydro) "vER" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 1 }, /turf/open/floor/prison{ @@ -51458,8 +50246,7 @@ /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vFS" = ( @@ -51560,8 +50347,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vHN" = ( @@ -51594,8 +50380,7 @@ }, /turf/open/floor/prison{ dir = 5; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "vIg" = ( @@ -51617,8 +50402,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "vIy" = ( @@ -51647,8 +50431,7 @@ /obj/structure/surface/table/almayer, /obj/item/newspaper, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vJo" = ( @@ -51656,8 +50439,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "vJr" = ( @@ -51689,8 +50471,7 @@ "vJT" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vKe" = ( @@ -51722,8 +50503,7 @@ /obj/structure/surface/table/almayer, /obj/item/clothing/under/redpyjamas, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "vKF" = ( @@ -51758,8 +50538,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "vLu" = ( @@ -51792,8 +50571,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/hardpoint/locomotion/van_wheels, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "vLQ" = ( @@ -51803,16 +50581,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vLR" = ( /obj/item/stack/sheet/wood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vLW" = ( @@ -51825,8 +50601,7 @@ "vMg" = ( /obj/structure/safe, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vMu" = ( @@ -51845,8 +50620,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/central_streets) "vMJ" = ( @@ -51873,8 +50647,7 @@ }, /obj/item/ammo_box/magazine/misc/flares, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) "vNi" = ( @@ -51997,8 +50770,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vPb" = ( @@ -52114,16 +50886,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vRQ" = ( /obj/structure/surface/table/almayer, /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "vSc" = ( @@ -52147,8 +50917,7 @@ pixel_y = 5 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "vSJ" = ( @@ -52287,8 +51056,7 @@ /obj/structure/powerloader_wreckage/ft, /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_1/ceiling) "vVd" = ( @@ -52326,8 +51094,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "vVs" = ( @@ -52349,8 +51116,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "vWe" = ( @@ -52394,8 +51160,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "vXc" = ( @@ -52407,8 +51172,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vXY" = ( @@ -52431,8 +51195,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vYK" = ( @@ -52457,8 +51220,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "vYY" = ( @@ -52541,8 +51303,7 @@ "wan" = ( /obj/structure/surface/table/almayer, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wao" = ( @@ -52626,8 +51387,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "wbL" = ( @@ -52674,8 +51434,7 @@ /area/lv522/indoors/a_block/corpo/glass) "wcq" = ( /obj/structure/machinery/light{ - dir = 4; - tag = null + dir = 4 }, /turf/open/floor/strata{ dir = 4; @@ -52684,8 +51443,7 @@ /area/lv522/indoors/a_block/corpo/glass) "wcO" = ( /obj/structure/machinery/light{ - dir = 4; - tag = null + dir = 4 }, /obj/structure/bed/chair{ dir = 1 @@ -52714,8 +51472,7 @@ "wcX" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wdd" = ( @@ -52728,14 +51485,12 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "wdi" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security/glass) "wdj" = ( @@ -52753,8 +51508,7 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) "wdY" = ( @@ -52781,8 +51535,7 @@ /obj/structure/closet/secure_closet/freezer/fridge/full, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "wes" = ( @@ -52834,8 +51587,7 @@ }, /obj/structure/girder/reinforced, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wfe" = ( @@ -52915,8 +51667,7 @@ pixel_y = 16 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "wgn" = ( @@ -52954,16 +51705,14 @@ pixel_y = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "whs" = ( /obj/structure/surface/rack, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "whz" = ( @@ -53004,8 +51753,7 @@ "whG" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "whR" = ( @@ -53020,8 +51768,7 @@ /obj/structure/machinery/vending/coffee, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "whZ" = ( @@ -53030,8 +51777,7 @@ id = "cargo_container" }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "wiz" = ( @@ -53070,8 +51816,7 @@ /area/lv522/landing_zone_1) "wjf" = ( /obj/structure/bed/chair/wood/normal{ - dir = 8; - tag = null + dir = 8 }, /turf/open/floor/carpet, /area/lv522/indoors/c_block/casino) @@ -53133,15 +51878,13 @@ }, /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "wky" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "wkC" = ( @@ -53152,8 +51895,7 @@ }, /turf/open/floor/plating{ dir = 8; - icon_state = "platingdmg3"; - tag = null + icon_state = "platingdmg3" }, /area/lv522/indoors/a_block/kitchen/damage) "wkO" = ( @@ -53184,24 +51926,9 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) -"wmg" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - locked = 0 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Sec-Kitchen-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/kitchen) "wmk" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/fitness) @@ -53211,8 +51938,7 @@ /area/lv522/outdoors/w_rockies) "wmI" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor{ icon_state = "wood" @@ -53266,15 +51992,13 @@ "wog" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "woi" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "woq" = ( @@ -53313,8 +52037,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "wpd" = ( @@ -53371,8 +52094,7 @@ /obj/effect/landmark/objective_landmark/medium, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wqt" = ( @@ -53416,8 +52138,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "wrC" = ( @@ -53433,8 +52154,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wsz" = ( @@ -53444,8 +52164,7 @@ /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "wsC" = ( @@ -53492,8 +52211,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "wtH" = ( @@ -53548,8 +52266,7 @@ /obj/structure/closet/crate, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "wuQ" = ( @@ -53559,8 +52276,7 @@ /area/lv522/indoors/b_block/bar) "wuX" = ( /obj/structure/bed/chair/wood/normal{ - dir = 4; - tag = null + dir = 4 }, /turf/open/floor/carpet, /area/lv522/indoors/c_block/casino) @@ -53708,8 +52424,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wxg" = ( @@ -53721,8 +52436,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "wxB" = ( @@ -53743,8 +52457,7 @@ /obj/item/ammo_magazine/rifle/boltaction, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "wyv" = ( @@ -53782,8 +52495,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wyI" = ( @@ -53832,8 +52544,7 @@ "wzJ" = ( /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wzS" = ( @@ -53846,8 +52557,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "wAf" = ( @@ -53863,8 +52573,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "wBp" = ( @@ -53883,8 +52592,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "wBx" = ( @@ -53961,12 +52669,10 @@ icon_state = "pottedplant_21"; layer = 3.1; name = "synthethic potted plant"; - pixel_y = 14; - tag = null + pixel_y = 14 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wCW" = ( @@ -54032,13 +52738,11 @@ /area/lv522/indoors/a_block/hallway) "wEo" = ( /obj/structure/cargo_container/wy/mid{ - health = 5000; - unacidable = 0 + health = 5000 }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "wEz" = ( @@ -54074,8 +52778,7 @@ /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wEW" = ( @@ -54126,8 +52829,7 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "wGG" = ( @@ -54149,8 +52851,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wGY" = ( @@ -54160,8 +52861,7 @@ "wHi" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "wHj" = ( @@ -54169,8 +52869,7 @@ /obj/structure/machinery/light, /obj/item/clothing/mask/gas, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) "wHo" = ( @@ -54194,8 +52893,7 @@ /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "wHF" = ( @@ -54207,8 +52905,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "wHU" = ( @@ -54226,8 +52923,7 @@ /area/lv522/indoors/b_block/bridge) "wIu" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) @@ -54253,8 +52949,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wJq" = ( @@ -54276,8 +52971,7 @@ /obj/effect/landmark/objective_landmark/close, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "wKR" = ( @@ -54293,8 +52987,7 @@ /obj/structure/surface/rack, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "wLd" = ( @@ -54316,8 +53009,7 @@ /obj/item/reagent_container/food/drinks/coffee, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wLU" = ( @@ -54343,8 +53035,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "wMF" = ( @@ -54355,8 +53046,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wNl" = ( @@ -54380,8 +53070,7 @@ "wNp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "wNF" = ( @@ -54412,16 +53101,14 @@ /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "wOU" = ( /obj/item/prop/alien/hugger, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "wPt" = ( @@ -54429,8 +53116,7 @@ /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "wPA" = ( @@ -54457,8 +53143,7 @@ "wQy" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/c_block/mining) "wRa" = ( @@ -54474,8 +53159,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "wRk" = ( @@ -54623,8 +53307,7 @@ "wTx" = ( /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "wTy" = ( @@ -54666,8 +53349,7 @@ /obj/item/ore/diamond, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "wUx" = ( @@ -54675,8 +53357,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "wUL" = ( @@ -54752,8 +53433,7 @@ "wXQ" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "wYa" = ( @@ -54847,8 +53527,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "wZI" = ( @@ -54858,8 +53537,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "xaj" = ( @@ -54870,8 +53548,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "xay" = ( @@ -54882,15 +53559,13 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "xaD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "xaM" = ( @@ -54919,8 +53594,7 @@ pixel_y = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "xbj" = ( @@ -54956,8 +53630,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "xce" = ( @@ -54965,8 +53638,7 @@ /area/lv522/atmos/command_centre) "xci" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) @@ -54978,8 +53650,7 @@ /obj/effect/landmark/static_comms/net_two, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/c_block/mining) "xcE" = ( @@ -55016,8 +53687,7 @@ /area/lv522/indoors/c_block/mining) "xcY" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_1) "xdb" = ( @@ -55135,8 +53805,7 @@ /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "xfX" = ( @@ -55209,8 +53878,7 @@ "xhq" = ( /obj/structure/closet, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "xhu" = ( @@ -55225,8 +53893,7 @@ "xhB" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "xhD" = ( @@ -55250,8 +53917,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "xic" = ( @@ -55262,8 +53928,7 @@ "xig" = ( /obj/structure/closet/crate, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "xiu" = ( @@ -55283,8 +53948,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "xiY" = ( @@ -55302,8 +53966,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "xju" = ( @@ -55319,16 +53982,14 @@ /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "xjC" = ( /obj/structure/pipes/vents/pump, /obj/structure/closet, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "xjF" = ( @@ -55354,8 +54015,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "xjY" = ( @@ -55367,8 +54027,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "xka" = ( @@ -55391,8 +54050,7 @@ pixel_y = -5 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "xkr" = ( @@ -55413,8 +54071,7 @@ "xkB" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/outdoor) "xkO" = ( @@ -55424,8 +54081,7 @@ /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "xlq" = ( @@ -55433,8 +54089,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "xly" = ( @@ -55475,8 +54130,7 @@ /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "xlY" = ( @@ -55485,8 +54139,7 @@ }, /obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "xmj" = ( @@ -55494,8 +54147,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/nw_rockies) "xmk" = ( @@ -55530,8 +54182,7 @@ }, /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_1/ceiling) "xnk" = ( @@ -55580,8 +54231,7 @@ /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "xnI" = ( @@ -55610,8 +54260,7 @@ }, /obj/item/storage/toolbox/electrical, /obj/structure/machinery/light{ - dir = 4; - tag = null + dir = 4 }, /turf/open/floor/strata{ dir = 4; @@ -55622,22 +54271,19 @@ /obj/structure/largecrate/random/barrel/red, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "xpg" = ( /obj/structure/prop/server_equipment/yutani_server, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/nw_rockies) "xpu" = ( /obj/structure/platform, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "xpH" = ( @@ -55656,8 +54302,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "xqd" = ( @@ -55684,16 +54329,14 @@ "xqV" = ( /obj/structure/cargo_container/kelland/right, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "xqY" = ( /obj/structure/cargo_container/kelland/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "xrr" = ( @@ -55768,8 +54411,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "xtk" = ( @@ -55829,8 +54471,7 @@ /obj/structure/cargo_container/watatsumi/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "xvl" = ( @@ -55849,8 +54490,7 @@ /area/lv522/indoors/c_block/bridge) "xvG" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "xvQ" = ( @@ -55861,8 +54501,7 @@ /area/lv522/indoors/lone_buildings/engineering) "xvW" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges) "xwv" = ( @@ -55944,8 +54583,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "xxU" = ( @@ -55967,16 +54605,14 @@ "xyi" = ( /obj/structure/closet/emcloset, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "xym" = ( /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "xyL" = ( @@ -56059,8 +54695,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "xAO" = ( @@ -56087,8 +54722,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "xAZ" = ( @@ -56164,8 +54798,7 @@ "xCY" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "xDl" = ( @@ -56205,8 +54838,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "xDJ" = ( @@ -56218,8 +54850,7 @@ /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "xDM" = ( @@ -56260,14 +54891,12 @@ /obj/structure/cargo_container/kelland/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "xEB" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -56277,7 +54906,7 @@ /turf/closed/wall/mineral/bone_resin, /area/lv522/oob) "xEH" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds1{ dir = 1 }, /turf/open/floor/prison{ @@ -56301,8 +54930,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "xFG" = ( @@ -56336,8 +54964,7 @@ /obj/item/reagent_container/glass/bucket/janibucket, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "xHj" = ( @@ -56365,8 +54992,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "xIv" = ( @@ -56397,8 +55023,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "xJF" = ( @@ -56458,8 +55083,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "xKk" = ( @@ -56474,8 +55098,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "xKO" = ( @@ -56542,8 +55165,7 @@ pixel_y = 16 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "xMu" = ( @@ -56555,8 +55177,7 @@ "xMz" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "xMO" = ( @@ -56600,8 +55221,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "xNw" = ( @@ -56678,8 +55298,7 @@ "xPj" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "xPo" = ( @@ -56723,8 +55342,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "xPW" = ( @@ -56747,8 +55365,7 @@ "xPY" = ( /obj/structure/fence, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/outdoor) "xQc" = ( @@ -56783,14 +55400,12 @@ /obj/effect/landmark/objective_landmark/science, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "xRg" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -56862,8 +55477,7 @@ "xRE" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "xRG" = ( @@ -56872,8 +55486,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "xRI" = ( @@ -56892,8 +55505,7 @@ /area/lv522/outdoors/colony_streets/north_street) "xRM" = ( /obj/structure/machinery/door/airlock/dropship_hatch/two{ - dir = 8; - locked = 0 + dir = 8 }, /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -56901,8 +55513,7 @@ indestructible = 1 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "xRQ" = ( @@ -56966,16 +55577,14 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "xTs" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "xTJ" = ( @@ -57011,8 +55620,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "xUx" = ( @@ -57093,8 +55701,7 @@ /area/lv522/atmos/cargo_intake) "xWf" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges/dorms_fitness) "xWx" = ( @@ -57119,8 +55726,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "xWF" = ( @@ -57174,8 +55780,7 @@ /obj/structure/foamed_metal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "xXN" = ( @@ -57285,8 +55890,7 @@ /obj/item/tool/pen/blue/clicky, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "yaf" = ( @@ -57307,20 +55911,17 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "yar" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/landing_zone_2/ceiling) "yat" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ - locked = 0; name = "\improper Marshall Office Armory" }, /obj/structure/pipes/standard/simple/hidden/green{ @@ -57383,8 +55984,7 @@ /obj/effect/spawner/random/toolbox, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "yca" = ( @@ -57404,8 +56004,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "ycv" = ( @@ -57486,8 +56085,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "ydV" = ( @@ -57511,8 +56109,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "yeM" = ( @@ -57528,8 +56125,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "yeS" = ( @@ -57591,8 +56187,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) "ygJ" = ( @@ -57648,8 +56243,7 @@ "yhU" = ( /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_1/ceiling) "yif" = ( @@ -57773,8 +56367,7 @@ "yjL" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/oob) "yjP" = ( @@ -57787,8 +56380,7 @@ /obj/item/tool/screwdriver, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "yjT" = ( @@ -57812,15 +56404,13 @@ /obj/item/tank/emergency_oxygen/engi, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "ykc" = ( /turf/open/floor/plating{ dir = 8; - icon_state = "platingdmg3"; - tag = null + icon_state = "platingdmg3" }, /area/lv522/indoors/a_block/bridges/op_centre) "yke" = ( @@ -57844,8 +56434,7 @@ "ykL" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "ykR" = ( @@ -57856,8 +56445,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "ykT" = ( @@ -60608,6 +59196,7 @@ pLm pkH pvd nhi +oyf tns fOc uTd @@ -60616,17 +59205,16 @@ tns fOc uTd oyf -hqY +tns fOc uTd oyf -tns uLz +fOc uTd oyf tns -fOc -ryU +rhk ryU sOM vYK @@ -61081,7 +59669,7 @@ sYH nFj nFj bhy -vTO +gnf ryU wes pxb @@ -61308,7 +59896,7 @@ sYH sYH nFj sYH -orU +vTO ryU wiY pxb @@ -61535,7 +60123,7 @@ sYH sYH sYH sYH -dMY +orU ryU wiY pxb @@ -61762,7 +60350,7 @@ sYH sYH nFj nFj -gnf +dMY ryU wiY pxb @@ -61874,8 +60462,8 @@ pUc qst qLz qVl -rhk -rhk +qzp +qzp rFp sdE sIx @@ -61989,7 +60577,7 @@ sYH sYH nFj nFj -vTO +gnf ryU wiY pxb @@ -62216,7 +60804,7 @@ sYH sYH nFj nFj -orU +vTO ryU wiY pxb @@ -62443,7 +61031,7 @@ sYH sYH sYH sYH -dMY +orU ryU wiY pxb @@ -62670,7 +61258,7 @@ sYH sYH nFj sYH -gnf +dMY ryU wiY pxb @@ -62897,7 +61485,7 @@ sYH nFj nFj sYH -vTO +gnf ryU wjE pxb @@ -63332,15 +61920,14 @@ oKG pkH pwH sCk -vJj -nFj +jIk aGS dhP vJj jIk aGS dhP -enJ +vJj jIk aGS dhP @@ -63350,7 +61937,8 @@ aGS dhP vJj jIk -ryU +aGS +uEH ryU gPv gVn @@ -73052,7 +71640,7 @@ nwj nLm qxb wqn -uEH +cve vJT sLQ nLm @@ -83707,7 +82295,7 @@ sjy kqb kqb mUS -wmg +egP kqb kqb pGl diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index 6e4080f4edec..937599e70947 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -24,30 +24,17 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/north_east_caves) "aaj" = ( -/turf/open/gm/coast{ - dir = 4 - }, -/area/lv624/ground/caves/north_central_caves) -"aak" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/west, /area/lv624/ground/caves/north_central_caves) "aam" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/river, /area/lv624/ground/caves/north_central_caves) "aap" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/north_central_caves) "aaq" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/caves/north_central_caves) "aar" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -59,56 +46,32 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/north_central_caves) "aat" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/caves/north_central_caves) "aau" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/caves/north_central_caves) "aav" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/caves/north_central_caves) "aaw" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/north_central_caves) "aax" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/north_central_caves) "aay" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/caves/north_central_caves) "aaz" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/north_central_caves) "aaA" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, -/area/lv624/ground/caves/north_central_caves) -"aaB" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/caves/north_central_caves) "aaC" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/caves/north_central_caves) "aaD" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -118,29 +81,23 @@ /area/lv624/ground/caves/north_east_caves) "aaE" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/north_central_caves) "aaF" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/caves/north_central_caves) "aaG" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/caves/north_central_caves) "aaH" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/north_central_caves) "aaJ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/north_central_caves) "aaK" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/north_central_caves) "aaM" = ( /obj/effect/landmark/crap_item, @@ -153,15 +110,10 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) "aaO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/caves/north_central_caves) "aaP" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/north_central_caves) "aaQ" = ( /turf/closed/wall/cult, @@ -178,38 +130,26 @@ }, /area/lv624/ground/caves/east_caves) "aaT" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/north_central_caves) "aaU" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/dirt, /area/lv624/ground/caves/north_central_caves) "aaV" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/north_central_caves) "aaW" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/north_central_caves) "aaX" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/caves/north_central_caves) "aaY" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/caves/north_central_caves) "aaZ" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/caves/north_central_caves) "aba" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -226,30 +166,20 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) "abd" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/caves/north_central_caves) "abe" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/caves/north_central_caves) "abf" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/caves/north_central_caves) "abg" = ( /obj/effect/landmark/crap_item, /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) "abh" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/lv624/ground/caves/north_central_caves) "abi" = ( @@ -299,7 +229,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "abv" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, @@ -312,6 +242,7 @@ /area/lv624/ground/caves/central_caves) "aby" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/gm/dirt, /area/lv624/ground/caves/west_caves) "abz" = ( @@ -330,6 +261,7 @@ /area/lv624/ground/caves/north_west_caves) "abE" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) "abF" = ( @@ -382,6 +314,7 @@ "abV" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor{ icon_state = "white" }, @@ -475,12 +408,11 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) "acr" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, /turf/open/gm/dirt, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "acs" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ dir = 1; @@ -773,7 +705,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adD" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/diamond{ @@ -784,7 +716,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adE" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/metal{ @@ -800,7 +732,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adF" = ( /obj/structure/surface/rack, /obj/item/tool/shovel, @@ -808,7 +740,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adH" = ( /obj/effect/decal/remains/xeno, /obj/structure/stairs/perspective{ @@ -828,7 +760,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adJ" = ( /obj/effect/landmark/monkey_spawn, /turf/open/gm/dirt, @@ -837,7 +769,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adN" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/iron{ @@ -851,7 +783,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adP" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane, /obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane, @@ -872,7 +804,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adS" = ( /obj/structure/xenoautopsy/tank/hugger, /turf/open/shuttle{ @@ -888,7 +820,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adU" = ( /obj/effect/landmark/crap_item, /turf/open/floor/airless{ @@ -959,7 +891,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "aej" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/prop/brazier/torch, @@ -995,9 +927,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/sand_temple) "aeq" = ( /obj/structure/platform_decoration/mineral/sandstone/runed, @@ -1012,7 +942,7 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/south_east_caves) "aes" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/caves/west_caves) "aet" = ( /obj/structure/fence, @@ -1022,9 +952,7 @@ }, /area/lv624/ground/barrens/containers) "aev" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/sand_temple) "aex" = ( /turf/open/floor{ @@ -1180,7 +1108,7 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "afr" = ( /obj/structure/ore_box, @@ -1447,7 +1375,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "agv" = ( /turf/open/floor/plating{ dir = 4; @@ -1562,9 +1490,7 @@ /area/lv624/ground/caves/sand_temple) "ahe" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/barrens/west_barrens) "ahh" = ( /obj/effect/decal/cleanable/blood, @@ -1617,19 +1543,19 @@ "ahx" = ( /obj/structure/inflatable, /turf/open/gm/dirt, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "ahy" = ( /obj/structure/inflatable, /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "ahz" = ( /obj/structure/inflatable/door, /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "ahB" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/sandstone/runed, @@ -1646,18 +1572,18 @@ /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "ahK" = ( /obj/item/device/analyzer, /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "ahL" = ( /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "ahM" = ( /obj/structure/machinery/floodlight, /turf/open/floor/plating{ @@ -1714,19 +1640,19 @@ /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "aie" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "aif" = ( /obj/effect/landmark/crap_item, /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "aih" = ( /obj/structure/largecrate/random, /obj/item/tool/crowbar/red, @@ -1734,7 +1660,7 @@ dir = 9; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aij" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, @@ -1742,7 +1668,7 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aik" = ( /obj/structure/surface/table, /obj/item/ashtray/plastic, @@ -1752,7 +1678,7 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aim" = ( /obj/structure/surface/table, /obj/item/device/flashlight/lamp, @@ -1760,14 +1686,14 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "ain" = ( /obj/structure/machinery/computer3, /turf/open/floor/plating{ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aio" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_1" @@ -1776,7 +1702,7 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aip" = ( /obj/structure/surface/table, /obj/item/stack/rods{ @@ -1787,7 +1713,7 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiq" = ( /obj/structure/surface/table, /obj/item/stack/cable_coil/random, @@ -1796,18 +1722,16 @@ dir = 5; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiu" = ( /obj/effect/landmark/corpsespawner/miner, /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "aiv" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/barrens/east_barrens) "aiw" = ( /obj/structure/machinery/constructable_frame, @@ -1816,21 +1740,21 @@ dir = 9; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aix" = ( /obj/item/frame/apc, /turf/open/floor/plating{ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiy" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber, /turf/open/floor/plating{ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiz" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -1838,7 +1762,7 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiA" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 30 @@ -1847,14 +1771,14 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiB" = ( /obj/effect/spawner/random/tech_supply, /turf/open/floor/plating{ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiD" = ( /obj/structure/sink{ pixel_y = 30 @@ -1863,24 +1787,24 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiF" = ( /obj/item/weapon/butterfly/switchblade, /turf/open/floor/plating, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiG" = ( /obj/structure/bed/stool, /obj/item/storage/backpack, /turf/open/floor/plating, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiH" = ( /obj/effect/spawner/random/tech_supply, /turf/open/floor/plating, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiI" = ( /obj/structure/bed/stool, /turf/open/floor/plating, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiJ" = ( /obj/structure/surface/table, /obj/item/stack/medical/ointment, @@ -1889,13 +1813,13 @@ dir = 4; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiK" = ( /obj/structure/window/framed/colony, /turf/open/floor{ icon_state = "platebot" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiL" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ name = "Water Filtration Plant"; @@ -1905,13 +1829,13 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiM" = ( /turf/open/floor/plating{ dir = 10; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiO" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -1920,7 +1844,7 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiP" = ( /obj/structure/disposalpipe/junction{ dir = 8; @@ -1929,7 +1853,7 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1937,7 +1861,7 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1946,7 +1870,7 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiS" = ( /obj/item/tool/kitchen/knife/butcher, /turf/open/gm/dirt, @@ -1959,24 +1883,22 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiU" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber, /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiV" = ( /turf/open/floor/plating{ dir = 6; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aja" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/west_jungle) "ajc" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -1991,17 +1913,15 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "ajg" = ( /obj/structure/flora/bush/ausbushes, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/jungle/west_jungle) "ajh" = ( /obj/structure/flora/jungle/planttop1, /turf/closed/wall, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aji" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -2028,23 +1948,21 @@ /area/lv624/ground/barrens/central_barrens) "ajq" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/central_river) "ajr" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "ajs" = ( /obj/structure/flora/jungle/plantbot1, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "ajt" = ( /obj/item/weapon/broken_bottle, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "aju" = ( /obj/structure/disposalpipe/segment{ @@ -2052,16 +1970,16 @@ name = "water pipe" }, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "ajv" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "ajw" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/east_river) "ajx" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -2073,7 +1991,7 @@ "ajA" = ( /obj/structure/fence, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "ajD" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -2084,10 +2002,7 @@ /area/lv624/ground/river/east_river) "ajE" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/central_river) "ajF" = ( /obj/structure/disposalpipe/segment{ @@ -2147,9 +2062,7 @@ /area/lv624/ground/river/central_river) "ajT" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/river/central_river) "ajU" = ( /obj/structure/fence, @@ -2173,9 +2086,7 @@ /area/lv624/ground/river/central_river) "ajY" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/south_east_jungle) "ajZ" = ( /obj/structure/disposalpipe/broken{ @@ -2229,10 +2140,8 @@ /turf/open/floor/wood, /area/lv624/lazarus/hop) "akj" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "akl" = ( /obj/item/device/analyzer, @@ -2244,15 +2153,11 @@ /area/lv624/ground/river/central_river) "akn" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/central_river) "ako" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/central_river) "akp" = ( /obj/structure/grille, @@ -2264,7 +2169,7 @@ /area/lv624/ground/river/east_river) "akq" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "akr" = ( /obj/structure/flora/bush/ausbushes/palebush, @@ -2300,7 +2205,7 @@ /turf/open/gm/river, /area/lv624/ground/river/east_river) "aky" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "akA" = ( /obj/structure/grille, @@ -2332,12 +2237,6 @@ icon_state = "warnplate" }, /area/lv624/ground/river/east_river) -"akG" = ( -/obj/structure/machinery/floodlight/landing, -/turf/open/floor/mech_bay_recharge_floor{ - name = "Shuttle Landing Lights" - }, -/area/lv624/lazarus/landing_zones/lz1) "akJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2384,9 +2283,7 @@ "akR" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/central_river) "akT" = ( /obj/structure/disposalpipe/junction, @@ -2415,44 +2312,29 @@ /area/lv624/ground/river/central_river) "akW" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/central_river) "akY" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/jungle/west_jungle) "akZ" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/jungle/west_jungle) "ala" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/east_river) "alb" = ( /obj/structure/disposalpipe/trunk{ dir = 4 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "alc" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/central_river) "ald" = ( /obj/structure/disposalpipe/segment{ @@ -2467,10 +2349,7 @@ /area/lv624/ground/river/east_river) "ale" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/south_west_jungle) "alg" = ( /obj/structure/ore_box, @@ -2486,28 +2365,14 @@ /area/lv624/ground/river/central_river) "alo" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, -/area/lv624/ground/river/central_river) -"alp" = ( -/obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/river/central_river) "als" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/east_river) "alw" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/lv624/ground/river/east_river) "alx" = ( @@ -2523,13 +2388,11 @@ /turf/open/gm/river, /area/lv624/ground/river/east_river) "alC" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/west_river) "alD" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "alE" = ( /obj/structure/disposalpipe/segment, @@ -2544,9 +2407,7 @@ /area/lv624/ground/river/central_river) "alF" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/central_river) "alK" = ( /obj/structure/disposalpipe/broken{ @@ -2560,16 +2421,10 @@ /area/lv624/ground/river/central_river) "alL" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/north_east_jungle) "alM" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/east_river) "alN" = ( /obj/structure/disposalpipe/trunk{ @@ -2584,10 +2439,8 @@ /turf/open/gm/river, /area/lv624/ground/river/west_river) "alP" = ( -/obj/structure/flora/jungle/vines, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_1, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "alR" = ( @@ -2616,9 +2469,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/central_river) "alU" = ( /obj/structure/disposalpipe/trunk{ @@ -2628,9 +2479,7 @@ /area/lv624/ground/river/central_river) "alW" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "alX" = ( /obj/structure/fence, @@ -2646,9 +2495,7 @@ "alZ" = ( /obj/effect/landmark/crap_item, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/river/central_river) "ama" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -2665,11 +2512,8 @@ }, /area/lv624/ground/river/east_river) "amh" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/alienplant1, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "aml" = ( /obj/structure/disposalpipe/segment, @@ -2715,48 +2559,34 @@ /area/lv624/ground/river/west_river) "amB" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "amC" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "amD" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_east_jungle) "amE" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_east_jungle) "amG" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/lv624/ground/river/west_river) "amK" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/river/west_river) "amL" = ( /obj/structure/flora/bush/ausbushes/palebush, /turf/open/gm/river, /area/lv624/ground/river/east_river) "amN" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz1) "amR" = ( @@ -2784,9 +2614,7 @@ /area/lv624/ground/river/central_river) "amW" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "amX" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -2798,22 +2626,17 @@ "amZ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/west_river) "anc" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "and" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/east_river) "ane" = ( /turf/closed/wall/rock/brown, @@ -2840,20 +2663,18 @@ /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "anq" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "anv" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "anx" = ( /obj/structure/flora/jungle/vines/heavy, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "any" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -2885,7 +2706,7 @@ /area/lv624/lazarus/corporate_dome) "anP" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "anR" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, @@ -2903,10 +2724,7 @@ /area/lv624/lazarus/hydroponics) "anW" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/south_east_jungle) "aoa" = ( /obj/structure/machinery/medical_pod/sleeper, @@ -3096,10 +2914,7 @@ "aoX" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/east_river) "aoZ" = ( /obj/structure/flora/bush/ausbushes/ppflowers, @@ -3108,18 +2923,15 @@ "apa" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/west_river) "aph" = ( /obj/effect/landmark/survivor_spawner, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "apl" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "apo" = ( /obj/structure/flora/bush/ausbushes/ppflowers, @@ -3127,13 +2939,11 @@ /turf/open/gm/river, /area/lv624/ground/river/east_river) "app" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/river/east_river) "apq" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "apt" = ( /turf/open/floor, @@ -3191,14 +3001,12 @@ /turf/open/gm/river, /area/lv624/ground/river/west_river) "apQ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/r_wall, /area/lv624/lazarus/landing_zones/lz1) "apR" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "apV" = ( /obj/item/clothing/under/colonist, @@ -3207,13 +3015,9 @@ }, /area/lv624/lazarus/medbay) "apW" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "apZ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{ @@ -3226,9 +3030,7 @@ /area/lv624/lazarus/medbay) "aqf" = ( /obj/structure/window/framed/colony/reinforced, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "aqi" = ( @@ -3249,9 +3051,7 @@ /area/lv624/lazarus/hydroponics) "aqq" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/west_jungle) "aqr" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, @@ -3261,19 +3061,16 @@ "aqs" = ( /obj/effect/landmark/crap_item, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "aqt" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "aqu" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/river/east_river) "aqz" = ( /obj/effect/landmark/crap_item, @@ -3292,40 +3089,32 @@ /area/lv624/lazarus/medbay) "aqF" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/lazarus/quartstorage/outdoors) "aqG" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/lazarus/quartstorage/outdoors) "aqH" = ( /obj/effect/landmark/crap_item, /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/lazarus/quartstorage/outdoors) "aqI" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/lazarus/quartstorage/outdoors) "aqJ" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/river/east_river) "aqK" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "aqM" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/east_river) "aqQ" = ( /obj/structure/surface/table, @@ -3339,21 +3128,14 @@ }, /area/lv624/lazarus/medbay) "aqR" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/west_jungle) "aqS" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_jungle) "aqV" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/lazarus/quartstorage/outdoors) "aqW" = ( /turf/open/gm/dirt, @@ -3363,9 +3145,7 @@ /turf/open/gm/dirt, /area/lv624/lazarus/quartstorage/outdoors) "aqY" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/lazarus/quartstorage/outdoors) "arc" = ( /obj/effect/landmark/hunter_secondary, @@ -3390,13 +3170,10 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/river/east_river) "arn" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/west_jungle) "aro" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "arp" = ( /obj/structure/surface/rack, @@ -3472,15 +3249,10 @@ /area/lv624/lazarus/hydroponics) "arw" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/lazarus/quartstorage/outdoors) "arE" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/jungle/west_jungle) "arG" = ( /obj/effect/landmark/survivor_spawner, @@ -3515,34 +3287,24 @@ /area/lv624/lazarus/landing_zones/lz1) "arO" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/east_river) "arP" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "arQ" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/east_river) "arR" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/east_river) "arS" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/east_river) "arT" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -3559,30 +3321,21 @@ /turf/open/gm/river, /area/lv624/ground/river/west_river) "asa" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/west_jungle) "asc" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "asd" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_jungle) "ase" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/west_jungle) "asg" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "asi" = ( /obj/structure/girder, @@ -3601,17 +3354,12 @@ "asl" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/east_river) "asm" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/river/east_river) "aso" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -3622,29 +3370,21 @@ /turf/open/gm/river, /area/lv624/ground/river/west_river) "asr" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/north_jungle) "ast" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/south_medbay_road) "asw" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/west_jungle) "asx" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/west_jungle) "asy" = ( /obj/item/tool/warning_cone, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "asz" = ( /obj/structure/barricade/wooden, @@ -3669,7 +3409,7 @@ /turf/open/gm/dirt, /area/lv624/ground/colony/south_medbay_road) "asJ" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/floor{ dir = 5; icon_state = "warning" @@ -3677,7 +3417,7 @@ /area/lv624/lazarus/landing_zones/lz1) "asK" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "asL" = ( /obj/item/tool/warning_cone, @@ -3716,9 +3456,7 @@ "asR" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/west_river) "asT" = ( /turf/closed/wall/r_wall, @@ -3752,27 +3490,23 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "asY" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "asZ" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "ata" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "atc" = ( /obj/structure/girder, @@ -3826,9 +3560,7 @@ }, /area/lv624/lazarus/research) "atu" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/west_jungle) "atv" = ( /obj/structure/closet/crate, @@ -3855,11 +3587,11 @@ /area/lv624/lazarus/fitness) "atA" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "atC" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "atD" = ( /obj/structure/girder/displaced, @@ -3895,10 +3627,7 @@ /area/lv624/lazarus/quartstorage) "atJ" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/west_river) "atM" = ( /obj/structure/closet/crate, @@ -3998,9 +3727,7 @@ /area/lv624/lazarus/fitness) "atZ" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aua" = ( /obj/effect/landmark/crap_item, @@ -4012,10 +3739,7 @@ /area/lv624/lazarus/quartstorage) "auc" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/west_river) "aud" = ( /turf/open/gm/river, @@ -4024,17 +3748,17 @@ /turf/open/floor/wood{ icon_state = "wood-broken3" }, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "auf" = ( /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "aug" = ( /obj/structure/barricade/wooden{ dir = 1; pixel_y = 7 }, /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "auj" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/surgical_tray, @@ -4049,10 +3773,7 @@ /area/lv624/lazarus/medbay) "aul" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/west_river) "aum" = ( /turf/open/floor{ @@ -4117,21 +3838,13 @@ }, /area/lv624/lazarus/research) "aux" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/item/stack/medical/advanced/bruise_pack/predator, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/caves/sand_temple) "auy" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/south_west_jungle) "auz" = ( /obj/structure/surface/rack, @@ -4215,9 +3928,7 @@ /area/lv624/lazarus/quartstorage/outdoors) "auM" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_jungle) "auO" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ @@ -4228,12 +3939,10 @@ /turf/open/floor{ icon_state = "cult" }, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "auP" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/west_river) "auR" = ( /obj/structure/barricade/wooden{ @@ -4242,7 +3951,7 @@ /turf/open/floor/wood{ icon_state = "wood-broken" }, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "auV" = ( /obj/effect/decal/remains/human, /turf/open/floor{ @@ -4352,7 +4061,7 @@ "avo" = ( /obj/structure/barricade/wooden, /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "avp" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/stairs/perspective{ @@ -4418,9 +4127,7 @@ "avy" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/west_river) "avB" = ( /obj/structure/surface/table, @@ -4490,9 +4197,7 @@ /area/lv624/lazarus/research) "avK" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/west_river) "avL" = ( /obj/structure/closet/lasertag/blue, @@ -4518,16 +4223,11 @@ /area/lv624/lazarus/fitness) "avP" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/lazarus/quartstorage/outdoors) "avQ" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/lazarus/quartstorage/outdoors) "avR" = ( /obj/structure/fence, @@ -4581,21 +4281,18 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "awc" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/river/west_river) "awe" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "awg" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/jungle/west_jungle) "awh" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -4751,14 +4448,11 @@ /area/lv624/lazarus/fitness) "awz" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "awC" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/jungle/west_jungle) "awD" = ( /turf/open/floor/plating{ @@ -4778,7 +4472,7 @@ /area/lv624/lazarus/robotics) "awF" = ( /obj/item/storage/toolbox/mechanical, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "awG" = ( /obj/effect/landmark/survivor_spawner, @@ -4811,7 +4505,7 @@ /area/lv624/lazarus/research) "awL" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_central_jungle) "awM" = ( /obj/item/prop/alien/hugger, @@ -4853,7 +4547,7 @@ /area/lv624/lazarus/fitness) "awQ" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_central_jungle) "awR" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -4891,7 +4585,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "awW" = ( /obj/structure/machinery/light/small{ @@ -4980,7 +4674,7 @@ "axp" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "axt" = ( /turf/open/floor{ dir = 9; @@ -5001,10 +4695,7 @@ }, /area/lv624/lazarus/fitness) "axw" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/jungle/west_jungle) "axx" = ( /obj/effect/landmark/corpsespawner/chef, @@ -5048,7 +4739,7 @@ /area/lv624/lazarus/robotics) "axD" = ( /obj/effect/decal/remains/human, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "axF" = ( /turf/open/floor{ @@ -5088,9 +4779,9 @@ dir = 8 }, /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Lazarus Landing"; - phone_id = "Research Dome" + phone_id = "Research Dome"; + pixel_y = 24 }, /turf/open/floor{ dir = 5; @@ -5125,11 +4816,9 @@ }, /area/lv624/lazarus/fitness) "axR" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirt, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "axS" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ pixel_x = 29 @@ -5141,24 +4830,22 @@ }, /area/lv624/lazarus/fitness) "axV" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/west_jungle) "axW" = ( /obj/effect/decal/remains/xeno, /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/north_nexus_road) "axX" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "axY" = ( /obj/structure/tunnel{ id = "hole4" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "axZ" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -5171,13 +4858,13 @@ /area/lv624/lazarus/quartstorage) "aya" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "ayd" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "ayg" = ( /obj/structure/computerframe, @@ -5187,9 +4874,7 @@ /area/lv624/lazarus/robotics) "ayh" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/jungle/west_jungle) "ayj" = ( /obj/structure/machinery/optable, @@ -5212,7 +4897,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aym" = ( /obj/structure/machinery/autolathe, @@ -5306,7 +4991,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "ayC" = ( /obj/item/tool/warning_cone, @@ -5385,7 +5070,7 @@ /area/lv624/lazarus/research) "ayN" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "ayO" = ( /obj/item/weapon/baseballbat/metal, @@ -5417,26 +5102,19 @@ "ayS" = ( /obj/effect/landmark/crap_item, /obj/structure/barricade/wooden, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "ayT" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "ayU" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/south_central_jungle) "ayV" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/jungle/west_jungle) "ayW" = ( /obj/structure/largecrate/random, @@ -5520,7 +5198,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "azh" = ( /obj/item/prop/alien/hugger, @@ -5641,10 +5319,7 @@ /area/lv624/ground/colony/telecomm/tcommdome/south) "azD" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/lazarus/landing_zones/lz2) "azE" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -5762,7 +5437,7 @@ /area/lv624/lazarus/sleep_female) "azU" = ( /obj/structure/barricade/wooden, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "azV" = ( /obj/item/stack/sheet/wood{ @@ -5806,7 +5481,7 @@ /area/lv624/lazarus/landing_zones/lz2) "aAd" = ( /obj/structure/platform/mineral/sandstone/runed, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "aAh" = ( /obj/effect/decal/cleanable/blood/oil, @@ -5851,9 +5526,7 @@ pixel_y = 32 }, /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/north_tcomms_road) "aAp" = ( /turf/closed/wall/strata_ice/jungle, @@ -5868,17 +5541,15 @@ pixel_y = 32 }, /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/north_tcomms_road) "aAs" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz2) "aAt" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aAv" = ( /obj/effect/decal/cleanable/blood, @@ -6166,7 +5837,7 @@ /area/lv624/ground/caves/sand_temple) "aBk" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aBl" = ( /obj/structure/flora/bush/ausbushes/genericbush, @@ -6174,10 +5845,7 @@ /area/lv624/ground/jungle/west_jungle) "aBn" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/west_river) "aBo" = ( /obj/docking_port/stationary/marine_dropship/lz2{ @@ -6346,10 +6014,8 @@ /area/lv624/ground/caves/north_central_caves) "aBQ" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aBR" = ( /obj/structure/largecrate, @@ -6522,9 +6188,7 @@ /area/lv624/lazarus/sleep_male) "aCs" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/lazarus/landing_zones/lz2) "aCt" = ( /obj/structure/closet, @@ -6644,9 +6308,7 @@ }, /area/lv624/lazarus/robotics) "aCO" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/west_jungle) "aCP" = ( /obj/structure/bed/chair/wood/wings{ @@ -6681,9 +6343,7 @@ /area/lv624/lazarus/sleep_male) "aCS" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) "aCT" = ( /obj/structure/closet{ @@ -6709,7 +6369,7 @@ }, /area/lv624/lazarus/sleep_male) "aCV" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/sleep_male) "aCX" = ( /turf/open/floor/grass, @@ -6783,14 +6443,12 @@ /turf/open/gm/river, /area/lv624/ground/jungle/west_jungle) "aDl" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aDn" = ( /obj/item/bananapeel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aDp" = ( /obj/structure/bed/chair/comfy/orange{ @@ -6904,10 +6562,6 @@ icon_state = "warning" }, /area/lv624/lazarus/landing_zones/lz1) -"aDH" = ( -/obj/effect/decal/warning_stripes, -/turf/open/floor/plating, -/area/lv624/lazarus/landing_zones/lz1) "aDI" = ( /obj/structure/machinery/landinglight/ds1/delaytwo, /turf/open/floor/plating, @@ -6941,9 +6595,7 @@ /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz2) "aDP" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/west_central_jungle) "aDS" = ( @@ -7002,9 +6654,7 @@ }, /area/lv624/lazarus/quartstorage) "aEe" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/jungle/west_jungle) "aEf" = ( /obj/effect/landmark/crap_item, @@ -7048,20 +6698,12 @@ /area/lv624/lazarus/fitness) "aEs" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/lazarus/landing_zones/lz2) "aEt" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/lv624/lazarus/yggdrasil) "aEu" = ( /obj/effect/landmark/crap_item, @@ -7070,7 +6712,7 @@ "aEv" = ( /obj/structure/flora/grass/tallgrass/jungle, /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aEw" = ( /obj/structure/machinery/landinglight/ds2{ @@ -7207,10 +6849,7 @@ }, /area/lv624/lazarus/chapel) "aEM" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/jungle/west_jungle) "aEO" = ( /obj/structure/bed/chair{ @@ -7401,7 +7040,7 @@ /area/lv624/lazarus/toilet) "aFm" = ( /turf/closed/wall/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "aFn" = ( /turf/open/floor{ icon_state = "chapel" @@ -7588,7 +7227,7 @@ "aFQ" = ( /obj/structure/window_frame/wood, /turf/open/floor/plating, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "aFR" = ( /turf/open/floor{ dir = 4; @@ -7679,22 +7318,15 @@ /area/lv624/ground/jungle/west_jungle) "aGh" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/lazarus/landing_zones/lz2) "aGk" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aGl" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/west_central_jungle) "aGm" = ( @@ -7868,7 +7500,7 @@ /area/lv624/lazarus/landing_zones/lz1) "aGS" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "aGU" = ( /obj/effect/landmark/crap_item, @@ -7889,7 +7521,7 @@ /area/lv624/lazarus/landing_zones/lz2) "aGY" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/north_nexus_road) "aGZ" = ( /obj/structure/surface/table, @@ -8047,21 +7679,15 @@ /area/lv624/lazarus/landing_zones/lz1) "aHB" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/colony/north_tcomms_road) "aHD" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/west_nexus_road) "aHE" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aHF" = ( /obj/structure/machinery/vending/coffee, @@ -8114,9 +7740,7 @@ /area/lv624/lazarus/landing_zones/lz1) "aHO" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/jungle/west_jungle) "aHQ" = ( /obj/structure/flora/bush/ausbushes/palebush, @@ -8124,9 +7748,7 @@ /area/lv624/ground/jungle/east_jungle) "aHR" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/jungle/west_jungle) "aHT" = ( /obj/structure/window_frame/wood, @@ -8139,7 +7761,7 @@ }, /area/lv624/lazarus/main_hall) "aIb" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/floor{ dir = 8; icon_state = "warning" @@ -8154,12 +7776,8 @@ }, /area/lv624/lazarus/main_hall) "aId" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/south_west_jungle) "aIe" = ( /obj/effect/landmark/crap_item, @@ -8222,15 +7840,15 @@ /area/lv624/lazarus/main_hall) "aIm" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aIn" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aIo" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aIp" = ( /obj/structure/surface/table, @@ -8242,7 +7860,7 @@ /area/lv624/lazarus/main_hall) "aIq" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aIr" = ( /obj/structure/machinery/atm{ @@ -8308,11 +7926,9 @@ }, /area/lv624/ground/caves/north_central_caves) "aIz" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/effect/landmark/monkey_spawn, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_jungle) "aIB" = ( /obj/structure/closet, @@ -8327,7 +7943,7 @@ /obj/item/weapon/gun/shotgun/double/with_stock, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "aII" = ( /obj/structure/surface/rack, /obj/item/clothing/glasses/regular, @@ -8339,7 +7955,7 @@ /area/lv624/lazarus/research) "aIJ" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aIL" = ( /obj/structure/flora/jungle/vines/heavy, @@ -8347,9 +7963,7 @@ /turf/open/floor/plating, /area/lv624/lazarus/yggdrasil) "aIM" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 2; name = "\improper Atmospherics Condenser" @@ -8374,9 +7988,7 @@ }, /area/lv624/lazarus/main_hall) "aIV" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) @@ -8384,16 +7996,14 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aIY" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz1) "aIZ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz1) "aJa" = ( @@ -8444,9 +8054,7 @@ }, /area/lv624/lazarus/main_hall) "aJi" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) @@ -8474,26 +8082,20 @@ }, /area/lv624/lazarus/landing_zones/lz1) "aJr" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aJu" = ( /obj/structure/flora/jungle/planttop1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aJv" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aJz" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall, /area/lv624/lazarus/yggdrasil) "aJA" = ( @@ -8545,9 +8147,7 @@ /area/lv624/lazarus/main_hall) "aJF" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/lazarus/landing_zones/lz2) "aJG" = ( /obj/item/tool/pickaxe/jackhammer{ @@ -8633,9 +8233,7 @@ /area/lv624/lazarus/main_hall) "aJO" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/lazarus/landing_zones/lz2) "aJP" = ( /obj/item/stock_parts/scanning_module/phasic, @@ -8675,20 +8273,6 @@ /obj/effect/landmark/hunter_primary, /turf/open/floor, /area/lv624/lazarus/landing_zones/lz1) -"aJT" = ( -/obj/effect/decal/warning_stripes, -/obj/structure/machinery/landinglight/ds1{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv624/lazarus/landing_zones/lz1) -"aJU" = ( -/obj/effect/decal/warning_stripes, -/obj/structure/machinery/landinglight/ds1{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv624/lazarus/landing_zones/lz1) "aJZ" = ( /obj/structure/closet, /obj/item/clothing/glasses/sunglasses, @@ -8700,35 +8284,31 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "aKc" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aKd" = ( /obj/effect/landmark/hunter_primary, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "aKf" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aKg" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aKh" = ( /obj/effect/landmark/good_item, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKi" = ( /obj/structure/machinery/colony_floodlight, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKj" = ( /obj/structure/stairs/perspective{ @@ -8744,32 +8324,22 @@ "aKk" = ( /obj/structure/flora/jungle/plantbot1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKl" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKm" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKn" = ( /obj/effect/landmark/lv624/xeno_tunnel, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKo" = ( /turf/closed/wall/strata_ice/jungle, @@ -8777,23 +8347,19 @@ "aKp" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKq" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/machinery/power/apc{ dir = 1; name = "Atmospherics Processing APC" }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKr" = ( /obj/structure/window_frame/colony, -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/floor/plating, /area/lv624/lazarus/yggdrasil) "aKv" = ( @@ -8818,65 +8384,38 @@ /turf/open/floor, /area/lv624/lazarus/main_hall) "aKB" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKC" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKD" = ( /obj/structure/flora/grass/ice/both, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKE" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "gbcorner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/gbcorner/north_west, /area/lv624/lazarus/yggdrasil) "aKF" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grassbeach/north, /area/lv624/lazarus/yggdrasil) "aKG" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grassbeach/north, /area/lv624/lazarus/yggdrasil) "aKH" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - dir = 8; - icon_state = "gbcorner" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/gbcorner/north_east, /area/lv624/lazarus/yggdrasil) "aKI" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/yggdrasil) "aKJ" = ( /obj/structure/machinery/light/small, @@ -8922,53 +8461,38 @@ /area/lv624/ground/jungle/south_west_jungle) "aKZ" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/central_jungle) "aLb" = ( -/obj/structure/flora/tree/dead, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/tree/dead/tree_1, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aLc" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "gbcorner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/gbcorner/north_west, /area/lv624/lazarus/yggdrasil) "aLd" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grassbeach/north, /area/lv624/lazarus/yggdrasil) "aLe" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aLf" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aLg" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - dir = 8; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/north_east, /area/lv624/lazarus/yggdrasil) "aLh" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/yggdrasil) "aLi" = ( /obj/structure/flora/jungle/vines/heavy{ @@ -8977,10 +8501,8 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "aLj" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aLk" = ( /turf/closed/wall/r_wall, @@ -9003,21 +8525,15 @@ }, /area/lv624/lazarus/main_hall) "aLo" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "aLp" = ( /turf/closed/wall, /area/lv624/lazarus/canteen) "aLq" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "aLr" = ( /obj/effect/landmark/xeno_spawn, @@ -9036,17 +8552,13 @@ }, /area/lv624/lazarus/robotics) "aLv" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/central_jungle) "aLw" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_y = 26 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "aLz" = ( @@ -9057,7 +8569,7 @@ /area/lv624/lazarus/landing_zones/lz1) "aLF" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aLI" = ( /obj/structure/flora/jungle/planttop1, @@ -9067,38 +8579,29 @@ "aLJ" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/lv624/lazarus/yggdrasil) "aLK" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aLL" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grassbeach/south, /area/lv624/lazarus/yggdrasil) "aLM" = ( -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/lv624/lazarus/yggdrasil) "aLN" = ( /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aLO" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aLQ" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/east_central_jungle) "aLS" = ( @@ -9177,8 +8680,8 @@ "aMd" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp{ - pixel_y = 14; - pixel_x = 6 + pixel_x = 6; + pixel_y = 14 }, /obj/structure/transmitter/colony_net/rotary{ phone_category = "Lazarus Landing"; @@ -9285,23 +8788,19 @@ /area/lv624/lazarus/landing_zones/lz1) "aMr" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "aMt" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aMz" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/east_central_jungle) "aMD" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aMN" = ( /obj/structure/grille{ @@ -9314,46 +8813,28 @@ /area/lv624/lazarus/yggdrasil) "aMO" = ( /obj/structure/flora/jungle/plantbot1, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aMP" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aMQ" = ( /obj/structure/flora/tree/jungle/bigtreeTL, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/lv624/lazarus/yggdrasil) "aMS" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/lv624/lazarus/yggdrasil) "aMT" = ( /obj/structure/flora/tree/jungle/bigtreeTR, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aMU" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aMV" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, @@ -9361,11 +8842,8 @@ /area/lv624/lazarus/yggdrasil) "aMW" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grassbeach/east, /area/lv624/lazarus/yggdrasil) "aMX" = ( /obj/structure/machinery/deployable/barrier, @@ -9424,7 +8902,7 @@ /area/lv624/lazarus/security) "aNf" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aNh" = ( /obj/structure/bed/chair/office/light{ @@ -9460,9 +8938,7 @@ /area/lv624/lazarus/canteen) "aNn" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/jungle/west_jungle) "aNo" = ( /turf/closed/wall/r_wall, @@ -9475,7 +8951,7 @@ /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "aNA" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/floor/plating{ icon_state = "platebotc" }, @@ -9483,66 +8959,44 @@ "aNB" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aNC" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/lv624/lazarus/yggdrasil) "aND" = ( -/obj/structure/flora/jungle/plantbot1{ - desc = "Doesn't look like it'll do much cleaning any more."; - icon_state = "cart_wreck"; - name = "old janicart" - }, +/obj/structure/flora/jungle/cart_wreck, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aNE" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /obj/effect/landmark/objective_landmark/close, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aNF" = ( /obj/structure/flora/jungle/treeblocker, /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aNG" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aNH" = ( /obj/structure/flora/jungle/planttop1, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aNI" = ( -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/east, /area/lv624/lazarus/yggdrasil) "aNJ" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aNK" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/window_frame/colony, /turf/open/floor/plating, /area/lv624/lazarus/yggdrasil) @@ -9676,10 +9130,7 @@ /area/lv624/lazarus/kitchen) "aOb" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/north_jungle) "aOc" = ( /obj/structure/machinery/light/small{ @@ -9712,11 +9163,8 @@ }, /area/lv624/lazarus/sleep_female) "aOs" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grassbeach/west, /area/lv624/lazarus/yggdrasil) "aOt" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, @@ -9728,9 +9176,7 @@ /area/lv624/lazarus/yggdrasil) "aOv" = ( /obj/structure/flora/jungle/treeblocker, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aOw" = ( /obj/structure/flora/jungle/plantbot1, @@ -9812,7 +9258,7 @@ /area/lv624/lazarus/chapel) "aOG" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aOI" = ( /obj/structure/surface/table/reinforced/prison, @@ -9838,10 +9284,7 @@ /area/lv624/lazarus/security) "aOL" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/north_nexus_road) "aOM" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, @@ -9892,19 +9335,15 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "aOW" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aOX" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/central_jungle) "aPe" = ( /obj/structure/surface/table, @@ -9920,50 +9359,32 @@ }, /area/lv624/lazarus/quart) "aPf" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "aPg" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - dir = 4; - icon_state = "gbcorner" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/gbcorner/south_west, /area/lv624/lazarus/yggdrasil) "aPh" = ( -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/north, /area/lv624/lazarus/yggdrasil) "aPi" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/north, /area/lv624/lazarus/yggdrasil) "aPj" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grassbeach/east, /area/lv624/lazarus/yggdrasil) "aPk" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall, /area/lv624/lazarus/yggdrasil) "aPm" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aPo" = ( /obj/effect/landmark/crap_item, @@ -10139,12 +9560,12 @@ /obj/structure/lz_sign/lazarus_sign{ density = 0 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "aPS" = ( /obj/structure/flora/tree/jungle/bigtreeBOT, /obj/structure/flora/bush/ausbushes/var3/leafybush, -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aPT" = ( @@ -10157,14 +9578,12 @@ /area/lv624/lazarus/yggdrasil) "aPV" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aPY" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/east_central_jungle) "aPZ" = ( /obj/structure/machinery/light/small{ @@ -10237,58 +9656,35 @@ /area/lv624/lazarus/comms) "aQo" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aQp" = ( /obj/structure/machinery/colony_floodlight, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - dir = 4; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/south_west, /area/lv624/lazarus/yggdrasil) "aQr" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/lv624/lazarus/yggdrasil) "aQs" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grassbeach/south, /area/lv624/lazarus/yggdrasil) "aQt" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grassbeach/south, /area/lv624/lazarus/yggdrasil) "aQu" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/lv624/lazarus/yggdrasil) "aQw" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aQx" = ( /turf/closed/wall/r_wall, @@ -10428,21 +9824,17 @@ /area/lv624/lazarus/canteen) "aQX" = ( /obj/effect/landmark/hunter_primary, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aQY" = ( /obj/structure/flora/jungle/planttop1, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "aRa" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aRd" = ( /obj/structure/surface/table, @@ -10512,9 +9904,7 @@ /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/jungle/vines/heavy, /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aRq" = ( /obj/structure/surface/table/reinforced{ @@ -10522,7 +9912,7 @@ flipped = 1 }, /obj/structure/machinery/computer/shuttle/dropship/flight/lz1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "aRu" = ( /obj/structure/machinery/landinglight/ds2{ @@ -10534,13 +9924,11 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aRx" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/lazarus/landing_zones/lz2) "aRz" = ( /obj/structure/bed, @@ -10638,10 +10026,8 @@ /area/lv624/lazarus/main_hall) "aRO" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "aRP" = ( /obj/structure/machinery/light/small{ @@ -10682,9 +10068,7 @@ /area/lv624/lazarus/kitchen) "aRV" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "aRW" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -10756,23 +10140,17 @@ "aSi" = ( /obj/structure/foamed_metal, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aSj" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/foamed_metal, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aSm" = ( /obj/structure/foamed_metal, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aSo" = ( /obj/structure/stairs/perspective{ @@ -11196,7 +10574,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aTW" = ( /obj/item/clothing/glasses/regular, @@ -11269,10 +10647,7 @@ /area/lv624/lazarus/kitchen) "aUe" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/jungle/west_jungle) "aUh" = ( /obj/structure/window_frame/colony/reinforced, @@ -11280,7 +10655,7 @@ /area/lv624/lazarus/canteen) "aUi" = ( /obj/effect/landmark/hunter_secondary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aUj" = ( /obj/structure/largecrate/random, @@ -11359,10 +10734,7 @@ /area/lv624/lazarus/engineering) "aUz" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/north_east_jungle) "aUA" = ( /obj/item/bedsheet/rd, @@ -11476,10 +10848,8 @@ /area/lv624/lazarus/kitchen) "aUO" = ( /obj/item/shard, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "aUQ" = ( /turf/open/floor/greengrid, @@ -11502,7 +10872,7 @@ /area/lv624/lazarus/secure_storage) "aVa" = ( /obj/item/xenos_claw, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aVb" = ( /obj/structure/machinery/light, @@ -11568,18 +10938,15 @@ "aVk" = ( /obj/structure/sign/safety/maint, /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_nexus_road) "aVl" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aVm" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/colony/north_nexus_road) "aVn" = ( /obj/structure/surface/table/reinforced{ @@ -11632,11 +10999,10 @@ /turf/closed/wall/r_wall, /area/lv624/lazarus/kitchen) "aVw" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aVx" = ( /obj/structure/surface/table/woodentable/poor, @@ -11647,9 +11013,7 @@ /area/lv624/ground/caves/north_central_caves) "aVA" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "aVB" = ( /obj/structure/window/framed/colony/reinforced, @@ -11666,7 +11030,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aVF" = ( /obj/structure/machinery/power/apc{ @@ -11708,13 +11072,11 @@ /area/lv624/lazarus/engineering) "aVJ" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aVK" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aVL" = ( /obj/structure/surface/table, @@ -11753,18 +11115,17 @@ /area/lv624/lazarus/kitchen) "aVS" = ( /turf/closed/wall/mineral/sandstone/runed, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aVT" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_west_jungle) "aVU" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "aVV" = ( /obj/item/device/radio/intercom{ @@ -11863,9 +11224,7 @@ /area/lv624/lazarus/engineering) "aWh" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/north_nexus_road) "aWi" = ( /obj/structure/bed/stool, @@ -11885,16 +11244,14 @@ }, /obj/effect/decal/cleanable/cobweb, /turf/open/gm/dirt, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWl" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWm" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_y = 26 @@ -11903,48 +11260,44 @@ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWn" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWo" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_y = 26 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWp" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_y = 26 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWs" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_x = -28 }, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aWu" = ( /obj/structure/machinery/door/poddoor/almayer{ @@ -11996,7 +11349,7 @@ /area/lv624/lazarus/engineering) "aWC" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aWD" = ( /turf/open/floor/plating{ @@ -12053,9 +11406,7 @@ /area/lv624/lazarus/engineering) "aWJ" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "aWK" = ( /obj/structure/window_frame/colony/reinforced, @@ -12084,17 +11435,17 @@ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWP" = ( /obj/effect/landmark/monkey_spawn, /turf/open/gm/dirt, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWQ" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_x = -28 }, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aWR" = ( /obj/structure/safe{ @@ -12180,15 +11531,11 @@ }, /area/lv624/lazarus/sleep_male) "aXd" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/lazarus/comms) "aXe" = ( /obj/structure/foamed_metal, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/lazarus/comms) "aXf" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -12214,38 +11561,33 @@ }, /area/lv624/lazarus/engineering) "aXh" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aXi" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/north_nexus_road) "aXj" = ( /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "aXk" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "aXl" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_x = -28 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aXn" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "aXo" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aXs" = ( /obj/structure/extinguisher_cabinet{ @@ -12259,10 +11601,10 @@ /obj/structure/surface/rack, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Lazarus Landing"; phone_color = "yellow"; - phone_id = "Engineering" + phone_id = "Engineering"; + pixel_y = 24 }, /turf/open/floor{ icon_state = "dark" @@ -12279,7 +11621,7 @@ /area/lv624/lazarus/engineering) "aXv" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aXw" = ( /obj/structure/closet/secure_closet/engineering_electrical, @@ -12290,27 +11632,25 @@ "aXx" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aXy" = ( /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/mineral/sandstone/runed, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aXA" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aXB" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_x = -28 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aXC" = ( /obj/structure/surface/table/woodentable/poor, @@ -12324,7 +11664,7 @@ }, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "aXD" = ( /obj/structure/surface/rack, /obj/item/tank/phoron, @@ -12351,9 +11691,7 @@ }, /obj/effect/decal/remains/xeno, /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/west_tcomms_road) "aXJ" = ( /obj/structure/foamed_metal{ @@ -12389,32 +11727,32 @@ /area/lv624/lazarus/engineering) "aXP" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aXQ" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/dirt, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aXR" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aXS" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_y = 26 }, /turf/closed/wall/mineral/sandstone/runed, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aXU" = ( /obj/effect/landmark/good_item, /turf/open/floor/greengrid, /area/lv624/lazarus/secure_storage) "aXV" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aXW" = ( /obj/structure/foamed_metal{ @@ -12425,7 +11763,7 @@ }, /area/lv624/lazarus/engineering) "aXX" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "aXZ" = ( /obj/structure/surface/rack, @@ -12473,19 +11811,14 @@ /area/lv624/lazarus/engineering) "aYj" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aYm" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_y = 24 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/south_west_jungle) "aYn" = ( /obj/effect/landmark/objective_landmark/science, @@ -12497,22 +11830,19 @@ /obj/structure/flora/jungle/vines/heavy{ pixel_y = 26 }, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/south_west_jungle) "aYp" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_y = 24 }, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aYr" = ( /obj/effect/landmark/yautja_teleport, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "aYs" = ( /obj/structure/largecrate/lisa, @@ -12523,25 +11853,23 @@ /turf/open/floor/greengrid, /area/lv624/lazarus/secure_storage) "aYv" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aYw" = ( /obj/structure/sign/safety/high_voltage{ pixel_x = 7; pixel_y = 32 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "aYx" = ( /obj/structure/tunnel{ id = "hole4" }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "aYC" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -12624,61 +11952,49 @@ /area/lv624/ground/caves/north_central_caves) "aYQ" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "aYR" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/west_river) "aYS" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/river/west_river) "aYT" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/west_river) "aYU" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "aYV" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/river/west_river) "aYX" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/west_river) "aYY" = ( /obj/effect/landmark/hunter_secondary, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "aYZ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "aZa" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/west_river) "aZb" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -12773,7 +12089,7 @@ }, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "aZo" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/megaphone, @@ -12789,7 +12105,7 @@ /turf/open/floor/wood{ icon_state = "wood-broken6" }, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "aZs" = ( /obj/structure/closet/secure_closet/bar, /turf/open/floor{ @@ -12942,7 +12258,7 @@ /area/lv624/ground/caves/east_caves) "aZP" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/lazarus/landing_zones/lz2) "aZT" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ @@ -12953,103 +12269,85 @@ "baa" = ( /obj/effect/landmark/monkey_spawn, /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "bad" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "baN" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "bbj" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "bbp" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "bbu" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "bbx" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "bbC" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "bbH" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "bbI" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "bbJ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "bbL" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "bbN" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "bbO" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "bbT" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/effect/decal/remains/human, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "bbU" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/effect/decal/remains/human, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "bbZ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_central_jungle) "bdL" = ( /obj/structure/surface/table/reinforced/prison, @@ -13066,7 +12364,7 @@ "bei" = ( /obj/structure/flora/jungle/vines/heavy, /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "beB" = ( /obj/structure/bed/chair/comfy/black{ @@ -13080,10 +12378,7 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/containers) "bfe" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/north_east_jungle) "bfY" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -13093,18 +12388,14 @@ /area/lv624/ground/caves/east_caves) "bgL" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/west_tcomms_road) "bgQ" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "bhr" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/south_east_jungle) "bhL" = ( /obj/structure/surface/table/reinforced/prison{ @@ -13125,24 +12416,18 @@ /area/lv624/ground/caves/sand_temple) "bit" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "bkG" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/central_river) "bkP" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "bkY" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/south_west_jungle) "blC" = ( /obj/item/stack/sheet/wood, @@ -13161,14 +12446,11 @@ /area/lv624/lazarus/corporate_dome) "bnE" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "bnX" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/central_river) "boe" = ( /turf/open/floor/sandstone/runed, @@ -13195,14 +12477,11 @@ /area/lv624/lazarus/quartstorage) "brh" = ( /obj/structure/flora/jungle/plantbot1, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "bsR" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/south_west_jungle) "btb" = ( /obj/item/stack/sheet/wood{ @@ -13212,10 +12491,8 @@ /area/lv624/lazarus/landing_zones/lz1) "bte" = ( /obj/effect/landmark/hunter_primary, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "btr" = ( /obj/item/weapon/harpoon/yautja{ @@ -13241,11 +12518,11 @@ /area/lv624/ground/barrens/south_eastern_barrens) "btF" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "btS" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "btX" = ( /turf/open/gm/river, @@ -13264,39 +12541,31 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "buL" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "buW" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "bwc" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/barrens/west_barrens) "bwk" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_barrens) "bwR" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "byl" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/river/east_river) "byK" = ( /obj/structure/machinery/landinglight/ds2/delayone{ @@ -13311,6 +12580,11 @@ "byY" = ( /turf/open/gm/dirt, /area/lv624/ground/colony/north_tcomms_road) +"bzs" = ( +/turf/open/gm/dirtgrassborder{ + dir = 4 + }, +/area/lv624/ground/jungle/south_west_jungle/ceiling) "bzD" = ( /obj/structure/largecrate/random, /obj/item/storage/fancy/crayons{ @@ -13323,41 +12597,30 @@ }, /area/lv624/lazarus/corporate_dome) "bAB" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/south_east_jungle) "bBk" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "bBu" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/jungle/west_jungle) "bCe" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/south_east_jungle) "bCH" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "bCT" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "bEq" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_barrens) "bEU" = ( /obj/structure/showcase{ @@ -13385,7 +12648,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "bGb" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -13402,10 +12665,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/caves/sand_temple) "bJz" = ( /obj/effect/decal/cleanable/blood, @@ -13418,19 +12678,13 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/south_east_caves) "bLE" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/sand_temple) "bMu" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/east_jungle) "bNn" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_barrens) "bNW" = ( @@ -13465,9 +12719,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "bQA" = ( /obj/structure/stairs/perspective{ @@ -13478,10 +12730,7 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "bQP" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/north_east_jungle) "bRV" = ( /obj/structure/stairs/perspective{ @@ -13497,7 +12746,7 @@ /area/lv624/ground/caves/sand_temple) "bSm" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "bTw" = ( /obj/effect/landmark/nightmare{ @@ -13529,20 +12778,18 @@ }, /area/lv624/lazarus/crashed_ship_containers) "bXP" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/item/stack/sheet/wood{ amount = 2 }, /obj/effect/landmark/objective_landmark/far, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "bZb" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "bZX" = ( /obj/structure/window/framed/colony, @@ -13550,17 +12797,15 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "cac" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "cag" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/caves/sand_temple) "caH" = ( /obj/effect/landmark/objective_landmark/far, @@ -13572,13 +12817,13 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "ccn" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "cdj" = ( /obj/structure/window_frame/colony, @@ -13603,10 +12848,7 @@ /turf/closed/wall/r_wall/unmeltable, /area/lv624/lazarus/quartstorage/outdoors) "cfN" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/north_jungle) "cfP" = ( /obj/effect/decal/remains/human, @@ -13626,7 +12868,7 @@ }, /area/lv624/lazarus/corporate_dome) "cgC" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/floor{ dir = 10; icon_state = "warning" @@ -13634,10 +12876,7 @@ /area/lv624/lazarus/landing_zones/lz2) "cgD" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/east_central_jungle) "cgK" = ( /obj/item/stool, @@ -13652,10 +12891,7 @@ /area/lv624/ground/caves/west_caves) "cij" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "ciA" = ( /obj/structure/surface/table/reinforced/prison{ @@ -13677,7 +12913,7 @@ /area/lv624/ground/caves/sand_temple) "cmf" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "cmP" = ( /obj/structure/barricade/metal/wired, @@ -13698,10 +12934,10 @@ }, /area/lv624/ground/caves/sand_temple) "cpQ" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "cpY" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "cqm" = ( /obj/structure/powerloader_wreckage/ft, @@ -13709,19 +12945,15 @@ /area/lv624/ground/barrens/containers) "cqw" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_nexus_road) "cqz" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_west_jungle) "cqE" = ( /obj/structure/barricade/wooden, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor{ dir = 1; icon_state = "warning" @@ -13729,13 +12961,11 @@ /area/lv624/lazarus/landing_zones/lz1) "crF" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "csu" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "csM" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -13744,17 +12974,15 @@ "cvk" = ( /obj/structure/fence, /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/west_central_jungle) "cwv" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "cwV" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "cxc" = ( /obj/item/tool/shovel, @@ -13764,9 +12992,7 @@ /area/lv624/ground/barrens/west_barrens) "cys" = ( /obj/structure/foamed_metal, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_central_jungle) "czq" = ( /obj/effect/landmark/objective_landmark/medium, @@ -13776,7 +13002,7 @@ /area/lv624/lazarus/corporate_dome) "czu" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "cAl" = ( /obj/structure/girder/displaced, @@ -13818,35 +13044,31 @@ }, /area/lv624/ground/caves/south_west_caves) "cCr" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_jungle) "cEh" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "cEn" = ( /obj/effect/decal/remains/xeno, /turf/open/gm/dirt, /area/lv624/ground/barrens/west_barrens) "cEQ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "cGb" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "cIL" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "cIQ" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "cIU" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -13867,17 +13089,12 @@ /area/lv624/lazarus/corporate_dome) "cJA" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "cKj" = ( /obj/effect/landmark/yautja_teleport, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) -"cLw" = ( -/turf/open/gm/coast{ - dir = 5 - }, -/area/lv624/ground/river/central_river) "cLD" = ( /turf/open/floor{ dir = 4; @@ -13886,7 +13103,7 @@ /area/lv624/lazarus/corporate_dome) "cMj" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "cMD" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -13915,11 +13132,11 @@ /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) "cPV" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "cQJ" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "cQX" = ( /obj/structure/stairs/perspective{ @@ -13931,56 +13148,45 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "cRm" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/mineral/sandstone/runed/decor, /area/lv624/ground/caves/sand_temple) "cRT" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "cSs" = ( /obj/item/tool/surgery/surgicaldrill/predatorsurgicaldrill, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "cTi" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "cUk" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/north_east_jungle) "cUL" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "cWm" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "cWr" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "cXd" = ( /obj/effect/landmark/monkey_spawn, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/west_central_jungle) "cXk" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/barrens/west_barrens) "cYi" = ( /obj/structure/surface/table, @@ -14009,13 +13215,13 @@ /area/lv624/lazarus/crashed_ship_containers) "dbY" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "ddS" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "dff" = ( /obj/structure/bed/sofa/vert/grey, @@ -14057,7 +13263,7 @@ /area/lv624/lazarus/quartstorage) "djI" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "dkN" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -14065,37 +13271,26 @@ /area/lv624/ground/caves/sand_temple) "dkO" = ( /obj/effect/decal/remains/xeno, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "dlh" = ( /obj/structure/bed/chair/comfy/black, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "dmf" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/jungle/west_jungle) "dmS" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "dmZ" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "dop" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "dql" = ( /obj/structure/largecrate, @@ -14116,7 +13311,7 @@ /area/lv624/ground/barrens/south_eastern_barrens) "dqK" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "drm" = ( /obj/structure/closet/crate, @@ -14131,7 +13326,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "dsz" = ( /obj/structure/closet/crate/hydroponics/prespawned, /obj/effect/landmark/objective_landmark/close, @@ -14142,12 +13337,12 @@ /area/lv624/lazarus/hydroponics) "dvf" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "dvF" = ( /obj/structure/flora/bush/ausbushes/pointybush, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "dvX" = ( /obj/structure/bookcase/manuals/medical, @@ -14175,10 +13370,7 @@ /area/lv624/ground/barrens/south_eastern_barrens) "dwt" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/lazarus/landing_zones/lz2) "dwN" = ( /obj/structure/bed/sofa/vert/grey/bot, @@ -14203,10 +13395,7 @@ pixel_x = 12; pixel_y = 15 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "dCL" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle{ @@ -14220,37 +13409,27 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "dDa" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "dEc" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/south_central_jungle) "dEg" = ( /turf/open/gm/dirt, /area/lv624/ground/jungle/east_central_jungle) "dEp" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "dEI" = ( /obj/effect/landmark/monkey_spawn, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "dFk" = ( /obj/structure/bed/chair/comfy/black{ @@ -14265,15 +13444,10 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/west_caves) "dGc" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) "dGG" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/central_river) "dGQ" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -14282,10 +13456,7 @@ /area/lv624/ground/caves/central_caves) "dHo" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/north_jungle) "dId" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, @@ -14302,12 +13473,10 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "dKg" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "dLd" = ( /obj/structure/bookcase, @@ -14328,13 +13497,10 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/east_jungle) "dLY" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "dMF" = ( /obj/structure/surface/table/reinforced/prison{ @@ -14351,18 +13517,18 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "dNj" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_barrens) "dNx" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "dNN" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "dOf" = ( /obj/effect/decal/cleanable/blood/drip, @@ -14439,7 +13605,7 @@ /area/lv624/ground/colony/west_nexus_road) "dZp" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "dZH" = ( /obj/structure/filingcabinet, @@ -14450,10 +13616,8 @@ }, /area/lv624/lazarus/medbay) "dZY" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "eah" = ( /obj/effect/landmark/objective_landmark/close, @@ -14470,9 +13634,7 @@ /area/lv624/lazarus/landing_zones/lz1) "ebS" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/south_nexus_road) "ecy" = ( /turf/closed/wall/sulaco, @@ -14485,25 +13647,23 @@ }, /area/lv624/ground/caves/sand_temple) "ecO" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/west_nexus_road) "edS" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "eeW" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "efp" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "efX" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/east_river) "ehy" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -14516,7 +13676,7 @@ /area/lv624/lazarus/hydroponics) "eil" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "eiH" = ( /obj/item/stack/sheet/wood{ @@ -14530,15 +13690,11 @@ /area/lv624/lazarus/landing_zones/lz2) "eiP" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/river/east_river) "eji" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "ejx" = ( /obj/structure/disposalpipe/segment, @@ -14546,7 +13702,7 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "ekB" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -14573,11 +13729,11 @@ /area/lv624/lazarus/hydroponics) "eny" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "eoo" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "eoM" = ( /turf/open/floor{ @@ -14603,10 +13759,10 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "eqF" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "eqP" = ( /obj/structure/machinery/bioprinter, @@ -14615,16 +13771,10 @@ }, /area/lv624/lazarus/medbay) "erx" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/jungle/west_jungle) "esi" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/barrens/west_barrens) "esp" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -14643,29 +13793,23 @@ /area/lv624/ground/caves/north_central_caves) "evT" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "exf" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_west_jungle) "eyb" = ( /obj/structure/fence, /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/west_tcomms_road) "eyn" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/central_jungle) "ezz" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/east_central_jungle) "ezC" = ( /obj/structure/stairs/perspective{ @@ -14702,10 +13846,8 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "eBu" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "eBN" = ( /obj/structure/closet/crate/hydroponics/prespawned, @@ -14720,7 +13862,7 @@ /area/lv624/lazarus/hydroponics) "eCx" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "eCF" = ( /obj/structure/surface/table, @@ -14729,18 +13871,15 @@ /area/lv624/landing/console2) "eDy" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "eDS" = ( /obj/structure/machinery/colony_floodlight, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "eER" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "eFS" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -14777,17 +13916,14 @@ /area/lv624/ground/river/central_river) "eHr" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "eHQ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/north_west_jungle) "eKs" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "eLx" = ( /obj/effect/decal/cleanable/blood/drip, @@ -14797,9 +13933,7 @@ }, /area/lv624/lazarus/crashed_ship_containers) "eNK" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/south_east_jungle) "eNQ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -14818,20 +13952,15 @@ /area/lv624/ground/barrens/south_eastern_jungle_barrens) "ePu" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/gm/dirt, /area/lv624/ground/caves/south_west_caves) "ePw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/jungle/south_east_jungle) "ePV" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "eQh" = ( /obj/structure/largecrate/random, @@ -14842,21 +13971,14 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/east_jungle) "eTd" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/west_central_jungle) "eTI" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "eTQ" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_east_jungle) "eVH" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -14902,7 +14024,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "fbD" = ( /obj/structure/flora/jungle/planttop1, @@ -14940,7 +14062,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "fhs" = ( /obj/structure/stairs/perspective{ @@ -14957,26 +14079,22 @@ }, /area/lv624/ground/barrens/south_eastern_barrens) "fhJ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/barrens/south_eastern_barrens) "fhR" = ( /obj/structure/flora/jungle/planttop1, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "fio" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "fir" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "fiE" = ( /obj/structure/bed/alien, @@ -14985,7 +14103,7 @@ /area/lv624/ground/caves/north_central_caves) "fiZ" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "fja" = ( /obj/item/attachable/bayonet{ @@ -14995,24 +14113,19 @@ name = "\improper alien blade"; throwforce = 26 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "fjM" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "fjP" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/colony/south_nexus_road) "fjQ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "fkJ" = ( /obj/structure/sink{ @@ -15025,16 +14138,10 @@ }, /area/lv624/lazarus/corporate_dome) "fpn" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/barrens/east_barrens) "fqh" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/east_jungle) "fqM" = ( /obj/structure/machinery/power/apc{ @@ -15066,14 +14173,10 @@ }, /area/lv624/lazarus/corporate_dome) "fur" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) "fuy" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz2) "fuY" = ( @@ -15095,7 +14198,7 @@ /area/lv624/ground/caves/sand_temple) "fyA" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "fzg" = ( /obj/item/storage/firstaid/toxin/empty, @@ -15153,19 +14256,16 @@ }, /area/lv624/lazarus/landing_zones/lz1) "fDO" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/lv624/ground/barrens/west_barrens) "fEn" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "fED" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "fEU" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -15201,7 +14301,7 @@ /area/lv624/ground/colony/telecomm/cargo) "fGO" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "fHi" = ( /obj/item/ammo_magazine/smg/mp5, @@ -15210,17 +14310,12 @@ }, /area/lv624/lazarus/corporate_dome) "fHz" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "fIj" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/colony/west_nexus_road) "fIt" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, @@ -15235,7 +14330,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "fMl" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -15254,29 +14349,20 @@ }, /area/lv624/lazarus/crashed_ship_containers) "fPi" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/caves/sand_temple) "fPH" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_central_jungle) "fQL" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/west_river) "fSX" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) "fTf" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/north_tcomms_road) "fTE" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -15284,9 +14370,7 @@ name = "\improper LZ1 Access"; req_one_access = null }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor, /area/lv624/lazarus/landing_zones/lz1) "fTM" = ( @@ -15297,13 +14381,8 @@ /turf/open/gm/dirt, /area/lv624/ground/colony/south_nexus_road) "fXD" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, -/turf/open/gm/coast{ - dir = 8 - }, +/obj/structure/flora/jungle/alienplant1, +/turf/open/gm/coast/east, /area/lv624/ground/river/east_river) "fYl" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -15311,24 +14390,20 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) "fZO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/north_west_jungle) "gaw" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "gbl" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "gby" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, /turf/open/floor{ dir = 9; @@ -15341,13 +14416,11 @@ /area/lv624/ground/river/west_river) "gcn" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "gcp" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_central_jungle) "gcI" = ( /obj/effect/landmark/crap_item, @@ -15365,22 +14438,20 @@ /area/lv624/lazarus/corporate_dome) "gdr" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "gds" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "gdx" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/barrens/west_barrens) "gef" = ( /obj/item/stack/sheet/wood{ amount = 2 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 1; icon_state = "warning" @@ -15398,7 +14469,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "gin" = ( /obj/effect/landmark/objective_landmark/medium, @@ -15407,14 +14478,14 @@ }, /area/lv624/lazarus/quartstorage/outdoors) "git" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "gkh" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "gkC" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -15427,7 +14498,7 @@ /area/lv624/ground/barrens/west_barrens) "glS" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "gnx" = ( /turf/open/floor{ @@ -15436,20 +14507,12 @@ /area/lv624/lazarus/corporate_dome) "god" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/north_nexus_road) "gpC" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/west_central_jungle) "gqG" = ( /obj/item/device/assembly/infra, @@ -15462,7 +14525,7 @@ /area/lv624/lazarus/engineering) "grl" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "grZ" = ( /obj/effect/landmark/objective_landmark/science, @@ -15478,7 +14541,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "gte" = ( /obj/structure/surface/rack, @@ -15501,37 +14564,29 @@ /area/lv624/ground/barrens/north_east_barrens) "guY" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "gve" = ( /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/mineral/sandstone/runed/decor, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "gwP" = ( /turf/open/gm/dirt, /area/lv624/ground/caves/west_caves) "gxd" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/caves/sand_temple) "gyP" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/north_west_jungle) "gyY" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/river/east_river) "gzd" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "gzo" = ( /turf/open/gm/dirt{ @@ -15550,7 +14605,7 @@ /area/lv624/ground/barrens/south_west_barrens) "gAI" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "gAS" = ( /obj/effect/vehicle_spawner/van/decrepit, @@ -15561,33 +14616,24 @@ /area/lv624/lazarus/corporate_dome) "gBG" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/south_nexus_road) "gBI" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/river/east_river) "gDu" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/colony/west_tcomms_road) "gDy" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "gEn" = ( -/obj/structure/flora/jungle/vines, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "gFg" = ( /obj/item/ammo_casing/bullet{ @@ -15599,13 +14645,11 @@ /area/lv624/lazarus/corporate_dome) "gFm" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "gGd" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "gKg" = ( /obj/item/clothing/head/hardhat/orange, @@ -15618,7 +14662,7 @@ /obj/effect/landmark/nightmare{ insert_tag = "lv-rightsidepass" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "gNo" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -15627,24 +14671,17 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "gPN" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/barrens/south_eastern_barrens) "gQr" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/caves/sand_temple) "gRm" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_barrens) "gRx" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) "gTu" = ( /obj/structure/filingcabinet{ @@ -15665,13 +14702,9 @@ }, /area/lv624/lazarus/corporate_dome) "gTv" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/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{ @@ -15680,9 +14713,7 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "gUq" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_east_jungle) "gWf" = ( /obj/structure/surface/rack, @@ -15701,7 +14732,7 @@ /area/lv624/lazarus/quartstorage) "gWI" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "gXu" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony, @@ -15710,9 +14741,7 @@ }, /area/lv624/lazarus/medbay) "gXy" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 6; icon_state = "warning" @@ -15720,17 +14749,15 @@ /area/lv624/lazarus/landing_zones/lz1) "gYs" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/north_nexus_road) "gZh" = ( /obj/structure/prop/brazier, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) "haN" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "hba" = ( /turf/open/gm/dirt, @@ -15742,10 +14769,8 @@ }, /area/lv624/lazarus/medbay) "hbK" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "hbU" = ( /obj/structure/surface/table/reinforced/prison{ @@ -15775,6 +14800,7 @@ /area/lv624/ground/colony/telecomm/sw_lz2) "hdA" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/plating{ dir = 4; icon_state = "asteroidwarning" @@ -15784,13 +14810,13 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "heZ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "hfX" = ( /obj/effect/decal/remains/xeno, @@ -15799,12 +14825,12 @@ /area/lv624/lazarus/crashed_ship_containers) "hgt" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "hgO" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "hgY" = ( /obj/effect/landmark/nightmare{ @@ -15825,9 +14851,7 @@ /area/lv624/ground/barrens/containers) "hjl" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/west_tcomms_road) "hke" = ( /obj/structure/platform/mineral/sandstone/runed, @@ -15840,16 +14864,12 @@ /area/lv624/ground/barrens/south_eastern_barrens) "hmK" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "hnX" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/west_central_jungle) "hpN" = ( /obj/structure/surface/table, @@ -15862,14 +14882,12 @@ /area/lv624/lazarus/research) "hqQ" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "hqS" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "hrD" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -15890,30 +14908,26 @@ /area/lv624/ground/river/central_river) "huH" = ( /obj/structure/flora/jungle/planttop1, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "hwR" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/central_river) "hxL" = ( /obj/effect/landmark/hunter_primary, /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "hxP" = ( /obj/effect/decal/remains/xeno, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "hyK" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "hyU" = ( /obj/structure/barricade/wooden{ @@ -15947,9 +14961,7 @@ /turf/open/gm/dirt, /area/lv624/ground/colony/west_tcomms_road) "hEl" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_west_jungle) "hEs" = ( @@ -15961,16 +14973,11 @@ /area/lv624/lazarus/hydroponics) "hEu" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/west_nexus_road) "hFO" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/colony/north_tcomms_road) "hHc" = ( /obj/structure/window/framed/colony/reinforced, @@ -15978,25 +14985,20 @@ /turf/open/floor/plating, /area/lv624/lazarus/engineering) "hHA" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/r_wall, /area/lv624/lazarus/landing_zones/lz2) "hHR" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/barrens/east_barrens) "hIh" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "hIq" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "hJa" = ( /obj/structure/cargo_container/lockmart/left, @@ -16010,31 +15012,20 @@ /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) "hJn" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "hJW" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "hKk" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) "hLu" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_central_jungle) "hMd" = ( /obj/effect/landmark/objective_landmark/far, @@ -16042,7 +15033,7 @@ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "hMr" = ( /obj/structure/surface/rack{ color = "#6b675e"; @@ -16059,9 +15050,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "hNq" = ( /obj/structure/platform/mineral/sandstone/runed, @@ -16090,11 +15079,11 @@ /area/lv624/lazarus/quartstorage) "hRI" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "hRS" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "hSa" = ( /turf/open/floor{ @@ -16103,33 +15092,25 @@ }, /area/lv624/lazarus/landing_zones/lz1) "hSn" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "hSz" = ( /obj/effect/landmark/hunter_secondary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "hSE" = ( /obj/effect/landmark/monkey_spawn, /turf/open/gm/dirt, /area/lv624/ground/jungle/east_central_jungle) "hUs" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "hUD" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "hWj" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/east_river) "hWZ" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, @@ -16137,9 +15118,9 @@ /area/lv624/ground/river/central_river) "hXt" = ( /obj/structure/transmitter/colony_net{ - pixel_y = 32; phone_category = "Lazarus Landing"; - phone_id = "Lakeside Bar" + phone_id = "Lakeside Bar"; + pixel_y = 32 }, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) @@ -16155,27 +15136,22 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "hZW" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "iab" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/east_jungle) "iap" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/east_jungle) "iat" = ( /obj/structure/surface/table/reinforced/prison{ @@ -16198,11 +15174,9 @@ }, /area/lv624/ground/caves/sand_temple) "ibS" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "idz" = ( /obj/item/weapon/claymore/mercsword{ @@ -16229,26 +15203,22 @@ /obj/item/stack/sheet/wood{ amount = 2 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "ifk" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "ifF" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/jungle/south_east_jungle) "ifX" = ( /obj/structure/machinery/colony_floodlight, /obj/effect/landmark/nightmare{ insert_tag = "lv-gym" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "iiK" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -16256,9 +15226,7 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) "ilf" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, /obj/structure/window/framed/colony/reinforced, /obj/structure/flora/jungle/planttop1, @@ -16303,26 +15271,16 @@ }, /area/lv624/ground/barrens/south_eastern_barrens) "ivl" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/west_central_jungle) "ivu" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "iwh" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/north_nexus_road) "iwl" = ( /obj/structure/stairs/perspective{ @@ -16344,11 +15302,6 @@ /obj/effect/landmark/corpsespawner/doctor, /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) -"iyF" = ( -/turf/open/gm/coast{ - dir = 9 - }, -/area/lv624/ground/river/central_river) "izh" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -16377,12 +15330,10 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "iAH" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_central_jungle) "iBy" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, @@ -16398,12 +15349,10 @@ /area/lv624/lazarus/medbay) "iCN" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/west_nexus_road) "iFp" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/barricade/wooden{ dir = 4 }, @@ -16414,33 +15363,28 @@ /area/lv624/lazarus/landing_zones/lz1) "iGn" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "iHQ" = ( /obj/structure/xenoautopsy/tank/broken, /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) "iIF" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "iIU" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_central_jungle) "iJs" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "iJA" = ( /obj/effect/landmark/monkey_spawn, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_west_barrens) "iJJ" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "iKp" = ( /obj/structure/surface/rack, @@ -16456,18 +15400,14 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/north_east_barrens) "iLM" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/sand_temple) "iLS" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "iNB" = ( /obj/structure/ore_box, @@ -16477,19 +15417,17 @@ /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_barrens) "iOX" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "iPB" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "iPR" = ( /obj/item/stack/medical/ointment, @@ -16503,9 +15441,7 @@ /area/lv624/lazarus/medbay) "iRb" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "iSa" = ( /obj/structure/flora/jungle/vines/heavy, @@ -16516,17 +15452,14 @@ /area/lv624/ground/caves/sand_temple) "iSg" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "iUm" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "iUF" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/south_central_jungle) "iVg" = ( /turf/open/gm/dirt{ @@ -16537,29 +15470,19 @@ /obj/structure/machinery/colony_floodlight, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) -"iXc" = ( -/turf/open/gm/coast{ - dir = 5 - }, -/area/lv624/ground/barrens/east_barrens) "iXj" = ( /turf/closed/wall, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "iXz" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/barrens/west_barrens) "iXG" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/west_nexus_road) "iYJ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "iZG" = ( /obj/effect/landmark/crap_item, @@ -16567,8 +15490,8 @@ /area/lv624/ground/barrens/north_east_barrens) "iZZ" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "jaa" = ( /turf/open/gm/dirt{ @@ -16577,46 +15500,36 @@ /area/lv624/ground/barrens/central_barrens) "jas" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/caves/sand_temple) "jbd" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "jbB" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "jdi" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "jga" = ( /turf/open/gm/river, /area/lv624/ground/jungle/west_jungle) "jgJ" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/south_nexus_road) "jhG" = ( /obj/structure/barricade/handrail/strata{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/barrens/south_eastern_barrens) "jic" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -16641,14 +15554,12 @@ name = "\improper LZ1 Access"; req_one_access = null }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor, /area/lv624/lazarus/landing_zones/lz1) "jow" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "joz" = ( /obj/structure/surface/table/reinforced/prison, @@ -16667,14 +15578,12 @@ }, /area/lv624/ground/caves/sand_temple) "jsd" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "jtg" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "jum" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -16703,11 +15612,11 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "jxR" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_barrens) "jzh" = ( /obj/structure/surface/table/reinforced/prison, @@ -16739,10 +15648,8 @@ }, /area/lv624/lazarus/corporate_dome) "jzZ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "jAo" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, @@ -16765,17 +15672,14 @@ /area/lv624/ground/caves/sand_temple) "jEc" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/colony/north_tcomms_road) "jFc" = ( /turf/closed/wall/mineral/sandstone/runed/decor, /area/lv624/ground/caves/sand_temple) "jFF" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "jGo" = ( /obj/structure/girder, @@ -16785,7 +15689,7 @@ "jGs" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, /turf/open/gm/dirt, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "jGW" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/central_jungle) @@ -16793,44 +15697,33 @@ /obj/effect/landmark/nightmare{ insert_tag = "lv-science" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "jHN" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "jHT" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "jHW" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "jKu" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/west_central_jungle) "jLc" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/east_river) "jLv" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/barrens/east_barrens) "jLD" = ( /obj/effect/landmark/nightmare{ @@ -16840,9 +15733,7 @@ /area/lv624/ground/river/central_river) "jLR" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_central_jungle) "jMk" = ( /obj/structure/lattice{ @@ -16888,21 +15779,16 @@ "jQj" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "jQJ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/jungle/east_central_jungle) "jQV" = ( /obj/structure/barricade/wooden{ dir = 8 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 6; icon_state = "warning" @@ -16961,10 +15847,8 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "jTm" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "jTP" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -16977,9 +15861,7 @@ }, /area/lv624/lazarus/crashed_ship_containers) "jXT" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/north_east_jungle) "jYM" = ( /obj/structure/surface/table/woodentable/fancy, @@ -16997,7 +15879,7 @@ /area/lv624/lazarus/corporate_dome) "jZL" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "kbr" = ( /obj/structure/showcase{ @@ -17016,7 +15898,7 @@ /area/lv624/ground/river/west_river) "keS" = ( /turf/open/floor/plating, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "kff" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/gm/dirt, @@ -17027,65 +15909,46 @@ /area/lv624/ground/river/central_river) "kip" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "kjp" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "kjC" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/barrens/east_barrens) "kmP" = ( /obj/item/stool, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "knd" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/jungle/west_jungle) "knp" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "koh" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/gm/dirt, /area/lv624/ground/colony/north_tcomms_road) "koM" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "kqx" = ( /obj/structure/flora/jungle/plantbot1, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "kqL" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "ksB" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "ksQ" = ( /obj/structure/surface/rack, @@ -17107,10 +15970,7 @@ /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "kuP" = ( /obj/item/tool/hatchet{ @@ -17124,48 +15984,38 @@ /area/lv624/lazarus/hydroponics) "kuZ" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "kvo" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/east_central_jungle) "kvE" = ( /obj/structure/machinery/landinglight/ds2/delaythree, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz2) "kwG" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "kxo" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "kxI" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "kyc" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/central_river) "kyN" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "kza" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "kzd" = ( /obj/structure/surface/table, @@ -17181,11 +16031,11 @@ /area/lv624/lazarus/hydroponics) "kzu" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "kzv" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "kzE" = ( /obj/structure/cargo_container/lockmart/right, @@ -17193,7 +16043,7 @@ /area/lv624/ground/barrens/containers) "kAg" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "kAj" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -17207,9 +16057,7 @@ /area/lv624/lazarus/corporate_dome) "kAl" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_west_jungle) "kBe" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ @@ -17222,13 +16070,10 @@ /area/lv624/lazarus/quartstorage) "kFx" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "kFV" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/barrens/west_barrens) "kGk" = ( /turf/closed/wall/r_wall, @@ -17239,34 +16084,27 @@ }, /area/lv624/ground/barrens/central_barrens) "kHU" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "kJm" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "kJq" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) "kJu" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "kLP" = ( /obj/structure/flora/jungle/plantbot1, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "kNm" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "kPL" = ( /obj/structure/fence, @@ -17290,13 +16128,11 @@ }, /area/lv624/lazarus/canteen) "kQY" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/jungle/west_jungle) "kRg" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "kRr" = ( /obj/structure/surface/rack, @@ -17310,10 +16146,7 @@ }, /area/lv624/lazarus/crashed_ship_containers) "kRR" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "kSs" = ( /obj/structure/inflatable, @@ -17329,20 +16162,15 @@ /area/lv624/ground/caves/sand_temple) "kSR" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/colony/south_medbay_road) "kUr" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/north_tcomms_road) "kVP" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "kWH" = ( /turf/open/floor{ @@ -17365,7 +16193,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "kZk" = ( /obj/structure/largecrate/random/barrel/blue, @@ -17383,10 +16211,8 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "kZw" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "kZS" = ( /obj/structure/surface/table/reinforced/prison, @@ -17397,46 +16223,37 @@ }, /area/lv624/lazarus/corporate_dome) "laY" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/west_central_jungle) "lbd" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/barrens/west_barrens) "lbX" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) "ldB" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "ldZ" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_jungle) "lfy" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/south_nexus_road) "lgu" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "lju" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/central_river) "lke" = ( /obj/effect/landmark/crap_item, @@ -17451,9 +16268,7 @@ amount = 2 }, /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor{ dir = 1; icon_state = "warning" @@ -17464,20 +16279,15 @@ /obj/effect/landmark/nightmare{ insert_tag = "lv-bridge-nofog" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "lnR" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_east_jungle) "lnV" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/south_east_jungle) "lpV" = ( /turf/open/floor/plating{ @@ -17486,11 +16296,11 @@ /area/lv624/lazarus/quartstorage) "lqI" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "lqS" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "lse" = ( /obj/structure/stairs/perspective{ @@ -17506,51 +16316,38 @@ "lsq" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "lsK" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/barrens/west_barrens) "ltT" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "lud" = ( /obj/structure/fence, /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/north_tcomms_road) "lxr" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) "lxX" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "lyj" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/jungle/west_jungle) "lyz" = ( /turf/closed/wall/mineral/sandstone/runed/decor, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "lyL" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "lyS" = ( /turf/closed/wall/r_wall/unmeltable, @@ -17562,7 +16359,7 @@ /area/lv624/ground/barrens/west_barrens) "lAX" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "lBq" = ( /obj/structure/barricade/handrail/strata, @@ -17575,11 +16372,11 @@ /area/lv624/ground/barrens/south_eastern_barrens) "lBr" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "lBu" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "lBw" = ( /turf/closed/wall/strata_ice/jungle, @@ -17593,7 +16390,7 @@ /area/lv624/ground/caves/sand_temple) "lEY" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "lFv" = ( /obj/structure/bed/chair/wheelchair{ @@ -17626,7 +16423,7 @@ /area/lv624/lazarus/engineering) "lHL" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "lIm" = ( /obj/structure/fence, @@ -17642,9 +16439,7 @@ }, /area/lv624/lazarus/quartstorage) "lIU" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/south_central_jungle) "lJm" = ( /obj/structure/showcase{ @@ -17668,19 +16463,15 @@ /area/lv624/ground/caves/sand_temple) "lJo" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/sand_temple) "lJC" = ( /mob/living/simple_animal/bat, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/north_central_caves) "lKe" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 10; icon_state = "warning" @@ -17697,7 +16488,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "lNe" = ( /obj/effect/decal/cleanable/blood, @@ -17758,7 +16549,7 @@ /area/lv624/lazarus/landing_zones/lz2) "lUc" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "lUy" = ( /obj/structure/prop/brazier/torch, @@ -17774,16 +16565,11 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "lWO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/south_west_jungle) "lYB" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/north_tcomms_road) "lYI" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -17791,9 +16577,7 @@ name = "\improper LZ2 Access"; req_one_access = null }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor, /area/lv624/lazarus/landing_zones/lz2) "lZl" = ( @@ -17814,40 +16598,38 @@ }, /area/lv624/lazarus/landing_zones/lz1) "mbp" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; +/obj/structure/flora/jungle/alienplant1{ layer = 4.13; - luminosity = 2; pixel_y = 18 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "mbu" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "mdQ" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/caves/west_caves) "meP" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "mfu" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "mfI" = ( /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/west_central_jungle) "mfK" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "mgs" = ( /obj/structure/machinery/door/poddoor/almayer{ @@ -17892,7 +16674,7 @@ /area/lv624/ground/barrens/south_eastern_barrens) "mko" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_nexus_road) "mkr" = ( /obj/effect/landmark/hunter_primary, @@ -17902,42 +16684,34 @@ /area/lv624/ground/caves/south_west_caves) "mku" = ( /obj/effect/landmark/monkey_spawn, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "mkU" = ( /obj/structure/foamed_metal, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor/plating, /area/lv624/lazarus/engineering) "mkW" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "mmu" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "mnK" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "mnQ" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/barrens/west_barrens) "moM" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "moV" = ( /obj/structure/bed/chair/wood/normal{ @@ -17972,9 +16746,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "msd" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/sand_temple) "msV" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -17989,23 +16761,18 @@ /area/lv624/lazarus/medbay) "mun" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/north_tcomms_road) "muv" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "muz" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/barrens/east_barrens) "muO" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "mvc" = ( /obj/effect/landmark/static_comms/net_two, @@ -18015,7 +16782,7 @@ /area/lv624/ground/colony/telecomm/cargo) "mvr" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "mwB" = ( /obj/structure/machinery/atm{ @@ -18029,21 +16796,17 @@ /area/lv624/lazarus/corporate_dome) "mxd" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "mxW" = ( /obj/structure/window/framed/colony/reinforced, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz2) "myI" = ( /obj/effect/landmark/monkey_spawn, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "mBL" = ( /turf/open/floor{ @@ -18069,9 +16832,7 @@ /area/lv624/lazarus/corporate_dome) "mEw" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "mFu" = ( /obj/effect/landmark/crap_item, @@ -18082,17 +16843,12 @@ /turf/open/floor/plating, /area/lv624/lazarus/corporate_dome) "mHM" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/south_medbay_road) "mIs" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "mJB" = ( /turf/open/floor{ @@ -18111,7 +16867,7 @@ /area/lv624/ground/caves/sand_temple) "mMq" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "mMv" = ( /obj/structure/surface/rack, @@ -18130,31 +16886,22 @@ /area/lv624/lazarus/quartstorage) "mNz" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "mNO" = ( /obj/structure/foamed_metal, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/east_central_jungle) "mNU" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/east_central_jungle) "mOA" = ( /obj/structure/flora/bush/ausbushes/ausbush, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "mPt" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "mPK" = ( /obj/effect/landmark/crap_item, @@ -18183,9 +16930,7 @@ /area/lv624/ground/barrens/central_barrens) "mSN" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "mUH" = ( /turf/open/gm/dirtgrassborder{ @@ -18194,13 +16939,13 @@ /area/lv624/ground/barrens/south_eastern_barrens) "mUQ" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/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, +/turf/open/gm/coast/north, /area/lv624/ground/caves/sand_temple) "mVg" = ( /obj/item/weapon/harpoon/yautja{ @@ -18233,41 +16978,32 @@ /area/lv624/lazarus/corporate_dome) "mVK" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "mVV" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/north_jungle) "mWe" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/jungle/south_west_jungle) "mXR" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/north_nexus_road) "mZf" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "naR" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/north_tcomms_road) "nbw" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/barrens/north_east_barrens) "ncq" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/r_wall, /area/lv624/lazarus/landing_zones/lz1) "ncV" = ( @@ -18281,7 +17017,7 @@ }, /area/lv624/lazarus/landing_zones/lz2) "ndK" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/r_wall, /area/lv624/lazarus/corporate_dome) "nfD" = ( @@ -18300,11 +17036,11 @@ /area/lv624/ground/barrens/south_eastern_barrens) "nhi" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "niF" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_barrens) "niV" = ( /turf/open/floor/plating{ @@ -18324,39 +17060,32 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "nkU" = ( /obj/effect/landmark/nightmare{ insert_tag = "lv-bridge-east" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "nmO" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "nnq" = ( /obj/structure/prop/brazier, /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "nnL" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/barrens/east_barrens) "npf" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/jungle/west_jungle) "npQ" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "nqt" = ( /obj/item/device/analyzer/plant_analyzer, @@ -18370,7 +17099,7 @@ /area/lv624/ground/barrens/east_barrens) "nqy" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "nrb" = ( /turf/open/floor{ @@ -18385,9 +17114,9 @@ /area/lv624/ground/barrens/west_barrens) "nrP" = ( /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Lazarus Landing"; - phone_id = "Cargo" + phone_id = "Cargo"; + pixel_y = 24 }, /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) @@ -18416,19 +17145,15 @@ /area/lv624/ground/barrens/south_eastern_barrens) "ntL" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/west_tcomms_road) "ntQ" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "nuU" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_central_jungle) "nuW" = ( /turf/closed/wall/strata_ice/jungle, @@ -18514,10 +17239,8 @@ /area/lv624/ground/caves/sand_temple) "nBM" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "nDr" = ( /obj/structure/surface/rack, @@ -18556,7 +17279,7 @@ name = "\improper alien blade"; throwforce = 26 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "nEE" = ( /obj/structure/surface/table, @@ -18584,7 +17307,7 @@ "nHE" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "nHP" = ( /turf/open/floor{ @@ -18594,13 +17317,11 @@ /area/lv624/lazarus/medbay) "nHY" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/central_river) "nHZ" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "nIs" = ( /obj/structure/machinery/vending/snack, @@ -18640,22 +17361,15 @@ /area/lv624/lazarus/canteen) "nJF" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/west_nexus_road) "nLf" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/sand_temple) "nLk" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "nLH" = ( /obj/structure/prop/tower, @@ -18666,7 +17380,7 @@ /area/lv624/lazarus/landing_zones/lz1) "nLI" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "nMu" = ( /obj/effect/landmark/objective_landmark/science, @@ -18680,9 +17394,7 @@ /area/lv624/lazarus/corporate_dome) "nNw" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/colony/west_nexus_road) "nOD" = ( /obj/structure/disposalpipe/segment{ @@ -18692,16 +17404,13 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "nOX" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "nPd" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/central_river) "nPk" = ( /obj/structure/stairs/perspective{ @@ -18735,7 +17444,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "nTE" = ( /obj/structure/curtain/red, @@ -18778,11 +17487,11 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "nVG" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "nVZ" = ( /obj/structure/stairs/perspective{ @@ -18820,14 +17529,12 @@ /area/lv624/ground/jungle/west_jungle) "nYx" = ( /obj/structure/flora/jungle/planttop1, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "nYR" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "nYZ" = ( /turf/open/floor{ @@ -18837,24 +17544,19 @@ /area/lv624/lazarus/medbay) "nZz" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "oaL" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "obp" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/barrens/east_barrens) "obC" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "obJ" = ( /obj/structure/curtain/red, @@ -18862,9 +17564,7 @@ /area/lv624/ground/caves/north_central_caves) "ock" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "ocG" = ( /obj/effect/landmark/corpsespawner/security/liaison, @@ -18878,10 +17578,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/east_river) "odw" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ @@ -18894,14 +17591,14 @@ /obj/effect/landmark/nightmare{ insert_tag = "lv-hydro" }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "oek" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/jungle/west_jungle) "oeN" = ( /turf/closed/wall, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "oeS" = ( /obj/effect/decal/remains/human, /turf/open/gm/dirt, @@ -18918,7 +17615,7 @@ /area/lv624/ground/caves/sand_temple) "ofv" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "ogM" = ( /turf/open/gm/dirt, @@ -18950,10 +17647,7 @@ /turf/open/floor/plating, /area/lv624/ground/barrens/central_barrens) "omK" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/barrens/west_barrens) "oov" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, @@ -18961,31 +17655,26 @@ /area/lv624/ground/jungle/south_east_jungle) "ooM" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "opf" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "opP" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "opS" = ( /turf/open/gm/dirt, /area/lv624/ground/jungle/south_east_jungle) "oqO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/colony/north_nexus_road) "orj" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "oua" = ( /obj/effect/landmark/crap_item, @@ -19007,20 +17696,16 @@ /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) "owQ" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/barrens/east_barrens) "oxY" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "oym" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/west_river) "oys" = ( /obj/structure/stairs/perspective{ @@ -19056,13 +17741,13 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "oAJ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "oAV" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, @@ -19073,20 +17758,17 @@ /obj/effect/landmark/nightmare{ insert_tag = "lv-medbay" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "oDY" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/caves/sand_temple) "oED" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/north_tcomms_road) "oEE" = ( /obj/structure/surface/table, @@ -19097,16 +17779,14 @@ }, /area/lv624/lazarus/canteen) "oEI" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/barrens/east_barrens) "oER" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "oFf" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/river/east_river) "oFO" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -19132,20 +17812,18 @@ /area/lv624/ground/barrens/south_eastern_barrens) "oGs" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/north_tcomms_road) "oHu" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/east_river) "oHx" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "oJL" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "oKP" = ( /obj/effect/landmark/static_comms/net_two, @@ -19156,10 +17834,7 @@ /area/lv624/ground/colony/telecomm/sw_lz2) "oLk" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/west_nexus_road) "oMZ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane, @@ -19185,7 +17860,7 @@ /area/lv624/lazarus/corporate_dome) "oOd" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "oOf" = ( /obj/structure/flora/jungle/vines/heavy, @@ -19198,10 +17873,8 @@ /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz2) "oOV" = ( -/obj/structure/flora/jungle/vines, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_1, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ icon_state = "warning" }, @@ -19213,15 +17886,13 @@ }, /area/lv624/lazarus/landing_zones/lz1) "oRH" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_east_jungle) "oSh" = ( /obj/item/stack/sheet/wood{ amount = 2 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "oSp" = ( /obj/structure/largecrate/random/barrel/red, @@ -19229,16 +17900,13 @@ /area/lv624/ground/barrens/north_east_barrens) "oSv" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/west_tcomms_road) "oSx" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "oSJ" = ( /obj/structure/surface/table, @@ -19254,10 +17922,7 @@ }, /area/lv624/lazarus/medbay) "oTt" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/central_river) "oTx" = ( /obj/structure/barricade/handrail/strata{ @@ -19266,9 +17931,7 @@ /obj/structure/barricade/handrail/strata{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/barrens/south_eastern_barrens) "oTJ" = ( /turf/open/gm/dirt, @@ -19277,7 +17940,7 @@ /turf/open/gm/dirt, /area/lv624/ground/jungle/east_jungle) "oUy" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "oUK" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ @@ -19292,27 +17955,19 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "oWN" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "oXl" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/south_west_jungle) "oXI" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_west_jungle) "oXS" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/central_river) "oYx" = ( /obj/structure/window/framed/colony/reinforced, @@ -19320,19 +17975,15 @@ /turf/open/floor/plating, /area/lv624/lazarus/corporate_dome) "oYM" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/barrens/west_barrens) "pab" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "pas" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "pat" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -19344,18 +17995,15 @@ /area/lv624/lazarus/corporate_dome) "pba" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "pbd" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/rock/brown, /area/lv624/ground/jungle/west_jungle) "pbn" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/colony/south_nexus_road) "pca" = ( /obj/effect/landmark/nightmare{ @@ -19367,19 +18015,14 @@ }, /area/lv624/lazarus/security) "pcd" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/barrens/east_barrens) "pci" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/barrens/east_barrens) "pcu" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "pcz" = ( /obj/effect/landmark/objective_landmark/medium, @@ -19389,10 +18032,7 @@ }, /area/lv624/ground/barrens/containers) "pcA" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/jungle/south_central_jungle) "pfl" = ( /obj/effect/decal/cleanable/blood, @@ -19405,10 +18045,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "pgf" = ( /obj/structure/machinery/power/apc{ @@ -19431,33 +18068,27 @@ /area/lv624/lazarus/corporate_dome) "phU" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "pim" = ( /turf/open/floor, /area/lv624/ground/barrens/east_barrens) "pjk" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/river/east_river) "pjY" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "plf" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "ply" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "pmz" = ( /turf/open/gm/dirt{ @@ -19472,7 +18103,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "pox" = ( /obj/structure/barricade/metal{ @@ -19484,42 +18115,33 @@ }, /area/lv624/lazarus/corporate_dome) "ppR" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/north_nexus_road) "ppZ" = ( /obj/effect/landmark/nightmare{ insert_tag = "armory" }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/east_central_jungle) "prd" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor{ icon_state = "warning" }, /area/lv624/lazarus/landing_zones/lz1) "prQ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "psc" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "psh" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "psH" = ( /obj/structure/surface/rack, @@ -19537,7 +18159,7 @@ /area/lv624/lazarus/crashed_ship_containers) "ptr" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "puo" = ( /turf/open/floor/greengrid, @@ -19548,9 +18170,7 @@ }, /area/lv624/lazarus/medbay) "pws" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor/corsat{ dir = 1; icon_state = "squareswood" @@ -19558,16 +18178,11 @@ /area/lv624/ground/caves/sand_temple) "pxc" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/central_river) "pxs" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "pyG" = ( /turf/open/floor{ @@ -19576,7 +18191,7 @@ /area/lv624/lazarus/corporate_dome) "pyS" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "pzt" = ( /obj/structure/surface/table, @@ -19593,7 +18208,7 @@ /area/lv624/lazarus/medbay) "pBk" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "pDh" = ( /obj/structure/surface/table/reinforced/prison{ @@ -19622,7 +18237,7 @@ /area/lv624/ground/barrens/north_east_barrens) "pDI" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "pDK" = ( /turf/open/gm/dirt{ @@ -19631,7 +18246,7 @@ /area/lv624/ground/caves/sand_temple) "pEl" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "pEV" = ( /turf/open/floor/strata{ @@ -19640,13 +18255,11 @@ }, /area/lv624/ground/caves/sand_temple) "pFe" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_east_jungle) "pGD" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "pHn" = ( /obj/effect/decal/cleanable/blood/oil, @@ -19665,7 +18278,7 @@ /area/lv624/lazarus/corporate_dome) "pIy" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/west_nexus_road) "pIz" = ( /obj/structure/platform_decoration/mineral/sandstone/runed, @@ -19673,7 +18286,7 @@ /area/lv624/ground/barrens/south_eastern_barrens) "pIC" = ( /obj/effect/landmark/hunter_secondary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "pJr" = ( /obj/effect/landmark/hunter_primary, @@ -19681,7 +18294,7 @@ /area/lv624/ground/barrens/south_west_barrens) "pJN" = ( /obj/effect/landmark/hunter_secondary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "pKp" = ( /obj/effect/landmark/crap_item, @@ -19691,17 +18304,12 @@ /area/lv624/lazarus/quartstorage) "pKS" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "pLm" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/colony/west_nexus_road) "pMV" = ( /obj/effect/landmark/hunter_primary, @@ -19711,19 +18319,14 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "pNr" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) "pOC" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/north_west_jungle) "pOK" = ( /obj/item/ammo_casing, @@ -19739,7 +18342,7 @@ /area/lv624/lazarus/medbay) "pPd" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "pQn" = ( /obj/structure/machinery/door/airlock/almayer/generic{ @@ -19759,10 +18362,10 @@ pixel_y = -5 }, /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Lazarus Landing"; phone_color = "blue"; - phone_id = "Corporate Office" + phone_id = "Corporate Office"; + pixel_y = 24 }, /turf/open/floor{ dir = 5; @@ -19801,9 +18404,7 @@ /area/lv624/ground/caves/sand_temple) "pSt" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/west_nexus_road) "pTk" = ( /obj/item/bedsheet/medical, @@ -19817,22 +18418,20 @@ /area/lv624/ground/caves/east_caves) "pXI" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "pYp" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "pYq" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "pYJ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_west_jungle) "pZb" = ( @@ -19855,11 +18454,11 @@ /area/lv624/ground/river/east_river) "qcX" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "qdQ" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "qeb" = ( /obj/item/ammo_casing/bullet{ @@ -19871,50 +18470,37 @@ }, /area/lv624/lazarus/corporate_dome) "qeW" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/caves/sand_temple) "qeY" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/west_tcomms_road) "qfh" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) "qfr" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper LZ2 Access"; req_one_access = null }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor, /area/lv624/lazarus/landing_zones/lz2) "qgA" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/south_east_jungle) "qjf" = ( /turf/open/floor, /area/lv624/ground/barrens/containers) "qjt" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "qnQ" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "qpX" = ( /obj/structure/stairs/perspective{ @@ -19928,26 +18514,20 @@ }, /area/lv624/ground/barrens/south_eastern_barrens) "qqJ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "qsM" = ( /obj/structure/platform/mineral/sandstone/runed{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/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) "qtS" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "quK" = ( /obj/structure/showcase{ @@ -19974,17 +18554,12 @@ }, /area/lv624/ground/caves/sand_temple) "qvf" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "qvC" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/west_nexus_road) "qxo" = ( /obj/structure/surface/table/woodentable/fancy, @@ -20021,13 +18596,11 @@ pixel_x = -7; pixel_y = 10 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/caves/sand_temple) "qAu" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "qAP" = ( /obj/effect/landmark/crap_item, @@ -20035,7 +18608,7 @@ /area/lv624/ground/colony/west_nexus_road) "qAR" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "qBQ" = ( /obj/structure/stairs/perspective{ @@ -20048,9 +18621,12 @@ }, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) +"qBW" = ( +/turf/open/gm/dirt, +/area/lv624/ground/jungle/south_west_jungle/ceiling) "qBX" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "qCU" = ( /obj/structure/stairs/perspective{ @@ -20072,34 +18648,29 @@ }, /area/lv624/lazarus/landing_zones/lz2) "qDx" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "qDz" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "qDQ" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "qDW" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "qGH" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "qGK" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "qGR" = ( /obj/structure/foamed_metal, @@ -20132,12 +18703,10 @@ /area/lv624/lazarus/medbay) "qJx" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "qKl" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/north_nexus_road) "qKC" = ( /obj/structure/flora/jungle/vines/heavy, @@ -20148,15 +18717,10 @@ /area/lv624/ground/colony/telecomm/sw_lz2) "qLc" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "qMX" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/lv624/ground/jungle/west_jungle) "qNQ" = ( @@ -20167,7 +18731,7 @@ /area/lv624/lazarus/landing_zones/lz2) "qPx" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "qPO" = ( /obj/structure/stairs/perspective{ @@ -20198,7 +18762,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "qTu" = ( /obj/structure/window_frame/colony/reinforced, @@ -20214,13 +18778,10 @@ }, /area/lv624/lazarus/corporate_dome) "qUM" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/west_central_jungle) "qWf" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/west_nexus_road) "qXo" = ( /obj/structure/surface/rack, @@ -20236,13 +18797,11 @@ /area/lv624/ground/barrens/south_eastern_jungle_barrens) "qYM" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "qZv" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "rac" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -20266,7 +18825,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "rcR" = ( /obj/effect/landmark/hunter_primary, @@ -20277,7 +18836,7 @@ /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "rdS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/toolbox/mechanical{ @@ -20310,20 +18869,16 @@ }, /area/lv624/lazarus/quartstorage) "rfH" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/r_wall, /area/lv624/lazarus/corporate_dome) "rgQ" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "rit" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "rkq" = ( /obj/effect/landmark/crap_item, @@ -20343,8 +18898,8 @@ }, /area/lv624/lazarus/engineering) "rox" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "rpR" = ( /obj/structure/flora/jungle/vines/heavy, @@ -20355,7 +18910,7 @@ /area/lv624/lazarus/landing_zones/lz1) "rqf" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "rrz" = ( /obj/structure/curtain/red, @@ -20365,19 +18920,14 @@ "rtD" = ( /obj/structure/flora/jungle/planttop1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "rua" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/east_jungle) "rue" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/east_central_jungle) "ruv" = ( /obj/effect/landmark/nightmare{ @@ -20392,16 +18942,14 @@ /area/lv624/lazarus/quartstorage) "rvL" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "rvW" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/river/east_river) "rwg" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "rwx" = ( @@ -20433,12 +18981,10 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "rzT" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/item/stack/sheet/wood{ amount = 2 }, @@ -20460,10 +19006,8 @@ }, /area/lv624/lazarus/corporate_dome) "rBF" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "rCK" = ( /obj/structure/stairs/perspective{ @@ -20477,9 +19021,7 @@ }, /area/lv624/ground/caves/sand_temple) "rCV" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_central_jungle) "rGd" = ( /obj/structure/girder/displaced, @@ -20490,7 +19032,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "rGB" = ( /obj/structure/surface/rack, @@ -20501,25 +19043,21 @@ /area/lv624/lazarus/quartstorage) "rGW" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_west_jungle) "rGZ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "rHp" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "rIq" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "rJd" = ( /obj/structure/bed/alien{ @@ -20528,23 +19066,19 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "rJS" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/r_wall, /area/lv624/lazarus/landing_zones/lz2) "rKQ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "rKR" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "rMR" = ( /obj/structure/surface/table/woodentable/fancy, @@ -20564,11 +19098,9 @@ }, /area/lv624/lazarus/corporate_dome) "rON" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "rPK" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, @@ -20609,23 +19141,19 @@ /area/lv624/lazarus/hydroponics) "rTG" = ( /obj/structure/machinery/colony_floodlight, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "rTK" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/north_tcomms_road) "rVH" = ( /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Lazarus Landing"; phone_color = "yellow"; - phone_id = "Communications" + phone_id = "Communications"; + pixel_y = 24 }, /turf/open/floor{ dir = 9; @@ -20638,10 +19166,8 @@ /area/lv624/ground/jungle/west_jungle) "rXW" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "rYA" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -20660,8 +19186,8 @@ /area/lv624/lazarus/quartstorage) "sau" = ( /obj/effect/landmark/crap_item, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "sbt" = ( /obj/effect/decal/cleanable/blood, @@ -20696,21 +19222,19 @@ /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) "sgc" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "sgj" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/colony/north_nexus_road) "shq" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "shy" = ( /obj/structure/barricade/handrail/strata, @@ -20721,18 +19245,14 @@ "sic" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/effect/landmark/objective_landmark/medium, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "slW" = ( /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/mineral/sandstone/runed/decor, /area/lv624/ground/caves/sand_temple) "smx" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/west_central_jungle) "smE" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -20749,13 +19269,11 @@ }, /area/lv624/lazarus/corporate_dome) "snm" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/colony/west_nexus_road) "snr" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "snI" = ( /obj/effect/landmark/objective_landmark/medium, @@ -20764,10 +19282,7 @@ }, /area/lv624/lazarus/armory) "spm" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/lv624/ground/barrens/east_barrens) "sqj" = ( @@ -20776,7 +19291,7 @@ "sqw" = ( /obj/structure/machinery/colony_floodlight, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "sqR" = ( /obj/structure/stairs/perspective{ @@ -20793,42 +19308,31 @@ }, /area/lv624/ground/caves/sand_temple) "ssc" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/jungle/east_central_jungle) "ssK" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/caves/sand_temple) "suv" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "svh" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "swR" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "sxa" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "sxn" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/barrens/south_eastern_barrens) "sxY" = ( /obj/structure/surface/rack, @@ -20838,10 +19342,7 @@ /area/lv624/lazarus/corporate_dome) "syc" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "syx" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -20849,7 +19350,7 @@ /area/lv624/ground/barrens/east_barrens) "szy" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "sBg" = ( /obj/structure/machinery/vending/cigarette, @@ -20863,14 +19364,11 @@ /area/lv624/lazarus/corporate_dome) "sBC" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/colony/west_tcomms_road) "sBJ" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "sCg" = ( /obj/structure/stairs/perspective{ @@ -20893,25 +19391,18 @@ }, /area/lv624/lazarus/landing_zones/lz1) "sCX" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "sDE" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "sFc" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/river, /area/lv624/ground/river/west_river) -"sFt" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3"; - icon_tag = "light_3" - }, -/turf/open/gm/grass, -/area/lv624/ground/jungle/south_east_jungle) "sFY" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Workshop Storage"; @@ -20927,11 +19418,11 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "sHT" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "sIg" = ( /turf/closed/wall/rock/brown, @@ -20980,57 +19471,50 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "sOp" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "sOZ" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/sand_temple) "sPm" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "sPy" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "sRH" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "sSE" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "sTB" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/jungle/west_jungle) "sTX" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/lv624/ground/river/central_river) "sUc" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "sUm" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "sUT" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "sVh" = ( /obj/structure/window/framed/colony/reinforced, @@ -21038,7 +19522,7 @@ /area/lv624/lazarus/hydroponics) "sWy" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "sWE" = ( /obj/structure/largecrate, @@ -21071,20 +19555,16 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "sYY" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "taa" = ( /obj/structure/barricade/wooden, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 9; icon_state = "warning" @@ -21093,15 +19573,12 @@ "taK" = ( /obj/structure/fence, /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/north_tcomms_road) "tbV" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "tdX" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -21127,15 +19604,11 @@ /area/lv624/ground/jungle/south_central_jungle) "teR" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "teS" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_west_jungle) "tfA" = ( /obj/structure/surface/rack, @@ -21157,7 +19630,7 @@ "tgV" = ( /obj/structure/flora/bush/ausbushes/grassybush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "thn" = ( /obj/item/weapon/claymore/mercsword{ @@ -21192,10 +19665,7 @@ dir = 8 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/barrens/south_eastern_barrens) "tiw" = ( /mob/living/simple_animal/bat, @@ -21205,17 +19675,14 @@ /area/lv624/ground/caves/north_west_caves) "tka" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "tlD" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/river, /area/lv624/ground/river/central_river) "tlE" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/north_west_jungle) "tlQ" = ( /obj/structure/surface/table/reinforced/prison, @@ -21231,25 +19698,20 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "toz" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "toF" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/east_river) "toL" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "toT" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, @@ -21257,15 +19719,15 @@ pixel_x = 6; pixel_y = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "tqe" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "tqH" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "trs" = ( /obj/item/tool/shovel, @@ -21287,27 +19749,22 @@ /area/lv624/ground/jungle/south_central_jungle) "tsK" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/north_nexus_road) "ttu" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "ttI" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "ttZ" = ( /obj/structure/barricade/handrail/strata{ dir = 4 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/barrens/south_eastern_barrens) "tuX" = ( /obj/effect/landmark/crap_item, @@ -21317,32 +19774,21 @@ /area/lv624/ground/caves/north_central_caves) "tvC" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_east_jungle) "twg" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "twC" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/barrens/east_barrens) "twN" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "txp" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "txx" = ( @@ -21359,7 +19805,7 @@ }, /area/lv624/lazarus/medbay) "tyG" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "tzo" = ( /turf/open/gm/dirt{ @@ -21370,22 +19816,19 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "tzK" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "tBB" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "tBJ" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "tDa" = ( /obj/structure/stairs/perspective{ @@ -21399,9 +19842,7 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "tEn" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ icon_state = "warning" }, @@ -21414,7 +19855,7 @@ /area/lv624/lazarus/corporate_dome) "tHc" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "tIg" = ( /obj/structure/surface/table, @@ -21426,7 +19867,7 @@ /area/lv624/lazarus/medbay) "tIZ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "tJb" = ( /obj/structure/surface/rack, @@ -21454,17 +19895,17 @@ /area/lv624/ground/caves/sand_temple) "tJN" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "tKI" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "tLQ" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "tLS" = ( /obj/structure/bed/chair/office/light, @@ -21475,15 +19916,13 @@ /area/lv624/lazarus/corporate_dome) "tLU" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "tMh" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "tMB" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -21508,31 +19947,24 @@ "tRu" = ( /obj/effect/landmark/hunter_primary, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "tSd" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/lazarus/quartstorage/outdoors) "tSN" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "tTh" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "tTX" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "tWw" = ( /obj/effect/decal/cleanable/blood/drip, @@ -21544,12 +19976,10 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "tXO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/east_central_jungle) "tXZ" = ( /obj/structure/largecrate, @@ -21566,10 +19996,7 @@ /area/lv624/lazarus/comms) "tZa" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/east_river) "tZe" = ( /obj/item/tank/oxygen/yellow, @@ -21580,7 +20007,7 @@ /area/lv624/lazarus/landing_zones/lz2) "uaP" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "ubb" = ( /obj/structure/flora/bush/ausbushes/ppflowers, @@ -21598,7 +20025,7 @@ /area/lv624/ground/caves/sand_temple) "ubN" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "udj" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -21620,7 +20047,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "ufG" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, @@ -21632,11 +20059,9 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/caves/sand_temple) "ugk" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "ugG" = ( /obj/effect/landmark/nightmare{ @@ -21666,23 +20091,21 @@ /area/lv624/ground/caves/north_central_caves) "uiz" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/south_nexus_road) "uiN" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/north_tcomms_road) "ujd" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "ukk" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "ukE" = ( /turf/open/gm/dirt{ @@ -21706,10 +20129,10 @@ /area/lv624/ground/caves/sand_temple) "ulp" = ( /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Lazarus Landing"; phone_color = "red"; - phone_id = "Secure Storage" + phone_id = "Secure Storage"; + pixel_y = 24 }, /turf/open/floor/greengrid, /area/lv624/lazarus/secure_storage) @@ -21730,7 +20153,7 @@ /area/lv624/ground/colony/telecomm/tcommdome/south) "upM" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "upQ" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, @@ -21758,14 +20181,11 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "uvh" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/barrens/south_eastern_barrens) "uxh" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "uxq" = ( /obj/effect/decal/cleanable/blood, @@ -21774,9 +20194,7 @@ /area/lv624/ground/caves/north_central_caves) "uxT" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/east_river) "uya" = ( /turf/open/gm/dirt, @@ -21803,9 +20221,7 @@ }, /area/lv624/ground/caves/sand_temple) "uDs" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_central_jungle) "uDw" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -21815,12 +20231,12 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "uEl" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "uEL" = ( /obj/structure/machinery/light/small{ @@ -21855,9 +20271,7 @@ /area/lv624/lazarus/corporate_dome) "uHI" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "uIF" = ( /obj/structure/barricade/sandbags/wired, @@ -21875,9 +20289,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "uMz" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -21886,47 +20298,30 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) "uMD" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/sand_temple) "uOi" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/caves/sand_temple) "uRb" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "uRE" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/lazarus/landing_zones/lz2) "uSq" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/west_tcomms_road) "uSw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/west_jungle) "uSy" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/barrens/east_barrens) "uSF" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -21945,7 +20340,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "uUi" = ( /obj/structure/surface/table/reinforced/prison, @@ -21955,9 +20350,7 @@ }, /area/lv624/lazarus/corporate_dome) "uUl" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_west_jungle) "uUJ" = ( /turf/open/gm/dirtgrassborder{ @@ -21966,20 +20359,19 @@ /area/lv624/ground/barrens/south_eastern_barrens) "uVk" = ( /obj/effect/landmark/objective_landmark/far, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "uVx" = ( -/turf/open/floor{ - dir = 6; - icon_state = "warning" +/obj/structure/machinery/floodlight/landing, +/obj/effect/decal/warning_stripes, +/turf/open/floor/mech_bay_recharge_floor{ + name = "Shuttle Landing Lights" }, /area/lv624/lazarus/landing_zones/lz1) "uVU" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "uWr" = ( /obj/effect/decal/cleanable/blood/oil/streak, @@ -21997,7 +20389,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "uZp" = ( /obj/structure/surface/table/reinforced/prison{ @@ -22029,11 +20421,11 @@ /area/lv624/lazarus/research) "vam" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "vcY" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "vdy" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -22058,9 +20450,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/sand_temple) "vft" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -22072,7 +20462,7 @@ /area/lv624/ground/caves/sand_temple) "vfR" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "vgJ" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -22085,17 +20475,15 @@ /area/lv624/ground/caves/sand_temple) "vgM" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "vhx" = ( /obj/structure/girder, /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) "vjH" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "vjL" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, @@ -22103,10 +20491,7 @@ /area/lv624/ground/caves/east_caves) "vjO" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/colony/south_nexus_road) "vkI" = ( /obj/structure/stairs/perspective{ @@ -22131,7 +20516,7 @@ "vmv" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "vno" = ( /obj/item/ammo_casing/bullet{ @@ -22155,22 +20540,18 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "vqT" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "vsT" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_barrens) "vtt" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "vty" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "vuy" = ( /obj/effect/landmark/crap_item, @@ -22180,10 +20561,7 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "vvE" = ( /obj/structure/machinery/vending/cola, @@ -22196,17 +20574,15 @@ }, /area/lv624/lazarus/corporate_dome) "vxa" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/item/stack/sheet/wood{ amount = 2 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "vxU" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "vyz" = ( /obj/structure/largecrate, @@ -22216,9 +20592,7 @@ }, /area/lv624/lazarus/quartstorage) "vBe" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/east_central_jungle) "vBu" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -22240,14 +20614,11 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/south_east_caves) "vDy" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/barrens/south_eastern_barrens) "vDW" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "vEj" = ( /obj/effect/landmark/objective_landmark/medium, @@ -22257,14 +20628,14 @@ }, /area/lv624/lazarus/comms) "vEp" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "vGg" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "vHe" = ( /obj/structure/surface/rack, @@ -22296,22 +20667,18 @@ "vJs" = ( /obj/structure/flora/grass/tallgrass/jungle, /obj/item/bananapeel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "vKc" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "vKt" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "vLO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/lazarus/quartstorage/outdoors) "vMV" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -22321,11 +20688,11 @@ /area/lv624/ground/caves/south_west_caves) "vNP" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "vNW" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "vOD" = ( /turf/open/floor{ @@ -22334,23 +20701,18 @@ }, /area/lv624/ground/colony/telecomm/tcommdome/south) "vOF" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_central_jungle) "vPu" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor, /area/lv624/ground/barrens/containers) "vPV" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/east_jungle) "vSG" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "vUw" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -22372,9 +20734,7 @@ }, /area/lv624/ground/colony/telecomm/sw_lz2) "vVD" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/rock/brown, /area/lv624/ground/jungle/west_jungle) "vVN" = ( @@ -22385,26 +20745,20 @@ }, /area/lv624/lazarus/quartstorage) "vWs" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/east_jungle) "vXW" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "wbK" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "wbP" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "wca" = ( @@ -22431,33 +20785,25 @@ /area/lv624/lazarus/crashed_ship_containers) "wcS" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/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{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/caves/sand_temple) "weH" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "wgk" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/caves/sand_temple) "whr" = ( /obj/item/ammo_magazine/smg/mp5, @@ -22480,7 +20826,7 @@ desc = "The oranges aren't done yet... this sucks."; name = "orange tree" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "whR" = ( /turf/open/floor/plating, @@ -22496,27 +20842,22 @@ /obj/structure/sign/safety/analysis_lab{ pixel_x = 40 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "wkt" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/east_river) "wkE" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "wkP" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "wkZ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "wlh" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, @@ -22525,11 +20866,9 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/west_caves) "wlo" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "wmj" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -22568,7 +20907,7 @@ }, /area/lv624/ground/caves/sand_temple) "wpw" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "wqy" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -22577,20 +20916,18 @@ "wqz" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "wqO" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "wrN" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/dirt, /area/lv624/ground/caves/north_central_caves) "wsZ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_east_jungle) "wtK" = ( @@ -22607,22 +20944,19 @@ /area/lv624/lazarus/corporate_dome) "wvO" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "wvP" = ( /obj/effect/decal/remains/xeno, /turf/open/gm/dirt, /area/lv624/ground/barrens/central_barrens) "wxP" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/north_jungle) "wzG" = ( /obj/effect/landmark/hunter_primary, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "wAe" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -22637,16 +20971,12 @@ }, /area/lv624/lazarus/research) "wAI" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_central_jungle) "wAP" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "wBS" = ( /obj/item/clothing/suit/armor/yautja_flavor, @@ -22659,20 +20989,17 @@ /area/lv624/ground/caves/south_east_caves) "wEQ" = ( /obj/effect/decal/remains/xeno, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "wFp" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/river/east_river) "wFx" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "wFR" = ( /obj/effect/landmark/crap_item, /obj/effect/decal/cleanable/blood/drip, @@ -22687,18 +21014,13 @@ }, /area/lv624/lazarus/landing_zones/lz2) "wJA" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/lv624/lazarus/corporate_dome) "wJG" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "wJT" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -22727,12 +21049,10 @@ /area/lv624/lazarus/landing_zones/lz2) "wMk" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "wNB" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 10; icon_state = "warning" @@ -22754,10 +21074,7 @@ }, /area/lv624/lazarus/corporate_dome) "wPN" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/caves/sand_temple) "wQj" = ( /obj/structure/surface/rack, @@ -22770,9 +21087,7 @@ /area/lv624/lazarus/quartstorage) "wQl" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "wSg" = ( /obj/structure/inflatable/popped, @@ -22784,9 +21099,7 @@ /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) "wSo" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/barrens/west_barrens) "wSA" = ( /obj/structure/stairs/perspective{ @@ -22828,17 +21141,15 @@ }, /area/lv624/lazarus/corporate_dome) "wTa" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "wTC" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "wTL" = ( /obj/item/storage/firstaid, @@ -22854,21 +21165,17 @@ /area/lv624/ground/barrens/central_barrens) "wVK" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "wWg" = ( /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "wWm" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/north_east_jungle) "wWs" = ( /obj/structure/surface/rack, @@ -22902,23 +21209,19 @@ }, /area/lv624/ground/colony/telecomm/tcommdome/south) "wXp" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/jungle/west_central_jungle) "wXy" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "wYp" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "wZc" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "wZd" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -22945,18 +21248,16 @@ /area/lv624/ground/barrens/south_eastern_barrens) "xcC" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "xdO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_west_jungle) "xei" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "xeq" = ( /obj/structure/machinery/light{ @@ -22971,12 +21272,8 @@ }, /area/lv624/lazarus/corporate_dome) "xeT" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "xfP" = ( /obj/item/stack/rods, @@ -22990,10 +21287,7 @@ /turf/closed/wall/r_wall, /area/lv624/lazarus/corporate_dome) "xhC" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/barrens/south_eastern_barrens) "xkU" = ( /obj/structure/bed/sofa/vert/grey/top, @@ -23010,20 +21304,14 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "xpf" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/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{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "xqV" = ( /obj/structure/surface/rack, @@ -23034,24 +21322,19 @@ }, /area/lv624/lazarus/fitness) "xrI" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 6; icon_state = "warning" }, /area/lv624/lazarus/landing_zones/lz2) "xsN" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "xuk" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/east_central_jungle) "xuK" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -23108,12 +21391,10 @@ /area/lv624/lazarus/crashed_ship_containers) "xze" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "xzD" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/north_jungle) "xBi" = ( /turf/open/gm/dirt{ @@ -23132,16 +21413,14 @@ /area/lv624/lazarus/corporate_dome) "xDl" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/east_central_jungle) "xDw" = ( /turf/closed/wall/r_wall/unmeltable, /area/lv624/ground/colony/telecomm/cargo) "xDR" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "xEt" = ( /turf/closed/wall/strata_ice/jungle, @@ -23154,11 +21433,11 @@ /area/lv624/lazarus/canteen) "xGd" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "xHa" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "xJA" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -23172,15 +21451,11 @@ /area/lv624/ground/caves/north_central_caves) "xKu" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "xKE" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/west_jungle) "xLi" = ( /obj/structure/surface/rack, @@ -23191,21 +21466,19 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/containers) "xPk" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/south_medbay_road) "xPD" = ( /obj/item/tool/pickaxe, /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) "xPL" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_east_jungle) "xPS" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "xQy" = ( /obj/structure/largecrate/random, @@ -23218,13 +21491,13 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "xRo" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "xSA" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -23243,32 +21516,28 @@ /turf/open/gm/dirt, /area/lv624/ground/jungle/south_west_jungle) "xVb" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/barrens/east_barrens) "xVk" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "xVo" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "xXB" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "xXZ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_central_jungle) "xYj" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "xZE" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, @@ -23283,9 +21552,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) "ybQ" = ( /obj/structure/surface/table/woodentable/fancy, @@ -23296,7 +21563,7 @@ /area/lv624/lazarus/corporate_dome) "ydp" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "ydz" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -23308,23 +21575,14 @@ }, /area/lv624/lazarus/crashed_ship_containers) "yga" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/north_east_jungle) "ygn" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/river/east_river) "yhd" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "yhH" = ( /obj/structure/barricade/wooden{ @@ -23359,7 +21617,7 @@ /area/lv624/lazarus/corporate_dome) "yiE" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "yiT" = ( /obj/structure/surface/table/reinforced/prison, @@ -23373,10 +21631,7 @@ /area/lv624/lazarus/corporate_dome) "yjh" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/west_tcomms_road) "yjN" = ( /obj/structure/flora/jungle/vines/heavy, @@ -23388,7 +21643,7 @@ "ykM" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "yle" = ( /turf/open/gm/dirt, @@ -24530,7 +22785,7 @@ tMh aKb aVS aVS -uUl +bzs aVS aXy aKf @@ -24758,7 +23013,7 @@ kwG aKb aVS aWk -xTT +qBW axR aXy gve @@ -24986,7 +23241,7 @@ aKb aKb lyz aWl -xTT +qBW aWO hMd aWl @@ -25216,7 +23471,7 @@ aVS aWm aWO aWO -xTT +qBW aXQ aVS aLm @@ -25444,7 +23699,7 @@ acr aWn aWO jGs -xTT +qBW aWO aVS aYm @@ -25673,7 +23928,7 @@ aWo aWP aWO aWO -xTT +qBW axR xdO hUs @@ -25901,7 +24156,7 @@ aWl aWO aWO aWO -xTT +qBW aVS aYo aVK @@ -26127,7 +24382,7 @@ aKb aVS aWp aWO -xTT +qBW aXA aWl lyz @@ -26354,7 +24609,7 @@ aXh aVw aVS axR -xTT +qBW aWO aWO aXR @@ -38706,7 +36961,7 @@ abb abb abb abb -aaB +aaC aaj aaA aaU @@ -39384,7 +37639,7 @@ aah aah aaX aaj -aak +abe abb abb abb @@ -41321,7 +39576,7 @@ wVk wVk wVk ajr -iyF +lju nHY oTt mVV @@ -43271,7 +41526,7 @@ abh abb abb abb -aaB +aaC aaA aah aah @@ -43500,7 +41755,7 @@ abb abb abb abb -aaB +aaC aaA aah aaH @@ -44282,7 +42537,7 @@ wVk wVk ajq ako -alp +ajT sqj sqj rit @@ -45649,7 +43904,7 @@ wVk wVk wVk ajq -alp +ajT sqj sqj sqj @@ -47006,7 +45261,7 @@ muz twC nqv nqv -iXc +jLv obp wVk wVk @@ -47692,7 +45947,7 @@ nnL owQ uSy nqv -iXc +jLv pci wVk wVk @@ -47921,7 +46176,7 @@ uFB xVb spm nqv -iXc +jLv oEI pci wVk @@ -48144,14 +46399,14 @@ lQC lQC lQC xVb -iXc +jLv pci fpn uSy nqv nqv nqv -iXc +jLv oEI oEI oEI @@ -48373,7 +46628,7 @@ lQC lQC fpn uSy -iXc +jLv oEI twC syx @@ -49072,7 +47327,7 @@ lQC lQC ajr sqj -iyF +lju hwR oTt hrG @@ -49756,7 +48011,7 @@ sqj sqj sqj sTX -cLw +dGG nPd dVH dVH @@ -49985,7 +48240,7 @@ ajG sqj sqj kft -cLw +dGG nPd bfe bQP @@ -50667,7 +48922,7 @@ ajr sqj sqj sTX -iyF +lju hwR oTt dVH @@ -51580,7 +49835,7 @@ sqj sqj akr sqj -cLw +dGG bnX amr oRH @@ -56645,7 +54900,7 @@ acb avS acb asN -akG +uVx aDG aDG aDG @@ -56657,7 +54912,7 @@ aHu aGz aGz aGz -akG +uVx aGz aGz aGz @@ -56669,7 +54924,7 @@ aDG aDG aDG aDG -aMq +uVx aky aky aky @@ -56874,8 +55129,8 @@ btb uZq aDG aHu -aDH -aEj +ank +aGB aEj aFK aGe @@ -56885,7 +55140,7 @@ aFK aGe aGB aEj -aJT +aFK aGe aGB aEj @@ -56895,8 +55150,8 @@ aGB aEj aFK aGe -akG -aDH +aGB +ank aMq aky aky @@ -57102,7 +55357,7 @@ lke aGz aGz aGz -aDI +aDJ ank ank ano @@ -57330,7 +55585,7 @@ aDM aDM aDM hSa -aDJ +aDK ank ank ank @@ -57558,7 +55813,7 @@ btF btF btF aDi -aDK +aDL ank ank ank @@ -57786,7 +56041,7 @@ aky dbY btF aDi -aDL +aDI ank ank ank @@ -58014,7 +56269,7 @@ aky aky btF aDi -aDI +aDJ ank ank ank @@ -58242,7 +56497,7 @@ nSR aky btF aDi -aDJ +aDK ank ank ank @@ -58470,7 +56725,7 @@ qBX nSR btF aDi -aDK +aDL ank ank ank @@ -58698,7 +56953,7 @@ qBX tKI btF aDi -aDL +aDI ank ank ank @@ -58926,7 +57181,7 @@ qBX tKI btF aDi -aDI +aDJ ank ank ank @@ -59154,7 +57409,7 @@ shq rKQ btF aDi -aDJ +aDK ank ank ank @@ -59382,7 +57637,7 @@ aky jtg btF aDi -aDK +aDL ank ank ano @@ -59610,18 +57865,18 @@ aky aky btF aDi -aDH -aEl +ank +aGE aEl aFM -ank +aGf aGE aEl aFM aGf aGE aEl -aJU +aFM aGf aGE aEl @@ -59631,8 +57886,8 @@ aGE aEl aFM aGf -akG -aDH +aGE +ank aMq btF aky @@ -59837,7 +58092,7 @@ phU eHr aky btF -akG +uVx aDM aDM aDM @@ -59849,7 +58104,7 @@ aDM aDM aDM aDM -akG +uVx aDM aDM aDM @@ -60788,7 +59043,7 @@ wpw wpw wpw wpw -sFt +wYp lBw lBw lBw diff --git a/maps/map_files/LV624/cargospecial/cargospecial1_mines.dmm b/maps/map_files/LV624/cargospecial/cargospecial1_mines.dmm index 83e1ef880373..4f374a352b54 100644 --- a/maps/map_files/LV624/cargospecial/cargospecial1_mines.dmm +++ b/maps/map_files/LV624/cargospecial/cargospecial1_mines.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "b" = ( /obj/structure/largecrate/random/barrel/blue, @@ -11,7 +11,7 @@ /area/lv624/lazarus/quartstorage) "o" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "p" = ( /obj/structure/window/framed/colony/reinforced, diff --git a/maps/map_files/LV624/gym/20.pool.dmm b/maps/map_files/LV624/gym/20.pool.dmm index 510e7f990b50..92bba9a7dcff 100644 --- a/maps/map_files/LV624/gym/20.pool.dmm +++ b/maps/map_files/LV624/gym/20.pool.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "bA" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "bQ" = ( /turf/open/floor{ @@ -56,19 +56,14 @@ /turf/open/floor, /area/lv624/lazarus/fitness) "ic" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/central_jungle) "iv" = ( /obj/item/toy/inflatable_duck, /turf/open/gm/river, /area/lv624/lazarus/fitness) "iJ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/colony/north_nexus_road) "jS" = ( /obj/structure/surface/rack, @@ -130,7 +125,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "oK" = ( /obj/item/shard, @@ -179,22 +174,22 @@ /area/lv624/ground/colony/south_medbay_road) "wH" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "wO" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "xt" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "xS" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "yO" = ( /obj/item/toy/beach_ball, @@ -284,10 +279,7 @@ }, /area/lv624/lazarus/fitness) "Gf" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/south_medbay_road) "Iu" = ( /obj/structure/machinery/atm{ @@ -313,18 +305,18 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "JM" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "KS" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/north_nexus_road) "NC" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "Ot" = ( /obj/structure/window_frame/colony, @@ -377,11 +369,11 @@ /area/lv624/lazarus/fitness) "Td" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "Ua" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "Us" = ( /obj/structure/closet/athletic_mixed, @@ -404,9 +396,7 @@ }, /area/lv624/lazarus/fitness) "Vb" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) "Vo" = ( /obj/structure/window/framed/colony, @@ -422,13 +412,10 @@ }, /area/lv624/lazarus/fitness) "Wj" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "WV" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/north_nexus_road) "Zo" = ( /obj/effect/landmark/good_item, @@ -436,9 +423,7 @@ /area/lv624/lazarus/fitness) "ZM" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) (1,1,1) = {" diff --git a/maps/map_files/LV624/gym/30.alternate.dmm b/maps/map_files/LV624/gym/30.alternate.dmm index e786b6116743..8762e50bc905 100644 --- a/maps/map_files/LV624/gym/30.alternate.dmm +++ b/maps/map_files/LV624/gym/30.alternate.dmm @@ -181,14 +181,11 @@ }, /area/lv624/lazarus/fitness) "lq" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/north_nexus_road) "nl" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "ok" = ( /obj/structure/machinery/light{ @@ -239,7 +236,7 @@ /area/lv624/ground/colony/south_medbay_road) "ux" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "uF" = ( /obj/structure/barricade/handrail{ @@ -279,7 +276,7 @@ /area/lv624/lazarus/fitness) "vZ" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "wA" = ( /obj/structure/bed/chair, @@ -289,9 +286,7 @@ }, /area/lv624/lazarus/fitness) "wL" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) "xe" = ( /obj/structure/closet/boxinggloves, @@ -327,7 +322,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "AE" = ( /turf/open/floor{ @@ -336,9 +331,7 @@ }, /area/lv624/lazarus/fitness) "Bl" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/central_jungle) "Bm" = ( /obj/structure/machinery/vending/cola, @@ -368,7 +361,7 @@ /area/lv624/lazarus/fitness) "CO" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "CZ" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -387,7 +380,7 @@ }, /area/lv624/lazarus/fitness) "DM" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "EQ" = ( /obj/structure/holohoop{ @@ -420,7 +413,7 @@ /area/lv624/lazarus/fitness) "Hz" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/north_nexus_road) "HF" = ( /obj/structure/surface/rack, @@ -501,13 +494,11 @@ /area/lv624/lazarus/fitness) "LB" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) "LG" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "Mn" = ( /obj/structure/machinery/light, @@ -516,16 +507,16 @@ }, /area/lv624/lazarus/fitness) "Nt" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "NW" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "Od" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "Op" = ( /obj/effect/landmark/survivor_spawner, @@ -541,10 +532,7 @@ /turf/open/floor, /area/lv624/lazarus/fitness) "Ph" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/colony/north_nexus_road) "PC" = ( /obj/item/tool/soap, @@ -568,7 +556,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "Qj" = ( /obj/item/device/radio/intercom{ @@ -605,7 +593,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "To" = ( /turf/open/floor{ @@ -665,10 +653,7 @@ }, /area/lv624/lazarus/fitness) "Wh" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/south_medbay_road) "Wx" = ( /obj/structure/window_frame/colony, diff --git a/maps/map_files/LV624/hydro/30.destroyed.dmm b/maps/map_files/LV624/hydro/30.destroyed.dmm index c3cadb6c3c1f..a1c9ebcf3dbb 100644 --- a/maps/map_files/LV624/hydro/30.destroyed.dmm +++ b/maps/map_files/LV624/hydro/30.destroyed.dmm @@ -35,7 +35,7 @@ /area/lv624/lazarus/hydroponics) "bM" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/north_nexus_road) "ck" = ( /obj/effect/decal/cleanable/blood/xeno, @@ -57,15 +57,10 @@ }, /area/lv624/lazarus/hydroponics) "eU" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/north_nexus_road) "fk" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/south_medbay_road) "ft" = ( /obj/item/clothing/gloves/marine/veteran/pmc{ @@ -110,7 +105,7 @@ /area/lv624/lazarus/hydroponics) "jg" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "jy" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, @@ -222,7 +217,7 @@ /area/lv624/lazarus/hydroponics) "se" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "tK" = ( /obj/structure/barricade/deployable{ @@ -343,7 +338,7 @@ /area/lv624/lazarus/hydroponics) "BL" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "Cp" = ( /obj/structure/surface/rack, @@ -452,7 +447,7 @@ }, /area/lv624/lazarus/hydroponics) "Km" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "Lk" = ( /obj/effect/decal/cleanable/blood/xeno, @@ -476,7 +471,7 @@ /area/lv624/lazarus/hydroponics) "Mm" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "MM" = ( /obj/structure/barricade/deployable{ @@ -659,11 +654,11 @@ }, /area/lv624/lazarus/hydroponics) "XA" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "XJ" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "YJ" = ( /obj/item/storage/firstaid, diff --git a/maps/map_files/LV624/maintemple/1.intact.dmm b/maps/map_files/LV624/maintemple/1.intact.dmm index ecc11583e466..27e4f42b6152 100644 --- a/maps/map_files/LV624/maintemple/1.intact.dmm +++ b/maps/map_files/LV624/maintemple/1.intact.dmm @@ -49,10 +49,7 @@ dir = 8 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/barrens/south_eastern_barrens) "aO" = ( /obj/structure/bed/chair/comfy/black{ @@ -145,7 +142,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "dF" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_barrens) "dJ" = ( /obj/structure/barricade/handrail/strata{ @@ -281,10 +278,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "fl" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "fD" = ( /obj/structure/barricade/handrail/strata{ @@ -293,9 +287,7 @@ /obj/structure/barricade/handrail/strata{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/barrens/south_eastern_barrens) "fE" = ( /obj/structure/bed/alien{ @@ -341,9 +333,7 @@ }, /area/lv624/ground/caves/sand_temple) "gw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/sand_temple) "gA" = ( /obj/structure/curtain/red, @@ -356,7 +346,7 @@ desc = "The oranges aren't done yet... this sucks."; name = "orange tree" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "gL" = ( /turf/open/floor/strata{ @@ -394,9 +384,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "hi" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) "hu" = ( /obj/structure/surface/table/reinforced/prison{ @@ -1188,9 +1176,7 @@ /obj/structure/barricade/handrail/strata{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/barrens/south_eastern_barrens) "DH" = ( /obj/structure/showcase{ @@ -1379,10 +1365,7 @@ dir = 4 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/barrens/south_eastern_barrens) "Jc" = ( /turf/open/shuttle{ @@ -1680,9 +1663,7 @@ /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_barrens) "QL" = ( /obj/structure/stairs/perspective{ @@ -1809,7 +1790,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "Vu" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "Wl" = ( /obj/structure/bed/chair/comfy/black{ @@ -1850,10 +1831,7 @@ /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "Xz" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -1905,10 +1883,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/east_river) "Zt" = ( /obj/structure/prop/brazier, diff --git a/maps/map_files/LV624/maintemple/2.flooded.dmm b/maps/map_files/LV624/maintemple/2.flooded.dmm index 4cc4590fd679..f375b61213ce 100644 --- a/maps/map_files/LV624/maintemple/2.flooded.dmm +++ b/maps/map_files/LV624/maintemple/2.flooded.dmm @@ -4,10 +4,7 @@ /turf/closed/wall/rock/brown, /area/lv624/ground/caves/sand_temple) "ap" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "as" = ( /obj/structure/surface/table/reinforced/prison{ @@ -24,14 +21,11 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "ax" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/caves/sand_temple) "aA" = ( /obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "aI" = ( /obj/structure/surface/table/reinforced/prison{ @@ -52,16 +46,11 @@ dir = 8 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/barrens/south_eastern_barrens) "aO" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/sand_temple) "aT" = ( /obj/structure/stairs/perspective{ @@ -75,9 +64,7 @@ }, /area/lv624/ground/caves/sand_temple) "bP" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "bZ" = ( @@ -85,16 +72,10 @@ /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/caves/sand_temple) "ci" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/caves/sand_temple) "de" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "dr" = ( /obj/structure/stairs/perspective{ @@ -143,7 +124,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "dF" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_barrens) "dJ" = ( /obj/structure/barricade/handrail/strata{ @@ -170,10 +151,7 @@ /area/lv624/ground/caves/sand_temple) "dQ" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/caves/sand_temple) "dV" = ( /obj/structure/surface/table/reinforced/prison{ @@ -194,9 +172,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "ez" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/barrens/south_eastern_barrens) "eM" = ( /obj/structure/stairs/perspective{ @@ -207,16 +183,11 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "eY" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "fl" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "fD" = ( /obj/structure/barricade/handrail/strata{ @@ -225,30 +196,20 @@ /obj/structure/barricade/handrail/strata{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/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{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/caves/sand_temple) "fP" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/coast{ - dir = 8 - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/coast/east, /area/lv624/ground/caves/sand_temple) "gw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/sand_temple) "gA" = ( /obj/structure/curtain/red, @@ -261,7 +222,7 @@ desc = "The oranges aren't done yet... this sucks."; name = "orange tree" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "gL" = ( /turf/open/floor/strata{ @@ -273,10 +234,7 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "gY" = ( /obj/structure/stairs/perspective{ @@ -298,21 +256,14 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "hi" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) "hu" = ( /obj/item/weapon/claymore/mercsword, -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/caves/sand_temple) "hA" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/caves/sand_temple) "hD" = ( /turf/open/gm/dirtgrassborder{ @@ -323,10 +274,8 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "ic" = ( /obj/structure/flora/jungle/vines/heavy, @@ -362,16 +311,11 @@ /area/lv624/ground/barrens/south_eastern_barrens) "iM" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/sand_temple) "iN" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "iW" = ( /obj/structure/barricade/handrail/strata{ @@ -385,33 +329,19 @@ }, /area/lv624/ground/barrens/south_eastern_barrens) "ja" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "jZ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/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{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/caves/sand_temple) "lm" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/caves/sand_temple) "lt" = ( /obj/structure/surface/table/reinforced/prison{ @@ -542,9 +472,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) "od" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -574,9 +502,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "po" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/caves/sand_temple) "pu" = ( /obj/structure/stairs/perspective{ @@ -592,10 +518,7 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "pN" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -630,10 +553,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "rd" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/caves/sand_temple) "rA" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -819,13 +739,8 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "vC" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/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{ @@ -834,10 +749,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "vY" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/caves/sand_temple) "we" = ( /obj/structure/stairs/perspective{ @@ -898,24 +810,17 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "wP" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/caves/sand_temple) "wQ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/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, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "wS" = ( /obj/structure/showcase{ @@ -929,9 +834,7 @@ }, /area/lv624/ground/caves/sand_temple) "wU" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/caves/sand_temple) "wZ" = ( /turf/open/gm/dirtgrassborder{ @@ -939,15 +842,10 @@ }, /area/lv624/ground/barrens/south_eastern_barrens) "xp" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/barrens/south_eastern_barrens) "xu" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/caves/sand_temple) "xx" = ( @@ -977,17 +875,11 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/caves/sand_temple) "yf" = ( /obj/effect/landmark/yautja_teleport, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/barrens/south_eastern_barrens) "yh" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -1027,13 +919,10 @@ dir = 8; layer = 3.01 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/caves/sand_temple) "zA" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "zO" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -1050,9 +939,7 @@ /area/lv624/ground/caves/sand_temple) "Ak" = ( /obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/barrens/south_eastern_barrens) "Ao" = ( /obj/structure/showcase{ @@ -1078,15 +965,10 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "Aw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/sand_temple) "AB" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "AQ" = ( /obj/structure/stairs/perspective{ @@ -1174,23 +1056,18 @@ }, /area/lv624/ground/caves/sand_temple) "Dj" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/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, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "Ds" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; +/obj/structure/flora/jungle/alienplant1{ layer = 4.13; - luminosity = 2; pixel_y = 18 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "Dw" = ( /turf/closed/wall/strata_ice/jungle, @@ -1199,9 +1076,7 @@ /obj/structure/barricade/handrail/strata{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/barrens/south_eastern_barrens) "DH" = ( /obj/structure/showcase{ @@ -1232,10 +1107,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/east_river) "Eq" = ( /obj/structure/surface/table/reinforced/prison{ @@ -1255,26 +1127,15 @@ }, /area/lv624/ground/caves/sand_temple) "Es" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/caves/sand_temple) "EB" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "EJ" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/caves/sand_temple) "EM" = ( /obj/structure/showcase{ @@ -1330,17 +1191,12 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "FS" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/item/hunting_trap{ desc = "A bizarre alien device used for trapping and killing prey."; name = "Alien Mine" }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/caves/sand_temple) "Ge" = ( /turf/open/floor/corsat{ @@ -1355,9 +1211,7 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "Gu" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/barrens/south_eastern_barrens) "GO" = ( /obj/structure/stairs/perspective{ @@ -1391,9 +1245,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/sand_temple) "Hl" = ( /obj/structure/surface/table/reinforced/prison{ @@ -1448,10 +1300,7 @@ pixel_x = 10; pixel_y = 3 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "Ix" = ( /obj/structure/barricade/handrail/strata, @@ -1467,10 +1316,7 @@ dir = 4 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/barrens/south_eastern_barrens) "Jc" = ( /turf/open/shuttle{ @@ -1560,21 +1406,16 @@ /area/lv624/ground/barrens/south_eastern_barrens) "Ki" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "Kk" = ( -/turf/open/gm/grass, +/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{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/sand_temple) "KB" = ( /obj/structure/surface/table/reinforced/prison{ @@ -1598,18 +1439,14 @@ }, /area/lv624/ground/caves/sand_temple) "KL" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_barrens) "Lg" = ( /turf/open/gm/river, /area/lv624/ground/barrens/south_eastern_barrens) "Lt" = ( /obj/item/reagent_container/food/snacks/stew, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/caves/sand_temple) "LF" = ( /obj/structure/stairs/perspective{ @@ -1675,15 +1512,10 @@ /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/caves/sand_temple) "MB" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/caves/sand_temple) "MD" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "MK" = ( /turf/open/gm/dirtgrassborder{ @@ -1691,9 +1523,7 @@ }, /area/lv624/ground/barrens/south_eastern_barrens) "MX" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "Nt" = ( @@ -1748,9 +1578,7 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 1 }, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/caves/sand_temple) "PA" = ( /obj/structure/machinery/door/airlock/sandstone/runed/destroyable{ @@ -1803,17 +1631,13 @@ /area/lv624/ground/caves/sand_temple) "PR" = ( /obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/caves/sand_temple) "QG" = ( /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_barrens) "QL" = ( /obj/structure/stairs/perspective{ @@ -1830,12 +1654,8 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/sand_temple) "Rg" = ( /obj/structure/flora/jungle/vines/heavy, @@ -1899,21 +1719,17 @@ /turf/open/gm/river, /area/lv624/ground/barrens/south_eastern_barrens) "TY" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) "Ug" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/caves/sand_temple) "Uk" = ( /obj/structure/stairs/perspective{ @@ -1927,9 +1743,7 @@ /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/sand_temple) "UK" = ( /turf/open/gm/dirtgrassborder{ @@ -1950,13 +1764,11 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "Vu" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "Wl" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) "Ws" = ( /obj/structure/barricade/handrail/strata{ @@ -1984,10 +1796,7 @@ /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "XV" = ( /obj/structure/bed/chair/comfy/black{ @@ -1999,9 +1808,7 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 1 }, -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/caves/sand_temple) "Yu" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ diff --git a/maps/map_files/LV624/medbay/10.destroyed.dmm b/maps/map_files/LV624/medbay/10.destroyed.dmm index c40cc7a7e2bc..34dbd1981cf0 100644 --- a/maps/map_files/LV624/medbay/10.destroyed.dmm +++ b/maps/map_files/LV624/medbay/10.destroyed.dmm @@ -99,11 +99,11 @@ /area/lv624/lazarus/medbay) "jY" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "kg" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "kh" = ( /obj/structure/surface/table, @@ -116,7 +116,7 @@ /area/lv624/lazarus/medbay) "kD" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "lk" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, @@ -162,7 +162,7 @@ /area/lv624/lazarus/medbay) "nG" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "og" = ( /turf/open/gm/dirt, @@ -210,11 +210,11 @@ /area/lv624/lazarus/medbay) "rZ" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "se" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "tK" = ( /obj/structure/machinery/light{ @@ -239,9 +239,7 @@ /area/lv624/lazarus/medbay) "xe" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/south_medbay_road) "xF" = ( /obj/structure/surface/table/reinforced, @@ -255,11 +253,11 @@ }, /area/lv624/lazarus/medbay) "xM" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "ym" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "yU" = ( /obj/structure/girder, @@ -300,7 +298,7 @@ /area/lv624/lazarus/medbay) "zS" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "AB" = ( /obj/effect/landmark/objective_landmark/science, @@ -310,12 +308,10 @@ /area/lv624/lazarus/medbay) "Be" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/colony/south_medbay_road) "Bn" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "BL" = ( /obj/structure/window_frame/colony, @@ -381,7 +377,7 @@ /area/lv624/lazarus/medbay) "Ha" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "Il" = ( /obj/structure/machinery/bioprinter, @@ -410,7 +406,7 @@ }, /area/lv624/lazarus/medbay) "JE" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "JK" = ( /obj/item/stack/medical/ointment, @@ -436,7 +432,7 @@ /area/lv624/lazarus/medbay) "Km" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "Lk" = ( /obj/structure/machinery/light{ @@ -613,7 +609,7 @@ }, /area/lv624/lazarus/medbay) "XA" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "XJ" = ( /turf/closed/wall/r_wall, diff --git a/maps/map_files/LV624/medbay/30.larvasurgery.dmm b/maps/map_files/LV624/medbay/30.larvasurgery.dmm index 5cf4e37bb31a..a47a2cd2ed62 100644 --- a/maps/map_files/LV624/medbay/30.larvasurgery.dmm +++ b/maps/map_files/LV624/medbay/30.larvasurgery.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ac" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "ae" = ( /turf/closed/wall/r_wall, @@ -10,7 +10,7 @@ /area/lv624/lazarus/medbay) "ag" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "ai" = ( /obj/structure/machinery/medical_pod/sleeper, @@ -29,7 +29,7 @@ /area/lv624/lazarus/medbay) "al" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "an" = ( /obj/structure/surface/table, @@ -100,7 +100,7 @@ /area/lv624/lazarus/medbay) "au" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "av" = ( /turf/open/floor{ @@ -265,9 +265,7 @@ /area/lv624/lazarus/medbay) "bw" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/colony/south_medbay_road) "bx" = ( /obj/item/trash/plate, @@ -301,9 +299,7 @@ /area/lv624/lazarus/medbay) "bE" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/south_medbay_road) "bF" = ( /turf/open/gm/dirt, @@ -364,7 +360,7 @@ /area/lv624/lazarus/medbay) "qK" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "qP" = ( /obj/structure/machinery/power/apc{ @@ -410,11 +406,11 @@ /area/lv624/lazarus/medbay) "we" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "wz" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "yd" = ( /turf/open/floor{ @@ -423,7 +419,7 @@ }, /area/lv624/lazarus/medbay) "zE" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "zF" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, @@ -433,7 +429,7 @@ /area/lv624/lazarus/medbay) "zL" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "AO" = ( /obj/effect/decal/cleanable/blood/xeno, @@ -474,10 +470,10 @@ /area/lv624/lazarus/medbay) "Es" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "ES" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "Gu" = ( /obj/structure/closet/wardrobe, @@ -510,14 +506,14 @@ /area/lv624/lazarus/medbay) "LQ" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "Np" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "Pe" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "Pi" = ( /obj/structure/surface/table, diff --git a/maps/map_files/LV624/science/10.yautja.dmm b/maps/map_files/LV624/science/10.yautja.dmm index 8983af50d4bf..d0dfdca90fc7 100644 --- a/maps/map_files/LV624/science/10.yautja.dmm +++ b/maps/map_files/LV624/science/10.yautja.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "ab" = ( /turf/closed/wall/r_wall, @@ -70,9 +70,7 @@ /area/lv624/lazarus/research) "an" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) "ao" = ( /obj/structure/window/framed/colony/reinforced, @@ -135,7 +133,7 @@ }, /area/lv624/lazarus/research) "av" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "aw" = ( /obj/structure/machinery/optable, @@ -431,7 +429,7 @@ }, /area/lv624/lazarus/research) "bg" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "bh" = ( /turf/closed/wall/strata_ice/jungle, diff --git a/maps/map_files/LV624/science/40.fullylocked.dmm b/maps/map_files/LV624/science/40.fullylocked.dmm index 42b74e6510dd..63a5d17558f3 100644 --- a/maps/map_files/LV624/science/40.fullylocked.dmm +++ b/maps/map_files/LV624/science/40.fullylocked.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "ab" = ( /turf/closed/wall/r_wall, @@ -69,9 +69,7 @@ /area/lv624/lazarus/research) "an" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) "ao" = ( /obj/structure/window/framed/colony/reinforced, @@ -141,7 +139,7 @@ }, /area/lv624/lazarus/research) "ax" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "ay" = ( /turf/open/floor{ @@ -416,7 +414,7 @@ }, /area/lv624/lazarus/research) "bE" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "bF" = ( /turf/closed/wall/strata_ice/jungle, diff --git a/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm b/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm index 3ba7fbdc8951..8b09597980a6 100644 --- a/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm +++ b/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm @@ -168,6 +168,7 @@ /obj/effect/decal/cleanable/blood/splatter, /obj/item/ammo_casing, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor{ icon_state = "white" }, @@ -424,10 +425,6 @@ /area/lv624/lazarus/main_hall) "bc" = ( /obj/effect/decal/cleanable/blood/splatter, -/obj/structure/surface/table{ - dir = 4; - flipped = 1 - }, /obj/structure/surface/table{ flipped = 1 }, @@ -712,10 +709,6 @@ /obj/structure/surface/table{ flipped = 1 }, -/obj/structure/surface/table{ - dir = 8; - flipped = 1 - }, /obj/item/ammo_casing, /obj/item/ammo_casing, /turf/open/floor{ diff --git a/maps/map_files/LV624/standalone/leftsidepass.dmm b/maps/map_files/LV624/standalone/leftsidepass.dmm index 2295c67b98f4..678059d4ad83 100644 --- a/maps/map_files/LV624/standalone/leftsidepass.dmm +++ b/maps/map_files/LV624/standalone/leftsidepass.dmm @@ -1,16 +1,14 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ab" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "ac" = ( /obj/effect/landmark/hunter_primary, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_west_barrens) "ad" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/west_river) "ae" = ( /obj/structure/flora/bush/ausbushes/grassybush, @@ -26,18 +24,13 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_west_barrens) "ah" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /obj/effect/landmark/lv624/fog_blocker, /turf/open/gm/river, /area/lv624/ground/river/west_river) "ai" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/west_river) "aj" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, @@ -52,145 +45,97 @@ /turf/open/gm/river, /area/lv624/ground/river/west_river) "ao" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/west_river) "aq" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/west_river) "ar" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/west_river) "as" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/dirt, /area/lv624/ground/jungle/west_jungle) "at" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/river/west_river) "au" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_jungle) "av" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/west_jungle) "aw" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/jungle/west_jungle) "ax" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/west_jungle) "ay" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "az" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aA" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aB" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/west_jungle) "aC" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aD" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aE" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aF" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aG" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aH" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aI" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aJ" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aK" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/west_jungle) "aU" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/river/west_river) "aV" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aX" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/west_river) "bc" = ( /turf/open/gm/river, @@ -207,26 +152,20 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_west_barrens) "bm" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/river/west_river) "bt" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/west_river) "bx" = ( /obj/effect/alien/weeds/node, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_west_barrens) "bz" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/west_river) "bL" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "bN" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -234,18 +173,13 @@ /area/lv624/ground/river/west_river) "bV" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_jungle) "gX" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/river/west_river) "kE" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/jungle/west_jungle) "qG" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -256,9 +190,7 @@ /turf/open/gm/river, /area/lv624/ground/jungle/west_jungle) "zW" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/jungle/west_jungle) "Dw" = ( /turf/closed/wall/strata_ice/jungle, @@ -277,15 +209,10 @@ /turf/open/gm/river, /area/lv624/ground/jungle/west_jungle) "Ms" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/jungle/west_jungle) "Ok" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/lv624/ground/river/west_river) "Oz" = ( diff --git a/maps/map_files/LV624/standalone/lv-bridge-east.dmm b/maps/map_files/LV624/standalone/lv-bridge-east.dmm index 00b0d29dd7d8..62df758ef0df 100644 --- a/maps/map_files/LV624/standalone/lv-bridge-east.dmm +++ b/maps/map_files/LV624/standalone/lv-bridge-east.dmm @@ -27,18 +27,16 @@ /area/lv624/ground/barrens/central_barrens) "af" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/central_river) "ag" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "ah" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "aj" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -47,9 +45,7 @@ "ak" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/central_river) "al" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -67,23 +63,11 @@ /area/lv624/ground/river/central_river) "ao" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/central_river) "aq" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, -/area/lv624/ground/river/central_river) -"ar" = ( -/obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 6; - icon_state = "beach" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/river/central_river) "as" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, @@ -91,10 +75,7 @@ /area/lv624/ground/river/central_river) "at" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 2; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/river/central_river) "au" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -107,13 +88,11 @@ "av" = ( /obj/effect/landmark/crap_item, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "ax" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/central_river) "ay" = ( /obj/effect/landmark/crap_item, @@ -125,40 +104,24 @@ /area/lv624/ground/river/central_river) "aB" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/central_river) "aD" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/central_river) "aE" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "aG" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 9; - icon_state = "beach" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/central_river) "aH" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/central_river) "aJ" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/central_river) "aK" = ( /turf/open/gm/river, @@ -175,15 +138,10 @@ /turf/open/gm/river, /area/lv624/ground/river/central_river) "aR" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/central_river) "aT" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/north_jungle) "aV" = ( /obj/structure/flora/jungle/plantbot1, @@ -203,65 +161,41 @@ }, /area/lv624/ground/river/central_river) "aZ" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/central_river) "ba" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/central_river) "be" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "bf" = ( /turf/open/gm/dirt, /area/lv624/ground/river/central_river) "bq" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "br" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/north_jungle) "bt" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/north_jungle) "bu" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/north_jungle) "bw" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "by" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "bz" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/north_jungle) "bD" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -269,74 +203,53 @@ /area/lv624/ground/jungle/north_jungle) "bE" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "bH" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "bK" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "bN" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "cp" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, -/turf/open/gm/coast, +/obj/structure/flora/jungle/alienplant1, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "gh" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/north_jungle) "mf" = ( -/turf/open/gm/coast{ - dir = 2; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/river/central_river) "oa" = ( /turf/open/gm/dirt, /area/lv624/ground/jungle/north_jungle) "px" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "pW" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/river, /area/lv624/ground/river/central_river) "uc" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/central_river) "uC" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/central_river) "wp" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "wu" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/lv624/ground/river/central_river) "Bv" = ( @@ -348,7 +261,7 @@ /area/lv624/ground/river/central_river) "BA" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "DQ" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -366,9 +279,7 @@ /area/lv624/ground/river/central_river) "Hi" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "HT" = ( /obj/structure/flora/jungle/planttop1, @@ -388,22 +299,17 @@ /area/lv624/ground/river/central_river) "Ow" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "Rp" = ( /obj/structure/flora/jungle/planttop1, /turf/open/gm/dirt, /area/lv624/ground/jungle/north_jungle) "RE" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "XL" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/river/central_river) "XY" = ( /obj/structure/fence, @@ -651,7 +557,7 @@ bK (15,1,1) = {" af ao -ar +at aK aK aK @@ -746,7 +652,7 @@ bN "} (21,1,1) = {" af -ar +at aK aK aK diff --git a/maps/map_files/LV624/standalone/lv-bridge-nofog.dmm b/maps/map_files/LV624/standalone/lv-bridge-nofog.dmm index b9608d702436..1b9b8a9408b8 100644 --- a/maps/map_files/LV624/standalone/lv-bridge-nofog.dmm +++ b/maps/map_files/LV624/standalone/lv-bridge-nofog.dmm @@ -55,12 +55,10 @@ /turf/open/gm/dirt, /area/lv624/ground/river/central_river) "aj" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "ak" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "al" = ( /obj/effect/decal/cleanable/blood/drip, @@ -70,10 +68,7 @@ }, /area/lv624/ground/river/central_river) "dC" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/central_river) "iW" = ( /obj/effect/landmark/crap_item, @@ -84,29 +79,22 @@ /area/lv624/ground/river/central_river) "jr" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "jT" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 2; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/river/central_river) "km" = ( /obj/effect/landmark/lv624/fog_blocker, /turf/open/gm/river, /area/lv624/ground/river/central_river) "lS" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "lW" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "lY" = ( /turf/open/floor/plating{ @@ -129,20 +117,14 @@ /area/lv624/ground/river/central_river) "mD" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "mE" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_east_jungle) "pF" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "qL" = ( /obj/effect/spawner/gibspawner/human, @@ -154,15 +136,10 @@ /area/lv624/ground/river/central_river) "xB" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "yj" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/central_river) "yu" = ( /turf/closed/wall/strata_ice/jungle, @@ -182,9 +159,7 @@ /area/lv624/ground/river/central_river) "EG" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "Pz" = ( /turf/closed/wall/strata_ice/jungle, @@ -198,12 +173,10 @@ }, /area/lv624/ground/river/central_river) "VN" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "Wb" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_east_jungle) "Yw" = ( /turf/open/floor/plating{ diff --git a/maps/map_files/LV624/standalone/rightsidepass.dmm b/maps/map_files/LV624/standalone/rightsidepass.dmm index 3fcb4c8bc931..944be98dfbe7 100644 --- a/maps/map_files/LV624/standalone/rightsidepass.dmm +++ b/maps/map_files/LV624/standalone/rightsidepass.dmm @@ -1,16 +1,10 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "bw" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/river/east_river) "ci" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "cG" = ( /turf/open/gm/dirt, @@ -28,34 +22,30 @@ /area/lv624/ground/barrens/south_eastern_jungle_barrens) "gs" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "hc" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_jungle) "jd" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "je" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "kf" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "lm" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/river/east_river) "lD" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, @@ -63,10 +53,7 @@ /turf/open/gm/river, /area/lv624/ground/river/east_river) "lJ" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "mK" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -79,24 +66,20 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "oA" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "pf" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "pS" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "qk" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "rP" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -106,9 +89,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) "sn" = ( /turf/closed/wall/strata_ice/jungle, @@ -120,10 +101,7 @@ }, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "tJ" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "tN" = ( /turf/open/gm/dirt{ @@ -131,7 +109,7 @@ }, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "tT" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "ww" = ( /turf/open/gm/dirt{ @@ -140,29 +118,20 @@ /area/lv624/ground/river/east_river) "zT" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "Cf" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/east_river) "CA" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "CL" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/east_river) "DA" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/east_jungle) "Ek" = ( /turf/open/gm/river, @@ -172,47 +141,30 @@ /turf/open/gm/river, /area/lv624/ground/river/east_river) "Fj" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, -/turf/open/gm/coast{ - dir = 8 - }, +/obj/structure/flora/jungle/alienplant1, +/turf/open/gm/coast/east, /area/lv624/ground/river/east_river) "Fm" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/east_river) "FQ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/river/east_river) "GI" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/east_river) "Hb" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "JA" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/east_river) "Kd" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/east_river) "Kp" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -222,41 +174,29 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) "NJ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/east_jungle) "Ov" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "Pb" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "Pk" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/east_river) "Pr" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) "PE" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_jungle) "PV" = ( /turf/open/gm/dirt, @@ -268,16 +208,10 @@ /area/lv624/ground/jungle/east_jungle) "Qb" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/east_river) "Qp" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/east_jungle) "Qz" = ( /turf/open/gm/dirt, @@ -288,10 +222,7 @@ /area/lv624/ground/river/east_river) "VF" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/east_jungle) "Wq" = ( /turf/open/gm/dirt{ @@ -300,27 +231,19 @@ /area/lv624/ground/barrens/south_eastern_jungle_barrens) "WK" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/east_jungle) "Xe" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "Xq" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "YK" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) (1,1,1) = {" diff --git a/maps/map_files/LV624/standalone/sandtemple-jungle.dmm b/maps/map_files/LV624/standalone/sandtemple-jungle.dmm index 543da9987398..3b5a0176fb01 100644 --- a/maps/map_files/LV624/standalone/sandtemple-jungle.dmm +++ b/maps/map_files/LV624/standalone/sandtemple-jungle.dmm @@ -1,77 +1,57 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aq" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "ar" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "cP" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "dy" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/south_west_jungle) "eV" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "fv" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, /obj/effect/landmark/objective_landmark/far, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "gb" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "hq" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "ja" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/south_west_jungle) "jy" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light_2" - }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_west_jungle) "jV" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/jungle/south_west_jungle) "lf" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "lR" = ( @@ -82,189 +62,139 @@ name = "\improper alien blade"; throwforce = 26 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "ny" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "op" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/south_west_jungle) "oA" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "oD" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "oO" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "pB" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "qZ" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "rK" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "ub" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "ui" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "uj" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "up" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "ux" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_west_jungle) "uV" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "vt" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "vT" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "zh" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, -/area/lv624/ground/jungle/south_west_jungle) -"Am" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light_2" - }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "AQ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "Bl" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "Bs" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "DF" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "El" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "FE" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "Ge" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_west_jungle) "Gi" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_west_jungle) "IP" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/south_west_jungle) "Kn" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/south_west_jungle) "Lv" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "Lz" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/south_west_jungle) "LF" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "LM" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "LV" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "LW" = ( /turf/closed/wall/strata_ice/jungle, @@ -274,83 +204,58 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "MG" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, -/area/lv624/ground/jungle/south_west_jungle) -"MY" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light_2" - }, -/turf/closed/wall/strata_ice/jungle, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "Nq" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "NE" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "NU" = ( /turf/open/gm/dirt, /area/lv624/ground/jungle/south_west_jungle) "Ok" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/jungle/south_west_jungle) "QL" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "Rj" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_3, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "RS" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_west_jungle) "Sj" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "TE" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "Wp" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "WQ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "XG" = ( /obj/effect/landmark/yautja_teleport, @@ -360,7 +265,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) (1,1,1) = {" @@ -406,7 +311,7 @@ Bl LW LW LW -MY +TE Bs oA aq @@ -460,7 +365,7 @@ RS LW "} (7,1,1) = {" -Am +LV Nq zh uj diff --git a/maps/map_files/LV624/standalone/sandtemple-se.dmm b/maps/map_files/LV624/standalone/sandtemple-se.dmm index a5d507b2b4d0..76d29d2d01ba 100644 --- a/maps/map_files/LV624/standalone/sandtemple-se.dmm +++ b/maps/map_files/LV624/standalone/sandtemple-se.dmm @@ -1,15 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "al" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light" - }, -/obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - icon_tag = "heavy"; - pixel_x = 0 - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "aK" = ( /turf/closed/wall/strata_ice/jungle, @@ -19,84 +12,56 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "cC" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz1) -"eR" = ( -/obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; - pixel_y = 0 - }, -/turf/closed/wall/mineral/sandstone/runed, -/area/lv624/ground/jungle/south_east_jungle) "gO" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3"; - icon_tag = "light" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "gU" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, /turf/open/floor/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "jc" = ( -/obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0 - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "kd" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "lV" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) "nI" = ( -/obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0 - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "qo" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "rA" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) "ug" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) "uk" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, /turf/closed/wall/mineral/sandstone/runed, @@ -106,37 +71,27 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "ur" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "wQ" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_x = -28 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "xk" = ( /turf/closed/wall/mineral/sandstone/runed/decor, /area/lv624/ground/jungle/south_east_jungle) "yg" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "zg" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3"; - icon_tag = "light" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz1) "Be" = ( @@ -145,84 +100,66 @@ /area/lv624/ground/jungle/south_east_jungle) "CW" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, /obj/effect/decal/cleanable/cobweb, /turf/open/gm/dirt, /area/lv624/ground/jungle/south_east_jungle) "EZ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "LV" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "LW" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz1) "NU" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, /turf/open/gm/dirt, /area/lv624/ground/jungle/south_east_jungle) "Tl" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "Uc" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "UA" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3"; - icon_tag = "light" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "VR" = ( /obj/effect/landmark/yautja_teleport, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "Wl" = ( /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "Wp" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_east_jungle) "Wr" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) "Wt" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "WQ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_east_jungle) "Xl" = ( /turf/open/gm/dirt, @@ -235,21 +172,11 @@ /turf/open/gm/dirt, /area/lv624/ground/jungle/south_east_jungle) "XB" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, -/area/lv624/ground/jungle/south_east_jungle) -"XN" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "XR" = ( -/obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0 - }, +/obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) "XS" = ( @@ -258,46 +185,30 @@ /area/lv624/ground/jungle/south_east_jungle) "Ya" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "Yr" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_east_jungle) "Yz" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 24 }, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) -"YD" = ( -/obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - icon_tag = "heavy"; - pixel_x = 0 - }, -/turf/open/gm/grass, -/area/lv624/ground/jungle/south_east_jungle) "Ze" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_east_jungle) "Zi" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 24 }, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "Zp" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) (1,1,1) = {" @@ -352,13 +263,13 @@ aK cC LW Wr -XN -YD +ur +jc Wl CW Xl Xl -eR +XS XS XS aK @@ -366,8 +277,8 @@ aK "} (5,1,1) = {" LW -YD -YD +jc +jc qo UA xk @@ -383,7 +294,7 @@ aK (6,1,1) = {" LW LW -XN +ur qo qo Wl @@ -399,7 +310,7 @@ aK (7,1,1) = {" qo UA -YD +jc qo qo Wt diff --git a/maps/map_files/LV624/storage-crashed-ship/10.armorystorage.dmm b/maps/map_files/LV624/storage-crashed-ship/10.armorystorage.dmm index bd54efc8c5b4..90b9f293b9f8 100644 --- a/maps/map_files/LV624/storage-crashed-ship/10.armorystorage.dmm +++ b/maps/map_files/LV624/storage-crashed-ship/10.armorystorage.dmm @@ -16,13 +16,13 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "d" = ( /obj/item/tool/shovel, /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "e" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ dir = 1; @@ -34,7 +34,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "i" = ( /obj/structure/surface/rack, /obj/item/ammo_magazine/smg/mp27, @@ -58,10 +58,10 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "j" = ( /turf/closed/wall, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "n" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/gold{ @@ -78,7 +78,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "p" = ( /turf/open/gm/dirt, /area/lv624/ground/barrens/north_east_barrens) @@ -98,19 +98,19 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "t" = ( /obj/item/tool/pickaxe, /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "v" = ( /obj/effect/landmark/crap_item, /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "x" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/smg/fp9000, @@ -118,7 +118,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "y" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/explosive/grenade/high_explosive/stick, @@ -132,7 +132,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "z" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/rifle/mar40{ @@ -146,7 +146,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "B" = ( /obj/structure/closet/crate, /obj/item/ammo_magazine/rifle/mar40, @@ -159,7 +159,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "F" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/gun/smg/nailgun, @@ -169,7 +169,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "G" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/smg/mp27{ @@ -182,7 +182,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "I" = ( /obj/structure/machinery/light{ dir = 4 @@ -204,7 +204,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "K" = ( /obj/effect/landmark/crap_item, /turf/open/gm/dirt, @@ -213,7 +213,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "O" = ( /obj/structure/machinery/light{ dir = 8 @@ -221,7 +221,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "P" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/smg/mac15, @@ -232,7 +232,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "Q" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/diamond{ @@ -242,7 +242,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "T" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ icon_state = "door_locked"; @@ -253,7 +253,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "U" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/rifle/lmg, @@ -262,7 +262,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "V" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/diamond{ @@ -275,7 +275,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "X" = ( /obj/effect/alien/weeds/node, /turf/open/gm/dirt, @@ -294,7 +294,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) (1,1,1) = {" X diff --git a/maps/map_files/LV624/storage-crashed-ship/10.valuables.dmm b/maps/map_files/LV624/storage-crashed-ship/10.valuables.dmm index aa22dd39d781..c76947ab37e8 100644 --- a/maps/map_files/LV624/storage-crashed-ship/10.valuables.dmm +++ b/maps/map_files/LV624/storage-crashed-ship/10.valuables.dmm @@ -11,7 +11,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "e" = ( /obj/structure/machinery/light{ dir = 4 @@ -20,10 +20,10 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "f" = ( /turf/closed/wall, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "i" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/diamond{ @@ -32,7 +32,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "l" = ( /obj/effect/landmark/crap_item, /obj/effect/alien/weeds/node, @@ -55,7 +55,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "p" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/silver{ @@ -66,13 +66,13 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "q" = ( /obj/effect/landmark/crap_item, /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "r" = ( /obj/effect/landmark/crap_item, /turf/open/gm/dirt, @@ -84,14 +84,14 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "t" = ( /obj/structure/surface/rack, /obj/item/tool/shovel, /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "y" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/metal{ @@ -107,7 +107,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "C" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/platinum{ @@ -116,14 +116,14 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "D" = ( /obj/structure/largecrate/supply, /turf/open/floor{ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "G" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/rifle/lmg, @@ -131,7 +131,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "H" = ( /obj/structure/machinery/light{ dir = 8 @@ -140,7 +140,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "I" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/rifle/mar40{ @@ -153,7 +153,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "M" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/iron{ @@ -163,7 +163,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "N" = ( /obj/effect/alien/weeds/node, /turf/open/gm/dirt, @@ -184,7 +184,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "U" = ( /obj/structure/closet/crate, /obj/item/ammo_magazine/rifle/mar40, @@ -197,7 +197,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "V" = ( /obj/structure/machinery/light{ dir = 4 @@ -211,7 +211,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "X" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ icon_state = "door_locked"; @@ -222,12 +222,12 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "Z" = ( /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) (1,1,1) = {" O diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index bf8684bd97da..b8733f060c4c 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -417,7 +417,7 @@ /obj/structure/platform/kutjevo/smooth{ dir = 8 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/varadero/exterior/pontoon_beach) "atb" = ( /obj/structure/machinery/vending/snack, @@ -492,9 +492,7 @@ /area/varadero/exterior/lz1_near) "awf" = ( /obj/item/toy/beach_ball, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/varadero/exterior/pontoon_beach) "axX" = ( /obj/structure/machinery/door/poddoor/two_tile/four_tile/vertical/secure{ @@ -576,7 +574,7 @@ /obj/structure/flora/bush/ausbushes/var3/brflowers{ icon_state = "brflowers_3" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "aCl" = ( /obj/structure/machinery/door/airlock/strata/autoname{ @@ -940,7 +938,7 @@ /turf/open/floor/plating, /area/varadero/interior/cargo) "aOg" = ( -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "aOi" = ( /turf/open/floor/shiva{ @@ -1291,10 +1289,7 @@ /obj/structure/platform/kutjevo/smooth{ dir = 8 }, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/eastbeach) "bfg" = ( /obj/structure/surface/table, @@ -3420,7 +3415,7 @@ /obj/structure/flora/bush/ausbushes/var3/ywflowers{ icon_state = "ywflowers_3" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "cSb" = ( /obj/structure/surface/rack, @@ -3745,10 +3740,7 @@ /area/varadero/interior_protected/caves/digsite) "dki" = ( /obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/eastbeach) "dkl" = ( /turf/open/floor/shiva{ @@ -3854,10 +3846,7 @@ /obj/structure/platform/kutjevo/smooth{ dir = 4 }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/varadero/interior/oob) "dpz" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -4091,10 +4080,7 @@ /obj/structure/platform_decoration/kutjevo{ dir = 1 }, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/eastbeach) "dFd" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -4704,9 +4690,7 @@ /obj/structure/platform/kutjevo/smooth{ dir = 4 }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/varadero/interior/oob) "elO" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -5191,10 +5175,7 @@ }, /area/varadero/interior_protected/maintenance/south) "eGX" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/varadero/exterior/pontoon_beach) "eHB" = ( /obj/structure/flora/pottedplant{ @@ -5310,6 +5291,7 @@ /area/varadero/interior/medical) "eMf" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) "eMi" = ( @@ -5410,10 +5392,7 @@ /area/varadero/interior/toilets) "eRc" = ( /obj/structure/prop/rock/brown, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/varadero/interior/oob) "eRD" = ( /obj/structure/pipes/vents/pump, @@ -5449,9 +5428,7 @@ }, /area/varadero/interior_protected/vessel) "eSd" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/varadero/exterior/eastbeach) "eSg" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -6143,10 +6120,7 @@ }, /area/varadero/interior/maintenance/security) "fvL" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/varadero/interior/oob) "fvR" = ( /obj/structure/platform_decoration/kutjevo{ @@ -6330,10 +6304,7 @@ }, /area/varadero/interior/electrical) "fFD" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/varadero/interior/oob) "fFI" = ( /obj/structure/bed/chair/office/dark{ @@ -6500,9 +6471,7 @@ /turf/open/gm/dirt, /area/varadero/exterior/pontoon_beach) "fLY" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/varadero/exterior/pontoon_beach) "fMq" = ( /obj/item/device/cassette_tape/heavymetal{ @@ -6533,16 +6502,11 @@ }, /area/varadero/interior/maintenance/research) "fOA" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/varadero/exterior/eastbeach) "fOW" = ( /obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/pontoon_beach) "fPn" = ( /obj/structure/disposalpipe/segment{ @@ -6567,7 +6531,7 @@ /obj/structure/flora/bush/ausbushes/var3/ywflowers{ icon_state = "ywflowers_2" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "fPv" = ( /obj/structure/machinery/power/apc{ @@ -7276,7 +7240,7 @@ /area/varadero/interior/maintenance/north) "gsm" = ( /obj/structure/prop/rock/brown, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "gsq" = ( /obj/structure/machinery/vending/coffee, @@ -7858,10 +7822,7 @@ /turf/open/floor/plating, /area/varadero/interior_protected/caves) "gVO" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/varadero/exterior/pontoon_beach) "gWd" = ( /obj/structure/desertdam/decals/road_edge{ @@ -8084,7 +8045,7 @@ /area/varadero/interior/mess) "hiE" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "hjj" = ( /obj/item/ammo_magazine/handful/shotgun/buckshot{ @@ -8173,10 +8134,7 @@ }, /area/varadero/interior/laundry) "hmu" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/eastbeach) "hni" = ( /obj/structure/sign/safety/fire_haz{ @@ -8444,7 +8402,7 @@ /obj/structure/flora/bush/ausbushes/var3/ywflowers{ icon_state = "ywflowers_4" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "hza" = ( /obj/effect/decal/cleanable/blood/oil, @@ -8649,9 +8607,7 @@ }, /area/varadero/interior/hall_N) "hKK" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/varadero/exterior/pontoon_beach) "hLA" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -9027,9 +8983,7 @@ icon_state = "hr_kutjevo"; name = "support struts" }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/varadero/interior/oob) "iaO" = ( /turf/closed/wall/r_wall/elevator{ @@ -9133,10 +9087,7 @@ pixel_x = -11; pixel_y = -4 }, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/varadero/exterior/pontoon_beach) "idI" = ( /obj/structure/prop/invuln/minecart_tracks{ @@ -9260,9 +9211,7 @@ /area/varadero/exterior/pontoon_beach) "ijR" = ( /obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/varadero/interior/oob) "iks" = ( /obj/item/tool/shovel/spade, @@ -9839,10 +9788,7 @@ pixel_x = 3; pixel_y = 5 }, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/pontoon_beach) "iHh" = ( /obj/item/weapon/gun/shotgun/pump, @@ -9991,9 +9937,7 @@ /turf/open/floor/plating, /area/varadero/interior/mess) "iLL" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/varadero/exterior/eastbeach) "iLN" = ( /obj/structure/platform/kutjevo/smooth, @@ -10376,9 +10320,7 @@ }, /area/varadero/interior/security) "jaF" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/varadero/exterior/pontoon_beach) "jbh" = ( /obj/structure/machinery/disposal, @@ -11259,9 +11201,7 @@ }, /area/varadero/interior/comms1) "jSX" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/varadero/exterior/pontoon_beach) "jTe" = ( /obj/structure/disposalpipe/segment{ @@ -11320,7 +11260,7 @@ }, /area/varadero/interior/hall_N) "jVw" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/varadero/exterior/eastbeach) "jVK" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -12086,9 +12026,7 @@ }, /area/varadero/interior/electrical) "kDy" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/varadero/exterior/eastbeach) "kDF" = ( /obj/structure/disposalpipe/segment{ @@ -12826,7 +12764,7 @@ }, /area/varadero/interior/hall_N) "lnO" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/varadero/exterior/pontoon_beach) "lod" = ( /obj/structure/surface/table/reinforced/prison, @@ -13552,7 +13490,7 @@ /area/varadero/interior/hall_NW) "lVQ" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "lVW" = ( /obj/structure/desertdam/decals/road_edge{ @@ -14934,6 +14872,7 @@ /area/varadero/interior/hall_SE) "ncd" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) "ncg" = ( @@ -15043,9 +14982,7 @@ /area/varadero/interior/laundry) "nfD" = ( /obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/varadero/exterior/eastbeach) "nfX" = ( /obj/item/reagent_container/glass/bucket{ @@ -15716,6 +15653,7 @@ /area/varadero/interior/hall_NW) "nOI" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand_white/layer0, /area/varadero/interior_protected/caves) "nOO" = ( @@ -16150,11 +16088,6 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"oei" = ( -/turf/open/shuttle{ - icon_state = "floor6" - }, -/area/varadero/interior_protected/vessel) "oeF" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -16944,6 +16877,7 @@ /area/varadero/interior/research) "oPb" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ dir = 1; icon_state = "squareswood" @@ -17403,7 +17337,7 @@ /obj/structure/flora/bush/ausbushes/var3/brflowers{ icon_state = "brflowers_2" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "pie" = ( /obj/structure/prop/invuln/lattice_prop{ @@ -18508,10 +18442,7 @@ /turf/open/floor/wood, /area/varadero/interior/bunks) "qgm" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/varadero/exterior/pontoon_beach) "qgy" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -20785,7 +20716,7 @@ /area/varadero/interior/research) "rWN" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "rWX" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -20917,9 +20848,7 @@ /turf/open/floor/wood, /area/varadero/interior/hall_SE) "scL" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/varadero/exterior/pontoon_beach) "scO" = ( /obj/item/paper{ @@ -21807,9 +21736,7 @@ /obj/structure/platform/kutjevo/smooth{ dir = 4 }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/varadero/interior/oob) "sLU" = ( /obj/structure/reagent_dispensers/water_cooler, @@ -21889,10 +21816,7 @@ /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) "sRs" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/pontoon_beach) "sRM" = ( /obj/structure/machinery/disposal, @@ -22417,9 +22341,7 @@ /obj/structure/platform/kutjevo/smooth{ dir = 8 }, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/varadero/exterior/eastbeach) "tyc" = ( /obj/structure/platform_decoration/kutjevo, @@ -23675,9 +23597,7 @@ icon_state = "hr_kutjevo"; name = "support struts" }, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/varadero/exterior/pontoon_beach) "uEz" = ( /obj/structure/disposalpipe/segment{ @@ -24230,9 +24150,7 @@ /obj/structure/platform_decoration/kutjevo{ dir = 1 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/varadero/exterior/eastbeach) "vaV" = ( /obj/structure/surface/table/reinforced/prison, @@ -24756,9 +24674,7 @@ }, /area/varadero/interior/hall_N) "vxA" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/varadero/interior/oob) "vxM" = ( /obj/structure/machinery/light{ @@ -25073,9 +24989,7 @@ pixel_x = -12; pixel_y = -3 }, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/varadero/exterior/pontoon_beach) "vMU" = ( /obj/structure/surface/rack, @@ -25611,9 +25525,6 @@ icon_state = "floor3" }, /area/varadero/interior/laundry) -"wjA" = ( -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior_protected/caves) "wjB" = ( /turf/open/floor{ icon_state = "asteroidwarning" @@ -25639,11 +25550,6 @@ }, /turf/open/floor/wood, /area/varadero/interior/records) -"wku" = ( -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior_protected/maintenance/south) "wkC" = ( /obj/item/stack/cable_coil/cut{ pixel_x = 6; @@ -26031,10 +25937,7 @@ /area/varadero/interior/laundry) "wAj" = ( /obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/varadero/exterior/pontoon_beach) "wAx" = ( /obj/effect/landmark/corpsespawner/security, @@ -26648,10 +26551,7 @@ /turf/closed/wall/r_wall, /area/varadero/interior/administration) "xgH" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/varadero/exterior/eastbeach) "xgU" = ( /obj/structure/prop/structure_lattice{ @@ -27253,7 +27153,7 @@ /area/varadero/interior/records) "xGV" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "xHt" = ( /obj/structure/desertdam/decals/road_edge{ @@ -27277,9 +27177,7 @@ /area/varadero/interior/research) "xJn" = ( /obj/structure/blocker/fog, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/varadero/interior/oob) "xJx" = ( /obj/structure/machinery/photocopier, @@ -28013,9 +27911,7 @@ /area/varadero/interior/toilets) "ykD" = ( /obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/varadero/exterior/pontoon_beach) "ykE" = ( /obj/structure/surface/table/reinforced/prison, @@ -30005,7 +29901,7 @@ mEA sBk ksn fay -wjA +crY vYW vYW vYW @@ -30187,8 +30083,8 @@ aJc lqV xrA fay -wjA -wjA +crY +crY vYW vYW vYW @@ -30370,8 +30266,8 @@ hDA tMx fay qMH -wjA -wjA +crY +crY vYW vYW vYW @@ -32022,9 +31918,9 @@ vYW hto pGs pGs -wjA -wjA -wjA +crY +crY +crY pGs pGs pGs @@ -32193,8 +32089,8 @@ fay ebr ebr vYW -wjA -wjA +crY +crY ebr alL alL @@ -32202,12 +32098,12 @@ uQa uQa vYW vYW -wjA -wjA +crY +crY vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -32376,7 +32272,7 @@ ebr ebr vYW vYW -wjA +crY vYW uQa uQa @@ -32389,8 +32285,8 @@ vYW vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -32565,15 +32461,15 @@ uQa uQa uQa vYW -wjA +crY vYW vYW -wjA +crY vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -32755,7 +32651,7 @@ vYW vYW vYW vYW -wjA +crY pGs pGs pGs @@ -32933,12 +32829,12 @@ ebr ebr ebr ebr -wjA +crY vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -33115,12 +33011,12 @@ ebr ebr ebr ebr -wjA +crY vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -33302,8 +33198,8 @@ vYW vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -33480,12 +33376,12 @@ ebr ebr ebr ebr -wjA +crY vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -33666,8 +33562,8 @@ ebr vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -33845,11 +33741,11 @@ ebr ebr ebr ebr -wjA +crY vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -34028,10 +33924,10 @@ ebr ebr vYW ckM -wjA +crY vYW vYW -wjA +crY pGs pGs pGs @@ -34397,8 +34293,8 @@ vYW vYW vYW vYW -wjA -wjA +crY +crY hto pGs pGs @@ -35301,7 +35197,7 @@ vYW vYW hto vYW -wjA +crY vYW vYW vYW @@ -35316,7 +35212,7 @@ vYW vYW vYW vYW -wjA +crY pGs pGs pGs @@ -35483,12 +35379,12 @@ hto ebr hto vYW -wjA -wjA -wjA +crY +crY +crY vYW vYW -wjA +crY vYW vYW vYW @@ -35665,7 +35561,7 @@ ebr ebr ebr vYW -wjA +crY pJF hWG gHJ @@ -35856,8 +35752,8 @@ vYW vYW vYW vYW -wjA -wjA +crY +crY vYW vYW vYW @@ -36027,7 +35923,7 @@ vYW ebr ebr ebr -wjA +crY vYW vYW pJF @@ -36038,7 +35934,7 @@ vYW vYW vYW vYW -wjA +crY qMH hto vYW @@ -36209,17 +36105,17 @@ vYW ebr ebr ebr -wjA +crY vYW -wjA -wjA +crY +crY nOI vYW vYW vYW vYW vYW -wjA +crY ebr ebr hto @@ -36393,7 +36289,7 @@ qMH qMH vYW vYW -wjA +crY vYW fGP vYW @@ -36564,18 +36460,18 @@ sdz ebr ebr qMH -wjA +crY vYW vYW vYW vYW vYW vYW -wjA +crY qMH vYW vYW -wjA +crY pJF hWG pJF @@ -36746,8 +36642,8 @@ nTG ebr ebr qMH -wjA -wjA +crY +crY vYW vYW vYW @@ -36756,7 +36652,7 @@ vYW vYW vYW vYW -wjA +crY vYW hWG cYC @@ -36929,7 +36825,7 @@ jpD ebr ebr qMH -wjA +crY vYW vYW vYW @@ -36938,7 +36834,7 @@ vYW vYW vYW vYW -wjA +crY vYW pJF hWG @@ -37111,14 +37007,14 @@ jpD ebr ebr ebr -wjA -wjA -wjA +crY +crY +crY vYW vYW vYW vYW -wjA +crY vYW vYW vYW @@ -37293,14 +37189,14 @@ gUP cQK ktE ebr -wjA -wjA -wjA +crY +crY +crY vYW vYW vYW vYW -wjA +crY vYW vYW vYW @@ -37476,12 +37372,12 @@ xes oSb ebr qMH -wjA +crY vYW vYW vYW vYW -wjA +crY vYW vYW ebr @@ -37658,11 +37554,11 @@ xes sYS ebr ebr -wjA +crY ckM -wjA -wjA -wjA +crY +crY +crY vYW vYW hto @@ -37670,11 +37566,11 @@ ebr ebr vYW vYW -wjA +crY vYW vYW -wjA -wjA +crY +crY ebr ebr hto @@ -37840,8 +37736,8 @@ wug axZ ebr ebr -wjA -wjA +crY +crY vYW vYW vYW @@ -37854,13 +37750,13 @@ vYW vYW vYW vYW -wjA -wjA -wjA +crY +crY +crY ebr ebr ebr -wjA +crY vYW vYW uQa @@ -38024,25 +37920,25 @@ kyG kyG kyG kyG -wjA -wjA +crY +crY vYW -wjA -wjA -wjA +crY +crY +crY vYW vYW vYW vYW vYW qMH -wjA -wjA +crY +crY ebr ebr ebr ebr -wjA +crY vYW vYW vYW @@ -38206,17 +38102,17 @@ sTA ukw rTT kyG -wjA -wjA -wjA -wjA -wjA -wjA -wjA -wjA -wjA -wjA -wjA +crY +crY +crY +crY +crY +crY +crY +crY +crY +crY +crY qMH ebr ebr @@ -38225,13 +38121,13 @@ ebr ebr ebr ebr -wjA +crY vYW vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -38389,15 +38285,15 @@ wOL hvj kyG ebr -wjA -wjA -wjA -wjA -wjA -wjA -wjA -wjA -wjA +crY +crY +crY +crY +crY +crY +crY +crY +crY ebr ebr ebr @@ -38410,10 +38306,10 @@ ebr qMH hto vYW -wjA -wjA -wjA -wjA +crY +crY +crY +crY pGs pGs pGs @@ -38572,12 +38468,12 @@ dqy kyG ebr ebr -wjA -wjA -wjA -wjA -wjA -wjA +crY +crY +crY +crY +crY +crY qMH ebr ebr @@ -38592,10 +38488,10 @@ ebr ebr ebr hto -wjA -wjA -wjA -wjA +crY +crY +crY +crY qMH pGs pGs @@ -38758,7 +38654,7 @@ qMH qMH ebr ebr -wjA +crY ebr ebr ebr @@ -38774,10 +38670,10 @@ ebr ebr ebr ebr -wjA -wjA -wjA -wjA +crY +crY +crY +crY qMH pGs pGs @@ -38956,11 +38852,11 @@ ebr ebr ebr ebr -wjA -wjA -wjA -wjA -wjA +crY +crY +crY +crY +crY hto pGs pGs @@ -43699,7 +43595,7 @@ cto kDJ ncd ckG -wku +cto cto cto iDn @@ -63354,7 +63250,7 @@ avD kEK kjI kjI -oei +kjI lDz oPb ijo diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index b71b96552172..f5aa892fc6f0 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -1293,11 +1293,7 @@ }, /area/strata/ug/interior/jungle/deep/minehead) "adN" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ug/interior/jungle/deep/minehead) "adO" = ( @@ -1748,11 +1744,7 @@ }, /area/strata/ug/interior/jungle/deep/structures/res) "aff" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/closed/wall/strata_ice/dirty, /area/strata/ag/exterior) "afg" = ( @@ -2677,9 +2669,7 @@ }, /area/strata/ug/interior/jungle/deep/structures/res) "ahK" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/strata/ug/interior/jungle/deep/tearlake) "ahL" = ( /obj/structure/disposalpipe/segment{ @@ -4232,30 +4222,18 @@ /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/restricted/devroom) "aml" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /obj/structure/platform/strata/metal{ dir = 4 }, /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/interior/restricted/devroom) "amm" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/cabin_area) "amn" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/cabin_area) "amo" = ( @@ -4888,11 +4866,7 @@ }, /area/strata/ag/interior/research_decks/security) "aoA" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/restricted/devroom) "aoB" = ( @@ -5073,11 +5047,7 @@ /area/strata/ug/interior/jungle/deep/structures/res) "ape" = ( /obj/effect/decal/cleanable/blood, -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/cabin_area) "apf" = ( @@ -5093,8 +5063,8 @@ }, /area/strata/ag/interior/landingzone_1) "api" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds1/delaythree, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -5106,7 +5076,7 @@ }, /area/strata/ag/interior/landingzone_1) "apk" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/ds1/delaythree, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -5169,7 +5139,7 @@ }, /area/strata/ag/interior/research_decks/security) "apv" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 }, /turf/open/asphalt/cement{ @@ -5490,11 +5460,7 @@ /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/research_decks/security) "aqq" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/interior/restricted/devroom) "aqr" = ( @@ -5637,11 +5603,7 @@ }, /area/strata/ag/interior/outpost/canteen/personal_storage) "aqN" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /obj/structure/largecrate/random, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/interior/restricted/devroom) @@ -6579,10 +6541,10 @@ }, /area/strata/ag/interior/landingzone_1) "atq" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds1/delaythree{ dir = 8 }, -/obj/effect/decal/cleanable/blood/oil, /turf/open/asphalt/cement{ icon_state = "cement3" }, @@ -7469,11 +7431,7 @@ }, /area/strata/ag/interior/outpost/security) "awb" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/cabin_area) "awc" = ( @@ -7653,11 +7611,7 @@ /turf/open/gm/dirt, /area/strata/ug/interior/jungle/deep/south_res) "awA" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/north_outpost) "awB" = ( @@ -7666,9 +7620,7 @@ dir = 1; pixel_y = 20 }, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/strata/ug/interior/jungle/deep/structures/res) "awC" = ( /turf/open/gm/river, @@ -8172,10 +8124,7 @@ /turf/open/gm/dirt, /area/strata/ug/interior/jungle/deep/south_res) "aya" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/interior/jungle/deep/structures/res) "ayb" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ @@ -8184,9 +8133,7 @@ /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/north_outpost) "ayc" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/strata/ug/interior/jungle/deep/structures/res) "ayd" = ( /obj/structure/surface/table/reinforced/prison, @@ -8218,12 +8165,12 @@ /area/strata/ag/interior/landingzone_1) "ayh" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ - dir = 8 + dir = 1 }, /turf/open/asphalt/cement{ - icon_state = "cement3" + icon_state = "cement4" }, -/area/strata/ag/interior/landingzone_1) +/area/strata/ag/exterior/landingzone_2) "ayj" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -8298,11 +8245,7 @@ /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/cabin_area) "ayv" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/north_outpost) "ayw" = ( @@ -11228,11 +11171,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi) "aHy" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/platform/strata/metal{ dir = 1 }, @@ -11254,11 +11193,7 @@ /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/adminext) "aHC" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/platform/strata/metal{ dir = 1 }, @@ -11414,6 +11349,7 @@ dir = 8 }, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/strata{ dir = 8; icon_state = "white_cyan2" @@ -11476,7 +11412,7 @@ }, /area/strata/ag/interior/dorms) "aIs" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/southresearch) "aIw" = ( @@ -11922,11 +11858,7 @@ /turf/open/asphalt/cement, /area/strata/ag/exterior/paths/adminext) "aKf" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /obj/structure/platform_decoration/strata/metal{ dir = 8 }, @@ -12194,11 +12126,7 @@ }, /area/strata/ag/interior/outpost/canteen/bar) "aKV" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/adminext) "aKW" = ( @@ -12415,11 +12343,7 @@ }, /area/strata/ag/interior/outpost/engi) "aLL" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/adminext) "aLM" = ( @@ -12731,11 +12655,7 @@ /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/dorms) "aMG" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/platform/strata/metal{ dir = 1 }, @@ -12831,11 +12751,7 @@ /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/dorms_quad) "aMU" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/platform/strata/metal{ dir = 1 }, @@ -12927,11 +12843,7 @@ /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outpost/admin) "aNj" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/dorms_quad) "aNl" = ( @@ -13177,11 +13089,7 @@ }, /area/strata/ag/exterior/research_decks) "aNU" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/platform/strata/metal, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/dorms_quad) @@ -13420,11 +13328,7 @@ }, /area/strata/ag/interior/outpost/canteen/lower_cafeteria) "aOz" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/platform/strata/metal, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/dorms_quad) @@ -13444,11 +13348,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/interior/outpost/gen/bball/nest) "aOE" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/platform/strata/metal, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/dorms_quad) @@ -13556,11 +13456,7 @@ /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/dorms_quad) "aOZ" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/platform/strata/metal{ dir = 4 }, @@ -13666,11 +13562,7 @@ /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/dorms_quad) "aPs" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /obj/structure/barricade/snow{ dir = 4 }, @@ -13703,7 +13595,6 @@ "aPz" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ dir = 2; - req_access = null; req_one_access = null }, /turf/open/floor/strata{ @@ -13879,11 +13770,7 @@ "aPT" = ( /obj/effect/decal/cleanable/generic, /obj/structure/platform_decoration/strata/metal, -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/dorms_quad) "aPW" = ( @@ -14374,10 +14261,10 @@ /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/adminext) "aRz" = ( +/obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/landinglight/ds1/delayone{ dir = 1 }, -/obj/effect/decal/cleanable/blood/oil, /turf/open/asphalt/cement{ icon_state = "cement4" }, @@ -14704,15 +14591,10 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/east_dorms) "aSC" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/strata/ug/interior/jungle/deep/north_carp) "aSD" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/strata/ug/interior/jungle/deep/north_carp) "aSF" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -14734,11 +14616,7 @@ }, /area/strata/ag/interior/landingzone_1) "aSJ" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/adminext) @@ -14816,10 +14694,10 @@ /turf/open/floor/strata, /area/strata/ag/interior/dorms/south) "aSX" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds2{ dir = 1 }, -/obj/effect/decal/cleanable/blood/oil, /turf/open/asphalt/cement{ icon_state = "cement4" }, @@ -14858,13 +14736,9 @@ /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/adminext) "aTh" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/adminext) "aTi" = ( @@ -15170,9 +15044,7 @@ /turf/open/gm/river, /area/strata/ug/interior/jungle/deep/north_carp) "aUh" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/strata/ug/interior/jungle/deep/north_carp) "aUn" = ( /obj/structure/platform/strata/metal, @@ -15599,20 +15471,13 @@ }, /area/strata/ag/interior/outpost/maint/canteen_e_1) "aVK" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/strata/ug/interior/jungle/deep/north_carp) "aVL" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/strata/ug/interior/jungle/deep/north_carp) "aVM" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/strata/ug/interior/jungle/deep/north_carp) "aVN" = ( /obj/structure/flora/bush/ausbushes/grassybush{ @@ -15632,15 +15497,10 @@ /turf/open/gm/dirt, /area/strata/ug/interior/jungle/deep/hotsprings) "aVS" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/strata/ug/interior/jungle/deep/hotsprings) "aVT" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/strata/ug/interior/jungle/deep/hotsprings) "aVW" = ( /obj/structure/platform/strata/metal{ @@ -15668,11 +15528,7 @@ /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/interior/administration) "aWa" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/platform/strata/metal{ dir = 8 }, @@ -15695,19 +15551,11 @@ /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/adminext) "aWf" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/river) "aWg" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/marsh/river) "aWi" = ( @@ -16031,10 +15879,7 @@ /turf/closed/wall/strata_outpost, /area/strata/ug/interior/outpost/jung/dorms/admin4) "aXr" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/interior/jungle/deep/north_carp) "aXs" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony, @@ -16044,16 +15889,10 @@ }, /area/strata/ag/exterior/shed_five_caves) "aXt" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/interior/jungle/deep/hotsprings) "aXu" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/strata/ug/interior/jungle/deep/hotsprings) "aXv" = ( /obj/structure/platform/strata/metal{ @@ -16185,11 +16024,7 @@ /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/north_lz_caves) "aYe" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/north_lz_caves) "aYh" = ( @@ -16394,19 +16229,11 @@ /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/north_lz_caves) "aYY" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/north_lz_caves) "aYZ" = ( -/obj/item/lightstick{ - anchored = 1; - icon_state = "lightstick_blue1"; - luminosity = 2 - }, +/obj/item/lightstick/planted, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/north_lz_caves) "aZb" = ( @@ -16449,11 +16276,7 @@ /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/adminext) "aZj" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/barricade/snow{ dir = 1 }, @@ -16675,9 +16498,7 @@ /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/adminext) "aZL" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/strata/ug/interior/jungle/deep/north_carp) "aZO" = ( /turf/open/gm/dirt, @@ -16883,11 +16704,7 @@ }, /area/strata/ag/interior/outpost/gen/foyer) "bav" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/adminext) "baw" = ( @@ -17343,11 +17160,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/nearlz1) "bcg" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/barricade/snow{ dir = 1 }, @@ -17372,11 +17185,7 @@ }, /area/strata/ag/interior/nearlz1) "bcm" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/adminext) "bco" = ( @@ -17726,11 +17535,7 @@ /area/strata/ag/exterior/paths/adminext) "bdB" = ( /obj/structure/platform/strata, -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/river) "bdC" = ( @@ -17801,11 +17606,7 @@ /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/adminext) "bdQ" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/paths/adminext) "bdS" = ( @@ -18054,10 +17855,7 @@ }, /area/strata/ug/interior/jungle/deep/west_engi) "beG" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/strata/ug/interior/jungle/deep/east_carp) "beH" = ( /obj/effect/landmark/xeno_spawn, @@ -18101,11 +17899,7 @@ /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh) "beQ" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh) "beS" = ( @@ -18713,11 +18507,7 @@ /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/crash) "bgT" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/marsh) "bgV" = ( @@ -18751,18 +18541,11 @@ /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh) "bhb" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh) "bhd" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/interior/jungle/deep/east_carp) "bhe" = ( /obj/structure/pipes/standard/simple/hidden/cyan, @@ -18773,10 +18556,7 @@ /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/vanyard) "bhg" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/strata/ug/interior/jungle/deep/east_carp) "bhh" = ( /obj/structure/fence, @@ -19048,11 +18828,7 @@ }, /area/strata/ag/interior/outpost/gen/foyer) "bia" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/crash) "bib" = ( @@ -19062,11 +18838,7 @@ }, /area/strata/ag/interior/outpost/gen/foyer) "bic" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/crash) "bif" = ( @@ -19246,11 +19018,7 @@ /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/marsh) "biQ" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/platform/strata{ dir = 1 }, @@ -19515,11 +19283,7 @@ /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/marsh) "bjL" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/marsh) "bjM" = ( @@ -19641,11 +19405,7 @@ /turf/open/gm/river, /area/strata/ag/exterior/marsh/water) "bkp" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/platform/strata, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/vanyard) @@ -19847,11 +19607,7 @@ }, /area/strata/ag/interior/outpost/canteen/personal_storage) "bla" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/marsh/crash) "blb" = ( @@ -20400,11 +20156,7 @@ /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/southresearch) "bnu" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/southresearch) "bnv" = ( @@ -20432,11 +20184,7 @@ /area/strata/ag/interior/administration) "bnA" = ( /obj/item/reagent_container/food/drinks/cans/souto/classic, -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/southresearch) "bnB" = ( @@ -20460,11 +20208,7 @@ /area/strata/ag/interior/outpost/canteen) "bnF" = ( /obj/structure/bed/roller, -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/southresearch) "bnG" = ( @@ -20572,11 +20316,7 @@ /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/southresearch) "bnX" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/southresearch) "bnY" = ( @@ -20696,11 +20436,7 @@ /area/strata/ug/interior/jungle/deep/structures/res) "boq" = ( /obj/item/stack/medical/splint, -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/southresearch) "bos" = ( @@ -21222,11 +20958,7 @@ }, /area/strata/ag/interior/administration) "bpT" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/southresearch) "bpU" = ( @@ -21520,11 +21252,7 @@ /obj/structure/platform_decoration/strata{ dir = 1 }, -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/paths/southresearch) "brn" = ( @@ -21931,11 +21659,7 @@ /area/strata/ag/interior/outpost/admin) "bsM" = ( /obj/structure/platform/strata/metal, -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/southresearch) "bsN" = ( @@ -22112,11 +21836,7 @@ /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/marsh/center) "btu" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/tcomms/tcomms_deck) "btv" = ( @@ -22310,11 +22030,7 @@ /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/crash) "buf" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/marsh/center) "bug" = ( @@ -22432,11 +22148,7 @@ /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/marsh) "buF" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/tcomms/tcomms_deck) "buG" = ( @@ -22722,11 +22434,7 @@ }, /area/strata/ag/interior/outpost/engi/drome) "bvM" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/nearlz2) "bvN" = ( @@ -23061,11 +22769,7 @@ /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/marsh) "bxd" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/marsh) @@ -23116,11 +22820,7 @@ }, /area/strata/ug/interior/jungle/deep/minehead) "bxo" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/nearlz2) "bxr" = ( @@ -23397,6 +23097,7 @@ /area/strata/ag/interior/restricted) "byl" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /obj/effect/landmark/queen_spawn, /turf/open/floor/strata{ icon_state = "floor2" @@ -23406,11 +23107,7 @@ /obj/structure/barricade/snow{ dir = 4 }, -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/interior/restricted) "byn" = ( @@ -23426,11 +23123,7 @@ /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/nearlz2) "byr" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/nearlz2) "bys" = ( @@ -24288,10 +23981,7 @@ /turf/open/gm/river, /area/strata/ag/exterior/marsh/water) "bDH" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/strata/ug/exterior/jungle/deep/carplake_center) "bDO" = ( /obj/structure/cargo_container/grant/left{ @@ -25666,9 +25356,7 @@ }, /area/strata/ag/interior/dorms/canteen) "bPy" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/shed_five_caves) "bPA" = ( @@ -26876,9 +26564,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/dorms) "bZX" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/strata/ug/exterior/jungle/deep/carplake_center) "bZY" = ( /obj/structure/surface/table/almayer, @@ -28093,9 +27779,7 @@ /turf/closed/wall/wood, /area/strata/ug/interior/jungle/deep/north_carp) "ciy" = ( -/obj/docking_port/stationary/marine_dropship/lz1{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz1, /turf/open/floor/plating, /area/strata/ag/interior/landingzone_1) "ciA" = ( @@ -28713,7 +28397,7 @@ }, /area/strata/ag/interior/outpost/canteen/bar) "cmu" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/strata/ug/interior/jungle/deep/north_carp) "cmA" = ( /turf/open/asphalt/cement{ @@ -29030,9 +28714,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi/drome) "cor" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/strata/ug/interior/jungle/deep/north_carp) "cot" = ( /obj/structure/platform_decoration/strata/metal{ @@ -29416,11 +29098,11 @@ }, /area/strata/ag/interior/administration) "crW" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ - dir = 4 +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 1 }, /turf/open/asphalt/cement{ - icon_state = "cement1" + icon_state = "cement4" }, /area/strata/ag/interior/landingzone_1) "crY" = ( @@ -29904,9 +29586,7 @@ }, /area/strata/ag/interior/outpost/engi/drome) "cvG" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/strata/ug/exterior/jungle/deep/carplake_center) "cvY" = ( /obj/structure/platform_decoration/strata/metal{ @@ -29993,29 +29673,19 @@ }, /area/strata/ag/exterior/marsh) "cxA" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/exterior/jungle/deep/carplake_center) "cxB" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/strata/ug/exterior/jungle/deep/carplake_center) "cxC" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/strata/ug/exterior/jungle/deep/carplake_center) "cxJ" = ( /turf/open/gm/dirt, /area/strata/ug/interior/jungle/deep/east_dorms) "cxK" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/interior/jungle/deep/east_dorms) "cxS" = ( /obj/structure/barricade/handrail/strata{ @@ -30107,11 +29777,7 @@ }, /area/strata/ug/interior/jungle/deep/structures/engi) "cDL" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh) "cEu" = ( @@ -30137,9 +29803,7 @@ }, /area/strata/ag/interior/outpost/med) "cFp" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/strata/ug/interior/jungle/deep/east_dorms) "cFK" = ( /obj/structure/flora/grass/tallgrass/ice/corner, @@ -30175,11 +29839,7 @@ }, /area/strata/ag/interior/tcomms) "cJf" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/center) "cKc" = ( @@ -30349,6 +30009,14 @@ icon_state = "multi_tiles" }, /area/strata/ag/interior/dorms/hive) +"cZH" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 8 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/strata/ag/interior/landingzone_1) "daq" = ( /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/east_carp) @@ -30490,6 +30158,14 @@ icon_state = "floor3" }, /area/strata/ug/interior/outpost/jung/dorms/sec1) +"dnS" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 1 + }, +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/strata/ag/interior/landingzone_1) "doO" = ( /obj/structure/machinery/weather_siren{ dir = 1; @@ -30512,9 +30188,7 @@ }, /area/strata/ug/interior/outpost/jung/dorms/admin2) "drQ" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/strata/ug/interior/jungle/deep/tearlake) "drS" = ( /obj/effect/decal/strata_decals/catwalk/prison, @@ -30716,9 +30390,7 @@ }, /area/strata/ug/interior/jungle/platform/east/scrub) "dIh" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/strata/ug/interior/jungle/deep/tearlake) "dIE" = ( /obj/structure/prop/turbine_extras, @@ -30740,7 +30412,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh) "dNq" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/strata/ug/interior/jungle/deep/east_dorms) "dND" = ( /obj/structure/flora/bush/ausbushes/grassybush{ @@ -30877,7 +30549,7 @@ }, /area/strata/ug/interior/outpost/jung/dorms/med1) "dZl" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/north_outpost) "dZm" = ( @@ -31142,7 +30814,7 @@ }, /area/strata/ag/exterior/tcomms/tcomms_deck) "eBo" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -31677,6 +31349,14 @@ icon_state = "red1" }, /area/strata/ag/interior/dorms/flight_control) +"fuA" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 1 + }, +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/strata/ag/interior/landingzone_1) "fuX" = ( /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/auto_turf/strata_grass/layer0, @@ -31704,7 +31384,7 @@ /turf/open/floor/strata, /area/strata/ug/interior/outpost/jung/dorms/sec1) "fwV" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/north_outpost) "fxM" = ( @@ -31769,9 +31449,7 @@ /turf/open/floor/strata, /area/strata/ag/exterior/research_decks) "fAS" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/crash) "fBh" = ( @@ -31819,7 +31497,7 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/south_dorms) "fCz" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/strata/ug/interior/jungle/deep/tearlake) "fCE" = ( /obj/effect/decal/strata_decals/catwalk/prison, @@ -31872,6 +31550,7 @@ dir = 4 }, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/plating, /area/strata/ag/interior/tcomms) "fKt" = ( @@ -32077,9 +31756,7 @@ }, /area/strata/ag/interior/outpost/med) "gcj" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/strata/ug/interior/jungle/deep/tearlake) "gdZ" = ( /obj/structure/machinery/smartfridge, @@ -32288,9 +31965,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/southresearch) "goG" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/north_outpost) "gpp" = ( @@ -32427,9 +32102,7 @@ }, /area/strata/ag/interior/tcomms) "gzd" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/strata/ug/interior/jungle/deep/south_engi) "gAm" = ( /turf/open/floor/strata{ @@ -32454,9 +32127,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/southresearch) "gBr" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/strata/ug/interior/jungle/deep/south_engi) "gCa" = ( /obj/item/stack/snow, @@ -32609,10 +32280,7 @@ /turf/open/floor/plating, /area/strata/ag/exterior/marsh/center) "gSR" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/strata/ug/interior/jungle/deep/south_engi) "gTa" = ( /obj/structure/platform_decoration/strata/metal{ @@ -32837,9 +32505,7 @@ /turf/open/auto_turf/strata_grass/layer0_mud, /area/strata/ug/interior/jungle/deep/tearlake) "hir" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh) "hiL" = ( @@ -32956,7 +32622,7 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/east/scrub) "hue" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds2{ dir = 8 }, /turf/open/asphalt/cement{ @@ -33033,9 +32699,7 @@ }, /area/strata/ag/exterior/research_decks) "hFm" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/strata/ug/interior/jungle/deep/east_dorms) "hGd" = ( /obj/structure/platform/strata/metal{ @@ -33194,9 +32858,7 @@ /turf/closed/wall/strata_outpost/reinforced, /area/strata/ug/interior/outpost/jung/dorms/med1) "hWk" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/strata/ug/exterior/jungle/deep/carplake_center) "hYc" = ( /turf/closed/wall/strata_outpost/reinforced, @@ -33217,11 +32879,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/outpost/maint/canteen_e_1) "ibh" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/auto_turf/ice/layer2, /area/strata/ag/exterior/nearlz2) "ibE" = ( @@ -33487,9 +33145,7 @@ }, /area/strata/ag/exterior/landingzone_2) "iws" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/adminext) "iwH" = ( @@ -33575,10 +33231,7 @@ /turf/open/floor/plating, /area/strata/ag/interior/tcomms) "iBT" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/strata/ug/interior/jungle/deep/tearlake) "iBV" = ( /obj/item/stack/catwalk, @@ -33773,9 +33426,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi/drome) "iSe" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/strata/ug/interior/jungle/deep/south_engi) "iUw" = ( /obj/structure/prop/dam/crane/cargo, @@ -33788,9 +33439,7 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/south_dorms) "iUK" = ( -/obj/docking_port/stationary/marine_dropship/lz2{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz2, /turf/open/floor/plating, /area/strata/ag/exterior/landingzone_2) "iUN" = ( @@ -34273,9 +33922,7 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/tearlake) "jLc" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/nearlz2) "jLY" = ( @@ -34333,9 +33980,11 @@ }, /area/strata/ug/interior/jungle/deep/structures/engi) "jPQ" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/ds2{ + dir = 4 + }, /turf/open/asphalt/cement{ - icon_state = "cement12" + icon_state = "cement1" }, /area/strata/ag/exterior/landingzone_2) "jPV" = ( @@ -34575,7 +34224,7 @@ /turf/closed/wall/strata_outpost, /area/strata/ug/interior/jungle/deep/structures/engi) "kim" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh) "kjc" = ( @@ -34755,7 +34404,7 @@ }, /area/strata/ag/interior/outpost/engi/drome) "kBL" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/nearlz2) "kCf" = ( @@ -34766,9 +34415,7 @@ }, /area/strata/ag/interior/outpost/engi/drome) "kCk" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/marsh/center) "kDb" = ( @@ -34835,17 +34482,13 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/east_engi) "kJd" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/strata/ug/interior/jungle/deep/east_dorms) "kKI" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ug/interior/outpost/jung/dorms/admin1) "kLM" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/strata/ug/interior/jungle/deep/east_dorms) "kLZ" = ( /obj/effect/blocker/sorokyne_cold_water, @@ -34854,10 +34497,7 @@ /turf/open/gm/river, /area/strata/ag/exterior/marsh/water) "kNJ" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/interior/jungle/deep/south_engi) "kNZ" = ( /obj/structure/inflatable, @@ -34880,10 +34520,7 @@ }, /area/strata/ug/interior/jungle/platform/east/scrub) "kPC" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/strata/ug/exterior/jungle/deep/carplake_center) "kPL" = ( /obj/structure/surface/table/reinforced/prison, @@ -34905,10 +34542,7 @@ }, /area/strata/ug/interior/outpost/jung/dorms/admin1) "kQu" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/strata/ug/exterior/jungle/deep/carplake_center) "kRb" = ( /obj/structure/bed/nest, @@ -34949,9 +34583,7 @@ }, /area/strata/ag/interior/outpost/med) "kSs" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/strata/ug/exterior/jungle/deep/carplake_center) "kSS" = ( /obj/structure/window/reinforced/tinted{ @@ -34967,7 +34599,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/dorms) "kTB" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/strata/ug/exterior/jungle/deep/carplake_center) "kUb" = ( /obj/effect/landmark/monkey_spawn, @@ -34980,9 +34612,7 @@ }, /area/strata/ag/interior/tcomms) "kUs" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/strata/ug/exterior/jungle/deep/carplake_center) "kUN" = ( /obj/effect/decal/strata_decals/grime/grime2{ @@ -34992,9 +34622,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/dorms) "kWS" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/southresearch) "kXi" = ( @@ -35092,7 +34720,7 @@ /turf/open/gm/river, /area/strata/ag/exterior/research_decks) "ldO" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/strata/ug/interior/jungle/deep/east_carp) "lec" = ( /obj/structure/flora/grass/tallgrass/ice/corner, @@ -35297,9 +34925,7 @@ }, /area/strata/ag/interior/dorms/flight_control) "lvF" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/strata/ug/interior/jungle/deep/tearlake) "lwI" = ( /obj/structure/barricade/handrail/strata{ @@ -35372,7 +34998,7 @@ /turf/open/gm/river, /area/strata/ag/interior/tcomms) "lEo" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/ds2, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -35549,7 +35175,7 @@ /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/tcomms) "lTW" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/strata/ug/interior/jungle/deep/south_engi) "lTX" = ( /obj/structure/pipes/standard/simple/hidden/cyan, @@ -36064,9 +35690,7 @@ }, /area/strata/ag/interior/tcomms) "mDF" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/vanyard) "mEk" = ( @@ -36188,10 +35812,7 @@ }, /area/strata/ag/interior/outpost/engi/drome) "mMp" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/interior/jungle/deep/tearlake) "mMR" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, @@ -36439,10 +36060,7 @@ /turf/open/gm/river, /area/strata/ag/exterior/marsh) "noq" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/strata/ug/interior/jungle/deep/east_dorms) "npy" = ( /obj/structure/closet/secure_closet/medical3{ @@ -36488,9 +36106,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/southresearch) "nrp" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/river) "nrP" = ( @@ -36504,9 +36120,7 @@ }, /area/strata/ug/interior/outpost/jung/dorms/admin3) "nsq" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/strata/ug/interior/jungle/deep/east_carp) "nsB" = ( /obj/structure/closet/coffin, @@ -36549,9 +36163,7 @@ }, /area/strata/ug/interior/jungle/platform/east/scrub) "nAf" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/strata/ug/interior/jungle/deep/east_carp) "nAM" = ( /obj/structure/platform/strata{ @@ -36662,10 +36274,7 @@ }, /area/strata/ag/interior/outpost/gen/bball) "nPb" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/strata/ug/interior/jungle/deep/east_carp) "nPh" = ( /obj/structure/flora/bush/ausbushes/grassybush{ @@ -36720,7 +36329,7 @@ }, /area/strata/ag/interior/outpost/med) "nTf" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 4 }, /turf/open/asphalt/cement{ @@ -36798,9 +36407,7 @@ /turf/closed/wall/strata_outpost, /area/strata/ag/interior/landingzone_checkpoint) "ocz" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/marsh) "ocE" = ( @@ -36828,6 +36435,12 @@ icon_state = "multi_tiles" }, /area/strata/ag/interior/tcomms) +"odB" = ( +/obj/structure/machinery/landinglight/ds2/delayone, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/strata/ag/exterior/landingzone_2) "odJ" = ( /turf/closed/wall/strata_ice/dirty, /area/strata/ag/interior/outpost/engi/drome) @@ -36848,9 +36461,7 @@ /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/exterior/tcomms/tcomms_deck) "oeO" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/strata/ug/interior/jungle/deep/east_carp) "oeQ" = ( /turf/open/floor/strata{ @@ -36955,9 +36566,7 @@ /turf/open/asphalt/cement, /area/strata/ag/exterior/vanyard) "oqc" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/strata/ug/interior/jungle/deep/east_dorms) "oqA" = ( /obj/item/stack/rods, @@ -37117,9 +36726,7 @@ }, /area/strata/ug/interior/jungle/platform/east/scrub) "oKl" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/center) "oKo" = ( @@ -37838,9 +37445,7 @@ /turf/open/gm/river, /area/strata/ag/interior/tcomms) "pJA" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/strata/ug/interior/jungle/deep/east_dorms) "pKq" = ( /obj/effect/blocker/sorokyne_cold_water, @@ -37922,9 +37527,7 @@ /turf/closed/wall/strata_outpost, /area/strata/ag/interior/research_decks/security) "pRp" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/north_outpost) "pSc" = ( @@ -37944,9 +37547,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/tcomms) "pSw" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/strata/ug/interior/jungle/deep/east_carp) "pUB" = ( /obj/structure/bed{ @@ -38026,11 +37627,11 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/south_dorms) "qbk" = ( -/obj/structure/machinery/landinglight/ds1{ - dir = 8 +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 1 }, /turf/open/asphalt/cement{ - icon_state = "cement3" + icon_state = "cement4" }, /area/strata/ag/exterior/landingzone_2) "qbA" = ( @@ -38042,6 +37643,14 @@ "qbR" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ug/interior/outpost/jung/dorms/sec2) +"qbU" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 8 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/strata/ag/exterior/landingzone_2) "qcB" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/strata_grass/layer1, @@ -38245,9 +37854,7 @@ }, /area/strata/ag/interior/outpost/med) "qvy" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/crash) "qvJ" = ( @@ -38286,9 +37893,7 @@ /turf/open/floor/interior/tatami, /area/strata/ag/interior/restricted) "qxr" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/strata/ug/interior/jungle/deep/tearlake) "qxt" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, @@ -38742,6 +38347,14 @@ icon_state = "white_cyan1" }, /area/strata/ag/interior/dorms/maintenance) +"rhk" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 4 + }, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/strata/ag/interior/landingzone_1) "rhJ" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -38882,15 +38495,10 @@ /turf/open/floor/greengrid, /area/strata/ag/interior/disposals) "ruM" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/strata/ug/interior/jungle/deep/south_engi) "rvD" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/strata/ug/interior/jungle/deep/south_engi) "rwD" = ( /obj/effect/decal/cleanable/blood, @@ -39003,9 +38611,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/nearlz2) "rIM" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/strata/ug/interior/jungle/deep/north_carp) "rJf" = ( /turf/open/floor/strata{ @@ -39294,10 +38900,10 @@ }, /area/strata/ag/interior/outpost/engi/drome) "skJ" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds2{ dir = 4 }, -/obj/effect/decal/cleanable/blood/oil, /turf/open/asphalt/cement{ icon_state = "cement1" }, @@ -39363,9 +38969,7 @@ }, /area/strata/ag/interior/tcomms) "ssd" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/strata/ug/interior/jungle/deep/east_dorms) "sse" = ( /obj/structure/bed{ @@ -39387,9 +38991,7 @@ }, /area/strata/ag/exterior/vanyard) "stf" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/strata/ug/interior/jungle/deep/east_carp) "stF" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ @@ -39515,11 +39117,11 @@ /turf/open/gm/dirt, /area/strata/ug/exterior/jungle/deep/carplake_center) "sFB" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ - dir = 4 +/obj/structure/machinery/landinglight/ds2{ + dir = 1 }, /turf/open/asphalt/cement{ - icon_state = "cement1" + icon_state = "cement4" }, /area/strata/ag/exterior/landingzone_2) "sGJ" = ( @@ -39778,7 +39380,7 @@ }, /area/strata/ag/exterior/north_lz_caves) "tfM" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/shed_five_caves) "tgr" = ( @@ -39903,18 +39505,13 @@ }, /area/strata/ug/interior/jungle/platform/east/scrub) "toV" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/strata/ug/interior/jungle/deep/tearlake) "tqG" = ( /turf/open/floor/strata, /area/strata/ag/exterior/paths/north_outpost) "tqK" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/cabin_area) "trr" = ( @@ -40057,7 +39654,7 @@ /turf/open/floor/plating, /area/strata/ag/exterior/landingzone_2) "tDo" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/center) "tEf" = ( @@ -40264,9 +39861,7 @@ }, /area/strata/ag/interior/tcomms) "tSb" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/cabin_area) "tSi" = ( @@ -40317,9 +39912,7 @@ }, /area/strata/ag/interior/tcomms) "tUu" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/north_lz_caves) "tUN" = ( @@ -40368,9 +39961,7 @@ }, /area/strata/ag/interior/tcomms) "tWf" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/adminext) "tWJ" = ( @@ -40678,10 +40269,6 @@ "uux" = ( /turf/closed/wall/strata_outpost, /area/strata/ug/interior/jungle/deep/structures/res) -"uvm" = ( -/obj/effect/landmark/static_comms/net_two, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/crash) "uvw" = ( /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/deep/west_engi) @@ -40911,6 +40498,7 @@ /area/strata/ag/exterior/research_decks) "uSR" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /obj/effect/landmark/queen_spawn, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/tearlake) @@ -41013,7 +40601,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/southresearch) "vaZ" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/cabin_area) "vbw" = ( @@ -41267,7 +40855,7 @@ }, /area/strata/ag/interior/outpost/med) "vsp" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 8 }, /turf/open/asphalt/cement{ @@ -41391,7 +40979,7 @@ /obj/structure/platform/strata/metal{ dir = 8 }, -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/adminext) "vwV" = ( @@ -41642,13 +41230,11 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/minehead) "vXt" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/southresearch) "vYf" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/adminext) "vYD" = ( @@ -41664,9 +41250,7 @@ }, /area/strata/ag/interior/outpost/med) "vZT" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/strata/ug/interior/jungle/deep/south_engi) "wab" = ( /obj/structure/machinery/space_heater, @@ -41767,9 +41351,7 @@ /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/tcomms) "wjv" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/center) "wkv" = ( @@ -41780,10 +41362,7 @@ /turf/closed/wall/strata_ice/dirty, /area/strata/ag/interior/outpost/engi) "wne" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/strata/ug/interior/jungle/deep/east_dorms) "wni" = ( /turf/open/asphalt/cement{ @@ -41884,9 +41463,7 @@ }, /area/strata/ag/interior/outpost/admin) "wuI" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/strata/ug/interior/jungle/deep/east_carp) "wvt" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -42104,9 +41681,7 @@ }, /area/strata/ag/interior/tcomms) "wWS" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/adminext) "wXb" = ( @@ -42331,9 +41906,7 @@ }, /area/strata/ag/exterior/research_decks) "xre" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/tcomms/tcomms_deck) "xrx" = ( @@ -42387,10 +41960,7 @@ /turf/open/gm/river, /area/strata/ag/exterior/research_decks) "xuY" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/strata/ug/interior/jungle/deep/south_engi) "xvy" = ( /obj/structure/window/framed/strata/reinforced, @@ -42498,7 +42068,7 @@ }, /area/strata/ag/interior/dorms/hive) "xEV" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/marsh) "xFc" = ( @@ -42551,8 +42121,8 @@ /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/deep/west_engi) "xGE" = ( -/obj/structure/machinery/landinglight/ds1/delayone, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds2/delaythree, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -42698,9 +42268,7 @@ /turf/open/gm/river, /area/strata/ag/exterior/marsh/river) "xOL" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/dorms_quad) "xPv" = ( @@ -42777,9 +42345,7 @@ /turf/open/floor/strata, /area/strata/ag/exterior/research_decks) "xUg" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/strata/ug/interior/jungle/deep/south_engi) "xVQ" = ( /obj/structure/bed/chair/dropship/passenger{ @@ -42870,7 +42436,7 @@ /turf/open/floor/strata, /area/strata/ag/exterior/research_decks) "yee" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 1 }, /turf/open/asphalt/cement{ @@ -42916,9 +42482,7 @@ }, /area/strata/ag/interior/outpost/med) "ylE" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/strata/ug/interior/jungle/deep/south_engi) "ylF" = ( /obj/structure/stairs/perspective{ @@ -43765,27 +43329,27 @@ cqE cnv crb apc -crW -crW arR atp auj -crW +rhk arR atp auj -crW -crW +rhk +arR atp auj -crW +rhk arR +atp auj -auj -crW +rhk arR atp -atp +auj +rhk +arR atp apc cmA @@ -43982,7 +43546,7 @@ crE arS crE crE -aRx +crW cmA cnv cqE @@ -44177,7 +43741,7 @@ crE crE ciy crE -aRx +fuA cmA cnv cqE @@ -44372,7 +43936,7 @@ crE crE crE crE -aRx +dnS cmA cnv cqE @@ -44762,7 +44326,7 @@ crE crE crE crE -aRx +crW cmA cnv cqE @@ -44957,7 +44521,7 @@ crE crE crE crE -aRx +fuA aSH coX aVX @@ -45152,7 +44716,7 @@ crE crE crE crE -aRx +dnS cmA cnv acY @@ -45542,7 +45106,7 @@ crE crE crE crE -aRx +crW cmA cnv cot @@ -45737,7 +45301,7 @@ crE crE crE crE -aRx +fuA cmA cnv aoj @@ -45782,7 +45346,7 @@ cXU bhO bgS bhO -uvm +bhO bhO bhO bhO @@ -45932,7 +45496,7 @@ crE arS crE crE -aRx +dnS cmA cnv aoj @@ -46105,28 +45669,28 @@ cqE cnv crb apc -cwQ -cwQ +cZH +auk arT atq auk cwQ arT -ayh +cZH auk cwQ -cwQ -ayh +arT +cZH auk cwQ arT -ayh +cZH auk cwQ arT -ayh -auk +cZH auk +cwQ apc cmA cnv @@ -50876,27 +50440,27 @@ bvD eFa bJI iwp -iwp +jPQ apv nTf -sFB +iwp skJ apv nTf -sFB -iwp iwp +jPQ +apv nTf -sFB iwp +jPQ apv -sFB -sFB +nTf iwp +jPQ apv nTf -nTf -nTf +iwp +jPQ bJI wvF bvE @@ -51264,7 +50828,7 @@ rNI xTU bvD eFa -jPQ +sBg jWs jWs jWs @@ -51287,7 +50851,7 @@ jWs jWs iUK jWs -yee +qbk wvF bvE bwt @@ -51482,7 +51046,7 @@ jWs jWs jWs jWs -yee +ayh wvF bvE bwt @@ -51654,7 +51218,7 @@ rNI xTU bvD eFa -sBg +odB vqx jWs jWs @@ -52067,7 +51631,7 @@ jWs jWs jWs jWs -yee +qbk wvF bvD bvD @@ -52262,7 +51826,7 @@ jWs jWs jWs jWs -yee +ayh wvF bvE bvE @@ -52434,7 +51998,7 @@ bvD bvD bvE eFa -sBg +odB jWs jWs jWs @@ -52457,7 +52021,7 @@ jWs jWs jWs jWs -yee +sFB oFG bvE byr @@ -52824,7 +52388,7 @@ bvD bvE bvD eFa -jPQ +sBg jWs jWs jWs @@ -52847,7 +52411,7 @@ jWs jWs jWs jWs -yee +qbk wvF bvD bvE @@ -53042,7 +52606,7 @@ jWs ewk jWs jWs -yee +ayh wvF bvD bvE @@ -53216,26 +52780,26 @@ xTU eFa bJI vsp -vsp -qbk -hzb hue -vsp -qbk hzb -hue -vsp +qbU vsp -hzb hue -vsp -qbk hzb +qbU +vsp hue +hzb +qbU vsp -qbk +hue hzb +qbU +vsp hue +hzb +qbU +vsp hue bJI wvF diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index bd4728265d42..8ba52000c917 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -2341,6 +2341,9 @@ dir = 2; name = "\improper Atmospherics Wing" }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -2361,6 +2364,7 @@ /area/almayer/hallways/aft_hallway) "ahJ" = ( /obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/engineering/starboard_atmos) "ahM" = ( @@ -5044,6 +5048,9 @@ /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering) "aqk" = ( @@ -5693,6 +5700,9 @@ /area/almayer/stair_clone/upper) "asn" = ( /obj/structure/window/framed/almayer/white, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/plating, /area/almayer/medical/upper_medical) "aso" = ( @@ -8815,7 +8825,6 @@ /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) "aBm" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -8856,9 +8865,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering) "aBq" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/plating, -/area/almayer/engineering/upper_engineering) +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/aft_hallway) "aBr" = ( /obj/structure/ladder{ height = 2; @@ -10325,6 +10335,9 @@ name = "\improper Engineering Lounge" }, /obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -13463,13 +13476,6 @@ /obj/structure/toilet{ pixel_y = 13 }, -/obj/structure/sign/poster{ - desc = "Wawaweewa."; - icon_state = "poster17"; - name = "magazine"; - pixel_x = -6; - pixel_y = -7 - }, /obj/item/paper_bin/uscm{ pixel_x = 9; pixel_y = -3 @@ -13477,6 +13483,10 @@ /obj/structure/machinery/light/small{ dir = 4 }, +/obj/item/prop/magazine/dirty{ + pixel_x = -6; + pixel_y = -10 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -17547,6 +17557,9 @@ /area/almayer/medical/operating_room_one) "bsw" = ( /obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/plating, /area/almayer/living/chapel) "bsy" = ( @@ -25883,13 +25896,9 @@ pixel_x = -10; pixel_y = 6 }, -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "The only official USCM magazine, the headline reads 'Corporate Liaison 'emotionally exhausted' from screwing so many people over.'"; - icon = 'icons/obj/structures/props/posters.dmi'; - icon_state = "poster15"; - name = "Boots!: Issue No.160"; - pixel_x = -5; - pixel_y = -7 +/obj/item/prop/magazine/boots/n160{ + pixel_x = -6; + pixel_y = -5 }, /obj/structure/transmitter/rotary{ name = "Flight Deck Telephone"; @@ -29477,12 +29486,9 @@ pixel_x = 1; pixel_y = 25 }, -/obj/item/book{ - desc = "An autobiography penned by Derik A.W. Tomahawk it recounts his service in the USCM. The book was harshly criticised for its bland and uncreative writing and wasn't well received by the general public or members of the UA military. However, artificial soldiers typically value the information contained within."; - icon_state = "bookSpaceLaw"; - name = "\improper Born to Kill"; +/obj/item/prop/magazine/book/borntokill{ pixel_x = -6; - pixel_y = 6 + pixel_y = 7 }, /turf/open/floor/almayer{ dir = 1; @@ -30081,6 +30087,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ name = "\improper Upper Engineering" }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -30213,6 +30222,11 @@ pixel_x = 3; pixel_y = 3 }, +/obj/item/weapon/dart, +/obj/item/weapon/dart, +/obj/item/weapon/dart, +/obj/item/weapon/dart/green, +/obj/item/weapon/dart/green, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) "dqN" = ( @@ -32110,9 +32124,7 @@ /area/almayer/engineering/upper_engineering/port) "eiq" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/sign/poster{ - serial_number = 15 - }, +/obj/item/prop/magazine/dirty, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) "eiw" = ( @@ -32427,12 +32439,7 @@ /area/almayer/hull/lower_hull/l_m_s) "eni" = ( /obj/structure/surface/table/almayer, -/obj/item/book{ - desc = "An autobiography focusing on the events of 'Fury 161' in August 2179 following the arrival of 'Ellen Ripley' and an unknown alien creature known as 'The Dragon' the books writing is extremely crude and was book banned shorty after publication."; - icon_state = "bookSpaceLaw"; - name = "\improper Space Beast, by Robert Morse"; - pixel_y = 3 - }, +/obj/item/prop/magazine/book/spacebeast, /turf/open/floor/almayer{ dir = 1; icon_state = "red" @@ -35532,12 +35539,8 @@ /area/almayer/squads/req) "fIZ" = ( /obj/structure/surface/table/almayer, -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "The only official USCM magazine, the headline reads 'STOP CANNING' the short paragraph further explains the dangers of marines throwing CN-20 Nerve gas into bathrooms as a prank."; - icon = 'icons/obj/structures/props/posters.dmi'; - icon_state = "poster15"; - name = "Boots!: Issue No.117"; - pixel_x = -5; +/obj/item/prop/magazine/boots/n117{ + pixel_x = -4; pixel_y = 6 }, /turf/open/floor/almayer{ @@ -37398,6 +37401,18 @@ icon_state = "plate" }, /area/almayer/hallways/vehiclehangar) +"gCu" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/item/folded_tent/cmd, +/turf/open/floor/almayer{ + icon_state = "plating_striped" + }, +/area/almayer/squads/req) "gCw" = ( /obj/item/reagent_container/food/drinks/cans/beer{ pixel_x = 10 @@ -39009,11 +39024,7 @@ /area/almayer/living/briefing) "htL" = ( /obj/structure/surface/table/almayer, -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "The only official USCM magazine, the headline reads 'UPP Rations, The truth.' the short paragraph further explains UPP field rations aren't standardized and are produced at a local level. Because of this, captured and confiscated UPP rations have included some odd choices such as duck liver pâté, century eggs, lutefisk, pickled pig snout, canned tripe, and dehydrated candied radish snacks."; - icon = 'icons/obj/structures/props/posters.dmi'; - icon_state = "poster15"; - name = "Boots!: Issue No.150"; +/obj/item/prop/magazine/boots/n150{ pixel_x = -5; pixel_y = 6 }, @@ -39381,6 +39392,18 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"hBP" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/item/folded_tent/med, +/turf/open/floor/almayer{ + icon_state = "plating_striped" + }, +/area/almayer/squads/req) "hBU" = ( /obj/structure/largecrate/random/secure, /obj/effect/decal/warning_stripes{ @@ -43100,7 +43123,6 @@ }, /area/almayer/hull/upper_hull/u_a_p) "jnw" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -46198,21 +46220,10 @@ /area/almayer/hull/lower_hull/l_m_p) "kRP" = ( /obj/structure/pipes/standard/simple/hidden/supply, -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "Hubba hubba."; - icon = 'icons/obj/structures/props/posters.dmi'; - icon_state = "poster17"; - name = "\improper torn magazine page"; - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "Hubba hubba."; - icon = 'icons/obj/structures/props/posters.dmi'; - icon_state = "poster3"; - name = "\improper torn magazine page"; - pixel_x = 5; - pixel_y = 14 +/obj/item/prop/magazine/dirty/torn, +/obj/item/prop/magazine/dirty/torn/alt{ + pixel_x = 7; + pixel_y = 11 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) @@ -46606,6 +46617,9 @@ id = "CIC Lockdown"; name = "\improper Combat Information Center Blast Door" }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, /turf/open/floor/plating, /area/almayer/command/cic) "lbb" = ( @@ -49955,12 +49969,9 @@ /obj/structure/sign/safety/distribution_pipes{ pixel_x = -17 }, -/obj/item/book{ - desc = "In the dark undercity of Luna 2119, blade runner Richard Ford is called out of retirement to terminate a cult of replicants who have escaped Earth seeking the meaning of their existence."; - icon_state = "bookSpaceLaw"; - name = "\improper Bladerunner: A True Detectives Story"; - pixel_x = -6; - pixel_y = 6 +/obj/item/prop/magazine/book/bladerunner{ + pixel_x = -1; + pixel_y = 9 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -51408,10 +51419,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) "nph" = ( -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 }, -/area/almayer/engineering/upper_engineering) +/turf/open/floor/plating, +/area/almayer/engineering/starboard_atmos) "npt" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -54927,18 +54940,14 @@ "oZp" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light, -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "The only official USCM magazine, the headline reads 'TEN tips to keep your UD4 cockpit both safer and more relaxing.'"; - icon = 'icons/obj/structures/props/posters.dmi'; - icon_state = "poster15"; - name = "Boots!: Issue No.55"; - pixel_x = -5; - pixel_y = 5 - }, /obj/item/reagent_container/food/snacks/grilledcheese{ pixel_x = 6; pixel_y = 8 }, +/obj/item/prop/magazine/boots/n055{ + pixel_x = -9; + pixel_y = 5 + }, /turf/open/floor/almayer{ dir = 10; icon_state = "red" @@ -55698,6 +55707,18 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"pvF" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/item/folded_tent/reqs, +/turf/open/floor/almayer{ + icon_state = "plating_striped" + }, +/area/almayer/squads/req) "pvJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56611,6 +56632,7 @@ id = "containmentlockdown_E"; name = "\improper Containment Lockdown" }, +/obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -56639,7 +56661,6 @@ }, /area/almayer/medical/containment/cell/cl) "pRL" = ( -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, @@ -57420,6 +57441,10 @@ icon_state = "test_floor4" }, /area/almayer/hull/lower_hull) +"qif" = ( +/obj/structure/sign/dartboard, +/turf/closed/wall/almayer, +/area/almayer/hallways/hangar) "qim" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -59370,6 +59395,17 @@ icon_state = "containment_window_h" }, /area/almayer/medical/containment/cell/cl) +"rfg" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hull/upper_hull/u_m_s) "rfI" = ( /obj/structure/sign/safety/airlock{ pixel_y = -32 @@ -63423,27 +63459,17 @@ pixel_x = 7; pixel_y = 9 }, -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "Hubba hubba."; - icon = 'icons/obj/structures/props/posters.dmi'; - icon_state = "poster17"; - name = "\improper torn magazine page"; - pixel_x = -5; - pixel_y = 5 - }, /obj/item/trash/semki{ layer = 2; pixel_x = -13; pixel_y = 14 }, -/obj/item/prop/helmetgarb/spacejam_tickets{ - desc = "The only official USCM magazine, the headline reads 'ARMAT strikes back against litigants in M41A-MK2 self cleaning case'"; - icon = 'icons/obj/structures/props/posters.dmi'; - icon_state = "poster15"; - layer = 3.6; - name = "Boots!: Issue No.54"; - pixel_x = 27; - pixel_y = 4 +/obj/item/prop/magazine/boots/n054{ + pixel_x = 29 + }, +/obj/item/prop/magazine/dirty/torn{ + pixel_x = -6; + pixel_y = 6 }, /obj/item/clothing/glasses/disco_fever{ pixel_x = 5; @@ -69344,6 +69370,10 @@ "vDa" = ( /turf/open/floor/almayer/research/containment/corner2, /area/almayer/medical/containment/cell) +"vDh" = ( +/obj/item/weapon/dart/green, +/turf/open/floor/plating, +/area/almayer/hull/lower_hull/l_f_p) "vEf" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -69940,6 +69970,18 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"vSr" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/item/folded_tent/big, +/turf/open/floor/almayer{ + icon_state = "plating_striped" + }, +/area/almayer/squads/req) "vSE" = ( /obj/structure/closet/secure_closet/personal, /turf/open/floor/almayer{ @@ -70159,14 +70201,11 @@ dir = 4 }, /obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/sign/poster{ - desc = "Wawaweewa."; - icon_state = "poster17"; - name = "magazine"; - pixel_x = 3; - pixel_y = 4 +/obj/item/tool/pen{ + pixel_x = 9; + pixel_y = -5 }, -/obj/item/tool/pen, +/obj/item/prop/magazine/book/theartofwar, /turf/open/floor/almayer, /area/almayer/living/bridgebunks) "vWB" = ( @@ -72005,18 +72044,11 @@ /area/almayer/medical/upper_medical) "wNl" = ( /obj/structure/surface/table/almayer, -/obj/item/trash/USCMtray{ - pixel_x = 5 - }, /obj/item/trash/USCMtray{ layer = 3.2; pixel_x = 4; pixel_y = 17 }, -/obj/item/reagent_container/food/snacks/bearmeat{ - pixel_x = 4; - pixel_y = -1 - }, /obj/item/reagent_container/food/drinks/cans/souto{ pixel_x = -10; pixel_y = 1 @@ -72026,6 +72058,10 @@ pixel_x = 1; pixel_y = 13 }, +/obj/item/prop/magazine/book/starshiptroopers{ + pixel_x = 8; + pixel_y = -3 + }, /turf/open/floor/almayer{ dir = 10; icon_state = "orange" @@ -73257,6 +73293,9 @@ dir = 1; name = "\improper Engineering Storage" }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -92699,8 +92738,8 @@ baH fVz bHB bBN -bcm -kCT +qif +vDh kCT kCT kCT @@ -98471,7 +98510,7 @@ kOB awZ aiX jnw -atL +aBq pRL awF aEM @@ -110640,7 +110679,7 @@ acD aao aap aap -aiv +rfg bYe amO bYe @@ -115305,11 +115344,11 @@ ahg aap aap aap -aiv +rfg aiw ahh aiw -ahJ +nph aiC ajF aiC @@ -115512,7 +115551,7 @@ aar afP ahh aiw -ahJ +nph aiC anG aiC @@ -115715,7 +115754,7 @@ aar afQ aiw aiw -ahJ +nph aiC anG aiC @@ -117447,7 +117486,7 @@ bEi bZr bmD ngw -pjG +gCu boz bpR bpR @@ -117650,7 +117689,7 @@ brp bZr bmD xId -pjG +hBP boz bpR bpR @@ -118056,7 +118095,7 @@ buz bZr bmD dmE -pjG +pvF boz bpR bpR @@ -118259,7 +118298,7 @@ bEm bZr bmD hAc -pjG +vSr boz bpR bpR @@ -119576,7 +119615,7 @@ psm ndJ anJ aoS -aBq +inw amA amx amx @@ -119590,7 +119629,7 @@ amx atq amx aoT -aBq +inw aiB anJ mnG @@ -119793,7 +119832,7 @@ ayd atq atq wwJ -aBq +inw alG aYj apd @@ -119982,7 +120021,7 @@ psm ylJ aDZ aoD -aBq +inw qHM emn rdI @@ -119996,7 +120035,7 @@ aye amx amx aBs -aBq +inw alG aYj apd @@ -121003,9 +121042,9 @@ atq aoT alO alO -azn +alR aBm -azn +alR alO xBe xBe @@ -122631,7 +122670,7 @@ amA amx aDr aFw -aBq +inw aJh arq ufx @@ -122834,7 +122873,7 @@ amA amx aDr aFy -aBq +inw aJi azs atq @@ -123240,7 +123279,7 @@ amA atq aDr aFz -aBq +inw amA ayl amx @@ -123443,7 +123482,7 @@ azq auy aDB aFA -aBq +inw aJl amx atq @@ -123849,7 +123888,7 @@ azt auA aDD aFD -aBq +inw xEO xEO lnP @@ -124255,7 +124294,7 @@ arm atc atc atc -aBq +inw xEO xEO aOV @@ -124452,7 +124491,7 @@ alR arK atc civ -nph +kwd atq atq amA @@ -124859,11 +124898,11 @@ aPa eky eky alO -aBq -aBq +aqY +aqY alO -aBq -aBq +aqY +aqY alO eky eky 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 add5b05bdaf1..2d280dd46967 100644 --- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm +++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm @@ -219,9 +219,7 @@ }, /area/whiskey_outpost/inside/living) "aK" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/two_south) "aM" = ( /obj/effect/decal/cleanable/blood/writing{ @@ -308,9 +306,7 @@ /area/whiskey_outpost/inside/hospital) "bc" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/three_north) "bd" = ( /obj/effect/decal/medical_decals{ @@ -454,7 +450,7 @@ /area/whiskey_outpost/inside/bunker) "bD" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/three_south) "bF" = ( /obj/structure/disposalpipe/segment, @@ -595,9 +591,7 @@ /obj/effect/decal/cleanable/blood/writing{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/inside/caves/caverns/west) "cl" = ( /obj/structure/barricade/metal/wired{ @@ -699,9 +693,7 @@ dir = 4 }, /obj/item/stool, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/two_south) "cC" = ( /obj/structure/sign/poster, @@ -795,9 +787,7 @@ }, /area/whiskey_outpost/inside/hospital) "cR" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/inside/caves/caverns/east) "cS" = ( /obj/structure/curtain/black{ @@ -842,14 +832,11 @@ }, /area/whiskey_outpost/inside/living) "dd" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/outside/south/very_far) "de" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/two_north) "df" = ( /obj/structure/mirror{ @@ -871,10 +858,7 @@ /area/whiskey_outpost/inside/living) "dj" = ( /obj/structure/closet/crate/trashcart, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/lane/two_south) "dk" = ( /obj/structure/curtain, @@ -1162,10 +1146,7 @@ }, /area/whiskey_outpost/inside/hospital) "ej" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/lane/four_south) "ek" = ( /obj/structure/largecrate/supply/supplies/sandbags, @@ -1175,15 +1156,10 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "eo" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/whiskey_outpost/outside/lane/four_south) "ep" = ( -/turf/open/gm/grass{ - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/north_west, /area/whiskey_outpost/outside/lane/one_south) "eq" = ( /obj/structure/machinery/power/apc/almayer{ @@ -1256,10 +1232,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/cic) "eG" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/lane/two_north) "eH" = ( /obj/structure/surface/rack, @@ -1380,10 +1353,7 @@ }, /area/whiskey_outpost/inside/hospital) "fb" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/lane/three_north) "fc" = ( /obj/structure/disposalpipe/segment, @@ -1628,10 +1598,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/beach) "fJ" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/whiskey_outpost/outside/lane/one_south) "fL" = ( @@ -1654,9 +1621,7 @@ /area/whiskey_outpost/outside/south/far) "fS" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/two_north) "fT" = ( /obj/structure/window/reinforced{ @@ -1677,11 +1642,7 @@ }, /area/whiskey_outpost/inside/living) "fU" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/jungle{ bushes_spawn = 0; icon_state = "grass_impenetrable" @@ -1769,10 +1730,7 @@ }, /area/whiskey_outpost/inside/hospital) "gj" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/lane/two_north) "gl" = ( /obj/structure/disposalpipe/segment, @@ -1795,7 +1753,7 @@ /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/cic) "gr" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/south) "gs" = ( /obj/structure/machinery/door/poddoor{ @@ -1818,25 +1776,17 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "gu" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/two_north) "gv" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/inside/caves/caverns/west) "gx" = ( /obj/structure/machinery/colony_floodlight, /turf/open/jungle, /area/whiskey_outpost/outside/lane/three_north) "gy" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/outside/lane/one_north) "gz" = ( /obj/effect/decal/cleanable/blood/writing{ @@ -2024,10 +1974,7 @@ /turf/open/floor/plating, /area/whiskey_outpost/inside/hospital) "hh" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/inside/caves/caverns/west) "hi" = ( /obj/structure/extinguisher_cabinet, @@ -2099,9 +2046,7 @@ /turf/open/jungle, /area/whiskey_outpost/outside/lane/two_south) "hs" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/whiskey_outpost/outside/lane/four_north) "ht" = ( /turf/open/floor{ @@ -2149,14 +2094,8 @@ }, /area/whiskey_outpost/inside/hospital) "hy" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/obj/item/lightstick/red/planted, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/south/far) "hz" = ( /obj/effect/decal/medical_decals{ @@ -2244,10 +2183,7 @@ }, /area/whiskey_outpost/inside/hospital) "hI" = ( -/turf/open/gm/grass{ - dir = 4; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/south_west, /area/whiskey_outpost/outside/lane/one_north) "hJ" = ( /obj/structure/machinery/colony_floodlight, @@ -2255,12 +2191,10 @@ /area/whiskey_outpost/outside/north/platform) "hK" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/one_north) "hL" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/inside/caves/caverns/west) "hM" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, @@ -2368,14 +2302,10 @@ /obj/structure/barricade/handrail/wire{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/two_south) "if" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/whiskey_outpost/outside/lane/four_south) "ig" = ( /obj/effect/decal/medical_decals{ @@ -2447,9 +2377,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/lane/four_north) "iq" = ( /obj/structure/largecrate/supply/supplies/mre, @@ -2544,10 +2472,7 @@ /turf/open/floor/plating, /area/whiskey_outpost/inside/hospital) "iD" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/whiskey_outpost/outside/lane/four_south) "iF" = ( @@ -3020,11 +2945,7 @@ }, /area/whiskey_outpost/inside/living) "ke" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/gm/dirt, /area/whiskey_outpost/outside/south/far) "kg" = ( @@ -3072,7 +2993,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/south) "ko" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/one_north) "kp" = ( /obj/structure/surface/table/reinforced/prison, @@ -3241,10 +3162,7 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/east, /area/whiskey_outpost/outside/south) "kS" = ( /turf/open/floor/prison, @@ -3285,9 +3203,7 @@ }, /area/whiskey_outpost/inside/hospital) "lc" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/north/northeast) "ld" = ( /turf/open/shuttle/dropship{ @@ -3305,9 +3221,7 @@ /turf/open/jungle, /area/whiskey_outpost/outside/south) "lg" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/three_south) "li" = ( /obj/structure/surface/table/reinforced/prison, @@ -3325,10 +3239,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/living) "lk" = ( -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/whiskey_outpost/outside/south) "lm" = ( /turf/open/floor/prison{ @@ -3346,11 +3257,7 @@ }, /area/whiskey_outpost) "lp" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/gm/dirt, /area/whiskey_outpost/outside/south/very_far) "lq" = ( @@ -3631,9 +3538,7 @@ }, /area/whiskey_outpost/inside/hospital) "mw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/south/very_far) "mx" = ( /obj/structure/flora/pottedplant/random, @@ -3645,10 +3550,7 @@ }, /area/whiskey_outpost/inside/cic) "my" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/lane/four_south) "mz" = ( /obj/structure/extinguisher_cabinet, @@ -3877,10 +3779,7 @@ }, /area/whiskey_outpost/inside/hospital) "ng" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/whiskey_outpost/outside/lane/four_south) "nh" = ( /turf/closed/wall/strata_ice/jungle, @@ -3899,10 +3798,7 @@ }, /area/whiskey_outpost) "nj" = ( -/turf/open/gm/grass{ - dir = 4; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/south_west, /area/whiskey_outpost/outside/south) "nk" = ( /obj/effect/decal/warning_stripes/asteroid{ @@ -4394,7 +4290,7 @@ /area/whiskey_outpost/outside/mortar_pit) "pj" = ( /obj/effect/landmark/start/whiskey/engineer, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/two_south) "pm" = ( /obj/effect/decal/cleanable/blood/writing, @@ -4411,15 +4307,13 @@ /turf/open/floor/plating, /area/whiskey_outpost/inside/engineering) "pu" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/lane/four_north) "pv" = ( /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river/east) "pw" = ( /obj/structure/disposalpipe/segment, @@ -4466,10 +4360,7 @@ }, /area/whiskey_outpost/inside/living) "pD" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/lane/three_south) "pE" = ( /obj/structure/disposalpipe/segment{ @@ -4632,10 +4523,7 @@ }, /area/whiskey_outpost/inside/living) "qg" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/north) "qi" = ( /obj/structure/disposalpipe/segment, @@ -4714,9 +4602,7 @@ }, /area/whiskey_outpost/inside/hospital/triage) "qt" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/lane/four_south) "qu" = ( /obj/structure/machinery/power/smes/buildable, @@ -4726,10 +4612,7 @@ }, /area/whiskey_outpost/inside/engineering) "qv" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/whiskey_outpost/outside/lane/four_south) "qw" = ( /obj/structure/surface/table/reinforced/prison, @@ -4938,10 +4821,7 @@ }, /area/whiskey_outpost) "qY" = ( -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/whiskey_outpost/outside/lane/one_south) "ra" = ( /obj/structure/machinery/power/apc/almayer{ @@ -5045,10 +4925,7 @@ }, /area/whiskey_outpost/inside/engineering) "rw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/outside/lane/two_north) "ry" = ( /turf/open/gm/dirt, @@ -5195,9 +5072,7 @@ }, /area/whiskey_outpost/inside/supply) "rT" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/three_south) "rV" = ( /turf/open/floor/prison{ @@ -5226,10 +5101,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/north) "rZ" = ( /obj/structure/surface/rack, @@ -5334,10 +5206,7 @@ /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/bunker/pillbox/four) "so" = ( -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/whiskey_outpost/outside/south/far) "sp" = ( /obj/structure/disposalpipe/segment{ @@ -5380,10 +5249,7 @@ }, /area/whiskey_outpost/inside/cic) "sA" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/lane/two_south) "sC" = ( /obj/effect/landmark/start/whiskey/doctor, @@ -5516,10 +5382,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/supply) "ti" = ( -/turf/open/gm/grass{ - dir = 1; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/south_east, /area/whiskey_outpost/outside/south) "tj" = ( /obj/structure/machinery/light/small, @@ -5695,21 +5558,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/beach) "tK" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/north) "tL" = ( /obj/structure/largecrate/supply/supplies/metal, @@ -5723,10 +5579,7 @@ /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/supply) "tO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/north) "tP" = ( /obj/structure/machinery/vending/snack{ @@ -5876,10 +5729,7 @@ }, /area/whiskey_outpost/inside/living) "um" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/north) "uo" = ( /obj/structure/largecrate/supply/supplies/flares, @@ -5950,9 +5800,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/mortar_pit) "uy" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/two_south) "uz" = ( /obj/structure/extinguisher_cabinet, @@ -6006,10 +5854,7 @@ dir = 1; icon_state = "pipe-c" }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/north) "uI" = ( /obj/structure/machinery/door/airlock/almayer/maint{ @@ -6135,10 +5980,7 @@ /turf/closed/wall, /area/whiskey_outpost/outside/lane/one_north) "vg" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/north/beach) "vi" = ( /obj/structure/curtain/black, @@ -6261,11 +6103,7 @@ }, /area/whiskey_outpost/inside/bunker) "vF" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/beach) "vG" = ( @@ -6309,10 +6147,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/supply) "vQ" = ( -/turf/open/gm/grass{ - dir = 8; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/north_east, /area/whiskey_outpost/outside/lane/one_south) "vR" = ( /obj/structure/machinery/light/small{ @@ -6376,13 +6211,8 @@ }, /area/whiskey_outpost/inside/bunker) "wb" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/obj/structure/flora/jungle/alienplant1, +/turf/open/gm/coast/beachcorner2/north_west, /area/whiskey_outpost/outside/river/east) "wc" = ( /obj/structure/curtain/black, @@ -6564,9 +6394,7 @@ }, /area/whiskey_outpost/inside/bunker) "wF" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/outside/lane/four_south) "wG" = ( /obj/structure/machinery/light{ @@ -6601,10 +6429,7 @@ }, /area/whiskey_outpost/inside/hospital/triage) "wK" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/lane/two_south) "wM" = ( /obj/structure/machinery/line_nexter{ @@ -6755,18 +6580,13 @@ }, /area/whiskey_outpost/inside/bunker) "xp" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/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{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/lane/four_north) "xr" = ( /obj/structure/surface/rack, @@ -6859,14 +6679,8 @@ }, /area/whiskey_outpost/inside/bunker) "xK" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/obj/item/lightstick/red/planted, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/south/very_far) "xL" = ( /obj/effect/decal/cleanable/blood/writing{ @@ -6958,10 +6772,7 @@ }, /area/whiskey_outpost/inside/living) "xZ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/lane/two_south) "ya" = ( /obj/effect/landmark/whiskey_outpost/supplydrops, @@ -7020,10 +6831,7 @@ }, /area/whiskey_outpost/outside/north/platform) "yl" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/inside/caves/caverns/west) "yn" = ( /obj/structure/platform_decoration, @@ -7041,9 +6849,7 @@ dir = 1; icon_state = "sandbag_0" }, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/lane/four_south) "yp" = ( /obj/structure/platform{ @@ -7060,9 +6866,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/bunker) "yt" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/lane/four_north) "yv" = ( /obj/structure/sign/prop3, @@ -7256,6 +7060,15 @@ icon_state = "asteroidwarning" }, /area/whiskey_outpost/outside/north/platform) +"yW" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/machinery/cm_vending/clothing/medic, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/whiskey_outpost/inside/bunker/bunker/front) "yX" = ( /obj/structure/disposalpipe/segment, /turf/open/floor{ @@ -7306,9 +7119,7 @@ }, /area/whiskey_outpost/outside/north/platform) "zh" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/two_north) "zi" = ( /obj/structure/disposalpipe/sortjunction/flipped{ @@ -7323,10 +7134,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/north) "zl" = ( /obj/structure/machinery/power/apc/almayer, @@ -7377,9 +7185,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/three) "zw" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/river/east) "zy" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, @@ -7453,11 +7259,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/bunker) "zK" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/gm/dirt, /area/whiskey_outpost/inside/caves/caverns) "zM" = ( @@ -7511,9 +7313,7 @@ }, /area/whiskey_outpost/outside/north/platform) "zU" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/south) "zV" = ( /obj/structure/disposalpipe/segment{ @@ -7532,9 +7332,7 @@ }, /area/whiskey_outpost/inside/bunker) "zX" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/river) "zY" = ( /obj/structure/barricade/plasteel/wired{ @@ -7543,10 +7341,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/bunker) "Aa" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/lane/three_north) "Ab" = ( /obj/structure/machinery/autodoc_console, @@ -7559,10 +7354,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/whiskey_outpost/outside/lane/four_north) "Ad" = ( /obj/structure/machinery/colony_floodlight, @@ -7575,9 +7367,7 @@ /turf/closed/wall/rock/brown, /area/whiskey_outpost/inside/bunker/bunker/front) "Af" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/lane/four_south) "Ag" = ( /obj/structure/machinery/floodlight{ @@ -7678,9 +7468,7 @@ dir = 1 }, /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/inside/caves/caverns/west) "AE" = ( /obj/structure/flora/jungle/planttop1, @@ -7715,7 +7503,7 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "AK" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/north/beach) "AO" = ( /obj/structure/barricade/metal/wired, @@ -7761,7 +7549,7 @@ }, /area/whiskey_outpost/outside/north) "AV" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river/west) "AW" = ( /obj/structure/disposalpipe/segment{ @@ -7772,9 +7560,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/bunker/bunker/front) "AY" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/river/east) "AZ" = ( /obj/structure/barricade/sandbags/wired, @@ -7816,9 +7602,7 @@ /area/whiskey_outpost/outside/north/platform) "Bf" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/three_north) "Bg" = ( /obj/structure/platform_decoration{ @@ -7839,7 +7623,7 @@ /area/whiskey_outpost/outside/river/west) "Bj" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/inside/caves/caverns/west) "Bl" = ( /obj/structure/disposalpipe/segment{ @@ -7891,6 +7675,15 @@ icon_state = "asteroidwarning" }, /area/whiskey_outpost/outside/north/platform) +"Br" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/machinery/cm_vending/clothing/medic, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/whiskey_outpost/inside/bunker/bunker/front) "Bs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7927,15 +7720,10 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/bunker) "By" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/whiskey_outpost/outside/river/east) "Bz" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/whiskey_outpost/outside/river/east) "BA" = ( /obj/structure/platform_decoration{ @@ -7967,10 +7755,7 @@ }, /area/whiskey_outpost/outside/north/platform) "BF" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/whiskey_outpost/outside/river/west) "BG" = ( /obj/structure/barricade/sandbags/wired, @@ -8122,10 +7907,7 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "Ce" = ( -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/whiskey_outpost/outside/lane/one_north) "Cf" = ( /obj/structure/disposalpipe/segment{ @@ -8259,18 +8041,19 @@ /turf/open/gm/river, /area/whiskey_outpost/outside/lane/one_north) "CE" = ( -/turf/open/jungle{ - bushes_spawn = 0; - icon_state = "grass_impenetrable" +/obj/structure/machinery/cm_vending/clothing/medic, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" }, -/area/whiskey_outpost/outside/lane/two_north) +/area/whiskey_outpost) "CG" = ( /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/two_south) "CJ" = ( /obj/structure/bed/chair, /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/two_south) "CK" = ( /obj/structure/disposalpipe/segment, @@ -8318,9 +8101,7 @@ /area/whiskey_outpost/outside/river/west) "CZ" = ( /obj/structure/platform, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/river/west) "Db" = ( /turf/open/gm/dirt, @@ -8503,9 +8284,7 @@ }, /area/whiskey_outpost/outside/north/beach) "DE" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/whiskey_outpost/outside/river/east) "DF" = ( /obj/structure/blocker/invisible_wall, @@ -8516,7 +8295,7 @@ pixel_x = 5; pixel_y = -12 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river/east) "DH" = ( /obj/structure/platform{ @@ -8590,11 +8369,7 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "DU" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_south) "DV" = ( @@ -8604,11 +8379,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/bunker) -"DW" = ( -/turf/open/gm/coast{ - dir = 6 - }, -/area/whiskey_outpost/outside/lane/four_south) "DX" = ( /obj/structure/blocker/invisible_wall, /turf/open/gm/river, @@ -8636,10 +8406,7 @@ }, /area/whiskey_outpost/outside/north/platform) "Ea" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/south) "Eb" = ( /obj/structure/machinery/medical_pod/autodoc/unskilled, @@ -8661,14 +8428,10 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/cic) "Ee" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/river/east) "Eg" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/river/west) "Eh" = ( /obj/effect/decal/cleanable/blood/oil, @@ -8691,11 +8454,11 @@ icon_state = "distribution" }, /obj/structure/blocker/invisible_wall, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river/west) "Eo" = ( /obj/structure/blocker/invisible_wall, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river/west) "Eq" = ( /obj/structure/bed/chair{ @@ -8711,10 +8474,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/whiskey_outpost/outside/lane/four_north) "Et" = ( /obj/structure/machinery/floodlight{ @@ -8726,10 +8486,7 @@ }, /area/whiskey_outpost/outside/north/platform) "Eu" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/whiskey_outpost/outside/river/west) "Ev" = ( /obj/structure/barricade/sandbags/wired, @@ -8805,9 +8562,7 @@ /turf/open/jungle, /area/whiskey_outpost/inside/caves/caverns/east) "EG" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/river/west) "EH" = ( /obj/structure/barricade/sandbags/wired{ @@ -8847,7 +8602,7 @@ }, /area/whiskey_outpost/outside/lane/three_south) "EO" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north/northwest) "EP" = ( /turf/open/jungle/impenetrable, @@ -8862,7 +8617,7 @@ }, /area/whiskey_outpost/outside/north/platform) "ER" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/lane/four_south) "ES" = ( /turf/closed/wall/r_wall, @@ -8877,9 +8632,7 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/river/west) "EY" = ( /obj/effect/landmark/whiskey_outpost/xenospawn, @@ -8943,9 +8696,7 @@ /obj/structure/platform{ dir = 8 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/river) "Fj" = ( /obj/effect/decal/cleanable/blood/writing{ @@ -8969,19 +8720,13 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "Fn" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/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{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/whiskey_outpost/outside/river/west) "Fr" = ( /obj/structure/machinery/light/small, @@ -8995,15 +8740,10 @@ dir = 1 }, /obj/structure/platform_decoration, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/whiskey_outpost/outside/river/west) "Fu" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/inside/caves/caverns/east) "Fv" = ( /obj/structure/machinery/light/small{ @@ -9019,15 +8759,11 @@ /area/whiskey_outpost/inside/bunker/bunker/front) "Fw" = ( /obj/structure/platform, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/river/east) "Fx" = ( /obj/structure/platform, -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/whiskey_outpost/outside/river/east) "Fy" = ( /obj/structure/barricade/sandbags/wired, @@ -9041,24 +8777,14 @@ }, /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/northeast) -"FB" = ( -/turf/open/gm/coast{ - dir = 5 - }, -/area/whiskey_outpost/outside/river/west) "FC" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/whiskey_outpost/outside/river/west) "FD" = ( /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/river/west) "FE" = ( /obj/structure/disposalpipe/segment{ @@ -9076,19 +8802,16 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/lane/four_north) "FG" = ( /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/lane/four_north) "FH" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/whiskey_outpost/outside/river/west) "FI" = ( @@ -9127,11 +8850,6 @@ icon_state = "asteroidfloor" }, /area/whiskey_outpost/outside/north/platform) -"FR" = ( -/turf/open/gm/coast{ - dir = 6 - }, -/area/whiskey_outpost/outside/river/east) "FS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9172,9 +8890,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/bunker) "FW" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/inside/caves/caverns/east) "FX" = ( /obj/structure/platform{ @@ -9196,18 +8912,13 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/bunker) "FZ" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north/beach) "Ga" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/north/beach) "Gb" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/north/beach) "Gd" = ( /obj/structure/barricade/sandbags/wired{ @@ -9224,7 +8935,7 @@ /turf/open/floor/plating, /area/whiskey_outpost/inside/living) "Gf" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river/east) "Gg" = ( /obj/effect/decal/cleanable/blood, @@ -9240,22 +8951,10 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "Gi" = ( -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/east, /area/whiskey_outpost/outside/south) -"Gj" = ( -/turf/open/jungle{ - bushes_spawn = 0; - icon_state = "grass_impenetrable" - }, -/area/whiskey_outpost/outside/lane/two_north) "Gl" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/north/beach) "Gm" = ( /obj/structure/platform{ @@ -9319,11 +9018,7 @@ /area/whiskey_outpost/outside/north/beach) "GA" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/beach) "GB" = ( @@ -9381,7 +9076,7 @@ /turf/open/jungle, /area/whiskey_outpost/outside/lane/two_north) "GK" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/three_north) "GL" = ( /obj/structure/barricade/sandbags/wired, @@ -9421,9 +9116,7 @@ pixel_x = -6; pixel_y = 10 }, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/river/east) "GT" = ( /obj/structure/reagent_dispensers/fueltank, @@ -9437,19 +9130,14 @@ /turf/open/floor/plating, /area/whiskey_outpost/outside/north/northeast) "GV" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/outside/lane/one_north) "GW" = ( /obj/structure/cargo_container/grant/rightmid, /turf/open/floor/plating, /area/whiskey_outpost/outside/north/northeast) "GX" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/outside/south) "GY" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, @@ -9496,23 +9184,15 @@ }, /area/whiskey_outpost/outside/north) "Hj" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/inside/caves/caverns/west) "Hk" = ( /obj/structure/platform, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/whiskey_outpost/outside/river/west) "Hl" = ( /obj/structure/platform, -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/whiskey_outpost/outside/river/west) "Hm" = ( /obj/effect/decal/warning_stripes/asteroid{ @@ -9543,7 +9223,7 @@ /area/whiskey_outpost/inside/bunker/bunker/front) "Hp" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/one_north) "Hq" = ( /obj/structure/pipes/standard/manifold/visible, @@ -9552,9 +9232,7 @@ }, /area/whiskey_outpost/inside/hospital/triage) "Hr" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/one_north) "Hs" = ( /obj/structure/platform_decoration{ @@ -9569,10 +9247,7 @@ /area/whiskey_outpost/outside/north/northwest) "Hu" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/inside/caves/caverns/west) "Hv" = ( /obj/structure/platform_decoration{ @@ -9605,18 +9280,14 @@ /turf/open/jungle, /area/whiskey_outpost/outside/lane/four_south) "HB" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/three_south) "HH" = ( /obj/effect/landmark/start/whiskey/leader, /turf/open/floor/prison, /area/whiskey_outpost/inside/living) "HI" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/inside/caves/caverns/west) "HK" = ( /obj/structure/barricade/sandbags/wired{ @@ -9674,10 +9345,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/outside/north) "HU" = ( /obj/structure/surface/table/reinforced/prison, @@ -9696,11 +9364,7 @@ /turf/open/gm/river, /area/whiskey_outpost/outside/lane/one_north) "HX" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/effect/decal/cleanable/blood/writing, /turf/open/jungle, /area/whiskey_outpost/outside/south/very_far) @@ -9786,9 +9450,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/south) "Im" = ( /obj/structure/cargo_container/watatsumi/rightmid, @@ -9844,9 +9506,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/two_south) "Iw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/two_north) "Ix" = ( /turf/open/floor{ @@ -9876,11 +9536,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/two_north) "IC" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/jungle, /area/whiskey_outpost/outside/north/northwest) "IF" = ( @@ -9892,9 +9548,7 @@ /area/whiskey_outpost/outside/north/platform) "IG" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/south/very_far) "IH" = ( /obj/structure/surface/table, @@ -9904,28 +9558,17 @@ /turf/open/floor, /area/whiskey_outpost/outside/south/far) "IK" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/obj/item/lightstick/red/planted, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/south) "IM" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/whiskey_outpost/outside/lane/four_south) "IN" = ( /obj/structure/platform{ dir = 1 }, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/river/east) "IO" = ( /turf/closed/shuttle/dropship{ @@ -9949,9 +9592,7 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/river/east) "IU" = ( /obj/effect/landmark/start/whiskey/marine, @@ -9972,9 +9613,7 @@ /obj/item/tool/weldpack{ pixel_x = 7 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/two_south) "IW" = ( /obj/structure/cargo_container/arious/leftmid, @@ -9990,13 +9629,10 @@ /area/whiskey_outpost/outside/north/northeast) "Jb" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/north/beach) "Jc" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/three_south) "Jd" = ( /obj/structure/machinery/light/small, @@ -10017,9 +9653,7 @@ dir = 4; icon_state = "pipe-c" }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/north/northwest) "Jg" = ( /obj/effect/spawner/gibspawner/human, @@ -10043,10 +9677,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/north/northwest) "Jl" = ( /obj/structure/barricade/sandbags/wired{ @@ -10146,20 +9777,14 @@ /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/whiskey_outpost/outside/south) "JL" = ( /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/north/beach) "JM" = ( /obj/structure/machinery/light/small{ @@ -10212,19 +9837,13 @@ }, /area/whiskey_outpost/inside/hospital) "JU" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/lane/four_south) "JX" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/four_south) "JZ" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/north/beach) "Kb" = ( /obj/structure/sign/poster{ @@ -10242,9 +9861,7 @@ }, /area/whiskey_outpost/outside/lane/four_north) "Ke" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/lane/four_south) "Kf" = ( /obj/structure/flora/jungle/planttop1, @@ -10264,10 +9881,7 @@ }, /area/whiskey_outpost/outside/lane/four_south) "Kn" = ( -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/whiskey_outpost/outside/lane/one_north) "Ko" = ( /obj/structure/curtain, @@ -10303,13 +9917,11 @@ }, /area/whiskey_outpost/inside/hospital/triage) "Ky" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/inside/caves/caverns) "KB" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north/northwest) "KF" = ( /obj/structure/disposalpipe/segment, @@ -10319,9 +9931,7 @@ }, /area/whiskey_outpost/outside/north/northeast) "KG" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/three_north) "KJ" = ( /obj/item/stack/medical/bruise_pack, @@ -10341,9 +9951,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/two_south) "KM" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/north/northwest) "KN" = ( /obj/structure/largecrate/random/barrel/red, @@ -10366,9 +9974,7 @@ /turf/open/gm/river, /area/whiskey_outpost/outside/river) "KT" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/lane/four_north) "KW" = ( /obj/item/clothing/gloves/boxing, @@ -10396,9 +10002,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/northwest) "Ld" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/river/west) "Le" = ( /obj/structure/machinery/m56d_hmg/mg_turret, @@ -10421,9 +10025,7 @@ /turf/open/jungle, /area/whiskey_outpost/inside/caves/caverns) "Lh" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/river/west) "Lj" = ( /obj/effect/landmark/start/whiskey/medic, @@ -10442,19 +10044,12 @@ }, /area/whiskey_outpost/inside/hospital/triage) "Lp" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/disposalpipe/segment, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north/northwest) "Ls" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/whiskey_outpost/outside/river/west) "Lt" = ( /obj/structure/closet/cabinet, @@ -10487,9 +10082,7 @@ }, /area/whiskey_outpost/inside/hospital/triage) "Ly" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/three_north) "Lz" = ( /turf/open/floor{ @@ -10563,30 +10156,19 @@ /turf/closed/wall, /area/whiskey_outpost/outside/south) "LN" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/lane/three_south) "LQ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/three_south) "LR" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/disposalpipe/segment, /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/beach) "LT" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/north, /area/whiskey_outpost/outside/lane/one_north) "LU" = ( /obj/item/stack/medical/bruise_pack, @@ -10595,14 +10177,7 @@ }, /area/whiskey_outpost/outside/lane/one_north) "LX" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, -/area/whiskey_outpost/outside/river/east) -"LY" = ( -/turf/open/gm/coast{ - dir = 10 - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/river/east) "LZ" = ( /obj/structure/extinguisher_cabinet, @@ -10615,9 +10190,7 @@ }, /area/whiskey_outpost/outside/lane/one_north) "Mb" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/south/very_far) "Mc" = ( /obj/structure/barricade/sandbags/wired{ @@ -10631,10 +10204,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_north) "Me" = ( -/turf/open/gm/grass{ - dir = 4; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/south_west, /area/whiskey_outpost/outside/lane/one_south) "Mf" = ( /turf/closed/shuttle/dropship{ @@ -10676,7 +10246,7 @@ /obj/structure/platform{ dir = 8 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river/east) "Mk" = ( /obj/structure/sign/safety/north, @@ -10756,9 +10326,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/north) "MB" = ( /obj/structure/platform{ @@ -10830,16 +10398,11 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/beach) "MR" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/whiskey_outpost/outside/lane/two_north) "MU" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/north/beach) "MW" = ( /obj/structure/disposalpipe/segment, @@ -10860,19 +10423,13 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/south/far) "MZ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/one_north) "Na" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/lane/four_north) "Nc" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/jungle{ bushes_spawn = 0; icon_state = "grass_impenetrable" @@ -10968,13 +10525,8 @@ /turf/open/jungle/impenetrable, /area/whiskey_outpost/outside/south/very_far) "Nv" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/alienplant1, +/turf/open/gm/grass/grassbeach/north, /area/whiskey_outpost/outside/lane/one_north) "Ny" = ( /obj/structure/barricade/sandbags/wired{ @@ -11026,9 +10578,7 @@ /area/whiskey_outpost/outside/lane/four_south) "NE" = ( /obj/item/stool, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/two_south) "NF" = ( /obj/structure/flora/bush/ausbushes/grassybush, @@ -11038,15 +10588,10 @@ /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/river/west) "NI" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/inside/caves/caverns/east) "NJ" = ( /obj/structure/machinery/colony_floodlight, @@ -11056,16 +10601,10 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/beach) "NL" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/north/beach) "NM" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/whiskey_outpost/outside/river) "NQ" = ( /obj/effect/decal/warning_stripes/asteroid{ @@ -11100,14 +10639,10 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_north) "NX" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/north/northwest) "NY" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/outside/lane/two_south) "NZ" = ( /obj/structure/machinery/vending/cola, @@ -11120,10 +10655,7 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "Ob" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/whiskey_outpost/outside/lane/one_north) "Oc" = ( @@ -11145,9 +10677,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/south) "Oi" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/lane/four_north) "Oj" = ( /obj/structure/barricade/sandbags/wired, @@ -11157,10 +10687,7 @@ }, /area/whiskey_outpost/outside/north/beach) "Ok" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/whiskey_outpost/outside/lane/four_south) "Om" = ( /obj/structure/surface/table/reinforced/prison, @@ -11217,9 +10744,7 @@ /area/whiskey_outpost/outside/lane/three_south) "Ou" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/river/east) "Ov" = ( /obj/structure/machinery/vending/snack, @@ -11238,16 +10763,8 @@ icon_state = "asteroidfloor" }, /area/whiskey_outpost/inside/bunker/bunker/front) -"Oy" = ( -/turf/open/gm/coast{ - dir = 5 - }, -/area/whiskey_outpost/outside/river/east) "OA" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/whiskey_outpost/outside/lane/four_north) "OD" = ( @@ -11255,17 +10772,10 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/two_north) "OE" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/lane/three_north) "OF" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/jungle, /area/whiskey_outpost/outside/south) "OG" = ( @@ -11290,15 +10800,10 @@ /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/bunker/pillbox/three) "OO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/outside/north/northwest) "OP" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/inside/caves/caverns/west) "OQ" = ( /obj/effect/landmark/start/whiskey/marine, @@ -11315,24 +10820,16 @@ /area/whiskey_outpost/inside/cic) "OT" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/north/northwest) "OU" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/whiskey_outpost/outside/river) "OV" = ( /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/river) "OX" = ( /obj/structure/disposalpipe/segment{ @@ -11348,7 +10845,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river) "OZ" = ( /turf/open/floor{ @@ -11358,9 +10855,7 @@ /area/whiskey_outpost/outside/lane/three_south) "Pc" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/outside/lane/three_north) "Pd" = ( /obj/effect/decal/warning_stripes/asteroid{ @@ -11396,10 +10891,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/beach) "Pk" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/whiskey_outpost/outside/river/east) "Pl" = ( /obj/structure/disposalpipe/trunk{ @@ -11428,10 +10920,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/northwest) "Pr" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/whiskey_outpost/outside/river) "Ps" = ( @@ -11443,7 +10932,7 @@ /area/whiskey_outpost/inside/bunker/bunker/front) "Pt" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river) "Pu" = ( /obj/structure/barricade/metal/wired, @@ -11488,36 +10977,22 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_south) "PD" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/whiskey_outpost/outside/lane/four_north) "PE" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/whiskey_outpost/outside/river) "PF" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/outside/lane/four_south) "PG" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/outside/lane/two_south) "PH" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/outside/lane/three_north) "PL" = ( -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/north, /area/whiskey_outpost/outside/lane/one_north) "PM" = ( /turf/open/floor/plating/plating_catwalk, @@ -11535,7 +11010,7 @@ /obj/structure/platform{ dir = 8 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river) "PQ" = ( /obj/structure/platform{ @@ -11581,19 +11056,14 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_north) "Qa" = ( -/obj/structure/flora/jungle/plantbot1{ - icon_state = "alienplant1"; - luminosity = 2 - }, +/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{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/river/east) "Qe" = ( /turf/open/floor, @@ -11610,16 +11080,10 @@ }, /area/whiskey_outpost/outside/lane/four_north) "Qi" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/south) "Ql" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/floor{ dir = 1; icon_state = "asteroidfloor" @@ -11653,10 +11117,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/bunker) "Qq" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/north/northwest) "Qs" = ( /obj/structure/barricade/handrail{ @@ -11669,9 +11130,7 @@ /area/whiskey_outpost/inside/bunker) "Qt" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/south/far) "Qv" = ( /obj/structure/largecrate/random, @@ -11704,13 +11163,10 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/one_north) "QB" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/two_north) "QD" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/whiskey_outpost/outside/river/east) "QF" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ @@ -11737,14 +11193,10 @@ /turf/open/jungle, /area/whiskey_outpost/outside/south) "QJ" = ( -/turf/open/gm/grass{ - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/north_west, /area/whiskey_outpost/outside/lane/one_north) "QL" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/two_north) "QM" = ( /turf/open/gm/dirt, @@ -11767,10 +11219,7 @@ }, /area/whiskey_outpost/inside/caves/caverns/west) "QS" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/north/northwest) "QU" = ( /obj/structure/barricade/sandbags/wired, @@ -11781,26 +11230,17 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/north) "QV" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/two_north) "QW" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/inside/caves/caverns/west) "QX" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/north) "QY" = ( /obj/structure/platform_decoration, @@ -11868,9 +11308,7 @@ /turf/open/jungle, /area/whiskey_outpost/outside/south/very_far) "Ri" = ( -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/north, /area/whiskey_outpost/outside/north/northwest) "Rm" = ( /obj/structure/disposalpipe/segment, @@ -11878,9 +11316,7 @@ /area/whiskey_outpost/outside/lane/three_south) "Rn" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/inside/caves/caverns/west) "Ro" = ( /turf/open/jungle, @@ -11893,7 +11329,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/north) "Rx" = ( /obj/structure/surface/rack, @@ -11904,9 +11340,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/three) "Rz" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/two_south) "RA" = ( /obj/effect/landmark/start/whiskey/leader, @@ -11936,24 +11370,18 @@ /turf/open/jungle, /area/whiskey_outpost/outside/south) "RG" = ( -/turf/open/gm/grass{ - dir = 8; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/north_east, /area/whiskey_outpost/outside/north/northwest) "RH" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/outside/north/northwest) "RK" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north/northwest) "RL" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north/northwest) "RM" = ( /obj/structure/machinery/defenses/sentry/premade, @@ -11968,9 +11396,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/river/east) "RP" = ( -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/north, /area/whiskey_outpost/outside/south) "RR" = ( /obj/structure/barricade/plasteel/wired, @@ -11981,10 +11407,15 @@ /area/whiskey_outpost/inside/bunker/pillbox/three) "RS" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/one_north) +"RU" = ( +/obj/structure/machinery/cm_vending/clothing/medic, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area) "RV" = ( /obj/item/storage/box/m94, /turf/open/shuttle/dropship{ @@ -11992,10 +11423,7 @@ }, /area/whiskey_outpost/outside/lane/four_north) "RW" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/whiskey_outpost/outside/river) "RX" = ( /obj/structure/largecrate/random/case, @@ -12008,9 +11436,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/river) "Sb" = ( /obj/structure/platform, @@ -12049,9 +11475,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/four) "Si" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/south) "Sj" = ( /obj/effect/decal/warning_stripes/asteroid{ @@ -12111,30 +11535,14 @@ "Sq" = ( /turf/open/gm/river, /area/whiskey_outpost/outside/north/northwest) -"Sr" = ( -/turf/open/gm/coast{ - dir = 5 - }, -/area/whiskey_outpost/outside/lane/four_south) "Ss" = ( /turf/open/floor/prison, /area/whiskey_outpost/inside/bunker/bunker/front) -"St" = ( -/turf/open/gm/coast{ - dir = 10 - }, -/area/whiskey_outpost/outside/river) "Sx" = ( -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/east, /area/whiskey_outpost/outside/north/northwest) "Sy" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/outside/lane/three_south) "Sz" = ( /obj/structure/barricade/sandbags/wired{ @@ -12144,10 +11552,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/north) "SA" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/whiskey_outpost/outside/river/east) "SB" = ( /obj/structure/extinguisher_cabinet, @@ -12160,13 +11565,11 @@ }, /area/whiskey_outpost/inside/hospital) "SE" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/inside/caves/caverns/east) "SF" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/two_south) "SG" = ( /obj/structure/machinery/power/apc/almayer{ @@ -12187,9 +11590,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/four) "SI" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/inside/caves/caverns/east) "SJ" = ( /obj/structure/machinery/light/small{ @@ -12211,7 +11612,7 @@ /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/two_south) "SN" = ( /obj/structure/window/framed/colony/reinforced, @@ -12267,10 +11668,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/four) "SU" = ( -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/whiskey_outpost/outside/south) "SW" = ( /obj/structure/machinery/shower{ @@ -12298,17 +11696,13 @@ /area/whiskey_outpost/outside/lane/one_south) "Ta" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/open/gm/grass{ - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/north_west, /area/whiskey_outpost/outside/north/northwest) "Tc" = ( /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/river/east) "Td" = ( /obj/structure/sink{ @@ -12332,11 +11726,7 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "Th" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /obj/structure/barricade/plasteel/wired, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/one_north) @@ -12376,9 +11766,7 @@ /obj/structure/platform{ dir = 8 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/river/east) "Tp" = ( /obj/structure/machinery/door/airlock/almayer/marine/alpha{ @@ -12473,9 +11861,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/one) "TL" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/north) "TP" = ( /obj/structure/surface/table/almayer, @@ -12501,9 +11887,7 @@ pixel_x = 7; pixel_y = 3 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/two_south) "TS" = ( /turf/closed/shuttle/dropship{ @@ -12521,10 +11905,7 @@ /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/whiskey_outpost/outside/river) "TW" = ( /obj/structure/machinery/door/airlock/almayer/marine/bravo{ @@ -12577,16 +11958,10 @@ }, /area/whiskey_outpost/outside/lane/three_north) "Uf" = ( -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/east, /area/whiskey_outpost/outside/lane/one_south) "Ug" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/lane/three_south) "Uh" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass{ @@ -12644,7 +12019,7 @@ /area/whiskey_outpost/inside/bunker/pillbox/four) "Uq" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/three_north) "Ur" = ( /obj/effect/decal/cleanable/blood/writing{ @@ -12654,10 +12029,7 @@ /area/whiskey_outpost/outside/lane/one_south) "Us" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/lane/three_north) "Ut" = ( /obj/effect/landmark/start/whiskey/engineer, @@ -12686,9 +12058,7 @@ /area/whiskey_outpost/outside/lane/one_north) "Uz" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/three_north) "UB" = ( /obj/structure/disposalpipe/trunk{ @@ -12710,10 +12080,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/one) "UF" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/whiskey_outpost/outside/lane/four_north) "UH" = ( /obj/structure/disposalpipe/segment{ @@ -12761,19 +12128,11 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/beach) "UO" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, -/turf/open/gm/grass, +/obj/item/lightstick/red/planted, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north/northwest) "UP" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, +/obj/item/lightstick/red/planted, /turf/open/jungle{ bushes_spawn = 0; icon_state = "grass_impenetrable" @@ -12803,9 +12162,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/one) "UY" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/two_south) "UZ" = ( /obj/structure/machinery/cm_vending/clothing/marine/delta{ @@ -12825,23 +12182,16 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_south) "Vb" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/three_north) "Vd" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/two_south) "Ve" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/three_north) "Vg" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/inside/caves/caverns/east) "Vh" = ( /turf/open/jungle/impenetrable{ @@ -12862,10 +12212,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/bunker) "Vk" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/outside/north) "Vl" = ( /obj/structure/bed/chair, @@ -12901,7 +12248,7 @@ dir = 4; icon_state = "pipe-c" }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/north) "Vu" = ( /obj/structure/disposalpipe/segment{ @@ -12914,20 +12261,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/outside/north) "Vw" = ( /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/north) "Vx" = ( /obj/structure/machinery/medical_pod/bodyscanner{ @@ -12946,14 +12287,10 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/cic) "Vz" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/south/far) "VC" = ( -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/north, /area/whiskey_outpost/outside/lane/one_south) "VD" = ( /obj/effect/decal/cleanable/blood/writing, @@ -12998,9 +12335,7 @@ /area/whiskey_outpost/inside/bunker/pillbox/four) "VK" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/three_south) "VL" = ( /obj/structure/largecrate/supply/medicine/medkits, @@ -13064,10 +12399,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/north) "VU" = ( /turf/open/gm/dirt{ @@ -13075,10 +12407,7 @@ }, /area/whiskey_outpost/inside/caves/caverns/west) "VV" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/outside/lane/two_south) "VX" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -13086,9 +12415,7 @@ /area/whiskey_outpost/outside/lane/one_south) "Wa" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/two_south) "Wb" = ( /obj/structure/barricade/sandbags/wired{ @@ -13197,10 +12524,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/two) "Wv" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/lane/three_north) "Wx" = ( /obj/structure/barricade/plasteel/wired, @@ -13248,19 +12572,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/north) "WM" = ( /turf/closed/wall/r_wall/unmeltable, /area/whiskey_outpost/outside/south/very_far) "WN" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/inside/caves/caverns/east) "WO" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/inside/caves/caverns/west) "WP" = ( /obj/structure/disposalpipe/segment{ @@ -13318,10 +12640,7 @@ /area/whiskey_outpost/outside/north) "Xd" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/lane/two_south) "Xe" = ( /obj/structure/barricade/plasteel/wired, @@ -13346,10 +12665,7 @@ /area/whiskey_outpost/inside/bunker/pillbox/one) "Xk" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/lane/two_south) "Xl" = ( /obj/effect/landmark/start/whiskey/engineer, @@ -13379,9 +12695,15 @@ icon_state = "floor_plate" }, /area/whiskey_outpost/inside/bunker/pillbox/one) +"Xq" = ( +/turf/open/jungle{ + bushes_spawn = 0; + icon_state = "grass_impenetrable" + }, +/area/whiskey_outpost/outside/lane/two_north) "Xr" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/two_south) "Xx" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, @@ -13389,7 +12711,7 @@ /area/whiskey_outpost/outside/lane/four_north) "Xy" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north) "Xz" = ( /turf/closed/shuttle/dropship{ @@ -13474,9 +12796,7 @@ "XN" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/tool, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/two_south) "XP" = ( /obj/structure/disposalpipe/segment{ @@ -13521,14 +12841,11 @@ /turf/closed/shuttle/dropship, /area/whiskey_outpost/outside/lane/four_north) "XZ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/lane/three_south) "Yc" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/north) "Yd" = ( /obj/structure/barricade/sandbags/wired{ @@ -13590,13 +12907,13 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/three) "Yo" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river) "Yp" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/lane/four_north) "Yq" = ( /turf/open/floor/prison{ @@ -13637,7 +12954,7 @@ /obj/structure/platform_decoration{ dir = 9 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/lane/four_north) "YA" = ( /obj/structure/platform{ @@ -13649,7 +12966,7 @@ /obj/structure/platform_decoration{ dir = 5 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/lane/four_north) "YB" = ( /obj/effect/decal/warning_stripes/asteroid{ @@ -13682,9 +12999,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/two) "YH" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/inside/caves/caverns/west) "YI" = ( /obj/structure/surface/rack, @@ -13711,9 +13026,7 @@ /area/whiskey_outpost/outside/lane/four_north) "YM" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/three_south) "YN" = ( /obj/structure/disposalpipe/segment, @@ -13735,15 +13048,10 @@ /area/whiskey_outpost/inside/bunker/pillbox/three) "YT" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/three_south) "YV" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/whiskey_outpost/outside/river) "YY" = ( /turf/closed/shuttle/dropship{ @@ -13818,10 +13126,7 @@ /turf/open/gm/river, /area/whiskey_outpost/outside/lane/four_north) "Zi" = ( -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/east, /area/whiskey_outpost/outside/lane/two_north) "Zj" = ( /obj/structure/platform{ @@ -13840,9 +13145,7 @@ pixel_y = 2 }, /obj/effect/decal/cleanable/blood/oil, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/south) "Zm" = ( /obj/structure/machinery/cm_vending/sorted/medical/chemistry, @@ -13883,10 +13186,7 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "Zs" = ( -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/whiskey_outpost/outside/lane/one_south) "Zt" = ( /obj/effect/landmark/start/whiskey/marine, @@ -13895,9 +13195,7 @@ "Zv" = ( /obj/structure/bed/chair, /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/two_south) "Zw" = ( /turf/open/jungle, @@ -13947,9 +13245,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/one) "ZF" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/south/far) "ZG" = ( /obj/structure/sign/safety/medical{ @@ -13986,10 +13282,7 @@ }, /area/whiskey_outpost/outside/lane/four_north) "ZL" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/whiskey_outpost/outside/lane/four_south) "ZN" = ( /obj/effect/landmark/start/whiskey/engineer, @@ -13999,10 +13292,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/two) "ZP" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/lane/one_north) "ZQ" = ( /obj/structure/machinery/light/small{ @@ -14017,14 +13307,8 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/two) "ZT" = ( -/obj/item/lightstick/red{ - anchored = 1; - icon_state = "lightstick_red1"; - luminosity = 2 - }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/obj/item/lightstick/red/planted, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/south/far) "ZU" = ( /turf/open/floor/prison{ @@ -18780,7 +18064,7 @@ mT mT AV zq -FB +Ls Ld Ld Hk @@ -19399,7 +18683,7 @@ zq zq zq zq -FB +Ls Ld Ld FC @@ -20008,7 +19292,7 @@ zq zq zq zq -FB +Ls FC NX RK @@ -22254,7 +21538,7 @@ Zf Zf Zf mT -Gj +Xq GJ GJ mT @@ -22457,8 +21741,8 @@ Zf Zf mT GJ -Gj -Gj +Xq +Xq mT Zf Zf @@ -22661,7 +21945,7 @@ mT GJ GJ GJ -Gj +Xq Zf Zf mT @@ -22860,7 +22144,7 @@ Zf mT mT mT -Gj +Xq GJ GJ GJ @@ -23061,10 +22345,10 @@ Zf Zf mT mT -Gj -Gj +Xq +Xq GJ -Gj +Xq GJ Oq Oq @@ -23265,9 +22549,9 @@ mT mT GJ GJ -Gj -Gj -Gj +Xq +Xq +Xq Oq Qw Qw @@ -23459,20 +22743,20 @@ mT Db OD gu -Gj +Xq mT mT mT -Gj -Gj +Xq +Xq cY GJ -Gj -Gj +Xq +Xq GJ GJ -Gj -Gj +Xq +Xq GJ GJ GJ @@ -23665,17 +22949,17 @@ GJ GJ GJ GJ -GJ -GJ -Gj +Xq +Xq +Xq GJ GJ GJ -Gj +Xq GJ GJ GJ -Gj +Xq GJ GJ QB @@ -23796,8 +23080,8 @@ hb JT ix qz -kh -kh +CE +RU kA lB lO @@ -23866,19 +23150,19 @@ gu GJ GJ GJ -Gj +Xq GJ GJ -Gj -Gj +Xq +Xq GJ GJ -Gj -Gj +Xq +Xq GJ GJ -Gj -Gj +Xq +Xq GJ QB CG @@ -24065,22 +23349,22 @@ QO Db OD gu -Gj -Gj -Gj -Gj +Xq +Xq +Xq +Xq GJ -Gj -Gj -Gj +Xq +Xq +Xq GJ -Gj -Gj -Gj +Xq +Xq +Xq GJ -Gj -Gj -Gj +Xq +Xq +Xq GJ QB CG @@ -24267,23 +23551,23 @@ QO Db OD gu -Gj -Gj -Gj +Xq +Xq +Xq GJ -Gj -Gj +Xq +Xq GJ GJ -Gj -Gj +Xq +Xq AE In -Gj -Gj +Xq +Xq GJ GJ -Gj +Xq QB VH CN @@ -24451,7 +23735,7 @@ UN UN UN TU -St +OU eY eY zX @@ -24469,23 +23753,23 @@ Pu Db OD gu -Gj -Gj -Gj -Gj -Gj -Gj -Gj -Gj -Gj -Gj -Gj -Gj -Gj -Gj -Gj -Gj -Gj +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq QB CG CN @@ -25684,20 +24968,20 @@ Db eG QL rw -Gj -Gj -Gj +Xq +Xq +Xq GJ QB Db Db Db gu -Gj -Gj +Xq +Xq GJ -Gj -Gj +Xq +Xq QB CG CN @@ -25895,11 +25179,11 @@ IB IB sb gu -Gj +Xq GJ GJ GJ -Gj +Xq QB VH CN @@ -26097,11 +25381,11 @@ Db Db ky gu -Gj -Gj +Xq +Xq GJ GJ -Gj +Xq QB CG CN @@ -26303,7 +25587,7 @@ GJ GJ GJ GJ -Gj +Xq QB CG mT @@ -27114,7 +26398,7 @@ UR Gw UR UR -Gw +yW Nf ks tV @@ -28124,7 +27408,7 @@ UR ik FT UR -ik +Br Nf ks MF @@ -29906,7 +29190,7 @@ UN UN UN TU -St +OU eY eY eY @@ -31118,7 +30402,7 @@ BL BL BL Qc -FR +Bz eK eK yU @@ -31723,7 +31007,7 @@ fy fy Ou GS -FR +Bz eK zy eK @@ -32327,7 +31611,7 @@ fy fy LX zw -FR +Bz eK yU eK @@ -32729,7 +32013,7 @@ fy fy LX zw -FR +Bz zy eK eK @@ -33535,7 +32819,7 @@ IN zw zw zw -FR +Bz eK eK eK @@ -33926,7 +33210,7 @@ LX zw zw zw -FR +Bz eK eK Jp @@ -33943,7 +33227,7 @@ eK eK eK eK -Oy +SA zw lc lc @@ -34326,7 +33610,7 @@ LX zw zw zw -FR +Bz eK eK eK @@ -34545,10 +33829,10 @@ IR Ee Ee Ee -LY +QD eK eK -Oy +SA zw Bz eK @@ -34726,7 +34010,7 @@ mT mT mT zw -FR +Bz eK zy eK @@ -36363,7 +35647,7 @@ DM Ec MP LX -FR +Bz eK eK DE @@ -36770,7 +36054,7 @@ Gf eK eK eK -Oy +SA zw wb DE @@ -38217,11 +37501,11 @@ Tj py Yd yo -DW +if iD gU gU -Sr +IM ZL GQ GN @@ -38418,7 +37702,7 @@ Rr jQ KT qt -DW +if gU gU gU diff --git a/maps/new_varadero.json b/maps/new_varadero.json index 8d163a335d1f..d9d6a0d231cc 100644 --- a/maps/new_varadero.json +++ b/maps/new_varadero.json @@ -34,6 +34,7 @@ "xeno_hive_charlie": 0, "xeno_hive_delta": 0 }, + "camouflage": "jungle", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/override_ground.json b/maps/override_ground.json new file mode 100644 index 000000000000..94d3c70757e1 --- /dev/null +++ b/maps/override_ground.json @@ -0,0 +1,21 @@ +{ + "override_map": true, + "map_name": "Unknown", + "survivor_types": [ + "/datum/equipment_preset/survivor/civilian", + "/datum/equipment_preset/survivor/goon" + ], + "map_item_type": "/obj/item/map/big_red_map", + "announce_text": "We've lost contact with a Weyland-Yutani's research facility. The ###SHIPNAME### has been dispatched to assist.", + "monkey_types": [ + "neaera" + ], + "traits": [{ "Ground": true }], + "gamemodes": [ + "Distress Signal", + "Hunter Games", + "Hive Wars", + "Faction Clash", + "Infection" + ] +} diff --git a/maps/override_ship.json b/maps/override_ship.json new file mode 100644 index 000000000000..09bb02434998 --- /dev/null +++ b/maps/override_ship.json @@ -0,0 +1,5 @@ +{ + "override_map": true, + "map_name": "Ship", + "traits": [{"Marine Main Ship": true}] +} diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm index b3bdc834241a..467df24a94f4 100644 --- a/maps/predship/huntership.dmm +++ b/maps/predship/huntership.dmm @@ -876,9 +876,7 @@ /obj/structure/barricade/handrail/strata{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/yautja) "cd" = ( /obj/structure/surface/table/reinforced/prison{ @@ -1598,9 +1596,7 @@ /turf/closed/wall/huntership, /area/yautja) "dw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/yautja) "dI" = ( /turf/open/space/basic, @@ -1616,10 +1612,7 @@ dir = 4 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/yautja) "er" = ( /obj/structure/stairs/perspective{ @@ -2211,9 +2204,7 @@ /obj/structure/barricade/handrail/strata{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/yautja) "uO" = ( /obj/structure/bed/chair/hunter{ @@ -2300,10 +2291,7 @@ dir = 8 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/yautja) "xn" = ( /obj/structure/surface/table/reinforced/prison{ @@ -2371,9 +2359,7 @@ /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/yautja) "zA" = ( /turf/open/floor{ @@ -3044,7 +3030,7 @@ }, /area/yautja) "RS" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/yautja) "Sx" = ( /turf/open/floor{ @@ -3215,10 +3201,7 @@ /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/yautja) "XP" = ( /obj/structure/machinery/cryopod, diff --git a/maps/prison_station_fop.json b/maps/prison_station_fop.json index 7993346cbfad..b29f7255c21b 100644 --- a/maps/prison_station_fop.json +++ b/maps/prison_station_fop.json @@ -32,6 +32,7 @@ "xeno_hive_bravo": 0, "xeno_hive_charlie": 0 }, + "camouflage": "classic", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/runtime.json b/maps/runtime.json index a153f877e9f9..44aaea094dcb 100644 --- a/maps/runtime.json +++ b/maps/runtime.json @@ -6,5 +6,6 @@ "/datum/equipment_preset/survivor/scientist/lv" ], "traits": [{"Marine Main Ship": true}], + "camouflage": "classic", "disable_ship_map": true } diff --git a/maps/shivas_snowball.json b/maps/shivas_snowball.json index 902aa73e0894..412f0e35ff41 100644 --- a/maps/shivas_snowball.json +++ b/maps/shivas_snowball.json @@ -37,6 +37,7 @@ "xeno_hive_charlie": 0, "xeno_hive_delta": 0 }, + "camouflage": "snow", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/shuttles/trijentshuttle2.dmm b/maps/shuttles/trijentshuttle2.dmm index ccb1fc3902e8..c99ce5d16488 100644 --- a/maps/shuttles/trijentshuttle2.dmm +++ b/maps/shuttles/trijentshuttle2.dmm @@ -43,6 +43,17 @@ }, /turf/open/shuttle/escapepod, /area/shuttle/trijent_shuttle/elevator) +"n" = ( +/obj/structure/machinery/power/apc{ + dir = 1; + pixel_y = 26; + start_charge = 0 + }, +/obj/item/tool/wirecutters{ + pixel_y = -7 + }, +/turf/open/floor/plating, +/area/shuttle/trijent_shuttle/elevator) "o" = ( /obj/structure/bed/chair/dropship/passenger{ dir = 1 @@ -56,6 +67,14 @@ "q" = ( /turf/closed/shuttle/elevator/freight, /area/shuttle/trijent_shuttle/elevator) +"r" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + dir = 1 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/shuttle/escapepod, +/area/shuttle/trijent_shuttle/elevator) "s" = ( /turf/closed/shuttle/elevator{ dir = 4 @@ -79,6 +98,17 @@ dir = 8 }, /area/shuttle/trijent_shuttle/elevator) +"w" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/tool/screwdriver{ + layer = 3.6; + pixel_x = 9; + pixel_y = 8 + }, +/turf/open/shuttle/escapepod{ + icon_state = "floor11" + }, +/area/shuttle/trijent_shuttle/elevator) "A" = ( /turf/closed/shuttle/elevator{ dir = 9 @@ -91,6 +121,17 @@ }, /turf/open/shuttle/escapepod, /area/shuttle/trijent_shuttle/elevator) +"I" = ( +/obj/item/tool/crowbar/red{ + pixel_x = -13; + pixel_y = -13 + }, +/obj/item/stack/cable_coil{ + pixel_x = 1; + pixel_y = 10 + }, +/turf/open/shuttle/escapepod, +/area/shuttle/trijent_shuttle/elevator) "J" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -100,6 +141,18 @@ icon_state = "rasputin15" }, /area/shuttle/trijent_shuttle/elevator) +"O" = ( +/obj/item/limb/hand/r_hand, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/shuttle/escapepod, +/area/shuttle/trijent_shuttle/elevator) +"P" = ( +/obj/item/storage/toolbox/mechanical/green{ + pixel_y = 8 + }, +/obj/item/circuitboard/apc, +/turf/open/shuttle/escapepod, +/area/shuttle/trijent_shuttle/elevator) "Q" = ( /turf/open/shuttle/escapepod{ icon_state = "floor11" @@ -124,11 +177,6 @@ icon_state = "E"; dir = 1 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 26; - start_charge = 0 - }, /turf/open/shuttle/escapepod, /area/shuttle/trijent_shuttle/elevator) "V" = ( @@ -158,30 +206,30 @@ h (2,1,1) = {" d R -l +r l t s "} (3,1,1) = {" k -a +I W c -a +O s "} (4,1,1) = {" q -a -Q +n +w Y a s "} (5,1,1) = {" u -a +P Q b a diff --git a/maps/sorokyne_strata.json b/maps/sorokyne_strata.json index ab0078e17b93..61c3a7fd3f69 100644 --- a/maps/sorokyne_strata.json +++ b/maps/sorokyne_strata.json @@ -33,6 +33,7 @@ "xeno_hive_bravo": 0, "xeno_hive_charlie": 70 }, + "camouflage": "snow", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/tents/tent_big.dmm b/maps/tents/tent_big.dmm new file mode 100644 index 000000000000..f341e67ce2aa --- /dev/null +++ b/maps/tents/tent_big.dmm @@ -0,0 +1,78 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/tent/big, +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"n" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/blocker/tent{ + dir = 1 + }, +/turf/template_noop, +/area/template_noop) +"s" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/turf/template_noop, +/area/template_noop) +"v" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/turf/template_noop, +/area/template_noop) +"x" = ( +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"G" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"J" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/blocker/tent{ + dir = 1 + }, +/turf/template_noop, +/area/template_noop) +"O" = ( +/turf/template_noop, +/area/template_noop) +"S" = ( +/obj/structure/blocker/tent{ + dir = 1 + }, +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +O +J +v +a +"} +(2,1,1) = {" +O +S +O +x +"} +(3,1,1) = {" +O +n +s +G +"} diff --git a/maps/tents/tent_cmd.dmm b/maps/tents/tent_cmd.dmm new file mode 100644 index 000000000000..e7260ca9bccf --- /dev/null +++ b/maps/tents/tent_cmd.dmm @@ -0,0 +1,73 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/bed/chair, +/turf/template_noop, +/area/template_noop) +"d" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/bed/chair, +/turf/template_noop, +/area/template_noop) +"o" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/surface/table, +/obj/structure/transmitter/tent{ + phone_category = "Command"; + phone_id = "Ground Command"; + pixel_x = -2; + pixel_y = 6 + }, +/turf/template_noop, +/area/template_noop) +"p" = ( +/turf/template_noop, +/area/template_noop) +"v" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"A" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/surface/table, +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/machinery/computer/overwatch/tent, +/turf/template_noop, +/area/template_noop) +"X" = ( +/obj/structure/tent/cmd, +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +p +A +a +X +"} +(2,1,1) = {" +p +o +d +v +"} diff --git a/maps/tents/tent_med.dmm b/maps/tents/tent_med.dmm new file mode 100644 index 000000000000..fcb446a68e25 --- /dev/null +++ b/maps/tents/tent_med.dmm @@ -0,0 +1,68 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/turf/template_noop, +/area/template_noop) +"o" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/bed/roller, +/turf/template_noop, +/area/template_noop) +"p" = ( +/turf/template_noop, +/area/template_noop) +"v" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/turf/template_noop, +/area/template_noop) +"A" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/bed/roller, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/tent{ + pixel_y = 22 + }, +/turf/template_noop, +/area/template_noop) +"H" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"X" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/tent/med, +/obj/structure/machinery/iv_drip, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +p +A +a +X +"} +(2,1,1) = {" +p +o +v +H +"} diff --git a/maps/tents/tent_reqs.dmm b/maps/tents/tent_reqs.dmm new file mode 100644 index 000000000000..7d9cf926e698 --- /dev/null +++ b/maps/tents/tent_reqs.dmm @@ -0,0 +1,108 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"c" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"d" = ( +/obj/structure/blocker/tent, +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/filingcabinet, +/turf/template_noop, +/area/template_noop) +"k" = ( +/obj/structure/surface/rack, +/turf/template_noop, +/area/template_noop) +"m" = ( +/obj/structure/tent/reqs, +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"n" = ( +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/machinery/cm_vending/sorted/vehicle_supply/tent, +/turf/template_noop, +/area/template_noop) +"w" = ( +/obj/structure/blocker/tent{ + dir = 1 + }, +/turf/template_noop, +/area/template_noop) +"B" = ( +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/bed/chair, +/obj/structure/transmitter/tent{ + pixel_y = 30; + pixel_x = 16; + phone_category = "Command"; + phone_id = "Ground Requisitions" + }, +/turf/template_noop, +/area/template_noop) +"J" = ( +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/machinery/computer/ordercomp/tent{ + pixel_y = 25 + }, +/turf/template_noop, +/area/template_noop) +"S" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/surface/table, +/turf/template_noop, +/area/template_noop) +"U" = ( +/obj/structure/blocker/tent, +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +a +B +S +m +"} +(2,1,1) = {" +a +J +a +c +"} +(3,1,1) = {" +a +w +U +k +"} +(4,1,1) = {" +a +n +d +k +"} diff --git a/maps/whiskey_outpost_v2.json b/maps/whiskey_outpost_v2.json index f55f14d73ca6..4c8f2f6551e4 100644 --- a/maps/whiskey_outpost_v2.json +++ b/maps/whiskey_outpost_v2.json @@ -7,6 +7,7 @@ "perf_mode": 31, "disable_ship_map": true, "nightmare_path": "maps/Nightmare/maps/Whiskey_Outpost_v2/", + "camouflage": "desert", "gamemodes": [ "Whiskey Outpost" ] diff --git a/nano/templates/ert_shuttle_control_console.tmpl b/nano/templates/ert_shuttle_control_console.tmpl deleted file mode 100644 index 9ab626746e90..000000000000 --- a/nano/templates/ert_shuttle_control_console.tmpl +++ /dev/null @@ -1,90 +0,0 @@ -

Shuttle Status

-
- {{if data.shuttle_state != "crashed"}} -
- {{:data.shuttle_status}} -
- {{/if}} -
-
-
-
- {{if data.shuttle_state == "idle"}} - IDLE - {{else data.shuttle_state == "warmup"}} - SPINNING UP - {{else data.shuttle_state == "in_transit"}} - ENGAGED - {{else}} - ERROR - {{/if}} -
- {{if data.shuttle_state != "crashed" && data.recharge_time > 0}} - {{if data.shuttle_state == "idle"}} -
-
Recharge Status:
- {{if data.recharging > 0}} -
- The Shuttle Engines will be recharged in {{:data.recharging_seconds}} seconds. -
- {{else}} -
- The Shuttle Engines are ready to use. -
- {{/if}} -
- {{else}} -
- The Shuttle Engines are currently under use. -
- {{/if}} - {{/if}} -
-
- - -{{if data.has_docking && data.shuttle_state != "crashed"}} -
-
-
- Docking Status: -
-
- {{if data.docking_status == "docked"}} - DOCKED - {{else data.docking_status == "docking"}} - {{if !data.docking_override}} - DOCKING - {{else}} - DOCKING-MANUAL - {{/if}} - {{else data.docking_status == "undocking"}} - {{if !data.docking_override}} - UNDOCKING - {{else}} - UNDOCKING-MANUAL - {{/if}} - {{else data.docking_status == "undocked"}} - UNDOCKED - {{else}} - ERROR - {{/if}} - -
-
-
-{{/if}} - -{{if data.shuttle_state != "crashed"}} -
-

Shuttle Control

-
-
- {{:helper.link('Launch Shuttle', 'arrowthickstop-1-e', {'move' : '1'}, data.can_launch? null : 'disabled' , null)}} - {{:helper.link('Select Docking Area', 'locked', {'select_dock' : '1'}, data.shuttle_state == "idle"? null : 'disabled' , null)}} -
-
-
-{{/if}} - - diff --git a/nano/templates/portable_vendor.tmpl b/nano/templates/portable_vendor.tmpl deleted file mode 100644 index d0e8f38a1faa..000000000000 --- a/nano/templates/portable_vendor.tmpl +++ /dev/null @@ -1,28 +0,0 @@ - - - -{{if data.show_points}} -
-

Points: {{:data.current_points}}/{{:data.max_points}}

-
-{{/if}} - -
- {{for data.displayed_records}} - {{if value.prod_color}} -
- {{:helper.link(value.prod_name, null, {'vend' : value.prod_index}, value.prod_available ? null : 'disabled', null)}} -
- {{else}} -
- {{:value.prod_name}} -
- {{/if}} - - {{if value.prod_desc}} -
- {{:value.prod_desc}} -
- {{/if}} - {{/for}} -
diff --git a/strings/metatips.txt b/strings/metatips.txt index 4b1acc2b534a..4b69af764aeb 100644 --- a/strings/metatips.txt +++ b/strings/metatips.txt @@ -6,9 +6,8 @@ Communication, be it from a marine to a marine, a drone to the queen, or command As an alien or marine, be careful of the flank, regardless of if the push is going well or stalling out. Half of getting good is knowing to be aggressive. The other half is knowing when not to be aggressive. Alt-click a storage item to draw the last item in it (last non-weapon if it's a weapon belt). Middle-click a storage item to inmediately open it, and middle-click structures to attempt to vault them. -Use "North, South, East, West" when referring to locations in-game rather than "up, down, left, right". +Use "North, South, West, East" when referring to locations in-game rather than "up, down, left, right". You shouldn't ignore what your allies are up to. Sometimes they can be organizing a flank in hivemind/radio, sometimes they can be walking up behind you with a slug-loaded shotgun. Either way, it pays to be alert to what they're doing, as much to as what the enemies are. The Wiki (https://cm-ss13.com/wiki) is a very useful repository of information about the game, such as weapons, equipment, xenomorph castes and their strains. It may not be fully up to date the majority of the time, but the basics are usually accurate. As an observer, you may see how much remaining hijack time is left in the status panel. Embrace the suck. -Any applied damage has a small chance of being a critical hit, reducing armor's reduction of it to its minimal efficiency. For some reason. diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js index e81fd5f75b63..a73003e13267 100644 --- a/tgui/packages/tgui-panel/chat/constants.js +++ b/tgui/packages/tgui-panel/chat/constants.js @@ -34,6 +34,7 @@ export const MESSAGE_TYPE_COMBAT = 'combat'; export const MESSAGE_TYPE_ADMINCHAT = 'adminchat'; export const MESSAGE_TYPE_MODCHAT = 'modchat'; export const MESSAGE_TYPE_MENTOR = 'mentor'; +export const MESSAGE_TYPE_STAFF_IC = 'staff_ic'; export const MESSAGE_TYPE_EVENTCHAT = 'eventchat'; export const MESSAGE_TYPE_ADMINLOG = 'adminlog'; export const MESSAGE_TYPE_ATTACKLOG = 'attacklog'; @@ -113,6 +114,12 @@ export const MESSAGE_TYPES = [ name: 'Unsorted', description: 'Everything we could not sort, always enabled', }, + { + type: MESSAGE_TYPE_STAFF_IC, + name: 'Staff IC', + description: 'IC interaction with staff', + selector: '.staff_ic', + }, // Admin stuff { type: MESSAGE_TYPE_ADMINCHAT, diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss index 5fc39895149e..28a5639e884d 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss @@ -456,6 +456,10 @@ em { color: #6685f5; } +.staff_ic { + color: #6685f5; +} + .tinynotice { color: #6685f5; font-size: 85%; diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss index 981b2dbfa73c..adbb56ed9b89 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss @@ -492,6 +492,10 @@ h2.alert { color: #000099; } +.staff_ic { + color: #000099; +} + .tinynotice { color: #000099; font-size: 85%; diff --git a/tgui/packages/tgui/interfaces/HealthScan.js b/tgui/packages/tgui/interfaces/HealthScan.js index cf3e8e59eab9..861b26416cac 100644 --- a/tgui/packages/tgui/interfaces/HealthScan.js +++ b/tgui/packages/tgui/interfaces/HealthScan.js @@ -27,7 +27,6 @@ export const HealthScan = (props, context) => { has_blood, body_temperature, pulse, - internal_bleeding, implants, core_fracture, lung_ruptured, @@ -194,19 +193,12 @@ export const HealthScan = (props, context) => { {pulse} - {internal_bleeding || - implants || + {implants || hugged || core_fracture || (lung_ruptured && bodyscanner) ? ( ) : null} - {internal_bleeding ? ( - - Internal Bleeding Detected! - {healthanalyser ? ' Advanced scanner required for location.' : ''} - - ) : null} {implants && detail_level !== 1 ? ( {implants} embedded object{implants > 1 ? 's' : ''} detected! @@ -353,7 +345,7 @@ const ScannerLimbs = (props, context) => { [Bleeding] ) : null} - {limb.internal_bleeding && bodyscanner ? ( + {limb.internal_bleeding ? ( [Internal Bleeding] diff --git a/tgui/packages/tgui/interfaces/PortableVendor.tsx b/tgui/packages/tgui/interfaces/PortableVendor.tsx new file mode 100644 index 000000000000..22ba3b69e548 --- /dev/null +++ b/tgui/packages/tgui/interfaces/PortableVendor.tsx @@ -0,0 +1,81 @@ +import { useBackend } from '../backend'; +import { Button, Icon, ProgressBar, Stack, Tooltip } from '../components'; +import { Window } from '../layouts'; + +interface PortableVendorProduct { + index: number; + name: string; + cost: number; + color: string; + description: string; + available: boolean; +} + +interface PortableVendorProps { + show_points: boolean; + current_points: number; + max_points: number; + displayed_records: PortableVendorProduct[]; + name: string; +} + +interface RecordEntryProps { + record: PortableVendorProduct; +} + +const PointCounter = (props, context) => { + const { act, data } = useBackend(context); + + return ( + + + {data.current_points} points + + + ); +}; + +const RecordEntry = (props: RecordEntryProps, context) => { + const { act, data } = useBackend(context); + const { record } = props; + + if (!record.description) { + return {record.name}; + } + + return ( + + + + + + + + + + + ); +}; + +export const PortableVendor = (props, context) => { + const { act, data } = useBackend(context); + + return ( + + + + {data.show_points && } + {data.displayed_records.map((record) => { + return ( + + + + ); + })} + + + + ); +}; diff --git a/tgui/public/tgui-panel.bundle.css b/tgui/public/tgui-panel.bundle.css index 826d32cc4a85..55b4a50946c5 100644 --- a/tgui/public/tgui-panel.bundle.css +++ b/tgui/public/tgui-panel.bundle.css @@ -1,2 +1,2 @@ -html,body{box-sizing:border-box;height:100%;margin:0;font-size:12px}html{overflow:hidden;cursor:default}body{overflow:auto;font-family:Verdana,Geneva,sans-serif}*,*:before,*:after{box-sizing:inherit}h1,h2,h3,h4,h5,h6{display:block;margin:0;padding:6px 0;padding:.5rem 0}h1{font-size:18px;font-size:1.5rem}h2{font-size:16px;font-size:1.333rem}h3{font-size:14px;font-size:1.167rem}h4{font-size:12px;font-size:1rem}td,th{vertical-align:baseline;text-align:left}.candystripe:nth-child(odd){background-color:rgba(0,0,0,.25)}.color-black{color:#1a1a1a !important}.color-white{color:#fff !important}.color-red{color:#df3e3e !important}.color-orange{color:#f37f33 !important}.color-yellow{color:#fbda21 !important}.color-olive{color:#cbe41c !important}.color-green{color:#25ca4c !important}.color-teal{color:#00d6cc !important}.color-blue{color:#2e93de !important}.color-dark-blue{color:#005fa7 !important}.color-violet{color:#7349cf !important}.color-purple{color:#ad45d0 !important}.color-pink{color:#e34da1 !important}.color-brown{color:#b97447 !important}.color-grey{color:#848484 !important}.color-light-grey{color:#b3b3b3 !important}.color-good{color:#68c22d !important}.color-average{color:#f29a29 !important}.color-bad{color:#df3e3e !important}.color-label{color:#8b9bb0 !important}.color-xeno{color:#664573 !important}.color-bg-black{background-color:#000 !important}.color-bg-white{background-color:#d9d9d9 !important}.color-bg-red{background-color:#bd2020 !important}.color-bg-orange{background-color:#d95e0c !important}.color-bg-yellow{background-color:#d9b804 !important}.color-bg-olive{background-color:#9aad14 !important}.color-bg-green{background-color:#1b9638 !important}.color-bg-teal{background-color:#009a93 !important}.color-bg-blue{background-color:#1c71b1 !important}.color-bg-dark-blue{background-color:#003e6e !important}.color-bg-violet{background-color:#552dab !important}.color-bg-purple{background-color:#8b2baa !important}.color-bg-pink{background-color:#cf2082 !important}.color-bg-brown{background-color:#8c5836 !important}.color-bg-grey{background-color:#646464 !important}.color-bg-light-grey{background-color:#919191 !important}.color-bg-good{background-color:#4d9121 !important}.color-bg-average{background-color:#cd7a0d !important}.color-bg-bad{background-color:#bd2020 !important}.color-bg-label{background-color:#657a94 !important}.color-bg-xeno{background-color:#462f4e !important}.debug-layout,.debug-layout *:not(g):not(path){color:rgba(255,255,255,.9) !important;background:transparent !important;outline:1px solid rgba(255,255,255,.5) !important;box-shadow:none !important;filter:none !important}.debug-layout:hover,.debug-layout *:not(g):not(path):hover{outline-color:rgba(255,255,255,.8) !important}.outline-dotted{outline-style:dotted !important}.outline-dashed{outline-style:dashed !important}.outline-solid{outline-style:solid !important}.outline-double{outline-style:double !important}.outline-groove{outline-style:groove !important}.outline-ridge{outline-style:ridge !important}.outline-inset{outline-style:inset !important}.outline-outset{outline-style:outset !important}.outline-color-black{outline:.167rem solid #1a1a1a !important}.outline-color-white{outline:.167rem solid #fff !important}.outline-color-red{outline:.167rem solid #df3e3e !important}.outline-color-orange{outline:.167rem solid #f37f33 !important}.outline-color-yellow{outline:.167rem solid #fbda21 !important}.outline-color-olive{outline:.167rem solid #cbe41c !important}.outline-color-green{outline:.167rem solid #25ca4c !important}.outline-color-teal{outline:.167rem solid #00d6cc !important}.outline-color-blue{outline:.167rem solid #2e93de !important}.outline-color-dark-blue{outline:.167rem solid #005fa7 !important}.outline-color-violet{outline:.167rem solid #7349cf !important}.outline-color-purple{outline:.167rem solid #ad45d0 !important}.outline-color-pink{outline:.167rem solid #e34da1 !important}.outline-color-brown{outline:.167rem solid #b97447 !important}.outline-color-grey{outline:.167rem solid #848484 !important}.outline-color-light-grey{outline:.167rem solid #b3b3b3 !important}.outline-color-good{outline:.167rem solid #68c22d !important}.outline-color-average{outline:.167rem solid #f29a29 !important}.outline-color-bad{outline:.167rem solid #df3e3e !important}.outline-color-label{outline:.167rem solid #8b9bb0 !important}.outline-color-xeno{outline:.167rem solid #664573 !important}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.text-baseline{text-align:baseline}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-pre{white-space:pre}.text-bold{font-weight:bold}.text-italic{font-style:italic}.text-underline{text-decoration:underline}.BlockQuote{color:#8b9bb0;border-left:.1666666667em solid #8b9bb0;padding-left:.5em;margin-bottom:.5em}.BlockQuote:last-child{margin-bottom:0}.Button{position:relative;display:inline-block;line-height:1.667em;padding:0 .5em;margin-right:.1666666667em;white-space:nowrap;outline:0;border-radius:.16em;margin-bottom:.1666666667em;user-select:none;-ms-user-select:none}.Button:last-child{margin-right:0;margin-bottom:0}.Button .fa,.Button .fas,.Button .far{margin-left:-0.25em;margin-right:-0.25em;min-width:1.333em;text-align:center}.Button--hasContent .fa,.Button--hasContent .fas,.Button--hasContent .far{margin-right:.25em}.Button--hasContent.Button--iconPosition--right .fa,.Button--hasContent.Button--iconPosition--right .fas,.Button--hasContent.Button--iconPosition--right .far{margin-right:0px;margin-left:3px}.Button--ellipsis{overflow:hidden;text-overflow:ellipsis}.Button--fluid{display:block;margin-left:0;margin-right:0}.Button--circular{border-radius:50%}.Button--compact{padding:0 .25em;line-height:1.333em}.Button--color--black{transition:color 50ms,background-color 50ms;background-color:#000;color:#fff}.Button--color--black:hover{transition:color 0ms,background-color 0ms}.Button--color--black:focus{transition:color 100ms,background-color 100ms}.Button--color--black:hover,.Button--color--black:focus{background-color:#131313;color:#fff}.Button--color--white{transition:color 50ms,background-color 50ms;background-color:#d9d9d9;color:#000}.Button--color--white:hover{transition:color 0ms,background-color 0ms}.Button--color--white:focus{transition:color 100ms,background-color 100ms}.Button--color--white:hover,.Button--color--white:focus{background-color:#f8f8f8;color:#000}.Button--color--red{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--red:hover{transition:color 0ms,background-color 0ms}.Button--color--red:focus{transition:color 100ms,background-color 100ms}.Button--color--red:hover,.Button--color--red:focus{background-color:#dc4848;color:#fff}.Button--color--orange{transition:color 50ms,background-color 50ms;background-color:#d95e0c;color:#fff}.Button--color--orange:hover{transition:color 0ms,background-color 0ms}.Button--color--orange:focus{transition:color 100ms,background-color 100ms}.Button--color--orange:hover,.Button--color--orange:focus{background-color:#f0853f;color:#fff}.Button--color--yellow{transition:color 50ms,background-color 50ms;background-color:#d9b804;color:#000}.Button--color--yellow:hover{transition:color 0ms,background-color 0ms}.Button--color--yellow:focus{transition:color 100ms,background-color 100ms}.Button--color--yellow:hover,.Button--color--yellow:focus{background-color:#f5d72e;color:#000}.Button--color--olive{transition:color 50ms,background-color 50ms;background-color:#9aad14;color:#fff}.Button--color--olive:hover{transition:color 0ms,background-color 0ms}.Button--color--olive:focus{transition:color 100ms,background-color 100ms}.Button--color--olive:hover,.Button--color--olive:focus{background-color:#c4da2b;color:#fff}.Button--color--green{transition:color 50ms,background-color 50ms;background-color:#1b9638;color:#fff}.Button--color--green:hover{transition:color 0ms,background-color 0ms}.Button--color--green:focus{transition:color 100ms,background-color 100ms}.Button--color--green:hover,.Button--color--green:focus{background-color:#32c154;color:#fff}.Button--color--teal{transition:color 50ms,background-color 50ms;background-color:#009a93;color:#fff}.Button--color--teal:hover{transition:color 0ms,background-color 0ms}.Button--color--teal:focus{transition:color 100ms,background-color 100ms}.Button--color--teal:hover,.Button--color--teal:focus{background-color:#13c4bc;color:#fff}.Button--color--blue{transition:color 50ms,background-color 50ms;background-color:#1c71b1;color:#fff}.Button--color--blue:hover{transition:color 0ms,background-color 0ms}.Button--color--blue:focus{transition:color 100ms,background-color 100ms}.Button--color--blue:hover,.Button--color--blue:focus{background-color:#3a95d9;color:#fff}.Button--color--dark-blue{transition:color 50ms,background-color 50ms;background-color:#003e6e;color:#fff}.Button--color--dark-blue:hover{transition:color 0ms,background-color 0ms}.Button--color--dark-blue:focus{transition:color 100ms,background-color 100ms}.Button--color--dark-blue:hover,.Button--color--dark-blue:focus{background-color:#135b92;color:#fff}.Button--color--violet{transition:color 50ms,background-color 50ms;background-color:#552dab;color:#fff}.Button--color--violet:hover{transition:color 0ms,background-color 0ms}.Button--color--violet:focus{transition:color 100ms,background-color 100ms}.Button--color--violet:hover,.Button--color--violet:focus{background-color:#7953cc;color:#fff}.Button--color--purple{transition:color 50ms,background-color 50ms;background-color:#8b2baa;color:#fff}.Button--color--purple:hover{transition:color 0ms,background-color 0ms}.Button--color--purple:focus{transition:color 100ms,background-color 100ms}.Button--color--purple:hover,.Button--color--purple:focus{background-color:#ad4fcd;color:#fff}.Button--color--pink{transition:color 50ms,background-color 50ms;background-color:#cf2082;color:#fff}.Button--color--pink:hover{transition:color 0ms,background-color 0ms}.Button--color--pink:focus{transition:color 100ms,background-color 100ms}.Button--color--pink:hover,.Button--color--pink:focus{background-color:#e257a5;color:#fff}.Button--color--brown{transition:color 50ms,background-color 50ms;background-color:#8c5836;color:#fff}.Button--color--brown:hover{transition:color 0ms,background-color 0ms}.Button--color--brown:focus{transition:color 100ms,background-color 100ms}.Button--color--brown:hover,.Button--color--brown:focus{background-color:#b47851;color:#fff}.Button--color--grey{transition:color 50ms,background-color 50ms;background-color:#646464;color:#fff}.Button--color--grey:hover{transition:color 0ms,background-color 0ms}.Button--color--grey:focus{transition:color 100ms,background-color 100ms}.Button--color--grey:hover,.Button--color--grey:focus{background-color:#868686;color:#fff}.Button--color--light-grey{transition:color 50ms,background-color 50ms;background-color:#919191;color:#fff}.Button--color--light-grey:hover{transition:color 0ms,background-color 0ms}.Button--color--light-grey:focus{transition:color 100ms,background-color 100ms}.Button--color--light-grey:hover,.Button--color--light-grey:focus{background-color:#bababa;color:#fff}.Button--color--good{transition:color 50ms,background-color 50ms;background-color:#4d9121;color:#fff}.Button--color--good:hover{transition:color 0ms,background-color 0ms}.Button--color--good:focus{transition:color 100ms,background-color 100ms}.Button--color--good:hover,.Button--color--good:focus{background-color:#6cba39;color:#fff}.Button--color--average{transition:color 50ms,background-color 50ms;background-color:#cd7a0d;color:#fff}.Button--color--average:hover{transition:color 0ms,background-color 0ms}.Button--color--average:focus{transition:color 100ms,background-color 100ms}.Button--color--average:hover,.Button--color--average:focus{background-color:#ed9d35;color:#fff}.Button--color--bad{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--bad:hover{transition:color 0ms,background-color 0ms}.Button--color--bad:focus{transition:color 100ms,background-color 100ms}.Button--color--bad:hover,.Button--color--bad:focus{background-color:#dc4848;color:#fff}.Button--color--label{transition:color 50ms,background-color 50ms;background-color:#657a94;color:#fff}.Button--color--label:hover{transition:color 0ms,background-color 0ms}.Button--color--label:focus{transition:color 100ms,background-color 100ms}.Button--color--label:hover,.Button--color--label:focus{background-color:#91a1b3;color:#fff}.Button--color--xeno{transition:color 50ms,background-color 50ms;background-color:#462f4e;color:#fff}.Button--color--xeno:hover{transition:color 0ms,background-color 0ms}.Button--color--xeno:focus{transition:color 100ms,background-color 100ms}.Button--color--xeno:hover,.Button--color--xeno:focus{background-color:#64496d;color:#fff}.Button--color--default{transition:color 50ms,background-color 50ms;background-color:#3e6189;color:#fff}.Button--color--default:hover{transition:color 0ms,background-color 0ms}.Button--color--default:focus{transition:color 100ms,background-color 100ms}.Button--color--default:hover,.Button--color--default:focus{background-color:#5c83b0;color:#fff}.Button--color--caution{transition:color 50ms,background-color 50ms;background-color:#d9b804;color:#000}.Button--color--caution:hover{transition:color 0ms,background-color 0ms}.Button--color--caution:focus{transition:color 100ms,background-color 100ms}.Button--color--caution:hover,.Button--color--caution:focus{background-color:#f5d72e;color:#000}.Button--color--danger{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--danger:hover{transition:color 0ms,background-color 0ms}.Button--color--danger:focus{transition:color 100ms,background-color 100ms}.Button--color--danger:hover,.Button--color--danger:focus{background-color:#dc4848;color:#fff}.Button--color--transparent{transition:color 50ms,background-color 50ms;background-color:#202020;color:#fff;background-color:rgba(32,32,32,0);color:rgba(255,255,255,.5)}.Button--color--transparent:hover{transition:color 0ms,background-color 0ms}.Button--color--transparent:focus{transition:color 100ms,background-color 100ms}.Button--color--transparent:hover,.Button--color--transparent:focus{background-color:#383838;color:#fff}.Button--disabled{background-color:#999 !important}.Button--selected{transition:color 50ms,background-color 50ms;background-color:#1b9638;color:#fff}.Button--selected:hover{transition:color 0ms,background-color 0ms}.Button--selected:focus{transition:color 100ms,background-color 100ms}.Button--selected:hover,.Button--selected:focus{background-color:#32c154;color:#fff}.Button--flex{display:inline-flex;flex-direction:column}.Button--flex--fluid{width:100%}.Button--verticalAlignContent--top{justify-content:flex-start}.Button--verticalAlignContent--middle{justify-content:center}.Button--verticalAlignContent--bottom{justify-content:flex-end}.Button__content{display:block;align-self:stretch}.ColorBox{display:inline-block;width:1em;height:1em;line-height:1em;text-align:center}.Dimmer{display:flex;justify-content:center;align-items:center;position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(0,0,0,.75);z-index:1}.Divider--horizontal{margin:.5em 0}.Divider--horizontal:not(.Divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Divider--vertical{height:100%;margin:0 .5em}.Divider--vertical:not(.Divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Dropdown{position:relative}.Dropdown__control{position:relative;display:inline-block;font-family:Verdana,sans-serif;font-size:1em;width:8.3333333333em;line-height:1.4166666667em;user-select:none}.Dropdown__arrow-button{float:right;padding-left:.35em;width:1.2em;height:1.8333333333em;border-left:.0833333333em solid #000;border-left:.0833333333em solid rgba(0,0,0,.25)}.Dropdown__menu{position:absolute;overflow-y:auto;z-index:5;width:8.3333333333em;max-height:16.6666666667em;overflow-y:scroll;border-radius:0 0 .1666666667em .1666666667em;color:#fff;background-color:#000;background-color:rgba(0,0,0,.75)}.Dropdown__menu-noscroll{position:absolute;overflow-y:auto;z-index:5;width:8.3333333333em;max-height:16.6666666667em;border-radius:0 0 .1666666667em .1666666667em;color:#fff;background-color:#000;background-color:rgba(0,0,0,.75)}.Dropdown__menuentry{padding:.1666666667em .3333333333em;font-family:Verdana,sans-serif;font-size:1em;line-height:1.4166666667em;transition:background-color 100ms ease-out}.Dropdown__menuentry:hover{background-color:rgba(255,255,255,.2);transition:background-color 0ms}.Dropdown__over{top:auto;bottom:100%}.Dropdown__selected-text{display:inline-block;text-overflow:ellipsis;white-space:nowrap;height:1.4166666667em;width:calc(100% - 1.2em)}.Flex{display:-ms-flexbox;display:flex}.Flex--inline{display:inline-flex}.Flex--iefix{display:block}.Flex--iefix.Flex--inline{display:inline-block}.Flex__item--iefix{display:inline-block}.Flex--iefix--column>.Flex__item--iefix{display:block}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:transparent}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:"Consolas",monospace}.Knob{position:relative;font-size:1rem;width:2.6em;height:2.6em;margin:0 auto;margin-bottom:-0.2em;cursor:n-resize}.Knob:after{content:".";color:transparent;line-height:2.5em}.Knob__circle{position:absolute;top:.1em;bottom:.1em;left:.1em;right:.1em;margin:.3em;background-color:#333;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 0.15) 0%, rgba(255, 255, 255, 0) 100%);border-radius:50%;box-shadow:0 .05em .5em 0 rgba(0,0,0,.5)}.Knob__cursorBox{position:absolute;top:0;bottom:0;left:0;right:0}.Knob__cursor{position:relative;top:.05em;margin:0 auto;width:.2em;height:.8em;background-color:rgba(255,255,255,.9)}.Knob__popupValue{position:absolute;top:-2rem;right:50%;font-size:1rem;text-align:center;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.Knob__ring{position:absolute;top:0;bottom:0;left:0;right:0;padding:.1em}.Knob__ringTrackPivot{transform:rotateZ(135deg)}.Knob__ringTrack{fill:transparent;stroke:rgba(255,255,255,.1);stroke-width:8;stroke-linecap:round;stroke-dasharray:235.62}.Knob__ringFillPivot{transform:rotateZ(135deg)}.Knob--bipolar .Knob__ringFillPivot{transform:rotateZ(270deg)}.Knob__ringFill{fill:transparent;stroke:#6a96c9;stroke-width:8;stroke-linecap:round;stroke-dasharray:314.16;transition:stroke 50ms ease-out}.Knob--color--black .Knob__ringFill{stroke:#1a1a1a}.Knob--color--white .Knob__ringFill{stroke:#fff}.Knob--color--red .Knob__ringFill{stroke:#df3e3e}.Knob--color--orange .Knob__ringFill{stroke:#f37f33}.Knob--color--yellow .Knob__ringFill{stroke:#fbda21}.Knob--color--olive .Knob__ringFill{stroke:#cbe41c}.Knob--color--green .Knob__ringFill{stroke:#25ca4c}.Knob--color--teal .Knob__ringFill{stroke:#00d6cc}.Knob--color--blue .Knob__ringFill{stroke:#2e93de}.Knob--color--dark-blue .Knob__ringFill{stroke:#005fa7}.Knob--color--violet .Knob__ringFill{stroke:#7349cf}.Knob--color--purple .Knob__ringFill{stroke:#ad45d0}.Knob--color--pink .Knob__ringFill{stroke:#e34da1}.Knob--color--brown .Knob__ringFill{stroke:#b97447}.Knob--color--grey .Knob__ringFill{stroke:#848484}.Knob--color--light-grey .Knob__ringFill{stroke:#b3b3b3}.Knob--color--good .Knob__ringFill{stroke:#68c22d}.Knob--color--average .Knob__ringFill{stroke:#f29a29}.Knob--color--bad .Knob__ringFill{stroke:#df3e3e}.Knob--color--label .Knob__ringFill{stroke:#8b9bb0}.Knob--color--xeno .Knob__ringFill{stroke:#664573}.LabeledList{display:table;width:100%;width:calc(100% + 1em);border-collapse:collapse;border-spacing:0;margin:-0.25em -0.5em;margin-bottom:0;padding:0}.LabeledList__row{display:table-row}.LabeledList__row:last-child .LabeledList__cell{padding-bottom:0}.LabeledList__cell{display:table-cell;margin:0;padding:.25em .5em;border:0;text-align:left}.LabeledList__label--nowrap{width:1%;white-space:nowrap;min-width:5em}.LabeledList__buttons{width:.1%;white-space:nowrap;text-align:right;padding-top:.0833333333em;padding-bottom:0}.Modal{background-color:#202020;max-width:calc(100% - 1rem);padding:1rem}.NoticeBox{padding:.33em .5em;margin-bottom:.5em;box-shadow:none;font-weight:bold;font-style:italic;color:#000;background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg, transparent, transparent 0.8333333333em, rgba(0, 0, 0, 0.1) 0.8333333333em, rgba(0, 0, 0, 0.1) 1.6666666667em)}.NoticeBox--color--black{color:#fff;background-color:#000}.NoticeBox--color--white{color:#000;background-color:#b3b3b3}.NoticeBox--color--red{color:#fff;background-color:#701f1f}.NoticeBox--color--orange{color:#fff;background-color:#854114}.NoticeBox--color--yellow{color:#000;background-color:#83710d}.NoticeBox--color--olive{color:#000;background-color:#576015}.NoticeBox--color--green{color:#fff;background-color:#174e24}.NoticeBox--color--teal{color:#fff;background-color:#064845}.NoticeBox--color--blue{color:#fff;background-color:#1b4565}.NoticeBox--color--dark-blue{color:#fff;background-color:#02121f}.NoticeBox--color--violet{color:#fff;background-color:#3b2864}.NoticeBox--color--purple{color:#fff;background-color:#542663}.NoticeBox--color--pink{color:#fff;background-color:#802257}.NoticeBox--color--brown{color:#fff;background-color:#4c3729}.NoticeBox--color--grey{color:#fff;background-color:#3e3e3e}.NoticeBox--color--light-grey{color:#fff;background-color:#6a6a6a}.NoticeBox--color--good{color:#fff;background-color:#2e4b1a}.NoticeBox--color--average{color:#fff;background-color:#7b4e13}.NoticeBox--color--bad{color:#fff;background-color:#701f1f}.NoticeBox--color--label{color:#fff;background-color:#53565a}.NoticeBox--color--xeno{color:#fff;background-color:#19161b}.NoticeBox--type--info{color:#fff;background-color:#235982}.NoticeBox--type--success{color:#fff;background-color:#1e662f}.NoticeBox--type--warning{color:#fff;background-color:#a95219}.NoticeBox--type--danger{color:#fff;background-color:#8f2828}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:transparent}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:"Consolas",monospace}.NumberInput{position:relative;display:inline-block;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#88bfff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;text-align:right;overflow:visible;cursor:n-resize}.NumberInput--fluid{display:block}.NumberInput__content{margin-left:.5em}.NumberInput__barContainer{position:absolute;top:.1666666667em;bottom:.1666666667em;left:.1666666667em}.NumberInput__bar{position:absolute;bottom:0;left:0;width:.25em;box-sizing:border-box;border-bottom:.0833333333em solid #88bfff;background-color:#88bfff}.NumberInput__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:#0a0a0a;color:#fff;text-align:right}.ProgressBar{display:inline-block;position:relative;width:100%;padding:0 .5em;border-width:.0833333333em !important;border-style:solid !important;border-radius:.16em;background-color:rgba(0,0,0,0);transition:border-color 900ms ease-out}.ProgressBar__fill{position:absolute;top:-0.5px;left:0px;bottom:-0.5px}.ProgressBar__fill--animated{transition:background-color 900ms ease-out,width 900ms ease-out}.ProgressBar__content{position:relative;line-height:1.4166666667em;width:100%;text-align:right}.ProgressBar--color--default{border:.0833333333em solid #3e6189}.ProgressBar--color--default .ProgressBar__fill{background-color:#3e6189}.ProgressBar--color--black{border-color:#000 !important}.ProgressBar--color--black .ProgressBar__fill{background-color:#000}.ProgressBar--color--white{border-color:#d9d9d9 !important}.ProgressBar--color--white .ProgressBar__fill{background-color:#d9d9d9}.ProgressBar--color--red{border-color:#bd2020 !important}.ProgressBar--color--red .ProgressBar__fill{background-color:#bd2020}.ProgressBar--color--orange{border-color:#d95e0c !important}.ProgressBar--color--orange .ProgressBar__fill{background-color:#d95e0c}.ProgressBar--color--yellow{border-color:#d9b804 !important}.ProgressBar--color--yellow .ProgressBar__fill{background-color:#d9b804}.ProgressBar--color--olive{border-color:#9aad14 !important}.ProgressBar--color--olive .ProgressBar__fill{background-color:#9aad14}.ProgressBar--color--green{border-color:#1b9638 !important}.ProgressBar--color--green .ProgressBar__fill{background-color:#1b9638}.ProgressBar--color--teal{border-color:#009a93 !important}.ProgressBar--color--teal .ProgressBar__fill{background-color:#009a93}.ProgressBar--color--blue{border-color:#1c71b1 !important}.ProgressBar--color--blue .ProgressBar__fill{background-color:#1c71b1}.ProgressBar--color--dark-blue{border-color:#003e6e !important}.ProgressBar--color--dark-blue .ProgressBar__fill{background-color:#003e6e}.ProgressBar--color--violet{border-color:#552dab !important}.ProgressBar--color--violet .ProgressBar__fill{background-color:#552dab}.ProgressBar--color--purple{border-color:#8b2baa !important}.ProgressBar--color--purple .ProgressBar__fill{background-color:#8b2baa}.ProgressBar--color--pink{border-color:#cf2082 !important}.ProgressBar--color--pink .ProgressBar__fill{background-color:#cf2082}.ProgressBar--color--brown{border-color:#8c5836 !important}.ProgressBar--color--brown .ProgressBar__fill{background-color:#8c5836}.ProgressBar--color--grey{border-color:#646464 !important}.ProgressBar--color--grey .ProgressBar__fill{background-color:#646464}.ProgressBar--color--light-grey{border-color:#919191 !important}.ProgressBar--color--light-grey .ProgressBar__fill{background-color:#919191}.ProgressBar--color--good{border-color:#4d9121 !important}.ProgressBar--color--good .ProgressBar__fill{background-color:#4d9121}.ProgressBar--color--average{border-color:#cd7a0d !important}.ProgressBar--color--average .ProgressBar__fill{background-color:#cd7a0d}.ProgressBar--color--bad{border-color:#bd2020 !important}.ProgressBar--color--bad .ProgressBar__fill{background-color:#bd2020}.ProgressBar--color--label{border-color:#657a94 !important}.ProgressBar--color--label .ProgressBar__fill{background-color:#657a94}.ProgressBar--color--xeno{border-color:#462f4e !important}.ProgressBar--color--xeno .ProgressBar__fill{background-color:#462f4e}.Section{position:relative;margin-bottom:.5em;background-color:#131313;background-color:#131313;box-sizing:border-box}.Section:last-child{margin-bottom:0}.Section__title{position:relative;padding:.5em;border-bottom:.1666666667em solid #4972a1}.Section__titleText{font-size:1.1666666667em;font-weight:bold;color:#fff}.Section__buttons{position:absolute;display:inline-block;right:.5em;margin-top:-.0833333333em}.Section__rest{position:relative}.Section__content{padding:.66em .5em}.Section--fitted>.Section__rest>.Section__content{padding:0}.Section--fill{display:flex;flex-direction:column;height:100%}.Section--fill>.Section__rest{flex-grow:1}.Section--fill>.Section__rest>.Section__content{height:100%}.Section--fill.Section--scrollable>.Section__rest>.Section__content{position:absolute;top:0;left:0;right:0;bottom:0}.Section--fill.Section--iefix{display:table !important;width:100% !important;height:100% !important;border-collapse:collapse;border-spacing:0}.Section--fill.Section--iefix>.Section__rest{display:table-row !important;height:100% !important}.Section--scrollable{overflow-x:hidden;overflow-y:hidden}.Section--scrollable>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:hidden}.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:hidden;overflow-x:scroll}.Section--scrollable.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.Section--scrollable.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:scroll}.Section .Section{background-color:transparent;margin-left:-0.5em;margin-right:-0.5em}.Section .Section:first-child{margin-top:-0.5em}.Section .Section .Section__titleText{font-size:1.0833333333em}.Section .Section .Section .Section__titleText{font-size:1em}.Slider{cursor:e-resize}.Slider__cursorOffset{position:absolute;top:0;left:0;bottom:0;transition:none !important}.Slider__cursor{position:absolute;top:0;right:-.0833333333em;bottom:0;width:0;border-left:.1666666667em solid #fff}.Slider__pointer{position:absolute;right:-.4166666667em;bottom:-.3333333333em;width:0;height:0;border-left:.4166666667em solid transparent;border-right:.4166666667em solid transparent;border-bottom:.4166666667em solid #fff}.Slider__popupValue{position:absolute;right:0;top:-2rem;font-size:1rem;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.Divider--horizontal{margin:.5em 0}.Divider--horizontal:not(.Divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Divider--vertical{height:100%;margin:0 .5em}.Divider--vertical:not(.Divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Stack--fill{height:100%}.Stack--horizontal>.Stack__item{margin-left:.5em}.Stack--horizontal>.Stack__item:first-child{margin-left:0}.Stack--vertical>.Stack__item{margin-top:.5em}.Stack--vertical>.Stack__item:first-child{margin-top:0}.Stack--horizontal>.Stack__divider:not(.Stack__divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Stack--vertical>.Stack__divider:not(.Stack__divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Table{display:table;width:100%;border-collapse:collapse;border-spacing:0;margin:0}.Table--collapsing{width:auto}.Table__row{display:table-row}.Table__cell{display:table-cell;padding:0 .25em}.Table__cell:first-child{padding-left:0}.Table__cell:last-child{padding-right:0}.Table__row--header .Table__cell,.Table__cell--header{font-weight:bold;padding-bottom:.5em}.Table__cell--collapsing{width:1%;white-space:nowrap}.Tabs{display:flex;align-items:stretch;overflow:hidden;background-color:#131313}.Tabs--fill{height:100%}.Section .Tabs{background-color:transparent}.Section:not(.Section--fitted) .Tabs{margin:0 -0.5em .5em}.Section:not(.Section--fitted) .Tabs:first-child{margin-top:-0.5em}.Tabs--vertical{flex-direction:column;padding:.25em 0 .25em .25em}.Tabs--horizontal{margin-bottom:.5em;padding:.25em .25em 0 .25em}.Tabs--horizontal:last-child{margin-bottom:0}.Tabs__Tab{flex-grow:0}.Tabs--fluid .Tabs__Tab{flex-grow:1}.Tab{display:flex;align-items:center;justify-content:space-between;background-color:transparent;color:rgba(255,255,255,.5);min-height:2.25em;min-width:4em}.Tab:not(.Tab--selected):hover{background-color:rgba(255,255,255,.075)}.Tab--selected{background-color:rgba(255,255,255,.125);color:#dfe7f0}.Tab__text{flex-grow:1;margin:0 .5em}.Tab__left{min-width:1.5em;text-align:center;margin-left:.25em}.Tab__right{min-width:1.5em;text-align:center;margin-right:.25em}.Tabs--horizontal .Tab{border-top:.1666666667em solid transparent;border-bottom:.1666666667em solid transparent;border-top-left-radius:.25em;border-top-right-radius:.25em}.Tabs--horizontal .Tab--selected{border-bottom:.1666666667em solid #d4dfec}.Tabs--vertical .Tab{min-height:2em;border-left:.1666666667em solid transparent;border-right:.1666666667em solid transparent;border-top-left-radius:.25em;border-bottom-left-radius:.25em}.Tabs--vertical .Tab--selected{border-right:.1666666667em solid #d4dfec}.Tab--selected.Tab--color--black{color:#535353}.Tabs--horizontal .Tab--selected.Tab--color--black{border-bottom-color:#1a1a1a}.Tabs--vertical .Tab--selected.Tab--color--black{border-right-color:#1a1a1a}.Tab--selected.Tab--color--white{color:#fff}.Tabs--horizontal .Tab--selected.Tab--color--white{border-bottom-color:#fff}.Tabs--vertical .Tab--selected.Tab--color--white{border-right-color:#fff}.Tab--selected.Tab--color--red{color:#e76e6e}.Tabs--horizontal .Tab--selected.Tab--color--red{border-bottom-color:#df3e3e}.Tabs--vertical .Tab--selected.Tab--color--red{border-right-color:#df3e3e}.Tab--selected.Tab--color--orange{color:#f69f66}.Tabs--horizontal .Tab--selected.Tab--color--orange{border-bottom-color:#f37f33}.Tabs--vertical .Tab--selected.Tab--color--orange{border-right-color:#f37f33}.Tab--selected.Tab--color--yellow{color:#fce358}.Tabs--horizontal .Tab--selected.Tab--color--yellow{border-bottom-color:#fbda21}.Tabs--vertical .Tab--selected.Tab--color--yellow{border-right-color:#fbda21}.Tab--selected.Tab--color--olive{color:#d8eb55}.Tabs--horizontal .Tab--selected.Tab--color--olive{border-bottom-color:#cbe41c}.Tabs--vertical .Tab--selected.Tab--color--olive{border-right-color:#cbe41c}.Tab--selected.Tab--color--green{color:#53e074}.Tabs--horizontal .Tab--selected.Tab--color--green{border-bottom-color:#25ca4c}.Tabs--vertical .Tab--selected.Tab--color--green{border-right-color:#25ca4c}.Tab--selected.Tab--color--teal{color:#21fff5}.Tabs--horizontal .Tab--selected.Tab--color--teal{border-bottom-color:#00d6cc}.Tabs--vertical .Tab--selected.Tab--color--teal{border-right-color:#00d6cc}.Tab--selected.Tab--color--blue{color:#62aee6}.Tabs--horizontal .Tab--selected.Tab--color--blue{border-bottom-color:#2e93de}.Tabs--vertical .Tab--selected.Tab--color--blue{border-right-color:#2e93de}.Tab--selected.Tab--color--dark-blue{color:#008ffd}.Tabs--horizontal .Tab--selected.Tab--color--dark-blue{border-bottom-color:#005fa7}.Tabs--vertical .Tab--selected.Tab--color--dark-blue{border-right-color:#005fa7}.Tab--selected.Tab--color--violet{color:#9676db}.Tabs--horizontal .Tab--selected.Tab--color--violet{border-bottom-color:#7349cf}.Tabs--vertical .Tab--selected.Tab--color--violet{border-right-color:#7349cf}.Tab--selected.Tab--color--purple{color:#c274db}.Tabs--horizontal .Tab--selected.Tab--color--purple{border-bottom-color:#ad45d0}.Tabs--vertical .Tab--selected.Tab--color--purple{border-right-color:#ad45d0}.Tab--selected.Tab--color--pink{color:#ea79b9}.Tabs--horizontal .Tab--selected.Tab--color--pink{border-bottom-color:#e34da1}.Tabs--vertical .Tab--selected.Tab--color--pink{border-right-color:#e34da1}.Tab--selected.Tab--color--brown{color:#ca9775}.Tabs--horizontal .Tab--selected.Tab--color--brown{border-bottom-color:#b97447}.Tabs--vertical .Tab--selected.Tab--color--brown{border-right-color:#b97447}.Tab--selected.Tab--color--grey{color:#a3a3a3}.Tabs--horizontal .Tab--selected.Tab--color--grey{border-bottom-color:#848484}.Tabs--vertical .Tab--selected.Tab--color--grey{border-right-color:#848484}.Tab--selected.Tab--color--light-grey{color:#c6c6c6}.Tabs--horizontal .Tab--selected.Tab--color--light-grey{border-bottom-color:#b3b3b3}.Tabs--vertical .Tab--selected.Tab--color--light-grey{border-right-color:#b3b3b3}.Tab--selected.Tab--color--good{color:#8cd95a}.Tabs--horizontal .Tab--selected.Tab--color--good{border-bottom-color:#68c22d}.Tabs--vertical .Tab--selected.Tab--color--good{border-right-color:#68c22d}.Tab--selected.Tab--color--average{color:#f5b35e}.Tabs--horizontal .Tab--selected.Tab--color--average{border-bottom-color:#f29a29}.Tabs--vertical .Tab--selected.Tab--color--average{border-right-color:#f29a29}.Tab--selected.Tab--color--bad{color:#e76e6e}.Tabs--horizontal .Tab--selected.Tab--color--bad{border-bottom-color:#df3e3e}.Tabs--vertical .Tab--selected.Tab--color--bad{border-right-color:#df3e3e}.Tab--selected.Tab--color--label{color:#a8b4c4}.Tabs--horizontal .Tab--selected.Tab--color--label{border-bottom-color:#8b9bb0}.Tabs--vertical .Tab--selected.Tab--color--label{border-right-color:#8b9bb0}.Tab--selected.Tab--color--xeno{color:#9366a3}.Tabs--horizontal .Tab--selected.Tab--color--xeno{border-bottom-color:#664573}.Tabs--vertical .Tab--selected.Tab--color--xeno{border-right-color:#664573}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:transparent}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:"Consolas",monospace}.TextArea{position:relative;display:inline-block;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;background-color:#0a0a0a;margin-right:.1666666667em;line-height:1.4166666667em;box-sizing:border-box;width:100%}.TextArea--fluid{display:block;width:auto;height:auto}.TextArea--noborder{border:0px}.TextArea__textarea.TextArea__textarea--scrollable{overflow:auto;overflow-x:hidden;overflow-y:scroll}.TextArea__textarea{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;height:100%;font-size:1em;line-height:1.4166666667em;min-height:1.4166666667em;margin:0;padding:0 .5em;font-family:inherit;background-color:transparent;color:inherit;box-sizing:border-box;word-wrap:break-word;overflow:hidden}.TextArea__textarea:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.TextArea__textarea_custom{overflow:visible;white-space:pre-wrap}.Tooltip{z-index:2;padding:.5em .75em;pointer-events:none;text-align:left;transition:opacity 150ms ease-out;background-color:#000;color:#fff;box-shadow:.1em .1em 1.25em -0.1em rgba(0,0,0,.5);border-radius:.16em;max-width:20.8333333333em}.Chat{color:#abc6ec}.Chat__badge{display:inline-block;min-width:.5em;font-size:.7em;padding:.2em .3em;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:crimson;border-radius:10px;transition:font-size 200ms ease-out}.Chat__badge:before{content:"x"}.Chat__badge--animate{font-size:.9em;transition:font-size 0ms}.Chat__scrollButton{position:fixed;right:2em;bottom:1em}.Chat__reconnected{font-size:.85em;text-align:center;margin:1em 0 2em}.Chat__reconnected:before{content:"Reconnected";display:inline-block;border-radius:1em;padding:0 .7em;color:#db2828;background-color:#131313}.Chat__reconnected:after{content:"";display:block;margin-top:-0.75em;border-bottom:.1666666667em solid #db2828}.Chat__highlight{color:#000}.Chat__highlight--restricted{color:#fff;background-color:#a00;font-weight:bold}.ChatMessage{word-wrap:break-word}.ChatMessage--highlighted{position:relative;border-left:.1666666667em solid #fd4;padding-left:.5em}.ChatMessage--highlighted:after{content:"";position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(255,221,68,.1);pointer-events:none}.Ping{position:relative;padding:.125em .25em;border:.0833333333em solid rgba(140,140,140,.5);border-radius:.25em;width:3.75em;text-align:right}.Ping__indicator{content:"";position:absolute;top:.5em;left:.5em;width:.5em;height:.5em;background-color:#888;border-radius:.25em}.Notifications{position:absolute;bottom:1em;left:1em;right:2em}.Notification{color:#fff;background-color:crimson;padding:.5em;margin:1em 0}.Notification:first-child{margin-top:0}.Notification:last-child{margin-bottom:0}.Layout,.Layout *{scrollbar-base-color:#181818;scrollbar-face-color:#363636;scrollbar-3dlight-color:#202020;scrollbar-highlight-color:#202020;scrollbar-track-color:#181818;scrollbar-arrow-color:#909090;scrollbar-shadow-color:#363636}.Layout__content{position:absolute;top:0;bottom:0;left:0;right:0;overflow-x:hidden;overflow-y:hidden}.Layout__content--scrollable{overflow-y:scroll;margin-bottom:0}.Window{position:fixed;top:0;bottom:0;left:0;right:0;color:#fff;background-color:#202020;background-image:linear-gradient(to bottom, #202020 0%, #202020 100%)}.Window__titleBar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;height:2.6666666667rem}.Window__rest{position:fixed;top:32px;top:2.6666666667rem;bottom:0;left:0;right:0}.Window__contentPadding{margin:.5rem;height:100%;height:calc(100% - 1.01rem)}.Window__contentPadding:after{height:0}.Layout__content--scrollable .Window__contentPadding:after{display:block;content:"";height:.5rem}.Window__dimmer{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(56,56,56,.25);pointer-events:none}.Window__resizeHandle__se{position:fixed;bottom:0;right:0;width:20px;width:1.6666666667rem;height:20px;height:1.6666666667rem;cursor:se-resize}.Window__resizeHandle__s{position:fixed;bottom:0;left:0;right:0;height:6px;height:.5rem;cursor:s-resize}.Window__resizeHandle__e{position:fixed;top:0;bottom:0;right:0;width:3px;width:.25rem;cursor:e-resize}em{font-style:normal;font-weight:bold}img{margin:0;padding:0;line-height:1;-ms-interpolation-mode:nearest-neighbor;image-rendering:pixelated}img.icon{height:1em;min-height:16px;width:auto;vertical-align:bottom}a{color:#397ea5}a.visited{color:#7c00e6}a:visited{color:#7c00e6}a.popt{text-decoration:none}.popup{position:fixed;top:50%;left:50%;background:#ddd}.popup .close{position:absolute;background:#aaa;top:0;right:0;color:#333;text-decoration:none;z-index:2;padding:0 10px;height:30px;line-height:30px}.popup .close:hover{background:#999}.popup .head{background:#999;color:#ddd;padding:0 10px;height:30px;line-height:30px;text-transform:uppercase;font-size:.9em;font-weight:bold;border-bottom:2px solid green}.popup input{border:1px solid #999;background:#fff;margin:0;padding:5px;outline:none;color:#333}.popup input[type=text]:hover,.popup input[type=text]:active,.popup input[type=text]:focus{border-color:green}.popup input[type=submit]{padding:5px 10px;background:#999;color:#ddd;text-transform:uppercase;font-size:.9em;font-weight:bold}.popup input[type=submit]:hover,.popup input[type=submit]:focus,.popup input[type=submit]:active{background:#aaa;cursor:pointer}.changeFont{padding:10px}.changeFont a{display:block;text-decoration:none;padding:3px;color:#333}.changeFont a:hover{background:#ccc}.highlightPopup{padding:10px;text-align:center}.highlightPopup input[type=text]{display:block;width:215px;text-align:left;margin-top:5px}.highlightPopup input.highlightColor{background-color:#ff0}.highlightPopup input.highlightTermSubmit{margin-top:5px}.contextMenu{background-color:#ddd;position:fixed;margin:2px;width:150px}.contextMenu a{display:block;padding:2px 5px;text-decoration:none;color:#333}.contextMenu a:hover{background-color:#ccc}.filterMessages{padding:5px}.filterMessages div{padding:2px 0}.icon-stack{height:1em;line-height:1em;width:1em;vertical-align:middle;margin-top:-2px}.motd{color:#a4bad6;font-family:Verdana,sans-serif;white-space:normal}.motd h1,.motd h2,.motd h3,.motd h4,.motd h5,.motd h6{color:#a4bad6;text-decoration:underline}.motd a,.motd a:link,.motd a:visited,.motd a:active,.motd a:hover{color:#a4bad6}.bold,.name,.prefix,.ooc,.looc,.adminooc,.admin,.medal,.yell{font-weight:bold}.italic,.italics{font-style:italic}.highlight{background:#ff0}h1,h2,h3,h4,h5,h6{color:#a4bad6;font-family:Georgia,Verdana,sans-serif}h1.alert,h2.alert{color:#a4bad6}em{font-style:normal;font-weight:bold}.ooc{font-weight:bold}.adminobserverooc{color:#09c;font-weight:bold}.adminooc{color:#3d5bc3;font-weight:bold}.adminsay{color:#9611d4;font-weight:bold}.admin{color:#5975da;font-weight:bold}.name{font-weight:bold}.deadsay{color:#e2c1ff}.binarysay{color:#1e90ff}.binarysay a{color:lime}.binarysay a:active,.binarysay a:visited{color:#8f8}.radio{color:#1ecc43}.sciradio{color:#c68cfa}.comradio{color:#fcdf03}.secradio{color:#dd3535}.medradio{color:#57b8f0}.engradio{color:#f37746}.suppradio{color:#b88646}.servradio{color:#6ca729}.syndradio{color:#8f4a4b}.gangradio{color:#ac2ea1}.centcomradio{color:#2681a5}.aiprivradio{color:#d65d95}.redteamradio{color:#f44}.blueteamradio{color:#3434fd}.greenteamradio{color:#34fd34}.yellowteamradio{color:#fdfd34}.yell{font-weight:bold}.alert{color:#d82020}.userdanger{color:#c51e1e;font-weight:bold;font-size:185%}.bolddanger{color:#c51e1e;font-weight:bold}.danger{color:#c51e1e}.warning{color:#c51e1e;font-style:italic}.alertwarning{color:red;font-weight:bold}.boldwarning{color:#c51e1e;font-style:italic;font-weight:bold}.announce{color:#c51e1e;font-weight:bold}.boldannounce{color:#c51e1e;font-weight:bold}.minorannounce{font-weight:bold;font-size:185%}.greenannounce{color:#059223;font-weight:bold}.rose{color:#ff5050}.info{color:#9ab0ff}.notice{color:#6685f5}.tinynotice{color:#6685f5;font-size:85%}.tinynoticeital{color:#6685f5;font-style:italic;font-size:85%}.smallnotice{color:#6685f5;font-size:90%}.smallnoticeital{color:#6685f5;font-style:italic;font-size:90%}.boldnotice{color:#6685f5;font-weight:bold}.hear{color:#6685f5;font-style:italic}.adminnotice{color:#6685f5}.adminhelp{color:red;font-weight:bold}.unconscious{color:#a4bad6;font-weight:bold}.suicide{color:#ff5050;font-style:italic}.green{color:#059223}.grey{color:#838383}.red{color:red}.blue{color:#215cff}.nicegreen{color:#059223}.boldnicegreen{color:#059223;font-weight:bold}.cult{color:#973e3b}.cultitalic{color:#973e3b;font-style:italic}.cultbold{color:#973e3b;font-style:italic;font-weight:bold}.cultboldtalic{color:#973e3b;font-weight:bold;font-size:185%}.cultlarge{color:#973e3b;font-weight:bold;font-size:185%}.narsie{color:#973e3b;font-weight:bold;font-size:925%}.narsiesmall{color:#973e3b;font-weight:bold;font-size:370%}.colossus{color:#7f282a;font-size:310%}.hierophant{color:#b441ee;font-weight:bold;font-style:italic}.hierophant_warning{color:#c56bf1;font-style:italic}.purple{color:#9956d3}.holoparasite{color:#88809c}.revennotice{color:#c099e2}.revenboldnotice{color:#c099e2;font-weight:bold}.revenbignotice{color:#c099e2;font-weight:bold;font-size:185%}.revenminor{color:#823abb}.revenwarning{color:#760fbb;font-style:italic}.revendanger{color:#760fbb;font-weight:bold;font-size:185%}.deconversion_message{color:#a947ff;font-size:185%;font-style:italic}.ghostalert{color:#60f;font-style:italic;font-weight:bold}.alien{color:#855d85}.noticealien{color:#059223}.alertalien{color:#059223;font-weight:bold}.changeling{color:#059223;font-style:italic}.alertsyndie{color:red;font-size:185%;font-weight:bold}.spider{color:#80f;font-weight:bold;font-size:185%}.interface{color:#750e75}.sans{font-family:"Comic Sans MS",cursive,sans-serif}.papyrus{font-family:"Papyrus",cursive,sans-serif}.robot{font-family:"Courier New",cursive,sans-serif}.tape_recorder{color:red;font-family:"Courier New",cursive,sans-serif}.command_headset{font-weight:bold;font-size:160%}.small{font-size:60%}.big{font-size:185%}.reallybig{font-size:245%}.extremelybig{font-size:310%}.greentext{color:#059223;font-size:185%}.redtext{color:#c51e1e;font-size:185%}.clown{color:#ff70c1;font-size:160%;font-family:"Comic Sans MS",cursive,sans-serif;font-weight:bold}.singing{font-family:"Trebuchet MS",cursive,sans-serif;font-style:italic}.his_grace{color:#15d512;font-family:"Courier New",cursive,sans-serif;font-style:italic}.hypnophrase{color:#202020;font-weight:bold;animation:hypnocolor 1500ms infinite;animation-direction:alternate}@keyframes hypnocolor{0%{color:#202020}25%{color:#4b02ac}50%{color:#9f41f1}75%{color:#541c9c}100%{color:#7adbf3}}.phobia{color:#d00;font-weight:bold;animation:phobia 750ms infinite}@keyframes phobia{0%{color:#f75a5a}50%{color:#d00}100%{color:#f75a5a}}.icon{height:1em;width:auto}.bigicon{font-size:2.5em}.memo{color:#638500;text-align:center}.memoedit{text-align:center;font-size:125%}.abductor{color:#c204c2;font-style:italic}.mind_control{color:#df3da9;font-size:100%;font-weight:bold;font-style:italic}.slime{color:#00ced1}.drone{color:#848482}.monkey{color:#975032}.swarmer{color:#2c75ff}.resonate{color:#298f85}.monkeyhive{color:#a56408}.monkeylead{color:#af6805;font-size:80%}.connectionClosed,.fatalError{background:red;color:#fff;padding:5px}.connectionClosed.restored{background:green}.internal.boldnshit{color:#3d5bc3;font-weight:bold}.text-normal{font-weight:normal;font-style:normal}.hidden{display:none;visibility:hidden}.ml-1{margin-left:1em}.ml-2{margin-left:2em}.ml-3{margin-left:3em}.xooc{color:#ac04e9;font-weight:bold;font-size:140%}.mooc{color:#090;font-weight:bold;font-size:140%}.yooc{color:#999600;font-weight:bold;font-size:140%}.headminsay{color:#653d78;font-weight:bold}.radio{color:#b4b4b4}.deptradio{color:#939}.comradio{color:#779cc2}.centradio{color:#5c5c8a}.hcradio{color:#318779}.cryoradio{color:#ad6d48}.airadio{color:#f0f}.secradio{color:#a52929}.engradio{color:#a66300}.sentryradio{color:#844300}.sentryradio{color:#844300}.medradio{color:#008160}.supradio{color:#ba8e41}.jtacradio{color:#ad3b98}.intelradio{color:#027d02}.wyradio{color:#fe9b24}.pmcradio{color:#4dc5ce}.vairadio{color:#e3580e}.cmbradio{color:#1b748c}.clfradio{color:#8e83ca}.alpharadio{color:#db2626}.bravoradio{color:#c68610}.charlieradio{color:#a5a}.deltaradio{color:#007fcf}.echoradio{color:#3eb489}.medium{font-size:110%}.big{font-size:115%}.large{font-size:125%}.extra_large{font-size:130%}.huge{font-size:150%}.underline{text-decoration:underline}.orange{color:#eca100}.normal{font-style:normal}.attack{color:#ff3838}.moderate{color:#c00}.disarm{color:#900}.passive{color:#600}.helpful{color:#368f31}.scanner{color:#ff3838}.scannerb{color:#ff3838;font-weight:bold}.scannerburn{color:orange}.scannerburnb{color:orange;font-weight:bold}.rose{color:#ff5050}.debuginfo{color:#493d26;font-style:italic}.xenonotice{color:#51a16c}.xenoboldnotice{color:#51a16c;font-style:italic}.xenowarning{color:#51a16c;font-style:italic}.xenominorwarning{color:#51a16c;font-weight:bold;font-style:italic}.xenodanger{color:#51a16c;font-weight:bold}.avoidharm{color:#72a0e5;font-weight:bold}.highdanger{color:#ff3838;font-weight:bold;font-size:140%}.xenohighdanger{color:#51a16c;font-weight:bold;font-size:140%}.xenoannounce{color:#65c585;font-family:book-antiqua;font-weight:bold;font-size:140%}.yautjabold{color:purple;font-weight:bold}.yautjaboldbig{color:purple;font-weight:bold;font-size:120%}.objectivebig{font-weight:bold;font-size:130%}.objectivegreen{color:lime}.objectivered{color:red}.objectivesuccess{color:lime;font-weight:bold;font-size:110%}.objectivefail{color:red;font-weight:bold;font-size:110%}.xenotalk,.xeno{color:#c048c0;font-style:italic}.xenoleader{color:#996e99;font-style:italic;font-size:125%}.xenoqueen{color:#996e99;font-style:italic;font-weight:bold;font-size:125%}.newscaster{color:maroon}.role_header{color:#e92d2d;display:block;text-align:center;font-weight:bold;font-family:trebuchet-ms;font-size:150%}.role_body{color:#3a3ae9;display:block;text-align:center;font-size:125%}.round_header{color:#e92d2d;display:block;text-align:center;font-family:courier;font-weight:bold;font-size:180%}.round_body{color:#c5c5c5;display:block;text-align:center;font-family:trebuchet-ms;font-weight:bold;font-size:125%}.event_announcement{color:#600d48;font-family:arial-narrow;font-weight:bold;font-size:125%}.announce_header{color:#cecece;font-weight:bold;font-size:150%}.announce_header_blue{color:#7575f3;font-weight:bold;font-size:150%}.announce_header_admin{color:#7575f3;font-weight:bold;font-size:150%}.announce_body{color:#e92d2d;font-weight:normal;font-size:125%}.centerbold{display:block;text-align:center;font-weight:bold}.mod{color:#917455;font-weight:bold}.modooc{color:#184880;font-weight:bold}.adminmod{color:#7c440c;font-weight:bold}.mentorsay{color:#d4af57;font-weight:bold}.mentorhelp{color:#090;font-weight:bold}.mentorbody{color:#da6200;font-weight:bold}.mentorstaff{color:#b5850d;font-weight:bold}.staffsay{color:#b5850d;font-weight:bold}.tajaran{color:#803b56}.tajaran_signlang{color:#941c1c}.skrell{color:#00ced1}.soghun{color:#228b22}.changeling{color:purple}.vox{color:#a0a}.monkey{color:#966c47}.german{color:#858f1e;font-family:"Times New Roman",Times,serif}.spanish{color:#cf982b}.japanese{color:#940927}.chinese{color:#fe1919}.zombie{color:#2dacb1;font-style:italic}.rough{font-family:trebuchet-ms,cursive,sans-serif}.commando{color:#fe9b24;font-style:bold}.say_quote{font-family:Georgia,Verdana,sans-serif}.admin .message{color:#314cad}.admin .prefix{font-weight:bolder}.pm{font-size:110%}.deadsay{color:#8b4dff}.retro_translator{font-weight:bold}.yautja_translator{color:#a00;font-weight:bold;animation:glitch .5s infinite}@keyframes glitch{25%{color:#a00;transform:translate(-2px, -1px)}50%{color:#be0000;transform:translate(1px, -2px)}75%{color:#8d0000;transform:translate(-1px, 2px)}100%{color:#830000;transform:translate(1px, 1px)}}.examine_block{background:#1b1c1e;border:1px solid #a4bad6;margin:.5em;padding:.5em .75em}.examine_block .icon{width:1.5em;height:1.5em;margin:0;padding:0}.tooltip{font-style:italic;border-bottom:1px dashed #fff} -.theme-light .color-black{color:#000 !important}.theme-light .color-white{color:#e6e6e6 !important}.theme-light .color-red{color:#c82121 !important}.theme-light .color-orange{color:#e6630d !important}.theme-light .color-yellow{color:#e5c304 !important}.theme-light .color-olive{color:#a3b816 !important}.theme-light .color-green{color:#1d9f3b !important}.theme-light .color-teal{color:#00a39c !important}.theme-light .color-blue{color:#1e78bb !important}.theme-light .color-dark-blue{color:#004274 !important}.theme-light .color-violet{color:#5a30b5 !important}.theme-light .color-purple{color:#932eb4 !important}.theme-light .color-pink{color:#db228a !important}.theme-light .color-brown{color:#955d39 !important}.theme-light .color-grey{color:#e6e6e6 !important}.theme-light .color-light-grey{color:#999 !important}.theme-light .color-good{color:#529923 !important}.theme-light .color-average{color:#da810e !important}.theme-light .color-bad{color:#c82121 !important}.theme-light .color-label{color:#353535 !important}.theme-light .color-xeno{color:#4a3253 !important}.theme-light .color-bg-black{background-color:#000 !important}.theme-light .color-bg-white{background-color:#bfbfbf !important}.theme-light .color-bg-red{background-color:#a61c1c !important}.theme-light .color-bg-orange{background-color:#c0530b !important}.theme-light .color-bg-yellow{background-color:#bfa303 !important}.theme-light .color-bg-olive{background-color:#889912 !important}.theme-light .color-bg-green{background-color:#188532 !important}.theme-light .color-bg-teal{background-color:#008882 !important}.theme-light .color-bg-blue{background-color:#19649c !important}.theme-light .color-bg-dark-blue{background-color:#003761 !important}.theme-light .color-bg-violet{background-color:#4b2897 !important}.theme-light .color-bg-purple{background-color:#7a2696 !important}.theme-light .color-bg-pink{background-color:#b61d73 !important}.theme-light .color-bg-brown{background-color:#7c4d2f !important}.theme-light .color-bg-grey{background-color:#bfbfbf !important}.theme-light .color-bg-light-grey{background-color:gray !important}.theme-light .color-bg-good{background-color:#44801d !important}.theme-light .color-bg-average{background-color:#b56b0b !important}.theme-light .color-bg-bad{background-color:#a61c1c !important}.theme-light .color-bg-label{background-color:#2c2c2c !important}.theme-light .color-bg-xeno{background-color:#3e2945 !important}.theme-light .Tabs{display:flex;align-items:stretch;overflow:hidden;background-color:#fff}.theme-light .Tabs--fill{height:100%}.theme-light .Section .Tabs{background-color:transparent}.theme-light .Section:not(.Section--fitted) .Tabs{margin:0 -0.5em .5em}.theme-light .Section:not(.Section--fitted) .Tabs:first-child{margin-top:-0.5em}.theme-light .Tabs--vertical{flex-direction:column;padding:.25em 0 .25em .25em}.theme-light .Tabs--horizontal{margin-bottom:.5em;padding:.25em .25em 0 .25em}.theme-light .Tabs--horizontal:last-child{margin-bottom:0}.theme-light .Tabs__Tab{flex-grow:0}.theme-light .Tabs--fluid .Tabs__Tab{flex-grow:1}.theme-light .Tab{display:flex;align-items:center;justify-content:space-between;background-color:transparent;color:rgba(0,0,0,.5);min-height:2.25em;min-width:4em}.theme-light .Tab:not(.Tab--selected):hover{background-color:rgba(255,255,255,.075)}.theme-light .Tab--selected{background-color:rgba(255,255,255,.125);color:#404040}.theme-light .Tab__text{flex-grow:1;margin:0 .5em}.theme-light .Tab__left{min-width:1.5em;text-align:center;margin-left:.25em}.theme-light .Tab__right{min-width:1.5em;text-align:center;margin-right:.25em}.theme-light .Tabs--horizontal .Tab{border-top:.1666666667em solid transparent;border-bottom:.1666666667em solid transparent;border-top-left-radius:.25em;border-top-right-radius:.25em}.theme-light .Tabs--horizontal .Tab--selected{border-bottom:.1666666667em solid #000}.theme-light .Tabs--vertical .Tab{min-height:2em;border-left:.1666666667em solid transparent;border-right:.1666666667em solid transparent;border-top-left-radius:.25em;border-bottom-left-radius:.25em}.theme-light .Tabs--vertical .Tab--selected{border-right:.1666666667em solid #000}.theme-light .Tab--selected.Tab--color--black{color:#404040}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--black{border-bottom-color:#000}.theme-light .Tabs--vertical .Tab--selected.Tab--color--black{border-right-color:#000}.theme-light .Tab--selected.Tab--color--white{color:#ececec}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--white{border-bottom-color:#e6e6e6}.theme-light .Tabs--vertical .Tab--selected.Tab--color--white{border-right-color:#e6e6e6}.theme-light .Tab--selected.Tab--color--red{color:#e14d4d}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--red{border-bottom-color:#c82121}.theme-light .Tabs--vertical .Tab--selected.Tab--color--red{border-right-color:#c82121}.theme-light .Tab--selected.Tab--color--orange{color:#f48942}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--orange{border-bottom-color:#e6630d}.theme-light .Tabs--vertical .Tab--selected.Tab--color--orange{border-right-color:#e6630d}.theme-light .Tab--selected.Tab--color--yellow{color:#fcdd33}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--yellow{border-bottom-color:#e5c304}.theme-light .Tabs--vertical .Tab--selected.Tab--color--yellow{border-right-color:#e5c304}.theme-light .Tab--selected.Tab--color--olive{color:#d0e732}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--olive{border-bottom-color:#a3b816}.theme-light .Tabs--vertical .Tab--selected.Tab--color--olive{border-right-color:#a3b816}.theme-light .Tab--selected.Tab--color--green{color:#33da5a}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--green{border-bottom-color:#1d9f3b}.theme-light .Tabs--vertical .Tab--selected.Tab--color--green{border-right-color:#1d9f3b}.theme-light .Tab--selected.Tab--color--teal{color:#00faef}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--teal{border-bottom-color:#00a39c}.theme-light .Tabs--vertical .Tab--selected.Tab--color--teal{border-right-color:#00a39c}.theme-light .Tab--selected.Tab--color--blue{color:#419ce1}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--blue{border-bottom-color:#1e78bb}.theme-light .Tabs--vertical .Tab--selected.Tab--color--blue{border-right-color:#1e78bb}.theme-light .Tab--selected.Tab--color--dark-blue{color:#0079d7}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--dark-blue{border-bottom-color:#004274}.theme-light .Tabs--vertical .Tab--selected.Tab--color--dark-blue{border-right-color:#004274}.theme-light .Tab--selected.Tab--color--violet{color:#7f58d3}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--violet{border-bottom-color:#5a30b5}.theme-light .Tabs--vertical .Tab--selected.Tab--color--violet{border-right-color:#5a30b5}.theme-light .Tab--selected.Tab--color--purple{color:#b455d4}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--purple{border-bottom-color:#932eb4}.theme-light .Tabs--vertical .Tab--selected.Tab--color--purple{border-right-color:#932eb4}.theme-light .Tab--selected.Tab--color--pink{color:#e558a7}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--pink{border-bottom-color:#db228a}.theme-light .Tabs--vertical .Tab--selected.Tab--color--pink{border-right-color:#db228a}.theme-light .Tab--selected.Tab--color--brown{color:#c0825a}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--brown{border-bottom-color:#955d39}.theme-light .Tabs--vertical .Tab--selected.Tab--color--brown{border-right-color:#955d39}.theme-light .Tab--selected.Tab--color--grey{color:#ececec}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--grey{border-bottom-color:#e6e6e6}.theme-light .Tabs--vertical .Tab--selected.Tab--color--grey{border-right-color:#e6e6e6}.theme-light .Tab--selected.Tab--color--light-grey{color:#b3b3b3}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--light-grey{border-bottom-color:#999}.theme-light .Tabs--vertical .Tab--selected.Tab--color--light-grey{border-right-color:#999}.theme-light .Tab--selected.Tab--color--good{color:#77d23b}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--good{border-bottom-color:#529923}.theme-light .Tabs--vertical .Tab--selected.Tab--color--good{border-right-color:#529923}.theme-light .Tab--selected.Tab--color--average{color:#f3a23a}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--average{border-bottom-color:#da810e}.theme-light .Tabs--vertical .Tab--selected.Tab--color--average{border-right-color:#da810e}.theme-light .Tab--selected.Tab--color--bad{color:#e14d4d}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--bad{border-bottom-color:#c82121}.theme-light .Tabs--vertical .Tab--selected.Tab--color--bad{border-right-color:#c82121}.theme-light .Tab--selected.Tab--color--label{color:#686868}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--label{border-bottom-color:#353535}.theme-light .Tabs--vertical .Tab--selected.Tab--color--label{border-right-color:#353535}.theme-light .Tab--selected.Tab--color--xeno{color:#7e558e}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--xeno{border-bottom-color:#4a3253}.theme-light .Tabs--vertical .Tab--selected.Tab--color--xeno{border-right-color:#4a3253}.theme-light .Section{position:relative;margin-bottom:.5em;background-color:#fff;background-color:#fff;box-sizing:border-box}.theme-light .Section:last-child{margin-bottom:0}.theme-light .Section__title{position:relative;padding:.5em;border-bottom:.1666666667em solid #fff}.theme-light .Section__titleText{font-size:1.1666666667em;font-weight:bold;color:#000}.theme-light .Section__buttons{position:absolute;display:inline-block;right:.5em;margin-top:-.0833333333em}.theme-light .Section__rest{position:relative}.theme-light .Section__content{padding:.66em .5em}.theme-light .Section--fitted>.Section__rest>.Section__content{padding:0}.theme-light .Section--fill{display:flex;flex-direction:column;height:100%}.theme-light .Section--fill>.Section__rest{flex-grow:1}.theme-light .Section--fill>.Section__rest>.Section__content{height:100%}.theme-light .Section--fill.Section--scrollable>.Section__rest>.Section__content{position:absolute;top:0;left:0;right:0;bottom:0}.theme-light .Section--fill.Section--iefix{display:table !important;width:100% !important;height:100% !important;border-collapse:collapse;border-spacing:0}.theme-light .Section--fill.Section--iefix>.Section__rest{display:table-row !important;height:100% !important}.theme-light .Section--scrollable{overflow-x:hidden;overflow-y:hidden}.theme-light .Section--scrollable>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:hidden}.theme-light .Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.theme-light .Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:hidden;overflow-x:scroll}.theme-light .Section--scrollable.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.theme-light .Section--scrollable.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:scroll}.theme-light .Section .Section{background-color:transparent;margin-left:-0.5em;margin-right:-0.5em}.theme-light .Section .Section:first-child{margin-top:-0.5em}.theme-light .Section .Section .Section__titleText{font-size:1.0833333333em}.theme-light .Section .Section .Section .Section__titleText{font-size:1em}.theme-light .Button{position:relative;display:inline-block;line-height:1.667em;padding:0 .5em;margin-right:.1666666667em;white-space:nowrap;outline:0;border-radius:.16em;margin-bottom:.1666666667em;user-select:none;-ms-user-select:none}.theme-light .Button:last-child{margin-right:0;margin-bottom:0}.theme-light .Button .fa,.theme-light .Button .fas,.theme-light .Button .far{margin-left:-0.25em;margin-right:-0.25em;min-width:1.333em;text-align:center}.theme-light .Button--hasContent .fa,.theme-light .Button--hasContent .fas,.theme-light .Button--hasContent .far{margin-right:.25em}.theme-light .Button--hasContent.Button--iconPosition--right .fa,.theme-light .Button--hasContent.Button--iconPosition--right .fas,.theme-light .Button--hasContent.Button--iconPosition--right .far{margin-right:0px;margin-left:3px}.theme-light .Button--ellipsis{overflow:hidden;text-overflow:ellipsis}.theme-light .Button--fluid{display:block;margin-left:0;margin-right:0}.theme-light .Button--circular{border-radius:50%}.theme-light .Button--compact{padding:0 .25em;line-height:1.333em}.theme-light .Button--color--black{transition:color 50ms,background-color 50ms;background-color:#000;color:#fff}.theme-light .Button--color--black:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--black:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--black:hover,.theme-light .Button--color--black:focus{background-color:#131313;color:#fff}.theme-light .Button--color--white{transition:color 50ms,background-color 50ms;background-color:#bfbfbf;color:#000}.theme-light .Button--color--white:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--white:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--white:hover,.theme-light .Button--color--white:focus{background-color:#efefef;color:#000}.theme-light .Button--color--red{transition:color 50ms,background-color 50ms;background-color:#a61c1c;color:#fff}.theme-light .Button--color--red:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--red:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--red:hover,.theme-light .Button--color--red:focus{background-color:#d23333;color:#fff}.theme-light .Button--color--orange{transition:color 50ms,background-color 50ms;background-color:#c0530b;color:#fff}.theme-light .Button--color--orange:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--orange:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--orange:hover,.theme-light .Button--color--orange:focus{background-color:#ea7426;color:#fff}.theme-light .Button--color--yellow{transition:color 50ms,background-color 50ms;background-color:#bfa303;color:#fff}.theme-light .Button--color--yellow:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--yellow:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--yellow:hover,.theme-light .Button--color--yellow:focus{background-color:#efce17;color:#fff}.theme-light .Button--color--olive{transition:color 50ms,background-color 50ms;background-color:#889912;color:#fff}.theme-light .Button--color--olive:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--olive:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--olive:hover,.theme-light .Button--color--olive:focus{background-color:#afc328;color:#fff}.theme-light .Button--color--green{transition:color 50ms,background-color 50ms;background-color:#188532;color:#fff}.theme-light .Button--color--green:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--green:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--green:hover,.theme-light .Button--color--green:focus{background-color:#2fac4c;color:#fff}.theme-light .Button--color--teal{transition:color 50ms,background-color 50ms;background-color:#008882;color:#fff}.theme-light .Button--color--teal:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--teal:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--teal:hover,.theme-light .Button--color--teal:focus{background-color:#13afa9;color:#fff}.theme-light .Button--color--blue{transition:color 50ms,background-color 50ms;background-color:#19649c;color:#fff}.theme-light .Button--color--blue:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--blue:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--blue:hover,.theme-light .Button--color--blue:focus{background-color:#3086c7;color:#fff}.theme-light .Button--color--dark-blue{transition:color 50ms,background-color 50ms;background-color:#003761;color:#fff}.theme-light .Button--color--dark-blue:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--dark-blue:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--dark-blue:hover,.theme-light .Button--color--dark-blue:focus{background-color:#135283;color:#fff}.theme-light .Button--color--violet{transition:color 50ms,background-color 50ms;background-color:#4b2897;color:#fff}.theme-light .Button--color--violet:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--violet:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--violet:hover,.theme-light .Button--color--violet:focus{background-color:#6a41c1;color:#fff}.theme-light .Button--color--purple{transition:color 50ms,background-color 50ms;background-color:#7a2696;color:#fff}.theme-light .Button--color--purple:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--purple:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--purple:hover,.theme-light .Button--color--purple:focus{background-color:#a03fc0;color:#fff}.theme-light .Button--color--pink{transition:color 50ms,background-color 50ms;background-color:#b61d73;color:#fff}.theme-light .Button--color--pink:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--pink:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--pink:hover,.theme-light .Button--color--pink:focus{background-color:#da3f96;color:#fff}.theme-light .Button--color--brown{transition:color 50ms,background-color 50ms;background-color:#7c4d2f;color:#fff}.theme-light .Button--color--brown:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--brown:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--brown:hover,.theme-light .Button--color--brown:focus{background-color:#a26c49;color:#fff}.theme-light .Button--color--grey{transition:color 50ms,background-color 50ms;background-color:#bfbfbf;color:#000}.theme-light .Button--color--grey:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--grey:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--grey:hover,.theme-light .Button--color--grey:focus{background-color:#efefef;color:#000}.theme-light .Button--color--light-grey{transition:color 50ms,background-color 50ms;background-color:gray;color:#fff}.theme-light .Button--color--light-grey:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--light-grey:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--light-grey:hover,.theme-light .Button--color--light-grey:focus{background-color:#a6a6a6;color:#fff}.theme-light .Button--color--good{transition:color 50ms,background-color 50ms;background-color:#44801d;color:#fff}.theme-light .Button--color--good:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--good:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--good:hover,.theme-light .Button--color--good:focus{background-color:#62a635;color:#fff}.theme-light .Button--color--average{transition:color 50ms,background-color 50ms;background-color:#b56b0b;color:#fff}.theme-light .Button--color--average:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--average:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--average:hover,.theme-light .Button--color--average:focus{background-color:#e48f20;color:#fff}.theme-light .Button--color--bad{transition:color 50ms,background-color 50ms;background-color:#a61c1c;color:#fff}.theme-light .Button--color--bad:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--bad:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--bad:hover,.theme-light .Button--color--bad:focus{background-color:#d23333;color:#fff}.theme-light .Button--color--label{transition:color 50ms,background-color 50ms;background-color:#2c2c2c;color:#fff}.theme-light .Button--color--label:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--label:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--label:hover,.theme-light .Button--color--label:focus{background-color:#464646;color:#fff}.theme-light .Button--color--xeno{transition:color 50ms,background-color 50ms;background-color:#3e2945;color:#fff}.theme-light .Button--color--xeno:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--xeno:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--xeno:hover,.theme-light .Button--color--xeno:focus{background-color:#5a4363;color:#fff}.theme-light .Button--color--default{transition:color 50ms,background-color 50ms;background-color:#bbb;color:#000}.theme-light .Button--color--default:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--default:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--default:hover,.theme-light .Button--color--default:focus{background-color:#eaeaea;color:#000}.theme-light .Button--color--caution{transition:color 50ms,background-color 50ms;background-color:#be6209;color:#fff}.theme-light .Button--color--caution:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--caution:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--caution:hover,.theme-light .Button--color--caution:focus{background-color:#ec8420;color:#fff}.theme-light .Button--color--danger{transition:color 50ms,background-color 50ms;background-color:#9a9d00;color:#fff}.theme-light .Button--color--danger:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--danger:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--danger:hover,.theme-light .Button--color--danger:focus{background-color:#c4c813;color:#fff}.theme-light .Button--color--transparent{transition:color 50ms,background-color 50ms;background-color:#eee;color:#000;background-color:rgba(238,238,238,0);color:rgba(0,0,0,.5)}.theme-light .Button--color--transparent:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--transparent:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--transparent:hover,.theme-light .Button--color--transparent:focus{background-color:#fcfcfc;color:#000}.theme-light .Button--disabled{background-color:#363636 !important}.theme-light .Button--selected{transition:color 50ms,background-color 50ms;background-color:#0668b8;color:#fff}.theme-light .Button--selected:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--selected:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--selected:hover,.theme-light .Button--selected:focus{background-color:#1a8be7;color:#fff}.theme-light .Button--flex{display:inline-flex;flex-direction:column}.theme-light .Button--flex--fluid{width:100%}.theme-light .Button--verticalAlignContent--top{justify-content:flex-start}.theme-light .Button--verticalAlignContent--middle{justify-content:center}.theme-light .Button--verticalAlignContent--bottom{justify-content:flex-end}.theme-light .Button__content{display:block;align-self:stretch}.theme-light .Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#000;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.theme-light .Input--fluid{display:block;width:auto}.theme-light .Input__baseline{display:inline-block;color:transparent}.theme-light .Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#000;color:inherit}.theme-light .Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .Input--monospace .Input__input{font-family:"Consolas",monospace}.theme-light .Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#000;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.theme-light .Input--fluid{display:block;width:auto}.theme-light .Input__baseline{display:inline-block;color:transparent}.theme-light .Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#000;color:inherit}.theme-light .Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .Input--monospace .Input__input{font-family:"Consolas",monospace}.theme-light .NumberInput{position:relative;display:inline-block;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#353535;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;text-align:right;overflow:visible;cursor:n-resize}.theme-light .NumberInput--fluid{display:block}.theme-light .NumberInput__content{margin-left:.5em}.theme-light .NumberInput__barContainer{position:absolute;top:.1666666667em;bottom:.1666666667em;left:.1666666667em}.theme-light .NumberInput__bar{position:absolute;bottom:0;left:0;width:.25em;box-sizing:border-box;border-bottom:.0833333333em solid #353535;background-color:#353535}.theme-light .NumberInput__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:#fff;color:#000;text-align:right}.theme-light .Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#000;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.theme-light .Input--fluid{display:block;width:auto}.theme-light .Input__baseline{display:inline-block;color:transparent}.theme-light .Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#000;color:inherit}.theme-light .Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .Input--monospace .Input__input{font-family:"Consolas",monospace}.theme-light .TextArea{position:relative;display:inline-block;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;background-color:#fff;margin-right:.1666666667em;line-height:1.4166666667em;box-sizing:border-box;width:100%}.theme-light .TextArea--fluid{display:block;width:auto;height:auto}.theme-light .TextArea--noborder{border:0px}.theme-light .TextArea__textarea.TextArea__textarea--scrollable{overflow:auto;overflow-x:hidden;overflow-y:scroll}.theme-light .TextArea__textarea{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;height:100%;font-size:1em;line-height:1.4166666667em;min-height:1.4166666667em;margin:0;padding:0 .5em;font-family:inherit;background-color:transparent;color:inherit;box-sizing:border-box;word-wrap:break-word;overflow:hidden}.theme-light .TextArea__textarea:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .TextArea__textarea_custom{overflow:visible;white-space:pre-wrap}.theme-light .Knob{position:relative;font-size:1rem;width:2.6em;height:2.6em;margin:0 auto;margin-bottom:-0.2em;cursor:n-resize}.theme-light .Knob:after{content:".";color:transparent;line-height:2.5em}.theme-light .Knob__circle{position:absolute;top:.1em;bottom:.1em;left:.1em;right:.1em;margin:.3em;background-color:#333;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 0.15) 0%, rgba(255, 255, 255, 0) 100%);border-radius:50%;box-shadow:0 .05em .5em 0 rgba(0,0,0,.5)}.theme-light .Knob__cursorBox{position:absolute;top:0;bottom:0;left:0;right:0}.theme-light .Knob__cursor{position:relative;top:.05em;margin:0 auto;width:.2em;height:.8em;background-color:rgba(255,255,255,.9)}.theme-light .Knob__popupValue{position:absolute;top:-2rem;right:50%;font-size:1rem;text-align:center;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.theme-light .Knob__ring{position:absolute;top:0;bottom:0;left:0;right:0;padding:.1em}.theme-light .Knob__ringTrackPivot{transform:rotateZ(135deg)}.theme-light .Knob__ringTrack{fill:transparent;stroke:rgba(255,255,255,.1);stroke-width:8;stroke-linecap:round;stroke-dasharray:235.62}.theme-light .Knob__ringFillPivot{transform:rotateZ(135deg)}.theme-light .Knob--bipolar .Knob__ringFillPivot{transform:rotateZ(270deg)}.theme-light .Knob__ringFill{fill:transparent;stroke:#6a96c9;stroke-width:8;stroke-linecap:round;stroke-dasharray:314.16;transition:stroke 50ms ease-out}.theme-light .Knob--color--black .Knob__ringFill{stroke:#000}.theme-light .Knob--color--white .Knob__ringFill{stroke:#e6e6e6}.theme-light .Knob--color--red .Knob__ringFill{stroke:#c82121}.theme-light .Knob--color--orange .Knob__ringFill{stroke:#e6630d}.theme-light .Knob--color--yellow .Knob__ringFill{stroke:#e5c304}.theme-light .Knob--color--olive .Knob__ringFill{stroke:#a3b816}.theme-light .Knob--color--green .Knob__ringFill{stroke:#1d9f3b}.theme-light .Knob--color--teal .Knob__ringFill{stroke:#00a39c}.theme-light .Knob--color--blue .Knob__ringFill{stroke:#1e78bb}.theme-light .Knob--color--dark-blue .Knob__ringFill{stroke:#004274}.theme-light .Knob--color--violet .Knob__ringFill{stroke:#5a30b5}.theme-light .Knob--color--purple .Knob__ringFill{stroke:#932eb4}.theme-light .Knob--color--pink .Knob__ringFill{stroke:#db228a}.theme-light .Knob--color--brown .Knob__ringFill{stroke:#955d39}.theme-light .Knob--color--grey .Knob__ringFill{stroke:#e6e6e6}.theme-light .Knob--color--light-grey .Knob__ringFill{stroke:#999}.theme-light .Knob--color--good .Knob__ringFill{stroke:#529923}.theme-light .Knob--color--average .Knob__ringFill{stroke:#da810e}.theme-light .Knob--color--bad .Knob__ringFill{stroke:#c82121}.theme-light .Knob--color--label .Knob__ringFill{stroke:#353535}.theme-light .Knob--color--xeno .Knob__ringFill{stroke:#4a3253}.theme-light .Slider{cursor:e-resize}.theme-light .Slider__cursorOffset{position:absolute;top:0;left:0;bottom:0;transition:none !important}.theme-light .Slider__cursor{position:absolute;top:0;right:-.0833333333em;bottom:0;width:0;border-left:.1666666667em solid #000}.theme-light .Slider__pointer{position:absolute;right:-.4166666667em;bottom:-.3333333333em;width:0;height:0;border-left:.4166666667em solid transparent;border-right:.4166666667em solid transparent;border-bottom:.4166666667em solid #000}.theme-light .Slider__popupValue{position:absolute;right:0;top:-2rem;font-size:1rem;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.theme-light .ProgressBar{display:inline-block;position:relative;width:100%;padding:0 .5em;border-width:.0833333333em !important;border-style:solid !important;border-radius:.16em;background-color:rgba(0,0,0,0);transition:border-color 900ms ease-out}.theme-light .ProgressBar__fill{position:absolute;top:-0.5px;left:0px;bottom:-0.5px}.theme-light .ProgressBar__fill--animated{transition:background-color 900ms ease-out,width 900ms ease-out}.theme-light .ProgressBar__content{position:relative;line-height:1.4166666667em;width:100%;text-align:right}.theme-light .ProgressBar--color--default{border:.0833333333em solid #bfbfbf}.theme-light .ProgressBar--color--default .ProgressBar__fill{background-color:#bfbfbf}.theme-light .ProgressBar--color--black{border-color:#000 !important}.theme-light .ProgressBar--color--black .ProgressBar__fill{background-color:#000}.theme-light .ProgressBar--color--white{border-color:#bfbfbf !important}.theme-light .ProgressBar--color--white .ProgressBar__fill{background-color:#bfbfbf}.theme-light .ProgressBar--color--red{border-color:#a61c1c !important}.theme-light .ProgressBar--color--red .ProgressBar__fill{background-color:#a61c1c}.theme-light .ProgressBar--color--orange{border-color:#c0530b !important}.theme-light .ProgressBar--color--orange .ProgressBar__fill{background-color:#c0530b}.theme-light .ProgressBar--color--yellow{border-color:#bfa303 !important}.theme-light .ProgressBar--color--yellow .ProgressBar__fill{background-color:#bfa303}.theme-light .ProgressBar--color--olive{border-color:#889912 !important}.theme-light .ProgressBar--color--olive .ProgressBar__fill{background-color:#889912}.theme-light .ProgressBar--color--green{border-color:#188532 !important}.theme-light .ProgressBar--color--green .ProgressBar__fill{background-color:#188532}.theme-light .ProgressBar--color--teal{border-color:#008882 !important}.theme-light .ProgressBar--color--teal .ProgressBar__fill{background-color:#008882}.theme-light .ProgressBar--color--blue{border-color:#19649c !important}.theme-light .ProgressBar--color--blue .ProgressBar__fill{background-color:#19649c}.theme-light .ProgressBar--color--dark-blue{border-color:#003761 !important}.theme-light .ProgressBar--color--dark-blue .ProgressBar__fill{background-color:#003761}.theme-light .ProgressBar--color--violet{border-color:#4b2897 !important}.theme-light .ProgressBar--color--violet .ProgressBar__fill{background-color:#4b2897}.theme-light .ProgressBar--color--purple{border-color:#7a2696 !important}.theme-light .ProgressBar--color--purple .ProgressBar__fill{background-color:#7a2696}.theme-light .ProgressBar--color--pink{border-color:#b61d73 !important}.theme-light .ProgressBar--color--pink .ProgressBar__fill{background-color:#b61d73}.theme-light .ProgressBar--color--brown{border-color:#7c4d2f !important}.theme-light .ProgressBar--color--brown .ProgressBar__fill{background-color:#7c4d2f}.theme-light .ProgressBar--color--grey{border-color:#bfbfbf !important}.theme-light .ProgressBar--color--grey .ProgressBar__fill{background-color:#bfbfbf}.theme-light .ProgressBar--color--light-grey{border-color:gray !important}.theme-light .ProgressBar--color--light-grey .ProgressBar__fill{background-color:gray}.theme-light .ProgressBar--color--good{border-color:#44801d !important}.theme-light .ProgressBar--color--good .ProgressBar__fill{background-color:#44801d}.theme-light .ProgressBar--color--average{border-color:#b56b0b !important}.theme-light .ProgressBar--color--average .ProgressBar__fill{background-color:#b56b0b}.theme-light .ProgressBar--color--bad{border-color:#a61c1c !important}.theme-light .ProgressBar--color--bad .ProgressBar__fill{background-color:#a61c1c}.theme-light .ProgressBar--color--label{border-color:#2c2c2c !important}.theme-light .ProgressBar--color--label .ProgressBar__fill{background-color:#2c2c2c}.theme-light .ProgressBar--color--xeno{border-color:#3e2945 !important}.theme-light .ProgressBar--color--xeno .ProgressBar__fill{background-color:#3e2945}.theme-light .Chat{color:#000}.theme-light .Chat__badge{display:inline-block;min-width:.5em;font-size:.7em;padding:.2em .3em;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:crimson;border-radius:10px;transition:font-size 200ms ease-out}.theme-light .Chat__badge:before{content:"x"}.theme-light .Chat__badge--animate{font-size:.9em;transition:font-size 0ms}.theme-light .Chat__scrollButton{position:fixed;right:2em;bottom:1em}.theme-light .Chat__reconnected{font-size:.85em;text-align:center;margin:1em 0 2em}.theme-light .Chat__reconnected:before{content:"Reconnected";display:inline-block;border-radius:1em;padding:0 .7em;color:#db2828;background-color:#fff}.theme-light .Chat__reconnected:after{content:"";display:block;margin-top:-0.75em;border-bottom:.1666666667em solid #db2828}.theme-light .Chat__highlight{color:#000}.theme-light .Chat__highlight--restricted{color:#fff;background-color:#a00;font-weight:bold}.theme-light .ChatMessage{word-wrap:break-word}.theme-light .ChatMessage--highlighted{position:relative;border-left:.1666666667em solid #fd4;padding-left:.5em}.theme-light .ChatMessage--highlighted:after{content:"";position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(255,221,68,.1);pointer-events:none}.theme-light .Layout,.theme-light .Layout *{scrollbar-base-color:#f2f2f2;scrollbar-face-color:#d6d6d6;scrollbar-3dlight-color:#eee;scrollbar-highlight-color:#eee;scrollbar-track-color:#f2f2f2;scrollbar-arrow-color:#777;scrollbar-shadow-color:#d6d6d6}.theme-light .Layout__content{position:absolute;top:0;bottom:0;left:0;right:0;overflow-x:hidden;overflow-y:hidden}.theme-light .Layout__content--scrollable{overflow-y:scroll;margin-bottom:0}.theme-light .Window{position:fixed;top:0;bottom:0;left:0;right:0;color:#000;background-color:#eee;background-image:linear-gradient(to bottom, #eeeeee 0%, #eeeeee 100%)}.theme-light .Window__titleBar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;height:2.6666666667rem}.theme-light .Window__rest{position:fixed;top:32px;top:2.6666666667rem;bottom:0;left:0;right:0}.theme-light .Window__contentPadding{margin:.5rem;height:100%;height:calc(100% - 1.01rem)}.theme-light .Window__contentPadding:after{height:0}.theme-light .Layout__content--scrollable .Window__contentPadding:after{display:block;content:"";height:.5rem}.theme-light .Window__dimmer{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(252,252,252,.25);pointer-events:none}.theme-light .Window__resizeHandle__se{position:fixed;bottom:0;right:0;width:20px;width:1.6666666667rem;height:20px;height:1.6666666667rem;cursor:se-resize}.theme-light .Window__resizeHandle__s{position:fixed;bottom:0;left:0;right:0;height:6px;height:.5rem;cursor:s-resize}.theme-light .Window__resizeHandle__e{position:fixed;top:0;bottom:0;right:0;width:3px;width:.25rem;cursor:e-resize}.theme-light .TitleBar{background-color:#eee;border-bottom:1px solid rgba(0,0,0,.25);box-shadow:0 2px 2px rgba(0,0,0,.1);box-shadow:0 .1666666667rem .1666666667rem rgba(0,0,0,.1);user-select:none;-ms-user-select:none}.theme-light .TitleBar__clickable{color:rgba(0,0,0,.5);background-color:#eee;transition:color 250ms ease-out,background-color 250ms ease-out}.theme-light .TitleBar__clickable:hover{color:#fff;background-color:#c00;transition:color 0ms,background-color 0ms}.theme-light .TitleBar__title{position:absolute;display:inline-block;top:0;left:46px;left:3.8333333333rem;color:rgba(0,0,0,.75);font-size:14px;font-size:1.1666666667rem;line-height:31px;line-height:2.5833333333rem;white-space:nowrap;pointer-events:none}.theme-light .TitleBar__buttons{pointer-events:initial;display:inline-block;width:100%;margin-left:10px}.theme-light .TitleBar__dragZone{position:absolute;top:0;left:0;right:0;height:32px;height:2.6666666667rem}.theme-light .TitleBar__statusIcon{position:absolute;top:0;left:12px;left:1rem;transition:color .5s;font-size:20px;font-size:1.6666666667rem;line-height:32px !important;line-height:2.6666666667rem !important}.theme-light .TitleBar__close{position:absolute;top:-1px;right:0;width:45px;width:3.75rem;height:32px;height:2.6666666667rem;font-size:20px;font-size:1.6666666667rem;line-height:31px;line-height:2.5833333333rem;text-align:center}.theme-light .TitleBar__devBuildIndicator{position:absolute;top:6px;top:.5rem;right:52px;right:4.3333333333rem;min-width:20px;min-width:1.6666666667rem;padding:2px 4px;padding:.1666666667rem .3333333333rem;background-color:rgba(91,170,39,.75);color:#fff;text-align:center}.theme-light html,.theme-light body{padding:0;margin:0;height:100%;color:#000}.theme-light body{background:#fff;font-family:Verdana,sans-serif;font-size:13px;line-height:1.2;overflow-x:hidden;overflow-y:scroll;word-wrap:break-word}.theme-light em{font-style:normal;font-weight:bold}.theme-light img{margin:0;padding:0;line-height:1;-ms-interpolation-mode:nearest-neighbor;image-rendering:pixelated}.theme-light img.icon{height:1em;min-height:16px;width:auto;vertical-align:bottom}.theme-light a{color:blue}.theme-light a.visited{color:#f0f}.theme-light a:visited{color:#f0f}.theme-light a.popt{text-decoration:none}.theme-light .popup{position:fixed;top:50%;left:50%;background:#ddd}.theme-light .popup .close{position:absolute;background:#aaa;top:0;right:0;color:#333;text-decoration:none;z-index:2;padding:0 10px;height:30px;line-height:30px}.theme-light .popup .close:hover{background:#999}.theme-light .popup .head{background:#999;color:#ddd;padding:0 10px;height:30px;line-height:30px;text-transform:uppercase;font-size:.9em;font-weight:bold;border-bottom:2px solid green}.theme-light .popup input{border:1px solid #999;background:#fff;margin:0;padding:5px;outline:none;color:#333}.theme-light .popup input[type=text]:hover,.theme-light .popup input[type=text]:active,.theme-light .popup input[type=text]:focus{border-color:green}.theme-light .popup input[type=submit]{padding:5px 10px;background:#999;color:#ddd;text-transform:uppercase;font-size:.9em;font-weight:bold}.theme-light .popup input[type=submit]:hover,.theme-light .popup input[type=submit]:focus,.theme-light .popup input[type=submit]:active{background:#aaa;cursor:pointer}.theme-light .changeFont{padding:10px}.theme-light .changeFont a{display:block;text-decoration:none;padding:3px;color:#333}.theme-light .changeFont a:hover{background:#ccc}.theme-light .highlightPopup{padding:10px;text-align:center}.theme-light .highlightPopup input[type=text]{display:block;width:215px;text-align:left;margin-top:5px}.theme-light .highlightPopup input.highlightColor{background-color:#ff0}.theme-light .highlightPopup input.highlightTermSubmit{margin-top:5px}.theme-light .contextMenu{background-color:#ddd;position:fixed;margin:2px;width:150px}.theme-light .contextMenu a{display:block;padding:2px 5px;text-decoration:none;color:#333}.theme-light .contextMenu a:hover{background-color:#ccc}.theme-light .filterMessages{padding:5px}.theme-light .filterMessages div{padding:2px 0}.theme-light .icon-stack{height:1em;line-height:1em;width:1em;vertical-align:middle;margin-top:-2px}.theme-light .motd{color:#638500;font-family:Verdana,sans-serif;white-space:normal}.theme-light .motd h1,.theme-light .motd h2,.theme-light .motd h3,.theme-light .motd h4,.theme-light .motd h5,.theme-light .motd h6{color:#638500;text-decoration:underline}.theme-light .motd a,.theme-light .motd a:link,.theme-light .motd a:visited,.theme-light .motd a:active,.theme-light .motd a:hover{color:#638500}.theme-light .bold,.theme-light .name,.theme-light .prefix,.theme-light .ooc,.theme-light .looc,.theme-light .adminooc,.theme-light .admin,.theme-light .medal,.theme-light .yell{font-weight:bold}.theme-light .italic,.theme-light .italics{font-style:italic}.theme-light .highlight{background:#ff0}.theme-light h1,.theme-light h2,.theme-light h3,.theme-light h4,.theme-light h5,.theme-light h6{color:blue;font-family:Georgia,Verdana,sans-serif}.theme-light h1.alert,.theme-light h2.alert{color:#000}.theme-light em{font-style:normal;font-weight:bold}.theme-light .ooc{font-weight:bold}.theme-light .adminobserverooc{color:#09c;font-weight:bold}.theme-light .adminooc{color:#700038;font-weight:bold}.theme-light .adminsay{color:#ff4500;font-weight:bold}.theme-light .admin{color:#4473ff;font-weight:bold}.theme-light .name{font-weight:bold}.theme-light .deadsay{color:#5c00e6}.theme-light .binarysay{color:#20c20e;background-color:#000;display:block}.theme-light .binarysay a{color:lime}.theme-light .binarysay a:active,.theme-light .binarysay a:visited{color:#8f8}.theme-light .radio{color:green}.theme-light .sciradio{color:#939}.theme-light .comradio{color:#948f02}.theme-light .secradio{color:#a30000}.theme-light .medradio{color:#337296}.theme-light .engradio{color:#fb5613}.theme-light .sentryradio{color:#844300}.theme-light .suppradio{color:#a8732b}.theme-light .servradio{color:#6eaa2c}.theme-light .syndradio{color:#6d3f40}.theme-light .gangradio{color:#ac2ea1}.theme-light .centcomradio{color:#686868}.theme-light .aiprivradio{color:#f0f}.theme-light .redteamradio{color:red}.theme-light .blueteamradio{color:blue}.theme-light .greenteamradio{color:lime}.theme-light .yellowteamradio{color:#d1ba22}.theme-light .yell{font-weight:bold}.theme-light .alert{color:red}.theme-light h1.alert,.theme-light h2.alert{color:#000}.theme-light .userdanger{color:red;font-weight:bold;font-size:185%}.theme-light .bolddanger{color:red;font-weight:bold}.theme-light .danger{color:red}.theme-light .tinydanger{color:red;font-size:85%}.theme-light .smalldanger{color:red;font-size:90%}.theme-light .warning{color:red;font-style:italic}.theme-light .alertwarning{color:red;font-weight:bold}.theme-light .boldwarning{color:red;font-style:italic;font-weight:bold}.theme-light .announce{color:#228b22;font-weight:bold}.theme-light .boldannounce{color:red;font-weight:bold}.theme-light .minorannounce{font-weight:bold;font-size:185%}.theme-light .greenannounce{color:lime;font-weight:bold}.theme-light .rose{color:#ff5050}.theme-light .info{color:#00c}.theme-light .notice{color:#009}.theme-light .tinynotice{color:#009;font-size:85%}.theme-light .tinynoticeital{color:#009;font-style:italic;font-size:85%}.theme-light .smallnotice{color:#009;font-size:90%}.theme-light .smallnoticeital{color:#009;font-style:italic;font-size:90%}.theme-light .boldnotice{color:#009;font-weight:bold}.theme-light .hear{color:#009;font-style:italic}.theme-light .adminnotice{color:blue}.theme-light .adminhelp{color:red;font-weight:bold}.theme-light .unconscious{color:blue;font-weight:bold}.theme-light .suicide{color:#ff5050;font-style:italic}.theme-light .green{color:#03ff39}.theme-light .grey{color:#838383}.theme-light .red{color:red}.theme-light .blue{color:blue}.theme-light .nicegreen{color:#14a833}.theme-light .boldnicegreen{color:#14a833;font-weight:bold}.theme-light .cult{color:#973e3b}.theme-light .cultitalic{color:#973e3b;font-style:italic}.theme-light .cultbold{color:#973e3b;font-style:italic;font-weight:bold}.theme-light .cultboldtalic{color:#973e3b;font-weight:bold;font-size:185%}.theme-light .cultlarge{color:#973e3b;font-weight:bold;font-size:185%}.theme-light .narsie{color:#973e3b;font-weight:bold;font-size:925%}.theme-light .narsiesmall{color:#973e3b;font-weight:bold;font-size:370%}.theme-light .colossus{color:#7f282a;font-size:310%}.theme-light .hierophant{color:#609;font-weight:bold;font-style:italic}.theme-light .hierophant_warning{color:#609;font-style:italic}.theme-light .purple{color:#5e2d79}.theme-light .holoparasite{color:#35333a}.theme-light .revennotice{color:#1d2953}.theme-light .revenboldnotice{color:#1d2953;font-weight:bold}.theme-light .revenbignotice{color:#1d2953;font-weight:bold;font-size:185%}.theme-light .revenminor{color:#823abb}.theme-light .revenwarning{color:#760fbb;font-style:italic}.theme-light .revendanger{color:#760fbb;font-weight:bold;font-size:185%}.theme-light .deconversion_message{color:#5000a0;font-size:185%;font-style:italic}.theme-light .ghostalert{color:#5c00e6;font-style:italic;font-weight:bold}.theme-light .alien{color:#543354}.theme-light .noticealien{color:#00c000}.theme-light .alertalien{color:#00c000;font-weight:bold}.theme-light .changeling{color:purple;font-style:italic}.theme-light .alertsyndie{color:red;font-size:185%;font-weight:bold}.theme-light .spider{color:#4d004d;font-weight:bold;font-size:185%}.theme-light .interface{color:#303}.theme-light .sans{font-family:"Comic Sans MS",cursive,sans-serif}.theme-light .papyrus{font-family:"Papyrus",cursive,sans-serif}.theme-light .robot{font-family:"Courier New",cursive,sans-serif}.theme-light .tape_recorder{color:maroon;font-family:"Courier New",cursive,sans-serif}.theme-light .command_headset{font-weight:bold;font-size:160%}.theme-light .small{font-size:60%}.theme-light .big{font-size:185%}.theme-light .reallybig{font-size:245%}.theme-light .extremelybig{font-size:310%}.theme-light .greentext{color:lime;font-size:185%}.theme-light .redtext{color:red;font-size:185%}.theme-light .clown{color:#ff69bf;font-size:160%;font-family:"Comic Sans MS",cursive,sans-serif;font-weight:bold}.theme-light .singing{font-family:"Trebuchet MS",cursive,sans-serif;font-style:italic}.theme-light .his_grace{color:#15d512;font-family:"Courier New",cursive,sans-serif;font-style:italic}.theme-light .hypnophrase{color:#0d0d0d;font-weight:bold;animation:hypnocolor 1500ms infinite;animation-direction:alternate}@keyframes hypnocolor{0%{color:#0d0d0d}25%{color:#410194}50%{color:#7f17d8}75%{color:#410194}100%{color:#3bb5d3}}.theme-light .phobia{color:#d00;font-weight:bold;animation:phobia 750ms infinite}@keyframes phobia{0%{color:#0d0d0d}50%{color:#d00}100%{color:#0d0d0d}}.theme-light .icon{height:1em;width:auto}.theme-light .bigicon{font-size:2.5em}.theme-light .memo{color:#638500;text-align:center}.theme-light .memoedit{text-align:center;font-size:125%}.theme-light .abductor{color:purple;font-style:italic}.theme-light .mind_control{color:#a00d6f;font-size:100%;font-weight:bold;font-style:italic}.theme-light .slime{color:#00ced1}.theme-light .drone{color:#848482}.theme-light .monkey{color:#975032}.theme-light .swarmer{color:#2c75ff}.theme-light .resonate{color:#298f85}.theme-light .monkeyhive{color:#774704}.theme-light .monkeylead{color:#774704;font-size:80%}.theme-light .connectionClosed,.theme-light .fatalError{background:red;color:#fff;padding:5px}.theme-light .connectionClosed.restored{background:green}.theme-light .internal.boldnshit{color:blue;font-weight:bold}.theme-light .text-normal{font-weight:normal;font-style:normal}.theme-light .hidden{display:none;visibility:hidden}.theme-light .ml-1{margin-left:1em}.theme-light .ml-2{margin-left:2em}.theme-light .ml-3{margin-left:3em}.theme-light .xooc{color:#6c0094;font-weight:bold;font-size:140%}.theme-light .mooc{color:#090;font-weight:bold;font-size:140%}.theme-light .yooc{color:#999600;font-weight:bold;font-size:140%}.theme-light .headminsay{color:#5a0a7f;font-weight:bold}.theme-light .radio{color:#4e4e4e}.theme-light .deptradio{color:#939}.theme-light .comradio{color:#004080}.theme-light .centradio{color:#5c5c8a}.theme-light .cryoradio{color:#554e3f}.theme-light .hcradio{color:#318779}.theme-light .airadio{color:#f0f}.theme-light .secradio{color:#a30000}.theme-light .engradio{color:#a66300}.theme-light .sentryradio{color:#844300}.theme-light .medradio{color:#008160}.theme-light .supradio{color:#5f4519}.theme-light .jtacradio{color:#702963}.theme-light .intelradio{color:#027d02}.theme-light .wyradio{color:#fe9b24}.theme-light .pmcradio{color:#136957}.theme-light .vairadio{color:#943d0a}.theme-light .cmbradio{color:#1b748c}.theme-light .clfradio{color:#6f679c}.theme-light .alpharadio{color:#ea0000}.theme-light .bravoradio{color:#c68610}.theme-light .charlieradio{color:#a5a}.theme-light .deltaradio{color:#007fcf}.theme-light .echoradio{color:#3a7e65}.theme-light .medium{font-size:110%}.theme-light .big{font-size:115%}.theme-light .large{font-size:125%}.theme-light .extra_large{font-size:130%}.theme-light .huge{font-size:150%}.theme-light .underline{text-decoration:underline}.theme-light .orange{color:#eca100}.theme-light .normal{font-style:normal}.theme-light .attack{color:red}.theme-light .moderate{color:#c00}.theme-light .disarm{color:#900}.theme-light .passive{color:#600}.theme-light .helpful{color:#368f31}.theme-light .scanner{color:red}.theme-light .scannerb{color:red;font-weight:bold}.theme-light .scannerburn{color:orange}.theme-light .scannerburnb{color:orange;font-weight:bold}.theme-light .rose{color:#ff5050}.theme-light .debuginfo{color:#493d26;font-style:italic}.theme-light .xenonotice{color:#2a623d}.theme-light .xenoboldnotice{color:#2a623d;font-style:italic}.theme-light .xenowarning{color:#2a623d;font-style:italic}.theme-light .xenominorwarning{color:#2a623d;font-weight:bold;font-style:italic}.theme-light .xenodanger{color:#2a623d;font-weight:bold}.theme-light .avoidharm{color:#72a0e5;font-weight:bold}.theme-light .highdanger{color:red;font-weight:bold;font-size:140%}.theme-light .xenohighdanger{color:#2a623d;font-weight:bold;font-size:140%}.theme-light .xenoannounce{color:#1a472a;font-family:book-antiqua;font-weight:bold;font-size:140%}.theme-light .yautjabold{color:purple;font-weight:bold}.theme-light .yautjaboldbig{color:purple;font-weight:bold;font-size:120%}.theme-light .objectivebig{font-weight:bold;font-size:130%}.theme-light .objectivegreen{color:lime}.theme-light .objectivered{color:red}.theme-light .objectivesuccess{color:lime;font-weight:bold;font-size:110%}.theme-light .objectivefail{color:red;font-weight:bold;font-size:110%}.theme-light .xenotalk,.theme-light .xeno{color:#900090;font-style:italic}.theme-light .xenoleader{color:#730d73;font-style:italic;font-size:125%}.theme-light .xenoqueen{color:#730d73;font-style:italic;font-weight:bold;font-size:125%}.theme-light .newscaster{color:maroon}.theme-light .role_header{color:#db0000;display:block;text-align:center;font-weight:bold;font-family:trebuchet-ms;font-size:150%}.theme-light .role_body{color:#009;display:block;text-align:center;font-size:125%}.theme-light .round_header{color:#db0000;display:block;text-align:center;font-family:courier;font-weight:bold;font-size:180%}.theme-light .round_body{color:#001427;display:block;text-align:center;font-family:trebuchet-ms;font-weight:bold;font-size:125%}.theme-light .event_announcement{color:#600d48;font-family:arial-narrow;font-weight:bold;font-size:125%}.theme-light .announce_header{color:#000;font-weight:bold;font-size:150%}.theme-light .announce_header_blue{color:#009;font-weight:bold;font-size:150%}.theme-light .announce_body{color:red;font-weight:normal;font-size:125%}.theme-light .centerbold{display:block;text-align:center;font-weight:bold}.theme-light .mod{color:#735638;font-weight:bold}.theme-light .modooc{color:#184880;font-weight:bold}.theme-light .adminmod{color:#402a14;font-weight:bold}.theme-light .mentorsay{color:#b38c32;font-weight:bold}.theme-light .mentorhelp{color:#007e00;font-weight:bold}.theme-light .mentorbody{color:#da6200;font-weight:bold}.theme-light .mentorstaff{color:#876101;font-weight:bold}.theme-light .staffsay{color:#876101;font-weight:bold}.theme-light .tajaran{color:#803b56}.theme-light .tajaran_signlang{color:#941c1c}.theme-light .skrell{color:#00ced1}.theme-light .soghun{color:#228b22}.theme-light .changeling{color:purple}.theme-light .vox{color:#a0a}.theme-light .monkey{color:#966c47}.theme-light .german{color:#858f1e;font-family:"Times New Roman",Times,serif}.theme-light .spanish{color:#cf982b}.theme-light .japanese{color:#940927}.theme-light .chinese{color:#fe1919}.theme-light .zombie{color:#216163;font-style:italic}.theme-light .commando{color:#fe9b24;font-style:bold}.theme-light .rough{font-family:trebuchet-ms,cursive,sans-serif}.theme-light .say_quote{font-family:Georgia,Verdana,sans-serif}.theme-light .admin .message{color:#314cad}.theme-light .admin .prefix{font-weight:bolder}.theme-light .pm{font-size:110%}.theme-light .retro_translator{font-weight:bold}.theme-light .yautja_translator{color:#a00;font-weight:bold;animation:glitch .5s infinite}@keyframes glitch{25%{color:#a00;transform:translate(-2px, -1px)}50%{color:#be0000;transform:translate(1px, -2px)}75%{color:#8d0000;transform:translate(-1px, 2px)}100%{color:#830000;transform:translate(1px, 1px)}}.theme-light .examine_block{background:#f2f7fa;border:1px solid #111a27;margin:.5em;padding:.5em .75em}.theme-light .examine_block .icon{width:1.5em;height:1.5em;margin:0;padding:0}.theme-light .tooltip{font-style:italic;border-bottom:1px dashed #000} +html,body{box-sizing:border-box;height:100%;margin:0;font-size:12px}html{overflow:hidden;cursor:default}body{overflow:auto;font-family:Verdana,Geneva,sans-serif}*,*:before,*:after{box-sizing:inherit}h1,h2,h3,h4,h5,h6{display:block;margin:0;padding:6px 0;padding:.5rem 0}h1{font-size:18px;font-size:1.5rem}h2{font-size:16px;font-size:1.333rem}h3{font-size:14px;font-size:1.167rem}h4{font-size:12px;font-size:1rem}td,th{vertical-align:baseline;text-align:left}.candystripe:nth-child(odd){background-color:rgba(0,0,0,.25)}.color-black{color:#1a1a1a !important}.color-white{color:#fff !important}.color-red{color:#df3e3e !important}.color-orange{color:#f37f33 !important}.color-yellow{color:#fbda21 !important}.color-olive{color:#cbe41c !important}.color-green{color:#25ca4c !important}.color-teal{color:#00d6cc !important}.color-blue{color:#2e93de !important}.color-dark-blue{color:#005fa7 !important}.color-violet{color:#7349cf !important}.color-purple{color:#ad45d0 !important}.color-pink{color:#e34da1 !important}.color-brown{color:#b97447 !important}.color-grey{color:#848484 !important}.color-light-grey{color:#b3b3b3 !important}.color-good{color:#68c22d !important}.color-average{color:#f29a29 !important}.color-bad{color:#df3e3e !important}.color-label{color:#8b9bb0 !important}.color-xeno{color:#664573 !important}.color-bg-black{background-color:#000 !important}.color-bg-white{background-color:#d9d9d9 !important}.color-bg-red{background-color:#bd2020 !important}.color-bg-orange{background-color:#d95e0c !important}.color-bg-yellow{background-color:#d9b804 !important}.color-bg-olive{background-color:#9aad14 !important}.color-bg-green{background-color:#1b9638 !important}.color-bg-teal{background-color:#009a93 !important}.color-bg-blue{background-color:#1c71b1 !important}.color-bg-dark-blue{background-color:#003e6e !important}.color-bg-violet{background-color:#552dab !important}.color-bg-purple{background-color:#8b2baa !important}.color-bg-pink{background-color:#cf2082 !important}.color-bg-brown{background-color:#8c5836 !important}.color-bg-grey{background-color:#646464 !important}.color-bg-light-grey{background-color:#919191 !important}.color-bg-good{background-color:#4d9121 !important}.color-bg-average{background-color:#cd7a0d !important}.color-bg-bad{background-color:#bd2020 !important}.color-bg-label{background-color:#657a94 !important}.color-bg-xeno{background-color:#462f4e !important}.debug-layout,.debug-layout *:not(g):not(path){color:rgba(255,255,255,.9) !important;background:transparent !important;outline:1px solid rgba(255,255,255,.5) !important;box-shadow:none !important;filter:none !important}.debug-layout:hover,.debug-layout *:not(g):not(path):hover{outline-color:rgba(255,255,255,.8) !important}.outline-dotted{outline-style:dotted !important}.outline-dashed{outline-style:dashed !important}.outline-solid{outline-style:solid !important}.outline-double{outline-style:double !important}.outline-groove{outline-style:groove !important}.outline-ridge{outline-style:ridge !important}.outline-inset{outline-style:inset !important}.outline-outset{outline-style:outset !important}.outline-color-black{outline:.167rem solid #1a1a1a !important}.outline-color-white{outline:.167rem solid #fff !important}.outline-color-red{outline:.167rem solid #df3e3e !important}.outline-color-orange{outline:.167rem solid #f37f33 !important}.outline-color-yellow{outline:.167rem solid #fbda21 !important}.outline-color-olive{outline:.167rem solid #cbe41c !important}.outline-color-green{outline:.167rem solid #25ca4c !important}.outline-color-teal{outline:.167rem solid #00d6cc !important}.outline-color-blue{outline:.167rem solid #2e93de !important}.outline-color-dark-blue{outline:.167rem solid #005fa7 !important}.outline-color-violet{outline:.167rem solid #7349cf !important}.outline-color-purple{outline:.167rem solid #ad45d0 !important}.outline-color-pink{outline:.167rem solid #e34da1 !important}.outline-color-brown{outline:.167rem solid #b97447 !important}.outline-color-grey{outline:.167rem solid #848484 !important}.outline-color-light-grey{outline:.167rem solid #b3b3b3 !important}.outline-color-good{outline:.167rem solid #68c22d !important}.outline-color-average{outline:.167rem solid #f29a29 !important}.outline-color-bad{outline:.167rem solid #df3e3e !important}.outline-color-label{outline:.167rem solid #8b9bb0 !important}.outline-color-xeno{outline:.167rem solid #664573 !important}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.text-baseline{text-align:baseline}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-pre{white-space:pre}.text-bold{font-weight:bold}.text-italic{font-style:italic}.text-underline{text-decoration:underline}.BlockQuote{color:#8b9bb0;border-left:.1666666667em solid #8b9bb0;padding-left:.5em;margin-bottom:.5em}.BlockQuote:last-child{margin-bottom:0}.Button{position:relative;display:inline-block;line-height:1.667em;padding:0 .5em;margin-right:.1666666667em;white-space:nowrap;outline:0;border-radius:.16em;margin-bottom:.1666666667em;user-select:none;-ms-user-select:none}.Button:last-child{margin-right:0;margin-bottom:0}.Button .fa,.Button .fas,.Button .far{margin-left:-0.25em;margin-right:-0.25em;min-width:1.333em;text-align:center}.Button--hasContent .fa,.Button--hasContent .fas,.Button--hasContent .far{margin-right:.25em}.Button--hasContent.Button--iconPosition--right .fa,.Button--hasContent.Button--iconPosition--right .fas,.Button--hasContent.Button--iconPosition--right .far{margin-right:0px;margin-left:3px}.Button--ellipsis{overflow:hidden;text-overflow:ellipsis}.Button--fluid{display:block;margin-left:0;margin-right:0}.Button--circular{border-radius:50%}.Button--compact{padding:0 .25em;line-height:1.333em}.Button--color--black{transition:color 50ms,background-color 50ms;background-color:#000;color:#fff}.Button--color--black:hover{transition:color 0ms,background-color 0ms}.Button--color--black:focus{transition:color 100ms,background-color 100ms}.Button--color--black:hover,.Button--color--black:focus{background-color:#131313;color:#fff}.Button--color--white{transition:color 50ms,background-color 50ms;background-color:#d9d9d9;color:#000}.Button--color--white:hover{transition:color 0ms,background-color 0ms}.Button--color--white:focus{transition:color 100ms,background-color 100ms}.Button--color--white:hover,.Button--color--white:focus{background-color:#f8f8f8;color:#000}.Button--color--red{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--red:hover{transition:color 0ms,background-color 0ms}.Button--color--red:focus{transition:color 100ms,background-color 100ms}.Button--color--red:hover,.Button--color--red:focus{background-color:#dc4848;color:#fff}.Button--color--orange{transition:color 50ms,background-color 50ms;background-color:#d95e0c;color:#fff}.Button--color--orange:hover{transition:color 0ms,background-color 0ms}.Button--color--orange:focus{transition:color 100ms,background-color 100ms}.Button--color--orange:hover,.Button--color--orange:focus{background-color:#f0853f;color:#fff}.Button--color--yellow{transition:color 50ms,background-color 50ms;background-color:#d9b804;color:#000}.Button--color--yellow:hover{transition:color 0ms,background-color 0ms}.Button--color--yellow:focus{transition:color 100ms,background-color 100ms}.Button--color--yellow:hover,.Button--color--yellow:focus{background-color:#f5d72e;color:#000}.Button--color--olive{transition:color 50ms,background-color 50ms;background-color:#9aad14;color:#fff}.Button--color--olive:hover{transition:color 0ms,background-color 0ms}.Button--color--olive:focus{transition:color 100ms,background-color 100ms}.Button--color--olive:hover,.Button--color--olive:focus{background-color:#c4da2b;color:#fff}.Button--color--green{transition:color 50ms,background-color 50ms;background-color:#1b9638;color:#fff}.Button--color--green:hover{transition:color 0ms,background-color 0ms}.Button--color--green:focus{transition:color 100ms,background-color 100ms}.Button--color--green:hover,.Button--color--green:focus{background-color:#32c154;color:#fff}.Button--color--teal{transition:color 50ms,background-color 50ms;background-color:#009a93;color:#fff}.Button--color--teal:hover{transition:color 0ms,background-color 0ms}.Button--color--teal:focus{transition:color 100ms,background-color 100ms}.Button--color--teal:hover,.Button--color--teal:focus{background-color:#13c4bc;color:#fff}.Button--color--blue{transition:color 50ms,background-color 50ms;background-color:#1c71b1;color:#fff}.Button--color--blue:hover{transition:color 0ms,background-color 0ms}.Button--color--blue:focus{transition:color 100ms,background-color 100ms}.Button--color--blue:hover,.Button--color--blue:focus{background-color:#3a95d9;color:#fff}.Button--color--dark-blue{transition:color 50ms,background-color 50ms;background-color:#003e6e;color:#fff}.Button--color--dark-blue:hover{transition:color 0ms,background-color 0ms}.Button--color--dark-blue:focus{transition:color 100ms,background-color 100ms}.Button--color--dark-blue:hover,.Button--color--dark-blue:focus{background-color:#135b92;color:#fff}.Button--color--violet{transition:color 50ms,background-color 50ms;background-color:#552dab;color:#fff}.Button--color--violet:hover{transition:color 0ms,background-color 0ms}.Button--color--violet:focus{transition:color 100ms,background-color 100ms}.Button--color--violet:hover,.Button--color--violet:focus{background-color:#7953cc;color:#fff}.Button--color--purple{transition:color 50ms,background-color 50ms;background-color:#8b2baa;color:#fff}.Button--color--purple:hover{transition:color 0ms,background-color 0ms}.Button--color--purple:focus{transition:color 100ms,background-color 100ms}.Button--color--purple:hover,.Button--color--purple:focus{background-color:#ad4fcd;color:#fff}.Button--color--pink{transition:color 50ms,background-color 50ms;background-color:#cf2082;color:#fff}.Button--color--pink:hover{transition:color 0ms,background-color 0ms}.Button--color--pink:focus{transition:color 100ms,background-color 100ms}.Button--color--pink:hover,.Button--color--pink:focus{background-color:#e257a5;color:#fff}.Button--color--brown{transition:color 50ms,background-color 50ms;background-color:#8c5836;color:#fff}.Button--color--brown:hover{transition:color 0ms,background-color 0ms}.Button--color--brown:focus{transition:color 100ms,background-color 100ms}.Button--color--brown:hover,.Button--color--brown:focus{background-color:#b47851;color:#fff}.Button--color--grey{transition:color 50ms,background-color 50ms;background-color:#646464;color:#fff}.Button--color--grey:hover{transition:color 0ms,background-color 0ms}.Button--color--grey:focus{transition:color 100ms,background-color 100ms}.Button--color--grey:hover,.Button--color--grey:focus{background-color:#868686;color:#fff}.Button--color--light-grey{transition:color 50ms,background-color 50ms;background-color:#919191;color:#fff}.Button--color--light-grey:hover{transition:color 0ms,background-color 0ms}.Button--color--light-grey:focus{transition:color 100ms,background-color 100ms}.Button--color--light-grey:hover,.Button--color--light-grey:focus{background-color:#bababa;color:#fff}.Button--color--good{transition:color 50ms,background-color 50ms;background-color:#4d9121;color:#fff}.Button--color--good:hover{transition:color 0ms,background-color 0ms}.Button--color--good:focus{transition:color 100ms,background-color 100ms}.Button--color--good:hover,.Button--color--good:focus{background-color:#6cba39;color:#fff}.Button--color--average{transition:color 50ms,background-color 50ms;background-color:#cd7a0d;color:#fff}.Button--color--average:hover{transition:color 0ms,background-color 0ms}.Button--color--average:focus{transition:color 100ms,background-color 100ms}.Button--color--average:hover,.Button--color--average:focus{background-color:#ed9d35;color:#fff}.Button--color--bad{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--bad:hover{transition:color 0ms,background-color 0ms}.Button--color--bad:focus{transition:color 100ms,background-color 100ms}.Button--color--bad:hover,.Button--color--bad:focus{background-color:#dc4848;color:#fff}.Button--color--label{transition:color 50ms,background-color 50ms;background-color:#657a94;color:#fff}.Button--color--label:hover{transition:color 0ms,background-color 0ms}.Button--color--label:focus{transition:color 100ms,background-color 100ms}.Button--color--label:hover,.Button--color--label:focus{background-color:#91a1b3;color:#fff}.Button--color--xeno{transition:color 50ms,background-color 50ms;background-color:#462f4e;color:#fff}.Button--color--xeno:hover{transition:color 0ms,background-color 0ms}.Button--color--xeno:focus{transition:color 100ms,background-color 100ms}.Button--color--xeno:hover,.Button--color--xeno:focus{background-color:#64496d;color:#fff}.Button--color--default{transition:color 50ms,background-color 50ms;background-color:#3e6189;color:#fff}.Button--color--default:hover{transition:color 0ms,background-color 0ms}.Button--color--default:focus{transition:color 100ms,background-color 100ms}.Button--color--default:hover,.Button--color--default:focus{background-color:#5c83b0;color:#fff}.Button--color--caution{transition:color 50ms,background-color 50ms;background-color:#d9b804;color:#000}.Button--color--caution:hover{transition:color 0ms,background-color 0ms}.Button--color--caution:focus{transition:color 100ms,background-color 100ms}.Button--color--caution:hover,.Button--color--caution:focus{background-color:#f5d72e;color:#000}.Button--color--danger{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--danger:hover{transition:color 0ms,background-color 0ms}.Button--color--danger:focus{transition:color 100ms,background-color 100ms}.Button--color--danger:hover,.Button--color--danger:focus{background-color:#dc4848;color:#fff}.Button--color--transparent{transition:color 50ms,background-color 50ms;background-color:#202020;color:#fff;background-color:rgba(32,32,32,0);color:rgba(255,255,255,.5)}.Button--color--transparent:hover{transition:color 0ms,background-color 0ms}.Button--color--transparent:focus{transition:color 100ms,background-color 100ms}.Button--color--transparent:hover,.Button--color--transparent:focus{background-color:#383838;color:#fff}.Button--disabled{background-color:#999 !important}.Button--selected{transition:color 50ms,background-color 50ms;background-color:#1b9638;color:#fff}.Button--selected:hover{transition:color 0ms,background-color 0ms}.Button--selected:focus{transition:color 100ms,background-color 100ms}.Button--selected:hover,.Button--selected:focus{background-color:#32c154;color:#fff}.Button--flex{display:inline-flex;flex-direction:column}.Button--flex--fluid{width:100%}.Button--verticalAlignContent--top{justify-content:flex-start}.Button--verticalAlignContent--middle{justify-content:center}.Button--verticalAlignContent--bottom{justify-content:flex-end}.Button__content{display:block;align-self:stretch}.ColorBox{display:inline-block;width:1em;height:1em;line-height:1em;text-align:center}.Dimmer{display:flex;justify-content:center;align-items:center;position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(0,0,0,.75);z-index:1}.Divider--horizontal{margin:.5em 0}.Divider--horizontal:not(.Divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Divider--vertical{height:100%;margin:0 .5em}.Divider--vertical:not(.Divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Dropdown{position:relative}.Dropdown__control{position:relative;display:inline-block;font-family:Verdana,sans-serif;font-size:1em;width:8.3333333333em;line-height:1.4166666667em;user-select:none}.Dropdown__arrow-button{float:right;padding-left:.35em;width:1.2em;height:1.8333333333em;border-left:.0833333333em solid #000;border-left:.0833333333em solid rgba(0,0,0,.25)}.Dropdown__menu{position:absolute;overflow-y:auto;z-index:5;width:8.3333333333em;max-height:16.6666666667em;overflow-y:scroll;border-radius:0 0 .1666666667em .1666666667em;color:#fff;background-color:#000;background-color:rgba(0,0,0,.75)}.Dropdown__menu-noscroll{position:absolute;overflow-y:auto;z-index:5;width:8.3333333333em;max-height:16.6666666667em;border-radius:0 0 .1666666667em .1666666667em;color:#fff;background-color:#000;background-color:rgba(0,0,0,.75)}.Dropdown__menuentry{padding:.1666666667em .3333333333em;font-family:Verdana,sans-serif;font-size:1em;line-height:1.4166666667em;transition:background-color 100ms ease-out}.Dropdown__menuentry:hover{background-color:rgba(255,255,255,.2);transition:background-color 0ms}.Dropdown__over{top:auto;bottom:100%}.Dropdown__selected-text{display:inline-block;text-overflow:ellipsis;white-space:nowrap;height:1.4166666667em;width:calc(100% - 1.2em)}.Flex{display:-ms-flexbox;display:flex}.Flex--inline{display:inline-flex}.Flex--iefix{display:block}.Flex--iefix.Flex--inline{display:inline-block}.Flex__item--iefix{display:inline-block}.Flex--iefix--column>.Flex__item--iefix{display:block}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:transparent}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:"Consolas",monospace}.Knob{position:relative;font-size:1rem;width:2.6em;height:2.6em;margin:0 auto;margin-bottom:-0.2em;cursor:n-resize}.Knob:after{content:".";color:transparent;line-height:2.5em}.Knob__circle{position:absolute;top:.1em;bottom:.1em;left:.1em;right:.1em;margin:.3em;background-color:#333;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 0.15) 0%, rgba(255, 255, 255, 0) 100%);border-radius:50%;box-shadow:0 .05em .5em 0 rgba(0,0,0,.5)}.Knob__cursorBox{position:absolute;top:0;bottom:0;left:0;right:0}.Knob__cursor{position:relative;top:.05em;margin:0 auto;width:.2em;height:.8em;background-color:rgba(255,255,255,.9)}.Knob__popupValue{position:absolute;top:-2rem;right:50%;font-size:1rem;text-align:center;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.Knob__ring{position:absolute;top:0;bottom:0;left:0;right:0;padding:.1em}.Knob__ringTrackPivot{transform:rotateZ(135deg)}.Knob__ringTrack{fill:transparent;stroke:rgba(255,255,255,.1);stroke-width:8;stroke-linecap:round;stroke-dasharray:235.62}.Knob__ringFillPivot{transform:rotateZ(135deg)}.Knob--bipolar .Knob__ringFillPivot{transform:rotateZ(270deg)}.Knob__ringFill{fill:transparent;stroke:#6a96c9;stroke-width:8;stroke-linecap:round;stroke-dasharray:314.16;transition:stroke 50ms ease-out}.Knob--color--black .Knob__ringFill{stroke:#1a1a1a}.Knob--color--white .Knob__ringFill{stroke:#fff}.Knob--color--red .Knob__ringFill{stroke:#df3e3e}.Knob--color--orange .Knob__ringFill{stroke:#f37f33}.Knob--color--yellow .Knob__ringFill{stroke:#fbda21}.Knob--color--olive .Knob__ringFill{stroke:#cbe41c}.Knob--color--green .Knob__ringFill{stroke:#25ca4c}.Knob--color--teal .Knob__ringFill{stroke:#00d6cc}.Knob--color--blue .Knob__ringFill{stroke:#2e93de}.Knob--color--dark-blue .Knob__ringFill{stroke:#005fa7}.Knob--color--violet .Knob__ringFill{stroke:#7349cf}.Knob--color--purple .Knob__ringFill{stroke:#ad45d0}.Knob--color--pink .Knob__ringFill{stroke:#e34da1}.Knob--color--brown .Knob__ringFill{stroke:#b97447}.Knob--color--grey .Knob__ringFill{stroke:#848484}.Knob--color--light-grey .Knob__ringFill{stroke:#b3b3b3}.Knob--color--good .Knob__ringFill{stroke:#68c22d}.Knob--color--average .Knob__ringFill{stroke:#f29a29}.Knob--color--bad .Knob__ringFill{stroke:#df3e3e}.Knob--color--label .Knob__ringFill{stroke:#8b9bb0}.Knob--color--xeno .Knob__ringFill{stroke:#664573}.LabeledList{display:table;width:100%;width:calc(100% + 1em);border-collapse:collapse;border-spacing:0;margin:-0.25em -0.5em;margin-bottom:0;padding:0}.LabeledList__row{display:table-row}.LabeledList__row:last-child .LabeledList__cell{padding-bottom:0}.LabeledList__cell{display:table-cell;margin:0;padding:.25em .5em;border:0;text-align:left}.LabeledList__label--nowrap{width:1%;white-space:nowrap;min-width:5em}.LabeledList__buttons{width:.1%;white-space:nowrap;text-align:right;padding-top:.0833333333em;padding-bottom:0}.Modal{background-color:#202020;max-width:calc(100% - 1rem);padding:1rem}.NoticeBox{padding:.33em .5em;margin-bottom:.5em;box-shadow:none;font-weight:bold;font-style:italic;color:#000;background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg, transparent, transparent 0.8333333333em, rgba(0, 0, 0, 0.1) 0.8333333333em, rgba(0, 0, 0, 0.1) 1.6666666667em)}.NoticeBox--color--black{color:#fff;background-color:#000}.NoticeBox--color--white{color:#000;background-color:#b3b3b3}.NoticeBox--color--red{color:#fff;background-color:#701f1f}.NoticeBox--color--orange{color:#fff;background-color:#854114}.NoticeBox--color--yellow{color:#000;background-color:#83710d}.NoticeBox--color--olive{color:#000;background-color:#576015}.NoticeBox--color--green{color:#fff;background-color:#174e24}.NoticeBox--color--teal{color:#fff;background-color:#064845}.NoticeBox--color--blue{color:#fff;background-color:#1b4565}.NoticeBox--color--dark-blue{color:#fff;background-color:#02121f}.NoticeBox--color--violet{color:#fff;background-color:#3b2864}.NoticeBox--color--purple{color:#fff;background-color:#542663}.NoticeBox--color--pink{color:#fff;background-color:#802257}.NoticeBox--color--brown{color:#fff;background-color:#4c3729}.NoticeBox--color--grey{color:#fff;background-color:#3e3e3e}.NoticeBox--color--light-grey{color:#fff;background-color:#6a6a6a}.NoticeBox--color--good{color:#fff;background-color:#2e4b1a}.NoticeBox--color--average{color:#fff;background-color:#7b4e13}.NoticeBox--color--bad{color:#fff;background-color:#701f1f}.NoticeBox--color--label{color:#fff;background-color:#53565a}.NoticeBox--color--xeno{color:#fff;background-color:#19161b}.NoticeBox--type--info{color:#fff;background-color:#235982}.NoticeBox--type--success{color:#fff;background-color:#1e662f}.NoticeBox--type--warning{color:#fff;background-color:#a95219}.NoticeBox--type--danger{color:#fff;background-color:#8f2828}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:transparent}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:"Consolas",monospace}.NumberInput{position:relative;display:inline-block;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#88bfff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;text-align:right;overflow:visible;cursor:n-resize}.NumberInput--fluid{display:block}.NumberInput__content{margin-left:.5em}.NumberInput__barContainer{position:absolute;top:.1666666667em;bottom:.1666666667em;left:.1666666667em}.NumberInput__bar{position:absolute;bottom:0;left:0;width:.25em;box-sizing:border-box;border-bottom:.0833333333em solid #88bfff;background-color:#88bfff}.NumberInput__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:#0a0a0a;color:#fff;text-align:right}.ProgressBar{display:inline-block;position:relative;width:100%;padding:0 .5em;border-width:.0833333333em !important;border-style:solid !important;border-radius:.16em;background-color:rgba(0,0,0,0);transition:border-color 900ms ease-out}.ProgressBar__fill{position:absolute;top:-0.5px;left:0px;bottom:-0.5px}.ProgressBar__fill--animated{transition:background-color 900ms ease-out,width 900ms ease-out}.ProgressBar__content{position:relative;line-height:1.4166666667em;width:100%;text-align:right}.ProgressBar--color--default{border:.0833333333em solid #3e6189}.ProgressBar--color--default .ProgressBar__fill{background-color:#3e6189}.ProgressBar--color--black{border-color:#000 !important}.ProgressBar--color--black .ProgressBar__fill{background-color:#000}.ProgressBar--color--white{border-color:#d9d9d9 !important}.ProgressBar--color--white .ProgressBar__fill{background-color:#d9d9d9}.ProgressBar--color--red{border-color:#bd2020 !important}.ProgressBar--color--red .ProgressBar__fill{background-color:#bd2020}.ProgressBar--color--orange{border-color:#d95e0c !important}.ProgressBar--color--orange .ProgressBar__fill{background-color:#d95e0c}.ProgressBar--color--yellow{border-color:#d9b804 !important}.ProgressBar--color--yellow .ProgressBar__fill{background-color:#d9b804}.ProgressBar--color--olive{border-color:#9aad14 !important}.ProgressBar--color--olive .ProgressBar__fill{background-color:#9aad14}.ProgressBar--color--green{border-color:#1b9638 !important}.ProgressBar--color--green .ProgressBar__fill{background-color:#1b9638}.ProgressBar--color--teal{border-color:#009a93 !important}.ProgressBar--color--teal .ProgressBar__fill{background-color:#009a93}.ProgressBar--color--blue{border-color:#1c71b1 !important}.ProgressBar--color--blue .ProgressBar__fill{background-color:#1c71b1}.ProgressBar--color--dark-blue{border-color:#003e6e !important}.ProgressBar--color--dark-blue .ProgressBar__fill{background-color:#003e6e}.ProgressBar--color--violet{border-color:#552dab !important}.ProgressBar--color--violet .ProgressBar__fill{background-color:#552dab}.ProgressBar--color--purple{border-color:#8b2baa !important}.ProgressBar--color--purple .ProgressBar__fill{background-color:#8b2baa}.ProgressBar--color--pink{border-color:#cf2082 !important}.ProgressBar--color--pink .ProgressBar__fill{background-color:#cf2082}.ProgressBar--color--brown{border-color:#8c5836 !important}.ProgressBar--color--brown .ProgressBar__fill{background-color:#8c5836}.ProgressBar--color--grey{border-color:#646464 !important}.ProgressBar--color--grey .ProgressBar__fill{background-color:#646464}.ProgressBar--color--light-grey{border-color:#919191 !important}.ProgressBar--color--light-grey .ProgressBar__fill{background-color:#919191}.ProgressBar--color--good{border-color:#4d9121 !important}.ProgressBar--color--good .ProgressBar__fill{background-color:#4d9121}.ProgressBar--color--average{border-color:#cd7a0d !important}.ProgressBar--color--average .ProgressBar__fill{background-color:#cd7a0d}.ProgressBar--color--bad{border-color:#bd2020 !important}.ProgressBar--color--bad .ProgressBar__fill{background-color:#bd2020}.ProgressBar--color--label{border-color:#657a94 !important}.ProgressBar--color--label .ProgressBar__fill{background-color:#657a94}.ProgressBar--color--xeno{border-color:#462f4e !important}.ProgressBar--color--xeno .ProgressBar__fill{background-color:#462f4e}.Section{position:relative;margin-bottom:.5em;background-color:#131313;background-color:#131313;box-sizing:border-box}.Section:last-child{margin-bottom:0}.Section__title{position:relative;padding:.5em;border-bottom:.1666666667em solid #4972a1}.Section__titleText{font-size:1.1666666667em;font-weight:bold;color:#fff}.Section__buttons{position:absolute;display:inline-block;right:.5em;margin-top:-.0833333333em}.Section__rest{position:relative}.Section__content{padding:.66em .5em}.Section--fitted>.Section__rest>.Section__content{padding:0}.Section--fill{display:flex;flex-direction:column;height:100%}.Section--fill>.Section__rest{flex-grow:1}.Section--fill>.Section__rest>.Section__content{height:100%}.Section--fill.Section--scrollable>.Section__rest>.Section__content{position:absolute;top:0;left:0;right:0;bottom:0}.Section--fill.Section--iefix{display:table !important;width:100% !important;height:100% !important;border-collapse:collapse;border-spacing:0}.Section--fill.Section--iefix>.Section__rest{display:table-row !important;height:100% !important}.Section--scrollable{overflow-x:hidden;overflow-y:hidden}.Section--scrollable>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:hidden}.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:hidden;overflow-x:scroll}.Section--scrollable.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.Section--scrollable.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:scroll}.Section .Section{background-color:transparent;margin-left:-0.5em;margin-right:-0.5em}.Section .Section:first-child{margin-top:-0.5em}.Section .Section .Section__titleText{font-size:1.0833333333em}.Section .Section .Section .Section__titleText{font-size:1em}.Slider{cursor:e-resize}.Slider__cursorOffset{position:absolute;top:0;left:0;bottom:0;transition:none !important}.Slider__cursor{position:absolute;top:0;right:-.0833333333em;bottom:0;width:0;border-left:.1666666667em solid #fff}.Slider__pointer{position:absolute;right:-.4166666667em;bottom:-.3333333333em;width:0;height:0;border-left:.4166666667em solid transparent;border-right:.4166666667em solid transparent;border-bottom:.4166666667em solid #fff}.Slider__popupValue{position:absolute;right:0;top:-2rem;font-size:1rem;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.Divider--horizontal{margin:.5em 0}.Divider--horizontal:not(.Divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Divider--vertical{height:100%;margin:0 .5em}.Divider--vertical:not(.Divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Stack--fill{height:100%}.Stack--horizontal>.Stack__item{margin-left:.5em}.Stack--horizontal>.Stack__item:first-child{margin-left:0}.Stack--vertical>.Stack__item{margin-top:.5em}.Stack--vertical>.Stack__item:first-child{margin-top:0}.Stack--horizontal>.Stack__divider:not(.Stack__divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Stack--vertical>.Stack__divider:not(.Stack__divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Table{display:table;width:100%;border-collapse:collapse;border-spacing:0;margin:0}.Table--collapsing{width:auto}.Table__row{display:table-row}.Table__cell{display:table-cell;padding:0 .25em}.Table__cell:first-child{padding-left:0}.Table__cell:last-child{padding-right:0}.Table__row--header .Table__cell,.Table__cell--header{font-weight:bold;padding-bottom:.5em}.Table__cell--collapsing{width:1%;white-space:nowrap}.Tabs{display:flex;align-items:stretch;overflow:hidden;background-color:#131313}.Tabs--fill{height:100%}.Section .Tabs{background-color:transparent}.Section:not(.Section--fitted) .Tabs{margin:0 -0.5em .5em}.Section:not(.Section--fitted) .Tabs:first-child{margin-top:-0.5em}.Tabs--vertical{flex-direction:column;padding:.25em 0 .25em .25em}.Tabs--horizontal{margin-bottom:.5em;padding:.25em .25em 0 .25em}.Tabs--horizontal:last-child{margin-bottom:0}.Tabs__Tab{flex-grow:0}.Tabs--fluid .Tabs__Tab{flex-grow:1}.Tab{display:flex;align-items:center;justify-content:space-between;background-color:transparent;color:rgba(255,255,255,.5);min-height:2.25em;min-width:4em}.Tab:not(.Tab--selected):hover{background-color:rgba(255,255,255,.075)}.Tab--selected{background-color:rgba(255,255,255,.125);color:#dfe7f0}.Tab__text{flex-grow:1;margin:0 .5em}.Tab__left{min-width:1.5em;text-align:center;margin-left:.25em}.Tab__right{min-width:1.5em;text-align:center;margin-right:.25em}.Tabs--horizontal .Tab{border-top:.1666666667em solid transparent;border-bottom:.1666666667em solid transparent;border-top-left-radius:.25em;border-top-right-radius:.25em}.Tabs--horizontal .Tab--selected{border-bottom:.1666666667em solid #d4dfec}.Tabs--vertical .Tab{min-height:2em;border-left:.1666666667em solid transparent;border-right:.1666666667em solid transparent;border-top-left-radius:.25em;border-bottom-left-radius:.25em}.Tabs--vertical .Tab--selected{border-right:.1666666667em solid #d4dfec}.Tab--selected.Tab--color--black{color:#535353}.Tabs--horizontal .Tab--selected.Tab--color--black{border-bottom-color:#1a1a1a}.Tabs--vertical .Tab--selected.Tab--color--black{border-right-color:#1a1a1a}.Tab--selected.Tab--color--white{color:#fff}.Tabs--horizontal .Tab--selected.Tab--color--white{border-bottom-color:#fff}.Tabs--vertical .Tab--selected.Tab--color--white{border-right-color:#fff}.Tab--selected.Tab--color--red{color:#e76e6e}.Tabs--horizontal .Tab--selected.Tab--color--red{border-bottom-color:#df3e3e}.Tabs--vertical .Tab--selected.Tab--color--red{border-right-color:#df3e3e}.Tab--selected.Tab--color--orange{color:#f69f66}.Tabs--horizontal .Tab--selected.Tab--color--orange{border-bottom-color:#f37f33}.Tabs--vertical .Tab--selected.Tab--color--orange{border-right-color:#f37f33}.Tab--selected.Tab--color--yellow{color:#fce358}.Tabs--horizontal .Tab--selected.Tab--color--yellow{border-bottom-color:#fbda21}.Tabs--vertical .Tab--selected.Tab--color--yellow{border-right-color:#fbda21}.Tab--selected.Tab--color--olive{color:#d8eb55}.Tabs--horizontal .Tab--selected.Tab--color--olive{border-bottom-color:#cbe41c}.Tabs--vertical .Tab--selected.Tab--color--olive{border-right-color:#cbe41c}.Tab--selected.Tab--color--green{color:#53e074}.Tabs--horizontal .Tab--selected.Tab--color--green{border-bottom-color:#25ca4c}.Tabs--vertical .Tab--selected.Tab--color--green{border-right-color:#25ca4c}.Tab--selected.Tab--color--teal{color:#21fff5}.Tabs--horizontal .Tab--selected.Tab--color--teal{border-bottom-color:#00d6cc}.Tabs--vertical .Tab--selected.Tab--color--teal{border-right-color:#00d6cc}.Tab--selected.Tab--color--blue{color:#62aee6}.Tabs--horizontal .Tab--selected.Tab--color--blue{border-bottom-color:#2e93de}.Tabs--vertical .Tab--selected.Tab--color--blue{border-right-color:#2e93de}.Tab--selected.Tab--color--dark-blue{color:#008ffd}.Tabs--horizontal .Tab--selected.Tab--color--dark-blue{border-bottom-color:#005fa7}.Tabs--vertical .Tab--selected.Tab--color--dark-blue{border-right-color:#005fa7}.Tab--selected.Tab--color--violet{color:#9676db}.Tabs--horizontal .Tab--selected.Tab--color--violet{border-bottom-color:#7349cf}.Tabs--vertical .Tab--selected.Tab--color--violet{border-right-color:#7349cf}.Tab--selected.Tab--color--purple{color:#c274db}.Tabs--horizontal .Tab--selected.Tab--color--purple{border-bottom-color:#ad45d0}.Tabs--vertical .Tab--selected.Tab--color--purple{border-right-color:#ad45d0}.Tab--selected.Tab--color--pink{color:#ea79b9}.Tabs--horizontal .Tab--selected.Tab--color--pink{border-bottom-color:#e34da1}.Tabs--vertical .Tab--selected.Tab--color--pink{border-right-color:#e34da1}.Tab--selected.Tab--color--brown{color:#ca9775}.Tabs--horizontal .Tab--selected.Tab--color--brown{border-bottom-color:#b97447}.Tabs--vertical .Tab--selected.Tab--color--brown{border-right-color:#b97447}.Tab--selected.Tab--color--grey{color:#a3a3a3}.Tabs--horizontal .Tab--selected.Tab--color--grey{border-bottom-color:#848484}.Tabs--vertical .Tab--selected.Tab--color--grey{border-right-color:#848484}.Tab--selected.Tab--color--light-grey{color:#c6c6c6}.Tabs--horizontal .Tab--selected.Tab--color--light-grey{border-bottom-color:#b3b3b3}.Tabs--vertical .Tab--selected.Tab--color--light-grey{border-right-color:#b3b3b3}.Tab--selected.Tab--color--good{color:#8cd95a}.Tabs--horizontal .Tab--selected.Tab--color--good{border-bottom-color:#68c22d}.Tabs--vertical .Tab--selected.Tab--color--good{border-right-color:#68c22d}.Tab--selected.Tab--color--average{color:#f5b35e}.Tabs--horizontal .Tab--selected.Tab--color--average{border-bottom-color:#f29a29}.Tabs--vertical .Tab--selected.Tab--color--average{border-right-color:#f29a29}.Tab--selected.Tab--color--bad{color:#e76e6e}.Tabs--horizontal .Tab--selected.Tab--color--bad{border-bottom-color:#df3e3e}.Tabs--vertical .Tab--selected.Tab--color--bad{border-right-color:#df3e3e}.Tab--selected.Tab--color--label{color:#a8b4c4}.Tabs--horizontal .Tab--selected.Tab--color--label{border-bottom-color:#8b9bb0}.Tabs--vertical .Tab--selected.Tab--color--label{border-right-color:#8b9bb0}.Tab--selected.Tab--color--xeno{color:#9366a3}.Tabs--horizontal .Tab--selected.Tab--color--xeno{border-bottom-color:#664573}.Tabs--vertical .Tab--selected.Tab--color--xeno{border-right-color:#664573}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:transparent}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:"Consolas",monospace}.TextArea{position:relative;display:inline-block;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;background-color:#0a0a0a;margin-right:.1666666667em;line-height:1.4166666667em;box-sizing:border-box;width:100%}.TextArea--fluid{display:block;width:auto;height:auto}.TextArea--noborder{border:0px}.TextArea__textarea.TextArea__textarea--scrollable{overflow:auto;overflow-x:hidden;overflow-y:scroll}.TextArea__textarea{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;height:100%;font-size:1em;line-height:1.4166666667em;min-height:1.4166666667em;margin:0;padding:0 .5em;font-family:inherit;background-color:transparent;color:inherit;box-sizing:border-box;word-wrap:break-word;overflow:hidden}.TextArea__textarea:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.TextArea__textarea_custom{overflow:visible;white-space:pre-wrap}.Tooltip{z-index:2;padding:.5em .75em;pointer-events:none;text-align:left;transition:opacity 150ms ease-out;background-color:#000;color:#fff;box-shadow:.1em .1em 1.25em -0.1em rgba(0,0,0,.5);border-radius:.16em;max-width:20.8333333333em}.Chat{color:#abc6ec}.Chat__badge{display:inline-block;min-width:.5em;font-size:.7em;padding:.2em .3em;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:crimson;border-radius:10px;transition:font-size 200ms ease-out}.Chat__badge:before{content:"x"}.Chat__badge--animate{font-size:.9em;transition:font-size 0ms}.Chat__scrollButton{position:fixed;right:2em;bottom:1em}.Chat__reconnected{font-size:.85em;text-align:center;margin:1em 0 2em}.Chat__reconnected:before{content:"Reconnected";display:inline-block;border-radius:1em;padding:0 .7em;color:#db2828;background-color:#131313}.Chat__reconnected:after{content:"";display:block;margin-top:-0.75em;border-bottom:.1666666667em solid #db2828}.Chat__highlight{color:#000}.Chat__highlight--restricted{color:#fff;background-color:#a00;font-weight:bold}.ChatMessage{word-wrap:break-word}.ChatMessage--highlighted{position:relative;border-left:.1666666667em solid #fd4;padding-left:.5em}.ChatMessage--highlighted:after{content:"";position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(255,221,68,.1);pointer-events:none}.Ping{position:relative;padding:.125em .25em;border:.0833333333em solid rgba(140,140,140,.5);border-radius:.25em;width:3.75em;text-align:right}.Ping__indicator{content:"";position:absolute;top:.5em;left:.5em;width:.5em;height:.5em;background-color:#888;border-radius:.25em}.Notifications{position:absolute;bottom:1em;left:1em;right:2em}.Notification{color:#fff;background-color:crimson;padding:.5em;margin:1em 0}.Notification:first-child{margin-top:0}.Notification:last-child{margin-bottom:0}.Layout,.Layout *{scrollbar-base-color:#181818;scrollbar-face-color:#363636;scrollbar-3dlight-color:#202020;scrollbar-highlight-color:#202020;scrollbar-track-color:#181818;scrollbar-arrow-color:#909090;scrollbar-shadow-color:#363636}.Layout__content{position:absolute;top:0;bottom:0;left:0;right:0;overflow-x:hidden;overflow-y:hidden}.Layout__content--scrollable{overflow-y:scroll;margin-bottom:0}.Window{position:fixed;top:0;bottom:0;left:0;right:0;color:#fff;background-color:#202020;background-image:linear-gradient(to bottom, #202020 0%, #202020 100%)}.Window__titleBar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;height:2.6666666667rem}.Window__rest{position:fixed;top:32px;top:2.6666666667rem;bottom:0;left:0;right:0}.Window__contentPadding{margin:.5rem;height:100%;height:calc(100% - 1.01rem)}.Window__contentPadding:after{height:0}.Layout__content--scrollable .Window__contentPadding:after{display:block;content:"";height:.5rem}.Window__dimmer{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(56,56,56,.25);pointer-events:none}.Window__resizeHandle__se{position:fixed;bottom:0;right:0;width:20px;width:1.6666666667rem;height:20px;height:1.6666666667rem;cursor:se-resize}.Window__resizeHandle__s{position:fixed;bottom:0;left:0;right:0;height:6px;height:.5rem;cursor:s-resize}.Window__resizeHandle__e{position:fixed;top:0;bottom:0;right:0;width:3px;width:.25rem;cursor:e-resize}em{font-style:normal;font-weight:bold}img{margin:0;padding:0;line-height:1;-ms-interpolation-mode:nearest-neighbor;image-rendering:pixelated}img.icon{height:1em;min-height:16px;width:auto;vertical-align:bottom}a{color:#397ea5}a.visited{color:#7c00e6}a:visited{color:#7c00e6}a.popt{text-decoration:none}.popup{position:fixed;top:50%;left:50%;background:#ddd}.popup .close{position:absolute;background:#aaa;top:0;right:0;color:#333;text-decoration:none;z-index:2;padding:0 10px;height:30px;line-height:30px}.popup .close:hover{background:#999}.popup .head{background:#999;color:#ddd;padding:0 10px;height:30px;line-height:30px;text-transform:uppercase;font-size:.9em;font-weight:bold;border-bottom:2px solid green}.popup input{border:1px solid #999;background:#fff;margin:0;padding:5px;outline:none;color:#333}.popup input[type=text]:hover,.popup input[type=text]:active,.popup input[type=text]:focus{border-color:green}.popup input[type=submit]{padding:5px 10px;background:#999;color:#ddd;text-transform:uppercase;font-size:.9em;font-weight:bold}.popup input[type=submit]:hover,.popup input[type=submit]:focus,.popup input[type=submit]:active{background:#aaa;cursor:pointer}.changeFont{padding:10px}.changeFont a{display:block;text-decoration:none;padding:3px;color:#333}.changeFont a:hover{background:#ccc}.highlightPopup{padding:10px;text-align:center}.highlightPopup input[type=text]{display:block;width:215px;text-align:left;margin-top:5px}.highlightPopup input.highlightColor{background-color:#ff0}.highlightPopup input.highlightTermSubmit{margin-top:5px}.contextMenu{background-color:#ddd;position:fixed;margin:2px;width:150px}.contextMenu a{display:block;padding:2px 5px;text-decoration:none;color:#333}.contextMenu a:hover{background-color:#ccc}.filterMessages{padding:5px}.filterMessages div{padding:2px 0}.icon-stack{height:1em;line-height:1em;width:1em;vertical-align:middle;margin-top:-2px}.motd{color:#a4bad6;font-family:Verdana,sans-serif;white-space:normal}.motd h1,.motd h2,.motd h3,.motd h4,.motd h5,.motd h6{color:#a4bad6;text-decoration:underline}.motd a,.motd a:link,.motd a:visited,.motd a:active,.motd a:hover{color:#a4bad6}.bold,.name,.prefix,.ooc,.looc,.adminooc,.admin,.medal,.yell{font-weight:bold}.italic,.italics{font-style:italic}.highlight{background:#ff0}h1,h2,h3,h4,h5,h6{color:#a4bad6;font-family:Georgia,Verdana,sans-serif}h1.alert,h2.alert{color:#a4bad6}em{font-style:normal;font-weight:bold}.ooc{font-weight:bold}.adminobserverooc{color:#09c;font-weight:bold}.adminooc{color:#3d5bc3;font-weight:bold}.adminsay{color:#9611d4;font-weight:bold}.admin{color:#5975da;font-weight:bold}.name{font-weight:bold}.deadsay{color:#e2c1ff}.binarysay{color:#1e90ff}.binarysay a{color:lime}.binarysay a:active,.binarysay a:visited{color:#8f8}.radio{color:#1ecc43}.sciradio{color:#c68cfa}.comradio{color:#fcdf03}.secradio{color:#dd3535}.medradio{color:#57b8f0}.engradio{color:#f37746}.suppradio{color:#b88646}.servradio{color:#6ca729}.syndradio{color:#8f4a4b}.gangradio{color:#ac2ea1}.centcomradio{color:#2681a5}.aiprivradio{color:#d65d95}.redteamradio{color:#f44}.blueteamradio{color:#3434fd}.greenteamradio{color:#34fd34}.yellowteamradio{color:#fdfd34}.yell{font-weight:bold}.alert{color:#d82020}.userdanger{color:#c51e1e;font-weight:bold;font-size:185%}.bolddanger{color:#c51e1e;font-weight:bold}.danger{color:#c51e1e}.warning{color:#c51e1e;font-style:italic}.alertwarning{color:red;font-weight:bold}.boldwarning{color:#c51e1e;font-style:italic;font-weight:bold}.announce{color:#c51e1e;font-weight:bold}.boldannounce{color:#c51e1e;font-weight:bold}.minorannounce{font-weight:bold;font-size:185%}.greenannounce{color:#059223;font-weight:bold}.rose{color:#ff5050}.info{color:#9ab0ff}.notice{color:#6685f5}.staff_ic{color:#6685f5}.tinynotice{color:#6685f5;font-size:85%}.tinynoticeital{color:#6685f5;font-style:italic;font-size:85%}.smallnotice{color:#6685f5;font-size:90%}.smallnoticeital{color:#6685f5;font-style:italic;font-size:90%}.boldnotice{color:#6685f5;font-weight:bold}.hear{color:#6685f5;font-style:italic}.adminnotice{color:#6685f5}.adminhelp{color:red;font-weight:bold}.unconscious{color:#a4bad6;font-weight:bold}.suicide{color:#ff5050;font-style:italic}.green{color:#059223}.grey{color:#838383}.red{color:red}.blue{color:#215cff}.nicegreen{color:#059223}.boldnicegreen{color:#059223;font-weight:bold}.cult{color:#973e3b}.cultitalic{color:#973e3b;font-style:italic}.cultbold{color:#973e3b;font-style:italic;font-weight:bold}.cultboldtalic{color:#973e3b;font-weight:bold;font-size:185%}.cultlarge{color:#973e3b;font-weight:bold;font-size:185%}.narsie{color:#973e3b;font-weight:bold;font-size:925%}.narsiesmall{color:#973e3b;font-weight:bold;font-size:370%}.colossus{color:#7f282a;font-size:310%}.hierophant{color:#b441ee;font-weight:bold;font-style:italic}.hierophant_warning{color:#c56bf1;font-style:italic}.purple{color:#9956d3}.holoparasite{color:#88809c}.revennotice{color:#c099e2}.revenboldnotice{color:#c099e2;font-weight:bold}.revenbignotice{color:#c099e2;font-weight:bold;font-size:185%}.revenminor{color:#823abb}.revenwarning{color:#760fbb;font-style:italic}.revendanger{color:#760fbb;font-weight:bold;font-size:185%}.deconversion_message{color:#a947ff;font-size:185%;font-style:italic}.ghostalert{color:#60f;font-style:italic;font-weight:bold}.alien{color:#855d85}.noticealien{color:#059223}.alertalien{color:#059223;font-weight:bold}.changeling{color:#059223;font-style:italic}.alertsyndie{color:red;font-size:185%;font-weight:bold}.spider{color:#80f;font-weight:bold;font-size:185%}.interface{color:#750e75}.sans{font-family:"Comic Sans MS",cursive,sans-serif}.papyrus{font-family:"Papyrus",cursive,sans-serif}.robot{font-family:"Courier New",cursive,sans-serif}.tape_recorder{color:red;font-family:"Courier New",cursive,sans-serif}.command_headset{font-weight:bold;font-size:160%}.small{font-size:60%}.big{font-size:185%}.reallybig{font-size:245%}.extremelybig{font-size:310%}.greentext{color:#059223;font-size:185%}.redtext{color:#c51e1e;font-size:185%}.clown{color:#ff70c1;font-size:160%;font-family:"Comic Sans MS",cursive,sans-serif;font-weight:bold}.singing{font-family:"Trebuchet MS",cursive,sans-serif;font-style:italic}.his_grace{color:#15d512;font-family:"Courier New",cursive,sans-serif;font-style:italic}.hypnophrase{color:#202020;font-weight:bold;animation:hypnocolor 1500ms infinite;animation-direction:alternate}@keyframes hypnocolor{0%{color:#202020}25%{color:#4b02ac}50%{color:#9f41f1}75%{color:#541c9c}100%{color:#7adbf3}}.phobia{color:#d00;font-weight:bold;animation:phobia 750ms infinite}@keyframes phobia{0%{color:#f75a5a}50%{color:#d00}100%{color:#f75a5a}}.icon{height:1em;width:auto}.bigicon{font-size:2.5em}.memo{color:#638500;text-align:center}.memoedit{text-align:center;font-size:125%}.abductor{color:#c204c2;font-style:italic}.mind_control{color:#df3da9;font-size:100%;font-weight:bold;font-style:italic}.slime{color:#00ced1}.drone{color:#848482}.monkey{color:#975032}.swarmer{color:#2c75ff}.resonate{color:#298f85}.monkeyhive{color:#a56408}.monkeylead{color:#af6805;font-size:80%}.connectionClosed,.fatalError{background:red;color:#fff;padding:5px}.connectionClosed.restored{background:green}.internal.boldnshit{color:#3d5bc3;font-weight:bold}.text-normal{font-weight:normal;font-style:normal}.hidden{display:none;visibility:hidden}.ml-1{margin-left:1em}.ml-2{margin-left:2em}.ml-3{margin-left:3em}.xooc{color:#ac04e9;font-weight:bold;font-size:140%}.mooc{color:#090;font-weight:bold;font-size:140%}.yooc{color:#999600;font-weight:bold;font-size:140%}.headminsay{color:#653d78;font-weight:bold}.radio{color:#b4b4b4}.deptradio{color:#939}.comradio{color:#779cc2}.centradio{color:#5c5c8a}.hcradio{color:#318779}.cryoradio{color:#ad6d48}.airadio{color:#f0f}.secradio{color:#a52929}.engradio{color:#a66300}.sentryradio{color:#844300}.sentryradio{color:#844300}.medradio{color:#008160}.supradio{color:#ba8e41}.jtacradio{color:#ad3b98}.intelradio{color:#027d02}.wyradio{color:#fe9b24}.pmcradio{color:#4dc5ce}.vairadio{color:#e3580e}.cmbradio{color:#1b748c}.clfradio{color:#8e83ca}.alpharadio{color:#db2626}.bravoradio{color:#c68610}.charlieradio{color:#a5a}.deltaradio{color:#007fcf}.echoradio{color:#3eb489}.medium{font-size:110%}.big{font-size:115%}.large{font-size:125%}.extra_large{font-size:130%}.huge{font-size:150%}.underline{text-decoration:underline}.orange{color:#eca100}.normal{font-style:normal}.attack{color:#ff3838}.moderate{color:#c00}.disarm{color:#900}.passive{color:#600}.helpful{color:#368f31}.scanner{color:#ff3838}.scannerb{color:#ff3838;font-weight:bold}.scannerburn{color:orange}.scannerburnb{color:orange;font-weight:bold}.rose{color:#ff5050}.debuginfo{color:#493d26;font-style:italic}.xenonotice{color:#51a16c}.xenoboldnotice{color:#51a16c;font-style:italic}.xenowarning{color:#51a16c;font-style:italic}.xenominorwarning{color:#51a16c;font-weight:bold;font-style:italic}.xenodanger{color:#51a16c;font-weight:bold}.avoidharm{color:#72a0e5;font-weight:bold}.highdanger{color:#ff3838;font-weight:bold;font-size:140%}.xenohighdanger{color:#51a16c;font-weight:bold;font-size:140%}.xenoannounce{color:#65c585;font-family:book-antiqua;font-weight:bold;font-size:140%}.yautjabold{color:purple;font-weight:bold}.yautjaboldbig{color:purple;font-weight:bold;font-size:120%}.objectivebig{font-weight:bold;font-size:130%}.objectivegreen{color:lime}.objectivered{color:red}.objectivesuccess{color:lime;font-weight:bold;font-size:110%}.objectivefail{color:red;font-weight:bold;font-size:110%}.xenotalk,.xeno{color:#c048c0;font-style:italic}.xenoleader{color:#996e99;font-style:italic;font-size:125%}.xenoqueen{color:#996e99;font-style:italic;font-weight:bold;font-size:125%}.newscaster{color:maroon}.role_header{color:#e92d2d;display:block;text-align:center;font-weight:bold;font-family:trebuchet-ms;font-size:150%}.role_body{color:#3a3ae9;display:block;text-align:center;font-size:125%}.round_header{color:#e92d2d;display:block;text-align:center;font-family:courier;font-weight:bold;font-size:180%}.round_body{color:#c5c5c5;display:block;text-align:center;font-family:trebuchet-ms;font-weight:bold;font-size:125%}.event_announcement{color:#600d48;font-family:arial-narrow;font-weight:bold;font-size:125%}.announce_header{color:#cecece;font-weight:bold;font-size:150%}.announce_header_blue{color:#7575f3;font-weight:bold;font-size:150%}.announce_header_admin{color:#7575f3;font-weight:bold;font-size:150%}.announce_body{color:#e92d2d;font-weight:normal;font-size:125%}.centerbold{display:block;text-align:center;font-weight:bold}.mod{color:#917455;font-weight:bold}.modooc{color:#184880;font-weight:bold}.adminmod{color:#7c440c;font-weight:bold}.mentorsay{color:#d4af57;font-weight:bold}.mentorhelp{color:#090;font-weight:bold}.mentorbody{color:#da6200;font-weight:bold}.mentorstaff{color:#b5850d;font-weight:bold}.staffsay{color:#b5850d;font-weight:bold}.tajaran{color:#803b56}.tajaran_signlang{color:#941c1c}.skrell{color:#00ced1}.soghun{color:#228b22}.changeling{color:purple}.vox{color:#a0a}.monkey{color:#966c47}.german{color:#858f1e;font-family:"Times New Roman",Times,serif}.spanish{color:#cf982b}.japanese{color:#940927}.chinese{color:#fe1919}.zombie{color:#2dacb1;font-style:italic}.rough{font-family:trebuchet-ms,cursive,sans-serif}.commando{color:#fe9b24;font-style:bold}.say_quote{font-family:Georgia,Verdana,sans-serif}.admin .message{color:#314cad}.admin .prefix{font-weight:bolder}.pm{font-size:110%}.deadsay{color:#8b4dff}.retro_translator{font-weight:bold}.yautja_translator{color:#a00;font-weight:bold;animation:glitch .5s infinite}@keyframes glitch{25%{color:#a00;transform:translate(-2px, -1px)}50%{color:#be0000;transform:translate(1px, -2px)}75%{color:#8d0000;transform:translate(-1px, 2px)}100%{color:#830000;transform:translate(1px, 1px)}}.examine_block{background:#1b1c1e;border:1px solid #a4bad6;margin:.5em;padding:.5em .75em}.examine_block .icon{width:1.5em;height:1.5em;margin:0;padding:0}.tooltip{font-style:italic;border-bottom:1px dashed #fff} +.theme-light .color-black{color:#000 !important}.theme-light .color-white{color:#e6e6e6 !important}.theme-light .color-red{color:#c82121 !important}.theme-light .color-orange{color:#e6630d !important}.theme-light .color-yellow{color:#e5c304 !important}.theme-light .color-olive{color:#a3b816 !important}.theme-light .color-green{color:#1d9f3b !important}.theme-light .color-teal{color:#00a39c !important}.theme-light .color-blue{color:#1e78bb !important}.theme-light .color-dark-blue{color:#004274 !important}.theme-light .color-violet{color:#5a30b5 !important}.theme-light .color-purple{color:#932eb4 !important}.theme-light .color-pink{color:#db228a !important}.theme-light .color-brown{color:#955d39 !important}.theme-light .color-grey{color:#e6e6e6 !important}.theme-light .color-light-grey{color:#999 !important}.theme-light .color-good{color:#529923 !important}.theme-light .color-average{color:#da810e !important}.theme-light .color-bad{color:#c82121 !important}.theme-light .color-label{color:#353535 !important}.theme-light .color-xeno{color:#4a3253 !important}.theme-light .color-bg-black{background-color:#000 !important}.theme-light .color-bg-white{background-color:#bfbfbf !important}.theme-light .color-bg-red{background-color:#a61c1c !important}.theme-light .color-bg-orange{background-color:#c0530b !important}.theme-light .color-bg-yellow{background-color:#bfa303 !important}.theme-light .color-bg-olive{background-color:#889912 !important}.theme-light .color-bg-green{background-color:#188532 !important}.theme-light .color-bg-teal{background-color:#008882 !important}.theme-light .color-bg-blue{background-color:#19649c !important}.theme-light .color-bg-dark-blue{background-color:#003761 !important}.theme-light .color-bg-violet{background-color:#4b2897 !important}.theme-light .color-bg-purple{background-color:#7a2696 !important}.theme-light .color-bg-pink{background-color:#b61d73 !important}.theme-light .color-bg-brown{background-color:#7c4d2f !important}.theme-light .color-bg-grey{background-color:#bfbfbf !important}.theme-light .color-bg-light-grey{background-color:gray !important}.theme-light .color-bg-good{background-color:#44801d !important}.theme-light .color-bg-average{background-color:#b56b0b !important}.theme-light .color-bg-bad{background-color:#a61c1c !important}.theme-light .color-bg-label{background-color:#2c2c2c !important}.theme-light .color-bg-xeno{background-color:#3e2945 !important}.theme-light .Tabs{display:flex;align-items:stretch;overflow:hidden;background-color:#fff}.theme-light .Tabs--fill{height:100%}.theme-light .Section .Tabs{background-color:transparent}.theme-light .Section:not(.Section--fitted) .Tabs{margin:0 -0.5em .5em}.theme-light .Section:not(.Section--fitted) .Tabs:first-child{margin-top:-0.5em}.theme-light .Tabs--vertical{flex-direction:column;padding:.25em 0 .25em .25em}.theme-light .Tabs--horizontal{margin-bottom:.5em;padding:.25em .25em 0 .25em}.theme-light .Tabs--horizontal:last-child{margin-bottom:0}.theme-light .Tabs__Tab{flex-grow:0}.theme-light .Tabs--fluid .Tabs__Tab{flex-grow:1}.theme-light .Tab{display:flex;align-items:center;justify-content:space-between;background-color:transparent;color:rgba(0,0,0,.5);min-height:2.25em;min-width:4em}.theme-light .Tab:not(.Tab--selected):hover{background-color:rgba(255,255,255,.075)}.theme-light .Tab--selected{background-color:rgba(255,255,255,.125);color:#404040}.theme-light .Tab__text{flex-grow:1;margin:0 .5em}.theme-light .Tab__left{min-width:1.5em;text-align:center;margin-left:.25em}.theme-light .Tab__right{min-width:1.5em;text-align:center;margin-right:.25em}.theme-light .Tabs--horizontal .Tab{border-top:.1666666667em solid transparent;border-bottom:.1666666667em solid transparent;border-top-left-radius:.25em;border-top-right-radius:.25em}.theme-light .Tabs--horizontal .Tab--selected{border-bottom:.1666666667em solid #000}.theme-light .Tabs--vertical .Tab{min-height:2em;border-left:.1666666667em solid transparent;border-right:.1666666667em solid transparent;border-top-left-radius:.25em;border-bottom-left-radius:.25em}.theme-light .Tabs--vertical .Tab--selected{border-right:.1666666667em solid #000}.theme-light .Tab--selected.Tab--color--black{color:#404040}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--black{border-bottom-color:#000}.theme-light .Tabs--vertical .Tab--selected.Tab--color--black{border-right-color:#000}.theme-light .Tab--selected.Tab--color--white{color:#ececec}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--white{border-bottom-color:#e6e6e6}.theme-light .Tabs--vertical .Tab--selected.Tab--color--white{border-right-color:#e6e6e6}.theme-light .Tab--selected.Tab--color--red{color:#e14d4d}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--red{border-bottom-color:#c82121}.theme-light .Tabs--vertical .Tab--selected.Tab--color--red{border-right-color:#c82121}.theme-light .Tab--selected.Tab--color--orange{color:#f48942}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--orange{border-bottom-color:#e6630d}.theme-light .Tabs--vertical .Tab--selected.Tab--color--orange{border-right-color:#e6630d}.theme-light .Tab--selected.Tab--color--yellow{color:#fcdd33}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--yellow{border-bottom-color:#e5c304}.theme-light .Tabs--vertical .Tab--selected.Tab--color--yellow{border-right-color:#e5c304}.theme-light .Tab--selected.Tab--color--olive{color:#d0e732}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--olive{border-bottom-color:#a3b816}.theme-light .Tabs--vertical .Tab--selected.Tab--color--olive{border-right-color:#a3b816}.theme-light .Tab--selected.Tab--color--green{color:#33da5a}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--green{border-bottom-color:#1d9f3b}.theme-light .Tabs--vertical .Tab--selected.Tab--color--green{border-right-color:#1d9f3b}.theme-light .Tab--selected.Tab--color--teal{color:#00faef}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--teal{border-bottom-color:#00a39c}.theme-light .Tabs--vertical .Tab--selected.Tab--color--teal{border-right-color:#00a39c}.theme-light .Tab--selected.Tab--color--blue{color:#419ce1}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--blue{border-bottom-color:#1e78bb}.theme-light .Tabs--vertical .Tab--selected.Tab--color--blue{border-right-color:#1e78bb}.theme-light .Tab--selected.Tab--color--dark-blue{color:#0079d7}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--dark-blue{border-bottom-color:#004274}.theme-light .Tabs--vertical .Tab--selected.Tab--color--dark-blue{border-right-color:#004274}.theme-light .Tab--selected.Tab--color--violet{color:#7f58d3}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--violet{border-bottom-color:#5a30b5}.theme-light .Tabs--vertical .Tab--selected.Tab--color--violet{border-right-color:#5a30b5}.theme-light .Tab--selected.Tab--color--purple{color:#b455d4}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--purple{border-bottom-color:#932eb4}.theme-light .Tabs--vertical .Tab--selected.Tab--color--purple{border-right-color:#932eb4}.theme-light .Tab--selected.Tab--color--pink{color:#e558a7}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--pink{border-bottom-color:#db228a}.theme-light .Tabs--vertical .Tab--selected.Tab--color--pink{border-right-color:#db228a}.theme-light .Tab--selected.Tab--color--brown{color:#c0825a}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--brown{border-bottom-color:#955d39}.theme-light .Tabs--vertical .Tab--selected.Tab--color--brown{border-right-color:#955d39}.theme-light .Tab--selected.Tab--color--grey{color:#ececec}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--grey{border-bottom-color:#e6e6e6}.theme-light .Tabs--vertical .Tab--selected.Tab--color--grey{border-right-color:#e6e6e6}.theme-light .Tab--selected.Tab--color--light-grey{color:#b3b3b3}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--light-grey{border-bottom-color:#999}.theme-light .Tabs--vertical .Tab--selected.Tab--color--light-grey{border-right-color:#999}.theme-light .Tab--selected.Tab--color--good{color:#77d23b}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--good{border-bottom-color:#529923}.theme-light .Tabs--vertical .Tab--selected.Tab--color--good{border-right-color:#529923}.theme-light .Tab--selected.Tab--color--average{color:#f3a23a}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--average{border-bottom-color:#da810e}.theme-light .Tabs--vertical .Tab--selected.Tab--color--average{border-right-color:#da810e}.theme-light .Tab--selected.Tab--color--bad{color:#e14d4d}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--bad{border-bottom-color:#c82121}.theme-light .Tabs--vertical .Tab--selected.Tab--color--bad{border-right-color:#c82121}.theme-light .Tab--selected.Tab--color--label{color:#686868}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--label{border-bottom-color:#353535}.theme-light .Tabs--vertical .Tab--selected.Tab--color--label{border-right-color:#353535}.theme-light .Tab--selected.Tab--color--xeno{color:#7e558e}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--xeno{border-bottom-color:#4a3253}.theme-light .Tabs--vertical .Tab--selected.Tab--color--xeno{border-right-color:#4a3253}.theme-light .Section{position:relative;margin-bottom:.5em;background-color:#fff;background-color:#fff;box-sizing:border-box}.theme-light .Section:last-child{margin-bottom:0}.theme-light .Section__title{position:relative;padding:.5em;border-bottom:.1666666667em solid #fff}.theme-light .Section__titleText{font-size:1.1666666667em;font-weight:bold;color:#000}.theme-light .Section__buttons{position:absolute;display:inline-block;right:.5em;margin-top:-.0833333333em}.theme-light .Section__rest{position:relative}.theme-light .Section__content{padding:.66em .5em}.theme-light .Section--fitted>.Section__rest>.Section__content{padding:0}.theme-light .Section--fill{display:flex;flex-direction:column;height:100%}.theme-light .Section--fill>.Section__rest{flex-grow:1}.theme-light .Section--fill>.Section__rest>.Section__content{height:100%}.theme-light .Section--fill.Section--scrollable>.Section__rest>.Section__content{position:absolute;top:0;left:0;right:0;bottom:0}.theme-light .Section--fill.Section--iefix{display:table !important;width:100% !important;height:100% !important;border-collapse:collapse;border-spacing:0}.theme-light .Section--fill.Section--iefix>.Section__rest{display:table-row !important;height:100% !important}.theme-light .Section--scrollable{overflow-x:hidden;overflow-y:hidden}.theme-light .Section--scrollable>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:hidden}.theme-light .Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.theme-light .Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:hidden;overflow-x:scroll}.theme-light .Section--scrollable.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.theme-light .Section--scrollable.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:scroll}.theme-light .Section .Section{background-color:transparent;margin-left:-0.5em;margin-right:-0.5em}.theme-light .Section .Section:first-child{margin-top:-0.5em}.theme-light .Section .Section .Section__titleText{font-size:1.0833333333em}.theme-light .Section .Section .Section .Section__titleText{font-size:1em}.theme-light .Button{position:relative;display:inline-block;line-height:1.667em;padding:0 .5em;margin-right:.1666666667em;white-space:nowrap;outline:0;border-radius:.16em;margin-bottom:.1666666667em;user-select:none;-ms-user-select:none}.theme-light .Button:last-child{margin-right:0;margin-bottom:0}.theme-light .Button .fa,.theme-light .Button .fas,.theme-light .Button .far{margin-left:-0.25em;margin-right:-0.25em;min-width:1.333em;text-align:center}.theme-light .Button--hasContent .fa,.theme-light .Button--hasContent .fas,.theme-light .Button--hasContent .far{margin-right:.25em}.theme-light .Button--hasContent.Button--iconPosition--right .fa,.theme-light .Button--hasContent.Button--iconPosition--right .fas,.theme-light .Button--hasContent.Button--iconPosition--right .far{margin-right:0px;margin-left:3px}.theme-light .Button--ellipsis{overflow:hidden;text-overflow:ellipsis}.theme-light .Button--fluid{display:block;margin-left:0;margin-right:0}.theme-light .Button--circular{border-radius:50%}.theme-light .Button--compact{padding:0 .25em;line-height:1.333em}.theme-light .Button--color--black{transition:color 50ms,background-color 50ms;background-color:#000;color:#fff}.theme-light .Button--color--black:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--black:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--black:hover,.theme-light .Button--color--black:focus{background-color:#131313;color:#fff}.theme-light .Button--color--white{transition:color 50ms,background-color 50ms;background-color:#bfbfbf;color:#000}.theme-light .Button--color--white:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--white:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--white:hover,.theme-light .Button--color--white:focus{background-color:#efefef;color:#000}.theme-light .Button--color--red{transition:color 50ms,background-color 50ms;background-color:#a61c1c;color:#fff}.theme-light .Button--color--red:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--red:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--red:hover,.theme-light .Button--color--red:focus{background-color:#d23333;color:#fff}.theme-light .Button--color--orange{transition:color 50ms,background-color 50ms;background-color:#c0530b;color:#fff}.theme-light .Button--color--orange:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--orange:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--orange:hover,.theme-light .Button--color--orange:focus{background-color:#ea7426;color:#fff}.theme-light .Button--color--yellow{transition:color 50ms,background-color 50ms;background-color:#bfa303;color:#fff}.theme-light .Button--color--yellow:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--yellow:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--yellow:hover,.theme-light .Button--color--yellow:focus{background-color:#efce17;color:#fff}.theme-light .Button--color--olive{transition:color 50ms,background-color 50ms;background-color:#889912;color:#fff}.theme-light .Button--color--olive:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--olive:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--olive:hover,.theme-light .Button--color--olive:focus{background-color:#afc328;color:#fff}.theme-light .Button--color--green{transition:color 50ms,background-color 50ms;background-color:#188532;color:#fff}.theme-light .Button--color--green:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--green:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--green:hover,.theme-light .Button--color--green:focus{background-color:#2fac4c;color:#fff}.theme-light .Button--color--teal{transition:color 50ms,background-color 50ms;background-color:#008882;color:#fff}.theme-light .Button--color--teal:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--teal:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--teal:hover,.theme-light .Button--color--teal:focus{background-color:#13afa9;color:#fff}.theme-light .Button--color--blue{transition:color 50ms,background-color 50ms;background-color:#19649c;color:#fff}.theme-light .Button--color--blue:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--blue:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--blue:hover,.theme-light .Button--color--blue:focus{background-color:#3086c7;color:#fff}.theme-light .Button--color--dark-blue{transition:color 50ms,background-color 50ms;background-color:#003761;color:#fff}.theme-light .Button--color--dark-blue:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--dark-blue:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--dark-blue:hover,.theme-light .Button--color--dark-blue:focus{background-color:#135283;color:#fff}.theme-light .Button--color--violet{transition:color 50ms,background-color 50ms;background-color:#4b2897;color:#fff}.theme-light .Button--color--violet:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--violet:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--violet:hover,.theme-light .Button--color--violet:focus{background-color:#6a41c1;color:#fff}.theme-light .Button--color--purple{transition:color 50ms,background-color 50ms;background-color:#7a2696;color:#fff}.theme-light .Button--color--purple:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--purple:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--purple:hover,.theme-light .Button--color--purple:focus{background-color:#a03fc0;color:#fff}.theme-light .Button--color--pink{transition:color 50ms,background-color 50ms;background-color:#b61d73;color:#fff}.theme-light .Button--color--pink:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--pink:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--pink:hover,.theme-light .Button--color--pink:focus{background-color:#da3f96;color:#fff}.theme-light .Button--color--brown{transition:color 50ms,background-color 50ms;background-color:#7c4d2f;color:#fff}.theme-light .Button--color--brown:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--brown:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--brown:hover,.theme-light .Button--color--brown:focus{background-color:#a26c49;color:#fff}.theme-light .Button--color--grey{transition:color 50ms,background-color 50ms;background-color:#bfbfbf;color:#000}.theme-light .Button--color--grey:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--grey:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--grey:hover,.theme-light .Button--color--grey:focus{background-color:#efefef;color:#000}.theme-light .Button--color--light-grey{transition:color 50ms,background-color 50ms;background-color:gray;color:#fff}.theme-light .Button--color--light-grey:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--light-grey:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--light-grey:hover,.theme-light .Button--color--light-grey:focus{background-color:#a6a6a6;color:#fff}.theme-light .Button--color--good{transition:color 50ms,background-color 50ms;background-color:#44801d;color:#fff}.theme-light .Button--color--good:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--good:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--good:hover,.theme-light .Button--color--good:focus{background-color:#62a635;color:#fff}.theme-light .Button--color--average{transition:color 50ms,background-color 50ms;background-color:#b56b0b;color:#fff}.theme-light .Button--color--average:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--average:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--average:hover,.theme-light .Button--color--average:focus{background-color:#e48f20;color:#fff}.theme-light .Button--color--bad{transition:color 50ms,background-color 50ms;background-color:#a61c1c;color:#fff}.theme-light .Button--color--bad:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--bad:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--bad:hover,.theme-light .Button--color--bad:focus{background-color:#d23333;color:#fff}.theme-light .Button--color--label{transition:color 50ms,background-color 50ms;background-color:#2c2c2c;color:#fff}.theme-light .Button--color--label:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--label:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--label:hover,.theme-light .Button--color--label:focus{background-color:#464646;color:#fff}.theme-light .Button--color--xeno{transition:color 50ms,background-color 50ms;background-color:#3e2945;color:#fff}.theme-light .Button--color--xeno:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--xeno:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--xeno:hover,.theme-light .Button--color--xeno:focus{background-color:#5a4363;color:#fff}.theme-light .Button--color--default{transition:color 50ms,background-color 50ms;background-color:#bbb;color:#000}.theme-light .Button--color--default:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--default:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--default:hover,.theme-light .Button--color--default:focus{background-color:#eaeaea;color:#000}.theme-light .Button--color--caution{transition:color 50ms,background-color 50ms;background-color:#be6209;color:#fff}.theme-light .Button--color--caution:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--caution:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--caution:hover,.theme-light .Button--color--caution:focus{background-color:#ec8420;color:#fff}.theme-light .Button--color--danger{transition:color 50ms,background-color 50ms;background-color:#9a9d00;color:#fff}.theme-light .Button--color--danger:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--danger:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--danger:hover,.theme-light .Button--color--danger:focus{background-color:#c4c813;color:#fff}.theme-light .Button--color--transparent{transition:color 50ms,background-color 50ms;background-color:#eee;color:#000;background-color:rgba(238,238,238,0);color:rgba(0,0,0,.5)}.theme-light .Button--color--transparent:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--transparent:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--transparent:hover,.theme-light .Button--color--transparent:focus{background-color:#fcfcfc;color:#000}.theme-light .Button--disabled{background-color:#363636 !important}.theme-light .Button--selected{transition:color 50ms,background-color 50ms;background-color:#0668b8;color:#fff}.theme-light .Button--selected:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--selected:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--selected:hover,.theme-light .Button--selected:focus{background-color:#1a8be7;color:#fff}.theme-light .Button--flex{display:inline-flex;flex-direction:column}.theme-light .Button--flex--fluid{width:100%}.theme-light .Button--verticalAlignContent--top{justify-content:flex-start}.theme-light .Button--verticalAlignContent--middle{justify-content:center}.theme-light .Button--verticalAlignContent--bottom{justify-content:flex-end}.theme-light .Button__content{display:block;align-self:stretch}.theme-light .Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#000;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.theme-light .Input--fluid{display:block;width:auto}.theme-light .Input__baseline{display:inline-block;color:transparent}.theme-light .Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#000;color:inherit}.theme-light .Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .Input--monospace .Input__input{font-family:"Consolas",monospace}.theme-light .Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#000;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.theme-light .Input--fluid{display:block;width:auto}.theme-light .Input__baseline{display:inline-block;color:transparent}.theme-light .Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#000;color:inherit}.theme-light .Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .Input--monospace .Input__input{font-family:"Consolas",monospace}.theme-light .NumberInput{position:relative;display:inline-block;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#353535;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;text-align:right;overflow:visible;cursor:n-resize}.theme-light .NumberInput--fluid{display:block}.theme-light .NumberInput__content{margin-left:.5em}.theme-light .NumberInput__barContainer{position:absolute;top:.1666666667em;bottom:.1666666667em;left:.1666666667em}.theme-light .NumberInput__bar{position:absolute;bottom:0;left:0;width:.25em;box-sizing:border-box;border-bottom:.0833333333em solid #353535;background-color:#353535}.theme-light .NumberInput__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:#fff;color:#000;text-align:right}.theme-light .Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#000;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.theme-light .Input--fluid{display:block;width:auto}.theme-light .Input__baseline{display:inline-block;color:transparent}.theme-light .Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:transparent;color:#000;color:inherit}.theme-light .Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .Input--monospace .Input__input{font-family:"Consolas",monospace}.theme-light .TextArea{position:relative;display:inline-block;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;background-color:#fff;margin-right:.1666666667em;line-height:1.4166666667em;box-sizing:border-box;width:100%}.theme-light .TextArea--fluid{display:block;width:auto;height:auto}.theme-light .TextArea--noborder{border:0px}.theme-light .TextArea__textarea.TextArea__textarea--scrollable{overflow:auto;overflow-x:hidden;overflow-y:scroll}.theme-light .TextArea__textarea{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;height:100%;font-size:1em;line-height:1.4166666667em;min-height:1.4166666667em;margin:0;padding:0 .5em;font-family:inherit;background-color:transparent;color:inherit;box-sizing:border-box;word-wrap:break-word;overflow:hidden}.theme-light .TextArea__textarea:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .TextArea__textarea_custom{overflow:visible;white-space:pre-wrap}.theme-light .Knob{position:relative;font-size:1rem;width:2.6em;height:2.6em;margin:0 auto;margin-bottom:-0.2em;cursor:n-resize}.theme-light .Knob:after{content:".";color:transparent;line-height:2.5em}.theme-light .Knob__circle{position:absolute;top:.1em;bottom:.1em;left:.1em;right:.1em;margin:.3em;background-color:#333;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 0.15) 0%, rgba(255, 255, 255, 0) 100%);border-radius:50%;box-shadow:0 .05em .5em 0 rgba(0,0,0,.5)}.theme-light .Knob__cursorBox{position:absolute;top:0;bottom:0;left:0;right:0}.theme-light .Knob__cursor{position:relative;top:.05em;margin:0 auto;width:.2em;height:.8em;background-color:rgba(255,255,255,.9)}.theme-light .Knob__popupValue{position:absolute;top:-2rem;right:50%;font-size:1rem;text-align:center;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.theme-light .Knob__ring{position:absolute;top:0;bottom:0;left:0;right:0;padding:.1em}.theme-light .Knob__ringTrackPivot{transform:rotateZ(135deg)}.theme-light .Knob__ringTrack{fill:transparent;stroke:rgba(255,255,255,.1);stroke-width:8;stroke-linecap:round;stroke-dasharray:235.62}.theme-light .Knob__ringFillPivot{transform:rotateZ(135deg)}.theme-light .Knob--bipolar .Knob__ringFillPivot{transform:rotateZ(270deg)}.theme-light .Knob__ringFill{fill:transparent;stroke:#6a96c9;stroke-width:8;stroke-linecap:round;stroke-dasharray:314.16;transition:stroke 50ms ease-out}.theme-light .Knob--color--black .Knob__ringFill{stroke:#000}.theme-light .Knob--color--white .Knob__ringFill{stroke:#e6e6e6}.theme-light .Knob--color--red .Knob__ringFill{stroke:#c82121}.theme-light .Knob--color--orange .Knob__ringFill{stroke:#e6630d}.theme-light .Knob--color--yellow .Knob__ringFill{stroke:#e5c304}.theme-light .Knob--color--olive .Knob__ringFill{stroke:#a3b816}.theme-light .Knob--color--green .Knob__ringFill{stroke:#1d9f3b}.theme-light .Knob--color--teal .Knob__ringFill{stroke:#00a39c}.theme-light .Knob--color--blue .Knob__ringFill{stroke:#1e78bb}.theme-light .Knob--color--dark-blue .Knob__ringFill{stroke:#004274}.theme-light .Knob--color--violet .Knob__ringFill{stroke:#5a30b5}.theme-light .Knob--color--purple .Knob__ringFill{stroke:#932eb4}.theme-light .Knob--color--pink .Knob__ringFill{stroke:#db228a}.theme-light .Knob--color--brown .Knob__ringFill{stroke:#955d39}.theme-light .Knob--color--grey .Knob__ringFill{stroke:#e6e6e6}.theme-light .Knob--color--light-grey .Knob__ringFill{stroke:#999}.theme-light .Knob--color--good .Knob__ringFill{stroke:#529923}.theme-light .Knob--color--average .Knob__ringFill{stroke:#da810e}.theme-light .Knob--color--bad .Knob__ringFill{stroke:#c82121}.theme-light .Knob--color--label .Knob__ringFill{stroke:#353535}.theme-light .Knob--color--xeno .Knob__ringFill{stroke:#4a3253}.theme-light .Slider{cursor:e-resize}.theme-light .Slider__cursorOffset{position:absolute;top:0;left:0;bottom:0;transition:none !important}.theme-light .Slider__cursor{position:absolute;top:0;right:-.0833333333em;bottom:0;width:0;border-left:.1666666667em solid #000}.theme-light .Slider__pointer{position:absolute;right:-.4166666667em;bottom:-.3333333333em;width:0;height:0;border-left:.4166666667em solid transparent;border-right:.4166666667em solid transparent;border-bottom:.4166666667em solid #000}.theme-light .Slider__popupValue{position:absolute;right:0;top:-2rem;font-size:1rem;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.theme-light .ProgressBar{display:inline-block;position:relative;width:100%;padding:0 .5em;border-width:.0833333333em !important;border-style:solid !important;border-radius:.16em;background-color:rgba(0,0,0,0);transition:border-color 900ms ease-out}.theme-light .ProgressBar__fill{position:absolute;top:-0.5px;left:0px;bottom:-0.5px}.theme-light .ProgressBar__fill--animated{transition:background-color 900ms ease-out,width 900ms ease-out}.theme-light .ProgressBar__content{position:relative;line-height:1.4166666667em;width:100%;text-align:right}.theme-light .ProgressBar--color--default{border:.0833333333em solid #bfbfbf}.theme-light .ProgressBar--color--default .ProgressBar__fill{background-color:#bfbfbf}.theme-light .ProgressBar--color--black{border-color:#000 !important}.theme-light .ProgressBar--color--black .ProgressBar__fill{background-color:#000}.theme-light .ProgressBar--color--white{border-color:#bfbfbf !important}.theme-light .ProgressBar--color--white .ProgressBar__fill{background-color:#bfbfbf}.theme-light .ProgressBar--color--red{border-color:#a61c1c !important}.theme-light .ProgressBar--color--red .ProgressBar__fill{background-color:#a61c1c}.theme-light .ProgressBar--color--orange{border-color:#c0530b !important}.theme-light .ProgressBar--color--orange .ProgressBar__fill{background-color:#c0530b}.theme-light .ProgressBar--color--yellow{border-color:#bfa303 !important}.theme-light .ProgressBar--color--yellow .ProgressBar__fill{background-color:#bfa303}.theme-light .ProgressBar--color--olive{border-color:#889912 !important}.theme-light .ProgressBar--color--olive .ProgressBar__fill{background-color:#889912}.theme-light .ProgressBar--color--green{border-color:#188532 !important}.theme-light .ProgressBar--color--green .ProgressBar__fill{background-color:#188532}.theme-light .ProgressBar--color--teal{border-color:#008882 !important}.theme-light .ProgressBar--color--teal .ProgressBar__fill{background-color:#008882}.theme-light .ProgressBar--color--blue{border-color:#19649c !important}.theme-light .ProgressBar--color--blue .ProgressBar__fill{background-color:#19649c}.theme-light .ProgressBar--color--dark-blue{border-color:#003761 !important}.theme-light .ProgressBar--color--dark-blue .ProgressBar__fill{background-color:#003761}.theme-light .ProgressBar--color--violet{border-color:#4b2897 !important}.theme-light .ProgressBar--color--violet .ProgressBar__fill{background-color:#4b2897}.theme-light .ProgressBar--color--purple{border-color:#7a2696 !important}.theme-light .ProgressBar--color--purple .ProgressBar__fill{background-color:#7a2696}.theme-light .ProgressBar--color--pink{border-color:#b61d73 !important}.theme-light .ProgressBar--color--pink .ProgressBar__fill{background-color:#b61d73}.theme-light .ProgressBar--color--brown{border-color:#7c4d2f !important}.theme-light .ProgressBar--color--brown .ProgressBar__fill{background-color:#7c4d2f}.theme-light .ProgressBar--color--grey{border-color:#bfbfbf !important}.theme-light .ProgressBar--color--grey .ProgressBar__fill{background-color:#bfbfbf}.theme-light .ProgressBar--color--light-grey{border-color:gray !important}.theme-light .ProgressBar--color--light-grey .ProgressBar__fill{background-color:gray}.theme-light .ProgressBar--color--good{border-color:#44801d !important}.theme-light .ProgressBar--color--good .ProgressBar__fill{background-color:#44801d}.theme-light .ProgressBar--color--average{border-color:#b56b0b !important}.theme-light .ProgressBar--color--average .ProgressBar__fill{background-color:#b56b0b}.theme-light .ProgressBar--color--bad{border-color:#a61c1c !important}.theme-light .ProgressBar--color--bad .ProgressBar__fill{background-color:#a61c1c}.theme-light .ProgressBar--color--label{border-color:#2c2c2c !important}.theme-light .ProgressBar--color--label .ProgressBar__fill{background-color:#2c2c2c}.theme-light .ProgressBar--color--xeno{border-color:#3e2945 !important}.theme-light .ProgressBar--color--xeno .ProgressBar__fill{background-color:#3e2945}.theme-light .Chat{color:#000}.theme-light .Chat__badge{display:inline-block;min-width:.5em;font-size:.7em;padding:.2em .3em;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:crimson;border-radius:10px;transition:font-size 200ms ease-out}.theme-light .Chat__badge:before{content:"x"}.theme-light .Chat__badge--animate{font-size:.9em;transition:font-size 0ms}.theme-light .Chat__scrollButton{position:fixed;right:2em;bottom:1em}.theme-light .Chat__reconnected{font-size:.85em;text-align:center;margin:1em 0 2em}.theme-light .Chat__reconnected:before{content:"Reconnected";display:inline-block;border-radius:1em;padding:0 .7em;color:#db2828;background-color:#fff}.theme-light .Chat__reconnected:after{content:"";display:block;margin-top:-0.75em;border-bottom:.1666666667em solid #db2828}.theme-light .Chat__highlight{color:#000}.theme-light .Chat__highlight--restricted{color:#fff;background-color:#a00;font-weight:bold}.theme-light .ChatMessage{word-wrap:break-word}.theme-light .ChatMessage--highlighted{position:relative;border-left:.1666666667em solid #fd4;padding-left:.5em}.theme-light .ChatMessage--highlighted:after{content:"";position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(255,221,68,.1);pointer-events:none}.theme-light .Layout,.theme-light .Layout *{scrollbar-base-color:#f2f2f2;scrollbar-face-color:#d6d6d6;scrollbar-3dlight-color:#eee;scrollbar-highlight-color:#eee;scrollbar-track-color:#f2f2f2;scrollbar-arrow-color:#777;scrollbar-shadow-color:#d6d6d6}.theme-light .Layout__content{position:absolute;top:0;bottom:0;left:0;right:0;overflow-x:hidden;overflow-y:hidden}.theme-light .Layout__content--scrollable{overflow-y:scroll;margin-bottom:0}.theme-light .Window{position:fixed;top:0;bottom:0;left:0;right:0;color:#000;background-color:#eee;background-image:linear-gradient(to bottom, #eeeeee 0%, #eeeeee 100%)}.theme-light .Window__titleBar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;height:2.6666666667rem}.theme-light .Window__rest{position:fixed;top:32px;top:2.6666666667rem;bottom:0;left:0;right:0}.theme-light .Window__contentPadding{margin:.5rem;height:100%;height:calc(100% - 1.01rem)}.theme-light .Window__contentPadding:after{height:0}.theme-light .Layout__content--scrollable .Window__contentPadding:after{display:block;content:"";height:.5rem}.theme-light .Window__dimmer{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(252,252,252,.25);pointer-events:none}.theme-light .Window__resizeHandle__se{position:fixed;bottom:0;right:0;width:20px;width:1.6666666667rem;height:20px;height:1.6666666667rem;cursor:se-resize}.theme-light .Window__resizeHandle__s{position:fixed;bottom:0;left:0;right:0;height:6px;height:.5rem;cursor:s-resize}.theme-light .Window__resizeHandle__e{position:fixed;top:0;bottom:0;right:0;width:3px;width:.25rem;cursor:e-resize}.theme-light .TitleBar{background-color:#eee;border-bottom:1px solid rgba(0,0,0,.25);box-shadow:0 2px 2px rgba(0,0,0,.1);box-shadow:0 .1666666667rem .1666666667rem rgba(0,0,0,.1);user-select:none;-ms-user-select:none}.theme-light .TitleBar__clickable{color:rgba(0,0,0,.5);background-color:#eee;transition:color 250ms ease-out,background-color 250ms ease-out}.theme-light .TitleBar__clickable:hover{color:#fff;background-color:#c00;transition:color 0ms,background-color 0ms}.theme-light .TitleBar__title{position:absolute;display:inline-block;top:0;left:46px;left:3.8333333333rem;color:rgba(0,0,0,.75);font-size:14px;font-size:1.1666666667rem;line-height:31px;line-height:2.5833333333rem;white-space:nowrap;pointer-events:none}.theme-light .TitleBar__buttons{pointer-events:initial;display:inline-block;width:100%;margin-left:10px}.theme-light .TitleBar__dragZone{position:absolute;top:0;left:0;right:0;height:32px;height:2.6666666667rem}.theme-light .TitleBar__statusIcon{position:absolute;top:0;left:12px;left:1rem;transition:color .5s;font-size:20px;font-size:1.6666666667rem;line-height:32px !important;line-height:2.6666666667rem !important}.theme-light .TitleBar__close{position:absolute;top:-1px;right:0;width:45px;width:3.75rem;height:32px;height:2.6666666667rem;font-size:20px;font-size:1.6666666667rem;line-height:31px;line-height:2.5833333333rem;text-align:center}.theme-light .TitleBar__devBuildIndicator{position:absolute;top:6px;top:.5rem;right:52px;right:4.3333333333rem;min-width:20px;min-width:1.6666666667rem;padding:2px 4px;padding:.1666666667rem .3333333333rem;background-color:rgba(91,170,39,.75);color:#fff;text-align:center}.theme-light html,.theme-light body{padding:0;margin:0;height:100%;color:#000}.theme-light body{background:#fff;font-family:Verdana,sans-serif;font-size:13px;line-height:1.2;overflow-x:hidden;overflow-y:scroll;word-wrap:break-word}.theme-light em{font-style:normal;font-weight:bold}.theme-light img{margin:0;padding:0;line-height:1;-ms-interpolation-mode:nearest-neighbor;image-rendering:pixelated}.theme-light img.icon{height:1em;min-height:16px;width:auto;vertical-align:bottom}.theme-light a{color:blue}.theme-light a.visited{color:#f0f}.theme-light a:visited{color:#f0f}.theme-light a.popt{text-decoration:none}.theme-light .popup{position:fixed;top:50%;left:50%;background:#ddd}.theme-light .popup .close{position:absolute;background:#aaa;top:0;right:0;color:#333;text-decoration:none;z-index:2;padding:0 10px;height:30px;line-height:30px}.theme-light .popup .close:hover{background:#999}.theme-light .popup .head{background:#999;color:#ddd;padding:0 10px;height:30px;line-height:30px;text-transform:uppercase;font-size:.9em;font-weight:bold;border-bottom:2px solid green}.theme-light .popup input{border:1px solid #999;background:#fff;margin:0;padding:5px;outline:none;color:#333}.theme-light .popup input[type=text]:hover,.theme-light .popup input[type=text]:active,.theme-light .popup input[type=text]:focus{border-color:green}.theme-light .popup input[type=submit]{padding:5px 10px;background:#999;color:#ddd;text-transform:uppercase;font-size:.9em;font-weight:bold}.theme-light .popup input[type=submit]:hover,.theme-light .popup input[type=submit]:focus,.theme-light .popup input[type=submit]:active{background:#aaa;cursor:pointer}.theme-light .changeFont{padding:10px}.theme-light .changeFont a{display:block;text-decoration:none;padding:3px;color:#333}.theme-light .changeFont a:hover{background:#ccc}.theme-light .highlightPopup{padding:10px;text-align:center}.theme-light .highlightPopup input[type=text]{display:block;width:215px;text-align:left;margin-top:5px}.theme-light .highlightPopup input.highlightColor{background-color:#ff0}.theme-light .highlightPopup input.highlightTermSubmit{margin-top:5px}.theme-light .contextMenu{background-color:#ddd;position:fixed;margin:2px;width:150px}.theme-light .contextMenu a{display:block;padding:2px 5px;text-decoration:none;color:#333}.theme-light .contextMenu a:hover{background-color:#ccc}.theme-light .filterMessages{padding:5px}.theme-light .filterMessages div{padding:2px 0}.theme-light .icon-stack{height:1em;line-height:1em;width:1em;vertical-align:middle;margin-top:-2px}.theme-light .motd{color:#638500;font-family:Verdana,sans-serif;white-space:normal}.theme-light .motd h1,.theme-light .motd h2,.theme-light .motd h3,.theme-light .motd h4,.theme-light .motd h5,.theme-light .motd h6{color:#638500;text-decoration:underline}.theme-light .motd a,.theme-light .motd a:link,.theme-light .motd a:visited,.theme-light .motd a:active,.theme-light .motd a:hover{color:#638500}.theme-light .bold,.theme-light .name,.theme-light .prefix,.theme-light .ooc,.theme-light .looc,.theme-light .adminooc,.theme-light .admin,.theme-light .medal,.theme-light .yell{font-weight:bold}.theme-light .italic,.theme-light .italics{font-style:italic}.theme-light .highlight{background:#ff0}.theme-light h1,.theme-light h2,.theme-light h3,.theme-light h4,.theme-light h5,.theme-light h6{color:blue;font-family:Georgia,Verdana,sans-serif}.theme-light h1.alert,.theme-light h2.alert{color:#000}.theme-light em{font-style:normal;font-weight:bold}.theme-light .ooc{font-weight:bold}.theme-light .adminobserverooc{color:#09c;font-weight:bold}.theme-light .adminooc{color:#700038;font-weight:bold}.theme-light .adminsay{color:#ff4500;font-weight:bold}.theme-light .admin{color:#4473ff;font-weight:bold}.theme-light .name{font-weight:bold}.theme-light .deadsay{color:#5c00e6}.theme-light .binarysay{color:#20c20e;background-color:#000;display:block}.theme-light .binarysay a{color:lime}.theme-light .binarysay a:active,.theme-light .binarysay a:visited{color:#8f8}.theme-light .radio{color:green}.theme-light .sciradio{color:#939}.theme-light .comradio{color:#948f02}.theme-light .secradio{color:#a30000}.theme-light .medradio{color:#337296}.theme-light .engradio{color:#fb5613}.theme-light .sentryradio{color:#844300}.theme-light .suppradio{color:#a8732b}.theme-light .servradio{color:#6eaa2c}.theme-light .syndradio{color:#6d3f40}.theme-light .gangradio{color:#ac2ea1}.theme-light .centcomradio{color:#686868}.theme-light .aiprivradio{color:#f0f}.theme-light .redteamradio{color:red}.theme-light .blueteamradio{color:blue}.theme-light .greenteamradio{color:lime}.theme-light .yellowteamradio{color:#d1ba22}.theme-light .yell{font-weight:bold}.theme-light .alert{color:red}.theme-light h1.alert,.theme-light h2.alert{color:#000}.theme-light .userdanger{color:red;font-weight:bold;font-size:185%}.theme-light .bolddanger{color:red;font-weight:bold}.theme-light .danger{color:red}.theme-light .tinydanger{color:red;font-size:85%}.theme-light .smalldanger{color:red;font-size:90%}.theme-light .warning{color:red;font-style:italic}.theme-light .alertwarning{color:red;font-weight:bold}.theme-light .boldwarning{color:red;font-style:italic;font-weight:bold}.theme-light .announce{color:#228b22;font-weight:bold}.theme-light .boldannounce{color:red;font-weight:bold}.theme-light .minorannounce{font-weight:bold;font-size:185%}.theme-light .greenannounce{color:lime;font-weight:bold}.theme-light .rose{color:#ff5050}.theme-light .info{color:#00c}.theme-light .notice{color:#009}.theme-light .staff_ic{color:#009}.theme-light .tinynotice{color:#009;font-size:85%}.theme-light .tinynoticeital{color:#009;font-style:italic;font-size:85%}.theme-light .smallnotice{color:#009;font-size:90%}.theme-light .smallnoticeital{color:#009;font-style:italic;font-size:90%}.theme-light .boldnotice{color:#009;font-weight:bold}.theme-light .hear{color:#009;font-style:italic}.theme-light .adminnotice{color:blue}.theme-light .adminhelp{color:red;font-weight:bold}.theme-light .unconscious{color:blue;font-weight:bold}.theme-light .suicide{color:#ff5050;font-style:italic}.theme-light .green{color:#03ff39}.theme-light .grey{color:#838383}.theme-light .red{color:red}.theme-light .blue{color:blue}.theme-light .nicegreen{color:#14a833}.theme-light .boldnicegreen{color:#14a833;font-weight:bold}.theme-light .cult{color:#973e3b}.theme-light .cultitalic{color:#973e3b;font-style:italic}.theme-light .cultbold{color:#973e3b;font-style:italic;font-weight:bold}.theme-light .cultboldtalic{color:#973e3b;font-weight:bold;font-size:185%}.theme-light .cultlarge{color:#973e3b;font-weight:bold;font-size:185%}.theme-light .narsie{color:#973e3b;font-weight:bold;font-size:925%}.theme-light .narsiesmall{color:#973e3b;font-weight:bold;font-size:370%}.theme-light .colossus{color:#7f282a;font-size:310%}.theme-light .hierophant{color:#609;font-weight:bold;font-style:italic}.theme-light .hierophant_warning{color:#609;font-style:italic}.theme-light .purple{color:#5e2d79}.theme-light .holoparasite{color:#35333a}.theme-light .revennotice{color:#1d2953}.theme-light .revenboldnotice{color:#1d2953;font-weight:bold}.theme-light .revenbignotice{color:#1d2953;font-weight:bold;font-size:185%}.theme-light .revenminor{color:#823abb}.theme-light .revenwarning{color:#760fbb;font-style:italic}.theme-light .revendanger{color:#760fbb;font-weight:bold;font-size:185%}.theme-light .deconversion_message{color:#5000a0;font-size:185%;font-style:italic}.theme-light .ghostalert{color:#5c00e6;font-style:italic;font-weight:bold}.theme-light .alien{color:#543354}.theme-light .noticealien{color:#00c000}.theme-light .alertalien{color:#00c000;font-weight:bold}.theme-light .changeling{color:purple;font-style:italic}.theme-light .alertsyndie{color:red;font-size:185%;font-weight:bold}.theme-light .spider{color:#4d004d;font-weight:bold;font-size:185%}.theme-light .interface{color:#303}.theme-light .sans{font-family:"Comic Sans MS",cursive,sans-serif}.theme-light .papyrus{font-family:"Papyrus",cursive,sans-serif}.theme-light .robot{font-family:"Courier New",cursive,sans-serif}.theme-light .tape_recorder{color:maroon;font-family:"Courier New",cursive,sans-serif}.theme-light .command_headset{font-weight:bold;font-size:160%}.theme-light .small{font-size:60%}.theme-light .big{font-size:185%}.theme-light .reallybig{font-size:245%}.theme-light .extremelybig{font-size:310%}.theme-light .greentext{color:lime;font-size:185%}.theme-light .redtext{color:red;font-size:185%}.theme-light .clown{color:#ff69bf;font-size:160%;font-family:"Comic Sans MS",cursive,sans-serif;font-weight:bold}.theme-light .singing{font-family:"Trebuchet MS",cursive,sans-serif;font-style:italic}.theme-light .his_grace{color:#15d512;font-family:"Courier New",cursive,sans-serif;font-style:italic}.theme-light .hypnophrase{color:#0d0d0d;font-weight:bold;animation:hypnocolor 1500ms infinite;animation-direction:alternate}@keyframes hypnocolor{0%{color:#0d0d0d}25%{color:#410194}50%{color:#7f17d8}75%{color:#410194}100%{color:#3bb5d3}}.theme-light .phobia{color:#d00;font-weight:bold;animation:phobia 750ms infinite}@keyframes phobia{0%{color:#0d0d0d}50%{color:#d00}100%{color:#0d0d0d}}.theme-light .icon{height:1em;width:auto}.theme-light .bigicon{font-size:2.5em}.theme-light .memo{color:#638500;text-align:center}.theme-light .memoedit{text-align:center;font-size:125%}.theme-light .abductor{color:purple;font-style:italic}.theme-light .mind_control{color:#a00d6f;font-size:100%;font-weight:bold;font-style:italic}.theme-light .slime{color:#00ced1}.theme-light .drone{color:#848482}.theme-light .monkey{color:#975032}.theme-light .swarmer{color:#2c75ff}.theme-light .resonate{color:#298f85}.theme-light .monkeyhive{color:#774704}.theme-light .monkeylead{color:#774704;font-size:80%}.theme-light .connectionClosed,.theme-light .fatalError{background:red;color:#fff;padding:5px}.theme-light .connectionClosed.restored{background:green}.theme-light .internal.boldnshit{color:blue;font-weight:bold}.theme-light .text-normal{font-weight:normal;font-style:normal}.theme-light .hidden{display:none;visibility:hidden}.theme-light .ml-1{margin-left:1em}.theme-light .ml-2{margin-left:2em}.theme-light .ml-3{margin-left:3em}.theme-light .xooc{color:#6c0094;font-weight:bold;font-size:140%}.theme-light .mooc{color:#090;font-weight:bold;font-size:140%}.theme-light .yooc{color:#999600;font-weight:bold;font-size:140%}.theme-light .headminsay{color:#5a0a7f;font-weight:bold}.theme-light .radio{color:#4e4e4e}.theme-light .deptradio{color:#939}.theme-light .comradio{color:#004080}.theme-light .centradio{color:#5c5c8a}.theme-light .cryoradio{color:#554e3f}.theme-light .hcradio{color:#318779}.theme-light .airadio{color:#f0f}.theme-light .secradio{color:#a30000}.theme-light .engradio{color:#a66300}.theme-light .sentryradio{color:#844300}.theme-light .medradio{color:#008160}.theme-light .supradio{color:#5f4519}.theme-light .jtacradio{color:#702963}.theme-light .intelradio{color:#027d02}.theme-light .wyradio{color:#fe9b24}.theme-light .pmcradio{color:#136957}.theme-light .vairadio{color:#943d0a}.theme-light .cmbradio{color:#1b748c}.theme-light .clfradio{color:#6f679c}.theme-light .alpharadio{color:#ea0000}.theme-light .bravoradio{color:#c68610}.theme-light .charlieradio{color:#a5a}.theme-light .deltaradio{color:#007fcf}.theme-light .echoradio{color:#3a7e65}.theme-light .medium{font-size:110%}.theme-light .big{font-size:115%}.theme-light .large{font-size:125%}.theme-light .extra_large{font-size:130%}.theme-light .huge{font-size:150%}.theme-light .underline{text-decoration:underline}.theme-light .orange{color:#eca100}.theme-light .normal{font-style:normal}.theme-light .attack{color:red}.theme-light .moderate{color:#c00}.theme-light .disarm{color:#900}.theme-light .passive{color:#600}.theme-light .helpful{color:#368f31}.theme-light .scanner{color:red}.theme-light .scannerb{color:red;font-weight:bold}.theme-light .scannerburn{color:orange}.theme-light .scannerburnb{color:orange;font-weight:bold}.theme-light .rose{color:#ff5050}.theme-light .debuginfo{color:#493d26;font-style:italic}.theme-light .xenonotice{color:#2a623d}.theme-light .xenoboldnotice{color:#2a623d;font-style:italic}.theme-light .xenowarning{color:#2a623d;font-style:italic}.theme-light .xenominorwarning{color:#2a623d;font-weight:bold;font-style:italic}.theme-light .xenodanger{color:#2a623d;font-weight:bold}.theme-light .avoidharm{color:#72a0e5;font-weight:bold}.theme-light .highdanger{color:red;font-weight:bold;font-size:140%}.theme-light .xenohighdanger{color:#2a623d;font-weight:bold;font-size:140%}.theme-light .xenoannounce{color:#1a472a;font-family:book-antiqua;font-weight:bold;font-size:140%}.theme-light .yautjabold{color:purple;font-weight:bold}.theme-light .yautjaboldbig{color:purple;font-weight:bold;font-size:120%}.theme-light .objectivebig{font-weight:bold;font-size:130%}.theme-light .objectivegreen{color:lime}.theme-light .objectivered{color:red}.theme-light .objectivesuccess{color:lime;font-weight:bold;font-size:110%}.theme-light .objectivefail{color:red;font-weight:bold;font-size:110%}.theme-light .xenotalk,.theme-light .xeno{color:#900090;font-style:italic}.theme-light .xenoleader{color:#730d73;font-style:italic;font-size:125%}.theme-light .xenoqueen{color:#730d73;font-style:italic;font-weight:bold;font-size:125%}.theme-light .newscaster{color:maroon}.theme-light .role_header{color:#db0000;display:block;text-align:center;font-weight:bold;font-family:trebuchet-ms;font-size:150%}.theme-light .role_body{color:#009;display:block;text-align:center;font-size:125%}.theme-light .round_header{color:#db0000;display:block;text-align:center;font-family:courier;font-weight:bold;font-size:180%}.theme-light .round_body{color:#001427;display:block;text-align:center;font-family:trebuchet-ms;font-weight:bold;font-size:125%}.theme-light .event_announcement{color:#600d48;font-family:arial-narrow;font-weight:bold;font-size:125%}.theme-light .announce_header{color:#000;font-weight:bold;font-size:150%}.theme-light .announce_header_blue{color:#009;font-weight:bold;font-size:150%}.theme-light .announce_body{color:red;font-weight:normal;font-size:125%}.theme-light .centerbold{display:block;text-align:center;font-weight:bold}.theme-light .mod{color:#735638;font-weight:bold}.theme-light .modooc{color:#184880;font-weight:bold}.theme-light .adminmod{color:#402a14;font-weight:bold}.theme-light .mentorsay{color:#b38c32;font-weight:bold}.theme-light .mentorhelp{color:#007e00;font-weight:bold}.theme-light .mentorbody{color:#da6200;font-weight:bold}.theme-light .mentorstaff{color:#876101;font-weight:bold}.theme-light .staffsay{color:#876101;font-weight:bold}.theme-light .tajaran{color:#803b56}.theme-light .tajaran_signlang{color:#941c1c}.theme-light .skrell{color:#00ced1}.theme-light .soghun{color:#228b22}.theme-light .changeling{color:purple}.theme-light .vox{color:#a0a}.theme-light .monkey{color:#966c47}.theme-light .german{color:#858f1e;font-family:"Times New Roman",Times,serif}.theme-light .spanish{color:#cf982b}.theme-light .japanese{color:#940927}.theme-light .chinese{color:#fe1919}.theme-light .zombie{color:#216163;font-style:italic}.theme-light .commando{color:#fe9b24;font-style:bold}.theme-light .rough{font-family:trebuchet-ms,cursive,sans-serif}.theme-light .say_quote{font-family:Georgia,Verdana,sans-serif}.theme-light .admin .message{color:#314cad}.theme-light .admin .prefix{font-weight:bolder}.theme-light .pm{font-size:110%}.theme-light .retro_translator{font-weight:bold}.theme-light .yautja_translator{color:#a00;font-weight:bold;animation:glitch .5s infinite}@keyframes glitch{25%{color:#a00;transform:translate(-2px, -1px)}50%{color:#be0000;transform:translate(1px, -2px)}75%{color:#8d0000;transform:translate(-1px, 2px)}100%{color:#830000;transform:translate(1px, 1px)}}.theme-light .examine_block{background:#f2f7fa;border:1px solid #111a27;margin:.5em;padding:.5em .75em}.theme-light .examine_block .icon{width:1.5em;height:1.5em;margin:0;padding:0}.theme-light .tooltip{font-style:italic;border-bottom:1px dashed #000} diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh index 154629ff3c8d..4a223fe3d3c5 100644 --- a/tools/ci/check_grep.sh +++ b/tools/ci/check_grep.sh @@ -166,9 +166,10 @@ part "map json sanity" for json in maps/*.json do map_path=$(jq -r '.map_path' $json) + override_map=$(jq -r '.override_map' $json) while read map_file; do filename="maps/$map_path/$map_file" - if [ ! -f $filename ] + if [ ! -f $filename ] && [ -z "$override_map" ] then echo echo -e "${RED}ERROR: found invalid file reference to $filename in _maps/$json.${NC}" diff --git a/tools/ci/install_byond.sh b/tools/ci/install_byond.sh index 4a688755d3d9..9108bde5ebec 100644 --- a/tools/ci/install_byond.sh +++ b/tools/ci/install_byond.sh @@ -1,7 +1,10 @@ #!/bin/bash set -euo pipefail -source dependencies.sh +# BYOND_MAJOR and BYOND_MINOR can be explicitly set, such as in alt_byond_versions.txt +if [ -z "${BYOND_MAJOR+x}" ]; then + source dependencies.sh +fi if [ -d "$HOME/BYOND/byond/bin" ] && grep -Fxq "${BYOND_MAJOR}.${BYOND_MINOR}" $HOME/BYOND/version.txt; then diff --git a/tools/maplint/lints/multiple_firelocks.yml b/tools/maplint/lints/multiple_firelocks.yml index 7b93d0816bcc..4fe83486e95e 100644 --- a/tools/maplint/lints/multiple_firelocks.yml +++ b/tools/maplint/lints/multiple_firelocks.yml @@ -1,3 +1,3 @@ =/obj/structure/machinery/door/firedoor: banned_neighbors: - - =/obj/structure/machinery/door/firedoor + - =/obj/structure/machinery/door/firedoor diff --git a/tools/maplint/lints/multiple_tables.yml b/tools/maplint/lints/multiple_tables.yml index d16b36d76293..a5f5393cd8de 100644 --- a/tools/maplint/lints/multiple_tables.yml +++ b/tools/maplint/lints/multiple_tables.yml @@ -1,4 +1,3 @@ /obj/structure/surface/table: banned_neighbors: - /obj/structure/surface/table: - identical: true + - /obj/structure/surface/table diff --git a/tools/tgs4_scripts/PreCompile.sh b/tools/tgs4_scripts/PreCompile.sh deleted file mode 100644 index b445ea0559c8..000000000000 --- a/tools/tgs4_scripts/PreCompile.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash - -# REPO MAINTAINERS: KEEP CHANGES TO THIS IN SYNC WITH /tools/LinuxOneShot/SetupProgram/PreCompile.sh -# No ~mso -set -e -set -x - -#load dep exports -#need to switch to game dir for Dockerfile weirdness -original_dir=$PWD -cd "$1" -. dependencies.sh -cd "$original_dir" - -#find out what we have (+e is important for this) -set +e -has_git="$(command -v git)" -has_cargo="$(command -v ~/.cargo/bin/cargo)" -has_sudo="$(command -v sudo)" -has_grep="$(command -v grep)" -has_youtubedl="$(command -v youtube-dl)" -has_pip3="$(command -v pip3)" -set -e - -# install cargo if needed -if ! [ -x "$has_cargo" ]; then - echo "Installing rust..." - curl https://sh.rustup.rs -sSf | sh -s -- -y - . ~/.profile -fi - -# apt packages, libssl needed by rust-g but not included in TGS barebones install -if ! ( [ -x "$has_git" ] && [ -x "$has_grep" ] && [ -f "/usr/lib/i386-linux-gnu/libssl.so" ] ); then - echo "Installing apt dependencies..." - if ! [ -x "$has_sudo" ]; then - dpkg --add-architecture i386 - apt-get update - apt-get install -y git libssl-dev:i386 - rm -rf /var/lib/apt/lists/* - else - sudo dpkg --add-architecture i386 - sudo apt-get update - sudo apt-get install -y git libssl-dev:i386 - sudo rm -rf /var/lib/apt/lists/* - fi -fi -dpkg --add-architecture i386 -apt-get update -apt-get install -y zlib1g:i386 zlib1g-dev:i386 pkg-config libssl-dev:i386 libssl-dev libssl1.1:i386 gcc-multilib -# update rust-g -if [ ! -d "rust-g" ]; then - echo "Cloning rust-g..." - git clone https://github.com/tgstation/rust-g - cd rust-g - ~/.cargo/bin/rustup target add i686-unknown-linux-gnu -else - echo "Fetching rust-g..." - cd rust-g - git fetch - ~/.cargo/bin/rustup target add i686-unknown-linux-gnu -fi - -echo "Deploying rust-g..." -git checkout "$RUST_G_VERSION" -~/.cargo/bin/rustup update stable -~/.cargo/bin/cargo update -env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --release --target=i686-unknown-linux-gnu -mv target/i686-unknown-linux-gnu/release/librust_g.so "$1/librust_g.so" -cd .. - -# install or update youtube-dl when not present, or if it is present with pip3, -# which we assume was used to install it -if ! [ -x "$has_youtubedl" ]; then - echo "Installing youtube-dl with pip3..." - if ! [ -x "$has_sudo" ]; then - apt-get install -y python3 python3-pip - else - sudo apt-get install -y python3 python3-pip - fi - pip3 install youtube-dl -elif [ -x "$has_pip3" ]; then - echo "Ensuring youtube-dl is up-to-date with pip3..." - pip3 install youtube-dl -U -fi - -# compile tgui -echo "Compiling tgui..." -cd "$1" -chmod +x tools/bootstrap/node # Workaround for https://github.com/tgstation/tgstation-server/issues/1167 -env TG_BOOTSTRAP_CACHE="$original_dir" TG_BOOTSTRAP_NODE_LINUX=1 CBT_BUILD_MODE="TGS" tools/bootstrap/node tools/build/build.js - -echo "Running changelog script..." -python3 .github/ss13_genchangelog.py html/changelogs diff --git a/tools/tgs4_scripts/WatchdogLaunch.sh b/tools/tgs_scripts/InstallDeps.sh similarity index 50% rename from tools/tgs4_scripts/WatchdogLaunch.sh rename to tools/tgs_scripts/InstallDeps.sh index cf226fd670da..6b75c49bb086 100644 --- a/tools/tgs4_scripts/WatchdogLaunch.sh +++ b/tools/tgs_scripts/InstallDeps.sh @@ -1,19 +1,29 @@ #!/bin/bash -# Special file to ensure all dependencies still exist between server lanuches. -# Mainly for use by people who abuse docker by modifying the container's system. -set -e -set -x - #find out what we have (+e is important for this) set +e has_git="$(command -v git)" +has_curl="$(command -v curl)" has_cargo="$(command -v ~/.cargo/bin/cargo)" has_sudo="$(command -v sudo)" -has_grep="$(command -v grep)" has_youtubedl="$(command -v youtube-dl)" has_pip3="$(command -v pip3)" set -e +set -x + +# apt packages, libssl needed by rust-g but not included in TGS barebones install +if ! ( [ -x "$has_git" ] && [ -x "$has_curl" ] && [ -f "/usr/lib/i386-linux-gnu/libssl.so" ] ); then + echo "Installing apt dependencies..." + if ! [ -x "$has_sudo" ]; then + dpkg --add-architecture i386 + apt-get update + apt-get install -y lib32z1 git pkg-config libssl-dev:i386 libssl-dev zlib1g-dev:i386 curl + else + sudo dpkg --add-architecture i386 + sudo apt-get update + sudo apt-get install -y lib32z1 git pkg-config libssl-dev:i386 libssl-dev zlib1g-dev:i386 curl + fi +fi # install cargo if needed if ! [ -x "$has_cargo" ]; then @@ -22,20 +32,19 @@ if ! [ -x "$has_cargo" ]; then . ~/.profile fi -# apt packages, libssl needed by rust-g but not included in TGS barebones install -if ! ( [ -x "$has_git" ] && [ -x "$has_grep" ] && [ -f "/usr/lib/i386-linux-gnu/libssl.so" ] ); then - dpkg --add-architecture i386 - apt-get update - apt-get install -y lib32z1 git pkg-config libssl-dev:i386 libssl-dev libssl1.1:i386 gcc-multilib lib32z1-dev -fi - -# install youtube-dl when not present +# install or update youtube-dl when not present, or if it is present with pip3, +# which we assume was used to install it if ! [ -x "$has_youtubedl" ]; then echo "Installing youtube-dl with pip3..." if ! [ -x "$has_sudo" ]; then + apt-get update apt-get install -y python3 python3-pip else + sudo apt-get update sudo apt-get install -y python3 python3-pip fi pip3 install youtube-dl +elif [ -x "$has_pip3" ]; then + echo "Ensuring youtube-dl is up-to-date with pip3..." + pip3 install youtube-dl -U fi diff --git a/tools/tgs_scripts/PreCompile.bat b/tools/tgs_scripts/PreCompile.bat new file mode 100644 index 000000000000..ce7572c9ef4e --- /dev/null +++ b/tools/tgs_scripts/PreCompile.bat @@ -0,0 +1,15 @@ +@echo off +cd /D "%~dp0" +set TG_BOOTSTRAP_CACHE=%cd% +IF NOT %1 == "" ( + rem TGS4+: we are passed the game directory on the command line + cd %1 +) ELSE IF EXIST "..\Game\B\tgstation.dmb" ( + rem TGS3: Game/B/tgstation.dmb exists, so build in Game/A + cd ..\Game\A +) ELSE ( + rem TGS3: Otherwise build in Game/B + cd ..\Game\B +) +set CBT_BUILD_MODE=TGS +tools\build\build diff --git a/tools/tgs_scripts/PreCompile.sh b/tools/tgs_scripts/PreCompile.sh new file mode 100644 index 000000000000..f859b8e344cd --- /dev/null +++ b/tools/tgs_scripts/PreCompile.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +./InstallDeps.sh + +set -e +set -x + +#load dep exports +#need to switch to game dir for Dockerfile weirdness +original_dir=$PWD +cd "$1" +. dependencies.sh +cd "$original_dir" + +# update rust-g +if [ ! -d "rust-g" ]; then + echo "Cloning rust-g..." + git clone https://github.com/tgstation/rust-g + cd rust-g + ~/.cargo/bin/rustup target add i686-unknown-linux-gnu +else + echo "Fetching rust-g..." + cd rust-g + git fetch + ~/.cargo/bin/rustup target add i686-unknown-linux-gnu +fi + +echo "Deploying rust-g..." +git checkout "$RUST_G_VERSION" +env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --release --target=i686-unknown-linux-gnu --features redis_pubsub +mv target/i686-unknown-linux-gnu/release/librust_g.so "$1/librust_g.so" +cd .. + +# compile tgui +echo "Compiling tgui..." +cd "$1" +chmod +x tools/bootstrap/node # Workaround for https://github.com/tgstation/tgstation-server/issues/1167 +env TG_BOOTSTRAP_CACHE="$original_dir" TG_BOOTSTRAP_NODE_LINUX=1 CBT_BUILD_MODE="TGS" tools/bootstrap/node tools/build/build.js + +echo "Running changelog script..." +python3 .github/ss13_genchangelog.py html/changelogs diff --git a/tools/tgs4_scripts/PreSynchronize.sh b/tools/tgs_scripts/PreSynchronize.sh similarity index 100% rename from tools/tgs4_scripts/PreSynchronize.sh rename to tools/tgs_scripts/PreSynchronize.sh diff --git a/tools/tgs_scripts/WatchdogLaunch.sh b/tools/tgs_scripts/WatchdogLaunch.sh new file mode 100644 index 000000000000..cd400cbb969b --- /dev/null +++ b/tools/tgs_scripts/WatchdogLaunch.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# Special file to ensure all dependencies still exist between server launches. +# Mainly for use by people who abuse docker by modifying the container's system. + +./InstallDeps.sh