diff --git a/.github/workflows/autochangelog.yml b/.github/workflows/autochangelog.yml new file mode 100644 index 00000000000..77324267187 --- /dev/null +++ b/.github/workflows/autochangelog.yml @@ -0,0 +1,39 @@ +name: Autochangelog +on: + pull_request: + types: closed + branches: + - master + +env: + BASENAME: "polaris" + +jobs: + autochangelog: + name: Autochangelog + runs-on: ubuntu-16.04 + if: github.event.pull_request.merged == true + steps: + - uses: /actions/checkout@v2 + - name: Ensure +x on CI directory + run: | + chmod -R +x ./tools/ci + - uses: actions/setup-python@v2 + with: + python-version: '3.7' + - name: Generate Changelog + run: | + pip install pyyaml + python tools/GenerateChangelog/ss13_autochangelog.py \ + html/changelogs \ + ${{ github.event.pull_request.number }} \ + "${{ github.event.pull_request.user.login }}" \ + "${{ github.event.pull_request.body }}" + python tools/GenerateChangelog/ss13_genchangelog.py \ + html/changelog.html \ + html/changelogs + - uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_message: Automatic changelog generation for ${{ github.events.pull_request.number }} + branch: ${{ github.events.pull_request.base }} + commit_user_name: Autochangelog Bot diff --git a/code/__defines/belly_modes_vr.dm b/code/__defines/belly_modes_vr.dm index ccffcf43416..d497391d3fc 100644 --- a/code/__defines/belly_modes_vr.dm +++ b/code/__defines/belly_modes_vr.dm @@ -9,30 +9,17 @@ #define DM_SIZE_STEAL "Size Steal" #define DM_HEAL "Heal" #define DM_EGG "Encase In Egg" -#define DM_TRANSFORM "Transform" //#define DM_ITEMWEAK "Digest (Item Friendly)" //#define DM_STRIPDIGEST "Strip Digest (Items Only)" //#define DM_DIGEST_NUMB "Digest (Numbing)" -//TF modes -#define DM_TRANSFORM_HAIR_AND_EYES "Transform (Hair and eyes)" -#define DM_TRANSFORM_MALE "Transform (Male)" -#define DM_TRANSFORM_FEMALE "Transform (Female)" -#define DM_TRANSFORM_KEEP_GENDER "Transform (Keep Gender)" -#define DM_TRANSFORM_REPLICA "Transform (Replica Of Self)" -#define DM_TRANSFORM_CHANGE_SPECIES_AND_TAUR "Transform (Change Species and Taur)" -#define DM_TRANSFORM_CHANGE_SPECIES_AND_TAUR_EGG "Transform (Change Species and Taur) (EGG)" -#define DM_TRANSFORM_REPLICA_EGG "Transform (Replica Of Self) (EGG)" -#define DM_TRANSFORM_KEEP_GENDER_EGG "Transform (Keep Gender) (EGG)" -#define DM_TRANSFORM_MALE_EGG "Transform (Male) (EGG)" -#define DM_TRANSFORM_FEMALE_EGG "Transform (Female) (EGG)" - //Addon mode flags #define DM_FLAG_NUMBING 0x1 #define DM_FLAG_STRIPPING 0x2 #define DM_FLAG_LEAVEREMAINS 0x4 #define DM_FLAG_THICKBELLY 0x8 +#define DM_FLAG_AFFECTWORN 0x10 //Item related modes #define IM_HOLD "Hold" diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index 3e86c138560..a7b3bd86f8f 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -157,6 +157,8 @@ #define MAT_GRAPHITE "graphite" #define MAT_LEATHER "leather" #define MAT_CHITIN "chitin" +#define MAT_CLOTH "cloth" +#define MAT_SYNCLOTH "syncloth" #define SHARD_SHARD "shard" #define SHARD_SHRAPNEL "shrapnel" @@ -480,4 +482,15 @@ GLOBAL_LIST_INIT(all_volume_channels, list( VOLUME_CHANNEL_ALARMS, VOLUME_CHANNEL_VORE, VOLUME_CHANNEL_DOORS, -)) \ No newline at end of file +)) + +#define APPEARANCECHANGER_CHANGED_RACE "Race" +#define APPEARANCECHANGER_CHANGED_GENDER "Gender" +#define APPEARANCECHANGER_CHANGED_GENDER_ID "Gender Identity" +#define APPEARANCECHANGER_CHANGED_SKINTONE "Skin Tone" +#define APPEARANCECHANGER_CHANGED_SKINCOLOR "Skin Color" +#define APPEARANCECHANGER_CHANGED_HAIRSTYLE "Hair Style" +#define APPEARANCECHANGER_CHANGED_HAIRCOLOR "Hair Color" +#define APPEARANCECHANGER_CHANGED_F_HAIRSTYLE "Facial Hair Style" +#define APPEARANCECHANGER_CHANGED_F_HAIRCOLOR "Facial Hair Color" +#define APPEARANCECHANGER_CHANGED_EYES "Eye Color" diff --git a/code/__defines/species_languages.dm b/code/__defines/species_languages.dm index 34c68ebd089..f6ca0ea5655 100644 --- a/code/__defines/species_languages.dm +++ b/code/__defines/species_languages.dm @@ -68,7 +68,7 @@ #define LANGUAGE_ALAI "Alai" #define LANGUAGE_ZADDAT "Vedahq" #define LANGUAGE_PROMETHEAN "Promethean Biolinguistics" -#define LANGUAGE_BLOB "Blob" +#define LANGUAGE_BLOB "Chemosense Transmission" #define LANGUAGE_GIBBERISH "Babel" // Language flags. diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm index 371f35b0515..855decff39a 100644 --- a/code/_helpers/global_lists.dm +++ b/code/_helpers/global_lists.dm @@ -215,7 +215,7 @@ var/global/list/string_slot_flags = list( GLOB.closet_appearances[T] = app // VOREStation Add - Vore Modes! - paths = typesof(/datum/digest_mode) - /datum/digest_mode/transform + paths = typesof(/datum/digest_mode) for(var/T in paths) var/datum/digest_mode/DM = new T GLOB.digest_modes[DM.id] = DM diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 0406099616a..7a49e8b3875 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -8,9 +8,11 @@ var/global/list/tail_styles_list = list() // Stores /datum/sprite_accessory/tail var/global/list/wing_styles_list = list() // Stores /datum/sprite_accessory/wing indexed by type var/global/list/negative_traits = list() // Negative custom species traits, indexed by path var/global/list/neutral_traits = list() // Neutral custom species traits, indexed by path +var/global/list/everyone_traits = list() // Neutral traits available to all species, indexed by path var/global/list/positive_traits = list() // Positive custom species traits, indexed by path var/global/list/traits_costs = list() // Just path = cost list, saves time in char setup var/global/list/all_traits = list() // All of 'em at once (same instances) +var/global/list/active_ghost_pods = list() var/global/list/sensorpreflist = list("Off", "Binary", "Vitals", "Tracking", "No Preference") //TFF 5/8/19 - Suit Sensors global list @@ -106,30 +108,66 @@ var/global/list/fancy_release_sounds = list( ) var/global/list/global_vore_egg_types = list( - "Unathi" = UNATHI_EGG, - "Tajaran" = TAJARAN_EGG, - "Akula" = AKULA_EGG, - "Skrell" = SKRELL_EGG, - "Nevrean" = NEVREAN_EGG, - "Sergal" = SERGAL_EGG, - "Human" = HUMAN_EGG, - "Slime" = SLIME_EGG, - "Egg" = EGG_EGG, - "Xenochimera" = XENOCHIMERA_EGG, - "Xenomorph" = XENOMORPH_EGG) + "Unathi", + "Tajara", + "Akula", + "Skrell", + "Sergal", + "Nevrean", + "Human", + "Slime", + "Egg", + "Xenochimera", + "Xenomorph", + "Chocolate", + "Boney", + "Slime glob", + "Chicken", + "Synthetic", + "Cooking error", + "Escape pod", + "Web cocoon", + "Bug cocoon", + "Rock", + "Yellow", + "Blue", + "Green", + "Orange", + "Purple", + "Red", + "Rainbow", + "Spotted pink") var/global/list/tf_vore_egg_types = list( - "Unathi" = /obj/structure/closet/secure_closet/egg/unathi, - "Tajara" = /obj/structure/closet/secure_closet/egg/tajaran, - "Akula" = /obj/structure/closet/secure_closet/egg/shark, - "Skrell" = /obj/structure/closet/secure_closet/egg/skrell, - "Sergal" = /obj/structure/closet/secure_closet/egg/sergal, - "Nevrean" = /obj/structure/closet/secure_closet/egg/nevrean, - "Human" = /obj/structure/closet/secure_closet/egg/human, - "Slime" = /obj/structure/closet/secure_closet/egg/slime, - "Egg" = /obj/structure/closet/secure_closet/egg, - "Xenochimera" = /obj/structure/closet/secure_closet/egg/scree, - "Xenomorph" = /obj/structure/closet/secure_closet/egg/xenomorph) + "Unathi" = /obj/item/weapon/storage/vore_egg/unathi, + "Tajara" = /obj/item/weapon/storage/vore_egg/tajaran, + "Akula" = /obj/item/weapon/storage/vore_egg/shark, + "Skrell" = /obj/item/weapon/storage/vore_egg/skrell, + "Sergal" = /obj/item/weapon/storage/vore_egg/sergal, + "Nevrean" = /obj/item/weapon/storage/vore_egg/nevrean, + "Human" = /obj/item/weapon/storage/vore_egg/human, + "Slime" = /obj/item/weapon/storage/vore_egg/slime, + "Egg" = /obj/item/weapon/storage/vore_egg, + "Xenochimera" = /obj/item/weapon/storage/vore_egg/scree, + "Xenomorph" = /obj/item/weapon/storage/vore_egg/xenomorph, + "Chocolate" = /obj/item/weapon/storage/vore_egg/chocolate, + "Boney" = /obj/item/weapon/storage/vore_egg/owlpellet, + "Slime glob" = /obj/item/weapon/storage/vore_egg/slimeglob, + "Chicken" = /obj/item/weapon/storage/vore_egg/chicken, + "Synthetic" = /obj/item/weapon/storage/vore_egg/synthetic, + "Cooking error" = /obj/item/weapon/storage/vore_egg/badrecipe, + "Escape pod" = /obj/item/weapon/storage/vore_egg/escapepod, + "Web cocoon" = /obj/item/weapon/storage/vore_egg/cocoon, + "Bug cocoon" = /obj/item/weapon/storage/vore_egg/bugcocoon, + "Rock" = /obj/item/weapon/storage/vore_egg/rock, + "Yellow" = /obj/item/weapon/storage/vore_egg/yellow, + "Blue" = /obj/item/weapon/storage/vore_egg/blue, + "Green" = /obj/item/weapon/storage/vore_egg/green, + "Orange" = /obj/item/weapon/storage/vore_egg/orange, + "Purple" = /obj/item/weapon/storage/vore_egg/purple, + "Red" = /obj/item/weapon/storage/vore_egg/red, + "Rainbow" = /obj/item/weapon/storage/vore_egg/rainbow, + "Spotted pink" = /obj/item/weapon/storage/vore_egg/pinkspots) var/global/list/edible_trash = list(/obj/item/broken_device, /obj/item/clothing/accessory/collar, //TFF 10/7/19 - add option to nom collars, @@ -180,7 +218,8 @@ var/global/list/edible_trash = list(/obj/item/broken_device, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/fancy/crayons, /obj/item/weapon/storage/fancy/egg_box, - /obj/item/weapon/storage/wallet) + /obj/item/weapon/storage/wallet, + /obj/item/weapon/storage/vore_egg) var/global/list/contamination_flavors = list( "Generic" = contamination_flavors_generic, @@ -457,7 +496,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, for(var/path in paths) var/datum/sprite_accessory/hair_accessory/instance = new path() hair_accesories_list[path] = instance - + // Custom species traits paths = typesof(/datum/trait) - /datum/trait for(var/path in paths) @@ -472,6 +511,8 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, negative_traits[path] = instance if(0) neutral_traits[path] = instance + if(!(instance.custom_only)) + everyone_traits[path] = instance if(0.1 to INFINITY) positive_traits[path] = instance diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index bc7dca1d749..c759e84c02d 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -1290,6 +1290,9 @@ var/mob/dview/dview_mob = new /proc/dview(var/range = world.view, var/center, var/invis_flags = 0) if(!center) return + if(!dview_mob) //VOREStation Add: Debugging + dview_mob = new + log_error("Had to recreate the dview mob!") dview_mob.loc = center diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 6a4579f1919..b29a1192d9b 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -354,19 +354,13 @@ facedir(direction) /obj/screen/click_catcher + name = "Darkness" icon = 'icons/mob/screen_gen.dmi' icon_state = "click_catcher" plane = CLICKCATCHER_PLANE + layer = LAYER_HUD_UNDER mouse_opacity = 2 - screen_loc = "CENTER-7,CENTER-7" - -/obj/screen/click_catcher/proc/MakeGreed() - . = list() - for(var/i = 0, i<15, i++) - for(var/j = 0, j<15, j++) - var/obj/screen/click_catcher/CC = new() - CC.screen_loc = "NORTH-[i],EAST-[j]" - . += CC + screen_loc = "SOUTHWEST to NORTHEAST" /obj/screen/click_catcher/Click(location, control, params) var/list/modifiers = params2list(params) @@ -374,7 +368,8 @@ var/mob/living/carbon/C = usr C.swap_hand() else - var/turf/T = screen_loc2turf(screen_loc, get_turf(usr)) + var/list/P = params2list(params) + var/turf/T = screen_loc2turf(P["screen-loc"], get_turf(usr)) if(T) T.Click(location, control, params) . = 1 diff --git a/code/_onclick/hud/_defines_vr.dm b/code/_onclick/hud/_defines_vr.dm index 2b4f4fb85e2..b419c6bd7f8 100644 --- a/code/_onclick/hud/_defines_vr.dm +++ b/code/_onclick/hud/_defines_vr.dm @@ -1,3 +1,2 @@ -#define ui_shadekin_dark_display "EAST-1:28,CENTER-3:15" -#define ui_shadekin_energy_display "EAST-1:28,CENTER-4:15" +#define ui_shadekin_display "EAST-1:28,CENTER-3:15" #define ui_xenochimera_danger_display "EAST-1:28,CENTER-3:15" \ No newline at end of file diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 6387f40d9ec..22e8e459fc5 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -14,7 +14,7 @@ var/other = list() var/hotkeybuttons = list() var/slot_info = list() - + HUD.adding = adding HUD.other = other HUD.hotkeybuttons = hotkeybuttons //These can be disabled for hotkey users @@ -258,15 +258,10 @@ hud_elements |= healths //VOREStation Addition begin - shadekin_dark_display = new /obj/screen/shadekin/darkness() - shadekin_dark_display.screen_loc = ui_shadekin_dark_display - shadekin_dark_display.icon_state = "dark" - hud_elements |= shadekin_dark_display - - shadekin_energy_display = new /obj/screen/shadekin/energy() - shadekin_energy_display.screen_loc = ui_shadekin_energy_display - shadekin_energy_display.icon_state = "energy0" - hud_elements |= shadekin_energy_display + shadekin_display = new /obj/screen/shadekin() + shadekin_display.screen_loc = ui_shadekin_display + shadekin_display.icon_state = "shadekin" + hud_elements |= shadekin_display xenochimera_danger_display = new /obj/screen/xenochimera/danger_level() xenochimera_danger_display.screen_loc = ui_xenochimera_danger_display diff --git a/code/_onclick/hud/screen_objects_vr.dm b/code/_onclick/hud/screen_objects_vr.dm index b3388f7bf76..1d8df98a38b 100644 --- a/code/_onclick/hud/screen_objects_vr.dm +++ b/code/_onclick/hud/screen_objects_vr.dm @@ -11,6 +11,11 @@ var/mob/living/simple_mob/shadekin/SK = usr if(istype(SK)) to_chat(usr,"Energy: [SK.energy] ([SK.dark_gains])") + if("shadekin status") + var/turf/T = get_turf(usr) + if(T) + var/darkness = round(1 - T.get_lumcount(),0.1) + to_chat(usr,"Darkness: [darkness]") var/mob/living/carbon/human/H = usr if(istype(H) && istype(H.species, /datum/species/shadekin)) to_chat(usr,"Energy: [H.shadekin_get_energy(H)]") diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 2b7aa15bbc0..67d14623cf6 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -496,7 +496,7 @@ var/list/gamemode_cache = list() config.respawn_time = raw_minutes MINUTES if ("respawn_message") - config.respawn_message = value + config.respawn_message = "[value]" if ("servername") config.server_name = value diff --git a/code/datums/autolathe/devices.dm b/code/datums/autolathe/devices.dm index 9c6ab5bb97e..eed4839159c 100644 --- a/code/datums/autolathe/devices.dm +++ b/code/datums/autolathe/devices.dm @@ -26,6 +26,12 @@ name = "mechanical trap" path =/obj/item/weapon/beartrap +/datum/category_item/autolathe/devices/barbedwire + name = "barbed wire" + path = /obj/item/weapon/material/barbedwire + hidden = 1 + resources = list(DEFAULT_WALL_MATERIAL = 10000) + /datum/category_item/autolathe/devices/electropack name = "electropack" path =/obj/item/device/radio/electropack diff --git a/code/datums/autolathe/tools.dm b/code/datums/autolathe/tools.dm index 9e9a87ea71f..9b88a496fa9 100644 --- a/code/datums/autolathe/tools.dm +++ b/code/datums/autolathe/tools.dm @@ -48,6 +48,11 @@ path = /obj/item/weapon/reagent_containers/spray resources = list(MAT_PLASTIC = 2000) +/datum/category_item/autolathe/devices/slowwire + name = "snare wire" + path = /obj/item/weapon/material/barbedwire/plastic + resources = list(MAT_PLASTIC = 10000) + /datum/category_item/autolathe/tools/spraynozzle name = "spray nozzle" path = /obj/item/weapon/reagent_containers/spray diff --git a/code/datums/observation/~cleanup.dm b/code/datums/observation/~cleanup.dm index 825902d4839..9dcc601436a 100644 --- a/code/datums/observation/~cleanup.dm +++ b/code/datums/observation/~cleanup.dm @@ -43,7 +43,7 @@ GLOBAL_LIST_EMPTY(event_listen_count) for(var/entry in GLOB.all_observable_events.events) var/decl/observ/event = entry if(event.unregister_global(listener)) - log_debug("[event] - [listener] was deleted while still registered to global events.") + // log_debug("[event] - [listener] was deleted while still registered to global events.") // TODO: Apply axe, reimplement with datum component listeners if(!(--listen_count)) return @@ -55,7 +55,7 @@ GLOBAL_LIST_EMPTY(event_listen_count) if(proc_owners) for(var/proc_owner in proc_owners) if(event.unregister(event_source, proc_owner)) - log_debug("[event] - [event_source] was deleted while still being listened to by [proc_owner].") + // log_debug("[event] - [event_source] was deleted while still being listened to by [proc_owner].") // TODO: Apply axe, reimplement with datum component listeners if(!(--source_listener_count)) return @@ -65,6 +65,6 @@ GLOBAL_LIST_EMPTY(event_listen_count) var/decl/observ/event = entry for(var/event_source in event.event_sources) if(event.unregister(event_source, listener)) - log_debug("[event] - [listener] was deleted while still listening to [event_source].") + // log_debug("[event] - [listener] was deleted while still listening to [event_source].") // TODO: Apply axe, reimplement with datum component listeners if(!(--listener_count)) return \ No newline at end of file diff --git a/code/datums/outfits/jobs/special_vr.dm b/code/datums/outfits/jobs/special_vr.dm index dd8316358b6..010010291dd 100644 --- a/code/datums/outfits/jobs/special_vr.dm +++ b/code/datums/outfits/jobs/special_vr.dm @@ -9,6 +9,21 @@ id_type = /obj/item/weapon/card/id/centcom pda_type = /obj/item/device/pda/centcom +/decl/hierarchy/outfit/job/emergency_responder + name = OUTFIT_JOB_NAME("Emergency Responder") + uniform = /obj/item/clothing/under/ert + shoes = /obj/item/clothing/shoes/boots/swat + gloves = /obj/item/clothing/gloves/swat + l_ear = /obj/item/device/radio/headset/ert + glasses = /obj/item/clothing/glasses/sunglasses + back = /obj/item/weapon/storage/backpack/satchel + id_type = /obj/item/weapon/card/id/centcom/ERT + pda_type = /obj/item/device/pda/centcom + + post_equip(var/mob/living/carbon/human/H) + ..() + ert.add_antagonist(H.mind) + /decl/hierarchy/outfit/job/clown name = OUTFIT_JOB_NAME("Clown") uniform = /obj/item/clothing/under/rank/clown diff --git a/code/datums/supplypacks/misc.dm b/code/datums/supplypacks/misc.dm index 0aa29b7b9c9..ed528d3bdd0 100644 --- a/code/datums/supplypacks/misc.dm +++ b/code/datums/supplypacks/misc.dm @@ -84,7 +84,8 @@ /obj/item/toy/plushie/borgplushie/scrubpuppy, /obj/item/toy/plushie/foxbear, /obj/item/toy/plushie/nukeplushie, - /obj/item/toy/plushie/otter) + /obj/item/toy/plushie/otter, + /obj/item/toy/plushie/vox) //VOREStation Add End name = "Plushies Crate" cost = 15 diff --git a/code/datums/supplypacks/munitions_vr.dm b/code/datums/supplypacks/munitions_vr.dm index e8674dd390c..75f2124c962 100644 --- a/code/datums/supplypacks/munitions_vr.dm +++ b/code/datums/supplypacks/munitions_vr.dm @@ -2,7 +2,7 @@ name = "Frontier phaser (station-locked) crate" contains = list( /obj/item/weapon/gun/energy/locked/frontier = 2, - /obj/item/weapon/gun/energy/locked/frontier/holdout = 1, + /obj/item/weapon/gun/energy/locked/frontier/holdout = 2, ) cost = 35 containertype = /obj/structure/closet/crate/secure diff --git a/code/datums/uplink/ammunition_vr.dm b/code/datums/uplink/ammunition_vr.dm index 3235bb7311f..18235e53432 100644 --- a/code/datums/uplink/ammunition_vr.dm +++ b/code/datums/uplink/ammunition_vr.dm @@ -18,3 +18,5 @@ name = "Void cell" path = /obj/item/weapon/cell/device/weapon/recharge/alien/hybrid item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 1.5 + antag_roles = list("ert") + blacklisted = 1 diff --git a/code/datums/uplink/backup.dm b/code/datums/uplink/backup.dm index 40f2a468f67..3e21676da3b 100644 --- a/code/datums/uplink/backup.dm +++ b/code/datums/uplink/backup.dm @@ -11,7 +11,7 @@ This type comes with a directional shield projector, a supressive fire energy weapon, \ a stunbaton, handcuffs, an agent ID, energy sword, pinpointer, and a jetpack." item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 1.5 - antag_roles = list("mercenary") + antag_roles = list("mercenary", "ert") //VOREStation Edit path = /obj/item/weapon/antag_spawner/syndicate_drone/protector /datum/uplink_item/item/backup/syndicate_drone_combat_medic @@ -21,7 +21,7 @@ a powerful hypospray that can create many potent chemicals, an agent ID, energy \ sword, pinpointer, and a jetpack." item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 1.5 - antag_roles = list("mercenary") + antag_roles = list("mercenary", "ert") //VOREStation Edit path = /obj/item/weapon/antag_spawner/syndicate_drone/combat_medic /datum/uplink_item/item/backup/syndicate_drone_mechanist @@ -31,5 +31,5 @@ a cryptographic sequencer, an AI detector, the ability to analyze and repair full-body prosthetics, \ a set of construction materials, an ionic rapier, an agent ID, energy sword, pinpointer, and a jetpack." item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 1.5 - antag_roles = list("mercenary") + antag_roles = list("mercenary", "ert") //VOREStation Edit path = /obj/item/weapon/antag_spawner/syndicate_drone/mechanist \ No newline at end of file diff --git a/code/datums/uplink/medical_vr.dm b/code/datums/uplink/medical_vr.dm index 8f0264d3e9d..5b4a0f31ccc 100644 --- a/code/datums/uplink/medical_vr.dm +++ b/code/datums/uplink/medical_vr.dm @@ -100,3 +100,66 @@ name = "Healing Nanite pill bottle" item_cost = 30 path = /obj/item/weapon/storage/pill_bottle/healing_nanites + +/datum/uplink_item/item/medical/vermicetol + name = "Vermicetol Bottle" + item_cost = 30 + path = /obj/item/weapon/reagent_containers/glass/bottle/vermicetol + antag_roles = list("ert") + blacklisted = 1 + +/datum/uplink_item/item/medical/dermaline + name = "Dermaline Bottle" + item_cost = 30 + path = /obj/item/weapon/reagent_containers/glass/bottle/dermaline + antag_roles = list("ert") + blacklisted = 1 + +/datum/uplink_item/item/medical/carthatoline + name = "Carthatoline Bottle" + item_cost = 30 + path = /obj/item/weapon/reagent_containers/glass/bottle/carthatoline + antag_roles = list("ert") + blacklisted = 1 + +/datum/uplink_item/item/medical/dexalinp + name = "Dexalin Plus Bottle" + item_cost = 30 + path = /obj/item/weapon/reagent_containers/glass/bottle/dexalinp + antag_roles = list("ert") + blacklisted = 1 + +/datum/uplink_item/item/medical/tramadol + name = "Tramadol Bottle" + item_cost = 30 + path = /obj/item/weapon/reagent_containers/glass/bottle/tramadol + antag_roles = list("ert") + blacklisted = 1 + +/datum/uplink_item/item/medical/arithrazine + name = "Arithrazine Bottle" + item_cost = 50 + path = /obj/item/weapon/reagent_containers/glass/bottle/arithrazine + antag_roles = list("ert") + blacklisted = 1 + +/datum/uplink_item/item/medical/corophizine + name = "Corophizine Bottle" + item_cost = 50 + path = /obj/item/weapon/reagent_containers/glass/bottle/corophizine + antag_roles = list("ert") + blacklisted = 1 + +/datum/uplink_item/item/medical/rezadone + name = "Rezadone Bottle" + item_cost = 50 + path = /obj/item/weapon/reagent_containers/glass/bottle/rezadone + antag_roles = list("ert") + blacklisted = 1 + +/datum/uplink_item/item/medical/defib + name = "Combat Defibrilator" + item_cost = 90 + path = /obj/item/device/defib_kit/compact/combat + antag_roles = list("mercenary", "ert") + blacklisted = 1 diff --git a/code/datums/uplink/tools.dm b/code/datums/uplink/tools.dm index 51d7ec7cd22..eee41e96993 100644 --- a/code/datums/uplink/tools.dm +++ b/code/datums/uplink/tools.dm @@ -92,6 +92,12 @@ desc = "A device which is capable of disrupting subspace communications, preventing the use of headsets, PDAs, and communicators within \ a radius of seven meters. It runs off weapon cells, which can be replaced as needed. One cell will last for approximately ten minutes." +/datum/uplink_item/item/tools/wall_elecrtifier + name = "Wall Electrifier" + item_cost = 10 + path = /obj/item/weapon/cell/spike + desc = "A modified powercell which will electrify walls and reinforced floors in a 3x3 tile range around it. Always active." + /datum/uplink_item/item/tools/emag name = "Cryptographic Sequencer" item_cost = 30 diff --git a/code/datums/uplink/tools_vr.dm b/code/datums/uplink/tools_vr.dm index 30b2cd725e0..871bfbb5add 100644 --- a/code/datums/uplink/tools_vr.dm +++ b/code/datums/uplink/tools_vr.dm @@ -26,6 +26,11 @@ item_cost = 5 path = /obj/item/device/survivalcapsule +/datum/uplink_item/item/tools/popcabin + name = "Cabin Capsule" + item_cost = 5 + path = /obj/item/device/survivalcapsule/popcabin + /datum/uplink_item/item/tools/nanopaste name = "Nanopaste (Advanced)" item_cost = 10 @@ -41,6 +46,16 @@ item_cost = 15 path = /obj/item/modular_computer/tablet/preset/custom_loadout/advanced +/datum/uplink_item/item/tools/metal + name = "Metal (50 sheets)" + item_cost = 15 + path = /obj/fiftyspawner/steel + +/datum/uplink_item/item/tools/glass + name = "Glass (50 sheets)" + item_cost = 15 + path = /obj/fiftyspawner/glass + /datum/uplink_item/item/tools/elitelaptop name = "Laptop (Advanced)" item_cost = 20 diff --git a/code/datums/uplink/visible_weapons.dm b/code/datums/uplink/visible_weapons.dm index d3ed1dcec34..b939e953de3 100644 --- a/code/datums/uplink/visible_weapons.dm +++ b/code/datums/uplink/visible_weapons.dm @@ -103,7 +103,7 @@ name = "Anti-Materiel Rifle (14.5mm)" item_cost = DEFAULT_TELECRYSTAL_AMOUNT path = /obj/item/weapon/gun/projectile/heavysniper - antag_roles = list("mercenary") + antag_roles = list("mercenary", "ert") //VOREStation Edit /datum/uplink_item/item/visible_weapons/heavysnipertraitor name = "Anti-Materiel Rifle (14.5mm)" diff --git a/code/datums/wires/mines.dm b/code/datums/wires/mines.dm index 209fcc4c307..5e757ad16c3 100644 --- a/code/datums/wires/mines.dm +++ b/code/datums/wires/mines.dm @@ -1,5 +1,5 @@ /datum/wires/mines - wire_count = 6 + wire_count = 7 randomize = TRUE holder_type = /obj/effect/mine proper_name = "Explosive Wires" @@ -7,6 +7,7 @@ /datum/wires/mines/New(atom/_holder) wires = list(WIRE_EXPLODE, WIRE_EXPLODE_DELAY, WIRE_DISARM, WIRE_BADDISARM) return ..() +#define WIRE_TRAP 64 /datum/wires/mines/get_status() . = ..() @@ -29,7 +30,13 @@ if(WIRE_DISARM) C.visible_message("[bicon(C)] *click!*", "[bicon(C)] *click!*") - new C.mineitemtype(get_turf(C)) + var/obj/effect/mine/MI = new C.mineitemtype(get_turf(C)) + + if(C.trap) + MI.trap = C.trap + C.trap = null + MI.trap.forceMove(MI) + spawn(0) qdel(C) @@ -37,6 +44,15 @@ C.visible_message("[bicon(C)] *BEEPBEEPBEEP*", "[bicon(C)] *BEEPBEEPBEEP*") spawn(20) C.explode() + + if(WIRE_TRAP) + C.visible_message("[bicon(C)] *click!*", "[bicon(C)] *click!*") + + if(mend) + C.visible_message("[bicon(C)] - The mine recalibrates[C.camo_net ? ", revealing \the [C.trap] inside." : "."]") + + C.alpha = 255 + ..() /datum/wires/mines/on_pulse(wire) @@ -57,6 +73,10 @@ if(WIRE_BADDISARM) C.visible_message("[bicon(C)] *ping*", "[bicon(C)] *ping*") + + if(WIRE_TRAP) + C.visible_message("[bicon(C)] *ping*", "[bicon(C)] *ping*") + ..() /datum/wires/mines/interactable(mob/user) diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index 4141281df9d..fccf178af9c 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -202,23 +202,9 @@ var/global/list/datum/dna/gene/dna_genes[0] // Technically custom_species is not part of the UI, but this place avoids merge problems. src.custom_species = character.custom_species - if(istype(character.species,/datum/species/custom)) - var/datum/species/custom/CS = character.species - src.species_traits = CS.traits.Copy() - src.base_species = CS.base_species - src.blood_color = CS.blood_color - - if(istype(character.species,/datum/species/xenochimera)) - var/datum/species/xenochimera/CS = character.species - //src.species_traits = CS.traits.Copy() //No traits - src.base_species = CS.base_species - src.blood_color = CS.blood_color - - if(istype(character.species,/datum/species/alraune)) - var/datum/species/alraune/CS = character.species - //src.species_traits = CS.traits.Copy() //No traits - src.base_species = CS.base_species - src.blood_color = CS.blood_color + src.base_species = character.species.base_species + src.blood_color = character.species.blood_color + src.species_traits = character.species.traits.Copy() // +1 to account for the none-of-the-above possibility SetUIValueRange(DNA_UI_EAR_STYLE, ear_style + 1, ear_styles_list.len + 1, 1) diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm index 0edc6bb636b..758f74d8737 100644 --- a/code/game/dna/dna2_helpers.dm +++ b/code/game/dna/dna2_helpers.dm @@ -237,20 +237,9 @@ // Technically custom_species is not part of the UI, but this place avoids merge problems. H.custom_species = dna.custom_species - if(istype(H.species,/datum/species/custom)) - var/datum/species/custom/CS = H.species - var/datum/species/custom/new_CS = CS.produceCopy(dna.base_species,dna.species_traits,src) - new_CS.blood_color = dna.blood_color - - if(istype(H.species,/datum/species/xenochimera)) - var/datum/species/xenochimera/CS = H.species - var/datum/species/xenochimera/new_CS = CS.produceCopy(dna.base_species,dna.species_traits,src) - new_CS.blood_color = dna.blood_color - - if(istype(H.species,/datum/species/alraune)) - var/datum/species/alraune/CS = H.species - var/datum/species/alraune/new_CS = CS.produceCopy(dna.base_species,dna.species_traits,src) - new_CS.blood_color = dna.blood_color + H.species.blood_color = dna.blood_color + var/datum/species/S = H.species + S.produceCopy(dna.base_species,dna.species_traits,src) // VOREStation Edit End H.force_update_organs() //VOREStation Add - Gotta do this too diff --git a/code/game/jobs/job/special_vr.dm b/code/game/jobs/job/special_vr.dm index d2de3db85c0..dcb6a51521a 100644 --- a/code/game/jobs/job/special_vr.dm +++ b/code/game/jobs/job/special_vr.dm @@ -24,47 +24,31 @@ get_access() return get_all_accesses().Copy() -/*/datum/job/centcom_visitor //For Pleasure // You mean for admin abuse... -Ace - title = "CentCom Visitor" - department = "Civilian" - head_position = 1 +/datum/job/emergency_responder //For staff managing/leading ERTs + title = "Emergency Responder" + departments = list("Central Command") + department_accounts = list(DEPARTMENT_COMMAND, DEPARTMENT_ENGINEERING, DEPARTMENT_MEDICAL, DEPARTMENT_RESEARCH, DEPARTMENT_SECURITY, DEPARTMENT_CARGO, DEPARTMENT_PLANET, DEPARTMENT_CIVILIAN) faction = "Station" total_positions = 2 spawn_positions = 1 supervisors = "company officials and Corporate Regulations" selection_color = "#1D1D4F" - idtype = /obj/item/weapon/card/id/centcom access = list() minimal_access = list() minimal_player_age = 14 economic_modifier = 20 whitelist_only = 1 latejoin_only = 1 + outfit_type = /decl/hierarchy/outfit/job/emergency_responder + job_description = "Emergency Responders are usually called in to deal with on-station emergencies that the crew require assistance to deal with." - minimum_character_age = 25 - ideal_character_age = 40 + minimum_character_age = 18 + ideal_character_age = 30 - equip(var/mob/living/carbon/human/H) - if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/centcom(H), slot_l_ear) - switch(H.backbag) - if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) - if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom, slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/device/pda/centcom(H), slot_belt) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(H), slot_gloves) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/centcom/officer(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/omnihud(H), slot_l_store) - - H.implant_loyalty() - - return 1 + pto_type = PTO_CIVILIAN get_access() - var/access = get_all_accesses() - return access*/ + return get_all_accesses().Copy() /datum/job/clown title = "Clown" diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index 5fc8c77bd0e..20fd6991a01 100644 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -168,9 +168,9 @@ if(reas) reason = reas if("duration") - var/dur = input("Duration (in minutes) during which pass is valid (up to 120 minutes).", "Duration") as num|null + var/dur = input("Duration (in minutes) during which pass is valid (up to 360 minutes).", "Duration") as num|null //VOREStation Edit if(dur) - if(dur > 0 && dur <= 120) + if(dur > 0 && dur <= 360) //VOREStation Edit duration = dur else to_chat(usr, "Invalid duration.") diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 0b6ab77d7a2..1fbd897113d 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -317,16 +317,16 @@ if(!length(t1)) return - for(var/datum/data/record/R in data_core.security) - if(t1 == lowertext(R.fields["name"]) || t1 == lowertext(R.fields["id"]) || t1 == lowertext(R.fields["b_dna"])) - active2 = R + for(var/datum/data/record/R in data_core.general) + if(t1 == lowertext(R.fields["name"]) || t1 == lowertext(R.fields["id"]) || t1 == lowertext(R.fields["fingerprint"])) + active1 = R break - if(!active2) - set_temp("Security record not found. You must enter the person's exact name, ID or DNA.", "danger") + if(!active1) + set_temp("Security record not found. You must enter the person's exact name, ID, or fingerprint.", "danger") return - for(var/datum/data/record/E in data_core.general) - if(E.fields["name"] == active2.fields["name"] && E.fields["id"] == active2.fields["id"]) - active1 = E + for(var/datum/data/record/E in data_core.security) + if(E.fields["name"] == active1.fields["name"] && E.fields["id"] == active1.fields["id"]) + active2 = E break screen = SEC_DATA_RECORD if("print_p") diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index db275597960..64a3cc1fc78 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -1,111 +1,8 @@ /* CONTAINS: Deployable items -Barricades */ -//Barricades! -/obj/structure/barricade - name = "barricade" - desc = "This space is blocked off by a barricade." - icon = 'icons/obj/structures.dmi' - icon_state = "barricade" - anchored = 1.0 - density = 1.0 - var/health = 100 - var/maxhealth = 100 - var/datum/material/material - -/obj/structure/barricade/New(var/newloc, var/material_name) - ..(newloc) - if(!material_name) - material_name = "wood" - material = get_material_by_name("[material_name]") - if(!material) - qdel(src) - return - name = "[material.display_name] barricade" - desc = "This space is blocked off by a barricade made of [material.display_name]." - color = material.icon_colour - maxhealth = material.integrity - health = maxhealth - -/obj/structure/barricade/get_material() - return material - -/obj/structure/barricade/attackby(obj/item/W as obj, mob/user as mob) - user.setClickCooldown(user.get_attack_speed(W)) - if(istype(W, /obj/item/stack)) - var/obj/item/stack/D = W - if(D.get_material_name() != material.name) - return //hitting things with the wrong type of stack usually doesn't produce messages, and probably doesn't need to. - if(health < maxhealth) - if(D.get_amount() < 1) - to_chat(user, "You need one sheet of [material.display_name] to repair \the [src].") - return - visible_message("[user] begins to repair \the [src].") - if(do_after(user,20) && health < maxhealth) - if(D.use(1)) - health = maxhealth - visible_message("[user] repairs \the [src].") - return - return - else - switch(W.damtype) - if("fire") - health -= W.force * 1 - if("brute") - health -= W.force * 0.75 - if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD))) - playsound(src, 'sound/effects/woodcutting.ogg', 100, 1) - else - playsound(src, 'sound/weapons/smash.ogg', 50, 1) - CheckHealth() - ..() - -/obj/structure/barricade/proc/CheckHealth() - if(health <= 0) - dismantle() - return - -/obj/structure/barricade/take_damage(var/damage) - health -= damage - CheckHealth() - return - -/obj/structure/barricade/attack_generic(var/mob/user, var/damage, var/attack_verb) - visible_message("[user] [attack_verb] the [src]!") - if(material == get_material_by_name("resin")) - playsound(src, 'sound/effects/attackblob.ogg', 100, 1) - else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD))) - playsound(src, 'sound/effects/woodcutting.ogg', 100, 1) - else - playsound(src, 'sound/weapons/smash.ogg', 50, 1) - user.do_attack_animation(src) - health -= damage - CheckHealth() - return - -/obj/structure/barricade/proc/dismantle() - material.place_dismantled_product(get_turf(src)) - visible_message("\The [src] falls apart!") - qdel(src) - return - -/obj/structure/barricade/ex_act(severity) - switch(severity) - if(1.0) - dismantle() - if(2.0) - health -= 25 - CheckHealth() - -/obj/structure/barricade/CanPass(atom/movable/mover, turf/target)//So bullets will fly over and stuff. - if(istype(mover) && mover.checkpass(PASSTABLE)) - return TRUE - return FALSE - -//Actual Deployable machinery stuff /obj/machinery/deployable name = "deployable" desc = "deployable" diff --git a/code/game/machinery/syndicatebeacon_vr.dm b/code/game/machinery/syndicatebeacon_vr.dm index ef6b3da0bbf..668b36dcb70 100644 --- a/code/game/machinery/syndicatebeacon_vr.dm +++ b/code/game/machinery/syndicatebeacon_vr.dm @@ -25,7 +25,7 @@ updateUsrDialog() return var/mob/M = locate(href_list["traitormob"]) - if(M.mind.special_role || jobban_isbanned(M, "Syndicate")) + if(M.mind.tcrystals > 0 || jobban_isbanned(M, "Syndicate")) temptext = "We have no need for you at this time. Have a pleasant day.
" updateUsrDialog() return @@ -33,7 +33,9 @@ if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/N = M to_chat(N, "Access granted, here are the supplies!") - traitors.equip(N) + traitors.spawn_uplink(N) + N.mind.tcrystals = DEFAULT_TELECRYSTAL_AMOUNT + N.mind.accept_tcrystals = 1 message_admins("[N]/([N.ckey]) has recieved an uplink and telecrystals from the syndicate beacon.") updateUsrDialog() diff --git a/code/game/machinery/vending_machines.dm b/code/game/machinery/vending_machines.dm index e04568c1d08..098d231ce77 100644 --- a/code/game/machinery/vending_machines.dm +++ b/code/game/machinery/vending_machines.dm @@ -753,7 +753,9 @@ /obj/item/toy/plushie/borgplushie/scrubpuppy = 1, /obj/item/toy/plushie/foxbear = 1, /obj/item/toy/plushie/nukeplushie = 1, - /obj/item/toy/plushie/otter = 1) + /obj/item/toy/plushie/otter = 1, + /obj/item/toy/plushie/vox = 1, + /obj/item/toy/mistletoe = 1) //VOREStation Add End premium = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne = 1, /obj/item/weapon/storage/trinketbox = 2) @@ -793,7 +795,9 @@ /obj/item/toy/plushie/borgplushie/scrubpuppy = 50, /obj/item/toy/plushie/foxbear = 50, /obj/item/toy/plushie/nukeplushie = 50, - /obj/item/toy/plushie/otter = 50) + /obj/item/toy/plushie/otter = 50, + /obj/item/toy/plushie/vox = 50, + /obj/item/toy/mistletoe = 50) //VOREStation Add End diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm index aa5a9e000c1..19bd2b9c53e 100644 --- a/code/game/mecha/combat/durand.dm +++ b/code/game/mecha/combat/durand.dm @@ -33,6 +33,9 @@ defence_mode_possible = 1 + icon_scale_x = 1.5 + icon_scale_y = 1.5 + /* /obj/mecha/combat/durand/New() ..() diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index 0323124c479..1f9d4a0b6e3 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -31,6 +31,9 @@ overload_possible = 1 + icon_scale_x = 1.35 + icon_scale_y = 1.35 + //Not quite sure how to move those yet. /obj/mecha/combat/gygax/get_commands() var/output = {"
diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index e2c0b9467a3..fd0442a2948 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -44,6 +44,9 @@ /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster ) + icon_scale_x = 1.5 + icon_scale_y = 1.5 + /obj/mecha/combat/marauder/seraph desc = "Heavy-duty, command-type exosuit. This is a custom model, utilized only by high-ranking military personnel." name = "Seraph" diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index bec2b1a6c36..c716b1f33e6 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -49,6 +49,9 @@ ..() return +/obj/item/mecha_parts/mecha_equipment/proc/add_equip_overlay(obj/mecha/M as obj) + return + /obj/item/mecha_parts/mecha_equipment/proc/update_chassis_page() if(chassis) send_byjax(chassis.occupant,"exosuit.browser","eq_list",chassis.get_equipment_list()) diff --git a/code/game/mecha/equipment/tools/repair_droid.dm b/code/game/mecha/equipment/tools/repair_droid.dm index 7cd8ebd9ab7..acae64142f8 100644 --- a/code/game/mecha/equipment/tools/repair_droid.dm +++ b/code/game/mecha/equipment/tools/repair_droid.dm @@ -26,9 +26,10 @@ pr_repair_droid = null ..() -/obj/item/mecha_parts/mecha_equipment/repair_droid/attach(obj/mecha/M as obj) +/obj/item/mecha_parts/mecha_equipment/repair_droid/add_equip_overlay(obj/mecha/M as obj) ..() - droid_overlay = new(src.icon, icon_state = "repair_droid") + if(!droid_overlay) + droid_overlay = new(src.icon, icon_state = "repair_droid") M.add_overlay(droid_overlay) return diff --git a/code/game/mecha/equipment/tools/running_board.dm b/code/game/mecha/equipment/tools/running_board.dm new file mode 100644 index 00000000000..aa2748c7a78 --- /dev/null +++ b/code/game/mecha/equipment/tools/running_board.dm @@ -0,0 +1,17 @@ +// concept borrowed from vgstation-coders/vgstation13#26316 on GitHub +/obj/item/mecha_parts/mecha_equipment/runningboard + name = "hacked powered exosuit running board" + desc = "A running board with a power-lifter attachment, to quickly catapult exosuit pilots into the cockpit. Fits any exosuit." + icon_state = "mecha_runningboard" + origin_tech = list(TECH_MATERIAL = 6) + equip_type = EQUIP_HULL + +/obj/item/mecha_parts/mecha_equipment/runningboard/limited + name = "powered exosuit running board" + desc = "A running board with a power-lifter attachment, to quickly catapult exosuit pilots into the cockpit. Only fits to working exosuits." + +/obj/item/mecha_parts/mecha_equipment/runningboard/limited/can_attach(obj/mecha/M) + if(istype(M, /obj/mecha/working)) // is this a ripley? + . = ..() + else + return FALSE \ No newline at end of file diff --git a/code/game/mecha/equipment/tools/shield.dm b/code/game/mecha/equipment/tools/shield.dm index ce0c43e7da9..0a50869e884 100644 --- a/code/game/mecha/equipment/tools/shield.dm +++ b/code/game/mecha/equipment/tools/shield.dm @@ -37,15 +37,19 @@ my_shield = null ..() +/obj/item/mecha_parts/mecha_equipment/combat_shield/add_equip_overlay(obj/mecha/M as obj) + ..() + if(!drone_overlay) + drone_overlay = new(src.icon, icon_state = "shield_droid") + M.overlays += drone_overlay + return + /obj/item/mecha_parts/mecha_equipment/combat_shield/attach(obj/mecha/M as obj) ..() if(chassis) my_shield.shield_health = 0 my_shield.my_mecha = chassis my_shield.forceMove(chassis) - - drone_overlay = new(src.icon, icon_state = "shield_droid") - M.overlays += drone_overlay return /obj/item/mecha_parts/mecha_equipment/combat_shield/detach() diff --git a/code/game/mecha/equipment/tools/syringe_gun.dm b/code/game/mecha/equipment/tools/syringe_gun.dm index 7449d80c0f1..1658a01df6d 100644 --- a/code/game/mecha/equipment/tools/syringe_gun.dm +++ b/code/game/mecha/equipment/tools/syringe_gun.dm @@ -467,11 +467,15 @@ if(enabled) set_ready_state(0) log_message("Activated.") - chassis.overlays += drone_overlay else set_ready_state(1) log_message("Deactivated.") - chassis.overlays -= drone_overlay + +/obj/item/mecha_parts/mecha_equipment/crisis_drone/add_equip_overlay(obj/mecha/M as obj) + ..() + if(enabled) + M.add_overlay(drone_overlay) + return /obj/item/mecha_parts/mecha_equipment/crisis_drone/Topic(href, href_list) ..() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index e9e3397bba8..2e68ca068d5 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -208,6 +208,7 @@ for(var/path in starting_equipment) var/obj/item/mecha_parts/mecha_equipment/ME = new path(src) ME.attach(src) + update_transform() /obj/mecha/drain_power(var/drain_check) @@ -1576,11 +1577,12 @@ src.verbs += /obj/mecha/verb/eject src.Entered(mmi_as_oc) src.Move(src.loc) - src.icon_state = src.reset_icon() + update_icon() set_dir(dir_in) src.log_message("[mmi_as_oc] moved in as pilot.") if(!hasInternalDamage()) src.occupant << sound('sound/mecha/nominal.ogg',volume=50) + update_icon() return 1 else return 0 @@ -1803,6 +1805,14 @@ set src in oview(1) move_inside() +//returns an equipment object if we have one of that type, useful since is_type_in_list won't return the object +//since is_type_in_list uses caching, this is a slower operation, so only use it if needed +/obj/mecha/proc/get_equipment(var/equip_type) + for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) + if(istype(ME,equip_type)) + return ME + return null + /obj/mecha/proc/move_inside() if (usr.stat || !ishuman(usr)) return @@ -1843,18 +1853,22 @@ return // to_chat(usr, "You start climbing into [src.name]") - - visible_message("\The [usr] starts to climb into [src.name]") - - if(enter_after(40,usr)) - if(!src.occupant) - moved_inside(usr) - if(ishuman(occupant)) //Aeiou - GrantActions(occupant, 1) - else if(src.occupant!=usr) - to_chat(usr, "[src.occupant] was faster. Try better next time, loser.") + if(get_equipment(/obj/item/mecha_parts/mecha_equipment/runningboard)) + visible_message("\The [usr] is instantly lifted into [src.name] by the running board!") + moved_inside(usr) + if(ishuman(occupant)) + GrantActions(occupant, 1) else - to_chat(usr, "You stop entering the exosuit.") + visible_message("\The [usr] starts to climb into [src.name]") + if(enter_after(40,usr)) + if(!src.occupant) + moved_inside(usr) + if(ishuman(occupant)) //Aeiou + GrantActions(occupant, 1) + else if(src.occupant!=usr) + to_chat(usr, "[src.occupant] was faster. Try better next time, loser.") + else + to_chat(usr, "You stop entering the exosuit.") return /obj/mecha/proc/moved_inside(var/mob/living/carbon/human/H as mob) @@ -1871,7 +1885,7 @@ src.forceMove(src.loc) src.verbs += /obj/mecha/verb/eject src.log_append_to_last("[H] moved in as pilot.") - src.icon_state = src.reset_icon() + update_icon() //VOREStation Edit Add if(occupant.hud_used) minihud = new (occupant.hud_used, src) @@ -1991,7 +2005,7 @@ occupant.clear_alert("mech damage") occupant.in_enclosed_vehicle = 0 occupant = null - icon_state = src.reset_icon()+"-open" + update_icon() set_dir(dir_in) verbs -= /obj/mecha/verb/eject @@ -2651,13 +2665,6 @@ return 1 return 0 -/obj/mecha/proc/reset_icon() - if (initial_icon) - icon_state = initial_icon - else - icon_state = initial(icon_state) - return icon_state - //This is for mobs mostly. /obj/mecha/attack_generic(var/mob/user, var/damage, var/attack_message) diff --git a/code/game/mecha/mecha_appearance.dm b/code/game/mecha/mecha_appearance.dm new file mode 100644 index 00000000000..5136ef070b6 --- /dev/null +++ b/code/game/mecha/mecha_appearance.dm @@ -0,0 +1,65 @@ + + +/obj/mecha + // Show the pilot. + var/show_pilot = FALSE + + // The state of the 'face', or the thing that overlays on the pilot. If this isn't set, it will probably look really weird. + var/face_state = null + var/icon/face_overlay + + var/icon/pilot_image + + // How many pixels do we bump the pilot upward? + var/pilot_lift = 0 + +/obj/mecha/update_transform() + // Now for the regular stuff. + var/matrix/M = matrix() + M.Scale(icon_scale_x, icon_scale_y) + M.Translate(0, 16*(icon_scale_y-1)) + animate(src, transform = M, time = 10) + return + +/obj/mecha/update_icon() + if(!initial_icon) + initial_icon = initial(icon_state) + + if(occupant) + icon_state = initial_icon + else + icon_state = "[initial_icon]-open" + + cut_overlays() + + if(show_pilot) + if(occupant) + pilot_image = getCompoundIcon(occupant) + + if(!istype(occupant, /mob/living/carbon/brain)) + + var/icon/Cutter + + if("[initial_icon]_cutter" in icon_states(icon)) + Cutter = new(src.icon, "[initial_icon]_cutter") + + if(Cutter) + pilot_image.Blend(Cutter, ICON_MULTIPLY, y = (-1 * pilot_lift)) + + var/image/Pilot = image(pilot_image) + + Pilot.pixel_y = pilot_lift + + add_overlay(Pilot) + else + pilot_image = null + + if(face_state && !face_overlay) + face_overlay = new(src.icon, icon_state = face_state) + + if(face_overlay) + add_overlay(face_overlay) + + for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) + ME.add_equip_overlay(src) + return diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm index dbba0cd2518..4db6332cb10 100644 --- a/code/game/mecha/medical/odysseus.dm +++ b/code/game/mecha/medical/odysseus.dm @@ -17,6 +17,9 @@ step_energy_drain = 6 var/obj/item/clothing/glasses/hud/health/mech/hud + icon_scale_x = 1.2 + icon_scale_y = 1.2 + /obj/mecha/medical/odysseus/New() ..() hud = new /obj/item/clothing/glasses/hud/health/mech(src) diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index aff19e301dd..def044c9bbc 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -24,6 +24,9 @@ /obj/item/mecha_parts/component/electrical ) + icon_scale_x = 1.2 + icon_scale_y = 1.2 + /obj/mecha/working/ripley/Destroy() for(var/atom/movable/A in src.cargo) A.loc = loc @@ -92,6 +95,20 @@ for(var/obj/item/mecha_parts/mecha_tracking/B in src.contents)//Deletes the beacon so it can't be found easily qdel (B) +/obj/mecha/working/ripley/antique + name = "APLU \"Geiger\"" + desc = "You can't beat the classics." + icon_state = "ripley-old" + initial_icon = "ripley-old" + + show_pilot = TRUE + pilot_lift = 5 + + max_utility_equip = 1 + max_universal_equip = 3 + + icon_scale_x = 1 + icon_scale_y = 1 //Vorestation Edit Start diff --git a/code/game/objects/effects/landmarks_vr.dm b/code/game/objects/effects/landmarks_vr.dm index 1111b717248..b9dd81e9673 100644 --- a/code/game/objects/effects/landmarks_vr.dm +++ b/code/game/objects/effects/landmarks_vr.dm @@ -1,3 +1,6 @@ +/obj/effect/landmark + var/abductor = 0 + /obj/effect/landmark/late_antag name = "Antag Latespawn" var/antag_id diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index c522b4300e0..c5e1f26c615 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -7,16 +7,32 @@ icon_state = "uglymine" var/triggered = 0 var/smoke_strength = 3 - var/mineitemtype = /obj/item/weapon/mine + var/obj/item/weapon/mine/mineitemtype = /obj/item/weapon/mine var/panel_open = 0 var/datum/wires/mines/wires = null register_as_dangerous_object = TRUE + var/camo_net = FALSE // Will the mine 'cloak' on deployment? + + // The trap item will be triggered in some manner when detonating. Default only checks for grenades. + var/obj/item/trap = null + /obj/effect/mine/New() icon_state = "uglyminearmed" wires = new(src) + if(ispath(trap)) + trap = new trap(src) + +/obj/effect/mine/Initialize() + ..() + + if(camo_net) + alpha = 50 + /obj/effect/mine/Destroy() + if(trap) + QDEL_NULL(trap) qdel_null(wires) return ..() @@ -25,11 +41,33 @@ triggered = 1 s.set_up(3, 1, src) s.start() - explosion(loc, 0, 2, 3, 4) //land mines are dangerous, folks. - visible_message("\The [src.name] detonates!") + + if(trap) + trigger_trap(M) + visible_message("\The [src.name] flashes as it is triggered!") + + else + explosion(loc, 0, 2, 3, 4) //land mines are dangerous, folks. + visible_message("\The [src.name] detonates!") + qdel(s) qdel(src) +/obj/effect/mine/proc/trigger_trap(var/mob/living/victim) + if(istype(trap, /obj/item/weapon/grenade)) + var/obj/item/weapon/grenade/G = trap + trap = null + G.forceMove(get_turf(src)) + if(victim.ckey) + msg_admin_attack("[key_name_admin(victim)] stepped on \a [src.name], triggering [trap]") + G.activate() + + if(istype(trap, /obj/item/device/transfer_valve)) + var/obj/item/device/transfer_valve/TV = trap + trap = null + TV.forceMove(get_turf(src)) + TV.toggle_valve() + /obj/effect/mine/bullet_act() if(prob(50)) explode() @@ -63,6 +101,9 @@ "You very carefully screw the mine's panel [panel_open ? "open" : "closed"].") playsound(src, W.usesound, 50, 1) + // Panel open, stay uncloaked, or uncloak if already cloaked. If you don't cloak on place, ignore it and just be normal alpha. + alpha = camo_net ? (panel_open ? 255 : 50) : 255 + else if((W.is_wirecutter() || istype(W, /obj/item/device/multitool)) && panel_open) interact(user) else @@ -74,6 +115,9 @@ user.set_machine(src) wires.Interact(user) +/obj/effect/mine/camo + camo_net = TRUE + /obj/effect/mine/dnascramble mineitemtype = /obj/item/weapon/mine/dnascramble @@ -193,6 +237,9 @@ spawn(0) qdel(src) +/obj/effect/mine/emp/camo + camo_net = TRUE + /obj/effect/mine/incendiary mineitemtype = /obj/item/weapon/mine/incendiary @@ -208,6 +255,26 @@ spawn(0) qdel(src) +/obj/effect/mine/gadget + mineitemtype = /obj/item/weapon/mine/gadget + +/obj/effect/mine/gadget/explode(var/mob/living/M) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread() + triggered = 1 + s.set_up(3, 1, src) + s.start() + + if(trap) + trigger_trap(M) + visible_message("\The [src.name] flashes as it is triggered!") + + else + explosion(loc, 0, 0, 2, 2) + visible_message("\The [src.name] detonates!") + + qdel(s) + qdel(src) + ///////////////////////////////////////////// // The held item version of the above mines ///////////////////////////////////////////// @@ -219,6 +286,10 @@ var/countdown = 10 var/minetype = /obj/effect/mine //This MUST be an /obj/effect/mine type, or it'll runtime. + var/obj/item/trap = null + + var/list/allowed_gadgets = null + /obj/item/weapon/mine/attack_self(mob/user as mob) // You do not want to move or throw a land mine while priming it... Explosives + Sudden Movement = Bad Times add_fingerprint(user) msg_admin_attack("[key_name_admin(user)] primed \a [src]") @@ -231,11 +302,39 @@ prime(user, TRUE) return +/obj/item/weapon/mine/attackby(obj/item/W as obj, mob/living/user as mob) + if(W.is_screwdriver() && trap) + to_chat(user, "You begin removing \the [trap].") + if(do_after(user, 10 SECONDS)) + to_chat(user, "You finish disconnecting the mine's trigger.") + trap.forceMove(get_turf(src)) + trap = null + return + + if(LAZYLEN(allowed_gadgets) && !trap) + var/allowed = FALSE + + for(var/path in allowed_gadgets) + if(istype(W, path)) + allowed = TRUE + break + + if(allowed) + user.drop_from_inventory(W) + W.forceMove(src) + trap = W + + ..() + /obj/item/weapon/mine/proc/prime(mob/user as mob, var/explode_now = FALSE) visible_message("\The [src.name] beeps as the priming sequence completes.") var/obj/effect/mine/R = new minetype(get_turf(src)) src.transfer_fingerprints_to(R) R.add_fingerprint(user) + if(trap) + R.trap = trap + trap = null + R.trap.forceMove(R) if(explode_now) R.explode(user) spawn(0) @@ -286,8 +385,14 @@ desc = "A small explosive mine with a fire symbol on the side." minetype = /obj/effect/mine/incendiary +/obj/item/weapon/mine/gadget + name = "gadget mine" + desc = "A small pressure-triggered device. If no component is added, the internal release bolts will detonate in unison when triggered." + + allowed_gadgets = list(/obj/item/weapon/grenade, /obj/item/device/transfer_valve) + // This tells AI mobs to not be dumb and step on mines willingly. /obj/item/weapon/mine/is_safe_to_step(mob/living/L) if(!L.hovering) return FALSE - return ..() \ No newline at end of file + return ..() diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm index 8e5fa683c90..f938f0eab18 100644 --- a/code/game/objects/items/devices/defib.dm +++ b/code/game/objects/items/devices/defib.dm @@ -509,8 +509,8 @@ return // Still no brain. // If the brain'd `defib_timer` var gets below this number, brain damage will happen at a linear rate. - // This is measures in `Life()` ticks. E.g. 10 minute defib timer = 6000 world.time units = 3000 `Life()` ticks. - var/brain_damage_timer = ((config.defib_timer MINUTES) / 2) - ((config.defib_braindamage_timer MINUTES) / 2) + // This is measures in `Life()` ticks. E.g. 10 minute defib timer = 300 `Life()` ticks. // Original math was VERY off. Life() tick occurs every ~2 seconds, not every 2 world.time ticks. + var/brain_damage_timer = ((config.defib_timer MINUTES) / 20) - ((config.defib_braindamage_timer MINUTES) / 20) if(brain.defib_timer > brain_damage_timer) return // They got revived before brain damage got a chance to set in. diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm index 03d0bdd60ca..60ca5cc1a29 100644 --- a/code/game/objects/items/devices/spy_bug.dm +++ b/code/game/objects/items/devices/spy_bug.dm @@ -88,6 +88,14 @@ if(get_dist(user, src) == 0) . += "It has a tiny camera inside. Needs to be both configured and brought in contact with monitor device to be fully functional." +/obj/item/device/camerabug/update_icon() + ..() + + if(anchored) // Standard versions are relatively obvious if not hidden in a container. Anchoring them is advised, to disguise them. + alpha = 50 + else + alpha = 255 + /obj/item/device/camerabug/attackby(obj/item/W as obj, mob/living/user as mob) if(istype(W, /obj/item/device/bug_monitor)) var/obj/item/device/bug_monitor/SM = W @@ -101,6 +109,15 @@ linkedmonitor = null else to_chat(user, "Error: The device is linked to another monitor.") + + else if(W.is_wrench() && user.a_intent != I_HURT) + if(isturf(loc)) + anchored = !anchored + + to_chat(user, "You [anchored ? "" : "un"]secure \the [src].") + + update_icon() + return else if(W.force >= 5) visible_message("\The [src] lens shatters!") diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm index 223c9a20182..45430a41c9a 100644 --- a/code/game/objects/items/paintkit.dm +++ b/code/game/objects/items/paintkit.dm @@ -241,7 +241,7 @@ M.initial_icon = new_icon if(new_icon_file) M.icon = new_icon_file - M.reset_icon() + M.update_icon() use(1, user) /obj/mecha/attackby(var/obj/item/weapon/W, var/mob/user) diff --git a/code/game/objects/items/robot/robot_upgrades_vr.dm b/code/game/objects/items/robot/robot_upgrades_vr.dm index ad2556f8101..b31f737e78d 100644 --- a/code/game/objects/items/robot/robot_upgrades_vr.dm +++ b/code/game/objects/items/robot/robot_upgrades_vr.dm @@ -31,8 +31,8 @@ return 1 /obj/item/borg/upgrade/bellysizeupgrade - name = "robotic Hound process capacity upgrade Module" - desc = "Used to upgrade a hound belly capacity. This only affects total volume and such, you won't be able to support more than one patient. Usable once." + name = "robohound capacity expansion module" + desc = "Used to double a robohound's belly capacity. This only affects total volume, and won't allow support of more than one patient in case of sleeper bellies. Can only be applied once." icon_state = "cyborg_upgrade2" item_state = "cyborg_upgrade" require_module = 1 diff --git a/code/game/objects/items/stacks/matter_synth.dm b/code/game/objects/items/stacks/matter_synth.dm index d92cd5f8dda..02c6518374e 100644 --- a/code/game/objects/items/stacks/matter_synth.dm +++ b/code/game/objects/items/stacks/matter_synth.dm @@ -56,3 +56,6 @@ name = "Bandage Synthesizer" max_energy = 10 recharge_rate = 1 + +/datum/matter_synth/cloth + name = "Cloth Synthesizer" diff --git a/code/game/objects/items/stacks/sandbags.dm b/code/game/objects/items/stacks/sandbags.dm new file mode 100644 index 00000000000..c4e755c4852 --- /dev/null +++ b/code/game/objects/items/stacks/sandbags.dm @@ -0,0 +1,158 @@ +/obj/item/stack/sandbags + name = "sandbag" + desc = "Filled sandbags. Fortunately pre-filled." + singular_name = "sandbag" + icon = 'icons/obj/sandbags.dmi' + icon_state = "sandbag" + w_class = ITEMSIZE_LARGE + force = 10.0 + throwforce = 20.0 + throw_speed = 5 + throw_range = 3 + drop_sound = 'sound/items/drop/clothing.ogg' + pickup_sound = 'sound/items/pickup/clothing.ogg' + matter = list(MAT_CLOTH = SHEET_MATERIAL_AMOUNT * 2) + max_amount = 30 + attack_verb = list("hit", "bludgeoned", "pillowed") + no_variants = TRUE + stacktype = /obj/item/stack/sandbags + + pass_color = TRUE + + var/bag_material = "cloth" + +/obj/item/stack/sandbags/cyborg + name = "sandbag synthesizer" + desc = "A device that makes filled sandbags. Don't ask how." + gender = NEUTER + matter = null + uses_charge = 1 + charge_costs = list(500) + stacktype = /obj/item/stack/sandbags + + bag_material = MAT_SYNCLOTH + +/obj/item/stack/sandbags/New(var/newloc, var/amt, var/bag_mat) + ..() + recipes = sandbag_recipes + update_icon() + + if(bag_mat) + bag_material = bag_mat + + var/datum/material/M = get_material_by_name("[bag_material]") + if(!M) + qdel(src) + return + + color = M.icon_colour + +/obj/item/stack/sandbags/update_icon() + var/amount = get_amount() + + slowdown = round(amount / 10, 0.1) + +var/global/list/datum/stack_recipe/sandbag_recipes = list( \ + new/datum/stack_recipe("barricade", /obj/structure/barricade/sandbag, 3, time = 5 SECONDS, one_per_turf = 1, on_floor = 1, pass_stack_color = TRUE)) + +/obj/item/stack/sandbags/produce_recipe(datum/stack_recipe/recipe, var/quantity, mob/user) + var/required = quantity*recipe.req_amount + var/produced = min(quantity*recipe.res_amount, recipe.max_res_amount) + + if (!can_use(required)) + if (produced>1) + to_chat(user, "You haven't got enough [src] to build \the [produced] [recipe.title]\s!") + else + to_chat(user, "You haven't got enough [src] to build \the [recipe.title]!") + return + + if (recipe.one_per_turf && (locate(recipe.result_type) in user.loc)) + to_chat(user, "There is another [recipe.title] here!") + return + + if (recipe.on_floor && !isfloor(user.loc)) + to_chat(user, "\The [recipe.title] must be constructed on the floor!") + return + + if (recipe.time) + to_chat(user, "Building [recipe.title] ...") + if (!do_after(user, recipe.time)) + return + + if (use(required)) + var/atom/O = new recipe.result_type(user.loc, bag_material) + + if(istype(O, /obj)) + var/obj/Ob = O + + if(LAZYLEN(Ob.matter)) // Law of equivalent exchange. + Ob.matter.Cut() + + else + Ob.matter = list() + + var/mattermult = istype(Ob, /obj/item) ? min(2000, 400 * Ob.w_class) : 2000 + + Ob.matter[recipe.use_material] = mattermult / produced * required + + O.set_dir(user.dir) + O.add_fingerprint(user) + + if (istype(O, /obj/item/stack)) + var/obj/item/stack/S = O + S.amount = produced + S.add_to_stacks(user) + + if (istype(O, /obj/item/weapon/storage)) //BubbleWrap - so newly formed boxes are empty + for (var/obj/item/I in O) + qdel(I) + + if ((pass_color || recipe.pass_color)) + if(!color) + if(recipe.use_material) + var/datum/material/MAT = get_material_by_name(recipe.use_material) + if(MAT.icon_colour) + O.color = MAT.icon_colour + else + return + else + O.color = color + +// Empty bags. Yes, you need to fill them. + +/obj/item/stack/emptysandbag + name = "sandbag" + desc = "Empty sandbags. You know what must be done." + singular_name = "sandbag" + icon = 'icons/obj/sandbags.dmi' + icon_state = "sandbag_e" + w_class = ITEMSIZE_LARGE + + strict_color_stacking = TRUE + max_amount = 30 + stacktype = /obj/item/stack/emptysandbag + + pass_color = TRUE + + var/bag_material = "cloth" + +/obj/item/stack/emptysandbag/New(var/newloc, var/amt, var/bag_mat) + ..(newloc, amt) + + if(bag_mat) + bag_material = bag_mat + + var/datum/material/M = get_material_by_name("[bag_material]") + if(!M) + qdel(src) + return + + color = M.icon_colour + +/obj/item/stack/emptysandbag/attack_self(var/mob/user) + while(do_after(user, 1 SECOND) && can_use(1) && istype(get_turf(src), /turf/simulated/floor/outdoors)) + use(1) + var/obj/item/stack/sandbags/SB = new (get_turf(src), 1, bag_material) + SB.color = color + if(user) + to_chat(user, "You fill a sandbag.") diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 5fa718564f4..d42d6c0e563 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -163,7 +163,7 @@ if (recipe.time) to_chat(user, "Building [recipe.title] ...") - if (!do_after(user, recipe.time, exclusive = TRUE)) + if (!do_after(user, recipe.time)) return if (use(required)) diff --git a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm index 098926f5350..e9d5f6a2a51 100644 --- a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm +++ b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm @@ -8,6 +8,10 @@ name = "stack of sifgrass" type_to_spawn = /obj/item/stack/tile/grass/sif +/obj/fiftyspawner/grass/sif/forest + name = "stack of sifgrass" + type_to_spawn = /obj/item/stack/tile/grass/sif/forest + /obj/fiftyspawner/wood name = "stack of wood" type_to_spawn = /obj/item/stack/tile/wood diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index d2a6522ce20..5e5ac1a746d 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -47,6 +47,11 @@ singular_name = "sivian grass floor tile" desc = "A patch of grass like those that decorate the plains of Sif." +/obj/item/stack/tile/grass/sif/forest + name = "sivian overgrowth tile" + singular_name = "sivian overgrowth floor tile" + desc = "A patch of dark overgrowth like those that decorate the plains of Sif." + /* * Wood */ diff --git a/code/game/objects/items/toys/toys_vr.dm b/code/game/objects/items/toys/toys_vr.dm index 91c3ed7e06f..73f73d88334 100644 --- a/code/game/objects/items/toys/toys_vr.dm +++ b/code/game/objects/items/toys/toys_vr.dm @@ -1,3 +1,9 @@ +/obj/item/toy/mistletoe + name = "mistletoe" + desc = "You are supposed to kiss someone under these" + icon = 'icons/obj/toy_vr.dmi' + icon_state = "mistletoe" + /obj/item/toy/plushie/lizardplushie name = "lizard plushie" desc = "An adorable stuffed toy that resembles a lizardperson." @@ -50,6 +56,14 @@ /obj/item/toy/plushie/borgplushie/scrubpuppy icon_state = "scrubpuppy" +/obj/item/toy/plushie/borgplushie/drakiesec + icon = 'icons/obj/drakietoy_vr.dmi' + icon_state = "secdrake" + +/obj/item/toy/plushie/borgplushie/drakiemed + icon = 'icons/obj/drakietoy_vr.dmi' + icon_state = "meddrake" + /obj/item/toy/plushie/foxbear name = "toy fox" desc = "Issa fox!" @@ -68,3 +82,22 @@ desc = "A perfectly sized snuggable river weasel! Keep away from Clams." icon = 'icons/obj/toy_vr.dmi' icon_state = "plushie_otter" + +/obj/item/toy/plushie/vox + name = "vox plushie" + desc = "A stitched-together vox, fresh from the skipjack. Press its belly to hear it skree!" + icon = 'icons/obj/toy_vr.dmi' + icon_state = "plushie_vox" + var/cooldown = 0 + +/obj/item/toy/plushie/vox/attack_self(mob/user as mob) + if(!cooldown) + playsound(user, 'sound/voice/shriek1.ogg', 10, 0) + src.visible_message("Skreee!") + cooldown = 1 + addtimer(CALLBACK(src, .proc/cooldownreset), 50) + return ..() + +/obj/item/toy/plushie/vox/proc/cooldownreset() + cooldown = 0 + diff --git a/code/game/objects/items/weapons/id cards/station_ids_vr.dm b/code/game/objects/items/weapons/id cards/station_ids_vr.dm index b659e756b3a..756ab3bc9cd 100644 --- a/code/game/objects/items/weapons/id cards/station_ids_vr.dm +++ b/code/game/objects/items/weapons/id cards/station_ids_vr.dm @@ -1,2 +1,102 @@ /obj/item/weapon/card/id/gold/captain/spare/fakespare - rank = "null" \ No newline at end of file + rank = "null" + +/obj/item/weapon/card/id/itg + name = "identification card" + desc = "A small card designating affiliation with the Ironcrest Transport Group." + icon = 'icons/obj/card_vr.dmi' + icon_state = "itg" + item_state = "itg_id" + +/obj/item/weapon/card/id/itg/green + icon_state = "itg_green" + item_state = "itg_green_id" + +/obj/item/weapon/card/id/itg/red + icon_state = "itg_red" + item_state = "itg_red_id" + +/obj/item/weapon/card/id/itg/purple + icon_state = "itg_purple" + item_state = "itg_purple_id" + +/obj/item/weapon/card/id/itg/white + icon_state = "itg_white" + item_state = "itg_white_id" + +/obj/item/weapon/card/id/itg/orange + icon_state = "itg_orange" + item_state = "itg_orange_id" + +/obj/item/weapon/card/id/itg/blue + icon_state = "itg_blue" + item_state = "itg_blue_id" + +/obj/item/weapon/card/id/itg/event + name = "\improper ITG Crew ID" + assignment = "Crew" + rank = "Crew" + access = list(777) + +/obj/item/weapon/card/id/itg/event/pilot + name = "\improper ITG Pilot's ID" + desc = "An ID card belonging to the Pilot of an ITG vessel. The Pilot's responsibility is primarily to fly the ship. They may also be tasked to assist with cargo movement duties." + assignment = "Pilot" + rank = "Pilot" + +/obj/item/weapon/card/id/itg/event/service + name = "\improper ITG Cook's ID" + desc = "An ID card belonging to the Cook of an ITG vessel. The Cook's responsibility is primarily to provide sustinence to the crew and passengers. The Cook answers to the Passenger Liason. In the absence of a Passenger Liason, the Cook is also responsible for tending to passenger related care and duties." + assignment = "Cook" + rank = "Cook" + icon_state = "itg_green" + item_state = "itg_green_id" + +/obj/item/weapon/card/id/itg/event/security + name = "\improper ITG Security's ID" + desc = "An ID card belonging to Security of an ITG vessel. Security's responsibility is primarily to protect the ship, cargo, or facility. They may also be tasked to assist with cargo movement duties and rescue operations. ITG Security is almost exclusively defensive. They should not start fights, but they are very capable of finishing them." + assignment = "Security" + rank = "Security" + icon_state = "itg_red" + item_state = "itg_red_id" + +/obj/item/weapon/card/id/itg/event/research + name = "\improper ITG Research's ID" + desc = "An ID card belonging to ITG Research staff. ITG Research staff primarily specializes in starship and starship engine design, and overcoming astronomic phenomena." + assignment = "Research" + rank = "Research" + icon_state = "itg_purple" + item_state = "itg_purple_id" + +/obj/item/weapon/card/id/itg/event/medical + name = "\improper ITG Medic's ID" + desc = "An ID card belonging to the Medic of an ITG vessel. The Medic's responsibility is primarily to treat crew and passenger injuries. They may also be tasked with rescue operations." + assignment = "Medic" + rank = "Medic" + icon_state = "itg_white" + item_state = "itg_white_id" + +/obj/item/weapon/card/id/itg/event/engineer + name = "\improper ITG Engineer's ID" + desc = "An ID card belonging to the Engineer of an ITG vessel. The Engineer's responsibility is primarily to maintain the ship. They may also be tasked to assist with cargo movement duties." + assignment = "Engineer" + rank = "Engineer" + icon_state = "itg_orange" + item_state = "itg_orange_id" + +/obj/item/weapon/card/id/itg/event/passengerliason + name = "\improper ITG Passenger Liason's ID" + desc = "An ID card belonging to the Passenger Liason of an ITG vessel. The Passenger Liason's responsibility is primarily to manage and tend to passenger needs and maintain supplies and facilities for passenger use." + assignment = "Passenger Liason" + rank = "Passenger Liason" + icon_state = "itg_blue" + item_state = "itg_blue_id" + +/obj/item/weapon/card/id/itg/event/captain + name = "\improper ITG Captain's ID" + desc = "An ID card belonging to the Captain of an ITG vessel. The Captain's responsibility is primarily to manage crew to ensure smooth ship operations. Captains often also often pilot the vessel when no dedicated pilot is assigned." + assignment = "Captain" + rank = "Captain" + icon_state = "itg_blue" + item_state = "itg_blue_id" + access = list(777, 778) \ No newline at end of file diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm index 23c04f2a818..5563b71689f 100644 --- a/code/game/objects/items/weapons/material/material_weapons.dm +++ b/code/game/objects/items/weapons/material/material_weapons.dm @@ -97,6 +97,8 @@ /obj/item/weapon/material/proc/check_health(var/consumed) if(health<=0) + health = 0 + if(fragile) shatter(consumed) else if(!dulled && can_dull) diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index 754943671ef..d8906955a15 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -93,3 +93,118 @@ //icon_state = "reinf-snowball" force_divisor = 0.20 thrown_force_divisor = 0.25 + +/obj/item/weapon/material/whip + name = "whip" + desc = "A tool used to discipline animals, or look cool. Mostly the latter." + description_info = "Help - Standard attack, no modifiers.
\ + Disarm - Disarming strike. Attempts to disarm the target at range, similar to an unarmed disarm. Additionally, will force the target (if possible) to move away from you.
\ + Grab - Grappling strike. Attempts to pull the target toward you. This can also move objects.
\ + Harm - A standard strike with a small chance to disarm." + icon = 'icons/obj/weapons.dmi' + icon_state = "whip" + item_state = "chain" + default_material = MAT_LEATHER + slot_flags = SLOT_BELT + w_class = ITEMSIZE_NORMAL + origin_tech = list(TECH_COMBAT = 2) + attack_verb = list("flogged", "whipped", "lashed", "disciplined") + force_divisor = 0.15 + thrown_force_divisor = 0.25 + reach = 2 + + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi', + ) + +/obj/item/weapon/material/whip/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) + ..() + + if(!proximity) + return + + if(istype(A, /atom/movable)) + var/atom/movable/AM = A + if(AM.anchored) + to_chat(user, "\The [AM] won't budge.") + return + + else + if(!istype(AM, /obj/item)) + user.visible_message("\The [AM] is pulled along by \the [src]!") + AM.Move(get_step(AM, get_dir(AM, src))) + return + + else + user.visible_message("\The [AM] is snatched by \the [src]!") + AM.throw_at(user, reach, 0.1, user) + +/obj/item/weapon/material/whip/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) + if(user.a_intent) + switch(user.a_intent) + if(I_HURT) + if(prob(10) && istype(target, /mob/living/carbon/human) && user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND)) + to_chat(target, "\The [src] rips at your hands!") + ranged_disarm(target) + if(I_DISARM) + if(prob(min(90, force * 3)) && istype(target, /mob/living/carbon/human) && user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND)) + ranged_disarm(target) + else + target.visible_message("\The [src] sends \the [target] stumbling away.") + target.Move(get_step(target,get_dir(user,target))) + if(I_GRAB) + var/turf/STurf = get_turf(target) + spawn(2) + playsound(STurf, 'sound/effects/snap.ogg', 60, 1) + target.visible_message("\The [src] yanks \the [target] towards \the [user]!") + target.throw_at(get_turf(get_step(user,get_dir(user,target))), 2, 1, src) + + ..() + +/obj/item/weapon/material/whip/proc/ranged_disarm(var/mob/living/carbon/human/H, var/mob/living/user) + if(istype(H)) + var/list/holding = list(H.get_active_hand() = 40, H.get_inactive_hand() = 20) + + if(user.zone_sel in list(BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND)) + for(var/obj/item/weapon/gun/W in holding) + if(W && prob(holding[W])) + var/list/turfs = list() + for(var/turf/T in view()) + turfs += T + if(turfs.len) + var/turf/target = pick(turfs) + visible_message("[H]'s [W] goes off due to \the [src]!") + return W.afterattack(target,H) + + if(!(H.species.flags & NO_SLIP) && prob(10) && user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)) + var/armor_check = H.run_armor_check(user.zone_sel, "melee") + H.apply_effect(3, WEAKEN, armor_check) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + if(armor_check < 60) + visible_message("\The [src] has tripped [H]!") + else + visible_message("\The [src] attempted to trip [H]!") + return + + else + if(H.break_all_grabs(user)) + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + return + + if(user.zone_sel in list(BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND)) + for(var/obj/item/I in holding) + if(I && prob(holding[I])) + H.drop_from_inventory(I) + visible_message("\The [src] has disarmed [H]!") + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + return + +/obj/item/weapon/material/whip/suicide_act(mob/user) + var/datum/gender/T = gender_datums[user.get_visible_gender()] + user.visible_message(span("danger", "\The [user] [T.is] strangling [T.himself] with \the [src]! It looks like [T.he] [T.is] trying to commit suicide."), span("danger", "You start to strangle yourself with \the [src]!"), span("danger", "You hear the sound of someone choking!")) + return (OXYLOSS) + +/obj/item/weapon/material/whip/attack_self(mob/user) + user.visible_message("\The [user] cracks \the [src]!") + playsound(src, 'sound/effects/snap.ogg', 50, 1) diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 4185cf92c24..b7684d6a7fa 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -9,10 +9,12 @@ origin_tech = list(TECH_COMBAT = 4) attack_verb = list("flogged", "whipped", "lashed", "disciplined") - suicide_act(mob/user) - var/datum/gender/T = gender_datums[user.get_visible_gender()] - user.visible_message(span("danger", "\The [user] [T.is] strangling [T.himself] with \the [src]! It looks like [T.he] [T.is] trying to commit suicide."), span("danger", "You start to strangle yourself with \the [src]!"), span("danger", "You hear the sound of someone choking!")) - return (OXYLOSS) + reach = 2 + +/obj/item/weapon/melee/chainofcommand/suicide_act(mob/user) + var/datum/gender/T = gender_datums[user.get_visible_gender()] + user.visible_message(span("danger", "\The [user] [T.is] strangling [T.himself] with \the [src]! It looks like [T.he] [T.is] trying to commit suicide."), span("danger", "You start to strangle yourself with \the [src]!"), span("danger", "You hear the sound of someone choking!")) + return (OXYLOSS) /obj/item/weapon/melee/umbrella name = "umbrella" diff --git a/code/game/objects/items/weapons/storage/egg_vr.dm b/code/game/objects/items/weapons/storage/egg_vr.dm new file mode 100644 index 00000000000..0ea3b673e10 --- /dev/null +++ b/code/game/objects/items/weapons/storage/egg_vr.dm @@ -0,0 +1,182 @@ +//Item type vorepanel egg release containers. + +/obj/item/weapon/storage/vore_egg + name = "egg" + desc = "It's an egg; it's smooth to the touch." //This is the default egg. + icon = 'icons/obj/egg_new_vr.dmi' + icon_state = "egg" + var/open_egg_icon = 'icons/obj/egg_open_vr.dmi' + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_storage.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_storage.dmi', + ) + w_class = 2 + max_w_class = 0 + show_messages = 0 + allow_quick_empty = TRUE + use_sound = 'sound/items/drop/flesh.ogg' + +/obj/item/weapon/storage/vore_egg/open(mob/user as mob) + icon = open_egg_icon + ..() + +/obj/item/weapon/storage/vore_egg/proc/hatch(mob/living/user as mob) + visible_message("\The [src] begins to shake as something pushes out from within!") + animate_shake() + if(do_after(user, 50)) + if(use_sound) + playsound(src, src.use_sound, 50, 0, -5) + animate_shake() + drop_contents() + icon = open_egg_icon + +/obj/item/weapon/storage/vore_egg/proc/animate_shake() + var/init_px = pixel_x + var/shake_dir = pick(-1, 1) + animate(src, transform=turn(matrix(), 8*shake_dir), pixel_x=init_px + 2*shake_dir, time=1) + animate(transform=null, pixel_x=init_px, time=6, easing=ELASTIC_EASING) + +/obj/item/weapon/storage/vore_egg/unathi + name = "unathi egg" + desc = "Some species of Unathi apparently lay soft-shelled eggs!" + icon_state = "egg_unathi" + +/obj/item/weapon/storage/vore_egg/nevrean + name = "nevrean egg" + desc = "Most Nevreans lay hard-shelled eggs!" + icon_state = "egg_nevrean" + +/obj/item/weapon/storage/vore_egg/human + name = "human egg" + desc = "Some humans lay eggs that are--wait, what?" + icon_state = "egg_human" + +/obj/item/weapon/storage/vore_egg/tajaran + name = "tajaran egg" + desc = "Apparently that's what a Tajaran egg looks like. Weird." + icon_state = "egg_tajaran" + +/obj/item/weapon/storage/vore_egg/skrell + name = "skrell egg" + desc = "Its soft and squishy" + icon_state = "egg_skrell" + +/obj/item/weapon/storage/vore_egg/shark + name = "akula egg" + desc = "Its soft and slimy to the touch" + icon_state = "egg_akula" + +/obj/item/weapon/storage/vore_egg/sergal + name = "sergal egg" + desc = "An egg with a slightly fuzzy exterior, and a hard layer beneath." + icon_state = "egg_sergal" + +/obj/item/weapon/storage/vore_egg/slime + name = "slime egg" + desc = "An egg with a soft and squishy interior, coated with slime." + icon_state = "egg_slime" + +/obj/item/weapon/storage/vore_egg/special //Not actually used, but the sprites are in, and it's there in case any admins need to spawn in the egg for any specific reasons. + name = "special egg" + desc = "This egg has a very unique look to it." + icon_state = "egg_unique" + +/obj/item/weapon/storage/vore_egg/scree + name = "Chimera egg" + desc = "...You don't know what type of creature laid this egg." + icon_state = "egg_scree" + +/obj/item/weapon/storage/vore_egg/xenomorph + name = "Xenomorph egg" + desc = "Some type of pitch black egg. It has a slimy exterior coating." + icon_state = "egg_xenomorph" + +/obj/item/weapon/storage/vore_egg/chocolate + name = "chocolate egg" + desc = "Delicious. May contain a choking hazard." + icon_state = "egg_chocolate" + +/obj/item/weapon/storage/vore_egg/owlpellet + name = "boney egg" + desc = "Can an egg shell be made of bones and hair?" + icon_state = "egg_pellet" + +/obj/item/weapon/storage/vore_egg/slimeglob + name = "glob of slime" + desc = "Very squishy." + icon_state = "egg_slimeglob" + +/obj/item/weapon/storage/vore_egg/chicken + name = "chicken egg" + desc = "Looks like chickens come in all sizes and shapes." + icon_state = "egg_chicken" + +/obj/item/weapon/storage/vore_egg/synthetic + name = "synthetic egg" + desc = "Can robots lay eggs?" + icon_state = "egg_synthetic" + +/obj/item/weapon/storage/vore_egg/badrecipe + name = "Burned mess" + desc = "Someone didn't cook this egg quite right..." + icon_state = "egg_badrecipe" + +/obj/item/weapon/storage/vore_egg/escapepod + name = "small escape pod" + desc = "Someone left in a hurry." + icon_state = "egg_escapepod" + +/obj/item/weapon/storage/vore_egg/cocoon + name = "web cocoon" + desc = "It straight up smells like spiders in here." + icon_state = "egg_cocoon" + +/obj/item/weapon/storage/vore_egg/bugcocoon + name = "bug cocoon" + desc = "Metamorphosis!" + icon_state = "egg_bugcocoon" + +/obj/item/weapon/storage/vore_egg/rock + name = "rock egg" + desc = "It looks like a small boulder." + icon_state = "egg_rock" + +/obj/item/weapon/storage/vore_egg/yellow + name = "yellow egg" + desc = "It is a nice yellow egg." + icon_state = "egg_yellow" + +/obj/item/weapon/storage/vore_egg/blue + name = "blue egg" + desc = "It is a nice blue egg." + icon_state = "egg_blue" + +/obj/item/weapon/storage/vore_egg/green + name = "green egg" + desc = "It is a nice green egg." + icon_state = "egg_green" + +/obj/item/weapon/storage/vore_egg/orange + name = "orange egg" + desc = "It is a nice orange egg." + icon_state = "egg_orange" + +/obj/item/weapon/storage/vore_egg/purple + name = "purple egg" + desc = "It is a nice purple egg." + icon_state = "egg_purple" + +/obj/item/weapon/storage/vore_egg/red + name = "red egg" + desc = "It is a nice red egg." + icon_state = "egg_red" + +/obj/item/weapon/storage/vore_egg/rainbow + name = "rainbow egg" + desc = "It looks so colorful." + icon_state = "egg_rainbow" + +/obj/item/weapon/storage/vore_egg/pinkspots + name = "spotted pink egg" + desc = "It is a cute pink egg with white spots." + icon_state = "egg_pinkspots" diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index 0ec9bc7af38..c583ce1eef2 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -1,3 +1,9 @@ + +/* + * Beartraps. + * Buckles crossing individuals, doing moderate brute damage. + */ + /obj/item/weapon/beartrap name = "mechanical trap" throw_speed = 2 @@ -158,3 +164,238 @@ color = "#C9DCE1" origin_tech = list(TECH_MATERIAL = 4, TECH_BLUESPACE = 3, TECH_MAGNET = 4, TECH_PHORON = 2, TECH_ARCANE = 1) + +/* + * Barbed-Wire. + * Slows individuals crossing it. Barefoot individuals will be cut. Can be electrified by placing over a cable node. + */ + +/obj/item/weapon/material/barbedwire + name = "barbed wire" + desc = "A coil of wire." + icon = 'icons/obj/trap.dmi' + icon_state = "barbedwire" + anchored = FALSE + layer = TABLE_LAYER + w_class = ITEMSIZE_LARGE + explosion_resistance = 1 + can_dull = TRUE + fragile = TRUE + force_divisor = 0.20 + thrown_force_divisor = 0.25 + + sharp = TRUE + +/obj/item/weapon/material/barbedwire/set_material(var/new_material) + ..() + + if(!QDELETED(src)) + health = round(material.integrity / 3) + name = (material.get_edge_damage() * force_divisor > 15) ? "[material.display_name] razor wire" : "[material.display_name] [initial(name)]" + +/obj/item/weapon/material/barbedwire/proc/can_use(mob/user) + return (user.IsAdvancedToolUser() && !issilicon(user) && !user.stat && !user.restrained()) + +/obj/item/weapon/material/barbedwire/attack_hand(mob/user as mob) + if(anchored && can_use(user)) + user.visible_message( + "[user] starts to collect \the [src].", + "You begin collecting \the [src]!", + "You hear the sound of rustling [material.name]." + ) + playsound(src, 'sound/machines/click.ogg', 50, 1) + + if(do_after(user, health)) + user.visible_message( + "[user] has collected \the [src].", + "You have collected \the [src]!" + ) + anchored = 0 + update_icon() + else + ..() + +/obj/item/weapon/material/barbedwire/attack_self(mob/user as mob) + ..() + if(!anchored && can_use(user)) + user.visible_message( + "[user] starts to deploy \the [src].", + "You begin deploying \the [src]!", + "You hear the rustling of [material.name]." + ) + + if (do_after(user, 60)) + user.visible_message( + "[user] has deployed \the [src].", + "You have deployed \the [src]!", + "You hear the rustling of [material.name]." + ) + playsound(src, 'sound/items/Wirecutter.ogg',70, 1) + spawn(2) + playsound(src, 'sound/items/Wirecutter.ogg',40, 1) + user.drop_from_inventory(src) + forceMove(get_turf(src)) + anchored = 1 + update_icon() + +/obj/item/weapon/material/barbedwire/attackby(obj/item/W as obj, mob/user as mob) + if(!istype(W)) + return + + if((W.flags & NOCONDUCT) || !shock(user, 70, pick(BP_L_HAND, BP_R_HAND))) + user.setClickCooldown(user.get_attack_speed(W)) + user.do_attack_animation(src) + playsound(src, 'sound/effects/grillehit.ogg', 40, 1) + + var/inc_damage = W.force + + if(W.is_wirecutter()) + if(!shock(user, 100, pick(BP_L_HAND, BP_R_HAND))) + playsound(src, W.usesound, 100, 1) + inc_damage *= 3 + + if(W.damtype != BRUTE) + inc_damage *= 0.3 + + health -= inc_damage + + check_health() + + ..() + +/obj/item/weapon/material/barbedwire/update_icon() + ..() + + if(anchored) + icon_state = "[initial(icon_state)]-out" + else + icon_state = "[initial(icon_state)]" + +/obj/item/weapon/material/barbedwire/Crossed(atom/movable/AM as mob|obj) + if(AM.is_incorporeal()) + return + if(anchored && isliving(AM)) + var/mob/living/L = AM + if(L.m_intent == "run") + L.visible_message( + "[L] steps in \the [src].", + "You step in \the [src]!", + "You hear a sharp rustling!" + ) + attack_mob(L) + update_icon() + ..() + +/obj/item/weapon/material/barbedwire/proc/shock(mob/user as mob, prb, var/target_zone = BP_TORSO) + if(!anchored || health == 0) // anchored/destroyed grilles are never connected + return 0 + if(material.conductivity <= 0) + return 0 + if(!prob(prb)) + return 0 + if(!in_range(src, user))//To prevent TK and mech users from getting shocked + return 0 + var/turf/T = get_turf(src) + var/obj/structure/cable/C = T.get_cable_node() + if(C) + if(C.powernet) + var/datum/powernet/PN = C.powernet + + if(PN) + PN.trigger_warning() + + var/PN_damage = PN.get_electrocute_damage() * (material.conductivity / 50) + + var/drained_energy = PN_damage * 10 / CELLRATE + + PN.draw_power(drained_energy) + + if(ishuman(user)) + var/mob/living/carbon/human/H = user + + var/obj/item/organ/external/affected = H.get_organ(check_zone(target_zone)) + + H.electrocute_act(PN_damage, src, H.get_siemens_coefficient_organ(affected)) + + else + if(isliving(user)) + var/mob/living/L = user + L.electrocute_act(PN_damage, src, 0.8) + + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(3, 1, src) + s.start() + if(user.stunned) + return 1 + else + return 0 + return 0 + +/obj/item/weapon/material/barbedwire/proc/attack_mob(mob/living/L) + var/target_zone + if(L.lying) + target_zone = ran_zone() + else + target_zone = pick("l_foot", "r_foot", "l_leg", "r_leg") + + //armour + var/blocked = L.run_armor_check(target_zone, "melee") + var/soaked = L.get_armor_soak(target_zone, "melee") + + if(blocked >= 100) + return + + if(soaked >= 30) + return + + if(L.buckled) //wheelchairs, office chairs, rollerbeds + return + + shock(L, 100, target_zone) + + L.add_modifier(/datum/modifier/entangled, 3 SECONDS) + + if(!L.apply_damage(force * (issilicon(L) ? 0.25 : 1), BRUTE, target_zone, blocked, soaked, src, sharp, edge)) + return + + playsound(src, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds + if(ishuman(L)) + var/mob/living/carbon/human/H = L + + if(H.species.siemens_coefficient<0.5) //Thick skin. + return + + if( H.shoes || ( H.wear_suit && (H.wear_suit.body_parts_covered & FEET) ) ) + return + + if(H.species.flags & NO_MINOR_CUT) + return + + to_chat(H, "You step directly on \the [src]!") + + var/list/check = list("l_foot", "r_foot") + while(check.len) + var/picked = pick(check) + var/obj/item/organ/external/affecting = H.get_organ(picked) + if(affecting) + if(affecting.robotic >= ORGAN_ROBOT) + return + if(affecting.take_damage(force, 0)) + H.UpdateDamageIcon() + H.updatehealth() + if(affecting.organ_can_feel_pain()) + H.Weaken(3) + return + check -= picked + + if(material.is_brittle() && prob(material.hardness)) + health = 0 + else if(!prob(material.hardness)) + health-- + check_health() + + return + +/obj/item/weapon/material/barbedwire/plastic + name = "snare wire" + default_material = MAT_PLASTIC diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index 16be9dff94b..4d40578c1ef 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -92,6 +92,8 @@ return pick(prob(30);/obj/effect/mine, prob(25);/obj/effect/mine/frag, prob(25);/obj/effect/mine/emp, + prob(15);/obj/effect/mine/camo, + prob(15);/obj/effect/mine/emp/camo, prob(10);/obj/effect/mine/stun, prob(10);/obj/effect/mine/incendiary,) diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 913ffda9b74..53f06af9f98 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -673,7 +673,10 @@ /obj/item/toy/plushie/borgplushie/scrubpuppy, /obj/item/toy/plushie/foxbear, /obj/item/toy/plushie/nukeplushie, - /obj/item/toy/plushie/otter) + /obj/item/toy/plushie/otter, + /obj/item/toy/plushie/vox, + /obj/item/toy/plushie/borgplushie/drakiesec, + /obj/item/toy/plushie/borgplushie/drakiemed) //VOREStation Add End /obj/random/plushielarge diff --git a/code/game/objects/structures/barricades.dm b/code/game/objects/structures/barricades.dm new file mode 100644 index 00000000000..34ab6025c73 --- /dev/null +++ b/code/game/objects/structures/barricades.dm @@ -0,0 +1,185 @@ +//Barricades! +/obj/structure/barricade + name = "barricade" + desc = "This space is blocked off by a barricade." + icon = 'icons/obj/structures.dmi' + icon_state = "barricade" + anchored = 1.0 + density = 1.0 + var/health = 100 + var/maxhealth = 100 + var/datum/material/material + +/obj/structure/barricade/New(var/newloc, var/material_name) + ..(newloc) + if(!material_name) + material_name = "wood" + material = get_material_by_name("[material_name]") + if(!material) + qdel(src) + return + name = "[material.display_name] barricade" + desc = "This space is blocked off by a barricade made of [material.display_name]." + color = material.icon_colour + maxhealth = material.integrity + health = maxhealth + +/obj/structure/barricade/get_material() + return material + +/obj/structure/barricade/attackby(obj/item/W as obj, mob/user as mob) + user.setClickCooldown(user.get_attack_speed(W)) + if(istype(W, /obj/item/stack)) + var/obj/item/stack/D = W + if(D.get_material_name() != material.name) + return //hitting things with the wrong type of stack usually doesn't produce messages, and probably doesn't need to. + if(health < maxhealth) + if(D.get_amount() < 1) + to_chat(user, "You need one sheet of [material.display_name] to repair \the [src].") + return + visible_message("[user] begins to repair \the [src].") + if(do_after(user,20) && health < maxhealth) + if(D.use(1)) + health = maxhealth + visible_message("[user] repairs \the [src].") + return + return + else + switch(W.damtype) + if("fire") + health -= W.force * 1 + if("brute") + health -= W.force * 0.75 + if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD))) + playsound(src, 'sound/effects/woodcutting.ogg', 100, 1) + else + playsound(src, 'sound/weapons/smash.ogg', 50, 1) + CheckHealth() + ..() + +/obj/structure/barricade/proc/CheckHealth() + if(health <= 0) + dismantle() + + health = min(health, maxhealth) + + return + +/obj/structure/barricade/take_damage(var/damage) + health -= damage + CheckHealth() + return + +/obj/structure/barricade/attack_generic(var/mob/user, var/damage, var/attack_verb) + visible_message("[user] [attack_verb] the [src]!") + if(material == get_material_by_name("resin")) + playsound(src, 'sound/effects/attackblob.ogg', 100, 1) + else if(material == (get_material_by_name(MAT_CLOTH) || get_material_by_name(MAT_SYNCLOTH))) + playsound(src, 'sound/items/drop/clothing.ogg', 100, 1) + else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD))) + playsound(src, 'sound/effects/woodcutting.ogg', 100, 1) + else + playsound(src, 'sound/weapons/smash.ogg', 50, 1) + user.do_attack_animation(src) + health -= damage + CheckHealth() + return + +/obj/structure/barricade/proc/dismantle() + material.place_dismantled_product(get_turf(src)) + visible_message("\The [src] falls apart!") + qdel(src) + return + +/obj/structure/barricade/ex_act(severity) + switch(severity) + if(1.0) + dismantle() + if(2.0) + health -= 25 + CheckHealth() + +/obj/structure/barricade/CanPass(atom/movable/mover, turf/target)//So bullets will fly over and stuff. + if(istype(mover) && mover.checkpass(PASSTABLE)) + return TRUE + return FALSE + +/obj/structure/barricade/sandbag + name = "sandbags" + desc = "Bags. Bags of sand. It's rough and coarse and somehow stays in the bag." + icon = 'icons/obj/sandbags.dmi' + icon_state = "blank" + +/obj/structure/barricade/sandbag/New(var/newloc, var/material_name) + if(!material_name) + material_name = "cloth" + ..(newloc, material_name) + material = get_material_by_name("[material_name]") + if(!material) + qdel(src) + return + name = "[material.display_name] [initial(name)]" + desc = "This space is blocked off by a barricade made of [material.display_name]." + color = null + maxhealth = material.integrity * 2 // These things are, commonly, used to stop bullets where possible. + health = maxhealth + update_connections(1) + +/obj/structure/barricade/sandbag/Destroy() + update_connections(1, src) + ..() + +/obj/structure/barricade/sandbag/dismantle() + update_connections(1, src) + material.place_dismantled_product(get_turf(src)) + visible_message("\The [src] falls apart!") + qdel(src) + return + +/obj/structure/barricade/sandbag/update_icon() + if(!material) + return + + cut_overlays() + var/image/I + + for(var/i = 1 to 4) + I = image('icons/obj/sandbags.dmi', "sandbags[connections[i]]", dir = 1<<(i-1)) + I.color = material.icon_colour + add_overlay(I) + + return + +/obj/structure/barricade/sandbag/update_connections(propagate = 0, var/obj/structure/barricade/sandbag/ignore = null) + if(!material) + return + var/list/dirs = list() + for(var/obj/structure/barricade/sandbag/S in orange(src, 1)) + if(!S.material) + continue + if(S == ignore) + continue + if(propagate >= 1) + S.update_connections(propagate - 1, ignore) + if(can_join_with(S)) + dirs += get_dir(src, S) + + connections = dirs_to_corner_states(dirs) + + update_icon() + +/obj/structure/barricade/sandbag/proc/can_join_with(var/obj/structure/barricade/sandbag/S) + if(material == S.material) + return 1 + return 0 + +/obj/structure/barricade/sandbag/CanPass(atom/movable/mover, turf/target) + . = ..() + + if(.) + if(istype(mover, /obj/item/projectile)) + var/obj/item/projectile/P = mover + + if(P.firer && get_dist(P.firer, src) > 1) // If you're firing from adjacent turfs, you are unobstructed. + if(P.armor_penetration < (material.protectiveness + material.hardness) || prob(33)) + return FALSE diff --git a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm index ba0809f6381..dabc8fd88bb 100644 --- a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm @@ -36,11 +36,11 @@ icon_opened = "egg_unathi_open" /obj/structure/closet/secure_closet/egg/nevrean - name = "nevarean egg" - desc = "Most Nevareans lay hard-shelled eggs!" - icon_state = "egg_nevarean" - icon_closed = "egg_nevarean" - icon_opened = "egg_nevarean_open" + name = "nevrean egg" + desc = "Most Nevreans lay hard-shelled eggs!" + icon_state = "egg_nevrean" + icon_closed = "egg_nevrean" + icon_opened = "egg_nevrean_open" /obj/structure/closet/secure_closet/egg/human name = "human egg" diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm new file mode 100644 index 00000000000..c724b9bd809 --- /dev/null +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -0,0 +1,101 @@ +/obj/structure/ghost_pod/ghost_activated/maintpred + name = "maintenance hole" + desc = "Looks like some creature dug its way into station's maintenance..." + icon = 'icons/effects/effects.dmi' + icon_state = "tunnel_hole" + icon_state_opened = "tunnel_hole" + density = FALSE + ghost_query_type = /datum/ghost_query/maints_pred + anchored = TRUE + invisibility = INVISIBILITY_OBSERVER + spawn_active = TRUE + var/announce_prob = 35 + var/list/possible_mobs = list("Space Bumblebee" = /mob/living/simple_mob/vore/bee, + "Voracious Lizard" = /mob/living/simple_mob/vore/aggressive/dino, + "Giant Frog" = /mob/living/simple_mob/vore/aggressive/frog, + "Giant Rat" = /mob/living/simple_mob/vore/aggressive/rat, + "Juvenile Solargrub" = /mob/living/simple_mob/vore/solargrub, + "Red Panda" = /mob/living/simple_mob/vore/redpanda, + "Fennec" = /mob/living/simple_mob/vore/fennec, + "Fennix" = /mob/living/simple_mob/vore/fennix, + "Jelly Blob" = /mob/living/simple_mob/animal/space/jelly, + "Wolf" = /mob/living/simple_mob/animal/wolf, + "Sect Queen" = /mob/living/simple_mob/vore/sect_queen, + "Defanged Xenomorph" = /mob/living/simple_mob/vore/xeno_defanged, + ) + +/obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M) + ..() + var/choice + var/randomize + var/finalized = "No" + + while(finalized == "No" && M.client) + choice = input(M,"What type of predator do you want to play as?") as null|anything in possible_mobs + if(!choice) + randomize = TRUE + break + + if(choice) + finalized = alert(M, "Are you sure you want to play as [choice]?","Confirmation","No","Yes") + + if(randomize) + choice = pick(possible_mobs) + + var/mobtype = possible_mobs[choice] + var/mob/living/simple_mob/newPred = new mobtype(get_turf(src)) + qdel(newPred.ai_holder) + newPred.ai_holder = null + //newPred.movement_cooldown = 0 // The "needless artificial speed cap" exists for a reason + if(M.mind) + M.mind.transfer_to(newPred) + to_chat(M, "You are [newPred], somehow having gotten aboard the station in search of food. \ + You are wary of environment around you, but you do feel rather peckish. Stick around dark, secluded places to avoid danger or, \ + if you are cute enough, try to make friends with this place's inhabitants.") + newPred.ckey = M.ckey + newPred.visible_message("[newPred] emerges from somewhere!") + + if(prob(announce_prob)) + spawn(2 MINUTES) + command_announcement.Announce("Unexpected biosignature detected in the maintenance tunnels of [station_name()].", "Lifesign Alert") + + qdel(src) + +/obj/structure/ghost_pod/ghost_activated/maintpred/no_announce + announce_prob = 0 + +/obj/structure/ghost_pod/ghost_activated/morphspawn + name = "weird goo" + desc = "A pile of weird gunk... Wait, is it actually moving?" + icon = 'icons/mob/animal_vr.dmi' + icon_state = "morph" + icon_state_opened = "morph_dead" + density = FALSE + ghost_query_type = /datum/ghost_query/morph + anchored = TRUE + invisibility = INVISIBILITY_OBSERVER + spawn_active = TRUE + var/announce_prob = 50 + +/obj/structure/ghost_pod/ghost_activated/morphspawn/create_occupant(var/mob/M) + ..() + var/mob/living/simple_mob/vore/hostile/morph/newMorph = new /mob/living/simple_mob/vore/hostile/morph(get_turf(src)) + if(M.mind) + M.mind.transfer_to(newMorph) + to_chat(M, "You are a Morph, somehow having gotten aboard the station in your wandering. \ + You are wary of environment around you, but your primal hunger still calls for you to find prey. Seek a convincing disguise, \ + using your amorphous form to traverse vents to find and consume weak prey.") + to_chat(M, "You can use shift + click on objects to disguise yourself as them, but your strikes are nearly useless when you are disguised. \ + You can undisguise yourself by shift + clicking yourself, but disguise being switched, or turned on and off has a short cooldown. You can also ventcrawl, \ + by using alt + click on the vent or scrubber.") + newMorph.ckey = M.ckey + newMorph.visible_message("A morph appears to crawl out of somewhere.") + + if(prob(announce_prob)) + spawn(2 MINUTES) + command_announcement.Announce("Unexpected biosignature detected in the maintenance tunnels of [station_name()].", "Lifesign Alert") + + qdel(src) + +/obj/structure/ghost_pod/ghost_activated/morphspawn/no_announce + announce_prob = 0 \ No newline at end of file diff --git a/code/game/objects/structures/ghost_pods/ghost_pods.dm b/code/game/objects/structures/ghost_pods/ghost_pods.dm index 12cfe24dc22..386d493d2db 100644 --- a/code/game/objects/structures/ghost_pods/ghost_pods.dm +++ b/code/game/objects/structures/ghost_pods/ghost_pods.dm @@ -36,6 +36,10 @@ // Override this to create whatever mob you need. Be sure to call ..() if you don't want it to make infinite mobs. /obj/structure/ghost_pod/proc/create_occupant(var/mob/M) used = TRUE + //VOREStation Addition Start + if(src in active_ghost_pods) + active_ghost_pods -= src + //VOREStation Addition End return TRUE @@ -52,6 +56,7 @@ // VOREStation Addition Start if(!used) activated = TRUE + ghostpod_startup(FALSE) // VOREStation Addition End /obj/structure/ghost_pod/manual/attack_ai(var/mob/living/silicon/user) diff --git a/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm b/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm index 9eedbb453cf..2d8f8198c50 100644 --- a/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm +++ b/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm @@ -1,3 +1,11 @@ +/obj/structure/ghost_pod/Destroy() + if(src in active_ghost_pods) + active_ghost_pods -= src + ..() + +/obj/structure/ghost_pod + var/spawn_active = FALSE + /obj/structure/ghost_pod/manual var/remains_active = FALSE var/activated = FALSE @@ -28,4 +36,14 @@ busy = FALSE - create_occupant(user) \ No newline at end of file + create_occupant(user) + +/obj/structure/ghost_pod/proc/ghostpod_startup(var/notify = FALSE) + if(!(src in active_ghost_pods)) + active_ghost_pods += src + if(notify) + trigger() + +/obj/structure/ghost_pod/ghost_activated/Initialize() + ..() + ghostpod_startup(spawn_active) \ No newline at end of file diff --git a/code/game/objects/structures/props/blackbox.dm b/code/game/objects/structures/props/blackbox.dm index a28b82349f0..052b7d7609a 100644 --- a/code/game/objects/structures/props/blackbox.dm +++ b/code/game/objects/structures/props/blackbox.dm @@ -130,3 +130,122 @@ A repeating ping, before silence.
End of second log. "} + +//VOREStation additions below this line - Killian's wrecks +/obj/structure/prop/blackbox/mackerel_wreck + catalogue_data = list(/datum/category_item/catalogue/information/blackbox/mackerel_wreck) + +/datum/category_item/catalogue/information/blackbox/mackerel_wreck + name = "Black Box Data - ITV Phish Phood" + desc = {" +
+ BEGIN LOG
+ (blaring alarms)
+ Shipboard Computer: Collision warning. Collision warning.
+ Shipboard Computer: High speed impact detected.
+ Shipboard Computer: Extensive damage detected.
+ Shipboard Computer: Starboard nacelle offline.
+ Shipboard Computer: Port nacelle damaged.
+ Shipboard Computer: Fore starboard impact buffer shattered.
+ Shipboard Computer: Fore port impact buffer critically damaged.
+ Shipboard Computer: Warning. Canopy breached. Warning. Canopy breached.
+ Shipboard Computer: Danger. Canopy depressurized.
+ Shipboard Computer: Warning. Sensors indicate crawlspaces exposed to vacuum.
+ Unknown Voice 1: Wow, that thing really did a number on this ship for a fifty year old piece of shit warhead huh?
+ Unknown Voice 2: No kidding!
+ Shipboard Computer: Danger. Lethal trauma to operator detected.
+ Unknown Voice 1: Fucking hell, will you shut that thing up?
+ (several loud metallic impacts)
+ Shipboard Computer: Warning. Intruders detec--*kzzzht*
+ (alarms cease)
+ Unknown Voice 2: There. Fuck. Finally. Sorry.
+ Unknown Voice 2: I hope whatever this idiot was hauling is here. Why were they in such a hurry anyway?
+ Unknown Voice 1: Beats me- and hand me that crowbar already.
+ Unknown Voice 2: Here, catch.
+ Unknown Voice 1: \'cha, nice. Let's see...
+ (sound of metal creaking, then a loud snapping sound)
+ Unknown Voice 1: And here she is.
+ Unknown Voice 2: (whistling) What a beauty. How much you think it\'ll go for?
+ Unknown Voice 1: Enough we\'ll never have to worry about doing another job all the way out here ever again.
+ Unknown Voice 2: Shiny. Now let\'s bounce before the ess-defs show up.
+ Unknown Voice 1: I hear that, brat.
+ END LOG
+
+ CATALOGUER VOICE RECOGNITION RESULTS:
+ No match found for either speaker, but contextual clues and use of Old Earth russian (\'brat\', approximately \'brother\' or \'pal\') suggests out-of-sector criminal elements. + "} + +/obj/structure/prop/blackbox/gecko_wreck + catalogue_data = list(/datum/category_item/catalogue/information/blackbox/gecko_wreck) + +/datum/category_item/catalogue/information/blackbox/gecko_wreck + name = "Black Box Data - ITV Sticky Situation" + desc = {" +
+ BEGIN LOG
+ (blaring alarms)
+ Shipboard Computer: Alert. Multiple impacts detected along starboard side.
+ Shipboard Computer: Multiple hull breaches detected. Starboard cargo hatches have been breached.
+ Shipboard Computer: Warning. Nacelle engines offline. Thrust reduced by thirty-five-point-three percent.
+ Unknown Voice 1: Agh! Shit! How'd they know-
+ (loud explosion, sound of rushing air)
+ Shipboard Computer: Danger. Canopy breached.
+ (mechanical whine, followed by a deep hiss)
+ Shipboard Computer: Automatic lockdown successfully engaged.
+ Unknown Voice 1: (wheezing) Motherfucker! Jackson, Phelps, stand by to repel boarders!
+ Unknown Voice 2: Roger!
+ Unknown Voice 3: Already there.
+ Shipboard Computer: Warning. Minor breach in Engineering. Local depressurization in five minutes.
+ Unknown Voice 1: Shit, shit, shit.
+ Unknown Voice 3: Jackson\'s down!
+ Unknown Voice 1: Motherf-
+ Unknown Voice 4: Captain. Enough. You know why we\'re here, and we have your engineer. Tell us where you hid the goods and maybe we\'ll let you live.
+ Unknown Voice 5: Let me go you son of a-
+ (gunshot, ballistic)
+ Unknown Voice 4: You fucking idiot!
+ Unknown Voice 6: Don\'t you start, you said-
+ Unknown Voice 4: I don\'t care what I fucking said, shit-for-brains!
+ Unknown Voice 7: Boss, I hate to rain on your little parade but SDF just popped up on my scopes, \'bout... fifty klicks out, closing fast. Be on top of us in a few minutes tops.
+ Unknown Voice 4: Fuck! You, dumbass! Link up with the others and grab as many crates as you can! Pray for your sake that we get the right one!
+ END LOG
+
+ CATALOGUER DATA ANALYSIS RESULTS:
+ No matches found for any of the voices involved. Ship manifest suggests a crew of at least six, but under the circumstances three of the recorded voices are clearly not from the crew.
+
+ Audio resynthesis of firearm discharge matches common high-caliber ballistic sidearm cartridges, best match 10mm Watson Special. An uncommon cartridge, one not manufactured locally. + "} + +/obj/structure/prop/blackbox/salamander_wreck + catalogue_data = list(/datum/category_item/catalogue/information/blackbox/salamander_wreck) + +/datum/category_item/catalogue/information/blackbox/salamander_wreck + name = "Black Box Data - ITV Unity" + desc = {" +
+ BEGIN LOG
+ Unknown Speaker 1: Hey cap, you seeing this?
+ Unknown Speaker 2 (\"Cap\"): Yea-- what the fuck?
+ Unknown Speaker 1: Yeah that was my reaction.
+ Unknown Speaker 3: What are you tw-- holy shit, what is that?
+ Unknown Speakers 1 & 2: We don't know!
+ Unknown Speaker 4: What\'s all the yel-- fuck me sideways, what the hell?
+ Unknown Speaker 2 (\"Cap\"): Stars above and fucking below, they never said anything like this was in the cans... shouldn't the port bioscanners have picked this up?
+ Unknown Speaker 3: I told you that guy was one shady motherfucker, and whaddaya know.
+ Unknown Speaker 1: No kidding. Christ. What\'s the play, cap?
+ Unknown Speaker 4: I say we shoot this crap into the nearest star. Or gas giant maybe.
+ Unknown Speaker 2 (\"Cap\"): Pretty much. Get in one of the voidsuits and rig the can up with some spare O2 canisters -- plot it a course that\'ll sling it right into V3\'s atmosphere.
+ Unknown Speaker 1: Yeah, sure. That shouldn\'t take long. Then what?
+ Unknown Speaker 2 (\"Cap\"): Let\'s see... ah, perfect. There's another ship passing close by, and I know the captain. We'll take our suits out and have her pick us up. Max, you still got those old cutting charges I told you to get rid of?
+ Unknown Speaker 4 (\"Max\"): No. (pause) ...but also yes.
+ Unknown Speaker 2 (\"Cap\"): Your propensity for ignoring my orders has once again paid off... man, I\'m gonna miss the Unity, but... better this way. I want holes in both sides of the engine bay and one in the portside crawlspace. Lock all the doors open and depressurize the main cabins. Drain as much fuel as you can, break up the main power block, and scatter the parts.
+ Unknown Speaker 1: You want us to scuttle her, chief?
+ Unknown Speaker 2 (\"Cap\"): Nail on the head, my friend.
+ Unknown Speaker 3: Let\'s get rid of that fucking can first, I think it just blinked at me.
+ END LOG
+
+ CATALOGUER VOICE RECOGNITION RESULTS:
+ SPEAKER ONE: No match.
+ SPEAKER TWO, \"CAP\": Predicted to be Jeremiah Wells, human, last registered owner of the ITV Unity and small-time smuggler of fake alien artefacts. Wanted for smuggling and sale of said (fake) alien artefacts. 87% confidence.
+ SPEAKER THREE: Predicted to be Allie Wells, human, niece of Captain Wells. 90% confidence.
+ SPEAKER FOUR, \"MAX\": Predicted to be Maxwell Ulysses Sarevic, zorren, known smuggler, and wanted in the Elysian Colonies for liberation of slaves and, quote, \'harshing my vibe, and being a, like, total lamer, dude\', unquote. 99% confidence. + "} \ No newline at end of file diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index f93ceaf0a1f..78384b02851 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -321,73 +321,344 @@ desc = "A warning sign which reads XENOBIOLOGY." icon_state = "xenobio3" +//direction signs presented by the order they appear in the dmi /obj/structure/sign/directions name = "direction sign" - desc = "A direction sign, claiming to know the way." + desc = "A direction sign, claiming to know the way to... somewhere?" icon_state = "direction" + icon = 'icons/obj/decals_directions.dmi' + //TODO: set up overlay systems, inc. interactions (e.g. vines clear w/ plantbgone or fire, snow can be brushed off or melted, and so on) +//disabled this proc, it serves no purpose except to overwrite the description that already exists. may have been intended for making your own signs? +//seems to defeat the point of having a generic directional sign that mappers could edit and use in POIs? left it here in case something breaks. +/* /obj/structure/sign/directions/New() ..() - desc = "A direction sign, pointing out which way \the [src] is." - -/obj/structure/sign/directions/science - name = "\improper Science department" - desc = "A direction sign, pointing out which way the Science department is." - icon_state = "direction_sci" + desc = "A direction sign, pointing out the way to \the [src]." +*/ +//engineering signs /obj/structure/sign/directions/engineering - name = "\improper Engineering department" - desc = "A direction sign, pointing out which way the Engineering department is." + name = "\improper Engineering Department" + desc = "A direction sign, pointing out the way to the Engineering Department." icon_state = "direction_eng" +/obj/structure/sign/directions/engineering/reactor + name = "\improper Reactor" + desc = "A direction sign, pointing out the way to the Reactor." + icon_state = "direction_core" + +/obj/structure/sign/directions/engineering/solars + name = "\improper Solar Array" + desc = "A direction sign, pointing out the way to the nearest Solar Array." + icon_state = "direction_solar" + +/obj/structure/sign/directions/engineering/atmospherics + name = "\improper Atmospherics Department" + desc = "A direction sign, pointing out the way to the Atmospherics Department." + icon_state = "direction_atmos" + +/obj/structure/sign/directions/engineering/gravgen + name = "\improper Gravity Generator" + desc = "A direction sign, pointing out the way to the Artificial Gravity Generator." + icon_state = "direction_grav" + +/obj/structure/sign/directions/engineering/engeqp + name = "\improper Engineering Equipment Storage" + desc = "A direction sign, pointing out the way to Engineering Equipment Storage." + icon_state = "direction_engeqp" + +//security signs /obj/structure/sign/directions/security - name = "\improper Security department" - desc = "A direction sign, pointing out which way the Security department is." + name = "\improper Security Department" + desc = "A direction sign, pointing out the way to the Security Department." icon_state = "direction_sec" +/obj/structure/sign/directions/security/armory + name = "\improper Armory" + desc = "A direction sign, pointing out the way to the Armory." + icon_state = "direction_armory" + +/obj/structure/sign/directions/security/brig + name = "\improper Brig" + desc = "A direction sign, pointing out the way to the Brig." + icon_state = "direction_brig" + +/obj/structure/sign/directions/security/seceqp + name = "\improper Security Equipment Storage" + desc = "A direction sign, pointing out the way to Security Equipment Storage." + icon_state = "direction_seceqp" + +/obj/structure/sign/directions/security/internal_affairs + name = "\improper Internal Affairs Office" + desc = "A direction sign, pointing out the way to the Internal Affairs Office." + icon_state = "direction_intaff" + +/obj/structure/sign/directions/security/forensics + name = "\improper Forensics Lab" + desc = "A direction sign, pointing out the way to the Forensics Lab." + icon_state = "direction_forensics" + +/obj/structure/sign/directions/security/forensics/alt + icon_state = "direction_lab" + +/obj/structure/sign/directions/security/interrogation + name = "\improper Interrogations" + desc = "A direction sign, pointing out the way to Interrogations." + icon_state = "direction_interrogation" + +//science signs +/obj/structure/sign/directions/science + name = "\improper Science Department" + desc = "A direction sign, pointing out the way to the Science Department." + icon_state = "direction_sci" + +/obj/structure/sign/directions/science/rnd + name = "\improper Research & Development" + desc = "A direction sign, pointing out the way to Research & Development." + icon_state = "direction_rnd" + +/obj/structure/sign/directions/science/toxins + name = "\improper Toxins Lab" + desc = "A direction sign, pointing out the way to the Toxins Lab." + icon_state = "direction_sci" + +/obj/structure/sign/directions/science/robotics + name = "\improper Robotics Workshop" + desc = "A direction sign, pointing out the way to the Robotics Workshop." + icon_state = "direction_robotics" + +/obj/structure/sign/directions/science/xenoarch + name = "\improper Xenoarchaeology Lab" + desc = "A direction sign, pointing out the way to the Xenoarchaeology Lab." + icon_state = "direction_xenoarch" + +/obj/structure/sign/directions/science/xenobiology + name = "\improper Xenobiology Lab" + desc = "A direction sign, pointing out the way to the Xenobiology Lab." + icon_state = "direction_xbio" + +/obj/structure/sign/directions/science/xenoflora + name = "\improper Xenoflora Lab" + desc = "A direction sign, pointing out the way to the Xenoflora Lab." + icon_state = "direction_xflora" + +/obj/structure/sign/directions/science/exploration + name = "\improper Exploration Department" + desc = "A direction sign, pointing out the way to the Exploration Department." + icon_state = "direction_explo" + +//medical signs /obj/structure/sign/directions/medical name = "\improper Medical Bay" - desc = "A direction sign, pointing out which way the Medical Bay is." + desc = "A direction sign, pointing out the way to the Medical Bay." icon_state = "direction_med" +/obj/structure/sign/directions/medical/chemlab + name = "\improper Chemistry Lab" + desc = "A direction sign, pointing out the way to the Chemistry Lab." + icon_state = "direction_med" + +/obj/structure/sign/directions/medical/surgery + name = "\improper Surgery" + desc = "A direction sign, pointing out the way to Surgery." + icon_state = "direction_surgery" + +/obj/structure/sign/directions/medical/operating_1 + name = "\improper Operating Theatre 1" + desc = "A direction sign, pointing out the way to Operating Theatre 1." + icon_state = "direction_op1" + +/obj/structure/sign/directions/medical/operating_2 + name = "\improper Operating Theatre 2" + desc = "A direction sign, pointing out the way to Operating Theatre 2." + icon_state = "direction_op2" + +/obj/structure/sign/directions/medical/virology + name = "\improper Virology" + desc = "A direction sign, pointing out the way to the Virology Lab." + icon_state = "direction_viro" + +/obj/structure/sign/directions/medical/medeqp + name = "\improper Medical Equipment Storage" + desc = "A direction sign, pointing out the way to Medical Equipment Storage." + icon_state = "direction_medeqp" + +/obj/structure/sign/directions/medical/morgue + name = "\improper Morgue" + desc = "A direction sign, pointing out the way to the Morgue." + icon_state = "direction_morgue" + +/obj/structure/sign/directions/medical/cloning + name = "\improper Cloning Lab" + desc = "A direction sign, pointing out the way to the Cloning Lab." + icon_state = "direction_cloning" + +/obj/structure/sign/directions/medical/resleeving + name = "\improper Resleeving Lab" + desc = "A direction sign, pointing out the way to the Resleeving Lab." + icon_state = "direction_resleeve" + +//special signs /obj/structure/sign/directions/evac name = "\improper Evacuation" - desc = "A direction sign, pointing out which way the Escape Shuttle dock is." + desc = "A direction sign, pointing out the way to the Escape Shuttle Dock." icon_state = "direction_evac" +/obj/structure/sign/directions/eva + name = "\improper Extra-Vehicular Activity" + desc = "A direction sign, pointing out the way to the EVA Bay." + icon_state = "direction_eva" + +//command signs +/obj/structure/sign/directions/ai_core + name = "\improper AI Core" + desc = "A direction sign, pointing out the way to the AI Core." + icon_state = "direction_ai_core" + /obj/structure/sign/directions/bridge name = "\improper Bridge" + desc = "A direction sign, pointing out the way to the Bridge." icon_state = "direction_bridge" +/obj/structure/sign/directions/command + name = "\improper Command" + desc = "A direction sign, pointing out the way to the Command Center." + icon_state = "direction_command" + +/obj/structure/sign/directions/teleporter + name = "\improper Teleporter" + desc = "A direction sign, pointing out the way to the Teleporter." + icon_state = "direction_teleport" + +/obj/structure/sign/directions/telecomms + name = "\improper Telecommunications Hub" + desc = "A direction sign, pointing out the way to the Telecommunications Hub." + icon_state = "direction_tcomms" + +//cargonia signs /obj/structure/sign/directions/cargo - name = "\improper Cargo department" - desc = "A direction sign, pointing out which way the Cargo department is." + name = "\improper Cargo Department" + desc = "A direction sign, pointing out the way to the Cargo Department." icon_state = "direction_crg" -// VOREStation Edit - New signs for us -/obj/structure/sign/directions/command - icon = 'icons/obj/decals_vr.dmi' - name = "\improper Command department" - desc = "A direction sign, pointing out which way the Command department is." - icon_state = "direction_cmd" +/obj/structure/sign/directions/cargo/mining + name = "\improper Mining Department" + desc = "A direction sign, pointing out the way to the Mining Department." + icon_state = "direction_mining" -/obj/structure/sign/directions/elevator - icon = 'icons/obj/decals_vr.dmi' - name = "\improper Space Elevator" - desc = "A direction sign, pointing out which way the Space Elevator is." - icon_state = "direction_elv" -// VOREStation Edit End - -/obj/structure/sign/directions/cryo - name = "\improper Cryogenic Storage" - desc = "A direction sign, pointing out which way cryogenic storage is." - icon_state = "direction_cry" +/obj/structure/sign/directions/cargo/refinery + name = "\improper Refinery" + desc = "A direction sign, pointing out the way to the Refinery." + icon_state = "direction_refinery" +//civilian/misc signs /obj/structure/sign/directions/roomnum name = "room number" desc = "A sign detailing the number of the room beside it." icon_state = "roomnum" +/obj/structure/sign/directions/cryo + name = "\improper Cryogenic Storage" + desc = "A direction sign, pointing out the way to Cryogenic Storage." + icon_state = "direction_cry" + +/obj/structure/sign/directions/elevator + name = "\improper Elevator" + desc = "A direction sign, pointing out the way to the nearest elevator." + icon_state = "direction_elv" + +/obj/structure/sign/directions/bar + name = "\improper Bar" + desc = "A direction sign, pointing out the way to the nearest watering hole." + icon_state = "direction_bar" + +/obj/structure/sign/directions/kitchen + name = "\improper Kitchen" + desc = "A pictographic direction sign with a knife, plate, and fork, pointing out the way to the nearest dining establishment." + icon_state = "direction_kitchen" + +/obj/structure/sign/directions/tram + name = "\improper Public Transit Station" + desc = "A direction sign, pointing out the way to the nearest public transit station." + icon_state = "direction_tram" + +/obj/structure/sign/directions/janitor + name = "\improper Custodial Closet" + desc = "A direction sign, pointing out the way to the Custodial Closet." + icon_state = "direction_janitor" + +/obj/structure/sign/directions/chapel + name = "\improper Chapel" + desc = "A direction sign, pointing out the way to the Chapel." + icon_state = "direction_chapel" + +/obj/structure/sign/directions/dorms + name = "\improper Dormitories" + desc = "A direction sign, pointing out the way to the Dormitories." + icon_state = "direction_dorms" + +/obj/structure/sign/directions/library + name = "\improper Library" + desc = "A direction sign, pointing out the way to the Library." + icon_state = "direction_library" + +/obj/structure/sign/directions/dock + name = "\improper Dock" + desc = "A direction sign, pointing out the way to the nearest docking area." + icon_state = "direction_dock" + +/obj/structure/sign/directions/gym + name = "\improper Gym" + desc = "A direction sign, pointing out the way to the Gym." + icon_state = "direction_gym" + +/obj/structure/sign/directions/pool + name = "\improper Pool" + desc = "A direction sign, pointing out the way to the Pool." + icon_state = "direction_pool" + +/obj/structure/sign/directions/recreation + name = "\improper Recreation Area" + desc = "A direction sign, pointing out the way to the nearest Recreation Area." + icon_state = "direction_recreation" + +/obj/structure/sign/directions/stairwell + name = "\improper Stairwell" + desc = "A direction sign with stairs and a door, pointing out the way to the nearest stairwell." + icon_state = "stairwell" + +/obj/structure/sign/directions/stairs_up + name = "\improper Stairs Up" + desc = "A direction sign with stairs and an upward-slanted arrow, pointing out the way to the nearest set of stairs that go up." + icon_state = "stairs_up" + +/obj/structure/sign/directions/stairs_down + name = "\improper Stairs Down" + desc = "A direction sign with stairs and a downward-slanted arrow, pointing out the way to the nearest set of stairs that go down." + icon_state = "stairs_down" + +/obj/structure/sign/directions/ladderwell + name = "\improper Access Shaft" + desc = "A direction sign with a ladder and a door, pointing out the way to the nearest access shaft." + icon_state = "ladderwell" + +/obj/structure/sign/directions/ladder_up + name = "\improper Ladder Up" + desc = "A direction sign with a ladder and an upward arrow, pointing out the way to the nearest ladder that goes up." + icon_state = "ladder_up" + +/obj/structure/sign/directions/ladder_down + name = "\improper Ladder Down" + desc = "A direction sign with a ladder and a downward arrow, pointing out the way to the nearest ladder that goes down." + icon_state = "ladder_down" + +/obj/structure/sign/directions/exit + name = "\improper Emergency Exit" + desc = "A lurid green sign that unmistakably identifies that the door it's next to as an emergency exit route." + icon_state = "exit_sign" + +//OTHER STUFF /obj/structure/sign/christmas/lights name = "Christmas lights" desc = "Flashy and pretty." diff --git a/code/game/objects/structures/watercloset_vr.dm b/code/game/objects/structures/watercloset_vr.dm new file mode 100644 index 00000000000..7e8790fbcc1 --- /dev/null +++ b/code/game/objects/structures/watercloset_vr.dm @@ -0,0 +1,41 @@ +//Flushable toilets on station levels. Flushing sends stuff directly to a trashpit landmark without stinking up the cargo office. +//Only on-station toilets are affected and only if the trashpit landmark also exists. Otherwise toilets will stay normal. + +/obj/structure/toilet + var/teleplumbed = FALSE + var/exit_landmark + +/obj/structure/toilet/Initialize() + if(z in global.using_map.map_levels) + teleplumbed = TRUE + exit_landmark = locate(/obj/effect/landmark/teleplumb_exit) + if(teleplumbed && exit_landmark) + desc = "The BS-500, a bluespace rift-rotation-based waste disposal unit for small matter. This one seems remarkably clean." + return ..() + +/obj/structure/toilet/attack_hand(mob/living/user as mob) + if(open && teleplumbed && exit_landmark) + var/list/bowl_contents = list() + for(var/obj/item/I in loc.contents) + if(istype(I) && !I.anchored) + bowl_contents += I + if(bowl_contents.len) + user.visible_message("[user] flushes the toilet.", "You flush the toilet.") + playsound(src, 'sound/vore/death7.ogg', 50, 1) //Got lazy about getting new sound files. Have a sick remix lmao. + playsound(src, 'sound/effects/bubbles.ogg', 50, 1) + playsound(src, 'sound/mecha/powerup.ogg', 30, 1) + for(var/obj/item/F in bowl_contents) + F.forceMove(get_turf(exit_landmark)) + bowl_contents -= F + return + return ..() + +/obj/structure/toilet/attack_ai(mob/user as mob) + if(isrobot(user)) + if(user.client && user.client.eye == user) + return attack_hand(user) + else + return attack_hand(user) + +/obj/effect/landmark/teleplumb_exit + name = "teleplumbing exit" diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 08133f1b727..31d39aa47d8 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -148,6 +148,15 @@ var/list/flooring_types icon_base = "grass_sif" build_type = /obj/item/stack/tile/grass/sif has_base_range = 1 + +/decl/flooring/grass/sif/forest + name = "thick growth" + desc = "A natural moss that has adapted to the sheer cold climate." + flags = TURF_REMOVE_SHOVEL + icon = 'icons/turf/outdoors.dmi' + icon_base = "grass_sif_dark" + build_type = /obj/item/stack/tile/grass/sif/forest + has_base_range = 1 /decl/flooring/water name = "water" diff --git a/code/game/turfs/simulated/outdoors/grass.dm b/code/game/turfs/simulated/outdoors/grass.dm index 09784b21a3a..65d0e472f16 100644 --- a/code/game/turfs/simulated/outdoors/grass.dm +++ b/code/game/turfs/simulated/outdoors/grass.dm @@ -86,6 +86,7 @@ var/list/grass_types = list( /turf/simulated/floor/outdoors/grass/sif/forest name = "thick growth" icon_state = "grass_sif_dark0" + initial_flooring = /decl/flooring/grass/sif/forest edge_blending_priority = 5 tree_chance = 10 grass_chance = 1 diff --git a/code/game/turfs/unsimulated/beach_vr.dm b/code/game/turfs/unsimulated/beach_vr.dm new file mode 100644 index 00000000000..be3130a72ec --- /dev/null +++ b/code/game/turfs/unsimulated/beach_vr.dm @@ -0,0 +1,5 @@ +/turf/simulated/floor/beach/sand/outdoors + outdoors = TRUE + +/turf/simulated/floor/beach/sand/desert/outdoors + outdoors = TRUE \ No newline at end of file diff --git a/code/global_vr.dm b/code/global_vr.dm index 9d06ea18a3d..278df90f79a 100644 --- a/code/global_vr.dm +++ b/code/global_vr.dm @@ -12,7 +12,9 @@ var/list/shell_module_types = list( "Standard", "Service", "Clerical", "Service-Hound" ) +var/list/awayabductors = list() // List of scatter landmarks for Abductors in Gateways var/list/eventdestinations = list() // List of scatter landmarks for VOREStation event portals +var/list/eventabductors = list() // List of scatter landmarks for VOREStation abductor portals var/global/list/acceptable_fruit_types= list( "ambrosia", diff --git a/code/modules/admin/admin_verb_lists.dm b/code/modules/admin/admin_verb_lists.dm index 0eaedc9fbeb..3fa8903f72d 100644 --- a/code/modules/admin/admin_verb_lists.dm +++ b/code/modules/admin/admin_verb_lists.dm @@ -104,7 +104,6 @@ var/list/admin_verbs_admin = list( /client/proc/toggle_attack_logs, /datum/admins/proc/paralyze_mob, /client/proc/fixatmos, - /datum/admins/proc/quick_nif, //VOREStation Add, /datum/admins/proc/sendFax, /client/proc/despawn_player, /datum/admins/proc/view_feedback @@ -139,7 +138,6 @@ var/list/admin_verbs_fun = list( /datum/admins/proc/call_supply_drop, /datum/admins/proc/call_drop_pod, /client/proc/smite, - /client/proc/smite_vr, //VOREStation Add, /client/proc/admin_lightning_strike, ) @@ -150,7 +148,6 @@ var/list/admin_verbs_spawn = list( /datum/admins/proc/spawn_plant, /datum/admins/proc/spawn_atom, //allows us to spawn instances, /client/proc/respawn_character, - /client/proc/spawn_character_mob, //VOREStation Add, /client/proc/virus2_editor, /client/proc/spawn_chemdisp_cartridge, /client/proc/map_template_load, @@ -181,6 +178,7 @@ var/list/admin_verbs_server = list( /datum/admins/proc/toggle_space_ninja, /client/proc/toggle_random_events, /client/proc/check_customitem_activity, + /client/proc/nanomapgen_DumpImage, /client/proc/modify_server_news, /client/proc/recipe_dump, /client/proc/panicbunker, @@ -228,7 +226,7 @@ var/list/admin_verbs_debug = list( /client/proc/toggle_debug_logs, /client/proc/admin_ghost, //allows us to ghost/reenter body at will, /datum/admins/proc/view_runtimes, - // /client/proc/show_gm_status, // VOREStation Edit - We don't use SSgame_master yet. + /client/proc/show_gm_status, /datum/admins/proc/change_weather, /datum/admins/proc/change_time, /client/proc/admin_give_modifier, @@ -403,7 +401,7 @@ var/list/admin_verbs_event_manager = list( /client/proc/callproc, /client/proc/callproc_datum, /client/proc/debug_controller, - // /client/proc/show_gm_status, // VOREStation Edit - We don't use SSgame_master yet. + /client/proc/show_gm_status, /datum/admins/proc/change_weather, /datum/admins/proc/change_time, /client/proc/admin_give_modifier, diff --git a/code/modules/admin/admin_verb_lists_vr.dm b/code/modules/admin/admin_verb_lists_vr.dm new file mode 100644 index 00000000000..b024211d2cc --- /dev/null +++ b/code/modules/admin/admin_verb_lists_vr.dm @@ -0,0 +1,575 @@ +//admin verb groups - They can overlap if you so wish. Only one of each verb will exist in the verbs list regardless +var/list/admin_verbs_default = list( +// /datum/admins/proc/show_player_panel, //shows an interface for individual players, with various links (links require additional flags, //VOREStation Remove, +// /client/proc/player_panel_new, //shows an interface for all players, with links to various panels, //VOREStation Remove, +// /client/proc/player_panel, //VOREStation Remove, + /client/proc/deadmin_self, //destroys our own admin datum so we can play as a regular player, + /client/proc/cmd_admin_say, //VOREStation Add, + /client/proc/cmd_mod_say, //VOREStation Add, + /client/proc/cmd_event_say, //VOREStation Add, +// /client/proc/hide_verbs, //hides all our adminverbs, //VOREStation Remove, +// /client/proc/hide_most_verbs, //hides all our hideable adminverbs, //VOREStation Remove, +// /client/proc/debug_variables, //allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify, //VOREStation Remove, +// /client/proc/mark_datum_mapview, //VOREStation Remove, +// /client/proc/cmd_check_new_players, //allows us to see every new player, //VOREStation Remove, +// /client/proc/check_antagonists, //shows all antags, +// /client/proc/cmd_mod_say, +// /client/proc/deadchat //toggles deadchat on/off, +// /client/proc/toggle_ahelp_sound, + ) + +var/list/admin_verbs_admin = list( + /datum/admins/proc/set_tcrystals, + /datum/admins/proc/add_tcrystals, + /client/proc/invisimin, //allows our mob to go invisible/visible, + /datum/admins/proc/show_traitor_panel, //interface which shows a mob's mind., + /datum/admins/proc/show_game_mode, //Configuration window for the current game mode., + /datum/admins/proc/force_mode_latespawn, //Force the mode to try a latespawn proc, + /datum/admins/proc/force_antag_latespawn, //Force a specific template to try a latespawn proc, + /datum/admins/proc/toggleenter, //toggles whether people can join the current game, + /datum/admins/proc/toggleguests, //toggles whether guests can join the current game, + /datum/admins/proc/announce, //priority announce something to all clients., + /datum/admins/proc/intercom, //send a fake intercom message, like an arrivals announcement, + /datum/admins/proc/intercom_convo, //send a fake intercom conversation, like an ATC exchange, + /client/proc/colorooc, //allows us to set a custom colour for everythign we say in ooc, + /client/proc/admin_ghost, //allows us to ghost/reenter body at will, + /datum/admins/proc/show_player_panel, //shows an interface for individual players, with various links (links require additional flags, //VOREStation Add, + /client/proc/player_panel_new, //shows an interface for all players, with links to various panels, //VOREStation Add, + /client/proc/player_panel, //VOREStation Add, + /client/proc/hide_verbs, //hides all our adminverbs, //VOREStation Add, + /client/proc/hide_most_verbs, //hides all our hideable adminverbs, //VOREStation Add, + /client/proc/debug_variables, //allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify, //VOREStation Add, + /client/proc/mark_datum_mapview, //VOREStation Add, + /client/proc/cmd_check_new_players, //allows us to see every new player, //VOREStation Add, + /client/proc/toggle_view_range, //changes how far we can see, + /datum/admins/proc/view_txt_log, //shows the server log (diary) for today, + /datum/admins/proc/view_atk_log, //shows the server combat-log, doesn't do anything presently, + /client/proc/cmd_admin_pm_context, //right-click adminPM interface, + /client/proc/cmd_admin_pm_panel, //admin-pm list, + /client/proc/cmd_admin_subtle_message, //send an message to somebody as a 'voice in their head', + /client/proc/cmd_admin_delete, //delete an instance/object/mob/etc, + /client/proc/cmd_admin_check_contents, //displays the contents of an instance, + /client/proc/cmd_admin_check_player_logs, //checks a player's attack logs, + /client/proc/cmd_admin_check_dialogue_logs, //checks a player's dialogue logs, + /datum/admins/proc/access_news_network, //allows access of newscasters, + /client/proc/giveruntimelog, //allows us to give access to runtime logs to somebody, + /client/proc/getserverlog, //allows us to fetch server logs (diary) for other days, + /client/proc/jumptocoord, //we ghost and jump to a coordinate, + /client/proc/Getmob, //teleports a mob to our location, + /client/proc/Getkey, //teleports a mob with a certain ckey to our location, +// /client/proc/sendmob, //sends a mob somewhere, -Removed due to it needing two sorting procs to work, which were executed every time an admin right-clicked. ~Errorage, + /client/proc/Jump, + /client/proc/jumptokey, //allows us to jump to the location of a mob with a certain ckey, + /client/proc/jumptomob, //allows us to jump to a specific mob, + /client/proc/jumptoturf, //allows us to jump to a specific turf, + /client/proc/admin_call_shuttle, //allows us to call the emergency shuttle, + /client/proc/admin_cancel_shuttle, //allows us to cancel the emergency shuttle, sending it back to CentCom, + /client/proc/cmd_admin_direct_narrate, //send text directly to a player with no padding. Useful for narratives and fluff-text, + /client/proc/cmd_admin_world_narrate, //sends text to all players with no padding, + /client/proc/cmd_admin_z_narrate, //VOREStation Add, + /client/proc/cmd_admin_create_centcom_report, + /client/proc/check_words, //displays cult-words, + /client/proc/check_ai_laws, //shows AI and borg laws, + /client/proc/rename_silicon, //properly renames silicons, + /client/proc/manage_silicon_laws, // Allows viewing and editing silicon laws. , + /client/proc/check_antagonists, + /client/proc/admin_memo, //admin memo system. show/delete/write. +SERVER needed to delete admin memos of others, + /client/proc/dsay, //talk in deadchat using our ckey/fakekey, +// /client/proc/toggle_hear_deadcast, //toggles whether we hear deadchat, + /client/proc/investigate_show, //various admintools for investigation. Such as a singulo grief-log, + /client/proc/secrets, + /datum/admins/proc/toggleooc, //toggles ooc on/off for everyone, + /datum/admins/proc/togglelooc, //toggles looc on/off for everyone, + /datum/admins/proc/toggleoocdead, //toggles ooc on/off for everyone who is dead, + /datum/admins/proc/togglehubvisibility, //toggles visibility on the BYOND Hub., + /datum/admins/proc/toggledsay, //toggles dsay on/off for everyone, + /client/proc/game_panel, //game panel, allows to change game-mode etc, + /client/proc/cmd_admin_say, //admin-only ooc chat, + /client/proc/cmd_mod_say, + /client/proc/cmd_event_say, + /datum/admins/proc/PlayerNotes, + /datum/admins/proc/show_player_info, + /client/proc/free_slot, //frees slot for chosen job, + /client/proc/cmd_admin_change_custom_event, + /client/proc/cmd_admin_rejuvenate, + /client/proc/toggleghostwriters, + /client/proc/toggledrones, + /datum/admins/proc/show_skills, + /client/proc/check_customitem_activity, + /client/proc/man_up, + /client/proc/global_man_up, + /client/proc/response_team, // Response Teams admin verb, + /client/proc/trader_ship, // Trader ship admin verb, + /client/proc/toggle_antagHUD_use, + /client/proc/toggle_antagHUD_restrictions, + /client/proc/allow_character_respawn, // Allows a ghost to respawn , + /client/proc/event_manager_panel, + /client/proc/empty_ai_core_toggle_latejoin, + /client/proc/empty_ai_core_toggle_latejoin, + /client/proc/aooc, + /client/proc/change_human_appearance_admin, // Allows an admin to change the basic appearance of human-based mobs , + /client/proc/change_human_appearance_self, // Allows the human-based mob itself change its basic appearance , + /client/proc/change_security_level, + /client/proc/view_chemical_reaction_logs, + /client/proc/makePAI, + /client/proc/toggle_debug_logs, + /client/proc/toggle_attack_logs, + /datum/admins/proc/paralyze_mob, + /client/proc/fixatmos, + /datum/admins/proc/quick_nif, //VOREStation Add, + /datum/admins/proc/set_uplink, //VOREStation Add, + /datum/admins/proc/sendFax, + /client/proc/despawn_player, + /datum/admins/proc/view_feedback + ) + +var/list/admin_verbs_ban = list( + /client/proc/unban_panel, + /client/proc/jobbans + ) + +var/list/admin_verbs_sounds = list( + /client/proc/play_local_sound, + /client/proc/play_sound, + /client/proc/play_server_sound + ) + +var/list/admin_verbs_fun = list( + /client/proc/object_talk, + /datum/admins/proc/cmd_admin_dress, + /client/proc/cmd_admin_gib_self, + /client/proc/drop_bomb, + /client/proc/everyone_random, + /client/proc/cinematic, + /datum/admins/proc/toggle_aliens, + /datum/admins/proc/toggle_space_ninja, + /client/proc/cmd_admin_add_freeform_ai_law, + /client/proc/cmd_admin_add_random_ai_law, + /client/proc/make_sound, + /client/proc/toggle_random_events, + /client/proc/editappear, + /client/proc/roll_dices, + /datum/admins/proc/call_supply_drop, + /datum/admins/proc/call_drop_pod, + /client/proc/smite, + /client/proc/smite_vr, //VOREStation Add, + /client/proc/admin_lightning_strike, + ) + +var/list/admin_verbs_spawn = list( + /datum/admins/proc/spawn_fruit, + /datum/admins/proc/spawn_custom_item, + /datum/admins/proc/check_custom_items, + /datum/admins/proc/spawn_plant, + /datum/admins/proc/spawn_atom, //allows us to spawn instances, + /client/proc/respawn_character, + /client/proc/spawn_character_mob, //VOREStation Add, + /client/proc/virus2_editor, + /client/proc/spawn_chemdisp_cartridge, + /client/proc/map_template_load, + /client/proc/map_template_upload, + /client/proc/map_template_load_on_new_z + ) + +var/list/admin_verbs_server = list( + /datum/admins/proc/capture_map, + /client/proc/Set_Holiday, + /client/proc/ToRban, + /datum/admins/proc/startnow, + /datum/admins/proc/restart, + /datum/admins/proc/delay, + /datum/admins/proc/toggleaban, + /datum/admins/proc/togglepersistence, + /client/proc/cmd_mod_say, + /client/proc/toggle_log_hrefs, + /datum/admins/proc/immreboot, + /client/proc/everyone_random, + /datum/admins/proc/toggleAI, + /client/proc/cmd_admin_delete, //delete an instance/object/mob/etc, + /client/proc/cmd_debug_del_all, + /datum/admins/proc/adrev, + /datum/admins/proc/adspawn, + /datum/admins/proc/adjump, + /datum/admins/proc/toggle_aliens, + /datum/admins/proc/toggle_space_ninja, + /client/proc/toggle_random_events, + /client/proc/check_customitem_activity, + /client/proc/modify_server_news, + /client/proc/recipe_dump, + /client/proc/panicbunker, + /client/proc/paranoia_logging, + /client/proc/ip_reputation + ) + +var/list/admin_verbs_debug = list( + /client/proc/getruntimelog, //allows us to access runtime logs to somebody, + /client/proc/cmd_admin_list_open_jobs, + /client/proc/Debug2, + /client/proc/kill_air, + /client/proc/ZASSettings, + /client/proc/cmd_debug_make_powernets, + /client/proc/kill_airgroup, + /client/proc/debug_controller, + /client/proc/debug_antagonist_template, + /client/proc/cmd_debug_mob_lists, + /client/proc/cmd_debug_using_map, + /client/proc/cmd_admin_delete, + /client/proc/cmd_debug_del_all, + /client/proc/cmd_debug_tog_aliens, + /client/proc/cmd_display_del_log, + /client/proc/cmd_display_init_log, + /client/proc/cmd_display_overlay_log, + /client/proc/air_report, + /client/proc/reload_admins, + /client/proc/reload_eventMs, + /client/proc/restart_controller, + /datum/admins/proc/restart, + /client/proc/print_random_map, + /client/proc/create_random_map, + /client/proc/apply_random_map, + /client/proc/overlay_random_map, + /client/proc/delete_random_map, + /client/proc/show_plant_genes, + /client/proc/enable_debug_verbs, + /client/proc/callproc, + /client/proc/callproc_datum, + /client/proc/SDQL2_query, + /client/proc/Jump, + /client/proc/jumptomob, + /client/proc/jumptocoord, + /client/proc/dsay, + /client/proc/toggle_debug_logs, + /client/proc/admin_ghost, //allows us to ghost/reenter body at will, + /datum/admins/proc/show_player_panel, //shows an interface for individual players, with various links (links require additional flags, //VOREStation Add, + /client/proc/player_panel_new, //shows an interface for all players, with links to various panels, //VOREStation Add, + /client/proc/player_panel, //VOREStation Add, + /client/proc/hide_verbs, //hides all our adminverbs, //VOREStation Add, + /client/proc/hide_most_verbs, //hides all our hideable adminverbs, //VOREStation Add, + /client/proc/debug_variables, //allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify, //VOREStation Add, + /client/proc/mark_datum_mapview, //VOREStation Add, + /client/proc/cmd_check_new_players, //allows us to see every new player, //VOREStation Add, + /datum/admins/proc/view_runtimes, + // /client/proc/show_gm_status, // VOREStation Edit - We don't use SSgame_master yet. + /datum/admins/proc/set_uplink, //VOREStation Add, + /datum/admins/proc/change_weather, + /datum/admins/proc/change_time, + /client/proc/admin_give_modifier, + /client/proc/simple_DPS, + /datum/admins/proc/view_feedback + ) + +var/list/admin_verbs_paranoid_debug = list( + /client/proc/callproc, + /client/proc/callproc_datum, + /client/proc/debug_controller + ) + +var/list/admin_verbs_possess = list( + /proc/possess, + /proc/release + ) +var/list/admin_verbs_permissions = list( + /client/proc/edit_admin_permissions + ) +var/list/admin_verbs_rejuv = list( + /client/proc/respawn_character + ) + +//verbs which can be hidden - needs work +var/list/admin_verbs_hideable = list( + /client/proc/deadmin_self, +// /client/proc/deadchat, + /datum/admins/proc/show_traitor_panel, + /datum/admins/proc/toggleenter, + /datum/admins/proc/toggleguests, + /datum/admins/proc/announce, + /client/proc/colorooc, + /client/proc/admin_ghost, + /client/proc/toggle_view_range, + /datum/admins/proc/view_txt_log, + /datum/admins/proc/view_atk_log, + /client/proc/cmd_admin_subtle_message, + /client/proc/cmd_admin_check_contents, + /client/proc/cmd_admin_check_player_logs, + /client/proc/cmd_admin_check_dialogue_logs, + /datum/admins/proc/access_news_network, + /client/proc/admin_call_shuttle, + /client/proc/admin_cancel_shuttle, + /client/proc/cmd_admin_direct_narrate, + /client/proc/cmd_admin_world_narrate, + /client/proc/cmd_admin_z_narrate, //VOREStation Add, + /client/proc/check_words, + /client/proc/play_local_sound, + /client/proc/play_sound, + /client/proc/play_server_sound, + /client/proc/object_talk, + /datum/admins/proc/cmd_admin_dress, + /client/proc/cmd_admin_gib_self, + /client/proc/drop_bomb, + /client/proc/cinematic, + /datum/admins/proc/toggle_aliens, + /datum/admins/proc/toggle_space_ninja, + /client/proc/cmd_admin_add_freeform_ai_law, + /client/proc/cmd_admin_add_random_ai_law, + /client/proc/cmd_admin_create_centcom_report, + /client/proc/make_sound, + /client/proc/toggle_random_events, + /client/proc/cmd_admin_add_random_ai_law, + /client/proc/Set_Holiday, + /client/proc/ToRban, + /datum/admins/proc/startnow, + /datum/admins/proc/restart, + /datum/admins/proc/delay, + /datum/admins/proc/toggleaban, + /client/proc/toggle_log_hrefs, + /datum/admins/proc/immreboot, + /client/proc/everyone_random, + /datum/admins/proc/toggleAI, + /datum/admins/proc/adrev, + /datum/admins/proc/adspawn, + /datum/admins/proc/adjump, + /client/proc/restart_controller, + /client/proc/cmd_admin_list_open_jobs, + /client/proc/callproc, + /client/proc/callproc_datum, + /client/proc/Debug2, + /client/proc/reload_admins, + /client/proc/kill_air, + /client/proc/cmd_debug_make_powernets, + /client/proc/kill_airgroup, + /client/proc/debug_controller, + /client/proc/startSinglo, + /client/proc/simple_DPS, + /client/proc/cmd_debug_mob_lists, + /client/proc/cmd_debug_using_map, + /client/proc/cmd_debug_del_all, + /client/proc/cmd_debug_tog_aliens, + /client/proc/cmd_display_del_log, + /client/proc/air_report, + /client/proc/enable_debug_verbs, + /client/proc/roll_dices, + /proc/possess, + /proc/release, + /datum/admins/proc/set_uplink, //VOREStation Add, + /datum/admins/proc/set_tcrystals + ) +var/list/admin_verbs_mod = list( + /client/proc/cmd_admin_pm_context, //right-click adminPM interface, + /client/proc/cmd_admin_pm_panel, //admin-pm list, + /client/proc/debug_variables, //allows us to -see- the variables of any instance in the game., + /datum/admins/proc/PlayerNotes, + /client/proc/admin_ghost, //allows us to ghost/reenter body at will, + /datum/admins/proc/show_player_panel, //shows an interface for individual players, with various links (links require additional flags, //VOREStation Add, + /client/proc/player_panel_new, //shows an interface for all players, with links to various panels, //VOREStation Add, + /client/proc/player_panel, //VOREStation Add, + /client/proc/hide_verbs, //hides all our adminverbs, //VOREStation Add, + /client/proc/hide_most_verbs, //hides all our hideable adminverbs, //VOREStation Add, + /client/proc/debug_variables, //allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify, //VOREStation Add, + /client/proc/mark_datum_mapview, //VOREStation Add, + /client/proc/cmd_check_new_players, //allows us to see every new player, //VOREStation Add, + /client/proc/cmd_mod_say, + /client/proc/cmd_event_say, + /datum/admins/proc/show_player_info, + /datum/admins/proc/show_traitor_panel, + /client/proc/colorooc, + /client/proc/player_panel_new, + /client/proc/dsay, + /datum/admins/proc/show_skills, + /datum/admins/proc/show_player_panel, + /client/proc/check_antagonists, + /client/proc/aooc, + /client/proc/jobbans, + /client/proc/toggle_attack_logs, + /client/proc/cmd_admin_subtle_message, //send an message to somebody as a 'voice in their head', + /datum/admins/proc/paralyze_mob, + /client/proc/cmd_admin_direct_narrate, + /client/proc/cmd_admin_z_narrate, //VOREStation Add, + /client/proc/allow_character_respawn, // Allows a ghost to respawn , + /datum/admins/proc/sendFax, + /client/proc/getserverlog, //allows us to fetch server logs (diary) for other days, + /datum/admins/proc/view_persistent_data, + /datum/admins/proc/view_txt_log, //shows the server log (diary) for today, + /datum/admins/proc/view_atk_log //shows the server combat-log, doesn't do anything presently, +) + +var/list/admin_verbs_event_manager = list( + /client/proc/cmd_event_say, + /client/proc/cmd_admin_pm_context, + /client/proc/cmd_admin_pm_panel, + /client/proc/admin_ghost, + /datum/admins/proc/show_player_panel, //shows an interface for individual players, with various links (links require additional flags, //VOREStation Add, + /client/proc/player_panel_new, //shows an interface for all players, with links to various panels, //VOREStation Add, + /client/proc/player_panel, //VOREStation Add, + /client/proc/hide_verbs, //hides all our adminverbs, //VOREStation Add, + /client/proc/hide_most_verbs, //hides all our hideable adminverbs, //VOREStation Add, + /client/proc/debug_variables, //allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify, //VOREStation Add, + /client/proc/mark_datum_mapview, //VOREStation Add, + /client/proc/cmd_check_new_players, //allows us to see every new player, //VOREStation Add, + /datum/admins/proc/show_player_info, + /client/proc/dsay, + /client/proc/cmd_admin_subtle_message, + /client/proc/debug_variables, + /client/proc/check_antagonists, + /client/proc/aooc, + /datum/admins/proc/paralyze_mob, + /client/proc/cmd_admin_direct_narrate, + /client/proc/cmd_admin_z_narrate, //VOREStation Add, + /client/proc/allow_character_respawn, + /datum/admins/proc/sendFax, + /client/proc/respawn_character, + /proc/possess, + /proc/release, + /datum/admins/proc/change_weather, + /datum/admins/proc/change_time, + /client/proc/admin_give_modifier, + /client/proc/Jump, + /client/proc/jumptomob, + /client/proc/jumptocoord, + /client/proc/cmd_admin_delete, + /datum/admins/proc/delay, + /client/proc/Set_Holiday, + /client/proc/make_sound, + /client/proc/toggle_random_events, + /datum/admins/proc/cmd_admin_dress, + /client/proc/cmd_admin_gib_self, + /client/proc/drop_bomb, + /client/proc/cmd_admin_add_freeform_ai_law, + /client/proc/cmd_admin_add_random_ai_law, + /client/proc/make_sound, + /client/proc/toggle_random_events, + /client/proc/editappear, + /client/proc/roll_dices, + /datum/admins/proc/call_supply_drop, + /datum/admins/proc/call_drop_pod, + /datum/admins/proc/PlayerNotes, + /client/proc/callproc, + /client/proc/callproc_datum, + /client/proc/debug_controller, + // /client/proc/show_gm_status, // VOREStation Edit - We don't use SSgame_master yet. + /datum/admins/proc/change_weather, + /datum/admins/proc/change_time, + /client/proc/admin_give_modifier, + /datum/admins/proc/cmd_admin_dress, + /client/proc/cmd_admin_gib_self, + /datum/admins/proc/set_tcrystals, + /datum/admins/proc/add_tcrystals, + /client/proc/invisimin, //allows our mob to go invisible/visible, + /datum/admins/proc/show_traitor_panel, //interface which shows a mob's mind., + /datum/admins/proc/show_game_mode, //Configuration window for the current game mode., + /datum/admins/proc/force_mode_latespawn, //Force the mode to try a latespawn proc, + /datum/admins/proc/force_antag_latespawn, //Force a specific template to try a latespawn proc, + /datum/admins/proc/announce, //priority announce something to all clients., + /datum/admins/proc/intercom, //send a fake intercom message, like an arrivals announcement, + /datum/admins/proc/intercom_convo, //send a fake intercom conversation, like an ATC exchange, + /client/proc/colorooc, //allows us to set a custom colour for everythign we say in ooc, + /client/proc/admin_ghost, //allows us to ghost/reenter body at will, + /client/proc/toggle_view_range, //changes how far we can see, + /client/proc/cmd_admin_pm_context, //right-click adminPM interface, + /client/proc/cmd_admin_pm_panel, //admin-pm list, + /client/proc/cmd_admin_subtle_message, //send an message to somebody as a 'voice in their head', + /client/proc/cmd_admin_delete, //delete an instance/object/mob/etc, + /client/proc/cmd_admin_check_contents, //displays the contents of an instance, + /client/proc/cmd_admin_check_player_logs, //checks a player's attack logs, + /client/proc/cmd_admin_check_dialogue_logs, //checks a player's dialogue logs, + /datum/admins/proc/access_news_network, //allows access of newscasters, + /client/proc/jumptocoord, //we ghost and jump to a coordinate, + /client/proc/Getmob, //teleports a mob to our location, + /client/proc/Getkey, //teleports a mob with a certain ckey to our location, + /client/proc/Jump, + /client/proc/jumptokey, //allows us to jump to the location of a mob with a certain ckey, + /client/proc/jumptomob, //allows us to jump to a specific mob, + /client/proc/jumptoturf, //allows us to jump to a specific turf, + /client/proc/admin_call_shuttle, //allows us to call the emergency shuttle, + /client/proc/admin_cancel_shuttle, //allows us to cancel the emergency shuttle, sending it back to CentCom, + /client/proc/cmd_admin_direct_narrate, //send text directly to a player with no padding. Useful for narratives and fluff-text, + /client/proc/cmd_admin_world_narrate, //sends text to all players with no padding, + /client/proc/cmd_admin_z_narrate, //VOREStation Add, + /client/proc/cmd_admin_create_centcom_report, + /client/proc/check_words, //displays cult-words, + /client/proc/check_ai_laws, //shows AI and borg laws, + /client/proc/rename_silicon, //properly renames silicons, + /client/proc/manage_silicon_laws, // Allows viewing and editing silicon laws. , + /client/proc/check_antagonists, + /client/proc/admin_memo, //admin memo system. show/delete/write. +SERVER needed to delete admin memos of others, + /client/proc/dsay, //talk in deadchat using our ckey/fakekey, + /client/proc/secrets, + /client/proc/game_panel, //game panel, allows to change game-mode etc, + /client/proc/cmd_mod_say, + /client/proc/cmd_event_say, + /datum/admins/proc/show_player_info, + /client/proc/free_slot, //frees slot for chosen job, + /client/proc/cmd_admin_change_custom_event, + /client/proc/cmd_admin_rejuvenate, + /client/proc/toggleghostwriters, + /datum/admins/proc/show_skills, + /client/proc/man_up, + /client/proc/global_man_up, + /client/proc/response_team, // Response Teams admin verb, + /client/proc/trader_ship, // Trader ship admin verb, + /client/proc/allow_character_respawn, // Allows a ghost to respawn , + /client/proc/event_manager_panel, + /client/proc/aooc, + /client/proc/change_human_appearance_admin, // Allows an admin to change the basic appearance of human-based mobs , + /client/proc/change_human_appearance_self, // Allows the human-based mob itself change its basic appearance , + /client/proc/change_security_level, + /client/proc/makePAI, + /client/proc/toggle_debug_logs, + /client/proc/toggle_attack_logs, + /datum/admins/proc/paralyze_mob, + /client/proc/fixatmos, + /datum/admins/proc/sendFax, + /client/proc/despawn_player, + /datum/admins/proc/view_feedback, + /datum/admins/proc/capture_map, + /client/proc/Set_Holiday, + /datum/admins/proc/startnow, + /datum/admins/proc/restart, + /datum/admins/proc/delay, + /client/proc/cmd_mod_say, + /datum/admins/proc/immreboot, + /client/proc/everyone_random, + /client/proc/cmd_admin_delete, //delete an instance/object/mob/etc, + /client/proc/cmd_debug_del_all, + /client/proc/toggle_random_events, + /client/proc/modify_server_news + +) + +/client/proc/add_admin_verbs() + if(holder) + verbs += admin_verbs_default + if(holder.rights & R_BUILDMODE) verbs += /client/proc/togglebuildmodeself + if(holder.rights & R_ADMIN) verbs += admin_verbs_admin + if(holder.rights & R_BAN) verbs += admin_verbs_ban + if(holder.rights & R_FUN) verbs += admin_verbs_fun + if(holder.rights & R_SERVER) verbs += admin_verbs_server + if(holder.rights & R_DEBUG) + verbs += admin_verbs_debug + if(config.debugparanoid && !(holder.rights & R_ADMIN)) + verbs.Remove(admin_verbs_paranoid_debug) //Right now it's just callproc but we can easily add others later on. + if(holder.rights & R_POSSESS) verbs += admin_verbs_possess + if(holder.rights & R_PERMISSIONS) verbs += admin_verbs_permissions + if(holder.rights & R_STEALTH) verbs += /client/proc/stealth + if(holder.rights & R_REJUVINATE) verbs += admin_verbs_rejuv + if(holder.rights & R_SOUNDS) verbs += admin_verbs_sounds + if(holder.rights & R_SPAWN) verbs += admin_verbs_spawn + if(holder.rights & R_MOD) verbs += admin_verbs_mod + if(holder.rights & R_EVENT) verbs += admin_verbs_event_manager + +/client/proc/remove_admin_verbs() + verbs.Remove( + admin_verbs_default, + /client/proc/togglebuildmodeself, + admin_verbs_admin, + admin_verbs_ban, + admin_verbs_fun, + admin_verbs_server, + admin_verbs_debug, + admin_verbs_possess, + admin_verbs_permissions, + /client/proc/stealth, + admin_verbs_rejuv, + admin_verbs_sounds, + admin_verbs_spawn, + debug_verbs + ) diff --git a/code/modules/admin/admin_vr.dm b/code/modules/admin/admin_vr.dm new file mode 100644 index 00000000000..356d69a3761 --- /dev/null +++ b/code/modules/admin/admin_vr.dm @@ -0,0 +1,12 @@ +/datum/admins/proc/set_uplink(mob/living/carbon/human/H as mob) + set category = "Debug" + set name = "Set Uplink" + set desc = "Allows admins to set up an uplink on a character. This will be required for a character to use telecrystals." + set popup_menu = FALSE + + if(check_rights(R_ADMIN|R_DEBUG)) + traitors.spawn_uplink(H) + H.mind.tcrystals = DEFAULT_TELECRYSTAL_AMOUNT + H.mind.accept_tcrystals = 1 + else + to_chat(usr, "You do not have access to this command.") \ No newline at end of file diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index ba75d453175..b9332751b56 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -11,9 +11,9 @@ log_adminsay(msg,src) - //VOREStation Edit Start - Adds R_EVENT + //VOREStation Edit Start - Adds R_STEALTH for(var/client/C in GLOB.admins) - if(check_rights(R_ADMIN|R_EVENT)) + if(check_rights(R_ADMIN|R_STEALTH)) to_chat(C, "" + create_text_tag("admin", "ADMIN:", C) + " [key_name(usr, 1)]([admin_jump_link(mob, src)]): [msg]") //VOREStation Edit End @@ -24,7 +24,7 @@ set name = "Msay" set hidden = 1 - if(!check_rights(R_ADMIN|R_MOD|R_SERVER|R_EVENT)) //VOREStation Edit + if(!check_rights(R_ADMIN|R_MOD|R_SERVER|R_STEALTH)) //VOREStation Edit return msg = sanitize(msg) @@ -47,7 +47,7 @@ set name = "Esay" set hidden = 1 - if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_SERVER|R_EVENT)) + if(!check_rights(R_ADMIN|R_MOD|R_EVENT|R_SERVER|R_STEALTH)) //VOREStation Edit return msg = sanitize(msg) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 2898145795b..58e982822b1 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -515,6 +515,12 @@ Traitors and the like can also be revived with the previous role mostly intact. if(new_character.mind) new_character.mind.loaded_from_ckey = picked_ckey new_character.mind.loaded_from_slot = picked_slot + + for(var/lang in picked_client.prefs.alternate_languages) + var/datum/language/chosen_language = GLOB.all_languages[lang] + if(chosen_language) + if(is_lang_whitelisted(src,chosen_language) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs))) + new_character.add_language(lang) //VOREStation Add End //If desired, apply equipment. diff --git a/code/modules/admin/verbs/randomverbs_vr.dm b/code/modules/admin/verbs/randomverbs_vr.dm index dbf38882d95..d4fa30c8243 100644 --- a/code/modules/admin/verbs/randomverbs_vr.dm +++ b/code/modules/admin/verbs/randomverbs_vr.dm @@ -71,4 +71,29 @@ feedback_add_details("admin_verb","SCAM") //heh - return new_mob \ No newline at end of file + return new_mob + +/client/proc/cmd_admin_z_narrate() // Allows administrators to fluff events a little easier -- TLE + set category = "Special Verbs" + set name = "Z Narrate" + set desc = "Narrates to your Z level." + + if (!holder) + return + + var/msg = input("Message:", text("Enter the text you wish to appear to everyone:")) as text + if(!(msg[1] == "<" && msg[length(msg)] == ">")) //You can use HTML but only if the whole thing is HTML. Tries to prevent admin 'accidents'. + msg = sanitize(msg) + + if (!msg) + return + + var/pos_z = get_z(src.mob) + if (!pos_z) + return + for(var/mob/M in player_list) + if(M.z == pos_z) + to_chat(M, msg) + log_admin("ZNarrate: [key_name(usr)] : [msg]") + message_admins(" ZNarrate: [key_name_admin(usr)] : [msg]
", 1) + feedback_add_details("admin_verb","GLNA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 115ecaa54d6..6aa06ef4ec2 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -23,7 +23,11 @@ var/corpseidjob = null // Needs to be in quotes, such as "Clown" or "Chef." This just determines what the ID reads as, not their access var/corpseidaccess = null //This is for access. See access.dm for which jobs give what access. Again, put in quotes. Use "Captain" if you want it to be all access. var/corpseidicon = null //For setting it to be a gold, silver, CentCom etc ID - var/species = SPECIES_HUMAN + var/species = SPECIES_HUMAN //defaults to generic-ass humans + var/random_species = FALSE //flip to TRUE to randomize species from the list below + var/list/random_species_list = list(SPECIES_HUMAN,SPECIES_TAJ,SPECIES_UNATHI,SPECIES_SKRELL) //preset list that can be overriden downstream. only includes common humanoids for voidsuit compatibility's sake. +// var/random_appearance = FALSE //TODO: make this work +// var/cause_of_death = null //TODO: set up a cause-of-death system. needs to support both damage types and actual wound types, so a body can have been bitten/stabbed/clawed/shot/burned/lasered/etc. to death delete_me = TRUE /obj/effect/landmark/corpse/Initialize() @@ -33,13 +37,20 @@ /obj/effect/landmark/corpse/proc/createCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it. var/mob/living/carbon/human/M = new /mob/living/carbon/human (src.loc) - M.set_species(species) + if(random_species) + var/random_pick = pick(random_species_list) + M.set_species(random_pick) + src.species = random_pick + else + M.set_species(species) + //TODO: insert appearance randomization, needs to be species-based M.real_name = src.name M.death(1) //Kills the new mob + //TODO: insert cause of death handling/wound simulation here if(src.corpseuniform) M.equip_to_slot_or_del(new src.corpseuniform(M), slot_w_uniform) if(src.corpsesuit) - M.equip_to_slot_or_del(new src.corpsesuit(M), slot_wear_suit) + M.equip_voidsuit_to_slot_or_del_with_refit(new src.corpsesuit(M), slot_wear_suit, src.species) if(src.corpseshoes) M.equip_to_slot_or_del(new src.corpseshoes(M), slot_shoes) if(src.corpsegloves) @@ -51,7 +62,7 @@ if(src.corpsemask) M.equip_to_slot_or_del(new src.corpsemask(M), slot_wear_mask) if(src.corpsehelmet) - M.equip_to_slot_or_del(new src.corpsehelmet(M), slot_head) + M.equip_voidhelm_to_slot_or_del_with_refit(new src.corpsehelmet(M), slot_head, src.species) if(src.corpsebelt) M.equip_to_slot_or_del(new src.corpsebelt(M), slot_belt) if(src.corpsepocket1) @@ -84,10 +95,6 @@ // I'll work on making a list of corpses people request for maps, or that I think will be commonly used. Syndicate operatives for example. - - - - /obj/effect/landmark/corpse/syndicatesoldier name = "Mercenary" corpseuniform = /obj/item/clothing/under/syndicate @@ -102,8 +109,6 @@ corpseidjob = "Operative" corpseidaccess = "Syndicate" - - /obj/effect/landmark/corpse/syndicatecommando name = "Syndicate Commando" corpseuniform = /obj/item/clothing/under/syndicate @@ -119,10 +124,14 @@ corpseidjob = "Operative" corpseidaccess = "Syndicate" - - ///////////Civilians////////////////////// +/obj/effect/landmark/corpse/random_civ + name = "Civilian" + corpseuniform = /obj/item/clothing/under/color/grey + corpseshoes = /obj/item/clothing/shoes/black + random_species = TRUE + /obj/effect/landmark/corpse/chef name = "Chef" corpseuniform = /obj/item/clothing/under/rank/chef @@ -165,6 +174,7 @@ corpsesuit = /obj/item/clothing/suit/space/void/engineering corpsemask = /obj/item/clothing/mask/breath corpsehelmet = /obj/item/clothing/head/helmet/space/void/engineering + corpseback = /obj/item/weapon/tank/oxygen /obj/effect/landmark/corpse/clown name = "Clown" @@ -188,6 +198,39 @@ corpseid = 1 corpseidjob = "Scientist" corpseidaccess = "Scientist" + +/obj/effect/landmark/corpse/security + name = "Security Officer" + corpseradio = /obj/item/device/radio/headset/headset_sec + corpseuniform = /obj/item/clothing/under/rank/security + corpsesuit = /obj/item/clothing/suit/armor/vest + corpseback = /obj/item/weapon/storage/backpack/security + corpseshoes = /obj/item/clothing/shoes/boots/jackboots + corpseglasses = /obj/item/clothing/glasses/sunglasses/sechud + corpsegloves = /obj/item/clothing/gloves/black + corpsehelmet = /obj/item/clothing/head/helmet + corpseid = 1 + corpseidjob = "Security Officer" + corpseidaccess = "Security Officer" + +/obj/effect/landmark/corpse/security/rig + corpsesuit = /obj/item/clothing/suit/space/void/security + corpsemask = /obj/item/clothing/mask/breath + corpsehelmet = /obj/item/clothing/head/helmet/space/void/security + corpseback = /obj/item/weapon/tank/jetpack/oxygen + +/obj/effect/landmark/corpse/security/rig/eva + corpsesuit = /obj/item/clothing/suit/space/void/security/alt + corpsehelmet = /obj/item/clothing/head/helmet/space/void/security/alt + corpseidjob = "Starship Security Officer" + +/obj/effect/landmark/corpse/prisoner + name = "Unknown Prisoner" + corpseuniform = /obj/item/clothing/under/color/prison + corpseshoes = /obj/item/clothing/shoes/orange + corpseid = 1 + corpseidjob = "Prisoner" + random_species = TRUE /obj/effect/landmark/corpse/miner corpseradio = /obj/item/device/radio/headset/headset_cargo @@ -203,7 +246,69 @@ corpsesuit = /obj/item/clothing/suit/space/void/mining corpsemask = /obj/item/clothing/mask/breath corpsehelmet = /obj/item/clothing/head/helmet/space/void/mining + corpseback = /obj/item/weapon/tank/oxygen + +/////////////////Vintage////////////////////// +//define the basic props at this level and only change specifics for variants, e.z. +/obj/effect/landmark/corpse/vintage + name = "Unknown Crewmate" + corpseuniform = /obj/item/clothing/under/utility + corpsesuit = /obj/item/clothing/suit/space/void/refurb + corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb + corpsemask = /obj/item/clothing/mask/breath + corpseback = /obj/item/weapon/tank/oxygen + corpseid = 1 + corpseidjob = "Crewmate" + +/obj/effect/landmark/corpse/vintage/engineering + name = "Unknown Engineer" + corpsesuit = /obj/item/clothing/suit/space/void/refurb/engineering + corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/engineering + corpsebelt = /obj/item/weapon/storage/belt/utility/full + corpseback = /obj/item/weapon/tank/oxygen/yellow + corpseidjob = "Engineer" + +/obj/effect/landmark/corpse/vintage/marine + name = "Unknown Marine" + corpsesuit = /obj/item/clothing/suit/space/void/refurb/marine + corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/marine + corpsebelt = /obj/item/weapon/storage/belt/security/tactical + corpseidjob = "Marine" + +/obj/effect/landmark/corpse/vintage/medical + name = "Unknown Medic" + corpsesuit = /obj/item/clothing/suit/space/void/refurb/medical + corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/medical + corpsebelt = /obj/item/weapon/storage/belt/medical + corpseidjob = "Medic" + +/obj/effect/landmark/corpse/vintage/mercenary + name = "Unknown Mercenary" + corpsesuit = /obj/item/clothing/suit/space/void/refurb/mercenary + corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/mercenary + corpsebelt = /obj/item/weapon/storage/belt/security/tactical + corpseback = /obj/item/weapon/tank/oxygen/red + corpseidjob = "Mercenary" + +/obj/effect/landmark/corpse/vintage/officer + name = "Unknown Captain" + corpsesuit = /obj/item/clothing/suit/space/void/refurb/officer + corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/officer + corpseback = /obj/item/weapon/tank/oxygen/yellow + corpseidjob = "Captain" + +/obj/effect/landmark/corpse/vintage/pilot + name = "Unknown Pilot" + corpsesuit = /obj/item/clothing/suit/space/void/refurb/pilot + corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/pilot + corpseidjob = "Pilot" + +/obj/effect/landmark/corpse/vintage/research + name = "Unknown Researcher" + corpsesuit = /obj/item/clothing/suit/space/void/refurb/research + corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/research + corpseidjob = "Researcher" /////////////////Officers////////////////////// diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 987d395992d..daf964e4433 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -133,18 +133,66 @@ obj/machinery/gateway/centerstation/process() M.set_dir(SOUTH) return else - //VOREStation Addition Start: Prevent taurriding abuse + //VOREStation Addition Start: Prevent abuse + if(istype(M, /obj/item/device/uav)) + var/obj/item/device/uav/L = M + L.power_down() if(istype(M, /mob/living)) var/mob/living/L = M if(LAZYLEN(L.buckled_mobs)) var/datum/riding/R = L.riding_datum for(var/rider in L.buckled_mobs) R.force_dismount(rider) - //VOREStation Addition End: Prevent taurriding abuse + //VOREStation Addition End: Prevent abuse var/obj/effect/landmark/dest = pick(awaydestinations) if(dest) M.forceMove(dest.loc) M.set_dir(SOUTH) + //VOREStation Addition Start: Abduction! + if(istype(M, /mob/living) && dest.abductor) + var/mob/living/L = M + //Situations to get the mob out of + if(L.buckled) + L.buckled.unbuckle_mob() + if(istype(L.loc,/obj/mecha)) + var/obj/mecha/ME = L.loc + ME.go_out() + else if(istype(L.loc,/obj/machinery/sleeper)) + var/obj/machinery/sleeper/SL = L.loc + SL.go_out() + else if(istype(L.loc,/obj/machinery/recharge_station)) + var/obj/machinery/recharge_station/RS = L.loc + RS.go_out() + if(!issilicon(L)) //Don't drop borg modules... + var/list/mob_contents = list() //Things which are actually drained as a result of the above not being null. + mob_contents |= L // The recursive check below does not add the object being checked to its list. + mob_contents |= recursive_content_check(L, mob_contents, recursion_limit = 3, client_check = 0, sight_check = 0, include_mobs = 1, include_objects = 1, ignore_show_messages = 1) + for(var/obj/item/weapon/holder/I in mob_contents) + var/obj/item/weapon/holder/H = I + var/mob/living/MI = H.held_mob + MI.forceMove(get_turf(H)) + if(!issilicon(MI)) //Don't drop borg modules... + for(var/obj/item/II in MI) + if(istype(II,/obj/item/weapon/implant) || istype(II,/obj/item/device/nif)) + continue + MI.drop_from_inventory(II, dest.loc) + var/obj/effect/landmark/finaldest = pick(awayabductors) + MI.forceMove(finaldest.loc) + sleep(1) + MI.Paralyse(10) + MI << 'sound/effects/bamf.ogg' + to_chat(MI,"You're starting to come to. You feel like you've been out for a few minutes, at least...") + for(var/obj/item/I in L) + if(istype(I,/obj/item/weapon/implant) || istype(I,/obj/item/device/nif)) + continue + L.drop_from_inventory(I, dest.loc) + var/obj/effect/landmark/finaldest = pick(awayabductors) + L.forceMove(finaldest.loc) + sleep(1) + L.Paralyse(10) + L << 'sound/effects/bamf.ogg' + to_chat(L,"You're starting to come to. You feel like you've been out for a few minutes, at least...") + //VOREStation Addition End return /obj/machinery/gateway/centerstation/attackby(obj/item/device/W as obj, mob/user as mob) diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index 43c1dc4a91b..ee065d41d70 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -63,9 +63,29 @@ proc/createRandomZlevel() . = ..() awaydestinations += src +/obj/effect/landmark/gateway_scatter/abduct + name = "uncalibrated gateway abductor" + abductor = 1 + /obj/effect/landmark/event_scatter - name = "uncalibrated gateway destination" + name = "uncalibrated event destination" /obj/effect/landmark/event_scatter/Initialize() . = ..() eventdestinations += src + +/obj/effect/landmark/event_scatter/abduct + name = "uncalibrated event abductor" + abductor = 1 + +/obj/effect/landmark/gateway_abduct_dest + name = "abductor gateway destination" +/obj/effect/landmark/gateway_abduct_dest/Initialize() + . = ..() + awayabductors += src + +/obj/effect/landmark/event_abduct_dest + name = "abductor event destination" +/obj/effect/landmark/event_abduct_dest/Initialize() + . = ..() + eventabductors += src //VOREStation Add End diff --git a/code/modules/blob2/blobs/base_blob.dm b/code/modules/blob2/blobs/base_blob.dm index 71d4ad72543..f9c9eb588d8 100644 --- a/code/modules/blob2/blobs/base_blob.dm +++ b/code/modules/blob2/blobs/base_blob.dm @@ -22,6 +22,7 @@ GLOBAL_LIST_EMPTY(all_blobs) /obj/structure/blob/Initialize(newloc, new_overmind) if(new_overmind) overmind = new_overmind + faction = overmind.blob_type.faction update_icon() if(!integrity) integrity = max_integrity @@ -47,19 +48,24 @@ GLOBAL_LIST_EMPTY(all_blobs) color = null set_light(0) +/obj/structure/blob/update_transform() + var/matrix/M = matrix() + M.Scale(icon_scale_x, icon_scale_y) + animate(src, transform = M, time = 10) + // Blob tiles are not actually dense so we need Special Code(tm). /obj/structure/blob/CanPass(atom/movable/mover, turf/target) if(istype(mover) && mover.checkpass(PASSBLOB)) return TRUE else if(istype(mover, /mob/living)) var/mob/living/L = mover - if(L.faction == "blob") + if(L.faction == faction) return TRUE else if(istype(mover, /obj/item/projectile)) var/obj/item/projectile/P = mover if(istype(P.firer, /obj/structure/blob)) return TRUE - if(istype(P.firer) && P.firer.faction == "blob") + if(istype(P.firer) && P.firer.faction == faction) return TRUE return FALSE @@ -88,6 +94,7 @@ GLOBAL_LIST_EMPTY(all_blobs) update_icon() pulse_timestamp = world.time + 1 SECOND if(overmind) + faction = overmind.blob_type.faction overmind.blob_type.on_pulse(src) return TRUE //we did it, we were pulsed! return FALSE //oh no we failed @@ -106,6 +113,9 @@ GLOBAL_LIST_EMPTY(all_blobs) for(var/L in blobs_to_affect) var/obj/structure/blob/B = L + if(B.faction != faction) + continue + if(!B.overmind && !istype(B, /obj/structure/blob/core) && prob(30)) B.overmind = pulsing_overmind //reclaim unclaimed, non-core blobs. B.update_icon() @@ -138,7 +148,8 @@ GLOBAL_LIST_EMPTY(all_blobs) var/dirn = pick(dirs) dirs.Remove(dirn) T = get_step(src, dirn) - if(!(locate(/obj/structure/blob) in T)) + var/obj/structure/blob/B = locate(/obj/structure/blob) in T + if(!B || B.faction != faction) // Allow opposing blobs to fight. break else T = null @@ -164,6 +175,7 @@ GLOBAL_LIST_EMPTY(all_blobs) if(make_blob) //well, can we? var/obj/structure/blob/B = new /obj/structure/blob/normal(src.loc) + B.faction = faction if(controller) B.overmind = controller else @@ -340,7 +352,7 @@ GLOBAL_LIST_EMPTY(all_blobs) if(!P) return - if(istype(P.firer) && P.firer.faction == "blob") + if(istype(P.firer) && P.firer.faction == faction) return var/damage = P.get_structure_damage() // So tasers don't hurt the blob. @@ -366,6 +378,31 @@ GLOBAL_LIST_EMPTY(all_blobs) if(overmind) overmind.blob_type.on_water(src, amount) +/obj/structure/blob/blob_act(var/obj/structure/blob/B) + . = ..() + + if(B) + + if(!B.overmind) + return + + if(B.faction != faction) + var/damage = rand(B.overmind.blob_type.damage_lower, B.overmind.blob_type.damage_upper) + var/inc_damage_type = B.overmind.blob_type.damage_type + + if(overmind) + damage = overmind.blob_type.on_received_damage(src, damage, inc_damage_type, B) + + else + faction = B.faction + overmind = B.overmind + update_icon() + return + + adjust_integrity(-1 * damage) + + return + /obj/structure/blob/proc/adjust_integrity(amount) integrity = between(0, integrity + amount, max_integrity) if(integrity == 0) diff --git a/code/modules/blob2/blobs/factory.dm b/code/modules/blob2/blobs/factory.dm index f9415a6e663..464f89f7606 100644 --- a/code/modules/blob2/blobs/factory.dm +++ b/code/modules/blob2/blobs/factory.dm @@ -35,7 +35,7 @@ var/mob/living/simple_mob/blob/spore/S = null if(overmind) S = new overmind.blob_type.spore_type(src.loc, src) - S.faction = "blob" + S.faction = overmind.blob_type.faction if(istype(S)) S.overmind = overmind overmind.blob_mobs.Add(S) diff --git a/code/modules/blob2/blobs/normal.dm b/code/modules/blob2/blobs/normal.dm index a6e841d4ddc..cf25ff5c1bf 100644 --- a/code/modules/blob2/blobs/normal.dm +++ b/code/modules/blob2/blobs/normal.dm @@ -19,4 +19,13 @@ if(overmind) name = "[overmind.blob_type.name]" else - name = "inert [base_name]" \ No newline at end of file + name = "inert [base_name]" + +/obj/structure/blob/normal/pulsed() + ..() + + if(prob(30)) + adjust_scale((rand(10, 13) / 10), (rand(10, 13) / 10)) + + else + adjust_scale(1) diff --git a/code/modules/blob2/core_chunk.dm b/code/modules/blob2/core_chunk.dm index 7d8f588568e..4abc06843eb 100644 --- a/code/modules/blob2/core_chunk.dm +++ b/code/modules/blob2/core_chunk.dm @@ -5,6 +5,7 @@ description_info = "Some blob types will have core effects when the chunk is used in-hand, toggled with an alt click, or constantly active." icon = 'icons/mob/blob.dmi' icon_state = "blobcore" + flags = OPENCONTAINER var/datum/blob_type/blob_type // The blob type this dropped from. var/active_ability_cooldown = 20 SECONDS @@ -15,11 +16,17 @@ var/passive_ability_cooldown = 5 SECONDS var/last_passive_use = 0 + var/can_genesis = TRUE // Can the core chunk be used to grow a new blob? + drop_sound = 'sound/effects/slime_squish.ogg' +/obj/item/weapon/blobcore_chunk/is_open_container() + return 1 + /obj/item/weapon/blobcore_chunk/New(var/atom/newloc, var/datum/blob_type/parentblob = null) ..(newloc) + create_reagents(120) setup_blobtype(parentblob) /obj/item/weapon/blobcore_chunk/Destroy() @@ -91,10 +98,57 @@ blob_type.on_chunk_tick(src) /obj/item/weapon/blobcore_chunk/AltClick(mob/living/carbon/user) - if(blob_type &&blob_type.chunk_active_type == BLOB_CHUNK_TOGGLE) + if(blob_type && blob_type.chunk_active_type == BLOB_CHUNK_TOGGLE) should_tick = !should_tick if(should_tick) to_chat(user, "\The [src] shudders with life.") else to_chat(user, "\The [src] stills, returning to a death-like state.") + +/obj/item/weapon/blobcore_chunk/proc/regen(var/newfaction = null) + if(istype(blob_type)) + if(newfaction) + blob_type.faction = newfaction + + var/obj/structure/blob/core/NC = new (get_turf(src)) + NC.overmind.blob_type = blob_type + NC.overmind.blob_core.update_icon() + return TRUE + + return FALSE + +/datum/chemical_reaction/blob_reconstitution + name = "Hostile Blob Revival" + id = "blob_revival" + result = null + required_reagents = list("phoron" = 60) + result_amount = 1 + +/datum/chemical_reaction/blob_reconstitution/can_happen(var/datum/reagents/holder) + if(holder.my_atom && istype(holder.my_atom, /obj/item/weapon/blobcore_chunk)) + return ..() + return FALSE + +/datum/chemical_reaction/blob_reconstitution/on_reaction(var/datum/reagents/holder) + var/obj/item/weapon/blobcore_chunk/chunk = holder.my_atom + if(chunk.can_genesis && chunk.regen()) + chunk.visible_message("[chunk] bubbles, surrounding itself with a rapidly expanding mass of [chunk.blob_type.name]!") + chunk.can_genesis = FALSE + else + chunk.visible_message("[chunk] shifts strangely, but falls still.") + +/datum/chemical_reaction/blob_reconstitution/domination + name = "Allied Blob Revival" + id = "blob_friend" + result = null + required_reagents = list("hydrophoron" = 40, "peridaxon" = 20, "mutagen" = 20) + result_amount = 1 + +/datum/chemical_reaction/blob_reconstitution/domination/on_reaction(var/datum/reagents/holder) + var/obj/item/weapon/blobcore_chunk/chunk = holder.my_atom + if(chunk.can_genesis && chunk.regen("neutral")) + chunk.visible_message("[chunk] bubbles, surrounding itself with a rapidly expanding mass of [chunk.blob_type.name]!") + chunk.can_genesis = FALSE + else + chunk.visible_message("[chunk] shifts strangely, but falls still.") diff --git a/code/modules/blob2/overmind/overmind.dm b/code/modules/blob2/overmind/overmind.dm index ffcd347dd81..6df0cba6295 100644 --- a/code/modules/blob2/overmind/overmind.dm +++ b/code/modules/blob2/overmind/overmind.dm @@ -23,6 +23,14 @@ var/list/overminds = list() var/ai_controlled = TRUE var/auto_pilot = FALSE // If true, and if a client is attached, the AI routine will continue running. + universal_understand = TRUE + + var/list/has_langs = list(LANGUAGE_BLOB) + var/datum/language/default_language = null + +/mob/observer/blob/get_default_language() + return default_language + /mob/observer/blob/Initialize(newloc, pre_placed = 0, starting_points = 60, desired_blob_type = null) blob_points = starting_points if(pre_placed) //we already have a core! @@ -41,6 +49,11 @@ var/list/overminds = list() if(blob_core) blob_core.update_icon() + for(var/L in has_langs) + languages |= GLOB.all_languages[L] + if(languages.len) + default_language = languages[1] + return ..(newloc) /mob/observer/blob/Destroy() @@ -67,9 +80,9 @@ var/list/overminds = list() stat(null, "Power Stored: [blob_points]/[max_blob_points]") stat(null, "Total Blobs: [GLOB.all_blobs.len]") -/mob/observer/blob/Move(NewLoc, Dir = 0) +/mob/observer/blob/Move(var/atom/NewLoc, Dir = 0) if(placed) - var/obj/structure/blob/B = locate() in range("3x3", NewLoc) + var/obj/structure/blob/B = (locate() in view("5x5", NewLoc)) if(B) forceMove(NewLoc) return TRUE @@ -93,3 +106,62 @@ var/list/overminds = list() if(blob_points >= 100) if(!auto_factory() && !auto_resource()) auto_node() + +/mob/observer/blob/say(var/message, var/datum/language/speaking = null, var/whispering = 0) + message = sanitize(message) + + if(!message) + return + + //If you're muted for IC chat + if(client) + if(message) + client.handle_spam_prevention(MUTE_IC) + if((client.prefs.muted & MUTE_IC) || say_disabled) + to_chat(src, "You cannot speak in IC (Muted).") + return + + //These will contain the main receivers of the message + var/list/listening = list() + var/list/listening_obj = list() + + var/turf/T = get_turf(src) + if(T) + //Obtain the mobs and objects in the message range + var/list/results = get_mobs_and_objs_in_view_fast(T, world.view, remote_ghosts = client ? TRUE : FALSE) + listening = results["mobs"] + listening_obj = results["objs"] + else + return 1 //If we're in nullspace, then forget it. + + var/list/message_pieces = parse_languages(message) + if(istype(message_pieces, /datum/multilingual_say_piece)) // Little quirk for dealing with hivemind/signlang languages. + var/datum/multilingual_say_piece/S = message_pieces // Yay for BYOND's hilariously broken typecasting for allowing us to do this. + S.speaking.broadcast(src, S.message) + return 1 + + if(!LAZYLEN(message_pieces)) + log_runtime(EXCEPTION("Message failed to generate pieces. [message] - [json_encode(message_pieces)]")) + return 0 + + //Handle nonverbal languages here + for(var/datum/multilingual_say_piece/S in message_pieces) + if(S.speaking.flags & NONVERBAL) + custom_emote(1, "[pick(S.speaking.signlang_verb)].") + + for(var/mob/M in listening) + spawn() + if(M && src) + if(get_dist(M, src) <= world.view || (M.stat == DEAD && !forbid_seeing_deadchat)) + M.hear_say(message_pieces, "conveys", (M.faction == blob_type.faction), src) + + //Object message delivery + for(var/obj/O in listening_obj) + spawn(0) + if(O && src) //If we still exist, when the spawn processes + var/dst = get_dist(get_turf(O),get_turf(src)) + if(dst <= world.view) + O.hear_talk(src, message_pieces, "conveys") + + log_say(message, src) + return 1 diff --git a/code/modules/blob2/overmind/powers.dm b/code/modules/blob2/overmind/powers.dm index f5727e94bfe..4177bac9912 100644 --- a/code/modules/blob2/overmind/powers.dm +++ b/code/modules/blob2/overmind/powers.dm @@ -80,8 +80,8 @@ potential_blobs -= temp // Don't take up the core's shield spot. else if(!istype(temp, /obj/structure/blob/normal)) potential_blobs -= temp // Not a normal blob. - else if(temp.overmind != src) - potential_blobs -= temp // Not our blob. + else if(temp.overmind != src || temp.overmind.blob_type.faction != blob_type.faction) + potential_blobs -= temp // Not our blob, or even an ally. else B = temp break @@ -123,8 +123,8 @@ potential_blobs -= temp // Don't take up the core's shield spot. else if(!istype(temp, /obj/structure/blob/normal)) potential_blobs -= temp // Not a normal blob. - else if(temp.overmind != src) - potential_blobs -= temp // Not our blob. + else if(temp.overmind != src || temp.overmind.blob_type.faction != blob_type.faction) + potential_blobs -= temp // Not our blob, or even an ally else B = temp break @@ -165,8 +165,8 @@ potential_blobs -= temp else if(!istype(temp, /obj/structure/blob/normal)) potential_blobs -= temp - else if(temp.overmind != src) - potential_blobs -= temp // Not our blob. + else if(temp.overmind != src || temp.overmind.blob_type.faction != blob_type.faction) + potential_blobs -= temp // Not our blob, or even our ally. else B = temp break @@ -216,7 +216,7 @@ for(var/mob/living/L in view(src)) if(L.stat == DEAD) continue // Already dying or dead. - if(L.faction == "blob") + if(L.faction == blob_type.faction) continue // No friendly fire. if(locate(/obj/structure/blob) in L.loc) continue // Already has a blob over them. diff --git a/code/modules/blob2/overmind/types.dm b/code/modules/blob2/overmind/types.dm index 79df541aae5..8fffbcdbcae 100644 --- a/code/modules/blob2/overmind/types.dm +++ b/code/modules/blob2/overmind/types.dm @@ -9,6 +9,8 @@ var/color = "#FFFFFF" // The actual blob's color. var/complementary_color = "#000000" //a color that's complementary to the normal blob color. Blob mobs are colored in this. + var/faction = "blob" // The blob's faction. + var/attack_message = "The blob attacks you" // Base message the mob gets when blob_act() gets called on them by the blob. An exclaimation point is added to the end. var/attack_message_living = null // Appended to attack_message, if the target fails isSynthetic() check. var/attack_message_synth = null // Ditto, but if they pass isSynthetic(). diff --git a/code/modules/blob2/overmind/types/blazing_oil.dm b/code/modules/blob2/overmind/types/blazing_oil.dm index 094083e7780..7d8c9f307d5 100644 --- a/code/modules/blob2/overmind/types/blazing_oil.dm +++ b/code/modules/blob2/overmind/types/blazing_oil.dm @@ -33,6 +33,8 @@ env.add_thermal_energy(10 * 1000) /datum/blob_type/blazing_oil/on_chunk_tick(obj/item/weapon/blobcore_chunk/B) + B.reagents.add_reagent("thermite_v", 0.5) + var/turf/T = get_turf(B) if(!T) return diff --git a/code/modules/blob2/overmind/types/cryogenic_goo.dm b/code/modules/blob2/overmind/types/cryogenic_goo.dm index 32684ed58f3..564516a71dd 100644 --- a/code/modules/blob2/overmind/types/cryogenic_goo.dm +++ b/code/modules/blob2/overmind/types/cryogenic_goo.dm @@ -46,6 +46,8 @@ env.add_thermal_energy(-10 * 1000) /datum/blob_type/cryogenic_goo/on_chunk_tick(obj/item/weapon/blobcore_chunk/B) + B.reagents.add_reagent("cryoslurry", 0.5) + var/turf/simulated/T = get_turf(B) if(!istype(T)) return diff --git a/code/modules/blob2/overmind/types/ectoplasmic_horror.dm b/code/modules/blob2/overmind/types/ectoplasmic_horror.dm index f7689847cde..a528ce83889 100644 --- a/code/modules/blob2/overmind/types/ectoplasmic_horror.dm +++ b/code/modules/blob2/overmind/types/ectoplasmic_horror.dm @@ -35,7 +35,7 @@ listclearnulls(active_beams) var/atom/movable/beam_origin = B for(var/mob/living/L in oview(world.view, B)) - if(L.stat == DEAD || L.faction == "blob") + if(L.stat == DEAD || L.faction == faction) continue if(prob(5)) var/beamtarget_exists = FALSE @@ -82,7 +82,7 @@ if(nearby_mobs.len) listclearnulls(active_beams) for(var/mob/living/L in nearby_mobs) - if(L.stat == DEAD || L.faction == "blob") + if(L.stat == DEAD || L.faction == faction) continue if(prob(5)) var/beamtarget_exists = FALSE diff --git a/code/modules/blob2/overmind/types/explosive_lattice.dm b/code/modules/blob2/overmind/types/explosive_lattice.dm index d0484c37254..aec6787eab1 100644 --- a/code/modules/blob2/overmind/types/explosive_lattice.dm +++ b/code/modules/blob2/overmind/types/explosive_lattice.dm @@ -30,7 +30,7 @@ for(var/mob/living/L in range(get_turf(victim), 1)) // We don't use orange(), in case there is more than one mob on the target tile. if(L == victim) // Already hit. continue - if(L.faction == "blob") // No friendly fire + if(L.faction == faction) // No friendly fire continue L.blob_act() diff --git a/code/modules/blob2/overmind/types/fulminant_organism.dm b/code/modules/blob2/overmind/types/fulminant_organism.dm index 2d940f93599..4f3788b787f 100644 --- a/code/modules/blob2/overmind/types/fulminant_organism.dm +++ b/code/modules/blob2/overmind/types/fulminant_organism.dm @@ -24,9 +24,10 @@ var/mob/living/simple_mob/blob/spore/S = new spore_type(T) if(istype(S)) S.overmind = O + S.faction = faction O.blob_mobs.Add(S) else - S.faction = "blob" + S.faction = faction S.update_icons() /datum/blob_type/fulminant_organism/on_death(obj/structure/blob/B) @@ -35,9 +36,10 @@ B.visible_message("\The [S] floats free from the [name]!") if(istype(S)) S.overmind = B.overmind + S.faction = faction B.overmind.blob_mobs.Add(S) else - S.faction = "blob" + S.faction = faction S.update_icons() /datum/blob_type/fulminant_organism/on_chunk_use(obj/item/weapon/blobcore_chunk/B, mob/living/user) diff --git a/code/modules/blob2/overmind/types/grey_goo.dm b/code/modules/blob2/overmind/types/grey_goo.dm index 5c93fb46c87..558f624e96f 100644 --- a/code/modules/blob2/overmind/types/grey_goo.dm +++ b/code/modules/blob2/overmind/types/grey_goo.dm @@ -14,6 +14,7 @@ attack_message = "The tide tries to swallow you" attack_message_living = ", and you feel your skin dissolve" attack_message_synth = ", and your external plating dissolves" + faction = "nanomachines" /datum/blob_type/grey_goo/on_emp(obj/structure/blob/B, severity) B.adjust_integrity(-(20 / severity)) diff --git a/code/modules/blob2/overmind/types/roiling_mold.dm b/code/modules/blob2/overmind/types/roiling_mold.dm index e909d060868..4594ad1c9f6 100644 --- a/code/modules/blob2/overmind/types/roiling_mold.dm +++ b/code/modules/blob2/overmind/types/roiling_mold.dm @@ -44,7 +44,7 @@ if(!istype(L)) return - if(istype(B, /obj/structure/blob/factory) && L.stat != DEAD && prob(ai_aggressiveness) && L.faction != "blob") + if(istype(B, /obj/structure/blob/factory) && L.stat != DEAD && prob(ai_aggressiveness) && L.faction != faction) var/obj/item/projectile/arc/spore/P = new(get_turf(B)) P.launch_projectile(L, BP_TORSO, B) diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index dd84f559820..83164afd3c3 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -227,7 +227,6 @@ if(!void) void = new() - void.MakeGreed() screen += void if((prefs.lastchangelog != changelog_hash) && isnewplayer(src.mob)) //bolds the changelog button on the interface so we know there are updates. diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 0d0f392e9a8..c8c6355ea25 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -27,6 +27,14 @@ ..() gear_tweaks += gear_tweak_free_color_choice +/datum/gear/eyes/thinblindfold + display_name = "blindfold, thin white (recolorable)" + path = /obj/item/clothing/glasses/sunglasses/thinblindfold + +/datum/gear/eyes/thinblindfold/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + /datum/gear/eyes/glasses display_name = "Glasses, prescription" path = /obj/item/clothing/glasses/regular diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 8415791627e..136c6194aca 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -88,9 +88,9 @@ ckeywhitelist = list("arokha") character_name = list("Aronai Sieyes") -/datum/gear/fluff/astraether_ritualknife - path = /obj/item/weapon/material/knife/ritual - display_name = "Astra's Ritual Knife" +/datum/gear/fluff/astra_ritualknife + path = /obj/item/weapon/material/knife/ritual/fluff/astra + display_name = "Polished Ritual Knife" description = "A well kept strange ritual knife, There is a small tag with the name 'Astra Ether' on it. They are probably looking for this." ckeywhitelist = list("astraether") character_name = list("Astra Ether") @@ -959,6 +959,25 @@ // U CKEYS // V CKEYS +/datum/gear/fluff/verie_suit + path = /obj/item/clothing/under/fluff/verie + display_name = "Verie's Salacious Suit" + ckeywhitelist = list("vitoras") + character_name = list("Verie") + +/datum/gear/fluff/verie_hoodie + path = /obj/item/clothing/suit/storage/hooded/fluff/verie + display_name = "Verie's Helluva Hoodie" + ckeywhitelist = list("vitoras") + character_name = list("Verie") + +/datum/gear/fluff/verie_comb + path = /obj/item/weapon/fluff/verie + display_name = "Verie's Crazy Comb" + description = "(Note: The highlights this gives you will be placed above EVERYTHING... including mobs!)" + ckeywhitelist = list("vitoras") + character_name = list("Verie") + /datum/gear/fluff/cameron_glasses path = /obj/item/clothing/glasses/fluff/science_proper display_name = "Cameron's Science Glasses" @@ -1059,6 +1078,12 @@ ckeywhitelist = list("vitoras") character_name = list("Roanna Ti'Rox") +/datum/gear/fluff/harmony_id + path = /obj/item/weapon/card/id/fluff/harmony + display_name = "Harmony's ITG-ID card" + ckeywhitelist = list("verysoft") + character_name = list("Harmony") + // W CKEYS /datum/gear/fluff/sthasha_bracer path = /obj/item/clothing/accessory/bracer/fluff/xander_sthasha diff --git a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm index ce6ada61abf..2aebfd668f4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm @@ -18,4 +18,28 @@ /datum/gear/head/detective_alt display_name = "cyberscope headgear, detective" path = /obj/item/clothing/head/helmet/detective_alt - allowed_roles = list("Head of Security", "Detective") \ No newline at end of file + allowed_roles = list("Head of Security", "Detective") + +/datum/gear/head/bearpelt + display_name = "brown bear pelt" + path = /obj/item/clothing/head/pelt + +/datum/gear/head/wolfpelt + display_name = "brown wolf pelt" + path = /obj/item/clothing/head/pelt/wolfpelt + +/datum/gear/head/wolfpeltblack + display_name = "black wolf pelt" + path = /obj/item/clothing/head/pelt/wolfpeltblack + +/datum/gear/head/tigerpelt + display_name = "shiny tiger pelt" + path = /obj/item/clothing/head/pelt/tigerpelt + +/datum/gear/head/tigerpeltsnow + display_name = "snow tiger pelt" + path = /obj/item/clothing/head/pelt/tigerpeltsnow + +/datum/gear/head/tigerpeltpink + display_name = "pink tiger pelt" + path = /obj/item/clothing/head/pelt/tigerpeltpink \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index c26c23ea7a1..d1ec1bca73c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -65,7 +65,7 @@ ..() var/list/skirts = list() for(var/skirt in (typesof(/obj/item/clothing/under/skirt))) - if(skirt in typesof(/obj/item/clothing/under/skirt/fluff)) //VOREStation addition + if((skirt in typesof(/obj/item/clothing/under/skirt/fluff)) || (skirt in typesof(/obj/item/clothing/under/skirt/outfit/fluff))) //VOREStation addition continue //VOREStation addition var/obj/item/clothing/under/skirt/skirt_type = skirt skirts[initial(skirt_type.name)] = skirt_type diff --git a/code/modules/client/preference_setup/vore/03_egg.dm b/code/modules/client/preference_setup/vore/03_egg.dm index 648b31b3995..6c090478d5e 100644 --- a/code/modules/client/preference_setup/vore/03_egg.dm +++ b/code/modules/client/preference_setup/vore/03_egg.dm @@ -1,15 +1,3 @@ -var/UNATHI_EGG = "Unathi" -var/TAJARAN_EGG = "Tajaran" -var/AKULA_EGG = "Akula" -var/SKRELL_EGG = "Skrell" -var/SERGAL_EGG = "Sergal" -var/HUMAN_EGG = "Human" -var/NEVREAN_EGG = "nevrean" -var/SLIME_EGG = "Slime" -var/EGG_EGG = "Egg" -var/XENOCHIMERA_EGG = "Xenochimera" -var/XENOMORPH_EGG = "Xenomorph" - // Define a place to save appearance in character setup /datum/preferences var/vore_egg_type = "Egg" //The egg type they have. @@ -26,8 +14,7 @@ var/XENOMORPH_EGG = "Xenomorph" S["vore_egg_type"] << pref.vore_egg_type /datum/category_item/player_setup_item/vore/egg/sanitize_character() - var/valid_vore_egg_types = global_vore_egg_types - pref.vore_egg_type = sanitize_inlist(pref.vore_egg_type, valid_vore_egg_types, initial(pref.vore_egg_type)) + pref.vore_egg_type = sanitize_inlist(pref.vore_egg_type, global_vore_egg_types, initial(pref.vore_egg_type)) /datum/category_item/player_setup_item/vore/egg/copy_to_mob(var/mob/living/carbon/human/character) character.vore_egg_type = pref.vore_egg_type @@ -44,7 +31,7 @@ var/XENOMORPH_EGG = "Xenomorph" var/list/vore_egg_types = global_vore_egg_types var/selection = input(user, "Choose your character's egg type:", "Character Preference", pref.vore_egg_type) as null|anything in vore_egg_types if(selection) - pref.vore_egg_type = vore_egg_types[selection] + pref.vore_egg_type = selection return TOPIC_REFRESH else return diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index e653166b7ad..ecaaa840cf6 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/code/modules/client/preference_setup/vore/07_traits.dm @@ -58,21 +58,21 @@ if(pref.species != SPECIES_CUSTOM) pref.pos_traits.Cut() - pref.neu_traits.Cut() pref.neg_traits.Cut() - else - // Clean up positive traits - for(var/path in pref.pos_traits) - if(!(path in positive_traits)) - pref.pos_traits -= path - //Neutral traits - for(var/path in pref.neu_traits) - if(!(path in neutral_traits)) - pref.neu_traits -= path - //Negative traits - for(var/path in pref.neg_traits) - if(!(path in negative_traits)) - pref.neg_traits -= path + // Clean up positive traits + for(var/path in pref.pos_traits) + if(!(path in positive_traits)) + pref.pos_traits -= path + //Neutral traits + for(var/path in pref.neu_traits) + if(!(path in neutral_traits)) + pref.neu_traits -= path + if(!(pref.species == SPECIES_CUSTOM) && !(path in everyone_traits)) + pref.neu_traits -= path + //Negative traits + for(var/path in pref.neg_traits) + if(!(path in negative_traits)) + pref.neg_traits -= path var/datum/species/selected_species = GLOB.all_species[pref.species] if(selected_species.selects_bodytype) @@ -82,23 +82,27 @@ /datum/category_item/player_setup_item/vore/traits/copy_to_mob(var/mob/living/carbon/human/character) character.custom_species = pref.custom_species - var/datum/species/selected_species = GLOB.all_species[pref.species] if(character.isSynthetic()) //Checking if we have a synth on our hands, boys. pref.dirty_synth = 1 - if(selected_species.selects_bodytype) - var/datum/species/custom/CS = character.species - var/S = pref.custom_base ? pref.custom_base : "Human" - var/datum/species/custom/new_CS = CS.produceCopy(S, pref.pos_traits + pref.neu_traits + pref.neg_traits, character) + var/datum/species/S = character.species + var/SB + if(S.selects_bodytype) + SB = pref.custom_base ? pref.custom_base : "Human" + else + SB = S.name + var/datum/species/new_S = S.produceCopy(SB, pref.pos_traits + pref.neu_traits + pref.neg_traits, character) - //Any additional non-trait settings can be applied here - new_CS.blood_color = pref.blood_color + //Any additional non-trait settings can be applied here + new_S.blood_color = pref.blood_color + + if(pref.species == SPECIES_CUSTOM) + //Statistics for this would be nice + var/english_traits = english_list(new_S.traits, and_text = ";", comma_text = ";") + log_game("TRAITS [pref.client_ckey]/([character]) with: [english_traits]") //Terrible 'fake' key_name()... but they aren't in the same entity yet + else - if(pref.species == SPECIES_CUSTOM) - //Statistics for this would be nice - var/english_traits = english_list(new_CS.traits, and_text = ";", comma_text = ";") - log_game("TRAITS [pref.client_ckey]/([character]) with: [english_traits]") //Terrible 'fake' key_name()... but they aren't in the same entity yet /datum/category_item/player_setup_item/vore/traits/content(var/mob/user) . += "Custom Species Name: " @@ -109,15 +113,16 @@ . += "Icon Base: " . += "[pref.custom_base ? pref.custom_base : "Human"]
" + var/traits_left = pref.max_traits + . += "Traits Left: [traits_left]
" if(pref.species == SPECIES_CUSTOM) var/points_left = pref.starting_trait_points - var/traits_left = pref.max_traits + for(var/T in pref.pos_traits + pref.neg_traits) points_left -= traits_costs[T] traits_left-- . += "Points Left: [points_left]
" - . += "Traits Left: [traits_left]
" if(points_left < 0 || traits_left < 0 || !pref.custom_species) . += "^ Fix things! ^
" @@ -128,19 +133,18 @@ . += "
  • - [trait.name] ([trait.cost])
  • " . += "" - . += "Neutral Trait +
    " - . += "" - . += "Negative Trait +
    " . += "" + . += "Neutral Trait +
    " + . += "" . += "Blood Color: " //People that want to use a certain species to have that species traits (xenochimera/promethean/spider) should be able to set their own blood color. . += "Set Color" . += "R
    " @@ -213,8 +217,12 @@ picklist = positive_traits.Copy() - pref.pos_traits mylist = pref.pos_traits if(NEUTRAL_MODE) - picklist = neutral_traits.Copy() - pref.neu_traits - mylist = pref.neu_traits + if(pref.species == SPECIES_CUSTOM) + picklist = neutral_traits.Copy() - pref.neu_traits + mylist = pref.neu_traits + else + picklist = everyone_traits.Copy() - pref.neu_traits + mylist = pref.neu_traits if(NEGATIVE_MODE) picklist = negative_traits.Copy() - pref.neg_traits mylist = pref.neg_traits diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index fc42b1efad4..3d6c80eedd4 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -235,7 +235,7 @@ datum/preferences to_chat(user, "No mob exists for the given client!") close_load_dialog(user) return - + if(!char_render_holders) update_preview_icon() show_character_previews() @@ -280,7 +280,7 @@ datum/preferences client.screen |= BG BG.icon_state = bgstate BG.screen_loc = preview_screen_locs["BG"] - + for(var/D in global.cardinal) var/obj/screen/setup_preview/O = LAZYACCESS(char_render_holders, "[D]") if(!O) @@ -400,13 +400,15 @@ datum/preferences if(S) dat += "Select a character slot to load
    " var/name + var/nickname //vorestation edit - This set appends nicknames to the save slot for(var/i=1, i<= config.character_slots, i++) S.cd = "/character[i]" S["real_name"] >> name + S["nickname"] >> nickname //vorestation edit if(!name) name = "Character[i]" if(i==default_slot) name = "[name]" - dat += "[name]
    " + dat += "[name][nickname ? " ([nickname])" : ""]
    " //vorestation edit dat += "
    " dat += "" diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 18a3efe8fa2..60ff3b8e352 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -397,6 +397,13 @@ BLIND // can't see anything desc = "A white blindfold that covers the eyes, preventing sight." icon_state = "blindfoldwhite" +/obj/item/clothing/glasses/sunglasses/thinblindfold + name = "thin white blindfold" + desc = "A thin blindfold to help protect sensitive eyes while still allowing some sight" + icon_state = "blindfoldwhite" + flash_protection = FLASH_PROTECTION_MODERATE //not as thick, only offers some protection + tint = TINT_HEAVY + /obj/item/clothing/glasses/sunglasses/blindfold/tape name = "length of tape" desc = "It's a robust DIY blindfold!" diff --git a/code/modules/clothing/head/misc_vr.dm b/code/modules/clothing/head/misc_vr.dm index 6fddde1c3d3..8cfb579201c 100644 --- a/code/modules/clothing/head/misc_vr.dm +++ b/code/modules/clothing/head/misc_vr.dm @@ -46,4 +46,44 @@ /obj/item/clothing/head/shiny_hood/closed/poly name = "polychromic closed shiny hood" icon_state = "hood_col_o" - polychromic = TRUE \ No newline at end of file + polychromic = TRUE + +/obj/item/clothing/head/pelt + name = "Bear pelt" + desc = "A luxurious bear pelt, good to keep warm in winter. Or to sleep through winter." + icon = 'icons/obj/clothing/hats_vr.dmi' + icon_override = 'icons/mob/head_vr.dmi' + icon_state = "bearpelt_brown" + item_state = "bearpelt_brown" + +/obj/item/clothing/head/pelt/wolfpelt + name = "Wolf pelt" + desc = "A fuzzy wolf pelt, demanding respect as a hunter, well if it isn't synthetic or anything at least. Or bought." + icon_override = 'icons/mob/wolfpelt_vr.dmi' + icon_state = "wolfpelt_brown" + item_state = "wolfpelt_brown" + +/obj/item/clothing/head/pelt/wolfpeltblack + name = "Wolf pelt" + desc = "A fuzzy wolf pelt, demanding respect as a hunter, well if it isn't synthetic or anything at least. Or bought." + icon_override = 'icons/mob/wolfpelt_vr.dmi' + icon_state = "wolfpelt_gray" + item_state = "wolfpelt_gray" + +/obj/item/clothing/head/pelt/tigerpelt + name = "Shiny tiger pelt" + desc = "A vibrant tiger pelt, particularly fabulous." + icon_state = "tigerpelt_shiny" + item_state = "tigerpelt_shiny" + +/obj/item/clothing/head/pelt/tigerpeltsnow + name = "Snow tiger pelt" + desc = "A pelt of a less vibrant tiger, but rather warm." + icon_state = "tigerpelt_snow" + item_state = "tigerpelt_snow" + +/obj/item/clothing/head/pelt/tigerpeltpink + name = "Pink tiger pelt" + desc = "A particularly vibrant tiger pelt, for those who want to be the most fabulous at parties." + icon_state = "tigerpelt_pink" + item_state = "tigerpelt_pink" \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/storage_vr.dm b/code/modules/clothing/under/accessories/storage_vr.dm new file mode 100644 index 00000000000..ac573a35643 --- /dev/null +++ b/code/modules/clothing/under/accessories/storage_vr.dm @@ -0,0 +1,5 @@ +/obj/item/clothing/accessory/storage/bluespace + name = "bluespace badge" + desc = "A small, shielded device capable of holding a number of items in it. Used for carrying items discreetly." + icon_state = "solbadge" + item_state = "badge" \ No newline at end of file diff --git a/code/modules/events/maintenance_predator_vr.dm b/code/modules/events/maintenance_predator_vr.dm index 6aa505a2a9a..b9b370f7e0d 100644 --- a/code/modules/events/maintenance_predator_vr.dm +++ b/code/modules/events/maintenance_predator_vr.dm @@ -1,21 +1,6 @@ /datum/event/maintenance_predator startWhen = 1 - announceWhen = 50 - endWhen = 100 - var/announceProb = 35 - var/list/possible_mobs = list("Space Bumblebee" = /mob/living/simple_mob/vore/bee, - "Voracious Lizard" = /mob/living/simple_mob/vore/aggressive/dino, - "Giant Frog" = /mob/living/simple_mob/vore/aggressive/frog, - "Giant Rat" = /mob/living/simple_mob/vore/aggressive/rat, - "Juvenile Solargrub" = /mob/living/simple_mob/vore/solargrub, - "Red Panda" = /mob/living/simple_mob/vore/redpanda, - "Fennec" = /mob/living/simple_mob/vore/fennec, - "Fennix" = /mob/living/simple_mob/vore/fennix, - "Jelly Blob" = /mob/living/simple_mob/animal/space/jelly, - "Wolf" = /mob/living/simple_mob/animal/wolf, - "Sect Queen" = /mob/living/simple_mob/vore/sect_queen, - "Defanged Xenomorph" = /mob/living/simple_mob/vore/xeno_defanged, - ) + endWhen = 30 /datum/event/maintenance_predator/start() @@ -34,44 +19,4 @@ kill() // To prevent fake announcements return - var/datum/ghost_query/Q = new /datum/ghost_query/maints_pred() - var/list/winner = Q.query() - - if(winner.len) - var/mob/observer/dead/D = winner[1] - var/choice - var/randomize - var/finalized = "No" - - while(finalized == "No" && D.client) - choice = input(D,"What type of predator do you want to play as?") as null|anything in possible_mobs - if(!choice) - randomize = TRUE - break - - if(choice) - finalized = alert(D, "Are you sure you want to play as [choice]?","Confirmation","No","Yes") - - if(randomize) - choice = pick(possible_mobs) - - var/mobtype = possible_mobs[choice] - var/mob/living/simple_mob/newPred = new mobtype(get_turf(spawnspot)) - qdel(newPred.ai_holder) - newPred.ai_holder = null - //newPred.movement_cooldown = 0 // The "needless artificial speed cap" exists for a reason - if(D.mind) - D.mind.transfer_to(newPred) - to_chat(D, "You are [newPred], somehow having gotten aboard the station in search of food. \ - You are wary of environment around you, but you do feel rather peckish. Stick around dark, secluded places to avoid danger or, \ - if you are cute enough, try to make friends with this place's inhabitants.") - newPred.ckey = D.ckey - newPred.visible_message("[newPred] emerges from somewhere!") - else - kill() // To prevent fake announcements - return - - -/datum/event/maintenance_predator/announce() - if(prob(announceProb)) - command_announcement.Announce("Unexpected biosignature detected in the maintenance tunnels of [station_name()].", "Lifesign Alert") + new /obj/structure/ghost_pod/ghost_activated/maintpred(get_turf(spawnspot)) diff --git a/code/modules/events/morph_spawn_vr.dm b/code/modules/events/morph_spawn_vr.dm index 778526efd90..ad1ea9a9f78 100644 --- a/code/modules/events/morph_spawn_vr.dm +++ b/code/modules/events/morph_spawn_vr.dm @@ -1,8 +1,6 @@ /datum/event/morph_spawn startWhen = 1 - announceWhen = 20 endWhen = 30 - var/announceProb = 50 /datum/event/morph_spawn/start() @@ -21,27 +19,4 @@ kill() // To prevent fake announcements return - var/datum/ghost_query/Q = new /datum/ghost_query/morph() - var/list/winner = Q.query() - - if(winner.len) - var/mob/living/simple_mob/vore/hostile/morph/newMorph = new /mob/living/simple_mob/vore/hostile/morph(get_turf(spawnspot)) - var/mob/observer/dead/D = winner[1] - if(D.mind) - D.mind.transfer_to(newMorph) - to_chat(D, "You are a Morph, somehow having gotten aboard the station in your wandering. \ - You are wary of environment around you, but your primal hunger still calls for you to find prey. Seek a convincing disguise, \ - using your amorphous form to traverse vents to find and consume weak prey.") - to_chat(D, "You can use shift + click on objects to disguise yourself as them, but your strikes are nearly useless when you are disguised. \ - You can undisguise yourself by shift + clicking yourself, but disguise being switched, or turned on and off has a short cooldown. You can also ventcrawl, \ - by using alt + click on the vent or scrubber.") - newMorph.ckey = D.ckey - newMorph.visible_message("A morph appears to crawl out of somewhere.") - else - kill() // To prevent fake announcements - return - - -/datum/event/morph_spawn/announce() - if(prob(announceProb)) - command_announcement.Announce("Unknown entitity detected boarding [station_name()]. Exercise extra caution.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg') \ No newline at end of file + new /obj/structure/ghost_pod/ghost_activated/morphspawn(get_turf(spawnspot)) \ No newline at end of file diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 268ef565caf..cbe9ff8f77b 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -6049,6 +6049,40 @@ reagents.add_reagent("protein", 8) bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup + name = "chicken noodle soup" + gender = PLURAL + desc = "A bright bowl of yellow broth with cuts of meat, noodles and carrots." + icon = 'icons/obj/food_custom.dmi' + icon_state = "chickennoodlesoup" + filling_color = "#ead90c" + nutriment_amt = 6 + nutriment_desc = list("warm soup" = 6) + center_of_mass = list("x"=16, "y"=5) + +/obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup/Initialize() + . = ..() + reagents.add_reagent("protein", 4) + reagents.add_reagent("water", 5) + bitesize = 6 + +/obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup + name = "chicken noodle soup" + gender = PLURAL + desc = "A bright bowl of yellow broth with cuts of meat, noodles and carrots." + icon = 'icons/obj/food_custom.dmi' + icon_state = "chickennoodlesoup" + filling_color = "#ead90c" + nutriment_amt = 6 + nutriment_desc = list("warm soup" = 6) + center_of_mass = list("x"=16, "y"=5) + +/obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup/Initialize() + . = ..() + reagents.add_reagent("protein", 4) + reagents.add_reagent("water", 5) + bitesize = 6 + /obj/item/weapon/reagent_containers/food/snacks/chilicheesefries name = "chili cheese fries" gender = PLURAL @@ -6404,8 +6438,8 @@ reagents.add_reagent("protein", 2) //For meaty things. /obj/item/weapon/reagent_containers/food/snacks/gigapuddi - name = "Giga Puddi" - desc = "A large crème caramel" + name = "Astro-Pudding" + desc = "A crème caramel of astronomical size." icon = 'icons/obj/food.dmi' icon_state = "gigapuddi" trash = /obj/item/trash/plate @@ -6416,17 +6450,17 @@ bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/gigapuddi/happy - desc = "A large crème caramel made with extra love" + desc = "A crème caramel of astronomical size, made with extra love." icon = 'icons/obj/food.dmi' icon_state = "happypuddi" /obj/item/weapon/reagent_containers/food/snacks/gigapuddi/anger - desc = "A large crème caramel made with extra hate" + desc = "A crème caramel of astronomical size, made with extra hate." icon_state = "angerpuddi" - + /obj/item/weapon/reagent_containers/food/snacks/sliceable/buchedenoel name = "\improper Buche de Noel" - desc = "Merry Christmas" + desc = "Yule love it!" icon = 'icons/obj/food.dmi' icon_state = "buche" slice_path = /obj/item/weapon/reagent_containers/food/snacks/bucheslice @@ -6451,7 +6485,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey name = "turkey" - desc = "Tastes like chicken" + desc = "Tastes like chicken." icon = 'icons/obj/food.dmi' icon_state = "turkey" slice_path = /obj/item/weapon/reagent_containers/food/snacks/turkeyslice @@ -6469,12 +6503,12 @@ /obj/item/weapon/reagent_containers/food/snacks/turkeyslice name = "turkey drumstick" - desc = "Guaranteed vox-free" + desc = "Forsooth!" icon = 'icons/obj/food.dmi' icon_state = "turkey_drumstick" trash = /obj/item/trash/plate bitesize = 2 - + /obj/item/weapon/reagent_containers/food/snacks/sliceable/suppermatter name = "suppermatter" desc = "Extremely dense and powerful food." @@ -6548,7 +6582,7 @@ /obj/item/weapon/reagent_containers/food/snacks/omurice/face icon = 'icons/obj/food.dmi' icon_state = "omuriceface" - + /obj/item/weapon/reagent_containers/food/snacks/cinnamonbun name = "cinnamon bun" desc = "Life needs frosting!" @@ -6559,4 +6593,4 @@ /obj/item/weapon/reagent_containers/food/snacks/cinnamonbun/New() ..() reagents.add_reagent("nutriment", 8) - bitesize = 1 \ No newline at end of file + bitesize = 1 diff --git a/code/modules/food/glass/bottle_vr.dm b/code/modules/food/glass/bottle_vr.dm index fc1595b699a..5f918f2f7b9 100644 --- a/code/modules/food/glass/bottle_vr.dm +++ b/code/modules/food/glass/bottle_vr.dm @@ -5,6 +5,13 @@ icon_state = "bottle-4" prefill = list("bicaridine" = 60) +/obj/item/weapon/reagent_containers/glass/bottle/vermicetol + name = "vermicetol bottle" + desc = "A small bottle. Vermicetol is an powerful analgesic medication and can be used to treat blunt trauma." + icon = 'icons/obj/chemical.dmi' + icon_state = "bottle-4" + prefill = list("vermicetol" = 60) + /obj/item/weapon/reagent_containers/glass/bottle/keloderm name = "keloderm bottle" desc = "A small bottle. A fifty-fifty mix of the popular burn medications kelotane and deramline." diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 7c19a2a310f..216eb0303c4 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -940,6 +940,20 @@ I said no! /obj/item/weapon/reagent_containers/food/snacks/bun ) result = /obj/item/weapon/reagent_containers/food/snacks/chickenfillet + +/datum/recipe/chickennoodlesoup + fruit = list("carrot" = 1) + reagents = list("water" = 10) + items = list( /obj/item/weapon/reagent_containers/food/snacks/spagetti, /obj/item/weapon/reagent_containers/food/snacks/rawcutlet) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + result = /obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup + +/datum/recipe/chickennoodlesoup + fruit = list("carrot" = 1) + reagents = list("water" = 10) + items = list( /obj/item/weapon/reagent_containers/food/snacks/spagetti, /obj/item/weapon/reagent_containers/food/snacks/rawcutlet) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + result = /obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup /datum/recipe/chilicheesefries items = list( @@ -1436,4 +1450,4 @@ I said no! /obj/item/weapon/reagent_containers/food/snacks/dough ) result = /obj/item/weapon/reagent_containers/food/snacks/cinnamonbun - result_quantity = 4 \ No newline at end of file + result_quantity = 4 diff --git a/code/modules/gamemaster/event2/events/engineering/brand_intelligence.dm b/code/modules/gamemaster/event2/events/engineering/brand_intelligence.dm index 85f51df1926..d3478bb333b 100644 --- a/code/modules/gamemaster/event2/events/engineering/brand_intelligence.dm +++ b/code/modules/gamemaster/event2/events/engineering/brand_intelligence.dm @@ -33,8 +33,8 @@ /datum/event2/event/brand_intelligence/announce() if(prob(90)) - command_announcement.Announce("An ongoing mass upload of malware for venders has been detected onboard \the [location_name()], \ - which appears to transmit to nearby vendors. The original infected machine is believed to be \a [vender_zero].", "Vender Service Alert") + command_announcement.Announce("An ongoing mass upload of malware for vendors has been detected onboard \the [location_name()], \ + which appears to transmit to nearby vendors. The original infected machine is believed to be \a [vender_zero].", "Vendor Service Alert") /datum/event2/event/brand_intelligence/start() infect_vender(vender_zero) diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 91d7d8d6660..0b58b5110fb 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -343,7 +343,8 @@ H.update_icon() src.update_icon() usr.visible_message("\The [usr] plays \the [discarding].") - H.loc = get_step(usr,usr.dir) + H.loc = get_turf(usr) + H.Move(get_step(usr,usr.dir)) if(!cards.len) qdel(src) diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm index c5f3e05f136..2480e39fb2f 100644 --- a/code/modules/integrated_electronics/core/printer.dm +++ b/code/modules/integrated_electronics/core/printer.dm @@ -29,7 +29,7 @@ /obj/item/device/integrated_circuit_printer/attack_robot(mob/user as mob) if(Adjacent(user)) - return interact(user) + return tgui_interact(user) else return ..() @@ -86,11 +86,10 @@ return ..() /obj/item/device/integrated_circuit_printer/attack_self(var/mob/user) - interact(user) tgui_interact(user) /obj/item/device/integrated_circuit_printer/tgui_state(mob/user) - return GLOB.tgui_inventory_state + return GLOB.tgui_physical_state /obj/item/device/integrated_circuit_printer/tgui_interact(mob/user, datum/tgui/ui) if(dirty_items) diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm index 57bf6b9b7dc..cf1389065a2 100644 --- a/code/modules/materials/material_recipes.dm +++ b/code/modules/materials/material_recipes.dm @@ -28,6 +28,7 @@ recipes += new/datum/stack_recipe("[display_name] fork", /obj/item/weapon/material/kitchen/utensil/fork/plastic, 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE) recipes += new/datum/stack_recipe("[display_name] knife", /obj/item/weapon/material/knife/plastic, 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE) recipes += new/datum/stack_recipe("[display_name] blade", /obj/item/weapon/material/butterflyblade, 6, time = 20, one_per_turf = 0, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE) + recipes += new/datum/stack_recipe("[display_name] defense wire", /obj/item/weapon/material/barbedwire, 10, time = 1 MINUTE, one_per_turf = 0, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE) /datum/material/steel/generate_recipes() ..() @@ -222,7 +223,7 @@ /datum/material/cloth/generate_recipes() recipes = list() - recipes += new/datum/stack_recipe("woven net", /obj/item/weapon/material/fishing_net, 10, time = 30 SECONDS, pass_stack_color = TRUE) + recipes += new/datum/stack_recipe("woven net", /obj/item/weapon/material/fishing_net, 10, time = 30 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]") recipes += new/datum/stack_recipe("bedsheet", /obj/item/weapon/bedsheet, 10, time = 30 SECONDS, pass_stack_color = TRUE) recipes += new/datum/stack_recipe("uniform", /obj/item/clothing/under/color/white, 8, time = 15 SECONDS, pass_stack_color = TRUE) recipes += new/datum/stack_recipe("foot wraps", /obj/item/clothing/shoes/footwraps, 2, time = 5 SECONDS, pass_stack_color = TRUE) @@ -237,6 +238,7 @@ recipes += new/datum/stack_recipe("baggy pants", /obj/item/clothing/under/pants/baggy/white, 8, time = 10 SECONDS, pass_stack_color = TRUE) recipes += new/datum/stack_recipe("belt pouch", /obj/item/weapon/storage/belt/fannypack/white, 25, time = 1 MINUTE, pass_stack_color = TRUE) recipes += new/datum/stack_recipe("crude bandage", /obj/item/stack/medical/crude_pack, 1, time = 2 SECONDS, pass_stack_color = TRUE) + recipes += new/datum/stack_recipe("empty sandbag", /obj/item/stack/emptysandbag, 2, time = 2 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]") /datum/material/resin/generate_recipes() recipes = list() @@ -269,3 +271,5 @@ recipes += new/datum/stack_recipe("[display_name] ring", /obj/item/clothing/gloves/ring/material, 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE) recipes += new/datum/stack_recipe("[display_name] bracelet", /obj/item/clothing/accessory/bracelet/material, 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE) recipes += new/datum/stack_recipe("[display_name] armor plate", /obj/item/weapon/material/armor_plating, 1, time = 20, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE) + recipes += new/datum/stack_recipe("empty sandbag", /obj/item/stack/emptysandbag, 2, time = 2 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]") + recipes += new/datum/stack_recipe("whip", /obj/item/weapon/material/whip, 5, time = 15 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]") diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index 068a745cbbe..572438107d0 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -1010,6 +1010,19 @@ var/list/name_to_material pass_stack_colors = TRUE supply_conversion_value = 2 +/datum/material/cloth/syncloth + name = "syncloth" + stack_origin_tech = list(TECH_MATERIAL = 3, TECH_BIO = 2) + door_icon_base = "wood" + ignition_point = T0C+532 + melting_point = T0C+600 + integrity = 200 + protectiveness = 15 // 4% + flags = MATERIAL_PADDING + conductive = 0 + pass_stack_colors = TRUE + supply_conversion_value = 3 + /datum/material/cult name = "cult" display_name = "disturbing stone" diff --git a/code/modules/mob/_modifiers/modifiers_misc.dm b/code/modules/mob/_modifiers/modifiers_misc.dm index 3b9663d855b..fee761cf307 100644 --- a/code/modules/mob/_modifiers/modifiers_misc.dm +++ b/code/modules/mob/_modifiers/modifiers_misc.dm @@ -426,4 +426,14 @@ the artifact triggers the rage. heat_protection = -0.5 cold_protection = -0.5 - siemens_coefficient = 1.5 \ No newline at end of file + siemens_coefficient = 1.5 + +/datum/modifier/entangled + name = "entangled" + desc = "Its hard to move." + + on_created_text = "You're caught in something! It's hard to move." + on_expired_text = "Your movement is freed." + stacks = MODIFIER_STACK_EXTEND + + slowdown = 2 diff --git a/code/modules/mob/dead/observer/observer_vr.dm b/code/modules/mob/dead/observer/observer_vr.dm index 2be0c90b804..7abad3ef09f 100644 --- a/code/modules/mob/dead/observer/observer_vr.dm +++ b/code/modules/mob/dead/observer/observer_vr.dm @@ -73,4 +73,31 @@ record.last_notification = world.time to_chat(src, "New notification has been sent.") else - to_chat(src, "No mind record found!") \ No newline at end of file + to_chat(src, "No mind record found!") + +/mob/observer/dead/verb/findghostpod() //Moves the ghost instead of just changing the ghosts's eye -Nodrak + set category = "Ghost" + set name = "Find Ghost Pod" + set desc = "Find an active ghost pod" + set popup_menu = FALSE + + if(!istype(usr, /mob/observer/dead)) //Make sure they're an observer! + return + + var/input = input(usr, "Select a ghost pod:", "Ghost Jump") as null|anything in observe_list_format(active_ghost_pods) + if(!input) + to_chat(src, "No active ghost pods detected.") + return + + var/target = observe_list_format(active_ghost_pods)[input] + if (!target)//Make sure we actually have a target + return + else + var/obj/O = target //Destination mob + var/turf/T = get_turf(O) //Turf of the destination mob + + if(T && isturf(T)) //Make sure the turf exists, then move the source to that destination. + forceMove(T) + stop_following() + else + to_chat(src, "This ghost pod is not located in the game world.") \ No newline at end of file diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index e6a618272ef..376a1fafa76 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -71,6 +71,15 @@ var/list/slot_equipment_priority = list( \ /mob/proc/equip_to_slot_or_del(obj/item/W as obj, slot) return equip_to_slot_if_possible(W, slot, 1, 1, 0) +//hurgh. these feel hacky, but they're the only way I could get the damn thing to work. I guess they could be handy for antag spawners too? +/mob/proc/equip_voidsuit_to_slot_or_del_with_refit(obj/item/clothing/suit/space/void/W as obj, slot, species = SPECIES_HUMAN) + W.refit_for_species(species) + return equip_to_slot_if_possible(W, slot, 1, 1, 0) + +/mob/proc/equip_voidhelm_to_slot_or_del_with_refit(obj/item/clothing/head/helmet/space/void/W as obj, slot, species = SPECIES_HUMAN) + W.refit_for_species(species) + return equip_to_slot_if_possible(W, slot, 1, 1, 0) + //Checks if a given slot can be accessed at this time, either to equip or unequip I /mob/proc/slot_is_accessible(var/slot, var/obj/item/I, mob/user=null) return 1 diff --git a/code/modules/mob/language/outsider.dm b/code/modules/mob/language/outsider.dm index 43ccb5bb7ee..1d73c4640c4 100644 --- a/code/modules/mob/language/outsider.dm +++ b/code/modules/mob/language/outsider.dm @@ -154,3 +154,31 @@ key = "]" flags = RESTRICTED syllables = list("chan","ange","thi","se") + +//Bloblang. +/datum/language/blob + name = LANGUAGE_BLOB + desc = "The massive processing power of the Blob's core gives the overmind finely tuned abilities to transmit messages to nearby life-forms through chemical signals." + speech_verb = "resonates" + ask_verb = "reverberates" + exclaim_verb = "shudders" + colour = "blob" + key = "}" + machine_understands = TRUE + flags = RESTRICTED + + syllables = list("^", "Ë…", "-", "°", "~") + +/datum/language/corticalborer/broadcast(var/mob/living/speaker,var/message,var/speaker_mask) + + var/mob/living/simple_mob/animal/borer/B + + if(istype(speaker,/mob/living/carbon)) + var/mob/living/carbon/M = speaker + B = M.has_brain_worms() + else if(istype(speaker,/mob/living/simple_mob/animal/borer)) + B = speaker + + if(B) + speaker_mask = B.true_name + ..(speaker,message,speaker_mask) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index fbf1b76b90f..785e223f8ff 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1323,6 +1323,8 @@ if(!O.up) found_welder = 1 if(!found_welder && nif && nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) found_welder = 1 //VOREStation Add - NIF + if(istype(glasses, /obj/item/clothing/glasses/sunglasses/thinblindfold)) + found_welder = 1 if(!found_welder && istype(head, /obj/item/clothing/head/welding)) var/obj/item/clothing/head/welding/O = head if(!O.up) diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm index 3fb94964da9..dfd34037b6f 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm @@ -54,8 +54,6 @@ base_color = "#f0f0f0" color_mult = 1 - inherent_verbs = list(/mob/living/proc/shred_limb) - has_glowing_eyes = TRUE death_message = "phases to somewhere far away!" @@ -66,8 +64,7 @@ speech_bubble_appearance = "ghost" - genders = list(PLURAL, NEUTER) //no sexual dymorphism - ambiguous_genders = TRUE //but just in case + genders = list(MALE, FEMALE, PLURAL, NEUTER) virus_immune = 1 @@ -219,34 +216,37 @@ /datum/species/shadekin/proc/update_shadekin_hud(var/mob/living/carbon/human/H) var/turf/T = get_turf(H) - if(!T) - return - if(H.shadekin_energy_display) - H.shadekin_energy_display.invisibility = 0 + if(H.shadekin_display) + var/l_icon = 0 + var/e_icon = 0 + + H.shadekin_display.invisibility = 0 + if(T) + var/brightness = T.get_lumcount() //Brightness in 0.0 to 1.0 + var/darkness = 1-brightness //Invert + switch(darkness) + if(0.80 to 1.00) + l_icon = 0 + if(0.60 to 0.80) + l_icon = 1 + if(0.40 to 0.60) + l_icon = 2 + if(0.20 to 0.40) + l_icon = 3 + if(0.00 to 0.20) + l_icon = 4 + switch(get_energy(H)) + if(0 to 24) + e_icon = 0 + if(25 to 49) + e_icon = 1 + if(50 to 74) + e_icon = 2 + if(75 to 99) + e_icon = 3 if(100 to INFINITY) - H.shadekin_energy_display.icon_state = "energy0" - if(75 to 100) - H.shadekin_energy_display.icon_state = "energy1" - if(50 to 75) - H.shadekin_energy_display.icon_state = "energy2" - if(25 to 50) - H.shadekin_energy_display.icon_state = "energy3" - if(0 to 25) - H.shadekin_energy_display.icon_state = "energy4" - if(H.shadekin_dark_display) - H.shadekin_dark_display.invisibility = 0 - var/brightness = T.get_lumcount() //Brightness in 0.0 to 1.0 - var/darkness = 1-brightness //Invert - switch(darkness) - if(0.80 to 1.00) - H.shadekin_dark_display.icon_state = "dark2" - if(0.60 to 0.80) - H.shadekin_dark_display.icon_state = "dark1" - if(0.40 to 0.60) - H.shadekin_dark_display.icon_state = "dark" - if(0.20 to 0.40) - H.shadekin_dark_display.icon_state = "dark-1" - if(0.00 to 0.20) - H.shadekin_dark_display.icon_state = "dark-2" + e_icon = 4 + + H.shadekin_display.icon_state = "shadekin-[l_icon]-[e_icon]" return \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_hud.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_hud.dm index 5017cff7240..23c23b0df83 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_hud.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_hud.dm @@ -1,17 +1,8 @@ /obj/screen/shadekin + name = "shadekin status" icon = 'icons/mob/shadekin_hud.dmi' invisibility = 101 -/obj/screen/shadekin/darkness - name = "darkness" - icon_state = "dark" - alpha = 150 - -/obj/screen/shadekin/energy - name = "energy" - icon_state = "energy0" - alpha = 150 - diff --git a/code/modules/mob/living/carbon/human/species/species_vr.dm b/code/modules/mob/living/carbon/human/species/species_vr.dm index d08ae0ee928..d24645c8ae3 100644 --- a/code/modules/mob/living/carbon/human/species/species_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_vr.dm @@ -30,6 +30,8 @@ var/base_species = null // Unused outside of a few species var/selects_bodytype = FALSE // Allows the species to choose from body types like custom species can, affecting suit fitting and etcetera as you would expect. + var/list/traits = list() + /datum/species/proc/update_attack_types() unarmed_attacks = list() for(var/u_type in unarmed_types) @@ -53,3 +55,29 @@ nif.nifsofts = nifsofts else ..() +/datum/species/proc/produceCopy(var/datum/species/to_copy,var/list/traits,var/mob/living/carbon/human/H) + ASSERT(to_copy) + ASSERT(istype(H)) + + if(ispath(to_copy)) + to_copy = "[initial(to_copy.name)]" + if(istext(to_copy)) + to_copy = GLOB.all_species[to_copy] + + var/datum/species/new_copy = new to_copy.type() + + new_copy.traits = traits + + //If you had traits, apply them + if(new_copy.traits) + for(var/trait in new_copy.traits) + var/datum/trait/T = all_traits[trait] + T.apply(new_copy,H) + + //Set up a mob + H.species = new_copy + + if(H.dna) + H.dna.ready_dna(H) + + return new_copy \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index 8353d36cbac..1b0ed79897e 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -46,10 +46,6 @@ appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR inherent_verbs = list( - /mob/living/carbon/human/proc/succubus_drain, - /mob/living/carbon/human/proc/succubus_drain_finalize, - /mob/living/carbon/human/proc/succubus_drain_lethal, - /mob/living/carbon/human/proc/bloodsuck, /mob/living/carbon/human/proc/alraune_fruit_select) //Give them the voremodes related to wrapping people in vines and sapping their fluids color_mult = 1 @@ -58,7 +54,7 @@ flesh_color = "#9ee02c" blood_color = "#edf4d0" //sap! base_color = "#1a5600" - + reagent_tag = IS_ALRAUNE blurb = "Alraunes are a rare sight in space. Their bodies are reminiscent of that of plants, and yet they share many\ @@ -449,7 +445,7 @@ //End of fruit gland code. -/datum/species/alraune/proc/produceCopy(var/datum/species/to_copy,var/list/traits,var/mob/living/carbon/human/H) +/datum/species/alraune/produceCopy(var/datum/species/to_copy,var/list/traits,var/mob/living/carbon/human/H) ASSERT(to_copy) ASSERT(istype(H)) @@ -475,6 +471,13 @@ new_copy.blood_mask = to_copy.blood_mask new_copy.damage_mask = to_copy.damage_mask new_copy.damage_overlays = to_copy.damage_overlays + new_copy.traits = traits + + //If you had traits, apply them + if(new_copy.traits) + for(var/trait in new_copy.traits) + var/datum/trait/T = all_traits[trait] + T.apply(new_copy,H) //Set up a mob H.species = new_copy diff --git a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm index bddb63f0920..20c7de5e12f 100644 --- a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm @@ -18,11 +18,11 @@ num_alternate_languages = 3 assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) + genders = list(MALE, FEMALE, PLURAL, NEUTER) + spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR - var/list/traits = list() - has_limbs = list( BP_TORSO = list("path" = /obj/item/organ/external/chest, "descriptor" = "torso"), BP_GROIN = list("path" = /obj/item/organ/external/groin, "descriptor" = "groin"), @@ -44,7 +44,7 @@ var/datum/species/real = GLOB.all_species[base_species] return real.race_key -/datum/species/custom/proc/produceCopy(var/datum/species/to_copy,var/list/traits,var/mob/living/carbon/human/H) +/datum/species/custom/produceCopy(var/datum/species/to_copy,var/list/traits,var/mob/living/carbon/human/H) ASSERT(to_copy) ASSERT(istype(H)) diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm b/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm index dc10bb562b6..4e7ac9376c3 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm @@ -13,6 +13,10 @@ "Rapala", "Neaera", "Stok", "Farwa", "Sobaka", "Wolpin", "Saru", "Sparra") + spawn_flags = SPECIES_CAN_JOIN + wikilink="https://wiki.vore-station.net/Promethean" + genders = list(MALE, FEMALE, PLURAL, NEUTER) + color_mult = 1 mob_size = MOB_MEDIUM //As of writing, original was MOB_SMALL - Allows normal swapping trashcan = 1 //They have goopy bodies. They can just dissolve things within them. @@ -30,10 +34,5 @@ /mob/living/carbon/human/proc/shapeshifter_select_tail, /mob/living/carbon/human/proc/shapeshifter_select_ears, /mob/living/proc/set_size, - /mob/living/carbon/human/proc/succubus_drain, - /mob/living/carbon/human/proc/succubus_drain_finalize, - /mob/living/carbon/human/proc/succubus_drain_lethal, - /mob/living/carbon/human/proc/slime_feed, - /mob/living/proc/eat_trash, /mob/living/carbon/human/proc/promethean_select_opaqueness, ) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm index 138af95b25b..ba4b3ee92ad 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm @@ -176,7 +176,7 @@ to_chat(src, "Your refactoring is interrupted.") to_chat(blob, "Your refactoring is interrupted!") active_regen = FALSE - nano_outofblob() + nano_outofblob(blob) //// diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm index 15904a65205..432c9fdc857 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm @@ -59,6 +59,8 @@ siemens_coefficient = 1.5 //Very bad zappy times rarity_value = 5 + genders = list(MALE, FEMALE, PLURAL, NEUTER) + has_organ = list( O_BRAIN = /obj/item/organ/internal/mmi_holder/posibrain/nano, O_ORCH = /obj/item/organ/internal/nano/orchestrator, @@ -96,9 +98,7 @@ /mob/living/carbon/human/proc/shapeshifter_select_gender, /mob/living/carbon/human/proc/shapeshifter_select_wings, /mob/living/carbon/human/proc/shapeshifter_select_tail, - /mob/living/carbon/human/proc/shapeshifter_select_ears, - /mob/living/proc/eat_trash, - /mob/living/carbon/human/proc/slime_feed + /mob/living/carbon/human/proc/shapeshifter_select_ears ) var/global/list/abilities = list() @@ -170,7 +170,7 @@ H.forceMove(H.temporary_form.drop_location()) H.ckey = H.temporary_form.ckey QDEL_NULL(H.temporary_form) - + to_chat(H, "You died as a Protean. Please sit out of the round for at least 60 minutes before respawning, to represent the time it would take to ship a new-you to the station.") for(var/obj/item/organ/I in H.internal_organs) diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm index 63158f9cba1..db223014b7a 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm @@ -566,7 +566,7 @@ return var/mob/living/carbon/human/T = G.affecting // I must say, this is a quite ingenious way of doing it. Props to the original coders. - if(!istype(T) || T.isSynthetic()) + if(!istype(T)) to_chat(src, "\The [T] is not able to be fed.") return diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm index 520b984a0bd..a850e60534f 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm @@ -25,12 +25,7 @@ inherent_verbs = list( /mob/living/carbon/human/proc/reconstitute_form, /mob/living/carbon/human/proc/sonar_ping, - /mob/living/carbon/human/proc/succubus_drain, - /mob/living/carbon/human/proc/succubus_drain_finalize, - /mob/living/carbon/human/proc/succubus_drain_lethal, - /mob/living/carbon/human/proc/bloodsuck, /mob/living/carbon/human/proc/tie_hair, - /mob/living/proc/shred_limb, /mob/living/proc/flying_toggle, /mob/living/proc/start_wings_hovering) //Xenochimera get all the special verbs since they can't select traits. @@ -57,6 +52,8 @@ flags = NO_SCAN | NO_INFECT //Dying as a chimera is, quite literally, a death sentence. Well, if it wasn't for their revive, that is. appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR + genders = list(MALE, FEMALE, PLURAL, NEUTER) + has_organ = list( //Same organ list as tajarans. O_HEART = /obj/item/organ/internal/heart, O_LUNGS = /obj/item/organ/internal/lungs, @@ -295,7 +292,7 @@ update_xenochimera_hud(H, danger, feral_state) -/datum/species/xenochimera/proc/produceCopy(var/datum/species/to_copy,var/list/traits,var/mob/living/carbon/human/H) +/datum/species/xenochimera/produceCopy(var/datum/species/to_copy,var/list/traits,var/mob/living/carbon/human/H) ASSERT(to_copy) ASSERT(istype(H)) @@ -321,6 +318,13 @@ new_copy.blood_mask = to_copy.blood_mask new_copy.damage_mask = to_copy.damage_mask new_copy.damage_overlays = to_copy.damage_overlays + new_copy.traits = traits + + //If you had traits, apply them + if(new_copy.traits) + for(var/trait in new_copy.traits) + var/datum/trait/T = all_traits[trait] + T.apply(new_copy,H) //Set up a mob H.species = new_copy @@ -402,6 +406,8 @@ spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR + genders = list(MALE, FEMALE, PLURAL, NEUTER) + flesh_color = "#AFA59E" //Gray-ish. Not sure if this is really needed, but eh. base_color = "#333333" //Blackish-gray blood_color = "#0952EF" //Spiders have blue blood. @@ -458,13 +464,12 @@ spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_WHITELIST_SELECTABLE appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_EYE_COLOR - inherent_verbs = list( - /mob/living/proc/shred_limb, - /mob/living/proc/eat_trash) flesh_color = "#AFA59E" base_color = "#777777" + genders = list(MALE, FEMALE, PLURAL, NEUTER) + heat_discomfort_strings = list( "Your fur prickles in the heat.", "You feel uncomfortably warm.", diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 4141eb8575a..ae53f807324 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -36,11 +36,12 @@ spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR - inherent_verbs = list(/mob/living/proc/shred_limb) flesh_color = "#AFA59E" base_color = "#777777" + genders = list(MALE, FEMALE, PLURAL, NEUTER) + heat_discomfort_strings = list( "Your fur prickles in the heat.", "You feel uncomfortably warm.", @@ -78,7 +79,6 @@ secondary_langs = list(LANGUAGE_SKRELLIAN) name_language = LANGUAGE_SKRELLIAN color_mult = 1 - inherent_verbs = list(/mob/living/proc/shred_limb) assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) min_age = 18 @@ -98,6 +98,8 @@ primitive_form = "Sobaka" + genders = list(MALE, FEMALE, PLURAL, NEUTER) + spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR @@ -125,7 +127,7 @@ secondary_langs = list(LANGUAGE_BIRDSONG) name_language = LANGUAGE_BIRDSONG color_mult = 1 - inherent_verbs = list(/mob/living/proc/shred_limb,/mob/living/proc/flying_toggle,/mob/living/proc/start_wings_hovering) + inherent_verbs = list(/mob/living/proc/flying_toggle,/mob/living/proc/start_wings_hovering) min_age = 18 max_age = 80 @@ -142,6 +144,8 @@ primitive_form = "Sparra" + genders = list(MALE, FEMALE, PLURAL, NEUTER) + spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR @@ -190,6 +194,8 @@ blood_color = "#240bc4" color_mult = 1 + genders = list(MALE, FEMALE, PLURAL, NEUTER) + heat_discomfort_strings = list( "Your fur prickles in the heat.", "You feel uncomfortably warm.", @@ -214,7 +220,7 @@ // gluttonous = 1 num_alternate_languages = 3 color_mult = 1 - inherent_verbs = list(/mob/living/proc/shred_limb, /mob/living/carbon/human/proc/lick_wounds) + inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds) blurb = "Vulpkanin are a species of sharp-witted canine-pideds residing on the planet Altam just barely within the \ dual-star Vazzend system. Their politically de-centralized society and independent natures have led them to become a species and \ @@ -231,6 +237,8 @@ spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR + genders = list(MALE, FEMALE, PLURAL, NEUTER) + flesh_color = "#966464" base_color = "#B43214" @@ -246,7 +254,7 @@ color_mult = 1 min_age = 18 gluttonous = 0 - inherent_verbs = list(/mob/living/proc/shred_limb) + genders = list(MALE, FEMALE, PLURAL, NEUTER) descriptors = list() wikilink="https://wiki.vore-station.net/Unathi" @@ -258,8 +266,9 @@ color_mult = 1 min_age = 18 gluttonous = 0 //Moving this here so I don't have to fix this conflict every time polaris glances at station.dm - inherent_verbs = list(/mob/living/proc/shred_limb, /mob/living/carbon/human/proc/lick_wounds) + inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds) heat_discomfort_level = 295 //Prevents heat discomfort spam at 20c + genders = list(MALE, FEMALE, PLURAL, NEUTER) wikilink="https://wiki.vore-station.net/Tajaran" agility = 90 @@ -271,12 +280,14 @@ min_age = 18 reagent_tag = null assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) + genders = list(MALE, FEMALE, PLURAL, NEUTER) wikilink="https://wiki.vore-station.net/Skrell" /datum/species/zaddat spawn_flags = SPECIES_CAN_JOIN min_age = 18 gluttonous = 0 + genders = list(MALE, FEMALE, PLURAL, NEUTER) descriptors = list() // no wiki link exists for Zaddat yet @@ -291,6 +302,7 @@ /datum/species/diona spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_WHITELIST_SELECTABLE min_age = 18 + genders = list(MALE, FEMALE, PLURAL, NEUTER) wikilink="https://wiki.vore-station.net/Diona" /datum/species/teshari @@ -304,6 +316,7 @@ push_flags = ~HEAVY //Allows them to use micro step code. swap_flags = ~HEAVY gluttonous = 0 + genders = list(MALE, FEMALE, PLURAL, NEUTER) descriptors = list() wikilink="https://wiki.vore-station.net/Teshari" agility = 90 @@ -311,20 +324,16 @@ inherent_verbs = list( /mob/living/carbon/human/proc/sonar_ping, /mob/living/proc/hide, - /mob/living/proc/shred_limb, /mob/living/proc/toggle_pass_table ) -/datum/species/shapeshifter/promethean - spawn_flags = SPECIES_CAN_JOIN - wikilink="https://wiki.vore-station.net/Promethean" - /datum/species/human color_mult = 1 icobase = 'icons/mob/human_races/r_human_vr.dmi' deform = 'icons/mob/human_races/r_def_human_vr.dmi' appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR min_age = 18 + genders = list(MALE, FEMALE, PLURAL, NEUTER) base_color = "#EECEB3" wikilink="https://wiki.vore-station.net/Human" @@ -337,7 +346,6 @@ min_age = 18 icobase = 'icons/mob/human_races/r_vox_old.dmi' deform = 'icons/mob/human_races/r_def_vox_old.dmi' - inherent_verbs = list(/mob/living/proc/shred_limb, /mob/living/proc/eat_trash) descriptors = list( /datum/mob_descriptor/vox_markings = 0 ) @@ -355,6 +363,7 @@ datum/species/harpy secondary_langs = list(LANGUAGE_BIRDSONG) name_language = null color_mult = 1 + genders = list(MALE, FEMALE, PLURAL, NEUTER) inherent_verbs = list(/mob/living/proc/flying_toggle,/mob/living/proc/start_wings_hovering) min_age = 18 @@ -440,8 +449,6 @@ datum/species/harpy base_color = "#f0f0f0" color_mult = 1 - inherent_verbs = list(/mob/living/proc/shred_limb) - has_glowing_eyes = TRUE male_cough_sounds = null @@ -451,8 +458,7 @@ datum/species/harpy speech_bubble_appearance = "ghost" - genders = list(PLURAL, NEUTER) //no sexual dymorphism - ambiguous_genders = TRUE //but just in case + genders = list(MALE, FEMALE, PLURAL, NEUTER) breath_type = null poison_type = null @@ -513,6 +519,7 @@ datum/species/harpy //primitive_form = "" //We don't have fennec-monkey sprites. spawn_flags = SPECIES_IS_RESTRICTED appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR + genders = list(MALE, FEMALE, PLURAL, NEUTER) flesh_color = "#AFA59E" base_color = "#333333" @@ -552,6 +559,7 @@ datum/species/harpy spawn_flags = SPECIES_IS_RESTRICTED appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR + genders = list(MALE, FEMALE, PLURAL, NEUTER) blood_color = "#12ff12" flesh_color = "#201730" @@ -562,4 +570,3 @@ datum/species/harpy "You feel uncomfortably warm.", "Your chitin feels hot." ) - inherent_verbs = list(/mob/living/proc/shred_limb) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index e9229b89e69..18fba552c37 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -145,5 +145,5 @@ name = "Neural Hypersensitivity" desc = "Your nerves are particularly sensitive to physical changes, leading to experiencing twice the intensity of pain and pleasure alike. Doubles traumatic shock." cost = -1 - var_changes = list("traumatic_mod" = 2) + var_changes = list("trauma_mod" = 2) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index 91422e7dd8d..e983ebd398c 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -25,7 +25,7 @@ cost = 0 var_changes = list("cold_level_1" = 200, "cold_level_2" = 150, "cold_level_3" = 90, "breath_cold_level_1" = 180, "breath_cold_level_2" = 100, "breath_cold_level_3" = 60, "cold_discomfort_level" = 210, "heat_level_1" = 305, "heat_level_2" = 360, "heat_level_3" = 700, "breath_heat_level_1" = 345, "breath_heat_level_2" = 380, "breath_heat_level_3" = 780, "heat_discomfort_level" = 295, "body_temperature" = 290) excludes = list(/datum/trait/hotadapt) - + /datum/trait/hotadapt name = "Heat-Adapted" desc = "You are able to withstand much hotter temperatures than other species, and can even be comfortable in extremely hot environments. You are also more vulnerable to cold environments, and have a higher body temperature as a consequence of these adaptations." @@ -74,6 +74,7 @@ name = "Succubus Drain" desc = "Makes you able to gain nutrition from draining prey in your grasp." cost = 0 + custom_only = FALSE /datum/trait/succubus_drain/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) @@ -85,6 +86,7 @@ name = "Feeder" desc = "Allows you to feed your prey using your own body." cost = 0 + custom_only = FALSE /datum/trait/feeder/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) @@ -93,7 +95,8 @@ /datum/trait/hard_vore name = "Brutal Predation" desc = "Allows you to tear off limbs & tear out internal organs." - cost = 0 //I would make this cost a point, since it has some in game value, but there are easier, less damaging ways to perform the same functions. + cost = 0 + custom_only = FALSE /datum/trait/hard_vore/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) @@ -103,6 +106,7 @@ name = "Trash Can" desc = "Allows you to dispose of some garbage on the go instead of having to look for a bin or littering like an animal." cost = 0 + custom_only = FALSE var_changes = list("trashcan" = 1) /datum/trait/trashcan/apply(var/datum/species/S,var/mob/living/carbon/human/H) @@ -131,12 +135,15 @@ name = "Glowing Eyes" desc = "Your eyes show up above darkness. SPOOKY! And kinda edgey too." cost = 0 + custom_only = FALSE var_changes = list("has_glowing_eyes" = 1) /datum/trait/glowing_body name = "Glowing Body" desc = "Your body glows about as much as a PDA light! Settable color and toggle in Abilities tab ingame." cost = 0 + custom_only = FALSE + /datum/trait/glowing_body/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/proc/glow_toggle @@ -147,36 +154,42 @@ name = "Extreme Spice Intolerance" desc = "Spicy (and chilly) peppers are three times as strong. (This does not affect pepperspray.)" cost = 0 + custom_only = FALSE var_changes = list("spice_mod" = 3) // 300% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! - + /datum/trait/spice_intolerance_basic name = "Heavy Spice Intolerance" desc = "Spicy (and chilly) peppers are twice as strong. (This does not affect pepperspray.)" cost = 0 + custom_only = FALSE var_changes = list("spice_mod" = 2) // 200% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! /datum/trait/spice_intolerance_slight name = "Slight Spice Intolerance" desc = "You have a slight struggle with spicy foods. Spicy (and chilly) peppers are one and a half times stronger. (This does not affect pepperspray.)" cost = 0 + custom_only = FALSE var_changes = list("spice_mod" = 1.5) // 150% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! /datum/trait/spice_tolerance_basic name = "Spice Tolerance" desc = "Spicy (and chilly) peppers are only three-quarters as strong. (This does not affect pepperspray.)" cost = 0 + custom_only = FALSE var_changes = list("spice_mod" = 0.75) // 75% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! - + /datum/trait/spice_tolerance_advanced name = "Strong Spice Tolerance" desc = "Spicy (and chilly) peppers are only half as strong. (This does not affect pepperspray.)" cost = 0 + custom_only = FALSE var_changes = list("spice_mod" = 0.5) // 50% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! /datum/trait/spice_immunity name = "Extreme Spice Tolerance" desc = "Spicy (and chilly) peppers are basically ineffective! (This does not affect pepperspray.)" cost = 0 + custom_only = FALSE var_changes = list("spice_mod" = 0.25) // 25% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! // Alcohol Traits Start Here, from negative to positive. @@ -184,35 +197,41 @@ name = "Liver of Air" desc = "The only way you can hold a drink is if it's in your own two hands, and even then you'd best not inhale too deeply near it. Drinks are three times as strong." cost = 0 + custom_only = FALSE var_changes = list("alcohol_mod" = 3) // 300% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! /datum/trait/alcohol_intolerance_basic name = "Liver of Lilies" desc = "You have a hard time with alcohol. Maybe you just never took to it, or maybe it doesn't agree with you... either way, drinks are twice as strong." cost = 0 + custom_only = FALSE var_changes = list("alcohol_mod" = 2) // 200% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! /datum/trait/alcohol_intolerance_slight name = "Liver of Tulips" desc = "You have a slight struggle with alcohol. Drinks are one and a half times stronger." cost = 0 + custom_only = FALSE var_changes = list("alcohol_mod" = 1.5) // 150% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! /datum/trait/alcohol_tolerance_basic name = "Liver of Iron" desc = "You can hold drinks much better than those lily-livered land-lubbers! Arr! Drinks are only three-quarters as strong." cost = 0 + custom_only = FALSE var_changes = list("alcohol_mod" = 0.75) // 75% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! - + /datum/trait/alcohol_tolerance_advanced name = "Liver of Steel" desc = "Drinks tremble before your might! You can hold your alcohol twice as well as those blue-bellied barnacle boilers! Drinks are only half as strong." cost = 0 + custom_only = FALSE var_changes = list("alcohol_mod" = 0.5) // 50% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! /datum/trait/alcohol_immunity name = "Liver of Durasteel" desc = "You've drunk so much that most booze doesn't even faze you. It takes something like a Pan-Galactic or a pint of Deathbell for you to even get slightly buzzed." cost = 0 + custom_only = FALSE var_changes = list("alcohol_mod" = 0.25) // 25% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! // Alcohol Traits End Here. \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm index 434fc8d846f..605da7e5698 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm @@ -5,7 +5,8 @@ var/cost = 0 // 0 is neutral, negative cost means negative, positive cost means positive. var/list/var_changes // A list to apply to the custom species vars. var/list/excludes // Store a list of paths of traits to exclude, but done automatically if they change the same vars. - var/not_for_synths = 0 // Can freaking synths use those. + var/not_for_synths = FALSE // Can freaking synths use those. + var/custom_only = TRUE // Trait only available for custom species //Proc can be overridden lower to include special changes, make sure to call up though for the vars changes /datum/trait/proc/apply(var/datum/species/S,var/mob/living/carbon/human/H) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index f47566279ad..c84f6b4cadd 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -286,6 +286,10 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() if(part.transparent) //VOREStation Edit. For better slime limbs. Avoids using solid var due to limb dropping. icon_key += "_t" //VOREStation Edit. + if(istype(tail_style, /datum/sprite_accessory/tail/taur)) + if(tail_style.clip_mask) //VOREStation Edit. + icon_key += tail_style.clip_mask_state + icon_key = "[icon_key][husk ? 1 : 0][fat ? 1 : 0][hulk ? 1 : 0][skeleton ? 1 : 0]" var/icon/base_icon if(human_icon_cache[icon_key]) @@ -295,10 +299,27 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() var/obj/item/organ/external/chest = get_organ(BP_TORSO) base_icon = chest.get_icon() + var/icon/Cutter = null + + if(istype(tail_style, /datum/sprite_accessory/tail/taur)) // Tail icon 'cookie cutters' are filled in where icons are preserved. We need to invert that. + if(tail_style.clip_mask) //VOREStation Edit. + Cutter = new(icon = tail_style.icon, icon_state = tail_style.clip_mask_state) + + Cutter.Blend("#000000", ICON_MULTIPLY) // Make it all black. + + Cutter.SwapColor("#00000000", "#FFFFFFFF") // Everywhere empty, make white. + Cutter.SwapColor("#000000FF", "#00000000") // Everywhere black, make empty. + + Cutter.Blend("#000000", ICON_MULTIPLY) // Black again. + for(var/obj/item/organ/external/part in organs) if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) //VOREStation Edit allowing tails to prevent bodyparts rendering, granting more spriter freedom for taur/digitigrade stuff. continue var/icon/temp = part.get_icon(skeleton) + + if((part.organ_tag in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)) && Cutter) + temp.Blend(Cutter, ICON_AND, x = -16) + //That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST //And no change in rendering for other parts (they icon_position is 0, so goes to 'else' part) if(part.icon_position & (LEFT | RIGHT)) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index a8137a8a89e..11158d89a1f 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -181,7 +181,7 @@ ..() /mob/living/blob_act(var/obj/structure/blob/B) - if(stat == DEAD || faction == "blob") + if(stat == DEAD || faction == B.faction) return var/damage = rand(30, 40) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index ef5336e5b96..9f703ea0269 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -167,7 +167,8 @@ "K9 Alternative" = "k92", "Secborg model V-2" = "secborg", "Borgi" = "borgi-sec", - "Otieborg" = "oties" + "Otieborg" = "oties", + "Drake" = "drakesec" ) channels = list("Security" = 1) networks = list(NETWORK_SECURITY) @@ -198,7 +199,8 @@ B.water = water src.modules += B - R.icon = 'icons/mob/widerobot_vr.dmi' + R.icon = 'icons/mob/widerobot_sec_vr.dmi' + R.wideborg_dept = 'icons/mob/widerobot_sec_vr.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' R.ui_style_vr = TRUE R.pixel_x = -16 @@ -243,7 +245,8 @@ "Medical Hound" = "medihound", "Dark Medical Hound (Static)" = "medihounddark", "Mediborg model V-2" = "vale", - "Borgi" = "borgi-medi" + "Borgi" = "borgi-medi", + "Drake" = "drakemed" ) /obj/item/weapon/robot_module/robot/medihound/New(var/mob/living/silicon/robot/R) @@ -283,7 +286,8 @@ B.water = water src.modules += B - R.icon = 'icons/mob/widerobot_vr.dmi' + R.icon = 'icons/mob/widerobot_med_vr.dmi' + R.wideborg_dept = 'icons/mob/widerobot_med_vr.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' R.ui_style_vr = TRUE R.pixel_x = -16 @@ -352,7 +356,8 @@ sprites = list( "Custodial Hound" = "scrubpup", "Borgi" = "borgi-jani", - "Otieborg" = "otiej" + "Otieborg" = "otiej", + "Drake" = "drakejanit" ) channels = list("Service" = 1) pto_type = PTO_CIVILIAN @@ -416,7 +421,8 @@ G.recipes += new/datum/stack_recipe("glass sheet", /obj/item/stack/material/glass, 1, 1, 20) src.modules += G - R.icon = 'icons/mob/widerobot_vr.dmi' + R.icon = 'icons/mob/widerobot_jan_vr.dmi' + R.wideborg_dept = 'icons/mob/widerobot_jan_vr.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' R.ui_style_vr = TRUE R.pixel_x = -16 @@ -437,7 +443,8 @@ "Research Hound" = "science", "Borgi" = "borgi-sci", "SciHound" = "scihound", - "SciHoundDark" = "scihounddark" + "SciHoundDark" = "scihounddark", + "Drake" = "drakesci" ) channels = list("Science" = 1) pto_type = PTO_SCIENCE @@ -490,7 +497,8 @@ C.synths = list(wire) src.modules += C - R.icon = 'icons/mob/widerobot_vr.dmi' + R.icon = 'icons/mob/widerobot_sci_vr.dmi' + R.wideborg_dept = 'icons/mob/widerobot_sci_vr.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' R.ui_style_vr = TRUE R.pixel_x = -16 @@ -512,7 +520,8 @@ "Borgi" = "borgi-eng", "V2 Engidog" = "thottbot", "EngiHound" = "engihound", - "EngiHoundDark" = "engihounddark" + "EngiHoundDark" = "engihounddark", + "Drake" = "drakeeng" ) channels = list("Engineering" = 1) networks = list(NETWORK_ENGINEERING) @@ -639,7 +648,8 @@ PS.synths = list(plasteel) src.modules += PS - R.icon = 'icons/mob/widerobot_vr.dmi' + R.icon = 'icons/mob/widerobot_eng_vr.dmi' + R.wideborg_dept = 'icons/mob/widerobot_eng_vr.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' R.ui_style_vr = TRUE R.pixel_x = -16 @@ -662,6 +672,7 @@ "Pinkhound" = "k69", "ServicehoundV2" = "serve2", "ServicehoundV2 Darkmode" = "servedark", + "Drake" = "drakemine" ) channels = list("Service" = 1) pto_type = PTO_CIVILIAN @@ -715,7 +726,8 @@ src.modules += B */ - R.icon = 'icons/mob/widerobot_vr.dmi' + R.icon = 'icons/mob/widerobot_ser_vr.dmi' + R.wideborg_dept = 'icons/mob/widerobot_ser_vr.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' R.ui_style_vr = TRUE R.pixel_x = -16 @@ -733,7 +745,8 @@ sprites = list( "KMine" = "kmine", "CargoHound" = "cargohound", - "CargoHoundDark" = "cargohounddark" + "CargoHoundDark" = "cargohounddark", + "Drake" = "drakemine" ) channels = list("Supply" = 1) pto_type = PTO_CARGO @@ -766,7 +779,8 @@ B.water = water src.modules += B - R.icon = 'icons/mob/widerobot_vr.dmi' + R.icon = 'icons/mob/widerobot_car_vr.dmi' + R.wideborg_dept = 'icons/mob/widerobot_car_vr.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' R.ui_style_vr = TRUE R.pixel_x = -16 diff --git a/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm b/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm index 7c6f22d6b9a..fe390404328 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm @@ -37,6 +37,12 @@ src.modules += new /obj/item/weapon/pinpointer/shuttle/merc(src) src.modules += new /obj/item/weapon/melee/energy/sword(src) + var/datum/matter_synth/cloth = new /datum/matter_synth/cloth(40000) + synths += cloth + + var/obj/item/stack/sandbags/cyborg/SB = new /obj/item/stack/sandbags/cyborg(src) + SB.synths += list(cloth) + var/jetpack = new/obj/item/weapon/tank/jetpack/carbondioxide(src) src.modules += jetpack R.internals = jetpack diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm index 21011e84c7b..f81aee6158d 100644 --- a/code/modules/mob/living/silicon/robot/robot_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_vr.dm @@ -15,6 +15,7 @@ var/sitting = FALSE var/bellyup = FALSE does_spin = FALSE + var/wideborg_dept = 'icons/mob/widerobot_vr.dmi' var/vr_icons = list( "handy-hydro", "handy-service", @@ -141,7 +142,13 @@ to_chat(cleaned_human, "[src] cleans your face!") /mob/living/silicon/robot/proc/vr_sprite_check() + if(custom_sprite == TRUE) + return if(wideborg == TRUE) + if(icontype== "Drake") // Why, Why can't we have normal nice things + icon = 'icons/mob/drakeborg/drakeborg_vr.dmi' + else + icon = wideborg_dept return if((!(original_icon == icon)) && (!(icon == 'icons/mob/robots_vr.dmi'))) original_icon = icon diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index ef631fa8975..853848b83d7 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -4,7 +4,9 @@ #define SA_ICON_REST 0x04 /mob/living/simple_mob - base_attack_cooldown = 15 + melee_attack_delay = 1 + base_attack_cooldown = 10 + melee_miss_chance = 25 var/temperature_range = 40 // How close will they get to environmental temperature before their body stops changing its heat diff --git a/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm b/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm index 44ab4fdd09b..752211812d7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm +++ b/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm @@ -50,9 +50,13 @@ /mob/living/simple_mob/blob/blob_act(obj/structure/blob/B) if(!overmind && B.overmind) overmind = B.overmind + faction = B.overmind.blob_type.faction update_icon() - if(stat != DEAD && health < maxHealth) + if(faction != B.faction && B.overmind) + adjustBruteLoss(rand(B.overmind.blob_type.damage_lower, B.overmind.blob_type.damage_upper)) + + else if(stat != DEAD && health < maxHealth) adjustBruteLoss(-maxHealth*0.0125) adjustFireLoss(-maxHealth*0.0125) @@ -73,7 +77,7 @@ for(var/obj/item/I in items) if(istype(I, /obj/item/weapon/blobcore_chunk)) var/obj/item/weapon/blobcore_chunk/BC = I - if(!overmind || (BC.blob_type && overmind.blob_type.type == BC.blob_type.type)) + if(!overmind || (BC.blob_type && overmind.blob_type.type == BC.blob_type.type) || BC.blob_type.faction == faction) ally = TRUE break diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm index bf8387ffc28..af2d00404e5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm @@ -81,6 +81,13 @@ max_n2 = 0 has_eye_glow = TRUE +/mob/living/simple_mob/otie/feral/chubby + name = "chubby mutated feral otie" + desc = "The classic bioengineered longdog. No pets. Only bite. This one has mutated from too much time out on the surface of Virgo-3B. What an absolute unit." + icon_state = "photiec" + icon_living = "photiec" + icon_rest = "photiec_rest" + /mob/living/simple_mob/otie/red name = "feral red otie" desc = "Seems this ominous looking longdog has been infused with wicked infernal forces." @@ -109,6 +116,15 @@ faction = "neutral" tamed = 1 +/mob/living/simple_mob/otie/red/chubby //gets the pet2tame feature and doesn't kill you right away + name = "chubby red otie" + desc = "Seems this ominous looking longdog has been infused with wicked infernal forces. What an absolute unit." + icon_state = "hotiec" + icon_living = "hotiec" + icon_rest = "hotiec_rest" + faction = "neutral" + tamed = 1 + /mob/living/simple_mob/otie/friendly //gets the pet2tame feature and doesn't kill you right away name = "otie" desc = "The classic bioengineered longdog. This one might even tolerate you!" @@ -158,7 +174,7 @@ /mob/living/simple_mob/otie/security //tame by default unless you're a marked crimester. can be befriended to follow with pets tho. name = "guard otie" - desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs." + desc = "The VARMAcorp bioengineering division flagship product on big mean guard dogs." icon_state = "sotie" icon_living = "sotie" icon_rest = "sotie_rest" @@ -176,7 +192,7 @@ /mob/living/simple_mob/otie/security/chubby name = "chubby guard otie" - desc = "The VARMAcorp bioengineering division flagship product on trained optimal snowflake guard dogs. What an absolute unit." + desc = "The VARMAcorp bioengineering division flagship product on big mean guard dogs. What an absolute unit." icon_state = "fsotie" icon_living = "fsotie" icon_rest = "fsotie_rest" @@ -184,7 +200,7 @@ /mob/living/simple_mob/otie/security/phoron name = "mutated guard otie" - desc = "An extra rare phoron resistant version of the VARMAcorp trained snowflake guard dogs for infernal environments." + desc = "An extra rare phoron resistant version of the VARMAcorp trained guard dogs adapted for hostile environments." tt_desc = "Otus phoronis" icon_state = "secphotie" icon_living = "secphotie" @@ -201,7 +217,7 @@ /mob/living/simple_mob/otie/security/phoron/red name = "red guard otie" - desc = "An ominous looking version of the VARMAcorp trained snowflake guard dogs." + desc = "An ominous looking version of the big mean VARMAcorp guard dogs." tt_desc = "Otus infernalis" icon_state = "sechotie" icon_living = "sechotie" @@ -209,6 +225,13 @@ icon_dead = "sechotie-dead" maxbodytemp = 1000 +/mob/living/simple_mob/otie/security/phoron/red/chubby + name = "chubby red guard otie" + desc = "An ominous looking version of the big mean VARMAcorp guard dogs. What an absolute unit." + icon_state = "hotiesc" + icon_living = "hotiesc" + icon_rest = "hotiesc_rest" + /mob/living/simple_mob/otie/attackby(var/obj/item/O, var/mob/user) // Trade donuts for bellybrig victims. if(istype(O, /obj/item/weapon/reagent_containers/food)) qdel(O) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm index b4c656ddc38..1b4a2e9ad86 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm @@ -66,7 +66,6 @@ name = "dire wolf" desc = "The biggest and baddest wolf around." tt_desc = "Canis maxdirus" - icon = 'icons/mob/vore64x32.dmi' icon_dead = "direwolf-dead" icon_living = "direwolf" @@ -108,12 +107,27 @@ name = "large dog" desc = "The biggest and goodest dog around." tt_desc = "Canis maxdirus familiaris" - icon_dead = "diredog-dead" icon_living = "diredog" icon_state = "diredog" icon_rest = "diredog_rest" +/mob/living/simple_mob/animal/wolf/direwolf/dog/sec + name = "large guard dog" + desc = "The biggest and goodest guard dog around." + icon_dead = "diredogs-dead" + icon_living = "diredogs" + icon_state = "diredogs" + icon_rest = "diredogs_rest" + +/mob/living/simple_mob/animal/wolf/direwolf/sec + name = "dire guard wolf" + desc = "The biggest and baddest guard wolf around." + icon_dead = "direwolfs-dead" + icon_living = "direwolfs" + icon_state = "direwolfs" + icon_rest = "direwolfs_rest" + /mob/living/simple_mob/animal/wolf/direwolf/rykka name = "Rykka" desc = "This big canine looks like a GSD. It has a collar tagged, 'Bitch'" diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 2cfed0de5be..d9394cf3b13 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -682,7 +682,7 @@ // facing verbs /mob/proc/canface() - if(!canmove) return 0 +// if(!canmove) return 0 //VOREStation Edit. Redundant check that only affects conscious proning, actual inability to turn and shift around handled by actual inabilities. if(stat) return 0 if(anchored) return 0 if(transforming) return 0 diff --git a/code/modules/mob/mob_defines_vr.dm b/code/modules/mob/mob_defines_vr.dm index 1c6e19ac789..41c27a41d0e 100644 --- a/code/modules/mob/mob_defines_vr.dm +++ b/code/modules/mob/mob_defines_vr.dm @@ -5,8 +5,7 @@ var/disconnect_time = null //Time of client loss, set by Logout(), for timekeeping - var/obj/screen/shadekin/darkness/shadekin_dark_display = null - var/obj/screen/shadekin/energy/shadekin_energy_display = null + var/obj/screen/shadekin/shadekin_display = null var/obj/screen/xenochimera/danger_level/xenochimera_danger_display = null /mob/drop_location() diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 75b2ccd07f2..95732bad6aa 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -289,7 +289,7 @@ // If we have a grab var/list/grablist = my_mob.ret_grab() - if(grablist.len) + if(LAZYLEN(grablist)) grablist -= my_mob // Just in case we're in a circular grab chain // It's just us and another person diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm index 4f48a4adf4c..64f65adfbb7 100644 --- a/code/modules/mob/say_vr.dm +++ b/code/modules/mob/say_vr.dm @@ -37,7 +37,7 @@ if(input) log_subtle(message,src) - message = "[src] [input]" + message = "[src] [input]" else return diff --git a/code/modules/multiz/admin_upload.dm b/code/modules/multiz/admin_upload.dm new file mode 100644 index 00000000000..5edd88d1f42 --- /dev/null +++ b/code/modules/multiz/admin_upload.dm @@ -0,0 +1,23 @@ +/obj/effect/landmark/map_data/admin_upload + name = "Unknown" + desc = "An unknown location." + +/obj/effect/landmark/map_data/admin_upload/two + desc = "An unknown location. It's two levels tall." + height = 2 + +/obj/effect/landmark/map_data/admin_upload/three + desc = "An unknown location. It's three levels tall." + height = 3 + +/obj/effect/landmark/map_data/admin_upload/four + desc = "An unknown location. It's four levels tall." + height = 4 + +/obj/effect/landmark/map_data/admin_upload/five + desc = "An unknown location. It's five levels tall." + height = 5 + +/obj/effect/landmark/map_data/admin_upload/six + desc = "An unknown location. It's six levels tall." + height = 6 \ No newline at end of file diff --git a/code/modules/multiz/structures_vr.dm b/code/modules/multiz/structures_vr.dm index e55b0eae5a0..8f96800a7ea 100644 --- a/code/modules/multiz/structures_vr.dm +++ b/code/modules/multiz/structures_vr.dm @@ -76,4 +76,47 @@ M << 'sound/effects/phasein.ogg' playsound(src, 'sound/effects/phasein.ogg', 100, 1) M.forceMove(dest.loc) + if(istype(M, /mob/living) && dest.abductor) + var/mob/living/L = M + //Situations to get the mob out of + if(L.buckled) + L.buckled.unbuckle_mob() + if(istype(L.loc,/obj/mecha)) + var/obj/mecha/ME = L.loc + ME.go_out() + else if(istype(L.loc,/obj/machinery/sleeper)) + var/obj/machinery/sleeper/SL = L.loc + SL.go_out() + else if(istype(L.loc,/obj/machinery/recharge_station)) + var/obj/machinery/recharge_station/RS = L.loc + RS.go_out() + if(!issilicon(L)) //Don't drop borg modules... + var/list/mob_contents = list() //Things which are actually drained as a result of the above not being null. + mob_contents |= L // The recursive check below does not add the object being checked to its list. + mob_contents |= recursive_content_check(L, mob_contents, recursion_limit = 3, client_check = 0, sight_check = 0, include_mobs = 1, include_objects = 1, ignore_show_messages = 1) + for(var/obj/item/weapon/holder/I in mob_contents) + var/obj/item/weapon/holder/H = I + var/mob/living/MI = H.held_mob + MI.forceMove(get_turf(H)) + if(!issilicon(MI)) //Don't drop borg modules... + for(var/obj/item/II in MI) + if(istype(II,/obj/item/weapon/implant) || istype(II,/obj/item/device/nif)) + continue + MI.drop_from_inventory(II, dest.loc) + var/obj/effect/landmark/finaldest = pick(awayabductors) + MI.forceMove(finaldest.loc) + sleep(1) + MI.Paralyse(10) + MI << 'sound/effects/bamf.ogg' + to_chat(MI,"You're starting to come to. You feel like you've been out for a few minutes, at least...") + for(var/obj/item/I in L) + if(istype(I,/obj/item/weapon/implant) || istype(I,/obj/item/device/nif)) + continue + L.drop_from_inventory(I, dest.loc) + var/obj/effect/landmark/finaldest = pick(awayabductors) + L.forceMove(finaldest.loc) + sleep(1) + L.Paralyse(10) + L << 'sound/effects/bamf.ogg' + to_chat(L,"You're starting to come to. You feel like you've been out for a few minutes, at least...") return diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 30c539bbde3..016e3fce3cc 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -33,7 +33,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) if(!owner || owner.stat == DEAD) defib_timer = max(--defib_timer, 0) else - defib_timer = min(++defib_timer, (config.defib_timer MINUTES) / 2) + defib_timer = min(++defib_timer, (config.defib_timer MINUTES) / 20) // Time vars measure things in ticks. Life tick happens every ~2 seconds, therefore dividing by 20 /obj/item/organ/internal/brain/proc/can_assist() return can_assist @@ -81,7 +81,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) /obj/item/organ/internal/brain/New() ..() health = config.default_brain_health - defib_timer = (config.defib_timer MINUTES) / 2 + defib_timer = (config.defib_timer MINUTES) / 20 // Time vars measure things in ticks. Life tick happens every ~2 seconds, therefore dividing by 20 spawn(5) if(brainmob) butcherable = FALSE @@ -103,7 +103,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) if(istype(H)) brainmob.dna = H.dna.Clone() brainmob.timeofhostdeath = H.timeofdeath - brainmob.ooc_notes = H.ooc_notes //VOREStation Edit + brainmob.ooc_notes = H.ooc_notes //VOREStation Edit // Copy modifiers. for(var/datum/modifier/M in H.modifiers) diff --git a/code/modules/overmap/ships/computers/ship_vr.dm b/code/modules/overmap/ships/computers/ship_vr.dm new file mode 100644 index 00000000000..b317eb3c1e4 --- /dev/null +++ b/code/modules/overmap/ships/computers/ship_vr.dm @@ -0,0 +1,13 @@ +/* +Ships can now be hijacked! +*/ +/obj/machinery/computer/ship + var/hacked = 0 // Has been emagged, no access restrictions. + +/obj/machinery/computer/ship/emag_act(var/remaining_charges, var/mob/user) + if (!hacked) + req_access = list() + req_one_access = list() + hacked = 1 + to_chat(user, "You short out the console's ID checking system. It's now available to everyone!") + return 1 diff --git a/code/modules/planet/virgo3b_vr.dm b/code/modules/planet/virgo3b_vr.dm index 791841aca71..26d33631a1d 100644 --- a/code/modules/planet/virgo3b_vr.dm +++ b/code/modules/planet/virgo3b_vr.dm @@ -1,7 +1,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null /datum/time/virgo3b - seconds_in_day = 3 HOURS + seconds_in_day = 6 HOURS /datum/planet/virgo3b name = "Virgo-3B" diff --git a/code/modules/planet/virgo4_vr.dm b/code/modules/planet/virgo4_vr.dm new file mode 100644 index 00000000000..50c0b8426ee --- /dev/null +++ b/code/modules/planet/virgo4_vr.dm @@ -0,0 +1,522 @@ +var/datum/planet/virgo4/planet_virgo4 = null + +/datum/time/virgo4 + seconds_in_day = 24 HOURS + +/datum/planet/virgo4 + name = "Virgo-4" + desc = "Zorren homeworld. Mostly dry and desolate, but ocean and fresh water are present, with scattered vegitation." //rewrite me + current_time = new /datum/time/virgo4() +// expected_z_levels = list(1) // This is defined elsewhere. + planetary_wall_type = /turf/unsimulated/wall/planetary/normal/virgo4 + +/datum/planet/virgo4/New() + ..() + planet_virgo4 = src + weather_holder = new /datum/weather_holder/virgo4(src) + +/datum/planet/virgo4/update_sun() + ..() + var/datum/time/time = current_time + var/length_of_day = time.seconds_in_day / 10 / 60 / 60 + var/noon = length_of_day / 2 + var/distance_from_noon = abs(text2num(time.show_time("hh")) - noon) + sun_position = distance_from_noon / noon + sun_position = abs(sun_position - 1) + + var/low_brightness = null + var/high_brightness = null + + var/low_color = null + var/high_color = null + var/min = 0 + + switch(sun_position) + if(0 to 0.30) // Night + low_brightness = 0.1 + low_color = "#000066" + + high_brightness = 0.2 + high_color = "#66004D" + min = 0 + + if(0.30 to 0.40) // Twilight + low_brightness = 0.4 + low_color = "#66004D" + + high_brightness = 0.6 + high_color = "#CC3300" + min = 0.40 + + if(0.40 to 0.50) // Sunrise/set + low_brightness = 0.7 + low_color = "#CC3300" + + high_brightness = 0.9 + high_color = "#FF9933" + min = 0.50 + + if(0.50 to 1.00) // Noon + low_brightness = 1 + low_color = "#DDDDDD" + + high_brightness = 2 + high_color = "#FFFFFF" + min = 0.70 + + var/interpolate_weight = (abs(min - sun_position)) * 4 + var/weather_light_modifier = 1 + if(weather_holder && weather_holder.current_weather) + weather_light_modifier = weather_holder.current_weather.light_modifier + + var/new_brightness = (LERP(low_brightness, high_brightness, interpolate_weight) ) * weather_light_modifier + + var/new_color = null + if(weather_holder && weather_holder.current_weather && weather_holder.current_weather.light_color) + new_color = weather_holder.current_weather.light_color + else + var/list/low_color_list = hex2rgb(low_color) + var/low_r = low_color_list[1] + var/low_g = low_color_list[2] + var/low_b = low_color_list[3] + + var/list/high_color_list = hex2rgb(high_color) + var/high_r = high_color_list[1] + var/high_g = high_color_list[2] + var/high_b = high_color_list[3] + + var/new_r = LERP(low_r, high_r, interpolate_weight) + var/new_g = LERP(low_g, high_g, interpolate_weight) + var/new_b = LERP(low_b, high_b, interpolate_weight) + + new_color = rgb(new_r, new_g, new_b) + + spawn(1) + update_sun_deferred(2, new_brightness, new_color) + + +/datum/weather_holder/virgo4 + temperature = T0C + allowed_weather_types = list( + WEATHER_CLEAR = new /datum/weather/virgo4/clear(), + WEATHER_OVERCAST = new /datum/weather/virgo4/overcast(), + WEATHER_LIGHT_SNOW = new /datum/weather/virgo4/light_snow(), + WEATHER_SNOW = new /datum/weather/virgo4/snow(), + WEATHER_BLIZZARD = new /datum/weather/virgo4/blizzard(), + WEATHER_RAIN = new /datum/weather/virgo4/rain(), + WEATHER_STORM = new /datum/weather/virgo4/storm(), + WEATHER_HAIL = new /datum/weather/virgo4/hail(), + WEATHER_BLOOD_MOON = new /datum/weather/virgo4/blood_moon(), + WEATHER_EMBERFALL = new /datum/weather/virgo4/emberfall(), + WEATHER_ASH_STORM = new /datum/weather/virgo4/ash_storm(), + WEATHER_FALLOUT = new /datum/weather/virgo4/fallout() + ) + roundstart_weather_chances = list( + WEATHER_CLEAR = 50, + WEATHER_OVERCAST = 10, + WEATHER_RAIN = 1 + ) + +/datum/weather/virgo4 + name = "virgo4" + temp_high = 303.15 // 30c + temp_low = 298.15 // 25c + +/datum/weather/virgo4/clear + name = "clear" + transition_chances = list( + WEATHER_CLEAR = 60, + WEATHER_OVERCAST = 20) + transition_messages = list( + "The sky clears up.", + "The sky is visible.", + "The weather is calm." + ) + sky_visible = TRUE + observed_message = "The sky is clear." + +/datum/weather/virgo4/overcast + name = "overcast" + temp_high = 293.15 // 20c + temp_low = 288.15 // 15c + light_modifier = 0.8 + transition_chances = list( + WEATHER_CLEAR = 25, + WEATHER_OVERCAST = 50, + WEATHER_RAIN = 5 + ) + observed_message = "It is overcast, all you can see are clouds." + transition_messages = list( + "All you can see above are clouds.", + "Clouds cut off your view of the sky.", + "It's very cloudy." + ) + +/datum/weather/virgo4/light_snow + name = "light snow" + icon_state = "snowfall_light" + temp_high = 268.15 // -5c + temp_low = 263.15 // -10c + light_modifier = 0.7 + transition_chances = list( + WEATHER_LIGHT_SNOW = 100 + ) + observed_message = "It is snowing lightly." + transition_messages = list( + "Small snowflakes begin to fall from above.", + "It begins to snow lightly.", + ) + +/datum/weather/virgo4/snow + name = "moderate snow" + icon_state = "snowfall_med" + temp_high = 268.15 // -5c + temp_low = 263.15 // -10c + wind_high = 2 + wind_low = 0 + light_modifier = 0.5 + flight_failure_modifier = 5 + transition_chances = list( + WEATHER_LIGHT_SNOW = 100 + ) + observed_message = "It is snowing." + transition_messages = list( + "It's starting to snow.", + "The air feels much colder as snowflakes fall from above." + ) + outdoor_sounds_type = /datum/looping_sound/weather/outside_snow + indoor_sounds_type = /datum/looping_sound/weather/inside_snow + +/datum/weather/virgo4/snow/process_effects() + ..() + for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + if(S.z in holder.our_planet.expected_z_levels) + for(var/dir_checked in cardinal) + var/turf/simulated/floor/T = get_step(S, dir_checked) + if(istype(T)) + if(istype(T, /turf/simulated/floor/outdoors) && prob(33)) + T.chill() + +/datum/weather/virgo4/blizzard + name = "blizzard" + icon_state = "snowfall_heavy" + temp_high = 268.15 // -5c + temp_low = 263.15 // -10c + wind_high = 4 + wind_low = 2 + light_modifier = 0.3 + flight_failure_modifier = 10 + transition_chances = list( + WEATHER_BLIZZARD = 100 + ) + observed_message = "A blizzard blows snow everywhere." + transition_messages = list( + "Strong winds howl around you as a blizzard appears.", + "It starts snowing heavily, and it feels extremly cold now." + ) + outdoor_sounds_type = /datum/looping_sound/weather/outside_blizzard + indoor_sounds_type = /datum/looping_sound/weather/inside_blizzard + +/datum/weather/virgo4/blizzard/process_effects() + ..() + for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + if(S.z in holder.our_planet.expected_z_levels) + for(var/dir_checked in cardinal) + var/turf/simulated/floor/T = get_step(S, dir_checked) + if(istype(T)) + if(istype(T, /turf/simulated/floor/outdoors) && prob(50)) + T.chill() + +/datum/weather/virgo4/rain + name = "rain" + icon_state = "rain" + temp_high = 288.15 // 15c + temp_low = 283.15 // 10c + wind_high = 2 + wind_low = 1 + light_modifier = 0.5 + effect_message = "Rain falls on you." + + transition_chances = list( + WEATHER_OVERCAST = 25, + WEATHER_RAIN = 50 + ) + observed_message = "It is raining." + transition_messages = list( + "The sky is dark, and rain falls down upon you." + ) + +/datum/weather/virgo4/rain/process_effects() + ..() + for(var/mob/living/L in living_mob_list) + if(L.z in holder.our_planet.expected_z_levels) + var/turf/T = get_turf(L) + if(!T.outdoors) + continue // They're indoors, so no need to rain on them. + + // If they have an open umbrella, it'll guard from rain + if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(U.open) + if(show_message) + to_chat(L, "Rain patters softly onto your umbrella.") + continue + else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) + var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() + if(U.open) + if(show_message) + to_chat(L, "Rain patters softly onto your umbrella.") + continue + + L.water_act(1) + if(show_message) + to_chat(L, effect_message) + +/datum/weather/virgo4/storm + name = "storm" + icon_state = "storm" + wind_high = 4 + wind_low = 2 + light_modifier = 0.3 + flight_failure_modifier = 10 + effect_message = "Rain falls on you, drenching you in water." + + var/next_lightning_strike = 0 // world.time when lightning will strike. + var/min_lightning_cooldown = 5 SECONDS + var/max_lightning_cooldown = 1 MINUTE + observed_message = "An intense storm pours down over the region." + transition_messages = list( + "You feel intense winds hit you as the weather takes a turn for the worst.", + "Loud thunder is heard in the distance.", + "A bright flash heralds the approach of a storm." + ) + + + transition_chances = list( + WEATHER_STORM = 100 + ) + +/datum/weather/virgo4/storm/process_effects() + ..() + for(var/mob/living/L in living_mob_list) + if(L.z in holder.our_planet.expected_z_levels) + var/turf/T = get_turf(L) + if(!T.outdoors) + continue // They're indoors, so no need to rain on them. + + // If they have an open umbrella, it'll guard from rain + if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(U.open) + if(show_message) + to_chat(L, "Rain showers loudly onto your umbrella!") + continue + else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) + var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() + if(U.open) + if(show_message) + to_chat(L, "Rain showers loudly onto your umbrella!") + continue + + + L.water_act(2) + if(show_message) + to_chat(L, effect_message) + + handle_lightning() + +// This gets called to do lightning periodically. +// There is a seperate function to do the actual lightning strike, so that badmins can play with it. +/datum/weather/virgo4/storm/proc/handle_lightning() + if(world.time < next_lightning_strike) + return // It's too soon to strike again. + next_lightning_strike = world.time + rand(min_lightning_cooldown, max_lightning_cooldown) + var/turf/T = pick(holder.our_planet.planet_floors) // This has the chance to 'strike' the sky, but that might be a good thing, to scare reckless pilots. + lightning_strike(T) + +/datum/weather/virgo4/hail + name = "hail" + icon_state = "hail" + light_modifier = 0.3 + flight_failure_modifier = 15 + timer_low_bound = 2 + timer_high_bound = 5 + effect_message = "The hail smacks into you!" + + transition_chances = list( + WEATHER_HAIL = 100 + ) + observed_message = "Ice is falling from the sky." + transition_messages = list( + "Ice begins to fall from the sky.", + "It begins to hail.", + "An intense chill is felt, and chunks of ice start to fall from the sky, towards you." + ) + +/datum/weather/virgo4/hail/process_effects() + ..() + for(var/humie in human_mob_list) + var/mob/living/carbon/human/H = humie + if(H.z in holder.our_planet.expected_z_levels) + var/turf/T = get_turf(H) + if(!T.outdoors) + continue // They're indoors, so no need to pelt them with ice. + + // If they have an open umbrella, it'll guard from hail + var/obj/item/weapon/melee/umbrella/U + if(istype(H.get_active_hand(), /obj/item/weapon/melee/umbrella)) + U = H.get_active_hand() + else if(istype(H.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) + U = H.get_inactive_hand() + if(U && U.open) + if(show_message) + to_chat(H, "Hail patters onto your umbrella.") + continue + + var/target_zone = pick(BP_ALL) + var/amount_blocked = H.run_armor_check(target_zone, "melee") + var/amount_soaked = H.get_armor_soak(target_zone, "melee") + + var/damage = rand(1,3) + + if(amount_blocked >= 30) + continue // No need to apply damage. Hardhats are 30. They should probably protect you from hail on your head. + //Voidsuits are likewise 40, and riot, 80. Clothes are all less than 30. + + if(amount_soaked >= damage) + continue // No need to apply damage. + + H.apply_damage(damage, BRUTE, target_zone, amount_blocked, amount_soaked, used_weapon = "hail") + if(show_message) + to_chat(H, effect_message) + +/datum/weather/virgo4/blood_moon + name = "blood moon" + light_modifier = 0.5 + light_color = "#FF0000" + temp_high = 293.15 // 20c + temp_low = 283.15 // 10c + flight_failure_modifier = 25 + transition_chances = list( + WEATHER_BLOODMOON = 100 + ) + observed_message = "Everything is red. Something really ominous is going on." + transition_messages = list( + "The sky turns blood red!" + ) + outdoor_sounds_type = /datum/looping_sound/weather/wind + indoor_sounds_type = /datum/looping_sound/weather/wind/indoors + +// Ash and embers fall forever, such as from a volcano or something. +/datum/weather/virgo4/emberfall + name = "emberfall" + icon_state = "ashfall_light" + light_modifier = 0.7 + light_color = "#880000" + temp_high = 293.15 // 20c + temp_low = 283.15 // 10c + flight_failure_modifier = 20 + transition_chances = list( + WEATHER_EMBERFALL = 100 + ) + observed_message = "Soot, ash, and embers float down from above." + transition_messages = list( + "Gentle embers waft down around you like grotesque snow." + ) + outdoor_sounds_type = /datum/looping_sound/weather/wind + indoor_sounds_type = /datum/looping_sound/weather/wind/indoors + +// Like the above but a lot more harmful. +/datum/weather/virgo4/ash_storm + name = "ash storm" + icon_state = "ashfall_heavy" + light_modifier = 0.1 + light_color = "#FF0000" + temp_high = 323.15 // 50c + temp_low = 313.15 // 40c + wind_high = 6 + wind_low = 3 + flight_failure_modifier = 50 + transition_chances = list( + WEATHER_ASH_STORM = 100 + ) + observed_message = "All that can be seen is black smoldering ash." + transition_messages = list( + "Smoldering clouds of scorching ash billow down around you!" + ) + // Lets recycle. + outdoor_sounds_type = /datum/looping_sound/weather/outside_blizzard + indoor_sounds_type = /datum/looping_sound/weather/inside_blizzard + +/datum/weather/virgo4/ash_storm/process_effects() + ..() + for(var/thing in living_mob_list) + var/mob/living/L = thing + if(L.z in holder.our_planet.expected_z_levels) + var/turf/T = get_turf(L) + if(!T.outdoors) + continue // They're indoors, so no need to burn them with ash. + + L.inflict_heat_damage(rand(1, 3)) + + +// Totally radical. +/datum/weather/virgo4/fallout + name = "fallout" + icon_state = "fallout" + light_modifier = 0.7 + light_color = "#CCFFCC" + flight_failure_modifier = 30 + transition_chances = list( + WEATHER_FALLOUT = 100 + ) + observed_message = "Radioactive soot and ash rains down from the heavens." + transition_messages = list( + "Radioactive soot and ash start to float down around you, contaminating whatever they touch." + ) + outdoor_sounds_type = /datum/looping_sound/weather/wind + indoor_sounds_type = /datum/looping_sound/weather/wind/indoors + + // How much radiation a mob gets while on an outside tile. + var/direct_rad_low = RAD_LEVEL_LOW + var/direct_rad_high = RAD_LEVEL_MODERATE + + // How much radiation is bursted onto a random tile near a mob. + var/fallout_rad_low = RAD_LEVEL_HIGH + var/fallout_rad_high = RAD_LEVEL_VERY_HIGH + +/datum/weather/virgo4/fallout/process_effects() + ..() + for(var/thing in living_mob_list) + var/mob/living/L = thing + if(L.z in holder.our_planet.expected_z_levels) + irradiate_nearby_turf(L) + var/turf/T = get_turf(L) + if(!T.outdoors) + continue // They're indoors, so no need to irradiate them with fallout. + + L.rad_act(rand(direct_rad_low, direct_rad_high)) + +// This makes random tiles near people radioactive for awhile. +// Tiles far away from people are left alone, for performance. +/datum/weather/virgo4/fallout/proc/irradiate_nearby_turf(mob/living/L) + if(!istype(L)) + return + var/list/turfs = RANGE_TURFS(world.view, L) + var/turf/T = pick(turfs) // We get one try per tick. + if(!istype(T)) + return + if(T.outdoors) + SSradiation.radiate(T, rand(fallout_rad_low, fallout_rad_high)) + +/turf/unsimulated/wall/planetary/normal/virgo4 + name = "deep ocean" + alpha = 0 + +/obj/machinery/power/smes/buildable/offmap_spawn/empty/New() + ..(1) + charge = 0 + RCon = TRUE + input_level = input_level_max + output_level = output_level_max + input_attempt = TRUE \ No newline at end of file diff --git a/code/modules/power/cells/esoteric_cells.dm b/code/modules/power/cells/esoteric_cells.dm new file mode 100644 index 00000000000..b45c19a783a --- /dev/null +++ b/code/modules/power/cells/esoteric_cells.dm @@ -0,0 +1,74 @@ + +/obj/item/weapon/cell/spike + name = "modified power cell" + desc = "A modified power cell sitting in a highly conductive chassis." + origin_tech = list(TECH_POWER = 2) + icon_state = "spikecell" + maxcharge = 10000 + matter = list(DEFAULT_WALL_MATERIAL = 1000, MAT_GLASS = 80, MAT_SILVER = 100) + self_recharge = TRUE + charge_amount = 150 + +/obj/item/weapon/cell/spike/process() + ..() + + var/turf/Center = get_turf(src) + + var/shock_count = 0 + for(var/turf/T in range(Center, 1)) + + if(prob(round(charge / 250)) && charge >= (maxcharge / 4)) + + if(locate(/obj/effect/temporary_effect/pulse/staticshock) in T) + continue + + var/conductive = FALSE + + if(istype(T, /turf/simulated/wall)) + var/turf/simulated/wall/WT = T + + if(WT.material.conductive) + conductive = TRUE + else if(WT.girder_material.conductive) + conductive = TRUE + else if(WT.reinf_material && WT.reinf_material.conductive) + conductive = TRUE + + if(istype(T, /turf/simulated/floor)) + var/turf/simulated/floor/F = T + if(istype(F.flooring, /decl/flooring/reinforced)) + conductive = TRUE + + if(conductive) + shock_count += 1 + new /obj/effect/temporary_effect/pulse/staticshock(T) + + if(shock_count) + while(shock_count) + use(200) + shock_count-- + +/obj/effect/temporary_effect/pulse/staticshock + name = "electric field" + desc = "Caution: Do not touch." + pulses_remaining = 10 + pulse_delay = 2 SECONDS + icon_state = "blue_static" + +/obj/effect/temporary_effect/pulse/staticshock/on_pulse() + ..() + + for(var/mob/living/L in view(1, src)) + if(!issilicon(L) && prob(L.mob_size)) + var/obj/item/projectile/beam/shock/weak/P = new (get_turf(src)) + P.launch_projectile_from_turf(L, BP_TORSO) + + var/obj/item/weapon/plastique/C4 = locate() in get_turf(src) + + if(C4) + C4.visible_message("The current fries \the [C4]!") + + if(prob(10)) + C4.explode(get_turf(src)) + else + qdel(C4) diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm index 49f0a15e3f6..6663d6e3805 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm @@ -31,7 +31,8 @@ /obj/item/projectile/beam/medical_cell/brute/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) - target.adjustBruteLoss(-5) + if(target.stat != DEAD) + target.adjustBruteLoss(-10) else return 1 @@ -43,7 +44,8 @@ /obj/item/projectile/beam/medical_cell/burn/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) - target.adjustFireLoss(-5) + if(target.stat != DEAD) + target.adjustFireLoss(-10) else return 1 @@ -83,7 +85,8 @@ /obj/item/projectile/beam/medical_cell/toxin/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) - target.adjustToxLoss(-5) + if(target.stat != DEAD) + target.adjustToxLoss(-10) else return 1 @@ -95,10 +98,11 @@ /obj/item/projectile/beam/medical_cell/omni/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) - target.adjustBruteLoss(-2.5) - target.adjustFireLoss(-2.5) - target.adjustToxLoss(-2.5) - target.adjustOxyLoss(-10) + if(target.stat != DEAD) + target.adjustBruteLoss(-5) + target.adjustFireLoss(-5) + target.adjustToxLoss(-5) + target.adjustOxyLoss(-20) else return 1 @@ -110,8 +114,9 @@ /obj/item/projectile/beam/medical_cell/antirad/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) - target.adjustToxLoss(-2.5) - target.radiation = max(target.radiation - 150, 0) //same as 5 units of arithrazine, sans the brute damage + if(target.stat != DEAD) + target.adjustToxLoss(-5) + target.radiation = max(target.radiation - 350, 0) //same as 5 units of arithrazine, sans the brute damage else return 1 @@ -123,7 +128,8 @@ /obj/item/projectile/beam/medical_cell/brute2/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) - target.adjustBruteLoss(-10) + if(target.stat != DEAD) + target.adjustBruteLoss(-20) else return 1 @@ -135,7 +141,8 @@ /obj/item/projectile/beam/medical_cell/burn2/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) - target.adjustFireLoss(-10) + if(target.stat != DEAD) + target.adjustFireLoss(-20) else return 1 @@ -170,10 +177,11 @@ /obj/item/projectile/beam/medical_cell/omni2/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) - target.adjustBruteLoss(-5) - target.adjustFireLoss(-5) - target.adjustToxLoss(-5) - target.adjustOxyLoss(-30) + if(target.stat != DEAD) + target.adjustBruteLoss(-10) + target.adjustFireLoss(-10) + target.adjustToxLoss(-10) + target.adjustOxyLoss(-60) else return 1 @@ -185,7 +193,8 @@ /obj/item/projectile/beam/medical_cell/toxin2/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) - target.adjustToxLoss(-20) + if(target.stat != DEAD) + target.adjustToxLoss(-20) else return 1 @@ -253,7 +262,8 @@ /obj/item/projectile/beam/medical_cell/brute3/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) - target.adjustBruteLoss(-20) + if(target.stat != DEAD) + target.adjustBruteLoss(-40) else return 1 @@ -265,7 +275,8 @@ /obj/item/projectile/beam/medical_cell/burn3/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) - target.adjustFireLoss(-20) + if(target.stat != DEAD) + target.adjustFireLoss(-40) else return 1 @@ -277,7 +288,8 @@ /obj/item/projectile/beam/medical_cell/toxin3/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) - target.adjustToxLoss(-20) + if(target.stat != DEAD) + target.adjustToxLoss(-40) else return 1 @@ -289,10 +301,11 @@ /obj/item/projectile/beam/medical_cell/omni3/on_hit(var/mob/living/carbon/human/target) if(istype(target, /mob/living/carbon/human)) - target.adjustBruteLoss(-10) - target.adjustFireLoss(-10) - target.adjustToxLoss(-10) - target.adjustOxyLoss(-60) + if(target.stat != DEAD) + target.adjustBruteLoss(-20) + target.adjustFireLoss(-20) + target.adjustToxLoss(-20) + target.adjustOxyLoss(-120) else return 1 @@ -337,4 +350,4 @@ target.show_message("The beam fires into your body, changing your size!") target.updateicon() else - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/projectiles/guns/energy/laser_vr.dm b/code/modules/projectiles/guns/energy/laser_vr.dm index 86a32cb97fe..fe29c85f0ee 100644 --- a/code/modules/projectiles/guns/energy/laser_vr.dm +++ b/code/modules/projectiles/guns/energy/laser_vr.dm @@ -207,10 +207,10 @@ var/recharging = 0 var/phase_power = 75 - projectile_type = /obj/item/projectile/beam + projectile_type = /obj/item/projectile/beam/blue firemodes = list( - list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam, charge_cost = 300), - list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 60), + list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/blue, charge_cost = 300), + list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser/blue, charge_cost = 80), ) /obj/item/weapon/gun/energy/locked/frontier/unload_ammo(var/mob/user) @@ -260,8 +260,8 @@ modifystate = "carbinekill" firemodes = list( - list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam, modifystate="carbinekill", charge_cost = 300), - list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, modifystate="carbinestun", charge_cost = 60), + list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/blue, modifystate="carbinekill", charge_cost = 300), + list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser/blue, modifystate="carbinestun", charge_cost = 80), ) /obj/item/weapon/gun/energy/locked/frontier/carbine/update_icon() @@ -290,8 +290,8 @@ charge_cost = 600 modifystate = "holdoutkill" firemodes = list( - list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam, modifystate="holdoutkill", charge_cost = 600), - list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, modifystate="holdoutstun", charge_cost = 120), + list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/blue, modifystate="holdoutkill", charge_cost = 600), + list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser/blue, modifystate="holdoutstun", charge_cost = 160), list(mode_name="stun", fire_delay=12, projectile_type=/obj/item/projectile/beam/stun/med, modifystate="holdoutshock", charge_cost = 300), ) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 41430bea38c..8c888fee3ef 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -261,3 +261,7 @@ agony = 15 eyeblur = 2 hitsound = 'sound/weapons/zapbang.ogg' + +/obj/item/projectile/beam/shock/weak + damage = 5 + agony = 10 diff --git a/code/modules/projectiles/projectile/beams_vr.dm b/code/modules/projectiles/projectile/beams_vr.dm index 8930260e9e7..f4aa2522de5 100644 --- a/code/modules/projectiles/projectile/beams_vr.dm +++ b/code/modules/projectiles/projectile/beams_vr.dm @@ -42,6 +42,11 @@ tracer_type = /obj/effect/projectile/tracer/laser_blue impact_type = /obj/effect/projectile/impact/laser_blue +/obj/item/projectile/beam/weaklaser/blue + muzzle_type = /obj/effect/projectile/muzzle/laser_blue + tracer_type = /obj/effect/projectile/tracer/laser_blue + impact_type = /obj/effect/projectile/impact/laser_blue + /obj/item/projectile/beam/medigun name = "healing beam" icon_state = "healbeam" diff --git a/code/modules/reagents/reagent_containers/glass_vr.dm b/code/modules/reagents/reagent_containers/glass_vr.dm index 09e6ce559a1..79c19b82880 100644 --- a/code/modules/reagents/reagent_containers/glass_vr.dm +++ b/code/modules/reagents/reagent_containers/glass_vr.dm @@ -48,3 +48,10 @@ /obj/item/weapon/reagent_containers/glass/beaker/vial/hyronalin name = "vial (hyronalin)" prefill = list("hyronalin" = 30) + +/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup + name = "measuring cup" + desc = "A measuring cup." + icon = 'icons/obj/chemical_vr.dmi' + icon_state = "measure_cup" + item_state = "measure_cup" \ No newline at end of file diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 1d46e16ce52..fd99a91d411 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -262,7 +262,7 @@ if(..()) return TRUE - if(usr.loc == src) + if(usr.loc == src && !issilicon(usr)) to_chat(usr, "You cannot reach the controls from inside.") return TRUE @@ -286,16 +286,15 @@ mode = 0 update() - if(!issilicon(usr)) - if(action == "engageHandle") - flush = 1 - update() - if(action == "disengageHandle") - flush = 0 - update() + if(action == "engageHandle") + flush = 1 + update() + if(action == "disengageHandle") + flush = 0 + update() - if(action == "eject") - eject() + if(action == "eject") + eject() return TRUE diff --git a/code/modules/research/mechfab_designs.dm b/code/modules/research/mechfab_designs.dm index 52b976e1877..7a041e8f428 100644 --- a/code/modules/research/mechfab_designs.dm +++ b/code/modules/research/mechfab_designs.dm @@ -679,6 +679,14 @@ materials = list(DEFAULT_WALL_MATERIAL = 5000, "osmium" = 3000, "silver" = 1000) build_path = /obj/item/mecha_parts/mecha_equipment/tool/orescanner/advanced +/datum/design/item/mecha/runningboard + name = "Powered Exosuit Running Board" + desc = "A running board with a power-lifter attachment, to quickly catapult exosuit pilots into the cockpit. Only fits to working exosuits." + id = "mech_runningboard" + req_tech = list(TECH_MATERIAL = 6) + materials = list(DEFAULT_WALL_MATERIAL = 10000) + build_path = /obj/item/mecha_parts/mecha_equipment/runningboard/limited + /datum/design/item/mecha/powerwrench name = "hydraulic wrench" desc = "A large, hydraulic wrench." diff --git a/code/modules/research/prosfab_designs_vr.dm b/code/modules/research/prosfab_designs_vr.dm index 094d036c91c..b425b3964a0 100644 --- a/code/modules/research/prosfab_designs_vr.dm +++ b/code/modules/research/prosfab_designs_vr.dm @@ -8,8 +8,8 @@ build_path = /obj/item/borg/upgrade/sizeshift /datum/design/item/prosfab/robot_upgrade/bellysizeupgrade - name = "Size Alteration Module" + name = "Robohound Capacity Expansion Module" id = "borg_hound_capacity_module" - req_tech = list(TECH_BLUESPACE = 3, TECH_MATERIAL = 3, TECH_POWER = 2) + req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2) materials = list(DEFAULT_WALL_MATERIAL = 4000, "glass" = 4000) build_path = /obj/item/borg/upgrade/bellysizeupgrade \ No newline at end of file diff --git a/code/modules/shieldgen/energy_shield.dm b/code/modules/shieldgen/energy_shield.dm index d6218eac8fe..61707682524 100644 --- a/code/modules/shieldgen/energy_shield.dm +++ b/code/modules/shieldgen/energy_shield.dm @@ -4,7 +4,7 @@ /obj/effect/shield name = "energy shield" desc = "An impenetrable field of energy, capable of blocking anything as long as it's active." - icon = 'icons/obj/machines/shielding.dmi' + icon = 'icons/obj/machines/shielding_vr.dmi' icon_state = "shield" anchored = 1 plane = MOB_PLANE @@ -110,7 +110,7 @@ diffused_for = max(duration, 0) gen?.damaged_segments |= src - + set_density(0) update_visuals() update_nearby_tiles() //Force ZAS update @@ -299,7 +299,7 @@ // /obj/effect/temp_visual/shield_impact_effect name = "shield impact" - icon = 'icons/obj/machines/shielding.dmi' + icon = 'icons/obj/machines/shielding_vr.dmi' icon_state = "shield_impact" plane = MOB_PLANE layer = ABOVE_MOB_LAYER diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index b87f66432fe..08d0b8ce860 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -123,7 +123,7 @@ "max_charge" = C.max_charge, "failing" = (C.time_since_fail <= 2), ))) - + data["lockedData"]["active"] = active data["lockedData"]["failing"] = (time_since_fail <= 2) data["lockedData"]["radius"] = field_radius @@ -201,7 +201,7 @@ /obj/machinery/shield_gen/tgui_act(action, params) if(..()) return TRUE - + switch(action) if("toggle") if (!active && !anchored) diff --git a/code/modules/shieldgen/shield_generator.dm b/code/modules/shieldgen/shield_generator.dm index cc3d2f1b25b..abe6c6efbf3 100644 --- a/code/modules/shieldgen/shield_generator.dm +++ b/code/modules/shieldgen/shield_generator.dm @@ -4,7 +4,7 @@ /obj/machinery/power/shield_generator name = "advanced shield generator" desc = "A heavy-duty shield generator and capacitor, capable of generating energy shields at large distances." - icon = 'icons/obj/machines/shielding.dmi' + icon = 'icons/obj/machines/shielding_vr.dmi' icon_state = "generator0" circuit = /obj/item/weapon/circuitboard/shield_generator density = 1 @@ -105,7 +105,7 @@ // Generates the field objects. Deletes existing field, if applicable. /obj/machinery/power/shield_generator/proc/regenerate_field() for(var/obj/effect/shield/S in field_segments) - qdel(S) + qdel(S) var/list/shielded_turfs if(check_flag(MODEFLAG_HULL)) diff --git a/code/modules/tgui/modules/appearance_changer.dm b/code/modules/tgui/modules/appearance_changer.dm index 667fe7e0a0d..ab75e1d67c0 100644 --- a/code/modules/tgui/modules/appearance_changer.dm +++ b/code/modules/tgui/modules/appearance_changer.dm @@ -1,3 +1,4 @@ + /datum/tgui_module/appearance_changer name = "Appearance Editor" tgui_id = "AppearanceChanger" @@ -24,6 +25,10 @@ var/camera_diff_y = -1 var/camera_diff_z = -1 + var/list/valid_earstyles = list() + var/list/valid_tailstyles = list() + var/list/valid_wingstyles = list() + /datum/tgui_module/appearance_changer/New( var/host, mob/living/carbon/human/H, @@ -68,6 +73,7 @@ qdel(cam_screen) QDEL_LIST(cam_plane_masters) qdel(cam_background) + cut_data() return ..() /datum/tgui_module/appearance_changer/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) @@ -84,22 +90,28 @@ if("race") if(can_change(APPEARANCE_RACE) && (params["race"] in valid_species)) if(target.change_species(params["race"])) - cut_and_generate_data() + cut_data() + generate_data(usr) + changed_hook(APPEARANCECHANGER_CHANGED_RACE) return 1 if("gender") if(can_change(APPEARANCE_GENDER) && (params["gender"] in get_genders())) if(target.change_gender(params["gender"])) - cut_and_generate_data() + cut_data() + generate_data(usr) + changed_hook(APPEARANCECHANGER_CHANGED_GENDER) return 1 if("gender_id") if(can_change(APPEARANCE_GENDER) && (params["gender_id"] in all_genders_define_list)) target.identifying_gender = params["gender_id"] + changed_hook(APPEARANCECHANGER_CHANGED_GENDER_ID) return 1 if("skin_tone") if(can_change_skin_tone()) var/new_s_tone = input(usr, "Choose your character's skin-tone:\n(Light 1 - 220 Dark)", "Skin Tone", -target.s_tone + 35) as num|null if(isnum(new_s_tone) && can_still_topic(usr, state)) new_s_tone = 35 - max(min( round(new_s_tone), 220),1) + changed_hook(APPEARANCECHANGER_CHANGED_SKINTONE) return target.change_skin_tone(new_s_tone) if("skin_color") if(can_change_skin_color()) @@ -110,11 +122,13 @@ var/b_skin = hex2num(copytext(new_skin, 6, 8)) if(target.change_skin_color(r_skin, g_skin, b_skin)) update_dna() + changed_hook(APPEARANCECHANGER_CHANGED_SKINCOLOR) return 1 if("hair") if(can_change(APPEARANCE_HAIR) && (params["hair"] in valid_hairstyles)) if(target.change_hair(params["hair"])) update_dna() + changed_hook(APPEARANCECHANGER_CHANGED_HAIRSTYLE) return 1 if("hair_color") if(can_change(APPEARANCE_HAIR_COLOR)) @@ -125,11 +139,13 @@ var/b_hair = hex2num(copytext(new_hair, 6, 8)) if(target.change_hair_color(r_hair, g_hair, b_hair)) update_dna() + changed_hook(APPEARANCECHANGER_CHANGED_HAIRCOLOR) return 1 if("facial_hair") if(can_change(APPEARANCE_FACIAL_HAIR) && (params["facial_hair"] in valid_facial_hairstyles)) if(target.change_facial_hair(params["facial_hair"])) update_dna() + changed_hook(APPEARANCECHANGER_CHANGED_F_HAIRSTYLE) return 1 if("facial_hair_color") if(can_change(APPEARANCE_FACIAL_HAIR_COLOR)) @@ -140,6 +156,7 @@ var/b_facial = hex2num(copytext(new_facial, 6, 8)) if(target.change_facial_hair_color(r_facial, g_facial, b_facial)) update_dna() + changed_hook(APPEARANCECHANGER_CHANGED_F_HAIRCOLOR) return 1 if("eye_color") if(can_change(APPEARANCE_EYE_COLOR)) @@ -150,10 +167,115 @@ var/b_eyes = hex2num(copytext(new_eyes, 6, 8)) if(target.change_eye_color(r_eyes, g_eyes, b_eyes)) update_dna() + changed_hook(APPEARANCECHANGER_CHANGED_EYES) return 1 + // VOREStation Add - Ears/Tails/Wings + if("ear") + if(can_change(APPEARANCE_ALL_HAIR)) + var/datum/sprite_accessory/ears/instance = locate(params["ref"]) + if(params["clear"]) + instance = null + if(!istype(instance) && !params["clear"]) + return FALSE + owner.ear_style = instance + owner.update_hair() + update_dna() + changed_hook(APPEARANCECHANGER_CHANGED_HAIRSTYLE) + return TRUE + if("ears_color") + if(can_change(APPEARANCE_HAIR_COLOR)) + var/new_hair = input("Please select ear color.", "Ear Color", rgb(target.r_ears, target.g_ears, target.b_ears)) as color|null + if(new_hair && can_still_topic(usr, state)) + target.r_ears = hex2num(copytext(new_hair, 2, 4)) + target.g_ears = hex2num(copytext(new_hair, 4, 6)) + target.b_ears = hex2num(copytext(new_hair, 6, 8)) + update_dna() + owner.update_hair() + changed_hook(APPEARANCECHANGER_CHANGED_HAIRCOLOR) + return 1 + if("ears2_color") + if(can_change(APPEARANCE_HAIR_COLOR)) + var/new_hair = input("Please select secondary ear color.", "2nd Ear Color", rgb(target.r_ears2, target.g_ears2, target.b_ears2)) as color|null + if(new_hair && can_still_topic(usr, state)) + target.r_ears2 = hex2num(copytext(new_hair, 2, 4)) + target.g_ears2 = hex2num(copytext(new_hair, 4, 6)) + target.b_ears2 = hex2num(copytext(new_hair, 6, 8)) + update_dna() + owner.update_hair() + changed_hook(APPEARANCECHANGER_CHANGED_HAIRCOLOR) + return 1 + if("tail") + if(can_change(APPEARANCE_ALL_HAIR)) + var/datum/sprite_accessory/tail/instance = locate(params["ref"]) + if(params["clear"]) + instance = null + if(!istype(instance) && !params["clear"]) + return FALSE + owner.tail_style = instance + owner.update_tail_showing() + update_dna() + changed_hook(APPEARANCECHANGER_CHANGED_HAIRSTYLE) + return TRUE + if("tail_color") + if(can_change(APPEARANCE_HAIR_COLOR)) + var/new_hair = input("Please select tail color.", "Tail Color", rgb(target.r_tail, target.g_tail, target.b_tail)) as color|null + if(new_hair && can_still_topic(usr, state)) + target.r_tail = hex2num(copytext(new_hair, 2, 4)) + target.g_tail = hex2num(copytext(new_hair, 4, 6)) + target.b_tail = hex2num(copytext(new_hair, 6, 8)) + update_dna() + owner.update_tail_showing() + changed_hook(APPEARANCECHANGER_CHANGED_HAIRCOLOR) + return 1 + if("tail2_color") + if(can_change(APPEARANCE_HAIR_COLOR)) + var/new_hair = input("Please select secondary tail color.", "2nd Tail Color", rgb(target.r_tail2, target.g_tail2, target.b_tail2)) as color|null + if(new_hair && can_still_topic(usr, state)) + target.r_tail2 = hex2num(copytext(new_hair, 2, 4)) + target.g_tail2 = hex2num(copytext(new_hair, 4, 6)) + target.b_tail2 = hex2num(copytext(new_hair, 6, 8)) + update_dna() + owner.update_tail_showing() + changed_hook(APPEARANCECHANGER_CHANGED_HAIRCOLOR) + return 1 + if("wing") + if(can_change(APPEARANCE_ALL_HAIR)) + var/datum/sprite_accessory/wing/instance = locate(params["ref"]) + if(params["clear"]) + instance = null + if(!istype(instance) && !params["clear"]) + return FALSE + owner.wing_style = instance + owner.update_wing_showing() + update_dna() + changed_hook(APPEARANCECHANGER_CHANGED_HAIRSTYLE) + return TRUE + if("wing_color") + if(can_change(APPEARANCE_HAIR_COLOR)) + var/new_hair = input("Please select wing color.", "Wing Color", rgb(target.r_wing, target.g_wing, target.b_wing)) as color|null + if(new_hair && can_still_topic(usr, state)) + target.r_wing = hex2num(copytext(new_hair, 2, 4)) + target.g_wing = hex2num(copytext(new_hair, 4, 6)) + target.b_wing = hex2num(copytext(new_hair, 6, 8)) + update_dna() + owner.update_wing_showing() + changed_hook(APPEARANCECHANGER_CHANGED_HAIRCOLOR) + return 1 + if("wing2_color") + if(can_change(APPEARANCE_HAIR_COLOR)) + var/new_hair = input("Please select secondary wing color.", "2nd Wing Color", rgb(target.r_wing2, target.g_wing2, target.b_wing2)) as color|null + if(new_hair && can_still_topic(usr, state)) + target.r_wing2 = hex2num(copytext(new_hair, 2, 4)) + target.g_wing2 = hex2num(copytext(new_hair, 4, 6)) + target.b_wing2 = hex2num(copytext(new_hair, 6, 8)) + update_dna() + owner.update_wing_showing() + changed_hook(APPEARANCECHANGER_CHANGED_HAIRCOLOR) + return 1 + // VOREStation Add End return FALSE -/datum/tgui_module/appearance_changer/tgui_interact(mob/user, datum/tgui/ui = null, datum/tgui/parent_ui = null, datum/tgui_state/custom_state = GLOB.tgui_default_state) +/datum/tgui_module/appearance_changer/tgui_interact(mob/user, datum/tgui/ui = null, datum/tgui/parent_ui = null, datum/tgui_state/custom_state) var/mob/living/carbon/human/target = owner if(customize_usr) if(!ishuman(user)) @@ -177,10 +299,39 @@ if(custom_state) ui.set_state(custom_state) +/datum/tgui_module/appearance_changer/tgui_static_data(mob/user) + var/list/data = ..() + + generate_data(usr) + + if(can_change(APPEARANCE_RACE)) + var/species[0] + for(var/specimen in valid_species) + species[++species.len] = list("specimen" = specimen) + data["species"] = species + + if(can_change(APPEARANCE_HAIR)) + var/hair_styles[0] + for(var/hair_style in valid_hairstyles) + hair_styles[++hair_styles.len] = list("hairstyle" = hair_style) + data["hair_styles"] = hair_styles + // VOREStation Add - Ears/Tails/Wings + data["ear_styles"] = valid_earstyles + data["tail_styles"] = valid_tailstyles + data["wing_styles"] = valid_wingstyles + // VOREStation Add End + + if(can_change(APPEARANCE_FACIAL_HAIR)) + var/facial_hair_styles[0] + for(var/facial_hair_style in valid_facial_hairstyles) + facial_hair_styles[++facial_hair_styles.len] = list("facialhairstyle" = facial_hair_style) + data["facial_hair_styles"] = facial_hair_styles + + return data + /datum/tgui_module/appearance_changer/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() - generate_data(check_whitelist, whitelist, blacklist) differential_check() var/mob/living/carbon/human/target = owner @@ -194,11 +345,6 @@ data["gender"] = target.gender data["gender_id"] = target.identifying_gender data["change_race"] = can_change(APPEARANCE_RACE) - if(data["change_race"]) - var/species[0] - for(var/specimen in valid_species) - species[++species.len] = list("specimen" = specimen) - data["species"] = species data["change_gender"] = can_change(APPEARANCE_GENDER) if(data["change_gender"]) @@ -213,30 +359,39 @@ data["change_hair"] = can_change(APPEARANCE_HAIR) if(data["change_hair"]) - var/hair_styles[0] - for(var/hair_style in valid_hairstyles) - hair_styles[++hair_styles.len] = list("hairstyle" = hair_style) - data["hair_styles"] = hair_styles data["hair_style"] = target.h_style + // VOREStation Add - Ears/Tails/Wings + data["ear_style"] = target.ear_style + data["tail_style"] = target.tail_style + data["wing_style"] = target.wing_style + // VOREStation Add End + data["change_facial_hair"] = can_change(APPEARANCE_FACIAL_HAIR) if(data["change_facial_hair"]) - var/facial_hair_styles[0] - for(var/facial_hair_style in valid_facial_hairstyles) - facial_hair_styles[++facial_hair_styles.len] = list("facialhairstyle" = facial_hair_style) - data["facial_hair_styles"] = facial_hair_styles data["facial_hair_style"] = target.f_style data["change_skin_tone"] = can_change_skin_tone() data["change_skin_color"] = can_change_skin_color() if(data["change_skin_color"]) data["skin_color"] = rgb(target.r_skin, target.g_skin, target.b_skin) + data["change_eye_color"] = can_change(APPEARANCE_EYE_COLOR) if(data["change_eye_color"]) data["eye_color"] = rgb(target.r_eyes, target.g_eyes, target.b_eyes) + data["change_hair_color"] = can_change(APPEARANCE_HAIR_COLOR) if(data["change_hair_color"]) data["hair_color"] = rgb(target.r_hair, target.g_hair, target.b_hair) + // VOREStation Add - Ears/Tails/Wings + data["ears_color"] = rgb(target.r_ears, target.g_ears, target.b_ears) + data["ears2_color"] = rgb(target.r_ears2, target.g_ears2, target.b_ears2) + data["tail_color"] = rgb(target.r_tail, target.g_tail, target.b_tail) + data["tail2_color"] = rgb(target.r_tail2, target.g_tail2, target.b_tail2) + data["wing_color"] = rgb(target.r_wing, target.g_wing, target.b_wing) + data["wing2_color"] = rgb(target.r_wing2, target.g_wing2, target.b_wing2) + // VOREStation Add End + data["change_facial_hair_color"] = can_change(APPEARANCE_FACIAL_HAIR_COLOR) if(data["change_facial_hair_color"]) data["facial_hair_color"] = rgb(target.r_facial, target.g_facial, target.b_facial) @@ -315,26 +470,67 @@ return target && (flags & APPEARANCE_SKIN) && target.species.appearance_flags & HAS_SKIN_COLOR -/datum/tgui_module/appearance_changer/proc/cut_and_generate_data() +/datum/tgui_module/appearance_changer/proc/cut_data() // Making the assumption that the available species remain constant + valid_hairstyles.Cut() valid_facial_hairstyles.Cut() - valid_facial_hairstyles.Cut() - generate_data() + // VOREStation Add - Ears/Tails/Wings + valid_earstyles.Cut() + valid_tailstyles.Cut() + valid_wingstyles.Cut() + // VOREStation Add End -/datum/tgui_module/appearance_changer/proc/generate_data() +/datum/tgui_module/appearance_changer/proc/generate_data(mob/user) var/mob/living/carbon/human/target = owner if(customize_usr) - if(!ishuman(usr)) + if(!ishuman(user)) return TRUE - target = usr + target = user if(!target) return - if(!valid_species.len) + + if(!LAZYLEN(valid_species)) valid_species = target.generate_valid_species(check_whitelist, whitelist, blacklist) - if(!valid_hairstyles.len || !valid_facial_hairstyles.len) + + if(!LAZYLEN(valid_hairstyles) || !LAZYLEN(valid_facial_hairstyles)) valid_hairstyles = target.generate_valid_hairstyles(check_gender = 0) valid_facial_hairstyles = target.generate_valid_facial_hairstyles() + // VOREStation Add - Ears/Tails/Wings + if(!LAZYLEN(valid_earstyles)) + for(var/path in ear_styles_list) + var/datum/sprite_accessory/ears/instance = ear_styles_list[path] + if(can_use_sprite(instance, target, user)) + valid_earstyles.Add(list(list( + "name" = instance.name, + "instance" = REF(instance), + "color" = !!instance.do_colouration, + "second_color" = !!instance.extra_overlay, + ))) + + if(!LAZYLEN(valid_tailstyles)) + for(var/path in tail_styles_list) + var/datum/sprite_accessory/tail/instance = tail_styles_list[path] + if(can_use_sprite(instance, target, user)) + valid_tailstyles.Add(list(list( + "name" = instance.name, + "instance" = REF(instance), + "color" = !!instance.do_colouration, + "second_color" = !!instance.extra_overlay, + ))) + + if(!LAZYLEN(valid_wingstyles)) + for(var/path in wing_styles_list) + var/datum/sprite_accessory/wing/instance = wing_styles_list[path] + if(can_use_sprite(instance, target, user)) + valid_wingstyles.Add(list(list( + "name" = instance.name, + "instance" = REF(instance), + "color" = !!instance.do_colouration, + "second_color" = !!instance.extra_overlay, + ))) + // VOREStation Add End + /datum/tgui_module/appearance_changer/proc/get_genders() var/mob/living/carbon/human/target = owner if(customize_usr) @@ -349,10 +545,25 @@ possible_genders |= NEUTER return possible_genders +// Used for subtypes to handle messaging or whatever. +/datum/tgui_module/appearance_changer/proc/changed_hook(flag) + return + +// VOREStation Add - Ears/Tails/Wings +/datum/tgui_module/appearance_changer/proc/can_use_sprite(datum/sprite_accessory/X, mob/living/carbon/human/target, mob/user) + if(X.apply_restrictions && !(target.species.name in X.species_allowed)) + return FALSE + + if(LAZYLEN(X.ckeys_allowed) && !(user?.ckey in X.ckeys_allowed) && !(target.ckey in X.ckeys_allowed)) + return FALSE + + return TRUE +// VOREStation Add End + /datum/tgui_module/appearance_changer/mirror name = "SalonPro Nano-Mirror™" flags = APPEARANCE_ALL_HAIR customize_usr = TRUE /datum/tgui_module/appearance_changer/mirror/coskit - name = "SalonPro Porta-Makeover Deluxe™" \ No newline at end of file + name = "SalonPro Porta-Makeover Deluxe™" diff --git a/code/modules/tgui/modules/appearance_changer_vr.dm b/code/modules/tgui/modules/appearance_changer_vr.dm new file mode 100644 index 00000000000..93ee4cfdf29 --- /dev/null +++ b/code/modules/tgui/modules/appearance_changer_vr.dm @@ -0,0 +1,45 @@ +/datum/tgui_module/appearance_changer/vore + name = "Appearance Editor (Vore)" + flags = APPEARANCE_ALL + +/datum/tgui_module/appearance_changer/vore/tgui_state(mob/user) + return GLOB.tgui_conscious_state + +/datum/tgui_module/appearance_changer/vore/tgui_status(mob/user, datum/tgui_state/state) + if(!isbelly(owner.loc)) + return STATUS_CLOSE + return ..() + +/datum/tgui_module/appearance_changer/vore/reload_cameraview() + cam_screen.vis_contents = list(owner) + cam_background.icon_state = "clear" + cam_background.fill_rect(1, 1, 1, 1) + local_skybox.cut_overlays() + +/datum/tgui_module/appearance_changer/vore/tgui_close(mob/user) + . = ..() + QDEL_IN(src, 1) + +/datum/tgui_module/appearance_changer/vore/changed_hook(flag) + var/mob/living/carbon/human/M = owner + var/mob/living/O = usr + + switch(flag) + if(APPEARANCECHANGER_CHANGED_RACE) + to_chat(M, "You lose sensation of your body, feeling only the warmth of everything around you... ") + to_chat(O, "Your body shifts as you make dramatic changes to your captive's body.") + if(APPEARANCECHANGER_CHANGED_GENDER) + to_chat(M, "Your body feels very strange...") + to_chat(O, "You feel strange as you alter your captive's gender.") + if(APPEARANCECHANGER_CHANGED_GENDER_ID) + to_chat(M, "You start to feel... [capitalize(M.gender)]?") + to_chat(O, "You feel strange as you alter your captive's gender identity.") + if(APPEARANCECHANGER_CHANGED_SKINTONE, APPEARANCECHANGER_CHANGED_SKINCOLOR) + to_chat(M, "Your body tingles all over...") + to_chat(O, "You tingle as you make noticeable changes to your captive's body.") + if(APPEARANCECHANGER_CHANGED_HAIRSTYLE, APPEARANCECHANGER_CHANGED_HAIRCOLOR, APPEARANCECHANGER_CHANGED_F_HAIRSTYLE, APPEARANCECHANGER_CHANGED_F_HAIRCOLOR) + to_chat(M, "Your body tingles all over...") + to_chat(O, "You tingle as you make noticeable changes to your captive's body.") + if(APPEARANCECHANGER_CHANGED_EYES) + to_chat(M, "You feel lightheaded and drowsy...") + to_chat(O, "You feel warm as you make subtle changes to your captive's body.") \ No newline at end of file diff --git a/code/modules/vchat/css/ss13styles.css b/code/modules/vchat/css/ss13styles.css index 2cddefb0ca5..abf9ebec444 100644 --- a/code/modules/vchat/css/ss13styles.css +++ b/code/modules/vchat/css/ss13styles.css @@ -173,6 +173,7 @@ h1.alert, h2.alert {color: #000000;} .terminus {font-family: "Times New Roman", Times, serif, sans-serif} .interface {color: #330033;} .spacer {color: #9c660b;} /* VOREStation Add */ +.blob {color: #ff950d; font-weight: bold; font-style: italic;} .black {color: #000000;} .darkgray {color: #808080;} diff --git a/code/modules/vchat/js/vchat.js b/code/modules/vchat/js/vchat.js index 028d5b52bb8..cb185101459 100644 --- a/code/modules/vchat/js/vchat.js +++ b/code/modules/vchat/js/vchat.js @@ -137,7 +137,7 @@ function start_vue() { //The table to map game css classes to our vchat categories type_table: [ { - matches: ".filter_say, .say, .emote", + matches: ".filter_say, .say, .emote, .emote_subtle", //VOREStation Edit becomes: "vc_localchat", pretty: "Local Chat", tooltip: "In-character local messages (say, emote, etc)", diff --git a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm index f60dd8df156..adcb66c1802 100644 --- a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm @@ -201,6 +201,7 @@ name = "SynthWolf dual-color (Taur)" icon_state = "synthwolf_s" extra_overlay = "synthwolf_markings" + extra_overlay2 = "synthwolf_glow" //icon_sprite_tag = "synthwolf" /datum/sprite_accessory/tail/taur/skunk @@ -275,6 +276,7 @@ name = "SynthHorse dual-color (Taur)" icon_state = "synthhorse_s" extra_overlay = "synthhorse_markings" + extra_overlay2 = "synthhorse_glow" //icon_sprite_tag = "synthhorse" /datum/sprite_accessory/tail/taur/cow @@ -336,6 +338,7 @@ name = "SynthLizard dual-color (Taur)" icon_state = "synthlizard_s" extra_overlay = "synthlizard_markings" + extra_overlay2 = "synthlizard_glow" //icon_sprite_tag = "synthlizard" /datum/sprite_accessory/tail/taur/spider @@ -422,6 +425,7 @@ name = "SynthFeline dual-color (Taur)" icon_state = "synthfeline_s" extra_overlay = "synthfeline_markings" + extra_overlay2 = "synthfeline_glow" //icon_sprite_tag = "synthfeline" /datum/sprite_accessory/tail/taur/slug diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm index 0bf95147634..ba0e1d1e3e4 100644 --- a/code/modules/vore/appearance/sprite_accessories_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_vr.dm @@ -44,6 +44,13 @@ // Ears avaliable to anyone +/datum/sprite_accessory/ears/alt_ram_horns + name = "Solid ram horns" + desc = "" + icon_state = "ram_horns_s" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + /datum/sprite_accessory/ears/hyena name = "hyena ears, dual-color" desc = "" @@ -2048,4 +2055,4 @@ desc = "" icon_state = "verie_hair_glow" ignores_lighting = 1 - //ckeys_allowed = list("vitoras") // This probably won't come into play EVER but better safe than sorry \ No newline at end of file + //ckeys_allowed = list("vitoras") // This probably won't come into play EVER but better safe than sorry diff --git a/code/modules/vore/eating/belly_dat_vr.dm b/code/modules/vore/eating/belly_dat_vr.dm index 01bda553894..2beec27ad65 100644 --- a/code/modules/vore/eating/belly_dat_vr.dm +++ b/code/modules/vore/eating/belly_dat_vr.dm @@ -31,8 +31,7 @@ var/datum/belly/transferlocation = null // Location that the prey is released if they struggle and get dropped off. var/tmp/digest_mode = DM_HOLD // Whether or not to digest. Default to not digest. - var/tmp/list/digest_modes = list(DM_HOLD,DM_DIGEST,DM_HEAL,DM_ABSORB,DM_DRAIN,DM_UNABSORB,DM_SHRINK,DM_GROW,DM_SIZE_STEAL) // Possible digest modes - var/tmp/list/transform_modes = list(DM_TRANSFORM_MALE,DM_TRANSFORM_FEMALE,DM_TRANSFORM_KEEP_GENDER,DM_TRANSFORM_CHANGE_SPECIES_AND_TAUR,DM_TRANSFORM_CHANGE_SPECIES_AND_TAUR_EGG,DM_TRANSFORM_REPLICA,DM_TRANSFORM_REPLICA_EGG,DM_TRANSFORM_KEEP_GENDER_EGG,DM_TRANSFORM_MALE_EGG,DM_TRANSFORM_FEMALE_EGG, DM_EGG) + var/tmp/list/digest_modes = list(DM_HOLD,DM_DIGEST,DM_HEAL,DM_ABSORB,DM_DRAIN,DM_UNABSORB,DM_SHRINK,DM_GROW,DM_SIZE_STEAL,DM_EGG) // Possible digest modes var/tmp/mob/living/owner // The mob whose belly this is. var/tmp/list/internal_contents = list() // People/Things you've eaten into this belly! var/tmp/emotePend = FALSE // If there's already a spawned thing counting for the next emote diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 247995a7e30..0889c29933b 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -38,14 +38,15 @@ var/fancy_vore = FALSE // Using the new sounds? var/is_wet = TRUE // Is this belly's insides made of slimy parts? var/wet_loop = TRUE // Does the belly have a fleshy loop playing? + var/obj/item/weapon/storage/vore_egg/ownegg // Is this belly creating an egg? + var/egg_type = "egg" // Default egg type and path. + var/egg_path = /obj/item/weapon/storage/vore_egg //I don't think we've ever altered these lists. making them static until someone actually overrides them somewhere. //Actual full digest modes - var/tmp/static/list/digest_modes = list(DM_HOLD,DM_DIGEST,DM_ABSORB,DM_DRAIN,DM_UNABSORB,DM_HEAL,DM_SHRINK,DM_GROW,DM_SIZE_STEAL) + var/tmp/static/list/digest_modes = list(DM_HOLD,DM_DIGEST,DM_ABSORB,DM_DRAIN,DM_UNABSORB,DM_HEAL,DM_SHRINK,DM_GROW,DM_SIZE_STEAL,DM_EGG) //Digest mode addon flags - var/tmp/static/list/mode_flag_list = list("Numbing" = DM_FLAG_NUMBING, "Stripping" = DM_FLAG_STRIPPING, "Leave Remains" = DM_FLAG_LEAVEREMAINS, "Muffles" = DM_FLAG_THICKBELLY) - //Transformation modes - var/tmp/static/list/transform_modes = list(DM_TRANSFORM_MALE,DM_TRANSFORM_FEMALE,DM_TRANSFORM_KEEP_GENDER,DM_TRANSFORM_CHANGE_SPECIES_AND_TAUR,DM_TRANSFORM_CHANGE_SPECIES_AND_TAUR_EGG,DM_TRANSFORM_REPLICA,DM_TRANSFORM_REPLICA_EGG,DM_TRANSFORM_KEEP_GENDER_EGG,DM_TRANSFORM_MALE_EGG,DM_TRANSFORM_FEMALE_EGG, DM_EGG) + var/tmp/static/list/mode_flag_list = list("Numbing" = DM_FLAG_NUMBING, "Stripping" = DM_FLAG_STRIPPING, "Leave Remains" = DM_FLAG_LEAVEREMAINS, "Muffles" = DM_FLAG_THICKBELLY, "Affect Worn Items" = DM_FLAG_AFFECTWORN) //Item related modes var/tmp/static/list/item_digest_modes = list(IM_HOLD,IM_DIGEST_FOOD,IM_DIGEST) @@ -286,6 +287,11 @@ if (!(M in contents)) return 0 // They weren't in this belly anyway + for(var/mob/living/L in M.contents) + L.muffled = 0 + for(var/obj/item/weapon/holder/H in M.contents) + H.held_mob.muffled = 0 + //Place them into our drop_location M.forceMove(drop_location()) @@ -370,7 +376,7 @@ // in message boxes, this looks nice and is easily delimited. /obj/belly/proc/get_messages(type, delim = "\n\n") ASSERT(type == "smo" || type == "smi" || type == "dmo" || type == "dmp" || type == "em") - + var/list/raw_messages switch(type) if("smo") @@ -522,7 +528,7 @@ owner.adjust_nutrition((nutrition_percent / 100) * 5 * digested) if(isrobot(owner)) var/mob/living/silicon/robot/R = owner - R.cell.charge += (50 * digested) + R.cell.charge += ((nutrition_percent / 100) * 50 * digested) return digested //Determine where items should fall out of us into. @@ -546,9 +552,10 @@ //Handle a mob struggling // Called from /mob/living/carbon/relaymove() -/obj/belly/proc/relay_resist(mob/living/R) +/obj/belly/proc/relay_resist(mob/living/R, obj/item/C) if (!(R in contents)) - return // User is not in this belly + if(!C) + return // User is not in this belly R.setClickCooldown(50) @@ -557,9 +564,13 @@ to_chat(owner, "Someone is attempting to climb out of your [lowertext(name)]!") if(do_after(R, escapetime, owner, incapacitation_flags = INCAPACITATION_DEFAULT & ~INCAPACITATION_RESTRAINED)) - if((owner.stat || escapable) && (R.loc == src)) //Can still escape? - release_specific_contents(R) - return + if((owner.stat || escapable)) //Can still escape? + if(C) + release_specific_contents(C) + return + if(R.loc == src) + release_specific_contents(R) + return else if(R.loc != src) //Aren't even in the belly. Quietly fail. return else //Belly became inescapable or mob revived @@ -602,6 +613,13 @@ to_chat(R, "You start to climb out of \the [lowertext(name)].") to_chat(owner, "Someone is attempting to climb out of your [lowertext(name)]!") if(do_after(R, escapetime)) + if(escapable && C) + release_specific_contents(C) + to_chat(R,"Your struggles successfully cause [owner] to squeeze your container out of their \the [lowertext(name)].") + to_chat(owner,"[C] suddenly slips out of your [lowertext(name)]!") + for(var/mob/M in hearers(4, owner)) + M.show_message("[C] suddenly slips out of [owner]'s [lowertext(name)]!", 2) + return if((escapable) && (R.loc == src) && !R.absorbed) //Does the owner still have escapable enabled? release_specific_contents(R) to_chat(R,"You climb out of \the [lowertext(name)].") @@ -632,6 +650,9 @@ to_chat(R, "Your attempt to escape [lowertext(name)] has failed and your struggles only results in you sliding into [owner]'s [transferlocation]!") to_chat(owner, "Someone slid into your [transferlocation] due to their struggling inside your [lowertext(name)]!") + if(C) + transfer_contents(C, dest_belly) + return transfer_contents(R, dest_belly) return diff --git a/code/modules/vore/eating/bellymodes_datum_vr.dm b/code/modules/vore/eating/bellymodes_datum_vr.dm index 04f96becd40..e00860cadaa 100644 --- a/code/modules/vore/eating/bellymodes_datum_vr.dm +++ b/code/modules/vore/eating/bellymodes_datum_vr.dm @@ -14,6 +14,9 @@ GLOBAL_LIST_INIT(digest_modes, list()) /datum/digest_mode/proc/process_mob(obj/belly/B, mob/living/L) return null +/datum/digest_mode/proc/handle_atoms(obj/belly/B, list/touchable_atoms) + return FALSE + /datum/digest_mode/digest id = DM_DIGEST noise_chance = 50 @@ -42,7 +45,7 @@ GLOBAL_LIST_INIT(digest_modes, list()) L.adjustFireLoss(B.digest_burn) var/actual_brute = L.getBruteLoss() - old_brute var/actual_burn = L.getFireLoss() - old_burn - var/damage_gain = actual_brute + actual_burn + var/damage_gain = (actual_brute + actual_burn)*(B.nutrition_percent / 100) var/offset = (1 + ((L.weight - 137) / 137)) // 130 pounds = .95 140 pounds = 1.02 var/difference = B.owner.size_multiplier / L.size_multiplier @@ -50,9 +53,9 @@ GLOBAL_LIST_INIT(digest_modes, list()) var/mob/living/silicon/robot/R = B.owner R.cell.charge += 25 * damage_gain if(offset) // If any different than default weight, multiply the % of offset. - B.owner.adjust_nutrition(offset*((B.nutrition_percent / 100) * 4.5 * (damage_gain) / difference)) //4.5 nutrition points per health point. Normal same size 100+100 health prey with average weight would give 900 points if the digestion was instant. With all the size/weight offset taxes plus over time oxyloss+hunger taxes deducted with non-instant digestion, this should be enough to not leave the pred starved. + B.owner.adjust_nutrition(offset*(4.5 * (damage_gain) / difference)) //4.5 nutrition points per health point. Normal same size 100+100 health prey with average weight would give 900 points if the digestion was instant. With all the size/weight offset taxes plus over time oxyloss+hunger taxes deducted with non-instant digestion, this should be enough to not leave the pred starved. else - B.owner.adjust_nutrition((B.nutrition_percent / 100) * 4.5 * (damage_gain) / difference) + B.owner.adjust_nutrition(4.5 * (damage_gain) / difference) /datum/digest_mode/absorb id = DM_ABSORB @@ -129,130 +132,72 @@ GLOBAL_LIST_INIT(digest_modes, list()) B.owner.adjust_nutrition(-1) L.adjust_nutrition(1) -// TRANSFORM MODES -/datum/digest_mode/transform - var/stabilize_nutrition = FALSE - var/changes_eyes = FALSE - var/changes_hair_solo = FALSE - var/changes_hairandskin = FALSE - var/changes_gender = FALSE - var/changes_gender_to = null - var/changes_species = FALSE - var/changes_ears_tail_wing_nocolor = FALSE - var/changes_ears_tail_wing_color = FALSE - var/eggs = FALSE - -/datum/digest_mode/transform/process_mob(obj/belly/B, mob/living/carbon/human/H) - if(!istype(H) || H.stat == DEAD) - return null - if(stabilize_nutrition) - if(B.owner.nutrition > 400 && H.nutrition < 400) - B.owner.adjust_nutrition(-2) - H.adjust_nutrition(1.5) - if(changes_eyes && B.check_eyes(H)) - B.change_eyes(H, 1) - return null - if(changes_hair_solo && B.check_hair(H)) - B.change_hair(H) - return null - if(changes_hairandskin && (B.check_hair(H) || B.check_skin(H))) - B.change_hair(H) - B.change_skin(H, 1) - return null - if(changes_species) - if(changes_ears_tail_wing_nocolor && (B.check_ears(H) || B.check_tail_nocolor(H) || B.check_wing_nocolor(H) || B.check_species(H))) - B.change_ears(H) - B.change_tail_nocolor(H) - B.change_wing_nocolor(H) - B.change_species(H, 1, 1) // ,1) preserves coloring - H.species.create_organs(H) - H.sync_organ_dna() - return null - if(changes_ears_tail_wing_color && (B.check_ears(H) || B.check_tail(H) || B.check_wing(H) || B.check_species(H))) - B.change_ears(H) - B.change_tail(H) - B.change_wing(H) - B.change_species(H, 1, 2) // ,2) does not preserve coloring. - H.species.create_organs(H) - H.sync_organ_dna() - return null - if(changes_gender && B.check_gender(H, changes_gender_to)) - B.change_gender(H, changes_gender_to, 1) - return null - if(eggs && (!H.absorbed)) - B.put_in_egg(H, 1) - return null - -// Regular TF Modes -/datum/digest_mode/transform/hairandeyes - id = DM_TRANSFORM_HAIR_AND_EYES - stabilize_nutrition = TRUE - changes_eyes = TRUE - changes_hair_solo = TRUE - -/datum/digest_mode/transform/gender - id = DM_TRANSFORM_FEMALE - changes_eyes = TRUE - changes_hairandskin = TRUE - changes_gender = TRUE - changes_gender_to = FEMALE - stabilize_nutrition = TRUE - -/datum/digest_mode/transform/gender/male - id = DM_TRANSFORM_FEMALE - changes_gender_to = MALE - -/datum/digest_mode/transform/keepgender - id = DM_TRANSFORM_KEEP_GENDER - changes_eyes = TRUE - changes_hairandskin = TRUE - stabilize_nutrition = TRUE - -/datum/digest_mode/transform/speciesandtaur - id = DM_TRANSFORM_CHANGE_SPECIES_AND_TAUR - changes_species = TRUE - changes_ears_tail_wing_nocolor = TRUE - stabilize_nutrition = TRUE - -/datum/digest_mode/transform/replica - id = DM_TRANSFORM_REPLICA - changes_eyes = TRUE - changes_hairandskin = TRUE - changes_species = TRUE - changes_ears_tail_wing_color = TRUE - // E G G -/datum/digest_mode/transform/egg +/datum/digest_mode/egg id = DM_EGG - eggs = TRUE +/* +/datum/digest_mode/egg/process_mob(obj/belly/B, mob/living/carbon/human/H) + if(!istype(H) || H.stat == DEAD || H.absorbed) + return null + B.put_in_egg(H, 1)*/ -/datum/digest_mode/transform/egg/gender - id = DM_TRANSFORM_FEMALE_EGG - changes_eyes = TRUE - changes_hairandskin = TRUE - changes_gender = TRUE - changes_gender_to = FEMALE - stabilize_nutrition = TRUE - -/datum/digest_mode/transform/egg/gender/male - id = DM_TRANSFORM_MALE_EGG - changes_gender_to = MALE - -/datum/digest_mode/transform/egg/nogender - id = DM_TRANSFORM_KEEP_GENDER_EGG - changes_eyes = TRUE - changes_hairandskin = TRUE - stabilize_nutrition = TRUE - -/datum/digest_mode/transform/egg/speciesandtaur - id = DM_TRANSFORM_CHANGE_SPECIES_AND_TAUR_EGG - changes_species = TRUE - changes_ears_tail_wing_nocolor = TRUE - stabilize_nutrition = TRUE - -/datum/digest_mode/transform/egg/replica - id = DM_TRANSFORM_REPLICA_EGG - changes_eyes = TRUE - changes_hairandskin = TRUE - changes_species = TRUE - changes_ears_tail_wing_color = TRUE \ No newline at end of file +/datum/digest_mode/egg/handle_atoms(obj/belly/B, list/touchable_atoms) + var/list/egg_contents = list() + for(var/E in touchable_atoms) + if(istype(E, /obj/item/weapon/storage/vore_egg)) // Don't egg other eggs. + continue + if(isliving(E)) + var/mob/living/L = E + if(L.absorbed) + continue + egg_contents += L + if(isitem(E)) + egg_contents += E + if(egg_contents.len) + if(!B.ownegg) + if(B.owner.vore_egg_type in tf_vore_egg_types) + B.egg_type = B.owner.vore_egg_type + B.egg_path = tf_vore_egg_types[B.egg_type] + B.ownegg = new B.egg_path(B) + for(var/atom/movable/C in egg_contents) + if(isitem(C) && egg_contents.len == 1) //Only egging one item + var/obj/item/I = C + B.ownegg.w_class = I.w_class + B.ownegg.max_storage_space = B.ownegg.w_class + I.forceMove(B.ownegg) + B.ownegg.icon_scale_x = 0.2 * B.ownegg.w_class + B.ownegg.icon_scale_y = 0.2 * B.ownegg.w_class + B.ownegg.update_transform() + egg_contents -= I + B.ownegg = null + return + if(isliving(C)) + var/mob/living/M = C + B.ownegg.w_class = M.size_multiplier * 4 //Egg size and weight scaled to match occupant. + var/obj/item/weapon/holder/H = new M.holder_type(B.ownegg) + H.held_mob = M + M.forceMove(H) + H.sync(M) + B.ownegg.max_storage_space = H.w_class + B.ownegg.icon_scale_x = 0.25 * B.ownegg.w_class + B.ownegg.icon_scale_y = 0.25 * B.ownegg.w_class + B.ownegg.update_transform() + egg_contents -= M + if(B.ownegg.w_class > 4) + B.ownegg.slowdown = B.ownegg.w_class - 4 + B.ownegg = null + return + C.forceMove(B.ownegg) + if(isitem(C)) + var/obj/item/I = C + B.ownegg.w_class += I.w_class //Let's assume a regular outfit can reach total w_class of 16. + B.ownegg.calibrate_size() + B.ownegg.orient2hud() + B.ownegg.w_class = clamp(B.ownegg.w_class * 0.25, 1, 8) //A total w_class of 16 will result in a backpack sized egg. + B.ownegg.icon_scale_x = 0.25 * B.ownegg.w_class + B.ownegg.icon_scale_y = 0.25 * B.ownegg.w_class + B.ownegg.update_transform() + if(B.ownegg.w_class > 4) + B.ownegg.slowdown = B.ownegg.w_class - 4 + B.ownegg = null + return \ No newline at end of file diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index d5eaeb4d257..23ef02e9ac9 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -31,6 +31,14 @@ if(!length(touchable_atoms)) return + var/datum/digest_mode/DM = GLOB.digest_modes["[digest_mode]"] + if(!DM) + log_debug("Digest mode [digest_mode] didn't exist in the digest_modes list!!") + return FALSE + if(DM.handle_atoms(src, touchable_atoms)) + updateVRPanels() + return + var/list/touchable_mobs = null var/list/hta_returns = handle_touchable_atoms(touchable_atoms) @@ -54,11 +62,6 @@ continue // don't give digesty messages to indigestible people to_chat(M, "[pick(EL)]") - var/datum/digest_mode/DM = GLOB.digest_modes["[digest_mode]"] - if(!DM) - log_debug("Digest mode [digest_mode] didn't exist in the digest_modes list!!") - return FALSE - if(!digestion_noise_chance) digestion_noise_chance = DM.noise_chance @@ -89,7 +92,7 @@ else M.playsound_local(owner.loc, play_sound, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF) //these are all external sound triggers now, so it's ok. - + if(to_update) updateVRPanels() @@ -137,6 +140,16 @@ if((mode_flags & DM_FLAG_THICKBELLY) && !H.muffled) H.muffled = TRUE + //Worn items flag + if(mode_flags & DM_FLAG_AFFECTWORN) + for(var/slot in slots) + var/obj/item/I = H.get_equipped_item(slot = slot) + if(I && I.canremove) + if(handle_digesting_item(I)) + digestion_noise_chance = 25 + to_update = TRUE + break + //Stripping flag if(mode_flags & DM_FLAG_STRIPPING) for(var/slot in slots) @@ -146,7 +159,7 @@ digestion_noise_chance = 25 to_update = TRUE break // Digest off one by one, not all at once - + //get rid of things like blood drops and gibs that end up in there else if(istype(A, /obj/effect/decal/cleanable)) qdel(A) @@ -215,7 +228,7 @@ if(compensation > 0) if(isrobot(owner)) var/mob/living/silicon/robot/R = owner - R.cell.charge += 25*compensation + R.cell.charge += 25*compensation*(nutrition_percent / 100) else owner.adjust_nutrition((nutrition_percent / 100)*4.5*compensation) diff --git a/code/modules/vore/eating/contaminate_vr.dm b/code/modules/vore/eating/contaminate_vr.dm index 5bbbe902c76..998c7b53c53 100644 --- a/code/modules/vore/eating/contaminate_vr.dm +++ b/code/modules/vore/eating/contaminate_vr.dm @@ -105,6 +105,9 @@ var/list/gurgled_overlays = list( /obj/item/weapon/reagent_containers/food/gurgle_contaminate(var/atom/movable/item_storage = null) return FALSE +/obj/item/weapon/storage/vore_egg/gurgle_contaminate(var/atom/movable/item_storage = null) + return FALSE + /obj/item/weapon/holder/gurgle_contaminate(var/atom/movable/item_storage = null) if(isbelly(loc)) digest_act(item_storage) @@ -150,4 +153,4 @@ var/list/gurgled_overlays = list( if(pockets.contents) for(var/obj/item/O in pockets.contents) O.gurgle_contaminate(item_storage, contamination_flavor, contamination_color) - ..() \ No newline at end of file + ..() diff --git a/code/modules/vore/eating/transforming_vr.dm b/code/modules/vore/eating/transforming_vr.dm index 8f9eea2371c..e8de8d466ba 100644 --- a/code/modules/vore/eating/transforming_vr.dm +++ b/code/modules/vore/eating/transforming_vr.dm @@ -1,250 +1,3 @@ -/obj/belly/proc/check_eyes(var/mob/living/carbon/human/M) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return 0 - return (M.r_eyes != O.r_eyes || M.g_eyes != O.g_eyes || M.b_eyes != O.b_eyes) - -/obj/belly/proc/change_eyes(var/mob/living/carbon/human/M, message=0) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return - - M.r_eyes = O.r_eyes - M.g_eyes = O.g_eyes - M.b_eyes = O.b_eyes - M.update_eyes() - M.update_icons_body() - if(message) - to_chat(M, "You feel lightheaded and drowsy...") - to_chat(O, "You feel warm as you make subtle changes to your captive's body.") - -/obj/belly/proc/check_hair(var/mob/living/carbon/human/M) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return 0 - - if(M.r_hair != O.r_hair || M.g_hair != O.g_hair || M.b_hair != O.b_hair) - return 1 - if(M.r_facial != O.r_facial || M.g_facial != O.g_facial || M.b_facial != O.b_facial) - return 1 - if(M.h_style != O.h_style || M.f_style != O.f_style) - return 1 - return 0 - -/obj/belly/proc/change_hair(var/mob/living/carbon/human/M, message=0) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return - - M.r_hair = O.r_hair - M.g_hair = O.g_hair - M.b_hair = O.b_hair - M.r_facial = O.r_facial - M.g_facial = O.g_facial - M.b_facial = O.b_facial - M.h_style = O.h_style - M.f_style = O.f_style - M.update_hair() - if(message) - to_chat(M, "Your body tingles all over...") - to_chat(O, "You tingle as you make noticeable changes to your captive's body.") - -/obj/belly/proc/check_skin(var/mob/living/carbon/human/M) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return 0 - - return (M.r_skin != O.r_skin || M.g_skin != O.g_skin || M.b_skin != O.b_skin) - -/obj/belly/proc/change_skin(var/mob/living/carbon/human/M, message=0) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return - - M.r_skin = O.r_skin - M.g_skin = O.g_skin - M.b_skin = O.b_skin - for(var/obj/item/organ/external/Z in M.organs) - Z.sync_colour_to_human(M) - M.update_icons_body() - if(message) - to_chat(M, "Your body tingles all over...") - to_chat(O, "You tingle as you make noticeable changes to your captive's body.") - -/obj/belly/proc/check_gender(var/mob/living/carbon/human/M, target_gender) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return 0 - - if(!target_gender) - target_gender = O.gender - - return (M.gender != target_gender || M.identifying_gender != target_gender) - -/obj/belly/proc/change_gender(var/mob/living/carbon/human/M, target_gender, message=0) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return - - if(!target_gender) - target_gender = O.gender - - M.gender = target_gender - M.identifying_gender = target_gender - if(target_gender == FEMALE) - M.f_style = "Shaved" - M.dna.SetUIState(DNA_UI_GENDER,M.gender!=MALE,1) - M.sync_organ_dna() - M.update_icons_body() - if(message) - to_chat(M, "Your body feels very strange...") - to_chat(O, "You feel strange as you alter your captive's gender.") - -/obj/belly/proc/check_tail(var/mob/living/carbon/human/M) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return 0 - - if(M.tail_style != O.tail_style) - return 1 - if(M.r_tail != O.r_tail || M.g_tail != O.g_tail || M.b_tail != O.b_tail) - return 1 - return 0 - -/obj/belly/proc/change_tail(var/mob/living/carbon/human/M, message=0) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return - - M.r_tail = O.r_tail - M.g_tail = O.g_tail - M.b_tail = O.b_tail - M.tail_style = O.tail_style - M.update_tail_showing() - if(message) - to_chat(M, "Your body tingles all over...") - to_chat(O, "You tingle as you make noticeable changes to your captive's body.") - -/obj/belly/proc/check_tail_nocolor(var/mob/living/carbon/human/M) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return 0 - - return (M.tail_style != O.tail_style) - -/obj/belly/proc/change_tail_nocolor(var/mob/living/carbon/human/M, message=0) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return - - M.tail_style = O.tail_style - M.update_tail_showing() - if(message) - to_chat(M, "Your body tingles all over...") - to_chat(O, "You tingle as you make noticeable changes to your captive's body.") - -/obj/belly/proc/check_wing(var/mob/living/carbon/human/M) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return 0 - - if(M.wing_style != O.wing_style) - return 1 - if(M.r_wing != O.r_wing || M.g_wing != O.g_wing || M.b_wing != O.b_wing) - return 1 - return 0 - -/obj/belly/proc/change_wing(var/mob/living/carbon/human/M, message=0) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return - - M.r_wing = O.r_wing - M.g_wing = O.g_wing - M.b_wing = O.b_wing - M.wing_style = O.wing_style - M.update_wing_showing() - if(message) - to_chat(M, "Your body tingles all over...") - to_chat(O, "You tingle as you make noticeable changes to your captive's body.") - -/obj/belly/proc/check_wing_nocolor(var/mob/living/carbon/human/M) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return 0 - - return (M.wing_style != O.wing_style) - -/obj/belly/proc/change_wing_nocolor(var/mob/living/carbon/human/M, message=0) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return - - M.wing_style = O.wing_style - M.update_wing_showing() - if(message) - to_chat(M, "Your body tingles all over...") - to_chat(O, "You tingle as you make noticeable changes to your captive's body.") - -/obj/belly/proc/check_ears(var/mob/living/carbon/human/M) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return 0 - - return (M.ear_style != O.ear_style) - -/obj/belly/proc/change_ears(var/mob/living/carbon/human/M, message=0) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return - - M.ear_style = O.ear_style - M.update_hair() - -/obj/belly/proc/check_species(var/mob/living/carbon/human/M) - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return 0 - - if(M.species.name != O.species.name || M.custom_species != O.custom_species) - return 1 - return 0 - -/obj/belly/proc/change_species(var/mob/living/carbon/human/M, message=0, color_action = 0) //color_action: 0 for default species, 1 to preserve, 2 to transfer from pred - var/mob/living/carbon/human/O = owner - if(!istype(M) || !istype(O)) - return - - M.verbs -= M.species.inherent_verbs //Take away their unique stuff - - var/list/backup_implants = list() - for(var/obj/item/organ/I in M.organs) - for(var/obj/item/weapon/implant/backup/BI in I.contents) - backup_implants += BI - if(backup_implants.len) - for(var/obj/item/weapon/implant/backup/BI in backup_implants) - BI.forceMove(src) - if(color_action == 1) - M.set_species(O.species.name,0,1,M) - else if(color_action == 2) - M.species = O.species - else - M.set_species(O.species.name) - M.custom_species = O.custom_species - - M.update_icons_body() - M.update_tail_showing() - - if(backup_implants.len) - var/obj/item/organ/external/torso = M.get_organ(BP_TORSO) - for(var/obj/item/weapon/implant/backup/BI in backup_implants) - BI.forceMove(torso) - torso.implants += BI - - if(message) - to_chat(M, "You lose sensation of your body, feeling only the warmth of everything around you... ") - to_chat(O, "Your body shifts as you make dramatic changes to your captive's body.") - /obj/belly/proc/put_in_egg(var/atom/movable/M, message=0) var/mob/living/carbon/human/O = owner var/egg_path = /obj/structure/closet/secure_closet/egg diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 00b4ac3c872..086c5270f7c 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -236,7 +236,7 @@ // Host is inside someone else, and is trying to interact with something else inside that person. if("pick_from_inside") return pick_from_inside(usr, params) - + // Host is trying to interact with something in host's belly. if("pick_from_outside") return pick_from_outside(usr, params) @@ -267,7 +267,7 @@ host.vore_selected = NB unsaved_changes = TRUE return TRUE - + if("bellypick") host.vore_selected = locate(params["bellypick"]) return TRUE @@ -403,11 +403,11 @@ if(!(target in OB)) return TRUE // Aren't here anymore, need to update menu - + var/intent = "Examine" if(isliving(target)) intent = alert("What do you want to do to them?","Query","Examine","Help Out","Devour") - + else if(istype(target, /obj/item)) intent = alert("What do you want to do to that?","Query","Examine","Use Hand") @@ -505,12 +505,14 @@ host.vore_selected.transfer_contents(target, choice, 1) return TRUE return - + var/atom/movable/target = locate(params["pick"]) if(!(target in host.vore_selected)) return TRUE // Not in our X anymore, update UI - intent = "Examine" - intent = alert("Examine, Eject, Move? Examine if you want to leave this box.","Query","Examine","Eject","Move") + var/list/available_options = list("Examine", "Eject", "Move") + if(ishuman(target)) + available_options += "Transform" + intent = input(user, "What would you like to do with [target]?", "Vore Pick", "Examine") as null|anything in available_options switch(intent) if("Examine") var/list/results = target.examine(host) @@ -525,6 +527,7 @@ return TRUE host.vore_selected.release_specific_contents(target) + return TRUE if("Move") if(host.stat) @@ -537,6 +540,20 @@ to_chat(target,"You're squished from [host]'s [lowertext(host.vore_selected.name)] to their [lowertext(choice.name)]!") host.vore_selected.transfer_contents(target, choice) + return TRUE + + if("Transform") + if(host.stat) + to_chat(user,"You can't do that in your state!") + return TRUE + + var/mob/living/carbon/human/H = target + if(!istype(H)) + return + + var/datum/tgui_module/appearance_changer/vore/V = new(host, H) + V.tgui_interact(user) + return TRUE /datum/vore_look/proc/set_attr(mob/user, params) if(!host.vore_selected) @@ -573,21 +590,10 @@ . = TRUE if("b_mode") var/list/menu_list = host.vore_selected.digest_modes.Copy() - if(istype(usr,/mob/living/carbon/human)) - menu_list += DM_TRANSFORM - var/new_mode = input("Choose Mode (currently [host.vore_selected.digest_mode])") as null|anything in menu_list if(!new_mode) return FALSE - if(new_mode == DM_TRANSFORM) //Snowflek submenu - var/list/tf_list = host.vore_selected.transform_modes - var/new_tf_mode = input("Choose TF Mode (currently [host.vore_selected.digest_mode])") as null|anything in tf_list - if(!new_tf_mode) - return FALSE - host.vore_selected.digest_mode = new_tf_mode - return - host.vore_selected.digest_mode = new_mode . = TRUE if("b_addons") @@ -596,7 +602,7 @@ if(!toggle_addon) return FALSE host.vore_selected.mode_flags ^= host.vore_selected.mode_flag_list[toggle_addon] - host.vore_selected.items_preserved.Cut() //Re-evaltuate all items in belly on + host.vore_selected.items_preserved.Cut() //Re-evaltuate all items in belly on . = TRUE if("b_item_mode") var/list/menu_list = host.vore_selected.item_digest_modes.Copy() @@ -626,7 +632,7 @@ host.vore_selected.contamination_color = new_color host.vore_selected.items_preserved.Cut() //To re-contaminate for new color . = TRUE - if("b_desc") + if("b_desc") var/new_desc = html_encode(input(usr,"Belly Description ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.desc) as message|null) if(new_desc) @@ -859,6 +865,6 @@ qdel(host.vore_selected) host.vore_selected = host.vore_organs[1] . = TRUE - + if(.) unsaved_changes = TRUE \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 9fde531d697..78af3b90441 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -110,8 +110,8 @@ //ketrai:Ketrai /obj/item/clothing/head/fluff/ketrai - name = "Pink Bear Hat" - desc = "A pink space bear hat, the origins are unknown" + name = "Bear Pelt" + desc = "A luxury space bear pelt, its origins unknown." icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "bearpelt" @@ -2024,7 +2024,7 @@ Departamental Swimsuits, for general use desc = "A special hat, removed from its owner." //Ryumi: Nikki Yumeno -/obj/item/clothing/under/skirt/outfit/fluff/nikki +/obj/item/clothing/under/skirt/outfit/fluff/nikki name = "dorky outfit" desc = "A little witch costume that looks like it's been worn as ordinary clothes. Who in their right mind would...??" icon = 'icons/vore/custom_clothes_vr.dmi' @@ -2050,7 +2050,7 @@ Departamental Swimsuits, for general use icon_state = "nikki_boots" item_state = "nikki_boots" -/obj/item/clothing/shoes/fluff/nikki/mob_can_equip(var/mob/living/carbon/human/M, slot, disable_warning = 0) +/obj/item/clothing/shoes/fluff/nikki/mob_can_equip(var/mob/living/carbon/human/M, slot, disable_warning = 0) if(..()) if (M.ckey == "ryumi") return 1 @@ -2084,7 +2084,7 @@ Departamental Swimsuits, for general use icon_state = "nikki-hat" item_state = "nikki-hat" item_icons = list( - slot_l_hand_str = 'icons/vore/custom_clothes_left_hand_vr.dmi', + slot_l_hand_str = 'icons/vore/custom_clothes_left_hand_vr.dmi', slot_r_hand_str = 'icons/vore/custom_clothes_right_hand_vr.dmi', slot_head_str = 'icons/vore/custom_onmob_32x48_vr.dmi' ) @@ -2138,19 +2138,19 @@ Departamental Swimsuits, for general use to_chat(user, "You think to turn \the [src] on its creator?! FOOOOOOOOL.") to_chat(user, "From seemingly nowhere you hear echoing, derisive laughter, accompanied by a stock laugh track and... Are those bike horns?") return 0 - + if (!istype(target)) to_chat(user, "\The [src] isn't a valid target!") return 0 - + // Because other mobs (i.e. monkeys) apparently have dropnom prey set to 0, we check SPECIFICALLY for humans' dropnom setting. if (target.type == /mob/living/carbon/human && !target.can_be_drop_prey) teleport_fail(user, target) return 0 - + if (!translocator.teleport_checks(target, user)) return 0 - + else return 1 /obj/item/clothing/head/fluff/nikki/attackby(obj/item/weapon/I as obj, mob/user as mob) @@ -2237,7 +2237,7 @@ Departamental Swimsuits, for general use if (I_HURT) user.visible_message("[user] swipes \the [src] over \the [target]!") translocator.afterattack(target, user, proximity_flag) - + add_attack_logs(user, target, "Teleported [target] with via \the [src]'s [translocator]!") else ..() @@ -2251,7 +2251,7 @@ Departamental Swimsuits, for general use icon_override = 'icons/vore/custom_onmob_vr.dmi' item_state = "verie_hoodie" - + hoodtype = /obj/item/clothing/head/hood/winter/fluff/verie var/owner = "vitoras" @@ -2265,6 +2265,7 @@ Departamental Swimsuits, for general use ..() /obj/item/clothing/head/hood/winter/fluff/verie + body_parts_covered = null // This way, Verie's hair can show through the hood! name = "not-so-cyan hood" icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "verie_hood" diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 3b71faa6abe..bcb1ad38503 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -828,6 +828,45 @@ accessset = 1 ..() +//verysoft:Harmony - Custom ID (pilot) +/obj/item/weapon/card/id/fluff/harmony + registered_name = "CONFIGURE ME" + assignment = "CONFIGURE ME" + var/configured = 0 + var/accessset = 0 + icon = 'icons/obj/card_vr.dmi' + icon_state = "itg" + desc = "A small card designating affiliation with the Ironcrest Transport Group. It has a NanoTrasen insignia and a lot of very small print on the back to do with practices and regulations for contractors to use." + var/title_strings = list("Harmony's ITG-ID card") + +/obj/item/weapon/card/id/fluff/harmony/attack_self(mob/user as mob) + if(configured == 1) + return ..() + + var/title + if(user.client.prefs.player_alt_titles[user.job]) + title = user.client.prefs.player_alt_titles[user.job] + else + title = user.job + assignment = title + user.set_id_info(src) + if(user.mind && user.mind.initial_account) + associated_account_number = user.mind.initial_account.account_number + var/tempname = pick(title_strings) + name = tempname + " ([title])" + configured = 1 + to_chat(user, "Card settings set.") + +/obj/item/weapon/card/id/fluff/harmony/attackby(obj/item/I as obj, mob/user as mob) + if(istype(I, /obj/item/weapon/card/id) && !accessset) + var/obj/item/weapon/card/id/O = I + access |= O.access + to_chat(user, "You copy the access from \the [I] to \the [src].") + user.drop_from_inventory(I) + qdel(I) + accessset = 1 + ..() + //General use, Verk felt like sharing. /obj/item/clothing/glasses/fluff/science_proper name = "Aesthetic Science Goggles" @@ -1267,7 +1306,7 @@ siemens_coefficient = 0.9 slowdown = 0 offline_slowdown = 0 - offline_vision_restriction = 0 + offline_vision_restriction = 0 siemens_coefficient = 0.9 chest_type = /obj/item/clothing/suit/fluff/nikki @@ -1375,7 +1414,7 @@ to_chat(user, "The brush's teeth are far too rough to even comb your hair. Apparently, \ this device was not made for people like you.") return - + if (!user.hair_accessory_style) var/datum/sprite_accessory/hair_accessory/verie_hair_glow/V = new(user) user.hair_accessory_style = V @@ -1385,7 +1424,7 @@ "You brush your hair. \The [src]'s teeth begin to vibrate and glow as they react to your nanites. \ The teeth stimulate the nanites in your hair strands until your hair give off a brilliant, faintly pulsing \ cyan glow!") - + else user.visible_message("[user] combs her hair. \The [src] brushes away her glowing cyan highlights. Neat!", \ "You brush your hair. \The [src]'s teeth wipe away the glowing streaks in your hair \ @@ -1395,12 +1434,14 @@ to_chat(user, "found a V to delete!") qdel(V) user.update_hair() - - + + else to_chat(user, "\The [src] isn't compatible with your body as it is now.") - - - - +// Astra - // Astra +/obj/item/weapon/material/knife/ritual/fluff/astra + name = "Polished Ritual Knife" + desc = "A well kept strange ritual knife, There is a small tag with the name 'Astra Ether' on it. They are probably looking for this." + icon = 'icons/obj/wizard.dmi' + icon_state = "render" diff --git a/code/modules/vore/resizing/holder_micro_vr.dm b/code/modules/vore/resizing/holder_micro_vr.dm index 4e7b63e0b98..b0bfbcc5b42 100644 --- a/code/modules/vore/resizing/holder_micro_vr.dm +++ b/code/modules/vore/resizing/holder_micro_vr.dm @@ -48,3 +48,23 @@ ..() for(var/mob/living/carbon/human/I in contents) item_state = lowertext(I.species.name) + +//Egg features. +/obj/item/weapon/holder/attack_hand(mob/living/user as mob) + if(istype(src.loc, /obj/item/weapon/storage/vore_egg)) //Don't scoop up the egged mob + src.pickup(user) + user.drop_from_inventory(src) + return + ..() + +/obj/item/weapon/holder/container_resist(mob/living/held) + if(!istype(src.loc, /obj/item/weapon/storage/vore_egg)) + ..() + else + var/obj/item/weapon/storage/vore_egg/E = src.loc + if(isbelly(E.loc)) + var/obj/belly/B = E.loc + B.relay_resist(held, E) + return + E.hatch(held) + return diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm index b121724219b..c6be35df69d 100644 --- a/code/modules/xenoarcheaology/finds/find_spawning.dm +++ b/code/modules/xenoarcheaology/finds/find_spawning.dm @@ -295,7 +295,7 @@ if(spawn_type) var/obj/item/weapon/gun/energy/new_gun = new spawn_type(src.loc) new_item = new_gun - new_item.icon_state = "egun[rand(1,12)]" + new_item.icon_state = "egun[rand(1,6)]" //VOREStation Edit: max value is 6 since xenoarcheoloy_vr only has 6 egun variants new_gun.desc = "This is an antique energy weapon, you're not sure if it will fire or not." //5% chance to explode when first fired diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 4ca8fb9436b..3d22733d95e 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -67,7 +67,11 @@ em {font-style: normal;font-weight: bold;} h1.alert, h2.alert {color: #000000;} .ghostalert {color: #5c00e6; font-style: italic; font-weight: bold;} -.emote {font-style: italic;} + +// VOREStation Edit Start +.emote {} +.emote_subtle {font-style: italic;} +// VOREStation Edit End /* Game Messages */ @@ -111,7 +115,8 @@ h1.alert, h2.alert {color: #000000;} .say_quote {font-family: Georgia, Verdana, sans-serif;} .terminus {font-family: "Times New Roman", Times, serif, sans-serif} .interface {color: #330033;} -.spacer {color: #9c660b;} +.spacer {color: #9c660b;} /* VOREStation Add */ +.blob {color: #ff950d; font-weight: bold; font-style: italic;} BIG IMG.icon {width: 32px; height: 32px;} diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index 3429f4c6f14..dc88467f4b0 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -3,11 +3,14 @@ admiraldragon - Vox aetherelemental - Daemon alphaprime1 - Protean amarewolf - Xenochimera +amshaegaar - Vox arandomalien - Xenochimera arokha - Protean aruis - Diona +aruis - Protean aruis - Xenochimera azmodan412 - Xenochimera +beyondmylife - Protean bothnevarbackwards - Diona bricker98 - Protean cgr - Protean @@ -19,13 +22,17 @@ draycu - Vox flaktual - Vox flurriee - Protean funnyman2003 - Xenochimera +greennyy - Protean hawkerthegreat - Vox hollifex - Diona +h0lysquirr3l - Protean inuzari - Diona +jademanique - Black-Eyed Shadekin jademanique - Xenochimera khanivore - Protean killjaden - Protean ktccd - Diona +liache - Black-Eyed Shadekin magpiemayhem - Vox marco_barko - Protean mewchild - Diona @@ -41,10 +48,8 @@ paradoxspace - Xenochimera pearlprophet - Protean pemdesos - Protean phoenixx0 - Vox +qrocakes - Black-Eyed Shadekin radiantaurora - Protean -rapidvalj - Vox -rapidvalj - Common Skrellian -rapidvalj - High Skrellian rikaru19xjenkins - Xenochimera rixunie - Diona rubyflamewing - Protean @@ -63,10 +68,14 @@ storesund97 - Protean tastypred - Black-Eyed Shadekin tastypred - Xenochimera tastypred - Protean +terrestris - Vox +terrestris - Common Skrellian +terrestris - High Skrellian timidvi - Diona trikonei - Protean varonis - Xenochimera verkister - Xenochimera +verysoft - Black-Eyed Shadekin vitoras - Protean voidalynx - Protean wickedtemp - Shadekin Empathy @@ -75,4 +84,3 @@ xioen - Xenochimera xonkon - Protean zalvine - Shadekin Empathy zammyman215 - Vox - diff --git a/config/jobwhitelist.txt b/config/jobwhitelist.txt index 130be911dbe..96e11549607 100644 --- a/config/jobwhitelist.txt +++ b/config/jobwhitelist.txt @@ -1,5 +1,6 @@ # Job whitelist in format ckey - jobname # Like arokha - clown +Akram - clown seiga - mime silvertalismen - clown suicidalpickles - mime diff --git a/html/changelogs/Cerebulon - machinesounds.yml b/html/changelogs/Cerebulon - machinesounds.yml index c6bfbfeaa30..fee9629a4f8 100644 --- a/html/changelogs/Cerebulon - machinesounds.yml +++ b/html/changelogs/Cerebulon - machinesounds.yml @@ -1,36 +1,4 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. author: Cerebulon - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. changes: - soundadd: "Added button sounds to various machines." diff --git a/html/changelogs/KasparoVy - PR - 7760.yml b/html/changelogs/KasparoVy - PR - 7760.yml index c4569eead39..44df74a4a55 100644 --- a/html/changelogs/KasparoVy - PR - 7760.yml +++ b/html/changelogs/KasparoVy - PR - 7760.yml @@ -1,37 +1,5 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. author: KasparoVy - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. changes: - imageadd: Adds orange Teshari goggles, selectable in the loadout. - imageadd: Adds blindfold & new white (recolorable) blindfold to loadout. @@ -42,4 +10,4 @@ changes: - rscadd: Adds a bunch of Teshari worksuits (sprites already existed). - imageadd: Adds some species-fitted Teshari jacket accessories (tan, charcoal, navy, burgundy, checkered). - tweak: Updates all Teshari undercoats and cloaks with new sprites from downstreams. - - fix: Fixes Teshari captain glove sprites. + - bugfix: Fixes Teshari captain glove sprites. diff --git a/html/changelogs/Mechoid - Encumbrance.yml b/html/changelogs/Mechoid - Encumbrance.yml index f013a3bcad9..4c735bd9deb 100644 --- a/html/changelogs/Mechoid - Encumbrance.yml +++ b/html/changelogs/Mechoid - Encumbrance.yml @@ -1,36 +1,4 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. author: Mechoid - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. changes: - rscadd: "Added system for exosuit over-encumbrance. Combat mechs and Ripleys have higher than default." diff --git a/html/changelogs/Meghan Rossi - the_teslagen.yml b/html/changelogs/Meghan Rossi - the_teslagen.yml index ee59d5663e1..efa9d81ba46 100644 --- a/html/changelogs/Meghan Rossi - the_teslagen.yml +++ b/html/changelogs/Meghan Rossi - the_teslagen.yml @@ -1,4 +1,4 @@ author: Meghan-Rossi delete-after: True changes: - - rscadd: "The Tesla Generator is now available from cargo. Coils and grounding rods for it may be printed on the protolathe and autolathe, respectively." \ No newline at end of file + - rscadd: "The Tesla Generator is now available from cargo. Coils and grounding rods for it may be printed on the protolathe and autolathe, respectively." \ No newline at end of file diff --git a/html/changelogs/Runa Dacino - Exosuit gripper tweak.yml b/html/changelogs/Runa Dacino - Exosuit gripper tweak.yml index fc17d241d0c..7a8539afcee 100644 --- a/html/changelogs/Runa Dacino - Exosuit gripper tweak.yml +++ b/html/changelogs/Runa Dacino - Exosuit gripper tweak.yml @@ -1,37 +1,5 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. -author: N3X15 - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +author: RunaDacino delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. changes: - rscadd: "Enabled research borgs equipped with 'exosuit gripper' to be able to replace internal exosuit parts like actuators, to upgrade or to repair" diff --git a/html/changelogs/SubberTheFabulous-PR-7642.yml b/html/changelogs/SubberTheFabulous-PR-7642.yml index 23864c64b07..a816794d443 100644 --- a/html/changelogs/SubberTheFabulous-PR-7642.yml +++ b/html/changelogs/SubberTheFabulous-PR-7642.yml @@ -1,36 +1,4 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. author: Subber - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. changes: - rscadd: "Added two new antag augments to traitor uplink: armblade and handblade." diff --git a/html/changelogs/Woodrat - Vote.yml b/html/changelogs/Woodrat - Vote.yml index 78317ec750c..872c80edfa8 100644 --- a/html/changelogs/Woodrat - Vote.yml +++ b/html/changelogs/Woodrat - Vote.yml @@ -1,36 +1,4 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. author: Woodrat - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. changes: - tweak: "Changes vote notification sound to that of World Server in order to help people realize there is a vote occurring." diff --git a/html/changelogs/mechoid - butchery.yml b/html/changelogs/mechoid - butchery.yml index 433bf787e76..598b5743567 100644 --- a/html/changelogs/mechoid - butchery.yml +++ b/html/changelogs/mechoid - butchery.yml @@ -34,4 +34,4 @@ delete-after: True # Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. changes: - rscadd: "Animals can be butchered for organs and hide. Requires scraping (sharp), washing (water or washing machine), and then drying (bonfire or drying rack)." - - rscadd: "Organs can be butchered for meat, named "[organ] meat". Heart meat, liver meat, etc. Brains from player mobs cannot be butchered." + - rscadd: "Organs can be butchered for meat, named \"[organ] meat\". Heart meat, liver meat, etc. Brains from player mobs cannot be butchered." diff --git a/html/changelogs/mechoid - hydroupkeep.yml b/html/changelogs/mechoid - hydroupkeep.yml index 66b4cea2144..023ba1495e9 100644 --- a/html/changelogs/mechoid - hydroupkeep.yml +++ b/html/changelogs/mechoid - hydroupkeep.yml @@ -1,37 +1,5 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. author: Mechoid - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. changes: - rscadd: "Adds Wurmwoad, a suspiciously worm-like plant that produces pods of spice." - rscadd: "Adds Wurmwoad to the service borg synthesizer." diff --git a/icons/_nanomaps/tether_nanomap_z1.png b/icons/_nanomaps/tether_nanomap_z1.png index a94568d0de7..a7bb05e7bc4 100644 Binary files a/icons/_nanomaps/tether_nanomap_z1.png and b/icons/_nanomaps/tether_nanomap_z1.png differ diff --git a/icons/_nanomaps/tether_nanomap_z2.png b/icons/_nanomaps/tether_nanomap_z2.png index 485afcd2403..bbd381ae474 100644 Binary files a/icons/_nanomaps/tether_nanomap_z2.png and b/icons/_nanomaps/tether_nanomap_z2.png differ diff --git a/icons/_nanomaps/tether_nanomap_z3.png b/icons/_nanomaps/tether_nanomap_z3.png index ade27a8b4c8..72c7582c2af 100644 Binary files a/icons/_nanomaps/tether_nanomap_z3.png and b/icons/_nanomaps/tether_nanomap_z3.png differ diff --git a/icons/_nanomaps/tether_nanomap_z7.png b/icons/_nanomaps/tether_nanomap_z7.png index 0f5d0d3a8ea..c404e1da35b 100644 Binary files a/icons/_nanomaps/tether_nanomap_z7.png and b/icons/_nanomaps/tether_nanomap_z7.png differ diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index e8905467f61..f578e1f9acf 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi index 65dfa982373..44f6047eeb2 100644 Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ diff --git a/icons/mecha/mecha_equipment.dmi b/icons/mecha/mecha_equipment.dmi index 1fcdff0f723..eb5944366a4 100644 Binary files a/icons/mecha/mecha_equipment.dmi and b/icons/mecha/mecha_equipment.dmi differ diff --git a/icons/mob/drakeborg/Drakeborg-Licensing.txt b/icons/mob/drakeborg/Drakeborg-Licensing.txt new file mode 100644 index 00000000000..f2d3ca925ca --- /dev/null +++ b/icons/mob/drakeborg/Drakeborg-Licensing.txt @@ -0,0 +1,69 @@ +Drakeborg & drakeplushies are created by deviantart.com/mizartz + +https://creativecommons.org/licenses/by-nc-sa/3.0/ +Attribution-NonCommercial-ShareAlike 3.0 Unported + +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. +License +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + +"Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. +"Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(g) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. +"Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. +"License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, Noncommercial, ShareAlike. +"Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. +"Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. +"Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. +"You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. +"Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. +"Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. +2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + +to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; +to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; +to Distribute and Publicly Perform the Work including as incorporated in Collections; and, +to Distribute and Publicly Perform Adaptations. +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved, including but not limited to the rights described in Section 4(e). + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + +You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(d), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(d), as requested. +You may Distribute or Publicly Perform an Adaptation only under: (i) the terms of this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-NonCommercial-ShareAlike 3.0 US) ("Applicable License"). You must include a copy of, or the URI, for Applicable License with every copy of each Adaptation You Distribute or Publicly Perform. You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License. You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License. +You may not exercise any of the rights granted to You in Section 3 above in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation. The exchange of the Work for other copyrighted works by means of digital file-sharing or otherwise shall not be considered to be intended for or directed toward commercial advantage or private monetary compensation, provided there is no payment of any monetary compensation in con-nection with the exchange of copyrighted works. +If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and, (iv) consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(d) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. +For the avoidance of doubt: + +Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; +Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License if Your exercise of such rights is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(c) and otherwise waives the right to collect royalties through any statutory or compulsory licensing scheme; and, +Voluntary License Schemes. The Licensor reserves the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License that is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(c). +Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING AND TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO THIS EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + +This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. +Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. +8. Miscellaneous + +Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. +Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. +If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. +No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. +This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. +The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. +Creative Commons Notice +Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. + +Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of this License. + +Creative Commons may be contacted at https://creativecommons.org/. \ No newline at end of file diff --git a/icons/mob/drakeborg/drakeborg_vr.dmi b/icons/mob/drakeborg/drakeborg_vr.dmi new file mode 100644 index 00000000000..c1ec3f92b03 Binary files /dev/null and b/icons/mob/drakeborg/drakeborg_vr.dmi differ diff --git a/icons/mob/head_vr.dmi b/icons/mob/head_vr.dmi index 8823243859d..7de7448cc35 100644 Binary files a/icons/mob/head_vr.dmi and b/icons/mob/head_vr.dmi differ diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi index 2071c634d13..75ba00f026d 100644 Binary files a/icons/mob/screen_gen.dmi and b/icons/mob/screen_gen.dmi differ diff --git a/icons/mob/shadekin_hud.dmi b/icons/mob/shadekin_hud.dmi index 707feea2a92..a1340290e19 100644 Binary files a/icons/mob/shadekin_hud.dmi and b/icons/mob/shadekin_hud.dmi differ diff --git a/icons/mob/species/akula/helmet_vr.dmi b/icons/mob/species/akula/helmet_vr.dmi index 9fed5a5604a..5d9d848ff26 100644 Binary files a/icons/mob/species/akula/helmet_vr.dmi and b/icons/mob/species/akula/helmet_vr.dmi differ diff --git a/icons/mob/species/akula/suit_vr.dmi b/icons/mob/species/akula/suit_vr.dmi index 0540f010731..9fb0807138b 100644 Binary files a/icons/mob/species/akula/suit_vr.dmi and b/icons/mob/species/akula/suit_vr.dmi differ diff --git a/icons/mob/species/sergal/helmet_vr.dmi b/icons/mob/species/sergal/helmet_vr.dmi index 34d529591d9..900f1adfd9c 100644 Binary files a/icons/mob/species/sergal/helmet_vr.dmi and b/icons/mob/species/sergal/helmet_vr.dmi differ diff --git a/icons/mob/species/sergal/suit_vr.dmi b/icons/mob/species/sergal/suit_vr.dmi index f60c8c54800..dc770a2fef9 100644 Binary files a/icons/mob/species/sergal/suit_vr.dmi and b/icons/mob/species/sergal/suit_vr.dmi differ diff --git a/icons/mob/species/seromi/eyes.dmi b/icons/mob/species/seromi/eyes.dmi index e50b97c956e..250a56d4f97 100644 Binary files a/icons/mob/species/seromi/eyes.dmi and b/icons/mob/species/seromi/eyes.dmi differ diff --git a/icons/mob/species/werebeast/back.dmi b/icons/mob/species/werebeast/back.dmi index 14cd04dbdd5..f04103f7a7b 100644 Binary files a/icons/mob/species/werebeast/back.dmi and b/icons/mob/species/werebeast/back.dmi differ diff --git a/icons/mob/species/werebeast/uniform.dmi b/icons/mob/species/werebeast/uniform.dmi index e441c4af6d8..267847085fa 100644 Binary files a/icons/mob/species/werebeast/uniform.dmi and b/icons/mob/species/werebeast/uniform.dmi differ diff --git a/icons/mob/vore/ears_vr.dmi b/icons/mob/vore/ears_vr.dmi index 14f46e0926c..6c259ad5580 100644 Binary files a/icons/mob/vore/ears_vr.dmi and b/icons/mob/vore/ears_vr.dmi differ diff --git a/icons/mob/vore/taurs_vr.dmi b/icons/mob/vore/taurs_vr.dmi index 7bc343655af..a724ddd57dd 100644 Binary files a/icons/mob/vore/taurs_vr.dmi and b/icons/mob/vore/taurs_vr.dmi differ diff --git a/icons/mob/vore64x32.dmi b/icons/mob/vore64x32.dmi index 2dde6000ff1..62fe5339173 100644 Binary files a/icons/mob/vore64x32.dmi and b/icons/mob/vore64x32.dmi differ diff --git a/icons/mob/widerobot_car_vr.dmi b/icons/mob/widerobot_car_vr.dmi new file mode 100644 index 00000000000..01e6ea41b52 Binary files /dev/null and b/icons/mob/widerobot_car_vr.dmi differ diff --git a/icons/mob/widerobot_eng_vr.dmi b/icons/mob/widerobot_eng_vr.dmi new file mode 100644 index 00000000000..b5c55b53c8c Binary files /dev/null and b/icons/mob/widerobot_eng_vr.dmi differ diff --git a/icons/mob/widerobot_jan_vr.dmi b/icons/mob/widerobot_jan_vr.dmi new file mode 100644 index 00000000000..23ec7272b2b Binary files /dev/null and b/icons/mob/widerobot_jan_vr.dmi differ diff --git a/icons/mob/widerobot_med_vr.dmi b/icons/mob/widerobot_med_vr.dmi new file mode 100644 index 00000000000..809bed1be06 Binary files /dev/null and b/icons/mob/widerobot_med_vr.dmi differ diff --git a/icons/mob/widerobot_sci_vr.dmi b/icons/mob/widerobot_sci_vr.dmi new file mode 100644 index 00000000000..9b2592fcc00 Binary files /dev/null and b/icons/mob/widerobot_sci_vr.dmi differ diff --git a/icons/mob/widerobot_sec_vr.dmi b/icons/mob/widerobot_sec_vr.dmi new file mode 100644 index 00000000000..5cf98503002 Binary files /dev/null and b/icons/mob/widerobot_sec_vr.dmi differ diff --git a/icons/mob/widerobot_ser_vr.dmi b/icons/mob/widerobot_ser_vr.dmi new file mode 100644 index 00000000000..14c8d354690 Binary files /dev/null and b/icons/mob/widerobot_ser_vr.dmi differ diff --git a/icons/mob/widerobot_vr.dmi b/icons/mob/widerobot_vr.dmi index 620a1502542..39d27a1dba5 100644 Binary files a/icons/mob/widerobot_vr.dmi and b/icons/mob/widerobot_vr.dmi differ diff --git a/icons/mob/wolfpelt_vr.dmi b/icons/mob/wolfpelt_vr.dmi new file mode 100644 index 00000000000..263c7ec018b Binary files /dev/null and b/icons/mob/wolfpelt_vr.dmi differ diff --git a/icons/obj/card_vr.dmi b/icons/obj/card_vr.dmi index f4ffe2273f2..5f76cab0350 100644 Binary files a/icons/obj/card_vr.dmi and b/icons/obj/card_vr.dmi differ diff --git a/icons/obj/chemical_vr.dmi b/icons/obj/chemical_vr.dmi index 973be492af5..ce49f9d4e87 100644 Binary files a/icons/obj/chemical_vr.dmi and b/icons/obj/chemical_vr.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index e410088a23b..93d368d42c4 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/hats_vr.dmi b/icons/obj/clothing/hats_vr.dmi index 5f8969553e3..0ba51d18e73 100644 Binary files a/icons/obj/clothing/hats_vr.dmi and b/icons/obj/clothing/hats_vr.dmi differ diff --git a/icons/obj/clothing/species/akula/hats.dmi b/icons/obj/clothing/species/akula/hats.dmi index b74f641dab7..53ef19b53f5 100644 Binary files a/icons/obj/clothing/species/akula/hats.dmi and b/icons/obj/clothing/species/akula/hats.dmi differ diff --git a/icons/obj/clothing/species/akula/suits.dmi b/icons/obj/clothing/species/akula/suits.dmi index d204ff70f74..193650e5ab9 100644 Binary files a/icons/obj/clothing/species/akula/suits.dmi and b/icons/obj/clothing/species/akula/suits.dmi differ diff --git a/icons/obj/clothing/species/sergal/hats.dmi b/icons/obj/clothing/species/sergal/hats.dmi index d05b40a680d..0af7d29863f 100644 Binary files a/icons/obj/clothing/species/sergal/hats.dmi and b/icons/obj/clothing/species/sergal/hats.dmi differ diff --git a/icons/obj/clothing/species/sergal/suits.dmi b/icons/obj/clothing/species/sergal/suits.dmi index 0d0a5792e8b..1c44cd7002c 100644 Binary files a/icons/obj/clothing/species/sergal/suits.dmi and b/icons/obj/clothing/species/sergal/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 473b6614e66..3c252b8d352 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/clothing/uniforms_1.dmi b/icons/obj/clothing/uniforms_1.dmi index eba7fa299fc..9478ef888d2 100644 Binary files a/icons/obj/clothing/uniforms_1.dmi and b/icons/obj/clothing/uniforms_1.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index c7b1fe5787d..3f1fd1b7920 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/decals_directions.dmi b/icons/obj/decals_directions.dmi new file mode 100644 index 00000000000..6b6ddf52835 Binary files /dev/null and b/icons/obj/decals_directions.dmi differ diff --git a/icons/obj/drakietoy_vr.dmi b/icons/obj/drakietoy_vr.dmi new file mode 100644 index 00000000000..34a49325138 Binary files /dev/null and b/icons/obj/drakietoy_vr.dmi differ diff --git a/icons/obj/egg_new_vr.dmi b/icons/obj/egg_new_vr.dmi new file mode 100644 index 00000000000..b9804d69baf Binary files /dev/null and b/icons/obj/egg_new_vr.dmi differ diff --git a/icons/obj/egg_open_vr.dmi b/icons/obj/egg_open_vr.dmi new file mode 100644 index 00000000000..e3faabb4dc2 Binary files /dev/null and b/icons/obj/egg_open_vr.dmi differ diff --git a/icons/obj/egg_vr.dmi b/icons/obj/egg_vr.dmi index c54ac62b10b..14c17920f81 100644 Binary files a/icons/obj/egg_vr.dmi and b/icons/obj/egg_vr.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 56d13d9fc68..af15334c113 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/food_custom.dmi b/icons/obj/food_custom.dmi index ee26eb7777e..e8be40f76d5 100644 Binary files a/icons/obj/food_custom.dmi and b/icons/obj/food_custom.dmi differ diff --git a/icons/obj/machines/shielding.dmi b/icons/obj/machines/shielding.dmi index 195192b1c87..42087073d3b 100644 Binary files a/icons/obj/machines/shielding.dmi and b/icons/obj/machines/shielding.dmi differ diff --git a/icons/obj/machines/shielding_vr.dmi b/icons/obj/machines/shielding_vr.dmi new file mode 100644 index 00000000000..195192b1c87 Binary files /dev/null and b/icons/obj/machines/shielding_vr.dmi differ diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index 732bb44e002..c806ec99be3 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index 232203b46eb..ebf7292781d 100644 Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ diff --git a/icons/obj/sandbags.dmi b/icons/obj/sandbags.dmi new file mode 100644 index 00000000000..0a5c24598aa Binary files /dev/null and b/icons/obj/sandbags.dmi differ diff --git a/icons/obj/toy_vr.dmi b/icons/obj/toy_vr.dmi index 9333c6b938f..2e6c3af857c 100644 Binary files a/icons/obj/toy_vr.dmi and b/icons/obj/toy_vr.dmi differ diff --git a/icons/obj/trap.dmi b/icons/obj/trap.dmi new file mode 100644 index 00000000000..108bc467263 Binary files /dev/null and b/icons/obj/trap.dmi differ diff --git a/icons/turf/areas_vr.dmi b/icons/turf/areas_vr.dmi index 6b6f7e8a223..dc58966d83e 100644 Binary files a/icons/turf/areas_vr.dmi and b/icons/turf/areas_vr.dmi differ diff --git a/icons/turf/flooring/decals.dmi b/icons/turf/flooring/decals.dmi index 66e365251a7..acd81e57f18 100644 Binary files a/icons/turf/flooring/decals.dmi and b/icons/turf/flooring/decals.dmi differ diff --git a/icons/turf/flooring/decals_vr.dmi b/icons/turf/flooring/decals_vr.dmi index 4447453ba93..6e99661d1f4 100644 Binary files a/icons/turf/flooring/decals_vr.dmi and b/icons/turf/flooring/decals_vr.dmi differ diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index 3e3d53b3db5..d9b172cd5ad 100644 Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ diff --git a/maps/expedition_vr/beach/_beach.dm b/maps/expedition_vr/beach/_beach.dm index c82f8d2c298..fdd52402d9f 100644 --- a/maps/expedition_vr/beach/_beach.dm +++ b/maps/expedition_vr/beach/_beach.dm @@ -139,16 +139,14 @@ /area/tether_away/beach name = "\improper Away Mission - Virgo 4 Beach" icon_state = "away" - base_turf = /turf/simulated/floor/beach/sand //This is what the ground turns into if destroyed/bombed/etc - //Not going to do sunlight simulations here like virgo3b - //So we just make the whole beach fullbright all the time - dynamic_lighting = 0 - requires_power = 0 + base_turf = /turf/simulated/floor/beach/sand/outdoors //This is what the ground turns into if destroyed/bombed/etc + dynamic_lighting = 1 + requires_power = 1 /area/tether_away/beach/powershed name = "\improper Away Mission - Virgo 4 Coast PS" icon_state = "blue2" - base_turf = /turf/simulated/floor/beach/sand + base_turf = /turf/simulated/floor/beach/sand/outdoors /area/tether_away/beach/coast name = "\improper Away Mission - Virgo 4 Coast" @@ -163,7 +161,47 @@ /area/tether_away/beach/jungle name = "\improper Away Mission - Virgo 4 Desert" icon_state = "green" - base_turf = /turf/simulated/floor/beach/sand/desert + base_turf = /turf/simulated/floor/beach/sand/desert/outdoors + +/area/tether_away/beach/resort + icon = 'icons/turf/areas_vr.dmi' + icon_state = "yellow" + base_turf = /turf/simulated/floor/beach/sand/outdoors + +/area/tether_away/beach/resort/kitchen + name = "\improper Away Mission - Virgo 4 Kitchen" + icon_state = "grewhicir" + +/area/tether_away/beach/resort/lockermed + name = "\improper Away Mission - Virgo 4 Utility Pavilion" + icon_state = "cyawhicir" + +/area/tether_away/beach/resort/janibar + name = "\improper Away Mission - Virgo 4 Bar" + icon_state = "purwhicir" + +/area/tether_away/beach/resort/dorm1 + name = "\improper Away Mission - Virgo 4 Private Room 1" + icon_state = "bluwhicir" + flags = RAD_SHIELDED +/area/tether_away/beach/resort/dorm2 + name = "\improper Away Mission - Virgo 4 Private Room 2" + icon_state = "bluwhicir" + flags = RAD_SHIELDED +/area/tether_away/beach/resort/dorm3 + name = "\improper Away Mission - Virgo 4 Private Room 3" + icon_state = "bluwhicir" + flags = RAD_SHIELDED +/area/tether_away/beach/resort/dorm4 + name = "\improper Away Mission - Virgo 4 Private Room 4" + icon_state = "bluwhicir" + flags = RAD_SHIELDED + +/area/tether_away/beach/cavebase + name = "\improper Away Mission - Virgo 4 Mysterious Cave" + icon = 'icons/turf/areas_vr.dmi' + icon_state = "orawhicir" + flags = RAD_SHIELDED //Some areas for the cave, which are referenced by our init object to seed submaps and ores /area/tether_away/cave diff --git a/maps/expedition_vr/beach/beach.dmm b/maps/expedition_vr/beach/beach.dmm index 3d3f03a4762..3efcfc0c104 100644 --- a/maps/expedition_vr/beach/beach.dmm +++ b/maps/expedition_vr/beach/beach.dmm @@ -1,39 +1,44 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/turf/simulated/floor/beach/sand/desert, +/turf/simulated/floor/beach/sand/desert/outdoors, /area/tether_away/beach/jungle) "ab" = ( /obj/effect/overlay/palmtree_r, -/turf/simulated/floor/beach/sand/desert, +/turf/simulated/floor/beach/sand/desert/outdoors, /area/tether_away/beach/jungle) "ac" = ( /obj/effect/overlay/palmtree_l, -/turf/simulated/floor/beach/sand/desert, +/turf/simulated/floor/beach/sand/desert/outdoors, /area/tether_away/beach/jungle) "ad" = ( -/turf/simulated/floor/beach/sand, -/area/tether_away/beach) +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/kitchen) "ae" = ( -/obj/structure/frame, -/turf/simulated/floor/tiled/asteroid_steel, -/area/tether_away/beach) +/turf/simulated/floor/outdoors/grass, +/area/tether_away/beach/jungle) "af" = ( -/obj/item/frame/apc, -/turf/simulated/floor/tiled/asteroid_steel, -/area/tether_away/beach) +/obj/structure/grille, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/tether_away/beach/powershed) "ag" = ( /obj/structure/table/woodentable, /obj/item/weapon/cell/apc, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/janibar) "ah" = ( -/obj/item/stack/cable_coil, -/turf/simulated/floor/beach/sand, -/area/tether_away/beach) +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor, +/area/tether_away/beach/resort/kitchen) "ai" = ( -/obj/machinery/power/port_gen/pacman/mrs, -/turf/simulated/floor/beach/sand, -/area/tether_away/beach) +/obj/effect/overlay/palmtree_r, +/turf/simulated/floor/outdoors/grass, +/area/tether_away/beach/jungle) "aj" = ( /turf/simulated/floor/water/beach, /area/tether_away/beach) @@ -42,281 +47,250 @@ /area/tether_away/beach/coast) "al" = ( /turf/simulated/floor/tiled/asteroid_steel, -/area/tether_away/beach) +/area/tether_away/beach/resort/lockermed) "am" = ( /turf/simulated/floor/water/deep/ocean, /area/tether_away/beach/water) "an" = ( -/obj/effect/overlay/palmtree_r, -/turf/simulated/floor/beach/sand, -/area/tether_away/beach) +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/jungle) "ao" = ( -/obj/effect/overlay/coconut, -/turf/simulated/floor/beach/sand, -/area/tether_away/beach) +/obj/structure/simple_door/wood, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/janibar) "ap" = ( /obj/effect/overlay/palmtree_r, /turf/simulated/floor/water/beach/corner{ - icon_state = "beachcorner"; - dir = 8 + dir = 8; + icon_state = "beachcorner" }, /area/tether_away/beach/jungle) "aq" = ( /turf/simulated/wall/wood, /area/tether_away/beach) "ar" = ( -/turf/simulated/wall/sandstone, -/area/tether_away/beach) +/turf/simulated/floor/wood{ + outdoors = 1 + }, +/area/tether_away/beach/resort) "as" = ( -/obj/structure/undies_wardrobe{ - density = 0; - pixel_x = 0; - pixel_y = 18 - }, +/obj/structure/table/bench/sifwooden/padded, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/kitchen) "at" = ( -/obj/structure/closet/cabinet{ - density = 0; - pixel_y = 20; - wall_mounted = 1 +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/tether_away/beach) +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) "au" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, -/turf/simulated/floor/wood, -/area/tether_away/beach) +/turf/simulated/floor/outdoors/grass/forest, +/area/tether_away/beach/jungle) "av" = ( -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum, -/obj/structure/table/woodentable, -/turf/simulated/floor/wood, -/area/tether_away/beach) +/turf/simulated/floor/outdoors/grass{ + outdoors = 0 + }, +/area/tether_away/beach/jungle) "aw" = ( /turf/simulated/floor/wood, /area/tether_away/beach) "ax" = ( -/obj/machinery/button/remote/airlock{ - id = "BaristoLoveShack"; - name = "Door Bolt Control"; - pixel_x = 25; - pixel_y = 0; - specialfunctions = 4 +/turf/simulated/mineral/floor/cave{ + name = "dirt"; + outdoors = 1 }, -/obj/item/weapon/bedsheet/rainbow, -/obj/structure/bed, -/turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/jungle) "ay" = ( -/obj/structure/toilet{ - pixel_y = 8 - }, -/turf/simulated/floor/wood, -/area/tether_away/beach) -"az" = ( -/obj/structure/mirror{ - pixel_y = 28 - }, -/turf/simulated/floor/wood, -/area/tether_away/beach) +/obj/structure/table/glass, +/turf/simulated/floor/tiled/kafel_full/white, +/area/tether_away/beach/resort/lockermed) "aA" = ( -/obj/machinery/door/airlock/sandstone{ - id_tag = "BaristoLoveShack"; - name = "Baristo's Love Shack" - }, -/turf/simulated/floor/wood, -/area/tether_away/beach) +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/shoes/sandal, +/obj/item/clothing/under/swimsuit/earth, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) "aB" = ( /obj/structure/simple_door/wood, /turf/simulated/floor/wood, /area/tether_away/beach) "aC" = ( -/obj/machinery/button/remote/airlock{ - id = "Changing1"; - name = "Door Bolt Control"; - pixel_x = 25; - pixel_y = 0; - specialfunctions = 4 - }, -/turf/simulated/floor/wood, -/area/tether_away/beach) +/obj/effect/overlay/palmtree_l, +/turf/simulated/floor/outdoors/grass, +/area/tether_away/beach/jungle) "aD" = ( -/obj/machinery/button/remote/airlock{ - id = "Changing2"; - name = "Door Bolt Control"; - pixel_x = 25; - pixel_y = 0; - specialfunctions = 4 - }, -/turf/simulated/floor/wood, -/area/tether_away/beach) +/turf/simulated/floor/tiled/eris/cafe, +/area/tether_away/beach/resort/kitchen) "aE" = ( -/obj/machinery/door/airlock/sandstone{ - id_tag = "Changing1"; - name = "Changing Room 1" - }, +/obj/machinery/media/jukebox, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/kitchen) "aF" = ( -/obj/machinery/door/airlock/sandstone{ - id_tag = "Changing2"; - name = "Changing Room 2" - }, -/turf/simulated/floor/wood, -/area/tether_away/beach) +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/tiled/eris/cafe, +/area/tether_away/beach/resort/kitchen) "aG" = ( /obj/structure/bedsheetbin{ pixel_y = -6 }, -/turf/simulated/floor/tiled/asteroid_steel, -/area/tether_away/beach) +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) "aH" = ( /obj/item/clothing/shoes/sandal, /obj/item/clothing/shoes/sandal, /obj/item/clothing/shoes/sandal, /obj/structure/closet/crate, -/turf/simulated/floor/tiled/asteroid_steel, -/area/tether_away/beach) +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) "aI" = ( /obj/structure/closet/athletic_mixed, -/turf/simulated/floor/tiled/asteroid_steel, -/area/tether_away/beach) +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) "aJ" = ( /obj/structure/sign/double/barsign, /turf/simulated/wall/sandstone, -/area/tether_away/beach) +/area/tether_away/beach/resort/janibar) "aK" = ( /obj/structure/closet/gmcloset{ name = "formal wardrobe" }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/janibar) "aL" = ( /obj/structure/closet/secure_closet/bar, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/janibar) "aM" = ( /obj/structure/table/woodentable, /obj/item/weapon/book/manual/barman_recipes, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/janibar) "aN" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/machinery/chemical_dispenser/bar_soft/full, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/janibar) "aO" = ( /obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/machinery/chemical_dispenser/bar_coffee/full, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/janibar) "aP" = ( /obj/structure/table/woodentable, -/obj/item/clothing/glasses/sunglasses, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/machinery/chemical_dispenser/bar_alc/full, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/janibar) "aQ" = ( /obj/machinery/vending/boozeomat{ emagged = 1; req_access = newlist() }, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/janibar) "aR" = ( /obj/machinery/vending/cigarette, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/janibar) "aS" = ( /obj/machinery/vending/cola, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/janibar) "aT" = ( /obj/machinery/vending/snack, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/janibar) "aU" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/janibar) "aV" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/janibar) "aW" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/wood, -/area/tether_away/beach) +/area/tether_away/beach/resort/janibar) "aX" = ( /obj/item/weapon/stool/padded, -/turf/simulated/floor/tiled/asteroid_steel, -/area/tether_away/beach) +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) "aY" = ( /obj/structure/bed/double/padded, /obj/item/weapon/bedsheet/greendouble, /turf/simulated/floor/wood, /area/tether_away/beach) -"aZ" = ( -/obj/effect/overlay/palmtree_l, -/turf/simulated/floor/beach/sand, -/area/tether_away/beach) "ba" = ( -/turf/unsimulated/wall/planetary/normal, +/turf/simulated/mineral/ignore_mapgen, /area/tether_away/beach) "bb" = ( /obj/structure/bed/chair, -/turf/simulated/floor/beach/sand/desert, +/turf/simulated/floor/beach/sand/desert/outdoors, /area/tether_away/beach) "bc" = ( /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/turf/simulated/floor/beach/sand/desert, +/turf/simulated/floor/beach/sand/desert/outdoors, /area/tether_away/beach) "bd" = ( /obj/item/weapon/beach_ball, -/turf/simulated/floor/beach/sand/desert, +/turf/simulated/floor/beach/sand/desert/outdoors, /area/tether_away/beach) "be" = ( /obj/item/clothing/head/collectable/paper, -/turf/simulated/floor/beach/sand/desert, +/turf/simulated/floor/beach/sand/desert/outdoors, /area/tether_away/beach) "bf" = ( /turf/simulated/floor/water/ocean, /area/tether_away/beach/water) "bg" = ( -/turf/unsimulated/wall/planetary/normal, +/turf/simulated/mineral/ignore_mapgen, /area/tether_away/beach/coast) "bh" = ( /obj/effect/overlay/coconut, -/turf/simulated/floor/beach/sand/desert, +/turf/simulated/floor/beach/sand/desert/outdoors, /area/tether_away/beach/jungle) "bi" = ( -/turf/unsimulated/wall/planetary/normal, +/turf/unsimulated/wall/planetary/normal/virgo4, /area/tether_away/beach/water) "bj" = ( /turf/simulated/floor/water/ocean, /area/tether_away/beach/jungle) "bk" = ( /turf/simulated/floor/water/beach{ - icon_state = "beach"; - dir = 1 + dir = 1; + icon_state = "beach" }, /area/tether_away/beach/water) "bl" = ( -/turf/unsimulated/wall/planetary/normal, +/obj/tether_away_spawner/beach_outside, +/turf/simulated/floor/outdoors/grass, /area/tether_away/beach/jungle) "bm" = ( /obj/effect/shuttle_landmark{ base_area = /area/tether_away/beach/jungle; - base_turf = /turf/simulated/floor/beach/sand/desert; + base_turf = /turf/simulated/floor/beach/sand/desert/outdoors; landmark_tag = "beach_c"; name = "Virgo 4 Beach (Center)" }, -/turf/simulated/floor/beach/sand/desert, +/turf/simulated/floor/beach/sand/desert/outdoors, /area/tether_away/beach/jungle) "bn" = ( /mob/living/simple_mob/animal/passive/fish/measelshark, @@ -327,319 +301,2064 @@ name = "V4_Cave_Entrance"; portal_id = "V4_cave_step" }, -/turf/simulated/floor/beach/sand, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, /area/tether_away/beach/jungle) "bp" = ( -/turf/simulated/floor/beach/sand, +/turf/simulated/floor/beach/sand/outdoors, /area/tether_away/beach/jungle) "bq" = ( /turf/simulated/mineral/ignore_mapgen, /area/tether_away/beach/jungle) "br" = ( /obj/effect/map_effect/portal/line/side_a, -/turf/simulated/floor/beach/sand, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, /area/tether_away/beach/jungle) "bs" = ( -/obj/effect/step_trigger/zlevel_fall/beach, -/turf/simulated/floor/beach/sand/desert, +/obj/effect/overlay/coconut, +/turf/simulated/floor/outdoors/grass, /area/tether_away/beach/jungle) +"bT" = ( +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"cf" = ( +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/janibar) +"cy" = ( +/obj/structure/bed/chair/bay/chair/padded/red/bignest, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/cavebase) "cA" = ( /turf/simulated/floor/water/beach{ - icon_state = "beach"; - dir = 10 + dir = 10; + icon_state = "beach" }, /area/tether_away/beach/water) +"cN" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/janibar) "cS" = ( /turf/simulated/floor/water/beach/corner, /area/tether_away/beach/water) +"dd" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/turf/simulated/floor/water/deep/pool{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"dm" = ( +/obj/machinery/vending/loadout/accessory, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) +"dt" = ( +/obj/item/weapon/bedsheet/pirate, +/obj/machinery/button/remote/airlock{ + id = "LoveShack4"; + name = "Door Bolt Control"; + pixel_x = -25; + specialfunctions = 4 + }, +/obj/structure/bed/padded, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm4) +"dP" = ( +/obj/structure/bed/padded, +/obj/item/weapon/bedsheet/medical, +/turf/simulated/floor/tiled/kafel_full/white, +/area/tether_away/beach/resort/lockermed) "dY" = ( /turf/simulated/floor/water/beach/corner{ - icon_state = "beachcorner"; - dir = 8 + dir = 8; + icon_state = "beachcorner" }, /area/tether_away/beach) +"et" = ( +/obj/machinery/shower{ + dir = 8; + pixel_x = -2 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, +/obj/structure/curtain/open/shower, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/tether_away/beach/resort/janibar) +"ez" = ( +/obj/machinery/vending/fishing, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/janibar) +"eF" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/shoes/sandal, +/obj/item/clothing/under/swimsuit/black, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) +"eV" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"eW" = ( +/obj/structure/table/glass, +/obj/item/weapon/backup_implanter{ + pixel_y = 9 + }, +/obj/item/weapon/backup_implanter{ + pixel_y = 2 + }, +/obj/item/weapon/backup_implanter{ + pixel_y = -5 + }, +/obj/item/weapon/backup_implanter{ + pixel_y = -12 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/kafel_full/white, +/area/tether_away/beach/resort/lockermed) +"fl" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/turf/simulated/floor/tiled/eris/cafe, +/area/tether_away/beach/resort/kitchen) +"fJ" = ( +/obj/item/weapon/bedsheet/ian, +/obj/machinery/button/remote/airlock{ + id = "LoveShack3"; + name = "Door Bolt Control"; + pixel_x = -25; + specialfunctions = 4 + }, +/obj/structure/bed/padded, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm3) "fQ" = ( /turf/simulated/floor/water/beach, /area/tether_away/beach/water) +"gd" = ( +/obj/structure/simple_door/sandstone, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/janibar) +"gw" = ( +/obj/structure/bonfire, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/cavebase) "gA" = ( /turf/simulated/floor/water/beach{ - icon_state = "beach"; - dir = 6 + dir = 6; + icon_state = "beach" }, /area/tether_away/beach/water) +"gU" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/janibar) +"hg" = ( +/obj/effect/overlay/palmtree_r, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach/resort) +"hj" = ( +/turf/simulated/wall/sandstone, +/area/tether_away/beach/resort/lockermed) +"hl" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/water/deep/pool{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"hq" = ( +/obj/item/weapon/stool/padded, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"hr" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/shoes/sandal, +/obj/item/clothing/under/swimsuit/red, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) "hx" = ( /obj/effect/overmap/visitable/sector/virgo4, /turf/simulated/floor/water/deep/ocean, /area/tether_away/beach/water) +"hL" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/reagentgrinder, +/turf/simulated/floor/tiled/eris/cafe, +/area/tether_away/beach/resort/kitchen) "hN" = ( /turf/simulated/floor/holofloor/beach/sand, /area/tether_away/beach/jungle) -"le" = ( -/turf/simulated/floor/water/beach{ - icon_state = "beach"; - dir = 5 +"hQ" = ( +/obj/structure/flora/sif/subterranean, +/turf/simulated/floor/outdoors/grass{ + outdoors = 0 }, -/area/tether_away/beach/jungle) -"mC" = ( -/turf/simulated/floor/beach/sand/desert, -/area/tether_away/beach/water) -"oC" = ( -/turf/simulated/floor/water/beach{ - icon_state = "beach"; +/area/tether_away/beach/cavebase) +"hR" = ( +/obj/machinery/power/terminal{ + dir = 8; + icon_state = "term" + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/powershed) +"hS" = ( +/obj/structure/table/woodentable, +/obj/random/drinkbottle, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm2) +"hV" = ( +/obj/structure/undies_wardrobe{ + density = 0; + pixel_x = 0; + pixel_y = 18 + }, +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm3) +"il" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/shoes/sandal, +/obj/item/clothing/under/swimsuit/white, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) +"io" = ( +/turf/simulated/floor/lino, +/area/tether_away/beach/resort/kitchen) +"iO" = ( +/obj/structure/mopbucket, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/janibar) +"jc" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"jH" = ( +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/water/pool{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"jN" = ( +/obj/tether_away_spawner/beach_outside, +/turf/simulated/floor/beach/sand/outdoors, +/area/tether_away/beach/resort) +"jQ" = ( +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"kd" = ( +/obj/machinery/light/small, +/turf/simulated/floor/outdoors/grass, +/area/tether_away/beach/resort/kitchen) +"kg" = ( +/obj/machinery/vending/loadout/clothing, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) +"kk" = ( +/obj/machinery/power/apc/alarms_hidden{ + dir = 8; + pixel_x = -27 + }, +/obj/structure/cable/cyan{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/kafel_full/white, +/area/tether_away/beach/resort/lockermed) +"ku" = ( +/obj/structure/cable/cyan{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/smes/buildable/offmap_spawn/empty, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/powershed) +"kK" = ( +/obj/effect/floor_decal/spline/plain{ dir = 4 }, +/turf/simulated/floor/water/deep/pool{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"kO" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/powershed) +"kP" = ( +/obj/structure/table/woodentable, +/obj/random/drinkbottle, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm3) +"kR" = ( +/obj/structure/undies_wardrobe{ + density = 0; + pixel_x = 0; + pixel_y = 18 + }, +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm2) +"kT" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"kW" = ( +/obj/structure/closet/cabinet{ + density = 0; + pixel_y = 20; + wall_mounted = 1 + }, +/obj/structure/cable/cyan{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc/alarms_hidden{ + dir = 8; + pixel_x = -27 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm2) +"la" = ( +/obj/structure/table/rack, +/obj/item/weapon/material/fishing_net, +/obj/item/weapon/material/fishing_net, +/obj/item/weapon/material/fishing_net, +/obj/item/weapon/material/fishing_net, +/obj/item/stack/cable_coil/pink, +/obj/item/stack/cable_coil/pink, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/janibar) +"le" = ( +/turf/simulated/floor/water/beach{ + dir = 5; + icon_state = "beach" + }, /area/tether_away/beach/jungle) +"lh" = ( +/obj/structure/closet/cabinet{ + density = 0; + pixel_y = 20; + wall_mounted = 1 + }, +/obj/machinery/power/apc/alarms_hidden{ + dir = 8; + pixel_x = -27 + }, +/obj/structure/cable/cyan{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm1) +"li" = ( +/obj/effect/overlay/palmtree_r, +/turf/simulated/floor/beach/sand, +/area/tether_away/beach/resort) +"lI" = ( +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach/resort) +"mb" = ( +/obj/machinery/power/apc/alarms_hidden{ + dir = 1; + pixel_y = 26 + }, +/obj/structure/cable/cyan{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/kitchen) +"me" = ( +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/janibar) +"mi" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/powershed) +"mu" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/chemical_dispenser/bar_soft/full{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/tether_away/beach/resort/kitchen) +"mC" = ( +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach/water) +"mF" = ( +/obj/structure/sink{ + dir = 4; + icon_state = "sink"; + pixel_x = 11; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/eris/cafe, +/area/tether_away/beach/resort/kitchen) +"mM" = ( +/obj/machinery/power/solar_control, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2"; + pixel_y = 0 + }, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/powershed) +"mS" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"mW" = ( +/obj/structure/mirror{ + pixel_x = 27 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm4) +"nm" = ( +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2"; + pixel_y = 0 + }, +/obj/machinery/power/tracker, +/turf/simulated/floor{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"nD" = ( +/turf/simulated/mineral/ignore_mapgen, +/area/tether_away/beach/water) +"of" = ( +/obj/structure/table/woodentable, +/obj/random/drinkbottle, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm1) +"oq" = ( +/obj/item/weapon/bedsheet/rainbow, +/obj/machinery/button/remote/airlock{ + id = "LoveShack1"; + name = "Door Bolt Control"; + pixel_x = 25; + specialfunctions = 4 + }, +/obj/structure/bed/padded, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm1) +"oC" = ( +/turf/simulated/floor/water/beach{ + dir = 4; + icon_state = "beach" + }, +/area/tether_away/beach/jungle) +"oF" = ( +/obj/item/weapon/stool/padded, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"pd" = ( +/obj/structure/table/rack, +/obj/item/weapon/material/fishing_rod/modern/cheap, +/obj/item/weapon/material/fishing_rod/modern/cheap, +/obj/item/weapon/material/fishing_rod/modern/cheap, +/obj/item/weapon/material/fishing_rod/modern/cheap, +/obj/item/stack/cable_coil/pink, +/obj/item/stack/cable_coil/pink, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/janibar) "pq" = ( /turf/simulated/floor/water/beach/corner, /area/tether_away/beach/jungle) +"pw" = ( +/turf/simulated/floor/water/ocean, +/area/tether_away/beach/cavebase) +"py" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/powershed) +"pA" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/water/pool{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"pC" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/light_switch{ + dir = 4; + on = 0; + pixel_x = -29; + pixel_y = 28 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm4) +"pF" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"pP" = ( +/obj/effect/overlay/palmtree_l, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach/resort) "pS" = ( /turf/simulated/floor/water/beach{ - icon_state = "beach"; - dir = 1 + dir = 1; + icon_state = "beach" }, /area/tether_away/beach/jungle) -"tj" = ( -/turf/simulated/floor/water/beach{ - icon_state = "beach"; - dir = 5 +"qi" = ( +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/area/tether_away/beach/water) -"tr" = ( -/turf/simulated/floor/beach/sand/desert, -/area/tether_away/beach) -"xW" = ( -/obj/tether_away_spawner/beach_outside_friendly, -/turf/simulated/floor/beach/sand/desert, -/area/tether_away/beach/jungle) -"Ar" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/tether_away/beach/jungle; - base_turf = /turf/simulated/floor/beach/sand/desert; - landmark_tag = "beach_nw"; - name = "Virgo 4 Beach (NW)" +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/turf/simulated/floor/beach/sand/desert, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"qI" = ( +/obj/machinery/power/port_gen/pacman/mrs, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/powershed) +"rm" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'DANGER: MONSTERS'."; + name = "\improper DANGER: MONSTERS" + }, +/turf/simulated/wall, /area/tether_away/beach/jungle) -"BG" = ( -/turf/simulated/floor/water/beach/corner{ - icon_state = "beachcorner"; +"rp" = ( +/obj/structure/table/woodentable, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/cavebase) +"rJ" = ( +/obj/structure/undies_wardrobe{ + density = 0; + pixel_x = 0; + pixel_y = 18 + }, +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm1) +"rQ" = ( +/obj/machinery/light/small{ dir = 8 }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort/kitchen) +"ss" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/beach/sand/outdoors, +/area/tether_away/beach/resort/lockermed) +"sD" = ( +/turf/simulated/wall/wood, +/area/tether_away/beach/resort/janibar) +"sT" = ( +/obj/effect/overlay/coconut, +/turf/simulated/floor/beach/sand/outdoors, +/area/tether_away/beach/resort) +"tj" = ( +/turf/simulated/floor/water/beach{ + dir = 5; + icon_state = "beach" + }, +/area/tether_away/beach/water) +"tl" = ( +/obj/machinery/shower{ + dir = 4; + icon_state = "shower"; + pixel_x = 2; + pixel_y = 0 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/obj/structure/curtain/open/shower, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/tether_away/beach/resort/janibar) +"to" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -28; + pixel_y = -29 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm1) +"tr" = ( +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach) +"ts" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"tG" = ( +/obj/machinery/appliance/cooker/fryer, +/turf/simulated/floor/tiled/eris/cafe, +/area/tether_away/beach/resort/kitchen) +"uh" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/turf/simulated/floor/water/pool{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"uk" = ( +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/eris/cafe, +/area/tether_away/beach/resort/kitchen) +"ul" = ( +/turf/simulated/wall/wood, +/area/tether_away/beach/water) +"us" = ( +/obj/effect/overlay/coconut, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach/resort) +"uL" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/light_switch{ + dir = 4; + on = 0; + pixel_x = -29; + pixel_y = 28 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm3) +"uO" = ( +/turf/simulated/floor/water/pool{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"uQ" = ( +/obj/machinery/chem_master/condimaster, +/turf/simulated/floor/tiled/eris/cafe, +/area/tether_away/beach/resort/kitchen) +"uT" = ( +/obj/structure/mirror{ + pixel_x = -27 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm1) +"vg" = ( +/obj/structure/flora/sif/subterranean, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/cavebase) +"vU" = ( +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp/green, +/turf/simulated/floor/wood, +/area/tether_away/beach) +"wv" = ( +/obj/effect/overlay/coconut, +/turf/simulated/mineral/ignore_mapgen, /area/tether_away/beach/jungle) +"wM" = ( +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort/lockermed) +"wT" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort/kitchen) +"xb" = ( +/obj/structure/flora/ausbushes/fernybush, +/turf/simulated/floor/water/ocean, +/area/tether_away/beach/cavebase) +"xi" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/beach/sand/outdoors, +/area/tether_away/beach/resort/janibar) +"xy" = ( +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/cavebase) +"xT" = ( +/obj/tether_away_spawner/beach_outside_friendly, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach/resort) +"xW" = ( +/obj/tether_away_spawner/beach_outside_friendly, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach/jungle) +"yf" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/kitchen) +"yg" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/outdoors/grass, +/area/tether_away/beach/resort/janibar) +"yF" = ( +/obj/structure/barricade, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/cavebase) +"zb" = ( +/obj/structure/table/woodentable, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/janibar) +"zs" = ( +/turf/simulated/wall/sandstone, +/area/tether_away/beach/resort/dorm2) +"zw" = ( +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"zD" = ( +/obj/structure/grille, +/turf/simulated/floor, +/area/tether_away/beach/powershed) +"zP" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/closet/crate, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/glass, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/powershed) +"zV" = ( +/obj/structure/table/bench/sifwooden/padded, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/kitchen) +"zZ" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/powershed) +"Ar" = ( +/obj/structure/flora/tree/jungle_small, +/turf/simulated/floor/outdoors/grass/forest, +/area/tether_away/beach/jungle) +"Aw" = ( +/obj/item/weapon/stool/padded, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/cavebase) +"AE" = ( +/obj/machinery/cryopod, +/turf/simulated/floor/tiled/kafel_full/white, +/area/tether_away/beach/resort/lockermed) +"AS" = ( +/obj/machinery/door/airlock/sandstone, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/kitchen) +"Bk" = ( +/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/small/sugar, +/obj/item/weapon/reagent_containers/food/condiment/small/sugar, +/obj/item/weapon/reagent_containers/food/condiment/small/sugar, +/obj/item/weapon/reagent_containers/food/condiment/small/sugar, +/obj/item/weapon/reagent_containers/food/condiment/spacespice, +/obj/item/weapon/reagent_containers/food/condiment/spacespice, +/obj/item/weapon/reagent_containers/food/condiment/spacespice, +/obj/item/weapon/reagent_containers/food/condiment/spacespice, +/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/weapon/material/knife/butch, +/obj/item/weapon/material/minihoe, +/obj/item/weapon/material/knife/machete/hatchet, +/obj/random/drinkbottle, +/obj/random/drinkbottle, +/obj/random/drinkbottle, +/obj/structure/closet, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/device/analyzer/plant_analyzer, +/obj/item/device/analyzer/plant_analyzer, +/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, +/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3 + }, +/turf/simulated/floor/tiled/eris/cafe, +/area/tether_away/beach/resort/kitchen) +"By" = ( +/obj/item/weapon/stool/baystool/padded, +/turf/simulated/floor/lino, +/area/tether_away/beach/resort/kitchen) +"BF" = ( +/turf/simulated/wall/sandstone, +/area/tether_away/beach/resort/dorm3) +"BG" = ( +/turf/simulated/floor/water/beach/corner{ + dir = 8; + icon_state = "beachcorner" + }, +/area/tether_away/beach/jungle) +"BP" = ( +/obj/structure/closet/crate/medical, +/turf/simulated/floor/tiled/kafel_full/white, +/area/tether_away/beach/resort/lockermed) +"BR" = ( +/obj/structure/table/rack/shelf/steel, +/obj/machinery/light, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/kitchen) +"Ce" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/beach/sand/outdoors, +/area/tether_away/beach/resort) +"Cr" = ( +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"CC" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/water/deep/pool{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"CM" = ( +/obj/structure/table/rack/shelf/steel, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/kitchen) "CP" = ( /turf/simulated/floor/water/beach{ - icon_state = "beach"; - dir = 10 + dir = 10; + icon_state = "beach" }, /area/tether_away/beach/jungle) +"Dq" = ( +/obj/tether_away_spawner/beach_outside_friendly, +/turf/simulated/floor/outdoors/grass, +/area/tether_away/beach/jungle) "Dr" = ( /obj/effect/shuttle_landmark{ base_area = /area/tether_away/beach/jungle; - base_turf = /turf/simulated/floor/beach/sand/desert; + base_turf = /turf/simulated/floor/beach/sand/desert/outdoors; landmark_tag = "beach_e"; name = "Virgo 4 Beach (E)" }, -/turf/simulated/floor/beach/sand/desert, +/turf/simulated/floor/beach/sand/desert/outdoors, /area/tether_away/beach/jungle) +"DA" = ( +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2"; + pixel_y = 0 + }, +/obj/item/solar_assembly, +/turf/simulated/floor{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"DB" = ( +/turf/simulated/floor/water/deep/pool{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"DK" = ( +/obj/machinery/door/airlock/sandstone{ + id_tag = "LoveShack2"; + name = "Love Shack 2" + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/dorm2) "DL" = ( /turf/simulated/floor/water/beach/corner{ - icon_state = "beachcorner"; - dir = 8 + dir = 8; + icon_state = "beachcorner" }, /area/tether_away/beach/water) +"Ed" = ( +/obj/structure/bed, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/cavebase) "Ee" = ( /turf/simulated/floor/water/beach/corner{ - icon_state = "beachcorner"; - dir = 4 + dir = 4; + icon_state = "beachcorner" }, /area/tether_away/beach/jungle) +"Eh" = ( +/turf/simulated/wall/sandstone, +/area/tether_away/beach/resort/dorm1) +"Ew" = ( +/obj/structure/closet/cabinet{ + density = 0; + pixel_y = 20; + wall_mounted = 1 + }, +/obj/machinery/power/apc/alarms_hidden{ + dir = 4; + pixel_x = 22 + }, +/obj/structure/cable/cyan{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm4) "Ey" = ( /turf/simulated/floor/water/beach{ - icon_state = "beach"; - dir = 6 + dir = 6; + icon_state = "beach" }, /area/tether_away/beach/jungle) +"EG" = ( +/obj/machinery/vending/loadout/costume, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) +"Fm" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"Gi" = ( +/obj/machinery/door/airlock/sandstone{ + id_tag = "LoveShack3"; + name = "Love Shack 3" + }, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/dorm3) +"Gr" = ( +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/kafel_full/white, +/area/tether_away/beach/resort/lockermed) +"GS" = ( +/obj/effect/overlay/coconut, +/turf/simulated/floor/beach/sand/outdoors, +/area/tether_away/beach/jungle) +"Hv" = ( +/obj/structure/table/steel_reinforced, +/obj/item/weapon/material/kitchen/rollingpin, +/obj/item/weapon/book/manual/chef_recipes, +/obj/item/weapon/reagent_containers/food/condiment/enzyme{ + layer = 5 + }, +/obj/item/weapon/reagent_containers/glass/bucket, +/turf/simulated/floor/tiled/eris/cafe, +/area/tether_away/beach/resort/kitchen) +"HO" = ( +/obj/structure/mirror{ + pixel_x = 27 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm3) "Ij" = ( /turf/simulated/floor/water/beach/corner{ - icon_state = "beachcorner"; + dir = 4; + icon_state = "beachcorner" + }, +/area/tether_away/beach/water) +"IA" = ( +/obj/structure/flora/tree/jungle, +/turf/simulated/floor/outdoors/grass/forest, +/area/tether_away/beach/jungle) +"IB" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/shoes/sandal, +/obj/item/clothing/under/swimsuit/striped, +/obj/machinery/light/small{ dir = 4 }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) +"IY" = ( +/obj/machinery/door/airlock/sandstone{ + id_tag = "LoveShack1"; + name = "Love Shack 1" + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/dorm1) +"IZ" = ( +/obj/effect/overlay/palmtree_r, +/turf/simulated/floor/beach/sand/outdoors, +/area/tether_away/beach/resort) +"Ja" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/kitchen) +"Je" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/kafel_full/white, +/area/tether_away/beach/resort/lockermed) +"Jm" = ( +/obj/machinery/biogenerator, +/turf/simulated/floor/tiled/eris/cafe, +/area/tether_away/beach/resort/kitchen) +"Jn" = ( +/obj/machinery/door/airlock/sandstone, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/kitchen) +"JG" = ( +/obj/effect/step_trigger/zlevel_fall/beach, +/turf/simulated/floor/beach/sand/desert/outdoors, /area/tether_away/beach/water) +"JU" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"JX" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) +"Kq" = ( +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/lino, +/area/tether_away/beach/resort/kitchen) "Kw" = ( /turf/simulated/floor/water/beach{ - icon_state = "beach"; - dir = 8 + dir = 8; + icon_state = "beach" }, /area/tether_away/beach/jungle) +"KN" = ( +/turf/simulated/wall/wood, +/area/tether_away/beach/coast) +"KU" = ( +/turf/simulated/mineral/ignore_mapgen, +/area/tether_away/beach/resort) +"Le" = ( +/obj/structure/bookcase, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/cavebase) +"Lp" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/shoes/sandal, +/obj/item/clothing/under/swimsuit/purple, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) +"Lw" = ( +/obj/machinery/door/airlock/sandstone{ + id_tag = "LoveShack4"; + name = "Love Shack 4" + }, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/dorm4) +"LB" = ( +/turf/simulated/wall/sandstone, +/area/tether_away/beach/resort/kitchen) +"LJ" = ( +/turf/simulated/floor/water/ocean, +/area/tether_away/beach/resort) +"LO" = ( +/obj/machinery/shower{ + dir = 4; + icon_state = "shower"; + pixel_x = 2; + pixel_y = 0 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/obj/structure/curtain/open/shower, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/tether_away/beach/resort/janibar) +"LQ" = ( +/turf/simulated/floor/outdoors/grass, +/area/tether_away/beach/cavebase) +"LT" = ( +/obj/machinery/seed_extractor, +/obj/machinery/light, +/turf/simulated/floor/tiled/eris/cafe, +/area/tether_away/beach/resort/kitchen) +"LZ" = ( +/turf/simulated/floor/wood{ + outdoors = 1 + }, +/area/tether_away/beach/water) +"Mp" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"ME" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"MZ" = ( +/obj/item/weapon/bedsheet/brown, +/obj/machinery/button/remote/airlock{ + id = "LoveShack2"; + name = "Door Bolt Control"; + pixel_x = 25; + specialfunctions = 4 + }, +/obj/structure/bed/padded, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm2) +"Nt" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"Nv" = ( +/turf/simulated/floor/beach/sand/outdoors, +/area/tether_away/beach/resort) +"ND" = ( +/obj/structure/table/glass, +/obj/machinery/vending/wallmed1/public{ + pixel_x = -28 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/kafel_full/white, +/area/tether_away/beach/resort/lockermed) +"Of" = ( +/obj/machinery/vending/dinnerware{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/tether_away/beach/resort/kitchen) +"OK" = ( +/obj/effect/overlay/palmtree_l, +/turf/simulated/floor/beach/sand/outdoors, +/area/tether_away/beach/resort) +"PG" = ( +/obj/machinery/shower{ + dir = 8; + pixel_x = -2 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, +/obj/structure/curtain/open/shower, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/tether_away/beach/resort/janibar) +"PK" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) +"PV" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/water/pool{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"Qm" = ( +/obj/structure/table, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/cavebase) +"Qr" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/shoes/sandal, +/obj/item/clothing/under/swimsuit/blue, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) +"QL" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/mop, +/obj/random/soap, +/obj/item/weapon/reagent_containers/glass/bucket, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/janibar) +"QY" = ( +/obj/structure/mirror{ + pixel_x = -27 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm2) +"Rh" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"Rm" = ( +/obj/structure/cable/cyan{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc/alarms_hidden{ + dir = 1; + pixel_y = 26 + }, +/obj/structure/table/woodentable, +/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer, +/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/clothing/glasses/sunglasses, +/obj/item/weapon/reagent_containers/glass/rag, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/janibar) +"Rv" = ( +/obj/structure/table/woodentable, +/obj/random/drinkbottle, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm4) +"Rx" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"RA" = ( +/turf/simulated/floor/tiled/kafel_full/white, +/area/tether_away/beach/resort/lockermed) +"RD" = ( +/obj/tether_away_spawner/beach_outside_friendly, +/turf/simulated/floor/beach/sand/outdoors, +/area/tether_away/beach/resort) +"RH" = ( +/obj/structure/closet/cabinet{ + density = 0; + pixel_y = 20; + wall_mounted = 1 + }, +/obj/machinery/power/apc/alarms_hidden{ + dir = 4; + pixel_x = 22 + }, +/obj/structure/cable/cyan{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm3) "RQ" = ( /turf/simulated/floor/water/beach{ - icon_state = "beach"; - dir = 8 + dir = 8; + icon_state = "beach" }, /area/tether_away/beach/water) +"RX" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) "Sv" = ( /turf/simulated/floor/water/beach{ - icon_state = "beach"; - dir = 9 + dir = 9; + icon_state = "beach" }, /area/tether_away/beach/jungle) +"Sz" = ( +/obj/structure/sink{ + dir = 4; + icon_state = "sink"; + pixel_x = 11; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/janibar) +"SG" = ( +/obj/machinery/appliance/cooker/oven, +/turf/simulated/floor/tiled/eris/cafe, +/area/tether_away/beach/resort/kitchen) +"SK" = ( +/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/structure/table/rack/steel, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/janibar) +"SQ" = ( +/obj/structure/flora/ausbushes/fernybush, +/turf/simulated/floor/outdoors/grass, +/area/tether_away/beach/cavebase) +"ST" = ( +/obj/machinery/door/airlock/glass_medical{ + name = "First Aid Staton"; + req_one_access = list() + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) +"Tg" = ( +/mob/living/simple_mob/animal/passive/fish/solarfish, +/turf/simulated/floor/water/ocean, +/area/tether_away/beach/cavebase) +"Tp" = ( +/obj/machinery/power/apc/alarms_hidden{ + dir = 4; + pixel_x = 22 + }, +/obj/structure/cable, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/powershed) +"TH" = ( +/obj/structure/table/glass, +/obj/machinery/vending/wallmed1/public{ + pixel_x = -28 + }, +/turf/simulated/floor/tiled/kafel_full/white, +/area/tether_away/beach/resort/lockermed) "TU" = ( /obj/tether_away_spawner/beach_outside, -/turf/simulated/floor/beach/sand/desert, -/area/tether_away/beach/jungle) -"UZ" = ( -/obj/tether_away_spawner/beach_outside_friendly, -/turf/simulated/floor/beach/sand, -/area/tether_away/beach) +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach/resort) +"Ue" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/turf/simulated/floor/water/pool{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"Uk" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/powershed) +"Um" = ( +/turf/simulated/wall/sandstone, +/area/tether_away/beach/powershed) +"Uo" = ( +/obj/structure/cable, +/obj/item/solar_assembly, +/turf/simulated/floor{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"UN" = ( +/turf/simulated/wall/sandstone, +/area/tether_away/beach/resort/janibar) +"UQ" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort/lockermed) "Va" = ( /turf/simulated/floor/water/beach/corner{ - icon_state = "beachcorner"; - dir = 1 + dir = 1; + icon_state = "beachcorner" }, /area/tether_away/beach/water) +"Vo" = ( +/obj/structure/table/rack/steel, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/cavebase) +"VJ" = ( +/obj/structure/sink/puddle, +/turf/simulated/floor/outdoors/grass/forest, +/area/tether_away/beach/jungle) "VS" = ( /turf/simulated/floor/water/beach/corner{ - icon_state = "beachcorner"; - dir = 1 + dir = 1; + icon_state = "beachcorner" }, /area/tether_away/beach/jungle) +"Wc" = ( +/turf/simulated/floor/wood{ + outdoors = 1 + }, +/area/tether_away/beach/coast) +"Wd" = ( +/obj/machinery/appliance/cooker/grill, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/cafe, +/area/tether_away/beach/resort/kitchen) +"Wf" = ( +/turf/simulated/floor/outdoors/grass, +/area/tether_away/beach/resort) +"Wj" = ( +/obj/structure/simple_door/wood, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) +"Wu" = ( +/turf/simulated/floor/wood{ + outdoors = 1 + }, +/area/tether_away/beach) +"WH" = ( +/obj/machinery/computer/cryopod{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/kafel_full/white, +/area/tether_away/beach/resort/lockermed) +"WS" = ( +/obj/structure/undies_wardrobe{ + density = 0; + pixel_x = 0; + pixel_y = 18 + }, +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm4) +"WU" = ( +/obj/machinery/vending/loadout, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) "WX" = ( /turf/simulated/floor/water/beach{ - icon_state = "beach"; - dir = 9 + dir = 9; + icon_state = "beach" }, /area/tether_away/beach/water) +"Xd" = ( +/turf/simulated/floor/outdoors/grass{ + outdoors = 0 + }, +/area/tether_away/beach/cavebase) +"XB" = ( +/obj/machinery/seed_storage/garden{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/cafe, +/area/tether_away/beach/resort/kitchen) +"XZ" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"Ya" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/shoes/sandal, +/obj/item/clothing/under/swimsuit/stripper/mankini, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/resort/lockermed) +"Yi" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 9 + }, +/turf/simulated/floor/water/deep/pool{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"Yq" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) "Yv" = ( /turf/simulated/floor/water/beach, /area/tether_away/beach/jungle) +"YE" = ( +/turf/simulated/wall/sandstone, +/area/tether_away/beach/resort/dorm4) +"YO" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tether_away/beach/jungle; + base_turf = /turf/simulated/floor/beach/sand/desert/outdoors; + landmark_tag = "beach_nw"; + name = "Virgo 4 Beach (NW)" + }, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach/jungle) +"YR" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -28; + pixel_y = -29 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/resort/dorm2) +"YY" = ( +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp/green, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/cavebase) +"ZA" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) +"ZC" = ( +/turf/simulated/mineral/ignore_mapgen, +/area/tether_away/beach/cavebase) +"ZX" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) (1,1,1) = {" -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq ba ba bg -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD bi bi bi @@ -656,133 +2375,133 @@ bi bi "} (2,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -am -am -am -am -am -am -am -am -am -am -am -am -am -am +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD am am am @@ -798,132 +2517,132 @@ hx bi "} (3,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -am -am -am -am -am -am -am -am -am -am -am -am -am +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD am am am @@ -940,128 +2659,128 @@ am bi "} (4,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -am -am -am -am -am -am -am -am -am +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD +nD +nD +nD +nD +nD +nD +nD +nD am am am @@ -1082,128 +2801,128 @@ am bi "} (5,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -am -am -am -am -am -am -am -am -am +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +ae +ae +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +ae +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD +nD +nD +nD +nD +nD +nD +nD +nD am am am @@ -1224,127 +2943,127 @@ am bi "} (6,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -am -am -am -am -am -am -am -am +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +ae +ae +ae +ae +bq +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD +nD +nD +nD +nD +nD +nD +nD am am am @@ -1366,127 +3085,127 @@ am bi "} (7,1,1) = {" -bl -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -am -am -am -am -am -am -am -am +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD +nD +nD +nD +nD +nD +nD +nD am am am @@ -1508,126 +3227,126 @@ am bi "} (8,1,1) = {" +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +au +ae +ae bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -am -am -am -am -am -am -am +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +bq +bq +bq +bq +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD +nD +nD +nD +nD +nD +nD am am am @@ -1650,125 +3369,125 @@ am bi "} (9,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -am -am -am -am -am -am +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +au +ae +ae +ae +ae +au +au +au +au +au +au +au +au +ae +ae +ae +Dq +ae +ae +bq +bq +bq +bq +ZC +ZC +ZC +ZC +yF +yF +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD +nD +nD +nD +nD +nD am am am @@ -1792,124 +3511,124 @@ am bi "} (10,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -am -am -am -am -am +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +au +Ar +au +ae +ae +au +au +au +au +au +au +au +au +au +au +ae +ae +ae +ae +ae +ae +bq +bq +bq +ZC +ZC +xy +xy +xy +xy +xy +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +bq +bq +ae +ae +ae +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD +nD +nD +nD +nD am am am @@ -1934,122 +3653,122 @@ am bi "} (11,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -am -am -am +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +au +au +au +ae +au +au +au +au +au +IA +au +au +au +au +au +ae +ae +ae +ae +ae +ae +ae +bq +bq +ZC +Le +xy +xy +xy +Aw +xy +xy +Xd +xy +xy +xy +xy +ZC +ZC +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +ae +ae +ai +ae +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD +nD +nD am am am @@ -2076,120 +3795,120 @@ am bi "} (12,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -am +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +au +au +au +au +au +au +au +au +au +au +au +au +au +au +au +au +ae +ae +ae +ae +ae +bq +bq +bq +bq +ZC +Vo +xy +xy +Aw +gw +Aw +Xd +Xd +Xd +Xd +Xd +Xd +xy +ZC +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD am am am @@ -2218,119 +3937,119 @@ am bi "} (13,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +au +au +au +au +au +au +au +ae +ae +au +au +au +au +VJ +au +au +au +ae +ae +ae +bq +bq +bq +bq +bq +bq +ZC +ZC +xy +vg +xy +Aw +xy +Xd +Xd +Xd +Xd +hQ +Xd +xy +ZC +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +au +ae +au +ae +ae +au +ae +ae +ae +ae +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg am am am @@ -2350,7 +4069,7 @@ aq aq aq aq -aw +Wu tr aa Yv @@ -2360,117 +4079,117 @@ am bi "} (14,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -bh -aa -aa -aa -tr +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +ae +au +Ar +au +au +ae +ae +ae +ae +ae +ae +au +au +au +au +au +au +au +au +ae +ae +bq +bq +bq +bq +bq +bq +ZC +rp +xy +xy +xy +xy +Xd +Xd +SQ +LQ +LQ +Xd +Xd +xy +xy +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +Dq +ae +au +ae +ae +ae +ae +ae +au +au +au +Dq +ae +ae +bq +bq +bq +bq +bq +bq +bq +bq +bq +wv +bq +bq +bq +ba aj ak am @@ -2492,7 +4211,7 @@ aq aY aw aB -aw +Wu tr aa Yv @@ -2502,116 +4221,116 @@ am bi "} (15,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +ae +au +au +au +au +ae +ae +ae +ae +ae +ae +ae +ae +au +au +au +au +au +au +au +ae +ae +bq +bq +bq +bq +bq +bq +ZC +rp +xy +xy +Xd +Xd +LQ +LQ +LQ +pw +LQ +LQ +Xd +Xd +xy +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +au +ae +ae +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq tr aj ak @@ -2631,10 +4350,10 @@ pS aa tr aq -aw +vU aw aq -aw +Wu tr aa Yv @@ -2644,116 +4363,116 @@ am bi "} (16,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +au +au +au +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +au +au +Ar +au +au +au +ae +ae +bq +bq +bq +bq +bq +bq +ZC +rp +xy +Xd +Xd +LQ +LQ +xb +pw +pw +pw +LQ +LQ +Xd +xy +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +au +ae +ae +ae +ae +aa +aa +aa +aa +aa +aa +aa +ae +ae +ae +ae +ae +ae +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq tr aj ak @@ -2776,7 +4495,7 @@ aq aq aq aq -aw +Wu tr aa Yv @@ -2786,115 +4505,115 @@ am bi "} (17,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +au +au +au +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +au +au +au +au +au +ae +ae +bq +bq +bq +bq +bq +bq +bq +ZC +ZC +Xd +Xd +LQ +LQ +pw +pw +pw +pw +pw +LQ +LQ +Xd +Xd +Xd +ZC +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +ae +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ae +ae +ae +ae +ae +ae +bq +bq +bq +bq +bq +bq +bq +bq aa tr aj @@ -2928,114 +4647,114 @@ am bi "} (18,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +au +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +bp +bp +ae +ae +ae +ae +ae +au +au +au +au +ae +ae +bq +bq +bq +bq +bq +bq +bq +ZC +ZC +Xd +xy +SQ +LQ +pw +pw +Tg +pw +pw +pw +LQ +Xd +Xd +xy +ZC +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aC +ae +ae +ae +bq +bq +bq +bq +bq +bq aa aa tr @@ -3070,87 +4789,87 @@ am bi "} (19,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +au +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +bp +bp +bp +bp +bp +ae +ae +ae +ae +ae +ae +au +ae +ae +ae +bq +bq +bq +bq +bq +bq +bq +ZC +ZC +Xd +Xd +LQ +pw +pw +pw +pw +pw +pw +LQ +LQ +Xd +Xd +xy +xy +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae aa aa aa @@ -3173,11 +4892,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq aa aa tr @@ -3212,88 +4931,85 @@ am bi "} (20,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +ae +bq +bq +bq +bq +bq +ae +ae +au +au +au +ae +ae +ae +ae +ae +bp +ae +ae +bp +bp +bp +bp +bp +bp +bp +bp +ae +ae +ae +ae +ae +ae +ae +ae +ae +bq +bq +bq +ZC +ZC +ZC +ZC +ZC +Xd +xy +xy +LQ +pw +pw +pw +pw +pw +SQ +LQ +Xd +xy +xy +xy +ZC +ZC +bq +bq +bq +bq +bq +bq aa +bq +bq +bq +bq +ae +ae aa aa aa @@ -3320,6 +5036,9 @@ aa aa aa aa +bq +bq +bq aa aa tr @@ -3354,84 +5073,84 @@ am bi "} (21,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +ae +ae +bq +bq +bq +ae +ae +au +au +ae +ae +ae +ae +ae +ae +bp +bp +bp +bp +bp +bp +bp aa ac aa +bp +bp +bp +ae +ae +ae +bp +ae +ae +ae +ae +bq +bq +bq +ZC +ZC +ZC +ZC +Xd +Xd +xy +Xd +LQ +LQ +pw +xb +LQ +LQ +LQ +Xd +ZC +ZC +Ed +Ed +ZC +ZC +bq +bq +bq +bq +bq aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -bh -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +ae aa aa aa @@ -3496,82 +5215,82 @@ am bi "} (22,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +ae +ae +ae +ae +ai +ae +ae +ae +ae +ae +ae aa aa +bp +bp +bp aa aa ac aa +bp +aa +aa +aa +aa +bp +bp +bp +bp +ae +ae +bp +bp +ae +ae +ae +bq +bq +bq +ZC +ZC +Xd +Xd +Xd +Xd +Xd +Xd +xy +LQ +LQ +LQ +LQ +Xd +Xd +xy +ZC +ZC +ZC +ZC +ZC +ZC +bq +bq +bq +bq aa aa aa aa aa -aa -aa -aa +bq aa aa aa @@ -3638,55 +5357,17 @@ am bi "} (23,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +ae +ae +ae +ae +ae +ae aa aa aa @@ -3708,6 +5389,44 @@ aa aa aa aa +bp +bp +bp +bp +bp +bp +bp +ae +ae +ae +bq +bq +ZC +Xd +xy +Xd +xy +xy +Xd +Xd +Xd +Xd +Xd +LQ +Xd +Xd +xy +ZC +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -3780,7 +5499,16 @@ am bi "} (24,1,1) = {" -bl +bq +bq +bq +bq +bq +ae +ae +ae +ae +ae aa aa aa @@ -3804,52 +5532,43 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -TU -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bp +bp +bp +bp +bp +bp +bp +ae +ae +bq +av +Xd +Xd +Xd +Xd +ZC +xy +xy +xy +Xd +Xd +Xd +xy +Xd +xy +xy +ZC +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -3922,52 +5641,16 @@ am bi "} (25,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae aa aa aa @@ -3991,8 +5674,44 @@ aa aa aa aa +bp +bp +bp aa aa +bp +bp +bp +ae +ae +ax +xy +Xd +ZC +ZC +ZC +ZC +xy +xy +xy +xy +xy +vg +xy +xy +xy +xy +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -4064,48 +5783,15 @@ am bi "} (26,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +ae +ae +ae aa aa aa @@ -4135,6 +5821,39 @@ aa aa aa aa +bp +bp +bp +bp +ae +ax +Xd +ZC +ZC +ZC +ZC +ZC +ZC +xy +xy +xy +xy +xy +xy +xy +xy +cy +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -4206,47 +5925,14 @@ am bi "} (27,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +ae +ae aa aa aa @@ -4257,6 +5943,7 @@ aa aa aa aa +ab aa aa aa @@ -4271,11 +5958,43 @@ aa aa aa aa +ab aa aa aa aa aa +bp +bp +bp +ae +ae +ZC +ZC +ZC +ZC +ZC +ZC +ZC +xy +xy +xy +xy +xy +xy +xy +xy +ZC +ZC +bq +bq +bq +bq +bq +bq +bq +bq +bq xW aa aa @@ -4348,7 +6067,14 @@ am bi "} (28,1,1) = {" -bl +bq +bq +bq +bq +bq +ae +ae +ae aa aa aa @@ -4370,51 +6096,44 @@ aa aa aa aa +ab +bh aa aa aa aa +xW aa aa aa aa +bp +bp +bp +ae +bq +bq +bq +bq +bq +bq +ZC +ZC +xy +vg +xy +xy +xy +xy +ZC +bq +bq +bq +bq +bq aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq aa aa aa @@ -4490,53 +6209,29 @@ am bi "} (29,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +ae +ae +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab aa aa aa @@ -4554,6 +6249,30 @@ aa aa aa aa +bp +bp +bp +ae +bq +bq +bq +bq +bq +bq +ZC +ZC +xy +xy +xy +Aw +xy +ZC +ZC +bq +bq +bq +bq +bq aa aa aa @@ -4632,40 +6351,14 @@ am bi "} (30,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Ar -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +ae +ae +ae aa aa aa @@ -4698,6 +6391,31 @@ aa aa aa aa +bp +bp +bp +bp +bq +bq +bq +bq +bq +bq +ZC +ZC +ZC +Qm +Qm +YY +rp +ZC +ZC +bq +bq +bq +bq +bq +bq aa aa aa @@ -4719,6 +6437,7 @@ aa aa aa aa +xW aa aa aa @@ -4774,36 +6493,14 @@ am bi "} (31,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +ae +ae +ae aa aa aa @@ -4836,7 +6533,29 @@ aa aa aa aa +bp aa +GS +bp +bq +bq +bq +bq +bq +bq +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +ZC +bq +bq +bq +bq aa aa aa @@ -4916,26 +6635,14 @@ am bi "} (32,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +ae +ae +ae aa aa aa @@ -4967,18 +6674,30 @@ aa aa aa aa +bp +bp aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ab +bp +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -5058,37 +6777,14 @@ am bi "} (33,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +ae +ae aa aa aa @@ -5100,6 +6796,8 @@ aa aa aa aa +ab +bh aa aa aa @@ -5118,10 +6816,30 @@ aa aa aa aa +bp aa aa aa aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -5134,6 +6852,7 @@ aa aa aa aa +ab aa aa aa @@ -5200,30 +6919,13 @@ am bi "} (34,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +ae aa aa aa @@ -5249,6 +6951,7 @@ aa aa aa aa +ab aa aa aa @@ -5260,6 +6963,22 @@ aa aa aa aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -5342,42 +7061,19 @@ am bi "} (35,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +ae +ae aa aa aa aa aa +ab aa aa aa @@ -5409,6 +7105,22 @@ aa aa aa aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -5418,6 +7130,7 @@ aa aa aa aa +bh aa aa aa @@ -5452,6 +7165,12 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI tr aj ak @@ -5484,25 +7203,12 @@ am bi "} (36,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +ae +ae aa aa aa @@ -5542,7 +7248,20 @@ aa aa aa aa +bq +bq aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -5574,14 +7293,6 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa ab aa aa @@ -5590,10 +7301,18 @@ aa aa aa aa +ab aa aa aa -aa +lI +lI +lI +lI +lI +lI +lI +lI bb aj ak @@ -5626,11 +7345,17 @@ am bi "} (37,1,1) = {" -bl +bq +bq +bq +bq +ae +ae aa aa aa aa +ab aa aa aa @@ -5665,34 +7390,20 @@ aa aa aa aa +bq +bq aa aa -aa -aa -aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -5736,6 +7447,14 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI +lI +lI bc aj ak @@ -5768,7 +7487,12 @@ am bi "} (38,1,1) = {" -bl +bq +bq +bq +ae +ae +ae aa aa aa @@ -5809,24 +7533,19 @@ aa aa aa aa -TU -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa aa aa aa aa +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -5868,16 +7587,16 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI tr aj ak @@ -5910,30 +7629,12 @@ am bi "} (39,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +ae +ae +ae aa aa aa @@ -5980,6 +7681,13 @@ aa aa aa aa +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -6020,6 +7728,17 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI tr aj ak @@ -6052,26 +7771,19 @@ am bi "} (40,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +ae +ae +ae +aa +aa +aa +aa +aa +aa +bh aa aa aa @@ -6111,6 +7823,13 @@ aa aa aa aa +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -6150,18 +7869,18 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI tr aj ak @@ -6194,7 +7913,14 @@ am bi "} (41,1,1) = {" -bl +bq +bq +ae +ae +ae +ai +ae +aa aa aa aa @@ -6233,11 +7959,19 @@ aa aa aa aa +ab aa aa aa aa aa +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -6276,34 +8010,19 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI tr aj ak @@ -6336,37 +8055,13 @@ am bi "} (42,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +ae +ae +ae +ae aa aa aa @@ -6401,6 +8096,7 @@ aa aa aa aa +ab aa aa aa @@ -6411,6 +8107,13 @@ aa aa aa aa +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -6421,6 +8124,7 @@ aa aa aa aa +xW aa aa aa @@ -6446,6 +8150,21 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +xT +lI +lI +lI tr aj ak @@ -6478,34 +8197,12 @@ am bi "} (43,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +ae +ae +ae aa aa aa @@ -6552,6 +8249,12 @@ aa aa aa aa +bq +bq +bq +bq +bq +bq aa aa aa @@ -6588,6 +8291,22 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI tr aj ak @@ -6620,7 +8339,12 @@ am bi "} (44,1,1) = {" -bl +bq +bq +bq +ae +ae +ae aa aa aa @@ -6667,6 +8391,12 @@ aa aa aa aa +bq +bq +bq +bq +bq +bq aa aa aa @@ -6702,34 +8432,23 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa +pP +lI +lI +lI +lI +lI +lI +lI +lI +pP +lI +lI +lI +lI +lI +lI +lI tr aj ak @@ -6762,36 +8481,12 @@ am bi "} (45,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +ae +ae +ae aa aa aa @@ -6831,6 +8526,7 @@ aa aa aa aa +xW aa aa aa @@ -6838,6 +8534,9 @@ aa aa aa aa +bq +bq +bq aa aa aa @@ -6862,9 +8561,11 @@ aa aa aa aa +xW aa aa aa +ab aa aa aa @@ -6872,6 +8573,24 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI bb aj ak @@ -6904,11 +8623,11 @@ am bi "} (46,1,1) = {" -bl -aa -aa -aa -aa +bq +bq +bq +ae +ae aa aa aa @@ -6994,26 +8713,26 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI bc aj ak @@ -7046,32 +8765,11 @@ am bi "} (47,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +ae +ae aa aa aa @@ -7156,6 +8854,27 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI bb aj ak @@ -7188,11 +8907,11 @@ am bi "} (48,1,1) = {" -bl -aa -aa -aa -aa +bq +bq +bq +bq +ae aa aa aa @@ -7274,30 +8993,30 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +hg +lI +lI +lI +lI +lI +lI bc aj ak @@ -7330,12 +9049,12 @@ am bi "} (49,1,1) = {" -bl -aa -aa -aa -aa -aa +bq +bq +bq +bq +ae +ae aa aa aa @@ -7414,32 +9133,32 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +Nv +lI +lI +lI +lI +lI +lI +lI bd aj ak @@ -7472,13 +9191,13 @@ am bi "} (50,1,1) = {" -bl -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +ae +ae +ae aa aa aa @@ -7555,44 +9274,44 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +Nv +Nv +Nv +Nv +lI +lI +lI +lI +Nv tr aj ak bf bf bf +bf am am am -am -am +bf am am am @@ -7614,7 +9333,13 @@ am bi "} (51,1,1) = {" -bl +bq +bq +bq +bq +ae +ae +ae aa aa aa @@ -7690,52 +9415,46 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad +lI +lI +lI +lI +lI +lI +lI +lI +hg +lI +lI +hg +lI +lI +lI +lI +hg +Nv +Nv +sD +sD +xi +Nv +Nv +Nv +Nv +Nv +Nv tr aj -ak +KN bf bf bf +ul +bf am -am -am -am -am -am +bf +ul +bf am am am @@ -7756,7 +9475,13 @@ am bi "} (52,1,1) = {" -bl +bq +bq +bq +bq +ae +ae +ae aa aa aa @@ -7782,6 +9507,7 @@ aa aa aa aa +YO aa aa aa @@ -7830,55 +9556,48 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -an -ad -ad -ad -tr -aj -ak -bf -bf -bf -am -am -am -am -am -am -am +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +Nv +Nv +sD +pd +zw +Nv +Nv +li +Nv +Nv +ar +Wu +Wu +Wc +LZ +LZ +LZ +LZ +LZ +LZ +LZ +LZ +LZ +LZ am am am @@ -7898,7 +9617,12 @@ am bi "} (53,1,1) = {" -bl +bq +bq +bq +ae +ae +ae aa aa aa @@ -7973,54 +9697,49 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ao -ad -ad -ad -tr -aj -ak -bf -bf -bf -am -am -am -am -am -am -am +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +hg +lI +lI +lI +lI +Nv +Nv +Nv +Nv +Nv +sD +ez +zw +Nv +Nv +sT +Nv +Nv +ar +Wu +Wu +Wc +LZ +LZ +LZ +LZ +LZ +LZ +LZ +LZ +LZ +LZ am am am @@ -8040,7 +9759,12 @@ am bi "} (54,1,1) = {" -bl +bq +bq +bq +ae +ae +ae aa aa aa @@ -8114,54 +9838,49 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +lI +lI +lI +lI +lI +lI +lI +hg +lI +lI +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +li +Nv +sD +la +zw +Nv +Nv +Nv +Nv +Nv +Nv tr aj -ak +KN bf bf bf +ul +bf am -am -am -am -am -am +bf +ul +bf am am am @@ -8182,12 +9901,12 @@ am bi "} (55,1,1) = {" -bl -aa -aa -aa -aa -aa +bq +bq +bq +ae +ae +ae aa aa aa @@ -8260,49 +9979,49 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +lI +lI +lI +lI +lI +lI +lI +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +sD +sD +xi +Nv +Nv +Nv +Nv +Nv +Nv tr aj ak bf bf bf +bf am am am -am -am +bf am am am @@ -8324,12 +10043,12 @@ am bi "} (56,1,1) = {" -bl -aa -aa -aa -aa -aa +bq +bq +bq +bq +ae +ae aa aa aa @@ -8401,39 +10120,39 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -ad -UZ -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +lI +lI +lI +lI +lI +lI +Nv +Nv +Nv +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +li +Nv tr aj ak @@ -8466,7 +10185,12 @@ am bi "} (57,1,1) = {" -bl +bq +bq +bq +bq +ae +ae aa aa aa @@ -8537,45 +10261,40 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -an -ad -ad -ad -ad -ad -ad -ad -ad -al -al -al -al -al -al -al -al -al -ad -ad -ad -ad +lI +lI +lI +lI +lI +lI +Nv +Nv +Nv +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +Nv +Nv +Nv +Nv tr aj ak @@ -8608,13 +10327,13 @@ am bi "} (58,1,1) = {" -bl -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +ae +ae +ae aa aa aa @@ -8684,40 +10403,40 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ao -ad -ad -ad -ad -ad -ad -ad -ad -al +lI +lI +lI +lI +lI +Nv +OK +Nv +Wf +zw +LB +LB +ah +ah +ah +ah +ah +LB +AS +LB +LB +zw aG -ar -ar -ar -aB -ar -al -al -ad -ad -ad -ad +UN +UN +UN +ao +UN +zw +zw +Nv +Nv +Nv +Nv tr aj ak @@ -8750,19 +10469,14 @@ am bi "} (59,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +ae +ae +ae aa aa aa @@ -8831,35 +10545,40 @@ aa aa aa aa +lI +lI +lI +lI +Nv +Nv +Nv +Wf +Wf +kd +LB +zV +yf +as ad +as +yf +as ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ar -ar -ar -ar -ad -al +CM +LB +wT aH -ar +UN aK -aw -aw +me +me aU aX -al -ad -ad -ad -ad +zw +Nv +Nv +Nv +Nv bb aj ak @@ -8892,15 +10611,15 @@ am bi "} (60,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +ae +ae +ae +ae aa aa aa @@ -8968,40 +10687,40 @@ aa aa aa aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ar +lI +lI +lI +Nv +Nv +Wf +Wf +Wf +Wf +Wf +ah +as +yf as -aw -ar ad -al +as +yf +as +ad +BR +LB +zw aI -ar +UN aL -aw -aw +me +me aU aX -al -ad -ad -ad -ad +zw +Nv +Nv +Nv +Nv bc aj ak @@ -9034,15 +10753,15 @@ am bi "} (61,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +bq +ae +ae aa aa aa @@ -9110,11 +10829,17 @@ aa aa aa aa -aa -aa -aa -aa -aa +lI +lI +Nv +Nv +Nv +Wf +Wf +LJ +Wf +Wf +ah ad ad ad @@ -9123,27 +10848,21 @@ ad ad ad ad -ad -ad -ad -ar -az -aC aE -al -al +LB +zw aH -ar +UN aM -aw -aw +me +me aV aX -al -ad -ad -ad -ad +zw +Nv +Nv +Nv +Nv bb aj ak @@ -9176,15 +10895,15 @@ am bi "} (62,1,1) = {" -bl -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +bq +bq +ae aa aa aa @@ -9252,11 +10971,17 @@ aa aa aa aa -aa -aa -aa -aa -aa +lI +lI +Nv +OK +Wf +Wf +LJ +LJ +LJ +Wf +ah ad ad ad @@ -9266,26 +10991,20 @@ ad ad ad ad -ad -ad -ar -ar -ar -ar -ad -al +AS +zw aI aJ aN -aw -aw +me +me aW aX -al -ad -ad -ad -ad +zw +Nv +Nv +Nv +Nv bc aj ak @@ -9318,16 +11037,16 @@ am bi "} (63,1,1) = {" -bl bq -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +bq +ae +ae aa aa aa @@ -9393,41 +11112,41 @@ aa aa aa aa -bs -aa -aa -aa -aa aa +lI +lI +Nv +Nv +Wf +Wf +LJ +LJ +LJ +Wf +ah ad ad -ad -ad -ad -ad -al -ad -ad -ad -ad -ad -ad -ad -ad -ad -al +By +By +By +By +By +io +Of +LB +zw aH -ar +UN aO -aw -aw +me +me aW aX -al -ad -ad -ad -ad +zw +Nv +Nv +Nv +Nv bb aj ak @@ -9460,17 +11179,17 @@ am bi "} (64,1,1) = {" -bl bq bq bq -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +ae +ae aa aa aa @@ -9536,40 +11255,40 @@ aa aa aa aa -aa -aa -aa -aa -aa +lI +lI +Nv +Nv +Nv +Wf +Wf +LJ +Wf +Wf +ah ad ad -ad -ad -ad -ad -al -al -al -al -al -al -al -al -al -al -al +Kq +Kq +Kq +Kq +Kq +io +Kq +LB +zw aI -ar +UN aP -aw -aw +me +me aV aX -al -ad -ad -ad -ad +zw +Nv +Nv +Nv +Nv bc aj ak @@ -9602,18 +11321,18 @@ am bi "} (65,1,1) = {" -bl bq bq bq bq bq -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +ae +ae aa aa aa @@ -9678,40 +11397,40 @@ aa aa aa aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -al -ad -ad -al -ad -ad -ad -ad -ad -ad -al +lI +lI +lI +Nv +Nv +Nv +Wf +Wf +Wf +Wf +LB +mb +Ja +mu +aD +aD +aD +aD +aD +Bk +LB +zw aH -ar -aw -aw -aw -aV -aX -al -ad -ad -ad -ad +UN +Rm +gU +gU +zb +hq +zw +Nv +Nv +Nv +Nv bb aj ak @@ -9744,7 +11463,6 @@ am bi "} (66,1,1) = {" -bl bq bq bq @@ -9752,6 +11470,17 @@ bq bq bq bq +bq +bq +bq +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -9810,50 +11539,40 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -ad -ad -ad -al -ad -ar -ar -ar -ar -ad -al +lI +lI +lI +lI +Nv +Nv +Nv +Wf +Wf +zw +LB +LB +Jn +LB +fl +aD +uk +uk +aD +XB +LB +zw aI -ar +UN aQ -aw -aw +me +me ag -aX -al -ad -ad -ad -ad +oF +zw +Nv +Nv +Nv +Nv bc aj ak @@ -9893,6 +11612,18 @@ bq bq bq bq +bq +bq +bq +bq +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -9950,52 +11681,40 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -ad -ad -ad -al -ad -ar -as -aw -ar -ad -al +lI +lI +lI +lI +lI +OK +Nv +Nv +Wf +zw +zw +rQ +jQ +LB +Wd +aD +uQ +Jm +aD +LT +LB +zw aH -ar +UN aR -aw -aw +me +me aV -aX -al -ad -ad -UZ -ad +oF +zw +Nv +Nv +Nv +Nv bb aj ak @@ -10041,12 +11760,12 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +ae +ae aa aa aa @@ -10104,40 +11823,40 @@ aa aa aa aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ar -ar -ar -ad -ad -al -ad -ar -az +lI +lI +lI +lI +lI +Nv +Nv +Nv +zw +zw +zw +zw +jQ +ah +tG +aD +aD +aD aD aF -al -al +ah +zw aI -ar +UN aS -aw -aw +me +me aV -aX -al -ad -ad -ad -ad +oF +zw +Nv +Nv +Nv +Nv bc aj ak @@ -10185,10 +11904,10 @@ bq bq bq bq -aa +ae bq -aa -aa +ae +ae aa aa aa @@ -10246,40 +11965,40 @@ aa aa aa aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ar -ae -al -ad -ad -al -ad -ar -ar -ar -ar -ad -al +lI +lI +lI +lI +lI +Nv +Um +Um +zD +Um +Um +zw +jQ +LB +SG +aD +hL +Hv +mF +aF +LB +zw aH -ar +UN aT -aw -aw +me +me aV -aX -al -ad -ad -ad -ad +oF +zw +Nv +Nv +Nv +Nv bb aj ak @@ -10329,8 +12048,8 @@ bq bq bq bq -aa -aa +ae +ae aa aa aa @@ -10387,41 +12106,41 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ar +lI +lI +lI +lI +lI +lI +Nv +zD +ku +zZ +zP af -al -al -al -al -ad +Yq +jQ +LB +LB +LB ah -ad -ad -ad -ad -al +ah +LB +LB +LB +zw aI -ar -ar -ar -ar -ar -al -al -ad -ad -ad -ad +UN +UN +UN +ao +UN +jQ +zw +Nv +Nv +Nv +Nv bc aj ak @@ -10470,6 +12189,9 @@ bq bq bq bq +ae +ae +ae aa aa aa @@ -10526,44 +12248,41 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ar -al -al -ad -ad -al -al -al -al -al -al -al -al -al -al -al -al -al -al -al -al -ad -ad -ad -ad +lI +lI +lI +hg +lI +lI +Nv +zD +hR +Uk +qI +zD +bT +eV +kT +kT +kT +kT +kT +kT +kT +kT +Rx +kT +kT +kT +kT +kT +kT +JU +zw +Nv +Nv +Nv +Nv tr aj ak @@ -10612,6 +12331,10 @@ bq bq bq bq +ae +ae +ae +ae aa aa aa @@ -10667,45 +12390,41 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ar -ar -ar -ad -ad -ad -ad -ad -ad -ad -al -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +lI +lI +lI +lI +lI +lI +Nv +zD +mM +py +Tp +zD +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +jQ +zw +zw +zw +zw +zw +zw +zw +Nv +Nv +Nv +Nv +Nv tr aj ak @@ -10753,6 +12472,11 @@ bq bq bq bq +ae +ae +ae +ae +ae aa aa aa @@ -10807,47 +12531,42 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -bp -bp -bp -bp -bp -ad -ad -ad -ad -ad -ad -ad -ar -ar -ar -ar -ad -al -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +lI +lI +lI +lI +lI +lI +lI +Nv +Um +Um +kO +Um +Um +zw +zw +Nv +Wf +Wf +Wf +Wf +Wf +Nv +Nv +jQ +zw +UN +UN +UN +UN +zw +Nv +Nv +Nv +Nv +Nv +Nv tr aj ak @@ -10897,6 +12616,33 @@ bq bq bq bq +ae +ae +ae +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab aa aa aa @@ -10927,69 +12673,42 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -bp -bp -bp -bp -bp -bp -bp -ad -ad -ad -ad -ad -ad -ad -ar -as -av -ar -ad -al -ad -ad -ad -ad -ad -aa -aa -aa -ad -ad -ad -ad -ad -ai +lI +lI +lI +lI +Nv +lI +lI +Nv +zw +zw +Fm +mi +zw +zw +zw +hj +hj +hj +hj +hj +hj +hj +hj +wM +zw +UN +SK +QL +UN +zw +Nv +Nv +Nv +Nv +Nv +Nv tr aj ak @@ -11041,8 +12760,8 @@ bq bq bq bq -aa -aa +ae +ae aa aa aa @@ -11096,42 +12815,42 @@ aa aa aa aa -aa -aa -bp -bp -bp -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -ar +lI +lI +Nv +Nv +lI +Nv +lI +lI +Nv +Nv +Fm +Nv +Nv +Nv +Nv +hj +kg at -aw +Ya aA -al -al -ad -ad -ad -ad -aa -aa -aa -aa -aa -ad -ad -ad -ad -aZ +Qr +il +hj +jQ +zw +UN +cN +cf +gd +zw +Nv +Nv +Nv +Nv +Nv +OK tr aj ak @@ -11182,14 +12901,11 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +ae aa aa aa @@ -11241,39 +12957,42 @@ aa aa aa bp -bp -bp -aa -aa -aa -aa -aa -ad -ad -ad -UZ -ad -ad -ar -au -ax -ar -ad +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +Fm +Nv +pP +lI +Nv +hj +WU al -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad +al +al +al +al +al +jQ +zw +UN +iO +Sz +UN +Nv +Nv +Nv +Nv +Nv +Nv +Nv tr aj ak @@ -11324,11 +13043,15 @@ bq bq bq bq +ae +ae +ae +aC +bs +ae aa aa aa -ac -bh aa aa aa @@ -11375,47 +13098,43 @@ aa aa bp bp -bp -bp -bp -bp -bp -bp -bp -bp aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ar -ar -ar -ar -ad +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +Fm +Nv +lI +lI +Nv +hj +dm al -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad +al +al +al +al +al +jQ +zw +UN +UN +UN +UN +lI +Nv +Nv +Nv +Nv +Nv +Nv tr aj ak @@ -11465,15 +13184,15 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -11515,49 +13234,49 @@ ac aa bp bp -bp -bp -bp -bp -bp -bp -bp -bp -bp +aa +aa bp aa aa aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -al -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad +lI +lI +lI +lI +lI +hg +lI +lI +lI +lI +Nv +Fm +Nv +lI +lI +Nv +hj +EG +PK +Lp +hr +IB +eF +hj +jQ +zw +UN +LO +tl +UN +Nv +Nv +Nv +Nv +Nv +Nv +Nv tr aj ak @@ -11607,16 +13326,16 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +au +ae +ae +ae +ae +ae +ae aa aa aa @@ -11663,43 +13382,43 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -ar -ar -ar -ad -al -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +Fm +Nv +lI +lI +Nv +hj +hj +hj +hj +hj +hj +hj +hj +jQ +zw +cf +cf +cf +cf +Nv +Nv +Nv +Nv +Nv +Nv +Nv tr aj ak @@ -11750,6 +13469,15 @@ bq bq bq bq +ae +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -11795,53 +13523,44 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ar +ab +lI +lI +lI +lI +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Fm +Nv +lI +lI +Nv +hj +BP +eW ay -aB -al -al -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad +TH +ND +kk +hj +jQ +zw +UN +et +PG +UN +Nv +Nv +Nv +lI +Nv +Nv +Nv bb aj ak @@ -11890,18 +13609,18 @@ bq bq bq bq -aa bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +ae +ae +ae +au +ae +ae +ae +ae +ae +ae aa aa aa @@ -11946,44 +13665,44 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ar -ar -ar -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad +lI +lI +lI +lI +Nv +Nt +RX +RX +RX +RX +RX +RX +Rh +Nv +lI +pP +Nv +hj +WH +RA +RA +RA +RA +Gr +ST +ZX +zw +UN +UN +UN +UN +Nv +Nv +lI +lI +Nv +Nv +Nv bc aj ak @@ -12032,17 +13751,17 @@ bq bq bq bq -aa bq -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +ae +ae +ae +au +au +ae +ae +ae +ae aa aa aa @@ -12088,44 +13807,44 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad +lI +lI +lI +lI +Nv +Fm +Nv +Nv +Nv +Nv +Nv +Nv +Nv +lI +pP +lI +Nv +hj +AE +AE +dP +dP +dP +Je +hj +jQ +zw +yg +Wf +Wf +Nv +Nv +Nv +lI +lI +hg +Nv +Nv bb aj ak @@ -12177,14 +13896,14 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +au +au +ae +ae +ae aa aa aa @@ -12230,44 +13949,44 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad +lI +lI +lI +lI +Nv +Fm +Nv +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +hj +hj +hj +hj +hj +hj +hj +hj +jQ +zw +Wf +Wf +Nv +Nv +Nv +lI +lI +lI +lI +Nv +Nv bc aj ak @@ -12319,6 +14038,14 @@ bq bq bq bq +ae +ae +au +au +au +ae +ae +ae aa aa aa @@ -12347,15 +14074,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ab aa aa aa @@ -12371,45 +14090,45 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad -ad -ad -ad -ad -ad -ad -ad -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad -ad +lI +lI +lI +pP +lI +Nv +Fm +Nv +pP +lI +lI +lI +pP +lI +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +jQ +zw +Nv +Nv +Nv +Nv +lI +lI +lI +lI +lI +Nv +Nv tr aj ak @@ -12461,14 +14180,14 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +au +ae +ae +ae aa aa aa @@ -12512,46 +14231,46 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -bh -aa -aa -aa -aa -aa -aa -aa -ad +lI +lI +lI +lI +lI +lI +Nv +Fm +Nv +lI +pP +us +lI +lI +Nv +Eh +Eh +Eh +Eh +Nv +Cr +kT +kT +kT +kT +kT +kT +JU +zw +zw +zw +zw +zw +Nv +hg +us +lI +lI +lI +Nv tr aj ak @@ -12603,15 +14322,15 @@ bq bq bq bq -aa -aa -aa -aa -ac -aa -aa -aa -aa +ae +ae +ae +ae +aC +ae +ae +ae +ae aa aa aa @@ -12652,48 +14371,48 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad +lI +lI +lI +lI +lI +lI +lI +lI +Nv +Fm +Nv +lI +lI +lI +lI +lI +Nv +Eh +lh +uT +Eh +Nv +jQ +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +Nv +lI +lI +lI +lI +lI +Nv tr aj ak @@ -12744,16 +14463,16 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -12788,54 +14507,54 @@ aa aa aa aa +ac aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad +lI +lI +lI +lI +lI +pP +lI +lI +lI +Nv +Fm +Nv +lI +lI +lI +lI +lI +Nv +Eh +rJ +to +IY +kT +qi +zw +Yi +CC +CC +CC +PV +PV +PV +PV +Ue +zw +zw +Nv +lI +lI +lI +lI +lI +Nv tr aj ak @@ -12888,14 +14607,14 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -12933,51 +14652,51 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +Fm +Nv +lI +lI +lI +lI +lI +Nv +Eh +of +oq +Eh +Nv +jQ +zw +hl +DB +DB +DB +uO +uO +uO +uO +jH +zw +zw +Nv +lI +lI +hg +lI +lI +Nv tr aj ak @@ -13030,14 +14749,14 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa +ae +au +ae +ae +ae +ae +ae +ae aa aa aa @@ -13069,57 +14788,57 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa ac aa +lI +lI aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ad +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +Fm +Nv +lI +lI +lI +pP +lI +Nv +Eh +Eh +Eh +Eh +ss +jQ +zw +hl +DB +DB +DB +uO +uO +uO +uO +jH +zw +zw +Nv +lI +lI +lI +lI +lI +Nv tr aj ak @@ -13171,97 +14890,97 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -xW -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +au +au +au +au +ae +ae +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +pP +lI +lI +lI +lI +lI +lI +Nv +Fm +Nv +lI +lI +lI +lI +lI +Nv +zs +kW +QY +zs +Nv +jQ +zw +hl +DB +DB +DB +uO +uO +uO +uO +jH +zw +zw +Nv +lI +lI +lI +lI +lI +lI tr aj ak @@ -13314,96 +15033,96 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -bp -xW -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +au +au +au +ae +ae +ae +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +lI +lI +lI +lI +lI +RD +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Fm +Nv +lI +lI +lI +lI +lI +Nv +zs +kR +YR +DK +kT +qi +zw +dd +kK +kK +kK +pA +pA +pA +pA +uh +zw +zw +Nv +lI +lI +lI +lI +lI +lI be aj ak @@ -13456,96 +15175,96 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +au +ae +ae +ae +ae +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +lI +lI +lI +lI +Nv +Nv +Nt +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +RX +Rh +Nv +lI +lI +lI +lI +lI +Nv +zs +hS +MZ +zs +Nv +jQ +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +zw +Nv +lI +hg +lI +lI +hg +lI tr aj ak @@ -13597,97 +15316,97 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +au +ae +ae +ae +ae +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +lI +Nv +lI +Nv +Nv +Nv +Fm +Nv +Nv +sT +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +lI +pP +lI +lI +lI +lI +Nv +zs +zs +zs +zs +Nv +bT +Rx +kT +kT +kT +UQ +kT +kT +kT +Yq +zw +zw +zw +Nv +lI +lI +lI +lI +lI +lI bb aj ak @@ -13739,97 +15458,97 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +ae +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +bp +lI +lI +lI +lI +lI +lI +Nv +Fm +Nv +lI +pP +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +pP +lI +lI +lI +lI +lI +lI +lI +lI +lI +pP +lI +lI +lI +Nv +Nv +Nv +Nv +Nv +Nv +jQ +Nv +BF +Wj +hj +Wj +YE +Nv +jQ +Nv +Ce +Nv +lI +lI +lI +lI +lI +lI +lI bc aj ak @@ -13881,12 +15600,12 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +ae +ae aa aa aa @@ -13898,80 +15617,80 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aa -aa -aa +bp +bp +aa +aa +aa +aa +lI +lI +lI +lI +lI +lI +Nv +Fm +Nv +Nv +lI +lI +lI +lI +lI +lI +lI +lI +lI +pP +lI +lI +lI +pP +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +Nv +Nv +Nv +BF +BF +Gi +BF +BF +JX +hj +JX +YE +YE +Lw +YE +YE +Nv +lI +lI +lI +pP +lI +lI +lI bb aj ak @@ -14022,12 +15741,12 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +ae +ae aa aa aa @@ -14046,74 +15765,74 @@ aa aa ac aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +Nv +Nt +RX +ts +RX +jc +Nv +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +pP +lI +lI +lI +lI +lI +lI +hg +us +lI +lI +lI +lI +lI +lI +lI +Nv +Nv +Nv +Nv +Nv +BF +hV +uL +fJ +BF +BF +BF +YE +YE +WS +pC +dt +YE +Nv +lI +lI +lI +us +lI +lI +lI bc aj ak @@ -14155,107 +15874,107 @@ bq bq bq bq -bp +an bq bq -bp +an bq bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +ae +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +lI +lI +lI +Nv +DA +pF +Uo +Nv +DA +pF +Uo +Nv +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +Nv +KU +KU +Nv +Nv +Nv +BF +RH +HO +kP +BF +Nv +Nv +Nv +YE +Ew +mW +Rv +YE +Nv +lI +lI +lI +lI +lI +lI +lI bb aj ak @@ -14297,21 +16016,21 @@ bq bq bq bq -bp +an bq -bp -bp +an +an bq bq bq bq bq bq -aa -aa -aa -aa -ab +ae +ae +ae +ae +ai aa aa aa @@ -14329,75 +16048,75 @@ aa aa aa aa -aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +pP +Nv +DA +pF +Uo +Nv +DA +pF +Uo +Nv +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +KU +KU +KU +Nv +Nv +Nv +Nv +BF +BF +BF +BF +BF +Nv +lI +Nv +YE +YE +YE +YE +YE +Nv +hg +lI +lI +lI +lI +lI +lI bc aj ak @@ -14438,23 +16157,23 @@ bq bq bq bq -bp -bp -bp -bp -bp +an +an +an +an +an bq bq bq bq bq -bq -aa -aa -aa -aa -bh -aa +ae +ae +ae +ae +ae +bs +ae aa aa bp @@ -14471,75 +16190,75 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +Nv +DA +pF +Uo +Nv +DA +pF +Uo +Nv +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +KU +KU +KU +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +lI +lI +lI +Nv +Nv +Nv +Nv +Nv +lI +lI +lI +lI +lI +lI +lI +lI tr aj ak @@ -14580,23 +16299,23 @@ bq bq bq bq -bp -bp -bp -bp -bp +an +an +an +an +an bq bq bq bq bq -bq -bp -aa -bp -bp -aa -aa +ae +ax +ae +ax +ax +ae +ae aa bp aa @@ -14613,75 +16332,75 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +Nv +nm +mS +XZ +XZ +XZ +Mp +Uo +Nv +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +hg +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +Nv +Nv +KU +KU +Nv +Nv +Nv +Nv +Nv +Nv +Nv +KU +KU +Nv +Nv +Nv +lI +lI +lI +lI +lI +lI +hg +lI +lI +lI +lI +lI +lI +lI +lI tr aj ak @@ -14717,113 +16436,113 @@ bi bq bq bq -bp +an bq bq -bp +an bq -bp -bp -bp -bp -bp +an +an +an +an +av bq bq bq bq -bq -bq -bp -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ax +ae +ae +ae +ae +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +lI +lI +lI +lI +Nv +DA +ZA +Uo +Nv +DA +ZA +Uo +Nv +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +Nv +Nv +KU +KU +Nv +Nv +Nv +Nv +Nv +Nv +Nv +KU +KU +KU +KU +Nv +Nv +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI tr aj ak @@ -14858,27 +16577,27 @@ bi (102,1,1) = {" bq bq -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bq -bq -bq -aa -aa -aa -aa +an +an +an +an +an +an +an +an +an +an +av +av +rm +ae +ae +ae +ae +ae +ae +ae +ae bp bp aa @@ -14897,75 +16616,75 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +Nv +DA +ZA +Uo +Nv +DA +ZA +Uo +Nv +lI +lI +lI +lI +lI +lI +lI +lI TU -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +Nv +KU +KU +KU +Nv +Nv +Nv +Nv +Nv +jN +Nv +Nv +Nv +KU +KU +KU +Nv +Nv +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI tr aj ak @@ -14999,114 +16718,114 @@ bi "} (103,1,1) = {" bo -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -aa -bp -bp -bp -bp -bp -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +an +an +an +an +an +an +an +an +an +an +an +an +an +an +ae +ae +ae +ax +ax +ax +ax +ax +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +lI +lI +lI +lI +Nv +DA +ME +Uo +Nv +DA +ME +Uo +Nv +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +aa +aa +aa +lI +lI +lI +lI +lI +lI +lI +lI +Nv +KU +KU +KU +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +KU +KU +KU +Nv +Nv +lI +lI +lI +lI +lI +lI +lI +lI +hg +lI +lI +lI aa tr aj @@ -15141,111 +16860,111 @@ bi "} (104,1,1) = {" br -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -aa -bp -bp -aa -bp -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +an +an +an +an +an +an +an +an +an +an +an +an +an +av +ae +ax +ae +ae +ax +ax +ae +ax +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +lI +lI +lI +lI +Nv +Nv +Nv +Nv +Nv +Nv +Nv +lI +lI +lI +lI +hg +lI +lI +lI +lI +lI +lI +lI +aa +aa +aa +aa +aa +lI +lI +lI +pP +lI +lI +Nv +Nv +KU +KU +KU +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +IZ +Nv +Nv +KU +KU +KU +Nv +Nv +lI +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -15283,84 +17002,29 @@ bi "} (105,1,1) = {" br -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bq -bp -bp -bp -bp -bp -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +an +an +an +an +an +an +an +an +an +an +an +av +av +rm +ae +ae +ae +ae +ax +ae +ae +ae +ae aa aa aa @@ -15379,6 +17043,28 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -15387,6 +17073,39 @@ aa aa aa aa +lI +lI +lI +lI +Nv +Nv +KU +KU +KU +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +KU +KU +KU +Nv +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -15425,81 +17144,29 @@ bi "} (106,1,1) = {" br -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp +an +an +an +an +an +an +an +an +an +an +an +av +av bq -bp -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -15519,6 +17186,27 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI +pP +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -15527,6 +17215,37 @@ aa aa aa aa +lI +lI +lI +lI +Nv +Nv +Nv +KU +KU +Nv +jN +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +KU +KU +KU +Nv +lI +lI +lI +lI +lI aa aa aa @@ -15567,29 +17286,29 @@ bi "} (107,1,1) = {" br -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp +an +an +an +an +an +an +an +an +an +an +an +an +av bq bq -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -15610,6 +17329,25 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -15619,31 +17357,36 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +Nv +Nv +KU +Nv +Nv +KU +Nv +Nv +Nv +IZ +sT +Nv +Nv +Nv +Nv +Nv +jN +Nv +Nv +KU +KU +KU +Nv +xT +lI +lI +lI aa aa aa @@ -15652,30 +17395,6 @@ aa aa ab bh -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -xW -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa tr aj ak @@ -15709,29 +17428,29 @@ bi "} (108,1,1) = {" br -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp -bp +an +an +an +an +an +an +an +an +an +an +an +an bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -15753,6 +17472,22 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -15765,51 +17500,35 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +Nv +KU +KU +KU +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +KU +KU +KU +Nv +lI +lI +lI +lI aa aa aa @@ -15852,20 +17571,29 @@ bi (109,1,1) = {" bq bq -bp -bp -bp -bp -bp -bp -bp -bp -bp +an +an +an +an +an +an +an +an +an bq bq bq bq bq +ae +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -15887,6 +17615,21 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -15896,61 +17639,37 @@ aa aa aa aa +ab aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +Nv +KU +KU +KU +Nv +Nv +Nv +KU +KU +KU +KU +KU +Nv +jN +Nv +Nv +Nv +Nv +Nv +KU +KU +Nv +Nv +lI +lI +lI aa aa aa @@ -15994,19 +17713,33 @@ bi (110,1,1) = {" bq bq -bp -bp -bp -bp -bp -bp -bp -bp -bp +an +an +an +an +an +an +an +an +an bq bq bq bq +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +aa +ae +ae aa aa aa @@ -16026,32 +17759,18 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -16060,39 +17779,39 @@ aa aa aa ab +bh aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aa -aa -aa +lI +lI +Nv +Nv +KU +KU +Nv +Nv +Nv +Nv +KU +KU +KU +KU +KU +Nv +Nv +Nv +Nv +Nv +Nv +Nv +KU +Nv +OK +lI +lI +lI aa aa aa @@ -16137,18 +17856,33 @@ bi bq bq bq -bp -bp -bp +an +an +an bq bq bq bq -bp +an bq bq bq bq +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -16172,6 +17906,12 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI aa aa aa @@ -16187,54 +17927,33 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +Nv +KU +KU +KU +Nv +Nv +Nv +Nv +Nv +KU +KU +KU +KU +Nv +Nv +Nv +Nv +Nv +Nv +KU +Nv +lI +lI +lI +lI aa aa aa @@ -16280,7 +17999,7 @@ bq bq bq bq -bp +an bq bq bq @@ -16290,48 +18009,22 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +au +ae +ae +Dq +ae +ae +aC +ae +ae +ae +ae +ae aa aa aa @@ -16376,6 +18069,32 @@ aa aa aa aa +hg +us +Nv +KU +KU +KU +KU +Nv +Nv +Nv +Nv +Nv +Nv +KU +KU +KU +KU +Nv +Nv +Nv +Nv +Nv +Nv +lI +lI +lI aa aa aa @@ -16434,21 +18153,21 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +au +au +au +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -16493,38 +18212,38 @@ aa aa aa aa +lI +Nv +Nv +KU +KU +KU +KU +KU +Nv +Nv +Nv +Nv +Nv +KU +KU +KU +KU +Nv +Nv +Nv +Nv +lI +lI +lI +lI aa aa aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ab aa aa aa @@ -16576,20 +18295,20 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +au +au +au +au +ae +ae +ae +au +ae +ae +ae +ae aa aa aa @@ -16636,29 +18355,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +Nv +Nv +KU +KU +KU +KU +KU +Nv +Nv +Nv +Nv +Nv +KU +KU +KU +KU +KU +KU +Nv +Nv +lI +lI aa aa aa @@ -16718,9 +18437,24 @@ bq bq bq bq +ae +ae +ae +au +au +au +ae +ae +ae +au +au +ae +ae +ae aa aa aa +xW aa aa aa @@ -16763,43 +18497,28 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +Nv +Nv +Nv +Nv +Nv +Nv +Nv +Nv +lI +Nv +Nv +Nv +KU +KU +KU +KU +Nv +Nv +Nv +lI aa aa aa @@ -16860,6 +18579,19 @@ bq bq bq bq +ae +ae +ae +au +au +au +au +ae +ae +ae +ae +ae +ae aa aa aa @@ -16875,19 +18607,6 @@ aa aa aa aa -TU -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -16921,26 +18640,26 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +Nv +Nv +Nv +Nv +lI +lI +lI +lI +lI +lI +Nv +Nv +Nv +Nv +Nv +Nv +Nv +lI aa aa aa @@ -16968,7 +18687,7 @@ bf bk mC mC -mC +JG mC fQ bf @@ -17002,19 +18721,19 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +au +au +au +au +au +ae +ae +ae +ae +ae aa aa aa @@ -17063,26 +18782,26 @@ xW aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Nv +Nv +Nv +Nv +lI +lI aa aa aa @@ -17144,18 +18863,18 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +au +au +au +au +au +ae +ae +ae +ae aa aa aa @@ -17207,23 +18926,23 @@ aa aa aa aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +pP +lI aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -17284,6 +19003,21 @@ bq bq bq bq +ae +ae +ae +ae +ae +au +au +au +au +au +ae +ae +ae +ae +ae aa aa aa @@ -17339,27 +19073,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +hg +lI +lI aa aa aa @@ -17427,20 +19146,20 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +au +au +au +au +au +au +ae +ae +ae +ae aa aa aa @@ -17569,21 +19288,21 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +au +au +au +au +au +au +ae +ae +ae +ae +ae aa aa aa @@ -17711,35 +19430,22 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +ae +au +au +au +au +au +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -17793,6 +19499,19 @@ aa aa ab aa +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +bh aa aa aa @@ -17852,27 +19571,27 @@ bq bq bq bq +ae +ae +ae +aC +ae +ae +au +au +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae aa -aa -aa -ac -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae aa aa aa @@ -17994,28 +19713,28 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ae +ae +ae +au +ae +ae +au +au +ae +ae +ae +ae +au +au +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -18136,6 +19855,29 @@ bq bq bq bq +ae +ae +ae +au +au +ae +ae +ae +ae +ae +ae +au +au +au +ae +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -18191,30 +19933,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ab aa aa aa @@ -18278,29 +19997,29 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +ae +ae +ae +Dq +ae +ae +ae +ae +ae +ae +au +ae +ae +au +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -18420,6 +20139,31 @@ bq bq bq bq +bq +bq +bq +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +au +ae +ae +ae +ae +bq +bq +bq +bq +bq +bq aa aa aa @@ -18461,6 +20205,7 @@ aa aa aa aa +ab aa aa aa @@ -18470,36 +20215,10 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq aa aa aa @@ -18564,6 +20283,31 @@ bq bq bq bq +bq +bq +bq +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +ae +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -18611,42 +20355,17 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -18709,6 +20428,29 @@ bq bq bq bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +ae +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -18755,41 +20497,18 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -18851,31 +20570,31 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae aa aa aa @@ -18910,6 +20629,7 @@ aa aa aa aa +ab aa aa aa @@ -18918,6 +20638,20 @@ aa aa aa aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa @@ -18926,23 +20660,8 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr +bq +ba aj ak bf @@ -18993,6 +20712,32 @@ bq bq bq bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae aa aa aa @@ -19033,58 +20778,32 @@ aa aa aa aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr +bq +bq +ba aj ak bf @@ -19136,6 +20855,33 @@ bq bq bq bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -19173,61 +20919,34 @@ aa aa aa aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj +bq +bq +ba +ba ak bf bf @@ -19278,6 +20997,34 @@ bq bq bq bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -19310,66 +21057,38 @@ aa aa aa aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj +bq +bq +bq +ba +ba ak bf bf @@ -19421,6 +21140,37 @@ bq bq bq bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +au +au +au +au +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -19447,72 +21197,41 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg bf bf am @@ -19563,6 +21282,38 @@ bq bq bq bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +au +au +au +au +au +ae +ae +ae +ae +ae +ae +ae aa aa aa @@ -19587,75 +21338,43 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -bf +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD bf am am @@ -19706,101 +21425,101 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -bf -bf -am -am +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +au +ae +ae +ae +ae +ae +ae +ae +ae +ae +bq +bq +bq +bq +bq +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD +nD +nD +nD am am am @@ -19848,110 +21567,110 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -bf -bf -am -am -am -am -am -am -am -am -am +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ae +ae +ae +ae +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD +nD +nD +nD +nD +nD am am +nD +nD +nD +nD +nD am am am @@ -19990,112 +21709,112 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -bf -am -am -am -am -am -am -am -am -am -am -am -am -am -am +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +aa +aa +aa +aa +aa +bq +bq +bq +bq +bq +aa +aa +aa +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD am am am @@ -20131,114 +21850,114 @@ bq bq bq bq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -tr -aj -ak -bf -am -am -am -am -am -am -am -am -am -am -am -am -am -am -am +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +ba +ba +bg +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD am am am @@ -20272,114 +21991,114 @@ bq bq bq bq -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl -bl +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq +bq ba ba bg -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi -bi +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD +nD bi bi bi diff --git a/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm b/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm index d2b574efa35..45138547ce1 100644 --- a/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm +++ b/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm @@ -219,7 +219,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/structure/closet/crate, +/obj/structure/prop/blackbox/gecko_wreck, /turf/simulated/floor/plating, /area/shuttle/gecko_cr_cockpit_wreck) "fL" = ( @@ -235,10 +235,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/decal/remains/human, -/obj/item/weapon/tank/air, -/obj/item/clothing/suit/space/void/refurb/marine, -/obj/item/clothing/head/helmet/space/void/refurb/marine, /turf/simulated/floor/tiled/techmaint, /area/shuttle/gecko_cr_cockpit_wreck) "fR" = ( @@ -1098,6 +1094,7 @@ dir = 1; pixel_y = 42 }, +/obj/random/multiple/voidsuit/vintage, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_cockpit_wreck) "vI" = ( @@ -1597,6 +1594,7 @@ }, /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/light/flicker, +/obj/random/multiple/voidsuit/vintage, /turf/simulated/floor/tiled/techfloor, /area/shuttle/gecko_cr_cockpit_wreck) "FA" = ( @@ -1962,10 +1960,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/effect/decal/remains, -/obj/item/weapon/tank/oxygen/yellow, -/obj/item/clothing/suit/space/void/refurb/engineering, -/obj/item/clothing/head/helmet/space/void/refurb/engineering, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/gecko_cr_engineering_wreck) "LW" = ( diff --git a/maps/offmap_vr/om_ships/itglight.dmm b/maps/offmap_vr/om_ships/itglight.dmm index e2e6008bb29..4707ee1c881 100644 --- a/maps/offmap_vr/om_ships/itglight.dmm +++ b/maps/offmap_vr/om_ships/itglight.dmm @@ -1,4 +1,34 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/pink{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/mining{ + name = "Captain's Quarters"; + req_one_access = list(778) + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/itglight/captain) +"ab" = ( +/obj/structure/bed/chair/bay/chair/padded/red/bignest{ + name = "large dog bed" + }, +/obj/machinery/alarm/alarms_hidden{ + dir = 4; + pixel_x = -26 + }, +/mob/living/simple_mob/vore/woof/cass, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/itglight/common) "ac" = ( /obj/machinery/smartfridge, /obj/machinery/light{ @@ -23,6 +53,125 @@ }, /turf/simulated/floor/airless, /area/itglight/readyroom) +"af" = ( +/obj/structure/table/wooden_reinforced, +/obj/item/weapon/paper/dockingcodes, +/obj/item/weapon/card/id/itg/event/captain, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = -32 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/itglight/captain) +"ag" = ( +/obj/structure/closet/walllocker_double{ + dir = 8; + name = "Cook's Cabinet"; + pixel_x = -27 + }, +/obj/item/clothing/under/tactical, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/accessory/armband/hydro, +/obj/item/clothing/under/utility, +/obj/item/clothing/under/utility/blue, +/obj/item/clothing/under/utility/grey, +/obj/item/clothing/shoes/boots/winter, +/obj/item/clothing/shoes/boots/duty, +/obj/item/device/communicator, +/obj/item/weapon/storage/backpack/messenger/hyd, +/obj/item/device/radio/headset{ + adhoc_fallback = 1; + desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; + name = "dauntless headset" + }, +/obj/item/clothing/suit/storage/hooded/wintercoat/hydro, +/obj/item/clothing/suit/chef, +/obj/item/clothing/suit/chef/classic, +/obj/item/clothing/head/chefhat, +/obj/item/clothing/suit/storage/solgov/service/army/service, +/obj/item/weapon/card/id/itg/event/service, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/itglight/metingroom) +"ah" = ( +/obj/structure/closet/walllocker_double{ + dir = 8; + name = "Engineer's Cabinet"; + pixel_x = -27 + }, +/obj/item/clothing/under/tactical, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/accessory/armband/engine, +/obj/item/clothing/under/utility, +/obj/item/clothing/under/utility/blue, +/obj/item/clothing/under/utility/grey, +/obj/item/clothing/shoes/boots/winter, +/obj/item/clothing/shoes/boots/duty, +/obj/item/device/communicator, +/obj/item/weapon/storage/backpack/messenger/engi, +/obj/item/device/radio/headset{ + adhoc_fallback = 1; + desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; + name = "dauntless headset" + }, +/obj/item/clothing/suit/storage/hooded/wintercoat/engineering, +/obj/item/taperoll/engineering, +/obj/item/clothing/suit/storage/solgov/service/army/engineering, +/obj/item/weapon/card/id/itg/event/engineer, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/itglight/metingroom) +"ai" = ( +/obj/structure/closet/walllocker_double{ + dir = 8; + name = "Medic's Cabinet"; + pixel_x = -27 + }, +/obj/item/clothing/under/tactical, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/accessory/armband/med/cross, +/obj/item/clothing/under/utility, +/obj/item/clothing/under/utility/blue, +/obj/item/clothing/under/utility/grey, +/obj/item/clothing/shoes/boots/winter, +/obj/item/clothing/shoes/boots/duty, +/obj/item/device/communicator, +/obj/item/weapon/storage/backpack/messenger/med, +/obj/item/device/radio/headset{ + adhoc_fallback = 1; + desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; + name = "dauntless headset" + }, +/obj/item/clothing/suit/storage/hooded/wintercoat/medical, +/obj/item/clothing/suit/storage/solgov/service/army/medical, +/obj/item/weapon/card/id/itg/event/medical, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/itglight/metingroom) +"aj" = ( +/obj/structure/closet/walllocker_double{ + dir = 8; + name = "Security's Cabinet"; + pixel_x = -27 + }, +/obj/item/clothing/under/tactical, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/accessory/armband, +/obj/item/clothing/under/utility, +/obj/item/clothing/under/utility/blue, +/obj/item/clothing/under/utility/grey, +/obj/item/clothing/shoes/boots/winter, +/obj/item/clothing/shoes/boots/duty, +/obj/item/device/communicator, +/obj/item/weapon/storage/backpack/messenger/sec, +/obj/item/device/radio/headset{ + adhoc_fallback = 1; + desc = "An updated, modular intercom that fits over the head. Takes encryption keys, also works as a shortwave radio."; + name = "dauntless headset" + }, +/obj/item/clothing/suit/storage/hooded/wintercoat/security, +/obj/item/clothing/suit/storage/trench, +/obj/item/clothing/suit/storage/solgov/service/army/security, +/obj/item/weapon/card/id/itg/event/security, +/obj/item/clothing/accessory/holster/hip, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/itglight/metingroom) "ak" = ( /obj/structure/bed/double/padded, /obj/item/weapon/bedsheet/browndouble, @@ -39,6 +188,7 @@ /obj/structure/bed/chair/bay/chair/padded/brown{ dir = 4 }, +/obj/item/device/flash, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/itglight/cockpit) "as" = ( @@ -147,6 +297,24 @@ }, /turf/simulated/floor/carpet, /area/itglight/readyroom) +"bk" = ( +/obj/structure/cable/pink{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/button/remote/airlock{ + id = "dauntlesspassengeraccessbolts"; + name = "Door Bolts"; + pixel_x = 32; + pixel_y = -32; + req_access = list(777); + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/itglight/forehall) "bn" = ( /obj/machinery/chem_master/condimaster, /turf/simulated/floor/tiled/eris/cafe, @@ -230,6 +398,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/pink{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/wood, /area/itglight/captain) "bF" = ( @@ -381,16 +554,6 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/itglight/kitchen) -"cB" = ( -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - pixel_y = -25 - }, -/obj/structure/cable/pink, -/obj/structure/table/wooden_reinforced, -/obj/item/weapon/paper/dockingcodes, -/turf/simulated/floor/carpet/sblucarpet, -/area/itglight/captain) "cM" = ( /obj/structure/cable/pink{ d1 = 2; @@ -403,6 +566,11 @@ /obj/structure/bed/chair/bay/chair/padded/brown{ dir = 8 }, +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + pixel_y = -25 + }, +/obj/structure/cable/pink, /turf/simulated/floor/wood, /area/itglight/captain) "cU" = ( @@ -520,6 +688,16 @@ "dE" = ( /turf/simulated/floor/reinforced, /area/itglight/shuttlebay) +"dO" = ( +/obj/structure/bed/chair/bay/chair/padded/brown{ + dir = 8 + }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 25 + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/itglight/metingroom) "dP" = ( /obj/structure/cable/pink{ d1 = 4; @@ -770,6 +948,10 @@ /area/itglight/cockpit) "fc" = ( /obj/machinery/chem_master, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = -25 + }, /turf/simulated/floor/tiled/eris/white/cargo, /area/itglight/medbay) "fe" = ( @@ -790,18 +972,6 @@ /obj/random/multiple/large_corp_crate, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/porthighsec) -"fv" = ( -/obj/machinery/power/apc/hyper{ - alarms_hidden = 1; - dir = 8; - pixel_x = -25 - }, -/obj/structure/cable/pink{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/itglight/metingroom) "fz" = ( /obj/machinery/light{ dir = 4 @@ -928,11 +1098,6 @@ /turf/simulated/floor/tiled/eris/white/cargo, /area/itglight/medbay) "gu" = ( -/obj/structure/cable/pink{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/structure/cable/pink{ d1 = 4; d2 = 8; @@ -1001,6 +1166,10 @@ /area/itglight/captain) "gS" = ( /obj/structure/bed/chair/sofa/brown/right, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = 25 + }, /turf/simulated/floor/wood, /area/itglight/captain) "gW" = ( @@ -1034,12 +1203,24 @@ /turf/simulated/floor/wood, /area/itglight/captain) "hc" = ( -/obj/machinery/alarm/alarms_hidden{ - dir = 8; - pixel_x = 26 +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "itglight_dock_1"; + name = "port exterior access button"; + pixel_x = -6; + pixel_y = 65 }, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/itglight/metingroom) +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "itglight_dock_2"; + name = "starboard exterior access button"; + pixel_x = 4; + pixel_y = 65 + }, +/turf/simulated/floor/tiled/eris/dark/gray_platform, +/area/itglight/cockpit) "hi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -1098,6 +1279,10 @@ /obj/structure/bed/chair/bay/chair/padded/brown{ dir = 8 }, +/obj/machinery/alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/metingroom) "hw" = ( @@ -1214,25 +1399,6 @@ }, /turf/simulated/floor, /area/itglight/medbay) -"if" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/pink{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/mining{ - name = "Captain's Quarters"; - req_one_access = list(777) - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/itglight/captain) "ih" = ( /obj/structure/cable{ d2 = 8; @@ -1466,6 +1632,15 @@ /obj/item/weapon/gun/energy/taser, /obj/item/weapon/gun/energy/taser, /obj/item/device/assembly/prox_sensor, +/obj/item/clothing/suit/armor/vest, +/obj/item/clothing/suit/armor/vest, +/obj/item/clothing/suit/armor/vest, +/obj/item/clothing/suit/armor/vest, +/obj/item/clothing/suit/armor/vest, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = -25 + }, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardhighsec) "jj" = ( @@ -1480,6 +1655,7 @@ /obj/structure/bed/chair/bay/chair/padded/brown{ dir = 8 }, +/obj/item/device/flash, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/itglight/cockpit) "jo" = ( @@ -1501,6 +1677,9 @@ dir = 8; icon_state = "map-supply" }, +/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen, +/obj/structure/table/rack/steel, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardhighsec) "jE" = ( @@ -1518,6 +1697,14 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/itglight/kitchen) +"jG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = -25 + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/itglight/shuttlebay) "jL" = ( /obj/structure/table/rack/shelf/steel, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -1557,7 +1744,8 @@ icon_state = "door_locked"; id_tag = "itglight_shuttle_port"; locked = 1; - name = "Shuttle Hatch" + name = "Shuttle Hatch"; + req_one_access = list() }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/itglightshuttle) @@ -1574,6 +1762,14 @@ /obj/machinery/light, /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/itglight/cockpit) +"ko" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 25 + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/itglight/shuttlebay) "kp" = ( /obj/structure/cable/pink{ d1 = 1; @@ -1587,8 +1783,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box/sinpockets, +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/itglight/cockpit) "ky" = ( @@ -1598,11 +1795,14 @@ pixel_y = -25 }, /obj/structure/cable/pink, -/obj/structure/table/steel_reinforced, /obj/item/device/radio, /obj/structure/closet/autolok_wall{ pixel_x = 32 }, +/obj/item/device/flash, +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/itglight/cockpit) "kH" = ( @@ -1837,6 +2037,12 @@ /obj/item/weapon/reagent_containers/glass/bucket, /obj/item/device/analyzer/plant_analyzer, /obj/item/device/analyzer/plant_analyzer, +/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, +/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3 + }, /turf/simulated/floor/tiled/eris/cafe, /area/itglight/kitchen) "lR" = ( @@ -1910,6 +2116,15 @@ }, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardhighsec) +"ms" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/pink{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/itglight/metingroom) "mu" = ( /obj/structure/cable{ d1 = 1; @@ -1993,6 +2208,22 @@ "nh" = ( /turf/simulated/wall/shull, /area/itglight/forehall) +"nl" = ( +/obj/structure/closet/walllocker_double{ + pixel_y = 27 + }, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/itglight/metingroom) "nq" = ( /obj/structure/cable/pink{ d1 = 1; @@ -2863,6 +3094,15 @@ /obj/item/weapon/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/eris/white/techfloor_grid, /area/itglight/medbay) +"tz" = ( +/obj/machinery/button/remote/airlock{ + id = "dauntlessstarboardcargobolts"; + name = "Door Bolts"; + req_access = list(777); + specialfunctions = 4 + }, +/turf/simulated/wall/shull, +/area/itglight/starboardcargo) "tC" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -3101,6 +3341,12 @@ }, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/shuttlebay) +"vR" = ( +/obj/machinery/newscaster{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/itglight/metingroom) "vX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -3162,6 +3408,13 @@ }, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardcargo) +"ww" = ( +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 25 + }, +/turf/simulated/floor/tiled/eris/steel/gray_platform, +/area/itglight/porthighsec) "wy" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -3175,6 +3428,34 @@ }, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardhighsec) +"wA" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/pink{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/pink{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/pink{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = 25 + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/itglight/afthall) "wD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3231,6 +3512,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/mining{ + id_tag = "dauntlesspassengeraccessbolts"; name = "Cargo Access"; req_one_access = list(777) }, @@ -3338,6 +3620,16 @@ }, /turf/simulated/floor/tiled/eris/white/cargo, /area/itglight/medbay) +"xp" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 25 + }, +/turf/simulated/floor/tiled/monotile, +/area/itglight/forehall) "xr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3349,7 +3641,9 @@ /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardcargo) "xw" = ( -/obj/structure/closet/secure_closet/personal, +/obj/structure/closet/secure_closet/personal{ + req_access = list(778) + }, /obj/item/device/radio, /obj/random/drinksoft, /obj/random/contraband/nofail, @@ -3360,6 +3654,34 @@ }, /obj/item/clothing/suit/space/void/captain, /obj/item/clothing/head/helmet/space/void/captain, +/obj/item/weapon/card/id/itg/event, +/obj/item/weapon/card/id/itg/event, +/obj/item/weapon/card/id/itg/event, +/obj/item/weapon/card/id/itg/event, +/obj/item/weapon/card/id/itg/event, +/obj/item/weapon/card/id/itg/event/passengerliason, +/obj/item/weapon/card/id/itg/event/pilot, +/obj/item/weapon/card/id/itg/event/research, +/obj/item/weapon/card/id/itg/event/research, +/obj/item/weapon/card/id/itg/event/security, +/obj/item/weapon/card/id/itg/event/service, +/obj/item/weapon/card/id/itg/event/engineer, +/obj/item/weapon/card/id/itg/event/engineer, +/obj/item/weapon/card/id/itg/event/medical, +/obj/item/weapon/card/id/itg/event/medical, +/obj/item/clothing/suit/storage/hooded/wintercoat/cargo{ + name = "dauntless winter coat" + }, +/obj/item/clothing/suit/pirate{ + desc = "The Captain's coat!"; + name = "captain's coat" + }, +/obj/item/clothing/suit/storage/solgov/service/army/command, +/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, +/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, +/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, +/obj/item/weapon/gun/energy/taser, +/obj/item/clothing/accessory/holster/hip, /turf/simulated/floor/carpet/sblucarpet, /area/itglight/captain) "xx" = ( @@ -4086,7 +4408,8 @@ frequency = 1380; icon_state = "door_locked"; id_tag = "itglight_dock_1_outer"; - locked = 1 + locked = 1; + name = "Port External Airlock" }, /obj/structure/cable/pink{ d1 = 4; @@ -4150,6 +4473,14 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/itglight/portdocking) +"Ct" = ( +/obj/item/weapon/stool/baystool/padded, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = 25 + }, +/turf/simulated/floor/tiled/eris/cafe, +/area/itglight/kitchen) "Cy" = ( /obj/machinery/meter{ frequency = 1443; @@ -4383,6 +4714,7 @@ dir = 4 }, /obj/machinery/door/airlock/glass_mining{ + id_tag = "dauntlessportcargobolts"; name = "Port Cargo Access"; req_one_access = list(777) }, @@ -4398,6 +4730,15 @@ }, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/portcargo) +"DI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + pixel_y = -25 + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/itglight/metingroom) "DJ" = ( /obj/structure/cable/pink{ d1 = 4; @@ -4472,6 +4813,7 @@ dir = 4 }, /obj/machinery/door/airlock/glass_mining{ + id_tag = "dauntlessstarboardcargobolts"; name = "Starboard Cargo Access"; req_one_access = list(777) }, @@ -4746,7 +5088,8 @@ frequency = 1380; icon_state = "door_locked"; id_tag = "itglight_dock_2_outer"; - locked = 1 + locked = 1; + name = "Starboard External Airlock" }, /obj/structure/cable/pink{ d1 = 4; @@ -5130,6 +5473,15 @@ }, /turf/space, /area/itglight/starboardengi) +"Hi" = ( +/obj/machinery/button/remote/airlock{ + id = "dauntlessportcargobolts"; + name = "Door Bolts"; + req_access = list(777); + specialfunctions = 4 + }, +/turf/simulated/wall/shull, +/area/itglight/portcargo) "Hj" = ( /turf/simulated/floor/tiled/eris/white/techfloor_grid, /area/itglight/medbay) @@ -5432,7 +5784,8 @@ }, /obj/machinery/door/airlock/glass_external{ frequency = 1380; - id_tag = "itglight_starboard_outer" + id_tag = "itglight_starboard_outer"; + name = "Starboard Solars External Airlock" }, /obj/effect/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ @@ -6368,9 +6721,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/mining{ + id_tag = "dauntlessshuttlbaybolts"; name = "Shuttle Bay"; req_one_access = list(777) }, +/obj/machinery/button/remote/airlock{ + id = "dauntlessshuttlbaybolts"; + name = "Door Bolts"; + pixel_x = 32; + req_access = list(777); + specialfunctions = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/itglight/shuttlebay) "OF" = ( @@ -6554,6 +6915,21 @@ }, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/common) +"Qh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/power/apc/hyper{ + alarms_hidden = 1; + dir = 1; + pixel_y = 25 + }, +/obj/structure/cable/pink{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/itglight/metingroom) "Qi" = ( /turf/simulated/wall/shull, /area/itglight/showers) @@ -6990,6 +7366,9 @@ dir = 8 }, /obj/machinery/recharger, +/obj/item/device/radio/intercom{ + pixel_y = -25 + }, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/common) "SL" = ( @@ -7193,17 +7572,6 @@ "Uw" = ( /turf/simulated/wall/shull, /area/itglight/medbay) -"UE" = ( -/obj/structure/bed/chair/bay/chair/padded/red/bignest{ - name = "large dog bed" - }, -/mob/living/simple_mob/vore/woof/cass, -/obj/machinery/alarm/alarms_hidden{ - dir = 4; - pixel_x = -26 - }, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/itglight/common) "UF" = ( /turf/simulated/floor/carpet/sblucarpet, /area/itglight/common) @@ -7344,6 +7712,13 @@ }, /turf/simulated/floor, /area/itglight/starboardengi) +"Vz" = ( +/obj/machinery/newscaster{ + pixel_x = -12; + pixel_y = -26 + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/itglight/common) "VB" = ( /obj/machinery/light{ dir = 1 @@ -7546,7 +7921,8 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_external{ frequency = 1380; - id_tag = "itglight_port_outer" + id_tag = "itglight_port_outer"; + name = "Port Solars External Airlock" }, /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -8148,6 +8524,13 @@ /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, +/obj/structure/closet/crate/bin{ + anchored = 1; + density = 0; + name = "trash bin"; + pixel_x = -10; + pixel_y = 11 + }, /turf/simulated/floor/tiled/eris/white/cargo, /area/itglight/medbay) "ZQ" = ( @@ -16788,7 +17171,7 @@ Tm Gv WN Np -Zp +Ct cx Zp fE @@ -17035,12 +17418,12 @@ Lr gO ay gu -cB +af XQ pm zR zR -zR +ww jo wk ZN @@ -17083,7 +17466,7 @@ En ZQ Zr PM -yO +jG yO iC Gp @@ -17322,10 +17705,10 @@ bF cY XQ ew -fv -vf -vf -vf +ag +ah +ai +aj wy ZN oU @@ -17460,15 +17843,15 @@ hF Lr XQ XQ -if +aa XQ XQ -rZ -fP +Qh +ms ul ul ul -wD +DI ZN yD AU @@ -17619,7 +18002,7 @@ sx sx Eg ZN -ZN +Hi DF ZN ZN @@ -17635,7 +18018,7 @@ MA MY Ow Qa -UE +ab WE Xu TE @@ -17920,7 +18303,7 @@ Nn Sh UF UF -Ji +Vz Xu Ud YT @@ -18054,7 +18437,7 @@ LG tP LG LG -LG +bk wL LZ ME @@ -18169,7 +18552,7 @@ bT hF hF hC -aY +hc it kp lu @@ -18331,7 +18714,7 @@ Nm Nm AJ Iu -GP +xp Nm Nm LO @@ -18471,7 +18854,7 @@ kR kR wS Nm -Nm +tz DQ Nm Nm @@ -18495,7 +18878,7 @@ Zf UL YM Qi -uf +wA Ga Nc Gc @@ -18599,7 +18982,7 @@ VU iJ VU VU -vf +vR oz qN qN @@ -18741,10 +19124,10 @@ Tp cb dC VU +nl vf -hc -hs hs +dO vf qB Nm @@ -19071,7 +19454,7 @@ cp vI Zr WS -Gp +ko Gp Gu yO diff --git a/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm b/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm index 418b6a416ac..0b52c12bc09 100644 --- a/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm +++ b/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm @@ -74,8 +74,6 @@ /area/shuttle/mackerel_lc_wreck) "cD" = ( /obj/effect/floor_decal/industrial/warning, -/obj/item/weapon/bone/skull, -/obj/item/clothing/head/helmet/space/void/refurb/pilot, /obj/item/weapon/material/shard/shrapnel, /obj/item/weapon/material/shard/shrapnel, /turf/simulated/floor/tiled/techmaint/airless, @@ -616,6 +614,10 @@ /obj/machinery/door/airlock/hatch, /turf/simulated/floor/tiled/techmaint, /area/shuttle/mackerel_lc_wreck) +"Iu" = ( +/obj/structure/prop/blackbox/mackerel_wreck, +/turf/simulated/floor/airless, +/area/shuttle/mackerel_lc_wreck) "Jq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -890,9 +892,8 @@ /turf/simulated/floor/airless, /area/shuttle/mackerel_lc_wreck) "Zp" = ( -/obj/item/weapon/bone/ribs, -/obj/item/clothing/suit/space/void/refurb/pilot, /obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpse/vintage/pilot, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/mackerel_lc_wreck) "ZJ" = ( @@ -1061,7 +1062,7 @@ ka ka tV ka -WP +ka WP WP "} @@ -1085,10 +1086,10 @@ fL JG kU dG +Iu ka WP WP -WP "} (8,1,1) = {" WP @@ -1235,10 +1236,10 @@ zo KZ rQ dG +oq ka WP WP -WP "} (14,1,1) = {" WP @@ -1261,7 +1262,7 @@ ka ka tV ka -WP +ka BB WP "} diff --git a/maps/offmap_vr/om_ships/salamander_wreck.dmm b/maps/offmap_vr/om_ships/salamander_wreck.dmm index 537f37aeb19..d1b9c38c848 100644 --- a/maps/offmap_vr/om_ships/salamander_wreck.dmm +++ b/maps/offmap_vr/om_ships/salamander_wreck.dmm @@ -448,6 +448,10 @@ }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_cockpit) +"gx" = ( +/obj/structure/prop/blackbox/salamander_wreck, +/turf/simulated/floor/plating, +/area/shuttle/salamander_wreck) "gC" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor{ @@ -2322,7 +2326,7 @@ ON mO VT Vs -qQ +gx VT WP "} diff --git a/maps/offmap_vr/talon/talon1.dmm b/maps/offmap_vr/talon/talon1.dmm index b194f0220a9..ba71141c7db 100644 --- a/maps/offmap_vr/talon/talon1.dmm +++ b/maps/offmap_vr/talon/talon1.dmm @@ -118,14 +118,14 @@ /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/deckone_port) "an" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/white/golden, /area/talon/deckone/bridge) "ao" = ( @@ -324,7 +324,7 @@ /obj/structure/handrail{ dir = 8 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port_fore_wing) "aH" = ( /obj/structure/catwalk, @@ -334,14 +334,14 @@ /obj/structure/handrail{ dir = 4 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard_fore_wing) "aI" = ( /obj/structure/catwalk, /obj/structure/sign/warning/moving_parts{ pixel_x = 30 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port_fore_wing) "aJ" = ( /obj/structure/table/rack/shelf/steel, @@ -407,7 +407,7 @@ /obj/structure/sign/warning/moving_parts{ pixel_x = -30 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard_fore_wing) "aT" = ( /obj/structure/catwalk, @@ -416,7 +416,7 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port_fore_wing) "aU" = ( /obj/structure/catwalk, @@ -424,7 +424,7 @@ dir = 1; icon_state = "4-8" }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard_fore_wing) "aV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux, @@ -456,34 +456,25 @@ /area/talon/deckone/armory) "aZ" = ( /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port_fore_wing) "ba" = ( /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard_fore_wing) -"bb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/structure/closet/hydrant{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/eris/dark/cyancorner, -/area/talon/deckone/bridge) "bc" = ( /obj/structure/catwalk, /obj/structure/handrail{ dir = 8 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port_aft_wing) "bd" = ( /obj/structure/catwalk, /obj/structure/handrail{ dir = 4 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard_aft_wing) "be" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -535,7 +526,7 @@ /area/talon/deckone/medical) "bi" = ( /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port_aft_wing) "bj" = ( /obj/structure/window/reinforced, @@ -550,7 +541,7 @@ /area/talon/maintenance/deckone_starboard) "bl" = ( /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard_aft_wing) "bm" = ( /obj/structure/catwalk, @@ -559,7 +550,7 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port_aft_wing) "bn" = ( /obj/structure/catwalk, @@ -568,21 +559,21 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard_aft_wing) "bo" = ( /obj/machinery/light/small{ dir = 4 }, /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port) "bp" = ( /obj/machinery/light/small{ dir = 8 }, /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard) "bq" = ( /obj/machinery/airlock_sensor{ @@ -676,7 +667,7 @@ }, /obj/effect/map_helper/airlock/sensor/ext_sensor, /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port) "by" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -705,7 +696,7 @@ }, /obj/effect/map_helper/airlock/sensor/ext_sensor, /obj/structure/catwalk, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard) "bA" = ( /obj/structure/catwalk, @@ -715,7 +706,7 @@ /obj/machinery/camera/network/talon{ dir = 8 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_port) "bB" = ( /obj/structure/catwalk, @@ -725,7 +716,7 @@ /obj/machinery/camera/network/talon{ dir = 4 }, -/turf/simulated/floor/plating/eris/under, +/turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard) "bC" = ( /obj/structure/catwalk, @@ -739,6 +730,9 @@ /obj/structure/closet/autolok_wall{ pixel_y = -24 }, +/obj/structure/closet/hydrant{ + pixel_x = -26 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "bE" = ( @@ -798,12 +792,7 @@ /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/central_hallway) "bI" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/closet/hydrant{ - pixel_y = 32 - }, +/obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "bJ" = ( @@ -958,6 +947,9 @@ id = "talon_sensor"; name = "sensor blast shields" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "bX" = ( @@ -1929,6 +1921,9 @@ /area/talon/deckone/starboard_eng) "hQ" = ( /obj/structure/table/steel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "id" = ( @@ -2525,9 +2520,13 @@ /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/deckone_starboard) "nT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/emblem/talon, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled/eris/white/golden, /area/talon/deckone/bridge) "nW" = ( @@ -2699,6 +2698,9 @@ /obj/structure/closet/autolok_wall{ pixel_y = -24 }, +/obj/structure/closet/hydrant{ + pixel_x = 26 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "pJ" = ( @@ -4075,9 +4077,6 @@ /obj/machinery/computer/ship/helm{ req_one_access = list(301) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "Gb" = ( @@ -4248,9 +4247,6 @@ /area/talon/deckone/bridge_hallway) "HW" = ( /obj/machinery/computer/ship/sensors, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "Id" = ( @@ -5140,13 +5136,11 @@ /turf/simulated/floor/hull/airless, /area/talon/maintenance/deckone_starboard_aft_wing) "RS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, +/obj/structure/table/steel, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "RV" = ( /obj/structure/cable/green{ @@ -5418,6 +5412,9 @@ id = "talon_windows"; name = "window blast shields" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "UC" = ( @@ -15410,7 +15407,7 @@ aa af ab ac -bb +bI Nz bW tw @@ -15694,11 +15691,11 @@ aa ag ae al +ao +ao an ao ao -ao -ao as ac KP @@ -15836,8 +15833,8 @@ aa aa ai IM -RS -on +LH +LH nT on uy @@ -15978,10 +15975,10 @@ aa aa ai IM +LH +LH wm LH -LH -LH cC zy ac @@ -16122,7 +16119,7 @@ ab ac HW oS -hQ +RS Os VU YT diff --git a/maps/southern_cross/items/encryptionkey_sc.dm b/maps/southern_cross/items/encryptionkey_sc.dm index c84fe0f0ca5..3e02f2fc089 100644 --- a/maps/southern_cross/items/encryptionkey_sc.dm +++ b/maps/southern_cross/items/encryptionkey_sc.dm @@ -6,7 +6,7 @@ /obj/item/device/encryptionkey/explorer name = "explorer radio encryption key" icon_state = "com_cypherkey" - channels = list("Explorer" = 1) + channels = list("Explorer" = 1, "Science" = 1) /obj/item/device/encryptionkey/sar name = "sar's encryption key" diff --git a/maps/southern_cross/southern_cross_jobs.dm b/maps/southern_cross/southern_cross_jobs.dm index 9d7988dd220..0903a3ac3dc 100644 --- a/maps/southern_cross/southern_cross_jobs.dm +++ b/maps/southern_cross/southern_cross_jobs.dm @@ -75,16 +75,16 @@ var/const/access_explorer = 43 /datum/job/explorer title = "Explorer" flag = EXPLORER - departments = list(DEPARTMENT_PLANET) - department_flag = CIVILIAN + departments = list(DEPARTMENT_RESEARCH, DEPARTMENT_PLANET) + department_flag = MEDSCI faction = "Station" total_positions = 4 spawn_positions = 4 - supervisors = "the Head of Personnel" - selection_color = "#515151" + supervisors = "the Research Director" + selection_color = "#633D63" economic_modifier = 4 - access = list(access_explorer) - minimal_access = list(access_explorer) + access = list(access_explorer, access_research) + minimal_access = list(access_explorer, access_research) outfit_type = /decl/hierarchy/outfit/job/explorer2 job_description = "An Explorer searches for interesting things on the surface of Sif, and returns them to the station." diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index 350005bbbcf..0081799cc32 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -5270,25 +5270,13 @@ /area/ship/ert/atmos) "Lq" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "LA" = ( @@ -5601,6 +5589,7 @@ "NI" = ( /obj/structure/table/rack, /obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid, +/obj/item/weapon/storage/belt/explorer/pathfinder, /turf/simulated/floor/wood, /area/ship/ert/commander) "NJ" = ( @@ -6757,7 +6746,7 @@ /turf/simulated/floor/wood, /area/ship/ert/commander) "Wd" = ( -/obj/machinery/telecomms/relay/preset/centcom/tether, +/obj/machinery/telecomms/relay, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "Wj" = ( diff --git a/maps/submaps/admin_use_vr/fun.dm b/maps/submaps/admin_use_vr/fun.dm index f618e7c3708..7144ae50d9b 100644 --- a/maps/submaps/admin_use_vr/fun.dm +++ b/maps/submaps/admin_use_vr/fun.dm @@ -152,8 +152,43 @@ power_environ = FALSE power_light = FALSE +/area/submap/admin_upload/lo + name = "\improper Unknown Area AA" + requires_power = 1 + dynamic_lighting = 1 + lightswitch = 0 + power_equip = FALSE + power_environ = FALSE + power_light = FALSE + +/area/submap/admin_upload/lo/one + name = "\improper Unknown Area AB" + +/area/submap/admin_upload/lo/two + name = "\improper Unknown Area AC" +/area/submap/admin_upload/lo/three + name = "\improper Unknown Area AD" + +/area/submap/admin_upload/lo/four + name = "\improper Unknown Area AE" + +/area/submap/admin_upload/lo/pow + name = "\improper Unknown Area AF" + requires_power = 0 + +/area/submap/admin_upload/lo/pow/one + name = "\improper Unknown Area AG" + +/area/submap/admin_upload/lo/pow/two + name = "\improper Unknown Area AH" + +/area/submap/admin_upload/lo/pow/three + name = "\improper Unknown Area AI" + +/area/submap/admin_upload/lo/pow/four + name = "\improper Unknown Area AJ" // Adminbuse things for overmap sectors diff --git a/maps/submaps/admin_use_vr/kk_mercship.dmm b/maps/submaps/admin_use_vr/kk_mercship.dmm index bb3ee7cabe8..b5279064be9 100644 --- a/maps/submaps/admin_use_vr/kk_mercship.dmm +++ b/maps/submaps/admin_use_vr/kk_mercship.dmm @@ -164,9 +164,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "aM" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -174,6 +171,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "aN" = ( @@ -255,9 +255,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "bc" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 2; d2 = 8; @@ -268,8 +265,17 @@ d2 = 4; icon_state = "2-4" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) +"bd" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/armoury_st) "bg" = ( /turf/space, /turf/space, @@ -337,7 +343,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "br" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 2; d2 = 4; @@ -350,6 +355,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "bt" = ( @@ -390,9 +398,15 @@ dir = 1 }, /obj/machinery/appliance/cooker/fryer, -/obj/effect/floor_decal/corner/black, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) +"by" = ( +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/armoury_st) "bA" = ( /obj/structure/closet/cabinet{ name = "Clothing Storage" @@ -648,9 +662,6 @@ /turf/simulated/floor/reinforced, /area/ship/manta/med) "cK" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -658,6 +669,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "cM" = ( @@ -719,9 +733,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "cX" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 8; @@ -731,6 +742,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "cY" = ( @@ -758,12 +772,12 @@ icon_state = "1-2" }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/dock_star) "da" = ( @@ -861,10 +875,10 @@ /turf/simulated/floor/wood, /area/ship/manta/barracks) "dH" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/structure/flora/pottedplant/minitree, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "dI" = ( @@ -929,12 +943,14 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/manta/bridge) "dZ" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "ec" = ( @@ -998,7 +1014,9 @@ /turf/simulated/floor/tiled/white, /area/ship/manta/med) "er" = ( -/obj/effect/floor_decal/techfloor/corner, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "et" = ( @@ -1012,8 +1030,8 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/effect/floor_decal/corner/black, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "eB" = ( /obj/machinery/chemical_dispenser/ert, @@ -1261,7 +1279,7 @@ /area/ship/manta/teleporter) "fU" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled/white, /area/ship/manta/med) @@ -1308,7 +1326,7 @@ /area/ship/manta/barracks/bed_1) "gf" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 8 + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) @@ -1608,12 +1626,12 @@ /turf/simulated/floor/wood, /area/ship/manta/barracks) "hD" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "hH" = ( @@ -1640,12 +1658,12 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "hS" = ( @@ -1796,10 +1814,10 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "it" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "iu" = ( @@ -1807,8 +1825,8 @@ dir = 1 }, /obj/machinery/appliance/cooker/oven, -/obj/effect/floor_decal/corner/black, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "iv" = ( /obj/machinery/atmospherics/portables_connector/fuel{ @@ -1855,7 +1873,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/chicken, /obj/item/weapon/reagent_containers/food/snacks/meat/chicken, /obj/item/weapon/reagent_containers/food/snacks/meat/chicken, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "iB" = ( /obj/effect/floor_decal/techfloor{ @@ -2106,38 +2124,33 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "jz" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/black, -/obj/effect/floor_decal/corner/black{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "jB" = ( -/obj/effect/floor_decal/corner/black, -/obj/effect/floor_decal/corner/black{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "jD" = ( -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, +/obj/effect/floor_decal/corner/white{ dir = 1 }, -/obj/effect/floor_decal/corner/black, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/corner, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "jE" = ( /obj/machinery/door/blast/regular{ @@ -2162,25 +2175,25 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "jI" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "jP" = ( @@ -2197,9 +2210,6 @@ icon_state = "4-8" }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -2210,6 +2220,9 @@ dir = 1; pixel_y = -23 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "jW" = ( @@ -2286,7 +2299,7 @@ dir = 10 }, /obj/machinery/appliance/cooker/grill, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "kF" = ( /obj/structure/table/steel_reinforced, @@ -2310,10 +2323,10 @@ pixel_y = 8 }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/white{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "kJ" = ( /obj/machinery/vending/food{ @@ -2322,15 +2335,12 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/white{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "kL" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/effect/floor_decal/techfloor{ dir = 10 }, @@ -2345,6 +2355,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "kO" = ( @@ -2368,7 +2381,6 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 2; d2 = 4; @@ -2380,6 +2392,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "lg" = ( @@ -2482,15 +2497,15 @@ icon_state = "4-8" }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "lG" = ( @@ -2711,6 +2726,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "mG" = ( @@ -2810,9 +2828,6 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/light/no_nightshift{ dir = 4 }, @@ -2827,6 +2842,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "nl" = ( @@ -2948,14 +2966,14 @@ /turf/simulated/floor/plating, /area/ship/manta/dock_port) "nP" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "nS" = ( @@ -2975,12 +2993,6 @@ pixel_y = -24; req_access = list(150) }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/effect/floor_decal/techfloor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -2988,6 +3000,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "nY" = ( @@ -3053,9 +3071,6 @@ /turf/simulated/floor/reinforced/airless, /area/ship/manta/radiator_star) "oi" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -3070,6 +3085,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "om" = ( @@ -3181,10 +3199,10 @@ dir = 4 }, /obj/effect/floor_decal/techfloor/corner{ - dir = 8 + dir = 10 }, /obj/effect/floor_decal/techfloor/corner{ - dir = 1 + dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) @@ -3241,10 +3259,10 @@ pixel_y = 8 }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/white{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "oT" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -3257,9 +3275,6 @@ /area/ship/manta/radiator_port) "oU" = ( /obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/engineering{ - req_one_access = list(150) - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -3271,6 +3286,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/airlock/engineering{ + name = "Radiator Array"; + req_one_access = list(150) + }, /turf/simulated/floor/plating, /area/ship/manta/radiator_star) "oW" = ( @@ -3380,12 +3399,12 @@ icon_state = "1-2" }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/dock_port) "pS" = ( @@ -3517,14 +3536,16 @@ /area/ship/manta/med) "qz" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 8 + dir = 10 }, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "qA" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "qB" = ( @@ -3626,12 +3647,14 @@ /turf/simulated/floor/tiled/white, /area/ship/manta/med) "rb" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "rl" = ( @@ -3661,7 +3684,7 @@ /area/ship/manta/radiator_port) "rq" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 1 + dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) @@ -3935,13 +3958,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "sV" = ( @@ -4003,7 +4026,9 @@ /turf/simulated/floor/wood, /area/ship/manta/barracks) "tm" = ( -/obj/effect/floor_decal/techfloor/corner, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "tp" = ( @@ -4108,7 +4133,7 @@ /area/ship/manta/recreation) "tQ" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 1 + dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) @@ -4126,14 +4151,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "ua" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "ub" = ( @@ -4264,7 +4289,7 @@ /area/ship/manta/hangar) "uE" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) @@ -4283,17 +4308,28 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "uK" = ( +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/effect/floor_decal/techfloor/corner{ - dir = 1 + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "uM" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "uN" = ( @@ -4325,14 +4361,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "uS" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "uT" = ( @@ -4560,7 +4596,6 @@ /turf/simulated/floor/plating, /area/ship/manta/engine) "vU" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 2; d2 = 4; @@ -4572,6 +4607,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "vV" = ( @@ -4606,10 +4644,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "wb" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -4626,6 +4660,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "wc" = ( @@ -4652,7 +4692,7 @@ /area/ship/manta/armoury_st) "wd" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) @@ -4661,9 +4701,6 @@ /turf/simulated/floor/plating, /area/ship/manta/radiator_star) "wi" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -4675,6 +4712,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wl" = ( @@ -4715,7 +4755,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wp" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -4727,6 +4766,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wt" = ( @@ -4772,9 +4814,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wy" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -4786,6 +4825,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wC" = ( @@ -4832,12 +4874,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wP" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "wQ" = ( @@ -4864,14 +4908,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "wX" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "wZ" = ( @@ -4896,7 +4940,7 @@ icon_state = "1-2" }, /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) @@ -5039,12 +5083,14 @@ /turf/simulated/floor/plating, /area/ship/manta/radiator_star) "xF" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "xG" = ( @@ -5071,6 +5117,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "xL" = ( @@ -5232,7 +5281,6 @@ /turf/simulated/floor/reinforced/airless, /area/ship/manta/dock_port) "yp" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -5249,6 +5297,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "ys" = ( @@ -5458,7 +5509,7 @@ /area/ship/manta/mech_bay) "zb" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) @@ -5481,7 +5532,7 @@ /area/ship/manta/engine) "zg" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 1 + dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) @@ -5546,10 +5597,10 @@ dir = 1 }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/corner/black{ +/obj/effect/floor_decal/corner/white{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "zp" = ( /obj/structure/cable{ @@ -5754,14 +5805,11 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/manta_ship_boat) "Aw" = ( -/obj/effect/floor_decal/corner/black, -/obj/effect/floor_decal/corner/black{ - dir = 1 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "AA" = ( /obj/machinery/atmospherics/portables_connector{ @@ -5782,9 +5830,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/effect/floor_decal/techfloor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5792,6 +5837,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "AD" = ( @@ -6058,19 +6106,18 @@ /area/ship/manta/dock_star) "Cp" = ( /obj/effect/floor_decal/rust, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Cu" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -6082,6 +6129,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "Cw" = ( @@ -6155,9 +6205,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "CK" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -6169,6 +6216,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "CP" = ( @@ -6318,12 +6368,6 @@ /turf/simulated/floor/plating, /area/ship/manta/atmos) "Dp" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -6331,6 +6375,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_as) "Dq" = ( @@ -6463,15 +6513,15 @@ /turf/simulated/floor/plating, /area/ship/manta/radiator_star) "DR" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "DY" = ( @@ -6578,11 +6628,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "EA" = ( @@ -6833,11 +6885,11 @@ pixel_y = 4 }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/corner/black{ +/obj/machinery/light/no_nightshift, +/obj/effect/floor_decal/corner/white{ dir = 1 }, -/obj/machinery/light/no_nightshift, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "Gg" = ( /obj/structure/table/woodentable, @@ -7222,15 +7274,15 @@ icon_state = "1-4" }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/teleporter) "Iq" = ( @@ -7277,16 +7329,18 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "II" = ( @@ -7396,15 +7450,15 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "Jl" = ( @@ -7554,11 +7608,8 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "JY" = ( -/obj/effect/floor_decal/corner/black, -/obj/effect/floor_decal/corner/black{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "Kc" = ( /obj/item/modular_computer/console/preset/mercenary{ @@ -7595,19 +7646,18 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "Ko" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -7615,6 +7665,9 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "Kp" = ( @@ -7764,9 +7817,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner, /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 5 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) @@ -7778,8 +7833,8 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/effect/floor_decal/corner/black, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "Ld" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -7812,6 +7867,19 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) +"Lj" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/bridge) "Lm" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/wall/rplastihull, @@ -7821,12 +7889,12 @@ dir = 1 }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Lt" = ( @@ -7917,10 +7985,6 @@ pixel_y = 25; req_access = list(150) }, -/obj/effect/floor_decal/techfloor/corner, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -7930,6 +7994,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "LU" = ( @@ -7998,15 +8068,25 @@ /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Ml" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) +"Mp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/armoury_st) "Mr" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, /turf/simulated/floor/plating, @@ -8031,12 +8111,12 @@ dir = 4 }, /obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "ME" = ( @@ -8050,14 +8130,14 @@ /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "MI" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "MM" = ( @@ -8068,10 +8148,12 @@ /turf/simulated/floor/plating, /area/ship/manta/hallways_star) "MQ" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "MU" = ( @@ -8079,12 +8161,12 @@ /turf/simulated/floor/plating, /area/ship/manta/radiator_port) "MV" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "MY" = ( @@ -8134,7 +8216,7 @@ /area/ship/manta/armoury_as) "Ne" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 8 + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) @@ -8223,14 +8305,16 @@ /area/ship/manta/armoury_st) "NA" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 8 + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "ND" = ( -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "NE" = ( @@ -8273,9 +8357,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "NK" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -8283,6 +8364,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "NM" = ( @@ -8298,7 +8382,9 @@ /turf/simulated/wall/plastihull, /area/ship/manta/barracks) "NT" = ( -/obj/effect/floor_decal/techfloor/corner, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "NV" = ( @@ -8402,9 +8488,6 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 2; d2 = 8; @@ -8419,6 +8502,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "OK" = ( @@ -8869,9 +8955,6 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -8879,6 +8962,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "Rj" = ( @@ -8888,15 +8974,15 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/effect/floor_decal/corner/black, /obj/machinery/light/no_nightshift{ dir = 1 }, -/turf/simulated/floor/tiled/white, +/obj/effect/floor_decal/corner/white, +/turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "Rq" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) @@ -9026,10 +9112,12 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "RR" = ( @@ -9200,6 +9288,7 @@ "SO" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/engineering{ + name = "Radiator Array"; req_one_access = list(150) }, /obj/structure/cable/orange{ @@ -9231,14 +9320,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "SW" = ( @@ -9369,12 +9458,18 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/ship/manta/engine) -"Tv" = ( +"Tp" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 4 + dir = 9 }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/hallways_star) +"Tv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "Tw" = ( @@ -9483,14 +9578,14 @@ /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Ua" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Ub" = ( @@ -9917,9 +10012,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "We" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 8; @@ -9927,6 +10019,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "Wi" = ( @@ -9997,6 +10092,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/multi_tile/metal{ + name = "Engineering"; req_one_access = list(150) }, /obj/effect/floor_decal/techfloor{ @@ -10105,9 +10201,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 8 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 4; @@ -10115,6 +10208,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "Xp" = ( @@ -10223,9 +10319,6 @@ /turf/simulated/wall/rplastihull, /area/ship/manta/engine) "XF" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, /obj/structure/cable/orange{ d1 = 1; d2 = 4; @@ -10238,6 +10331,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/techfloor/corner{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "XH" = ( @@ -10269,10 +10365,10 @@ icon_state = "4-8" }, /obj/effect/floor_decal/techfloor/corner{ - dir = 8 + dir = 9 }, /obj/effect/floor_decal/techfloor/corner{ - dir = 1 + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) @@ -10282,6 +10378,7 @@ }, /obj/machinery/door/airlock/multi_tile/metal{ dir = 1; + name = "Brig"; req_one_access = list(150) }, /obj/effect/floor_decal/techfloor, @@ -10341,14 +10438,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "Yh" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Yi" = ( @@ -10455,14 +10552,16 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor/corner, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/floor_decal/techfloor/corner{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "YH" = ( /obj/effect/floor_decal/techfloor/corner{ - dir = 1 + dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) @@ -10658,14 +10757,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "ZI" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 1 - }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) "ZO" = ( @@ -18595,7 +18694,7 @@ hU lj oD oD -iR +bd wi zv Du @@ -18744,7 +18843,7 @@ bR bR NA RR -iR +bd bR bR bR @@ -18886,7 +18985,7 @@ OR OR ND Sb -OR +Mp OR sy nC @@ -19021,7 +19120,7 @@ ih lo oO lo -aX +by wp zx Dz @@ -19305,7 +19404,7 @@ ip lz oP sk -iR +bd wy zy Eb @@ -19596,7 +19695,7 @@ bR bR NT St -aX +by bR bR bR @@ -19731,7 +19830,7 @@ iU lP lP lP -aX +by wP zH lP @@ -20744,7 +20843,7 @@ fx gR Jw FQ -FQ +Lj UF SV WN @@ -20886,7 +20985,7 @@ Bq gR zU Yd -Yd +er WV IG sg @@ -22003,7 +22102,7 @@ kh kh qz sz -uK +Tp xN NQ Fj @@ -22430,7 +22529,7 @@ mY qS rM uQ -yb +uK AX qn Ic @@ -22855,7 +22954,7 @@ ky nf qz sz -uK +Tp ys NQ tJ @@ -23430,7 +23529,7 @@ BJ BJ OT BJ -uK +Tp DR BJ OT diff --git a/maps/submaps/pois_vr/aerostat/Rockybase.dmm b/maps/submaps/pois_vr/aerostat/Rockybase.dmm index b9c9e2e327f..657988b5858 100644 --- a/maps/submaps/pois_vr/aerostat/Rockybase.dmm +++ b/maps/submaps/pois_vr/aerostat/Rockybase.dmm @@ -659,12 +659,6 @@ /obj/item/mecha_parts/chassis/gygax, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) -"co" = ( -/mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced{ - faction = "syndicate" - }, -/turf/simulated/floor/tiled/techfloor/virgo2, -/area/submap/virgo2/Rockybase) "cp" = ( /obj/machinery/vending/robotics, /obj/machinery/light{ @@ -1302,7 +1296,7 @@ al bA ao ao -co +ao bq ao al diff --git a/maps/submaps/pois_vr/debris_field/_templates.dm b/maps/submaps/pois_vr/debris_field/_templates.dm index 87ebdc54ecc..408647587fc 100644 --- a/maps/submaps/pois_vr/debris_field/_templates.dm +++ b/maps/submaps/pois_vr/debris_field/_templates.dm @@ -231,6 +231,34 @@ allow_duplicates = FALSE discard_prob = 50 +/datum/map_template/debrisfield/new_escape_pod + name = "Escape Pod" + mappath = 'new_escapepod.dmm' + cost = 10 + allow_duplicates = FALSE + discard_prob = 10 + +/datum/map_template/debrisfield/new_escape_pod_infested_xeno + name = "Xeno-Infested Escape Pod" + mappath = 'new_escapepod_xeno.dmm' + cost = 20 + allow_duplicates = FALSE + discard_prob = 25 + +/datum/map_template/debrisfield/new_escape_pod_infested_carp + name = "Carp-Infested Escape Pod" + mappath = 'new_escapepod_carp.dmm' + cost = 20 + allow_duplicates = FALSE + discard_prob = 25 + +/datum/map_template/debrisfield/new_escape_pod_infested_robo + name = "Robo-Infested Escape Pod" + mappath = 'new_escapepod_robo.dmm' + cost = 20 + allow_duplicates = FALSE + discard_prob = 25 + /datum/map_template/debrisfield/gutted_mackerel name = "Gutted Mackerel LC" mappath = 'maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm' diff --git a/maps/submaps/pois_vr/debris_field/debrisfield_things.dm b/maps/submaps/pois_vr/debris_field/debrisfield_things.dm index 13cd7f032dc..874a87c7351 100644 --- a/maps/submaps/pois_vr/debris_field/debrisfield_things.dm +++ b/maps/submaps/pois_vr/debris_field/debrisfield_things.dm @@ -82,4 +82,24 @@ prob(2);/obj/item/slime_extract/emerald, prob(2);/obj/item/slime_extract/light_pink, prob(1);/obj/item/slime_extract/grey, - prob(1);/obj/item/slime_extract/rainbow) \ No newline at end of file + prob(1);/obj/item/slime_extract/rainbow) + +/obj/item/weapon/paper/robo_escape_pod + name = "faded note" + info = {"This paper is old and the shaky writing has faded, rendering it difficult to read.
    \ +whichever poor bastard finds this pod
    \ +
    \ +im sorry
    \ +we tried to do everything we could for her
    \ +but in the end the virus was too much
    \ +rnd wanted to take her apart and document what happened
    \ +but after watching her tear through three of my men like they were nothing
    \ +i just. i couldnt. they might fire me, but fuck the suits. the safety of the other staff here matter more.
    \ +her fucking dignity matters more.
    \ +
    \ +we managed to bait her into one of the escape pods. fired her out into the black.
    \ +
    \ +hope nobody ever has to read this. has to find her.
    \ +if you do, im sorry.
    \ +i just hope whatever happens, she finds the mercy we werent equipped to give her.
    \ +The author's signature is smudged beyond recognition."} \ No newline at end of file diff --git a/maps/submaps/pois_vr/debris_field/new_escapepod.dmm b/maps/submaps/pois_vr/debris_field/new_escapepod.dmm new file mode 100644 index 00000000000..c61dd72670d --- /dev/null +++ b/maps/submaps/pois_vr/debris_field/new_escapepod.dmm @@ -0,0 +1,91 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/wall/rshull, +/area/submap/debrisfield/misc_debris) +"n" = ( +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"z" = ( +/obj/structure/closet/walllocker/emerglocker/south, +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"D" = ( +/obj/structure/bed/chair/bay/shuttle, +/obj/structure/closet/walllocker/emerglocker/north, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"O" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/structure/closet/walllocker/emerglocker/south, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"P" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"R" = ( +/obj/structure/closet/walllocker/emerglocker/north, +/obj/structure/bed/chair/bay/shuttle, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"Y" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod Door" + }, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) + +(1,1,1) = {" +a +P +P +P +a +"} +(2,1,1) = {" +a +D +n +O +a +"} +(3,1,1) = {" +a +D +n +O +a +"} +(4,1,1) = {" +a +R +n +z +a +"} +(5,1,1) = {" +a +D +n +O +a +"} +(6,1,1) = {" +a +a +Y +a +a +"} diff --git a/maps/submaps/pois_vr/debris_field/new_escapepod_carp.dmm b/maps/submaps/pois_vr/debris_field/new_escapepod_carp.dmm new file mode 100644 index 00000000000..8bbf078a8a5 --- /dev/null +++ b/maps/submaps/pois_vr/debris_field/new_escapepod_carp.dmm @@ -0,0 +1,87 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/wall/rshull, +/area/submap/debrisfield/misc_debris) +"F" = ( +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"K" = ( +/mob/living/simple_mob/animal/space/carp/large, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"N" = ( +/obj/structure/grille/broken, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"R" = ( +/obj/structure/grille/broken, +/mob/living/simple_mob/animal/space/carp, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"S" = ( +/obj/machinery/door/airlock/external{ + density = 0; + icon_state = "door_open"; + name = "Escape Pod Door"; + opacity = 0 + }, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"U" = ( +/obj/structure/grille/broken, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"W" = ( +/mob/living/simple_mob/animal/space/carp, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"Z" = ( +/obj/effect/gibspawner/human, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) + +(1,1,1) = {" +a +U +N +R +a +"} +(2,1,1) = {" +a +W +Z +F +a +"} +(3,1,1) = {" +a +F +K +F +a +"} +(4,1,1) = {" +a +F +Z +W +a +"} +(5,1,1) = {" +a +W +F +F +a +"} +(6,1,1) = {" +a +a +S +a +a +"} diff --git a/maps/submaps/pois_vr/debris_field/new_escapepod_robo.dmm b/maps/submaps/pois_vr/debris_field/new_escapepod_robo.dmm new file mode 100644 index 00000000000..c0d1c8504a0 --- /dev/null +++ b/maps/submaps/pois_vr/debris_field/new_escapepod_robo.dmm @@ -0,0 +1,115 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/wall/rshull, +/area/submap/debrisfield/misc_debris) +"g" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"i" = ( +/mob/living/simple_mob/vore/aggressive/corrupthound/space, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"m" = ( +/obj/structure/bed/chair/bay/shuttle, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/gibspawner/robot, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"q" = ( +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"r" = ( +/obj/effect/gibspawner/robot, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"v" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/gibspawner/robot, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"y" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/wall/rshull, +/area/submap/debrisfield/misc_debris) +"B" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/item/weapon/paper/robo_escape_pod, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"D" = ( +/obj/machinery/door/airlock/external{ + name = "Escape Pod Door" + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"E" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"Q" = ( +/obj/structure/bed/chair/bay/shuttle, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) +"S" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/reinforced/airless, +/area/submap/debrisfield/misc_debris) + +(1,1,1) = {" +a +E +E +E +y +"} +(2,1,1) = {" +y +S +S +v +a +"} +(3,1,1) = {" +a +m +i +S +a +"} +(4,1,1) = {" +a +Q +S +q +a +"} +(5,1,1) = {" +a +B +r +g +a +"} +(6,1,1) = {" +y +a +D +a +y +"} diff --git a/maps/submaps/pois_vr/debris_field/new_escapepod_xeno.dmm b/maps/submaps/pois_vr/debris_field/new_escapepod_xeno.dmm new file mode 100644 index 00000000000..ed2b127f4fd --- /dev/null +++ b/maps/submaps/pois_vr/debris_field/new_escapepod_xeno.dmm @@ -0,0 +1,119 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/wall/rshull, +/area/submap/debrisfield/misc_debris) +"f" = ( +/obj/structure/grille/broken, +/obj/effect/alien/weeds, +/obj/effect/alien/resin/membrane, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"h" = ( +/obj/effect/alien/resin/wall, +/obj/effect/alien/weeds, +/turf/space, +/area/submap/debrisfield/misc_debris) +"k" = ( +/obj/effect/alien/weeds, +/mob/living/simple_mob/animal/space/alien, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"r" = ( +/obj/structure/grille/broken, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/alien/weeds, +/obj/effect/alien/resin/membrane, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"t" = ( +/obj/effect/alien/weeds, +/mob/living/simple_mob/animal/space/alien/sentinel, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"v" = ( +/obj/machinery/door/airlock/external{ + density = 0; + icon_state = "door_open"; + name = "Escape Pod Door"; + opacity = 0 + }, +/obj/effect/alien/weeds, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"A" = ( +/obj/effect/alien/weeds/node, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"D" = ( +/obj/effect/alien/weeds, +/obj/effect/alien/resin/wall, +/turf/simulated/wall/rshull, +/area/submap/debrisfield/misc_debris) +"T" = ( +/obj/structure/grille/broken, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/alien/weeds, +/obj/effect/alien/resin/membrane, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"U" = ( +/obj/effect/alien/weeds, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"W" = ( +/obj/effect/alien/weeds, +/obj/effect/alien/egg, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) +"X" = ( +/obj/effect/alien/weeds, +/mob/living/simple_mob/animal/space/alien/drone, +/turf/simulated/floor/airless, +/area/submap/debrisfield/misc_debris) + +(1,1,1) = {" +a +T +f +r +a +"} +(2,1,1) = {" +h +X +U +W +D +"} +(3,1,1) = {" +a +k +A +t +D +"} +(4,1,1) = {" +a +U +U +U +a +"} +(5,1,1) = {" +h +W +U +X +a +"} +(6,1,1) = {" +a +a +v +a +a +"} diff --git a/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm b/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm index aab0b0eb080..412b6c8739b 100644 --- a/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm @@ -75,7 +75,6 @@ /obj/random/firstaid, /obj/random/firstaid, /obj/random/firstaid, -/obj/random/firstaid, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -103,7 +102,6 @@ /obj/vehicle/train/trolley, /obj/random/multiple/voidsuit, /obj/random/multiple/voidsuit, -/obj/random/multiple/voidsuit, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -121,15 +119,13 @@ /area/submap/Thiefc) "p" = ( /obj/structure/closet/crate, -/obj/item/weapon/storage/box/shotgunammo, /obj/item/weapon/storage/box/practiceshells, -/obj/item/weapon/grenade/spawnergrenade/manhacks/station, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, /area/submap/Thiefc) -"u" = ( -/mob/living/simple_mob/humanoid/merc/ranged/virgo, +"B" = ( +/mob/living/simple_mob/animal/giant_spider/phorogenic, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -322,7 +318,7 @@ a c c c -u +h h h h @@ -346,7 +342,7 @@ c f h h -h +B h h c @@ -387,12 +383,12 @@ a a c e -h -u +B h h h h +B h h c @@ -414,7 +410,7 @@ i h h h -u +h c c c diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index a11a486fc91..efed63f2c1f 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -28,10 +28,6 @@ "ae" = ( /turf/unsimulated/mineral/virgo3b, /area/space) -"af" = ( -/obj/structure/sign/warning/docking_area, -/turf/unsimulated/wall, -/area/centcom/simulated/terminal) "ag" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -58,12 +54,6 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) -"ai" = ( -/obj/machinery/door/blast/regular{ - dir = 4 - }, -/turf/unsimulated/floor/techfloor_grid, -/area/centcom/simulated/terminal) "aj" = ( /obj/structure/sign/warning{ name = "\improper STAND AWAY FROM TRACK EDGE" @@ -100,7 +90,6 @@ "ao" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ - icon_state = "spline_fancy"; dir = 9 }, /turf/simulated/floor/holofloor/grass, @@ -134,7 +123,6 @@ dir = 8 }, /obj/effect/floor_decal/carpet/corners{ - icon_state = "carpet_corners"; dir = 5 }, /turf/simulated/floor/holofloor/carpet, @@ -189,7 +177,6 @@ "aA" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ - icon_state = "spline_fancy"; dir = 10 }, /turf/simulated/floor/holofloor/grass, @@ -477,9 +464,7 @@ /area/holodeck/source_boxingcourt) "by" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/shuttle/floor, /area/shuttle/supply) @@ -755,7 +740,6 @@ /area/ai_multicam_room) "cj" = ( /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 9 }, /turf/simulated/floor/tiled/steel, @@ -787,6 +771,12 @@ /obj/item/toy/chess/pawn_white, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) +"cq" = ( +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "cs" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -848,20 +838,11 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) -"cC" = ( -/obj/effect/step_trigger/lost_in_space/tram, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" - }, -/area/space) "cO" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "supply_shuttle"; pixel_x = -25; - pixel_y = 0; req_one_access = list(13,31); tag_door = "supply_shuttle_hatch" }, @@ -1063,27 +1044,6 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) -"dz" = ( -/obj/effect/floor_decal/transit/orange{ - dir = 8 - }, -/obj/effect/transit/light{ - dir = 8 - }, -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 2; - name = "thrower_throwdownside"; - nostop = 1; - stopper = 0; - tiles = 0 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" - }, -/area/space) "dA" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -1098,6 +1058,22 @@ /obj/structure/window/reinforced, /turf/unsimulated/wall, /area/space) +"dD" = ( +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "escape_shuttle_hatch_station"; + locked = 1; + name = "Shuttle Hatch" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "dE" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -1164,9 +1140,7 @@ /area/holodeck/source_thunderdomecourt) "dU" = ( /obj/structure/table/holotable, -/obj/machinery/readybutton{ - pixel_y = 0 - }, +/obj/machinery/readybutton, /obj/effect/floor_decal/corner/red/full{ dir = 8 }, @@ -1603,9 +1577,7 @@ /area/holodeck/source_thunderdomecourt) "fX" = ( /obj/structure/table/holotable, -/obj/machinery/readybutton{ - pixel_y = 0 - }, +/obj/machinery/readybutton, /obj/effect/floor_decal/corner/green/full{ dir = 4 }, @@ -1706,6 +1678,18 @@ /obj/structure/flora/grass/both, /turf/simulated/floor/holofloor/snow, /area/holodeck/holodorm/source_snow) +"gE" = ( +/obj/structure/closet/hydrant{ + pixel_y = 32 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "gN" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/desert, @@ -1854,6 +1838,56 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/holodorm/source_boxing) +"ig" = ( +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/obj/effect/transit/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) +"ih" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"ii" = ( +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"in" = ( +/obj/effect/step_trigger/lost_in_space/tram, +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) +"ix" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "iO" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -1867,16 +1901,25 @@ }, /turf/space/transit/west, /area/space) -"iY" = ( -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" - }, -/area/space) +"iU" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "jf" = ( /turf/space/transit/north, /area/space) +"jr" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"jL" = ( +/obj/effect/step_trigger/lost_in_space/tram, +/turf/simulated/floor/maglev{ + icon = 'icons/turf/transit_vr.dmi' + }, +/area/space) "jQ" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -1904,28 +1947,47 @@ /obj/effect/floor_decal/sign/small_5, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) -"le" = ( -/obj/effect/floor_decal/transit/orange{ +"lf" = ( +/obj/effect/floor_decal/borderfloor/corner{ dir = 4 }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"li" = ( +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/grille, +/turf/simulated/floor/plating/eris/under, +/area/shuttle/escape) +"lE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"mb" = ( /obj/effect/step_trigger/lost_in_space/tram, +/obj/effect/floor_decal/transit/orange{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" + initial_flooring = null }, /area/space) -"mZ" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 4; - name = "thrower_escapeshuttletop(right)"; - tiles = 0 +"mF" = ( +/obj/effect/shuttle_landmark{ + base_area = null; + base_turf = null; + docking_controller = null; + landmark_tag = "escape_transit"; + name = "Escape Transit" }, /turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" + initial_flooring = null }, /area/space) "nj" = ( @@ -1938,6 +2000,23 @@ }, /turf/unsimulated/floor/steel, /area/centcom/control) +"nB" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) +"nC" = ( +/obj/structure/table/standard, +/obj/structure/closet/walllocker/emerglocker{ + pixel_x = 32 + }, +/obj/item/clothing/head/beret/nanotrasen, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "nV" = ( /obj/item/toy/chess/rook_black, /turf/simulated/floor/holofloor/wmarble, @@ -1961,19 +2040,28 @@ /obj/effect/floor_decal/sign/small_8, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) -"pu" = ( -/obj/effect/floor_decal/transit/orange{ +"pk" = ( +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/effect/transit/light{ +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) +"pv" = ( +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/area/space) +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "escape_shuttle_hatch_offsite"; + locked = 1; + name = "Shuttle Hatch" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "pF" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -1986,6 +2074,24 @@ "pT" = ( /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"pX" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) +"qc" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "qn" = ( /turf/space/transit/east, /area/space) @@ -1997,20 +2103,22 @@ /turf/space, /turf/space/internal_edge/bottomright, /area/space) -"qH" = ( -/obj/effect/floor_decal/transit/orange{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" - }, -/area/space) "qV" = ( /obj/effect/floor_decal/sign/small_6, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"qY" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"rh" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "ru" = ( /obj/item/toy/chess/pawn_black, /turf/simulated/floor/holofloor/bmarble, @@ -2026,10 +2134,94 @@ "sl" = ( /turf/space/internal_edge/top, /area/space) +"sp" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) +"sx" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/centcom/simulated/terminal) "sF" = ( /obj/effect/overmap/bluespace_rift, /turf/unsimulated/map, /area/overmap) +"sN" = ( +/obj/effect/floor_decal/transit/orange{ + dir = 8 + }, +/obj/effect/transit/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) +"sT" = ( +/obj/structure/closet/hydrant{ + pixel_y = -32 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"ti" = ( +/obj/machinery/status_display{ + pixel_y = 32 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"tp" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) +"tu" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) "tC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -2039,7 +2231,6 @@ "tD" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 2; name = "thrower_throwdown"; stopper = 0; tiles = 0 @@ -2050,24 +2241,28 @@ /obj/effect/floor_decal/transit/orange{ dir = 8 }, -/obj/effect/step_trigger/lost_in_space/tram, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" +/obj/effect/transit/light{ + dir = 8 }, -/area/space) -"tJ" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 4; - name = "thrower_escapeshuttletop(right)"; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; tiles = 0 }, -/turf/simulated/floor/maglev{ - icon = 'icons/turf/transit_vr.dmi' +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null }, /area/space) +"tS" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "uc" = ( /turf/unsimulated/wall, /area/centcom/suppy) @@ -2078,8 +2273,8 @@ "ue" = ( /obj/structure/closet/crate, /turf/unsimulated/floor{ - icon_state = "vault"; - dir = 1 + dir = 1; + icon_state = "vault" }, /area/centcom/suppy) "uf" = ( @@ -2096,44 +2291,27 @@ icon_state = "dark" }, /area/centcom/suppy) +"uG" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "uM" = ( /obj/item/toy/chess/knight_black, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) -"vi" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 2; - name = "thrower_throwdownside"; - nostop = 1; - stopper = 0; - tiles = 0 - }, -/turf/simulated/floor/maglev{ - icon = 'icons/turf/transit_vr.dmi' - }, -/area/space) -"vG" = ( -/obj/effect/step_trigger/lost_in_space/tram, -/turf/simulated/floor/maglev{ - icon = 'icons/turf/transit_vr.dmi' - }, -/area/space) -"vR" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 2; - name = "thrower_throwdownside"; - nostop = 1; - stopper = 0; - tiles = 0 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" - }, -/area/space) +"vu" = ( +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/grille, +/turf/simulated/floor/plating/eris/under, +/area/shuttle/escape) +"vz" = ( +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "vW" = ( /obj/effect/floor_decal/sign/small_a, /turf/simulated/floor/holofloor/wood, @@ -2162,19 +2340,6 @@ }, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) -"wr" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 8; - name = "thrower_escapeshuttletop(left)"; - tiles = 0 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" - }, -/area/space) "wy" = ( /turf/unsimulated/wall, /area/centcom/control) @@ -2190,9 +2355,21 @@ }, /turf/unsimulated/floor/steel, /area/centcom/control) +"xi" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE" + }, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"xl" = ( +/obj/structure/table/standard, +/obj/random/maintenance/clean, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "xM" = ( /obj/machinery/light{ - icon_state = "tube1"; dir = 8 }, /turf/simulated/floor/tiled/steel, @@ -2216,16 +2393,6 @@ /obj/machinery/telecomms/receiver/preset_cent, /turf/unsimulated/floor/steel, /area/centcom/control) -"yF" = ( -/obj/effect/floor_decal/transit/orange{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid{ - icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" - }, -/area/space) "yK" = ( /obj/machinery/door/airlock/multi_tile/metal, /obj/effect/floor_decal/industrial/warning{ @@ -2233,45 +2400,73 @@ }, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) +"yU" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "zb" = ( /obj/effect/step_trigger/thrower{ direction = 1; name = "thrower_throwup"; - nostop = 0; tiles = 0 }, /turf/space/transit/east, /area/space) "zv" = ( -/obj/effect/floor_decal/transit/orange{ +/obj/effect/transit/light{ dir = 8 }, -/obj/effect/transit/light{ +/obj/effect/floor_decal/transit/orange{ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" + initial_flooring = null }, /area/space) -"zK" = ( -/obj/machinery/door/blast/regular{ +"zw" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/maglev, -/area/centcom/simulated/terminal) -"Al" = ( +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "escape_shuttle_hatch_offsite"; + locked = 1; + name = "Shuttle Hatch" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"zH" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/centcom/simulated/terminal) +"zK" = ( +/obj/machinery/door/blast/regular{ + dir = 4 + }, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"Al" = ( +/obj/structure/bed/chair/shuttle, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "Av" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 8; - name = "thrower_escapeshuttletop(left)"; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; tiles = 0 }, /turf/simulated/floor/maglev{ @@ -2287,10 +2482,30 @@ "Az" = ( /turf/unsimulated/beach/coastline, /area/beach) +"AD" = ( +/obj/effect/floor_decal/borderfloor/corner, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "Bm" = ( /obj/item/toy/chess/bishop_black, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"Bs" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/machinery/door/airlock/glass_external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "escape_shuttle_hatch_station"; + locked = 1; + name = "Shuttle Hatch" + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "Bw" = ( /turf/unsimulated/beach/water, /area/beach) @@ -2306,9 +2521,30 @@ /turf/space, /turf/space/internal_edge/bottomleft, /area/space) +"Cd" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "Cn" = ( /turf/simulated/sky/virgo3b/south, /area/space) +"Cp" = ( +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/shuttle_landmark{ + base_area = /area/centcom/simulated/terminal; + base_turf = /turf/simulated/floor/tiled/techfloor/grid; + docking_controller = null; + landmark_tag = "escape_cc"; + name = "Escape Centcom" + }, +/obj/structure/grille, +/turf/simulated/floor/plating/eris/under, +/area/shuttle/escape) "Ct" = ( /obj/machinery/ntnet_relay, /turf/unsimulated/floor/steel, @@ -2323,6 +2559,15 @@ }, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) +"CG" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "CJ" = ( /obj/item/toy/chess/pawn_white, /turf/simulated/floor/holofloor/bmarble, @@ -2340,6 +2585,19 @@ }, /turf/simulated/floor/tiled/steel, /area/space) +"Dm" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"Dn" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "Dw" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/food/snacks/chips, @@ -2349,6 +2607,12 @@ /turf/space, /turf/space/internal_edge/topright, /area/space) +"DI" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "DL" = ( /obj/effect/floor_decal/sign/small_b, /turf/simulated/floor/holofloor/wood, @@ -2360,6 +2624,18 @@ /obj/effect/floor_decal/sign/small_g, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"Et" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/status_display{ + pixel_y = 32 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "ET" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/centcom/simulated/terminal) @@ -2371,25 +2647,27 @@ /obj/structure/table/standard, /turf/unsimulated/beach/sand, /area/beach) +"Fe" = ( +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/grille, +/turf/simulated/floor/plating/eris/under, +/area/shuttle/escape) "Fp" = ( /turf/simulated/floor/maglev, /area/centcom/simulated/terminal) -"Fr" = ( +"Ft" = ( +/obj/effect/transit/light{ + dir = 4 + }, /obj/effect/floor_decal/transit/orange{ dir = 4 }, -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - direction = 2; - name = "thrower_throwdownside"; - nostop = 1; - stopper = 0; - tiles = 0 - }, /turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" + initial_flooring = null }, /area/space) "FH" = ( @@ -2403,20 +2681,39 @@ }, /turf/unsimulated/beach/sand, /area/beach) +"FJ" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "FT" = ( -/obj/effect/shuttle_landmark{ - base_area = null; - base_turf = null; - docking_controller = null; - landmark_tag = "escape_transit"; - name = "Escape Transit" +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) +"FX" = ( +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/obj/effect/transit/light{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" + initial_flooring = null }, /area/space) +"FY" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "Ga" = ( /turf/unsimulated/floor/steel, /area/centcom/control) @@ -2466,6 +2763,27 @@ /obj/machinery/telecomms/broadcaster/preset_cent, /turf/unsimulated/floor/steel, /area/centcom/control) +"HW" = ( +/obj/machinery/status_display{ + pixel_y = -30 + }, +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) +"HX" = ( +/obj/structure/closet/walllocker/emerglocker{ + pixel_x = -32 + }, +/obj/random/maintenance/clean, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) +"Ic" = ( +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "Ik" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/food/drinks/cans/cola, @@ -2495,7 +2813,6 @@ }, /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; @@ -2503,14 +2820,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" + initial_flooring = null }, /area/space) "IR" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 2; name = "thrower_throwdown"; stopper = 0; tiles = 0 @@ -2521,6 +2836,19 @@ /obj/item/toy/chess/bishop_white, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"Jq" = ( +/obj/structure/sign/warning/docking_area, +/turf/unsimulated/wall, +/area/centcom/simulated/terminal) +"Jw" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "Jx" = ( /obj/effect/floor_decal/corner_steel_grid/diagonal, /obj/effect/floor_decal/corner_steel_grid/diagonal{ @@ -2551,7 +2879,6 @@ "JL" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 2; name = "thrower_throwdown"; nostop = 1; stopper = 0; @@ -2602,7 +2929,6 @@ /area/holodeck/source_chess) "Lg" = ( /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 5 }, /turf/simulated/floor/tiled/steel, @@ -2611,33 +2937,52 @@ /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, /turf/simulated/sky/virgo3b/south, /area/space) -"Mb" = ( -/obj/effect/transit/light{ +"LD" = ( +/obj/machinery/light{ dir = 8 }, -/turf/unsimulated/mineral{ +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"Mb" = ( +/obj/effect/floor_decal/transit/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - icon_state = "rock" + initial_flooring = null + }, +/area/space) +"Mf" = ( +/obj/effect/step_trigger/lost_in_space/tram, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null }, /area/space) "Mi" = ( /obj/item/toy/chess/bishop_white, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) +"Mq" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "ME" = ( /obj/machinery/computer/rdservercontrol{ - name = "Master R&D Server Controller"; - icon_state = "computer"; + badmin = 1; dir = 1; - badmin = 1 + name = "Master R&D Server Controller" }, /turf/unsimulated/floor/steel, /area/centcom/control) "MK" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) @@ -2662,7 +3007,6 @@ "Nr" = ( /obj/machinery/cryopod/robot/door/gateway, /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 8 }, /turf/simulated/floor/tiled/steel, @@ -2673,6 +3017,24 @@ opacity = 1 }, /area/beach) +"NA" = ( +/obj/structure/closet/hydrant{ + pixel_y = -32 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) +"NW" = ( +/obj/structure/table/standard, +/obj/structure/closet/walllocker/emerglocker{ + pixel_x = 32 + }, +/obj/random/maintenance/clean, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "Oj" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2686,16 +3048,16 @@ /obj/item/toy/chess/knight_white, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) -"OR" = ( -/turf/simulated/shuttle/wall, -/area/shuttle/escape) "OY" = ( /turf/unsimulated/map, /area/overmap) "Pe" = ( +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, /obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/shuttle/plating, +/turf/simulated/floor/plating/eris/under, /area/shuttle/escape) "Pf" = ( /obj/structure/table/woodentable{ @@ -2707,12 +3069,14 @@ /turf/simulated/floor/tiled, /area/centcom/simulated/terminal) "Pg" = ( -/turf/simulated/shuttle/wall/hard_corner, +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, /area/shuttle/escape) "Pi" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 2; name = "thrower_throwdown"; nostop = 1; stopper = 0; @@ -2725,38 +3089,40 @@ icon = 'icons/turf/transit_vr.dmi' }, /area/space) +"Py" = ( +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdownside"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) +"PU" = ( +/obj/effect/floor_decal/transit/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid{ + icon = 'icons/turf/transit_vr.dmi'; + initial_flooring = null + }, +/area/space) "Qa" = ( -/obj/structure/closet/hydrant{ - pixel_x = -30; - pixel_y = 0 - }, -/obj/item/weapon/storage/firstaid/o2{ - layer = 2.8; - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/toxin, -/obj/structure/bed/chair/shuttle, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, +/obj/structure/table/standard, +/obj/random/soap, +/turf/simulated/floor/tiled/techfloor, /area/shuttle/escape) "Qs" = ( /obj/item/toy/chess/queen_black, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) -"QW" = ( -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, -/area/shuttle/escape) -"QX" = ( -/obj/structure/bed/chair/shuttle, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, -/area/shuttle/escape) "QY" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-21" @@ -2770,100 +3136,47 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/centcom/simulated/terminal) "Rd" = ( -/obj/structure/table/standard, -/obj/random/maintenance/clean, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" +/obj/effect/floor_decal/borderfloor{ + dir = 9 }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "Re" = ( -/obj/structure/table/standard, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, -/area/shuttle/escape) -"Rf" = ( -/obj/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/table/standard, -/obj/machinery/light{ +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "Rg" = ( -/obj/structure/bed/chair/shuttle{ +/obj/effect/floor_decal/borderfloor/corner{ dir = 1 }, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) -"Rh" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'HIGH VOLTAGE'"; - icon_state = "shock"; - name = "HIGH VOLTAGE" - }, -/turf/unsimulated/wall, -/area/centcom/simulated/terminal) "Ri" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "escape_shuttle_hatch_station"; - locked = 1; - name = "Shuttle Hatch" +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/turf/simulated/shuttle/floor/yellow, -/area/shuttle/escape) -"Rj" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "escape_shuttle_hatch_offsite"; - locked = 1; - name = "Shuttle Hatch" - }, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "Rk" = ( /obj/structure/bed/chair/shuttle, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = -28 - }, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, -/area/shuttle/escape) -"Rl" = ( -/obj/structure/bed/chair/shuttle, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = 28 - }, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "Rm" = ( -/obj/structure/table/standard, -/obj/random/junk, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "Ro" = ( -/obj/structure/table/standard, -/obj/random/maintenance/clean, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" +/obj/structure/closet/hydrant{ + pixel_y = 32 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "Rq" = ( /obj/machinery/door/blast/regular{ @@ -2885,19 +3198,11 @@ /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) "Rs" = ( -/obj/structure/sign/nanotrasen, -/obj/effect/shuttle_landmark{ - base_area = /area/centcom/simulated/terminal; - base_turf = /turf/simulated/floor/tiled/techfloor/grid; - docking_controller = null; - landmark_tag = "escape_cc"; - name = "Escape Centcom" +/obj/structure/table/standard, +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/turf/simulated/shuttle/wall, -/area/shuttle/escape) -"Rt" = ( -/obj/structure/sign/nanotrasen, -/turf/simulated/shuttle/wall, +/turf/simulated/floor/tiled/techfloor, /area/shuttle/escape) "Ru" = ( /turf/simulated/floor/tiled/steel, @@ -2917,83 +3222,44 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/living) -"Rw" = ( -/obj/structure/table/standard, -/obj/item/clothing/head/beret/nanotrasen, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, -/area/shuttle/escape) -"Rx" = ( -/obj/structure/table/standard, -/obj/random/plushie, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, -/area/shuttle/escape) -"Ry" = ( -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = -28 - }, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, -/area/shuttle/escape) "Rz" = ( -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = 28 - }, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "RA" = ( -/obj/structure/grille, -/obj/structure/shuttle/window, -/turf/simulated/shuttle/floor/white, +/turf/simulated/floor/tiled/techfloor, /area/shuttle/escape) "RC" = ( -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "RD" = ( /obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/obj/machinery/light, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" + dir = 8 }, +/turf/simulated/floor/tiled/techfloor, /area/shuttle/escape) "RE" = ( -/obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/light, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" +/obj/machinery/light{ + dir = 4 }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, /area/shuttle/escape) "RF" = ( -/obj/random/junk, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/techfloor, /area/shuttle/escape) "RG" = ( -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/obj/random/soap, -/turf/simulated/shuttle/floor/white{ - color = "#cccccc" - }, +/obj/structure/table/standard, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled/techfloor, /area/shuttle/escape) "RV" = ( /obj/effect/step_trigger/teleporter/random{ @@ -3008,16 +3274,16 @@ }, /turf/simulated/sky/virgo3b/south, /area/space) +"RY" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "Sh" = ( -/obj/effect/floor_decal/transit/orange{ - dir = 4 - }, -/obj/effect/transit/light{ - dir = 4 - }, /obj/effect/step_trigger/thrower{ affect_ghosts = 1; - direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; @@ -3025,19 +3291,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid{ icon = 'icons/turf/transit_vr.dmi'; - initial_flooring = null; - icon_state = "techfloor_grid" + initial_flooring = null }, /area/space) "Sl" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/obj/machinery/camera/network/crescent{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/centcom/simulated/terminal) +/obj/structure/sign/nanotrasen, +/turf/simulated/wall/thull, +/area/shuttle/escape) "Sm" = ( /turf/simulated/shuttle/wall/alien/blue/hard_corner, /area/unknown/dorm4) @@ -3080,6 +3340,13 @@ /obj/structure/fans, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm4) +"Sy" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/shuttle/escape) "Sz" = ( /obj/machinery/smartfridge/survival_pod, /obj/item/weapon/storage/mre/menu11, @@ -3133,11 +3400,13 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm4) "SG" = ( -/obj/machinery/door/blast/regular{ - dir = 4 +/obj/structure/table/standard, +/obj/structure/closet/walllocker/emerglocker{ + pixel_x = -32 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/centcom/simulated/terminal) +/obj/item/clothing/head/beret/nanotrasen, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "SH" = ( /obj/structure/bed/chair{ dir = 8 @@ -3243,7 +3512,6 @@ /area/centcom/simulated/living) "Th" = ( /obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; dir = 8 }, /turf/simulated/floor/tiled/steel, @@ -3329,6 +3597,15 @@ }, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm3) +"Tv" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "Tx" = ( /obj/structure/prop/alien/dispenser, /turf/simulated/shuttle/floor/alien, @@ -3782,9 +4059,7 @@ /turf/simulated/floor/tiled/steel, /area/centcom/simulated/evac) "Vo" = ( -/obj/machinery/door/blast/regular{ - dir = 1 - }, +/obj/machinery/door/blast/regular, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/evac) "Vp" = ( @@ -3834,8 +4109,7 @@ /area/centcom/simulated/bathroom) "Vz" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/centcom/simulated/bathroom) @@ -3955,7 +4229,6 @@ /area/centcom/simulated/restaurant) "VZ" = ( /obj/structure/bed/chair/wood/wings{ - icon_state = "wooden_chair_wings"; dir = 4 }, /turf/simulated/floor/wood, @@ -3972,7 +4245,6 @@ /area/centcom/simulated/restaurant) "Wd" = ( /obj/structure/bed/chair/wood/wings{ - icon_state = "wooden_chair_wings"; dir = 8 }, /turf/simulated/floor/wood, @@ -4046,7 +4318,6 @@ }, /obj/machinery/computer/cryopod/dorms{ name = "Company Property Retention System"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/steel, @@ -4082,7 +4353,6 @@ }) "Wz" = ( /obj/structure/bed/chair/wood/wings{ - icon_state = "wooden_chair_wings"; dir = 1 }, /turf/simulated/floor/wood, @@ -4188,7 +4458,6 @@ /area/centcom/simulated/restaurant) "WN" = ( /obj/structure/bed/chair/wood/wings{ - icon_state = "wooden_chair_wings"; dir = 4 }, /obj/machinery/light{ @@ -4214,8 +4483,6 @@ "WR" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich{ - pixel_w = 0; - pixel_x = 0; pixel_y = 10 }, /turf/simulated/floor/wood, @@ -4331,13 +4598,9 @@ dir = 4 }, /obj/item/device/radio/intercom{ - broadcasting = 0; dir = 1; frequency = 1475; - icon_state = "intercom"; - listening = 1; name = "Station Intercom (Security)"; - pixel_x = 0; pixel_y = 27 }, /turf/simulated/floor/tiled, @@ -4393,7 +4656,6 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; pixel_x = 12; pixel_y = 8 }, @@ -4413,20 +4675,13 @@ name = "\improper CentCom Security Arrivals" }) "XE" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/centcom/simulated/terminal) +/turf/simulated/wall/thull, +/area/shuttle/escape) "XH" = ( /obj/structure/bed/chair{ dir = 8 }, /obj/machinery/light{ - icon_state = "tube1"; dir = 4 }, /turf/simulated/floor/tiled, @@ -4467,8 +4722,7 @@ "XQ" = ( /obj/machinery/optable, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/white, @@ -4501,8 +4755,6 @@ check_access = 0; check_anomalies = 0; check_records = 0; - check_synth = 0; - check_weapons = 0; control_area = "\improper CentCom Security Arrivals"; pixel_x = 32; req_access = list(101); @@ -4512,6 +4764,15 @@ /area/centcom/simulated/security{ name = "\improper CentCom Security Arrivals" }) +"XW" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/escape) "XX" = ( /obj/machinery/computer/crew{ dir = 4 @@ -4564,7 +4825,6 @@ "Yk" = ( /obj/structure/medical_stand, /obj/machinery/light{ - icon_state = "tube1"; dir = 4 }, /turf/simulated/floor/tiled/white, @@ -4635,7 +4895,6 @@ /area/centcom/simulated/medical) "Yx" = ( /obj/machinery/light{ - icon_state = "tube1"; dir = 4 }, /turf/simulated/floor/tiled, @@ -4654,10 +4913,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 @@ -4686,7 +4942,6 @@ /area/centcom/simulated/medical) "YG" = ( /obj/machinery/light{ - icon_state = "tube1"; dir = 4 }, /turf/simulated/floor/tiled/steel, @@ -4730,8 +4985,7 @@ /area/centcom/simulated/medical) "YN" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled/white, /area/centcom/simulated/medical) @@ -4873,7 +5127,6 @@ /area/centcom/simulated/medical) "Zn" = ( /obj/machinery/light{ - icon_state = "tube1"; dir = 4 }, /turf/simulated/floor/tiled/white, @@ -4883,8 +5136,7 @@ /obj/item/weapon/book/manual/security_space_law, /obj/item/weapon/book/manual/security_space_law, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/centcom/simulated/security{ @@ -4923,8 +5175,7 @@ /obj/item/weapon/storage/box/donkpockets, /obj/item/weapon/storage/box/donkpockets, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/centcom/simulated/security{ @@ -4962,14 +5213,12 @@ pixel_y = 5 }, /obj/machinery/light{ - icon_state = "tube1"; dir = 4 }, /turf/simulated/floor/tiled/white, /area/centcom/simulated/medical) "ZC" = ( /obj/machinery/light{ - icon_state = "tube1"; dir = 4 }, /turf/simulated/floor/wood, @@ -8826,7 +9075,6 @@ OY Xl "} (28,1,1) = {" -ap Hy Hy Hy @@ -8859,17 +9107,18 @@ Hy Hy Hy Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -8968,7 +9217,6 @@ OY Xl "} (29,1,1) = {" -ap Hy Hy Hy @@ -9001,17 +9249,18 @@ Hy Hy Hy Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -9110,7 +9359,6 @@ OY Xl "} (30,1,1) = {" -ap Hy Hy Hy @@ -9143,17 +9391,18 @@ Hy Hy Hy Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -9252,7 +9501,6 @@ OY Xl "} (31,1,1) = {" -ap Hy Hy Hy @@ -9285,17 +9533,18 @@ Hy Hy Hy Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -9394,7 +9643,7 @@ OY Xl "} (32,1,1) = {" -ap +Hy Hy dg dg @@ -9426,6 +9675,17 @@ dg dg dg dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg Hy ap ap @@ -9488,17 +9748,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Xl OY OY @@ -9536,50 +9785,50 @@ OY Xl "} (33,1,1) = {" -ap Hy -qH -qH +Hy +Mb +Mb zv -qH -qH -qH -dz +Mb +Mb +sN IN IN IN -dz +tH IN IN IN -dz +tH IN IN IN -dz +tH +sp +IN +IN +tH IN IN IN -dz +tH +IN +IN IN -qH -qH -zv -qH -qH tH Mb -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Mb +Mb +zv +Mb +Mb +sN +Mb +mb +sN +dg +Hy ap ap ap @@ -9678,38 +9927,49 @@ OY Xl "} (34,1,1) = {" -ap Hy -iY -iY -iY -iY -iY -iY -wr -wr -iY -iY -iY -iY -iY -iY +Hy FT -iY -iY -iY -iY -iY -iY -iY -vR -vR -iY -iY -iY -iY -iY -cC +FT +FT +FT +FT +FT +Sh +Sh +Sh +Sh +Sh +FT +FT +FT +FT +FT +FT +mF +FT +FT +FT +FT +FT +FT +FT +Sh +Sh +Sh +Sh +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg Hy ap ap @@ -9772,17 +10032,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Xl OY OY @@ -9820,7 +10069,7 @@ OY Xl "} (35,1,1) = {" -ap +Hy Hy Pq Pq @@ -9829,6 +10078,8 @@ Pq Pq Pq Av +Av +Av Pq Pq Pq @@ -9845,13 +10096,22 @@ Pq Pq Pq Pq -vi +Pq +Pq +Av +Av +Av Pq Pq Pq Pq Pq -vG +Pq +Pq +Pq +jL +Pq +dg Hy ap ap @@ -9914,17 +10174,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Xl Xl Xl @@ -9962,50 +10211,50 @@ Xl Xl "} (36,1,1) = {" -ap Hy -iY -iY -iY -iY -iY -iY -wr -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -vR -iY -iY -iY -iY -iY -cC Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +FT +FT +FT +FT +FT +FT +Sh +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg +Hy ap ap ap @@ -10104,50 +10353,50 @@ ap ap "} (37,1,1) = {" -ap Hy -iY -iY -iY -iY -iY -iY -wr -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -vR -iY -iY -iY -iY -iY -cC Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg +Hy ap ap ap @@ -10246,50 +10495,50 @@ ap ap "} (38,1,1) = {" -ap Hy -iY -iY -iY -iY -iY -iY -mZ -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -vR -iY -iY -iY -iY -iY -cC Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg +Hy ap ap ap @@ -10388,50 +10637,50 @@ ap ap "} (39,1,1) = {" -ap Hy -iY -iY -iY -iY -iY -iY -mZ -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -vR -iY -iY -iY -iY -iY -cC Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg +Hy ap ap ap @@ -10530,50 +10779,50 @@ ap ap "} (40,1,1) = {" -ap Hy -Pq -Pq -Pq -Pq -Pq -Pq -tJ -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -Pq -vi -Pq -Pq -Pq -Pq -Pq -vG Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg +Hy ap ap ap @@ -10672,50 +10921,50 @@ ap ap "} (41,1,1) = {" -ap Hy -iY -iY -iY -iY -iY -iY -mZ -mZ -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -iY -vR -vR -iY -iY -iY -iY -iY -cC Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg +Hy ap ap ap @@ -10814,50 +11063,50 @@ ap ap "} (42,1,1) = {" -ap Hy -yF -yF -yF -pu -yF -yF -Fr -Sh -Fr -Fr -Fr -Sh -Fr -Fr -Fr -Sh -Fr -Fr -Fr -Sh -Fr -Fr -Fr -Sh -yF -yF -yF -pu -yF -le Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +FT +FT +FT +FT +FT +FT +Sh +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg +Hy ap ap ap @@ -10956,37 +11205,48 @@ ap ap "} (43,1,1) = {" -ap Hy -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg -dg +Hy +Pq +Pq +Pq +Pq +Pq +Pq +Av +Av +Av +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Av +Av +Av +Pq +Pq +Pq +Pq +Pq +Pq +Pq +Pq +jL +Pq dg Hy ap @@ -11085,63 +11345,52 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (44,1,1) = {" -ap Hy Hy +FT +FT +FT +FT +FT +FT +Sh +Sh +Sh +Sh +Sh +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +FT +Sh +Sh +Sh +Sh +Sh +FT +FT +FT +FT +FT +FT +FT +FT +Mf +FT +dg Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -11240,50 +11489,50 @@ ap ap "} (45,1,1) = {" -ap Hy Hy +PU +PU +Ft +PU +PU +FX +Py +Py +Py +ig +Py +Py +Py +ig +Py +Py +Py +ig +tu +Py +Py +ig +Py +Py +Py +ig +Py +Py +Py +ig +PU +PU +PU +Ft +PU +PU +FX +PU +in +FX +dg Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -11382,50 +11631,50 @@ ap ap "} (46,1,1) = {" -ap Hy Hy +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg +dg Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -11524,7 +11773,6 @@ ap ap "} (47,1,1) = {" -ap Hy Hy Hy @@ -11557,17 +11805,18 @@ Hy Hy Hy Hy -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -11666,50 +11915,50 @@ ap ap "} (48,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -11808,50 +12057,50 @@ ap ap "} (49,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -11950,50 +12199,50 @@ ap ap "} (50,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy +Hy ap ap ap @@ -15686,33 +15935,33 @@ ae ae ae ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap ap ap ap @@ -15828,33 +16077,33 @@ ae ae ae ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap ap ap ap @@ -15970,33 +16219,33 @@ ae ae ae ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap ap ap ap @@ -16112,33 +16361,33 @@ ae ae ae ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae +Jq +dZ +dZ +dZ +dZ +dZ +dZ +xi +dZ +dZ +dZ +dZ +dZ +dZ +dZ +dZ +dZ +dZ +dZ +xi +dZ +dZ +dZ +dZ +dZ +dZ +aj ap ap ap @@ -16254,33 +16503,33 @@ ae ae ae ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae +zK +sx +sx +zH +sx +sx +sx +zH +sx +sx +sx +sx +zH +sx +zH +sx +sx +sx +sx +zH +sx +sx +sx +zH +sx +sx +zK ap ap ap @@ -16396,33 +16645,33 @@ ae ae ae ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae -ae +zK +ET +ET +ET +ET +ET +XE +XE +dD +XE +Sl +Bs +Cp +li +Bs +Sl +XE +dD +XE +XE +ET +ET +ET +ET +ET +ET +zK ap ap ap @@ -16538,33 +16787,33 @@ ae ae ae ae -af -dZ -dZ -dZ -dZ -dZ -Rh -dZ -dZ -dZ -dZ -dZ -dZ -Rh -dZ -dZ -dZ -dZ -dZ -af -ae -ae -ae -ae -ae -ae -ae +zK +Fp +Fp +Fp +XE +XE +XE +XE +gE +yU +LD +ix +yU +Mq +ix +ih +Mq +NA +XE +XE +XE +XE +Fp +Fp +Fp +Fp +zK ap ap ap @@ -16680,33 +16929,33 @@ ae ae ae ae -ai -Al -Al +zK +ET +ET XE Sl Al -Al -XE -Al -Al -Al -Al -XE -Al -Al -Sl -XE -Al +HX +cq +Re +Jw +XW +FY +XW +XW +FY +XW +FJ +Ic Al SG -ae -ae -ae -ae -ae -ae -ae +HW +XE +XE +ET +ET +ET +zK ap ap ap @@ -16822,33 +17071,33 @@ ae ae ae ae -ai +zK ET -ET -OR -Pe -Pe +XE +XE +XE +ti Ri -OR -Pe +Ri +Rg Rs -Rt -Pe -OR +iU +RA +iU +iU +RA +iU +RG +qY Ri -RA -RA -OR +Ri +RY +Sl +XE +XE ET ET -SG -ae -ae -ae -ae -ae -ae -ae +zK ap ap ap @@ -16965,32 +17214,32 @@ ae ae ae zK -Fp -OR +ET +Pe Pg Rd Rg -QW Rk -Re -Rg -QX -Rw -Ry -QW -Rg +Rk +Rm +Tv RD +RA +RD +RD +RA +RD +tS +Rm +ii +ii +qY +lE Pg -OR -Fp +vu +ET +ET zK -ae -ae -ae -ae -ae -ae -ae ap ap ap @@ -17106,33 +17355,33 @@ ae ae ae ae -ai +zK ET Pe Qa Re -Rg -QW -QX Rm -Rg -QX -Re -Rg -QW -QW -QW +vz +vz +Rm +DI +RA +RA +RA +RA +RA +RA RF -Pe +Rm +vz +vz +Rm +Ic +xl +vu ET -SG -ae -ae -ae -ae -ae -ae -ae +ET +zK ap ap ap @@ -17248,33 +17497,33 @@ ae ae ae ae -ai +zK ET Pe -QW -QW -QW -QW -QW -QW -QW -QW -QW -QW -QW -QX -QX -Rg -Pe +RD +jr +lf +Rk +Rk +Rm +CG +Pg +RA +Pg +Pg +RA +Pg +tp +Rm +ii +ii +AD +Cd +RD +vu ET -SG -ae -ae -ae -ae -ae -ae -ae +ET +zK ap ap ap @@ -17390,33 +17639,33 @@ ae ae ae ae -ai +zK ET -Pe -QW -QW -QW -QW -QW -QW -QW -QW -QW -QW -QW -QX -QX +XE +XE +XE +Et +rh +rh +lf +Rs +iU +RA +iU +iU +RA +iU RG -Pe +AD +rh +rh +Sy +Sl +XE +XE ET -SG -ae -ae -ae -ae -ae -ae -ae +ET +zK ap ap ap @@ -17532,33 +17781,33 @@ ae ae ae ae -ai +zK ET -Pe -QX -Re -Rg -QW -QX -Re -Rg -QX -Re -Rg -QW -QW -QW -QW -Pe ET -SG -ae -ae -ae -ae -ae -ae -ae +XE +Sl +Al +nC +cq +Re +qc +nB +pk +nB +nB +pk +nB +Dn +Ic +Al +NW +HW +XE +XE +ET +ET +ET +zK ap ap ap @@ -17676,31 +17925,31 @@ ae ae zK Fp -OR -Pg -Rf -Rg -QW -Rl +Fp +Fp +XE +XE +XE +XE Ro -Rg -QX -Rx Rz -QW +uG +RC +Rz +Dm RC RE -Pg -OR +Dm +sT +XE +XE +XE +XE +Fp +Fp +Fp Fp zK -ae -ae -ae -ae -ae -ae -ae ap ap ap @@ -17816,33 +18065,33 @@ ae ae ae ae -ai +zK ET ET -OR -Pe -Pe -Rj -OR -Pe -Rt -Rt -Pe -OR -Rj -RA -RA -OR ET ET -SG -ae -ae -ae -ae -ae -ae -ae +ET +XE +XE +zw +XE +Sl +zw +Fe +Fe +zw +Sl +XE +pv +XE +XE +ET +ET +ET +ET +ET +ET +zK ap ap ap @@ -17958,7 +18207,7 @@ ae ae ae ae -ai +zK Rc Rc Rc @@ -17977,14 +18226,14 @@ Rc Rc Rc Rc -SG -ae -ae -ae -ae -ae -ae -ae +pX +Rc +Rc +Rc +pX +Rc +Rc +zK ap ap ap @@ -18120,13 +18369,13 @@ Jx Jx Zt aj -ae -ae -ae -ae -ae -ae -ae +dZ +dZ +dZ +dZ +dZ +dZ +aj ap ap ap diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index ebe4eae595b..45df6fec18d 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -10,7 +10,6 @@ /area/tether/surfacebase/outside/outside1) "aac" = ( /obj/effect/map_effect/portal/master/side_a{ - dir = 2; portal_id = "surfacemine" }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, @@ -33,8 +32,7 @@ /area/tether/surfacebase/outside/outside1) "aai" = ( /obj/machinery/camera/network/outside{ - dir = 1; - icon_state = "camera" + dir = 1 }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/lowernortheva/external) @@ -52,7 +50,6 @@ /area/tether/surfacebase/outside/outside1) "aak" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -281,8 +278,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/cable{ icon_state = "1-2" @@ -311,8 +307,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -327,9 +322,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) "aaE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) "aaF" = ( @@ -373,12 +366,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) -"aaI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/carpet/blue, -/area/tether/surfacebase/medical/mentalhealth) "aaJ" = ( /obj/structure/table/woodentable, /obj/item/weapon/folder/white, @@ -554,8 +541,7 @@ icon_state = "4-8" }, /obj/machinery/alarm{ - pixel_y = 22; - target_temperature = 293.15 + pixel_y = 22 }, /turf/simulated/floor/plating, /area/maintenance/lower/solars) @@ -566,7 +552,6 @@ /obj/structure/table/woodentable, /obj/structure/plushie/ian{ dir = 8; - icon_state = "ianplushie"; pixel_y = 6 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -633,8 +618,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) @@ -712,7 +696,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -803,8 +786,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -852,37 +834,37 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) "abs" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/random/cigarettes, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" +/obj/structure/railing{ + dir = 8 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) -"abt" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ +/obj/structure/railing{ dir = 1 }, -/obj/random/junk, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/obj/structure/table/rack, +/obj/random/maintenance/research, +/obj/random/maintenance/research, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/public_garden_maintenence) +"abt" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/public_garden_maintenence) "abu" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/obj/random/maintenance/clean, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/public_garden_maintenence) "abv" = ( /turf/simulated/floor/tiled, /area/rnd/hardstorage) @@ -906,22 +888,28 @@ }, /area/security/checkpoint) "aby" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/obj/random/junk, -/obj/random/maintenance/clean, -/obj/random/tool, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/railing{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/green{ + d1 = 16; + d2 = 0; + icon_state = "16-0" + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/public_garden_maintenence) "abz" = ( /obj/structure/table/woodentable, /obj/machinery/light_construct{ - dir = 1; - icon_state = "tube-construct-stage1" + dir = 1 }, /obj/item/glass_jar, /turf/simulated/floor/wood, @@ -947,15 +935,13 @@ /turf/simulated/floor/plating, /area/maintenance/lower/solars) "abC" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, -/obj/random/junk, -/obj/structure/cable{ - icon_state = "1-2" - }, +/obj/structure/closet/crate, +/obj/random/maintenance/research, +/obj/random/maintenance/research, +/obj/random/drinkbottle, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/lower/public_garden_maintenence) "abD" = ( /obj/machinery/light/small{ dir = 1 @@ -963,66 +949,30 @@ /turf/simulated/floor/tiled, /area/rnd/hardstorage) "abE" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/random/junk, -/obj/random/junk, -/obj/random/maintenance/cargo, -/obj/structure/cable{ - icon_state = "1-4" - }, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/lower/public_garden_maintenence) "abF" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{ - pixel_y = 13 - }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{ - pixel_x = 9 - }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{ - pixel_x = -7; - pixel_y = -7 - }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{ - pixel_x = -10; - pixel_y = 5 - }, -/obj/item/trash/raisins{ - desc = "This trash looks like it's had one too many."; - name = "Wasted waste" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) -"abG" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/random/cigarettes, /obj/random/junk, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/lower/public_garden_maintenence) +"abG" = ( +/obj/effect/floor_decal/rust, +/obj/random/cutout, +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence) "abH" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 6 + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/machinery/meter, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/lower/mining_eva) "abI" = ( /obj/structure/closet/crate/plastic, /turf/simulated/floor/tiled, @@ -1266,8 +1216,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -1288,8 +1237,7 @@ name = "Paramedic" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) @@ -1297,21 +1245,9 @@ /turf/simulated/mineral, /area/storage/surface_eva/external) "acj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 6; - icon_state = "intact" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - pixel_y = 22; - target_temperature = 293.15 - }, -/obj/machinery/meter, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) +/obj/structure/closet/firecloset, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/public_garden_maintenence) "ack" = ( /obj/machinery/atmospherics/unary/vent_pump{ external_pressure_bound = 140; @@ -1355,13 +1291,14 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) "aco" = ( -/obj/structure/railing, -/obj/structure/railing{ +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 5 + }, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/maintenance/lower/mining_eva) "acp" = ( /obj/structure/grille, /obj/structure/railing, @@ -1438,13 +1375,10 @@ /area/engineering/atmos) "acw" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/vending/loadout/clothing, /turf/simulated/floor/tiled, @@ -1474,23 +1408,14 @@ /area/tether/surfacebase/lowernorthhall) "acz" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/vending/loadout, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) -"acA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/carpet/blue, -/area/tether/surfacebase/medical/mentalhealth) "acB" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -1512,7 +1437,6 @@ "acC" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight/lamp/green{ - dir = 2; pixel_x = -5; pixel_y = 4 }, @@ -1522,9 +1446,6 @@ pixel_y = 10; range = 12 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/button/windowtint{ id = "psych_office_inside"; pixel_x = 6; @@ -1638,8 +1559,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) @@ -1664,8 +1584,7 @@ /area/tether/surfacebase/medical/lowerhall) "acQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/machinery/floodlight, /turf/simulated/floor/plating, @@ -1807,8 +1726,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 22; - pixel_y = 0 + pixel_x = 22 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) @@ -1835,16 +1753,10 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 10 }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) -"adg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/carpet/blue, -/area/tether/surfacebase/medical/mentalhealth) "adh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -1918,7 +1830,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "adm" = ( -/obj/structure/bed/chair/bay/chair/padded/red/bignest, +/obj/structure/bed/chair/bay/chair/padded/red/bignest{ + name = "Tweeter's Bed" + }, /mob/living/simple_mob/animal/passive/bird/azure_tit/tweeter, /turf/simulated/floor/grass, /area/tether/surfacebase/medical/mentalhealth) @@ -1930,25 +1844,28 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "adp" = ( -/obj/machinery/atmospherics/pipe/tank/air{ - dir = 4 +/obj/structure/table/rack, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, +/obj/random/maintenance/clean, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining_eva) "adq" = ( /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/tether/surfacebase/medical/mentalhealth) "adr" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/medical{ - name = "Medical Maintenance Access"; - req_access = list(5) +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) +/area/maintenance/lower/xenoflora) "ads" = ( /obj/structure/table/rack, /obj/item/clothing/mask/gas, @@ -2053,6 +1970,9 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) "adz" = ( @@ -2102,7 +2022,6 @@ /area/tether/surfacebase/medical/paramed) "adD" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -2158,10 +2077,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/access_button{ command = "cycle_interior"; dir = 8; @@ -2182,6 +2097,9 @@ dir = 10 }, /obj/machinery/door/firedoor/glass/hidden/steel, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) "adH" = ( @@ -2192,7 +2110,6 @@ dir = 4 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -2227,7 +2144,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /obj/structure/disposalpipe/segment{ @@ -2276,8 +2192,7 @@ "adN" = ( /obj/machinery/power/apc/high{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/cable/green{ d2 = 8; @@ -2365,6 +2280,9 @@ /area/tether/surfacebase/medical/lowerhall) "adT" = ( /obj/structure/flora/pottedplant/fern, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/mentalhealth) "adU" = ( @@ -2438,7 +2356,6 @@ }, /obj/machinery/button/remote/airlock{ desc = "A remote control switch for the medbay recovery room door."; - dir = 2; id = "Psych"; name = "Exit Button"; pixel_x = -26; @@ -2482,6 +2399,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "aea" = ( @@ -2707,8 +2625,7 @@ dir = 10 }, /obj/machinery/camera/network/cargo{ - dir = 8; - icon_state = "camera" + dir = 8 }, /obj/structure/closet/hydrant{ pixel_x = 32 @@ -2747,7 +2664,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; layer = 1; @@ -2811,7 +2727,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's set to history channel, the show is talking about modern aliens. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -2907,6 +2822,9 @@ /area/medical/virology) "aeF" = ( /obj/random/junk, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "aeG" = ( @@ -2954,8 +2872,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like its set to the kek-centeral. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/wood, /area/vacant/vacant_bar) @@ -2996,7 +2913,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's on MTV. Now you can't blame that demi-cowgirl for working her money maker. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/lino, @@ -3005,7 +2921,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's on the fishing channel. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled, @@ -3027,8 +2942,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) @@ -3059,7 +2973,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /obj/structure/disposalpipe/segment{ @@ -3097,9 +3010,7 @@ /area/tether/surfacebase/lowernorthhall) "aeT" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -3131,7 +3042,6 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -3188,8 +3098,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3222,8 +3131,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3267,8 +3175,7 @@ /area/medical/virologyaccess) "afg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /turf/simulated/floor/tiled, /area/rnd/hardstorage) @@ -3280,8 +3187,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3388,8 +3294,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -3404,7 +3309,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "afq" = ( -/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside1) "afr" = ( @@ -3437,9 +3344,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "aft" = ( -/obj/machinery/camera/network/civilian{ - dir = 2 - }, +/obj/machinery/camera/network/civilian, /obj/machinery/lapvend, /turf/simulated/floor/tiled, /area/storage/primary) @@ -3481,7 +3386,6 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "afy" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -3522,17 +3426,18 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "afC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack, -/obj/random/maintenance/cargo, -/obj/random/maintenance/cargo, -/obj/random/maintenance/clean, -/obj/structure/cable/green{ +/obj/structure/catwalk, +/obj/structure/cable{ d1 = 2; - d2 = 8; - icon_state = "2-8" + d2 = 4; + icon_state = "2-4" }, -/turf/simulated/floor/tiled/techfloor, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "afD" = ( /obj/machinery/computer/centrifuge, @@ -3549,21 +3454,7 @@ /area/medical/virology) "afE" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 - }, -/obj/machinery/door/airlock/maintenance/medical{ - name = "Medical Maintenance Access"; - req_access = list(5) - }, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/tether/surfacebase/lowernorthhall) "afF" = ( @@ -3581,13 +3472,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "afH" = ( -/obj/effect/floor_decal/techfloor/orange{ +/obj/effect/floor_decal/industrial/danger{ dir = 4 }, -/obj/machinery/camera/network/civilian{ - dir = 9 +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor/grid, +/turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/tram) "afI" = ( /obj/item/device/radio/intercom{ @@ -3629,8 +3520,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) @@ -3713,22 +3603,26 @@ "afQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - icon_state = "map-scrubbers" + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "afR" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 5 +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/virgo3b, -/area/tether/surfacebase/outside/outside1) +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) "afS" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - icon_state = "map-scrubbers" + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -3781,13 +3675,10 @@ /area/tether/surfacebase/tram) "afZ" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/vending/loadout/overwear, /turf/simulated/floor/tiled, @@ -3797,15 +3688,13 @@ dir = 4 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/machinery/camera/network/civilian{ dir = 9 }, /obj/machinery/vending/coffee{ - dir = 8; - icon_state = "coffee" + dir = 8 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -3876,7 +3765,6 @@ "agm" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -3903,7 +3791,6 @@ "agp" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/suspension_gen, @@ -3918,7 +3805,6 @@ "agr" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -4017,7 +3903,6 @@ /area/rnd/xenoarch_storage) "agD" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -4047,21 +3932,24 @@ /area/rnd/testingroom) "agG" = ( /obj/structure/disposaloutlet{ - dir = 1; - icon_state = "outlet" + dir = 1 }, /obj/structure/disposalpipe/trunk, /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/reinforced, /area/rnd/testingroom) "agH" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/lower/mining_eva) "agI" = ( /obj/machinery/newscaster{ pixel_x = -30 @@ -4107,12 +3995,10 @@ /obj/structure/table/glass, /obj/machinery/status_display{ layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 @@ -4131,28 +4017,29 @@ dir = 4; icon_state = "pdoor0"; id = "gogogo"; - name = "Blast Door"; opacity = 0 }, /turf/simulated/floor/tiled, /area/rnd/testingroom) "agQ" = ( -/obj/structure/railing{ - dir = 8 +/obj/structure/catwalk, +/obj/random/cigarettes, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" }, -/obj/structure/railing{ - dir = 1 +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 28 }, -/obj/effect/decal/cleanable/dirt, -/obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "agR" = ( /obj/structure/table/glass, /obj/item/weapon/tool/screwdriver, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 @@ -4160,20 +4047,15 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "agS" = ( -/obj/structure/railing{ +/obj/structure/catwalk, +/obj/machinery/light/small{ dir = 1 }, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "agT" = ( /obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, /obj/random/junk, /obj/random/maintenance/clean, /turf/simulated/floor/plating, @@ -4198,7 +4080,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/effect/floor_decal/borderfloor{ @@ -4264,7 +4145,6 @@ dir = 4; icon_state = "pdoor0"; id = "gogogo"; - name = "Blast Door"; opacity = 0 }, /turf/simulated/floor/tiled, @@ -4284,7 +4164,6 @@ dir = 4; icon_state = "pdoor0"; id = "gogogo"; - name = "Blast Door"; opacity = 0 }, /turf/simulated/floor/tiled, @@ -4308,7 +4187,6 @@ dir = 4; icon_state = "pdoor0"; id = "gogogo"; - name = "Blast Door"; opacity = 0 }, /turf/simulated/floor/tiled, @@ -4329,7 +4207,6 @@ dir = 4; icon_state = "pdoor0"; id = "gogogo"; - name = "Blast Door"; opacity = 0 }, /turf/simulated/floor/tiled, @@ -4347,12 +4224,10 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "ahg" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/random/cigarettes, -/obj/random/junk, -/obj/random/junk, -/obj/random/tool, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "ahh" = ( @@ -4393,17 +4268,15 @@ /turf/simulated/floor/plating, /area/storage/surface_eva) "ahk" = ( -/obj/machinery/atmospherics/pipe/tank/air, -/obj/effect/decal/cleanable/dirt, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/storage/surface_eva) +/area/maintenance/lower/trash_pit) "ahl" = ( /turf/simulated/wall, /area/hallway/lower/first_west) "ahm" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/structure/cable/green{ d1 = 4; @@ -4428,33 +4301,36 @@ /turf/simulated/floor/tiled/steel_grid, /area/storage/primary) "ahp" = ( -/obj/structure/railing{ - dir = 1 +/obj/structure/catwalk, +/obj/random/junk, +/obj/random/junk, +/obj/random/maintenance/clean, +/obj/random/tool, +/obj/structure/cable{ + icon_state = "1-2" }, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) +"ahq" = ( /obj/structure/railing{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/random/maintenance/cargo, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) -"ahq" = ( /obj/structure/railing{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) "ahr" = ( -/obj/structure/railing{ +/obj/effect/floor_decal/rust, +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack, +/obj/random/junk, +/obj/random/junk, /obj/random/maintenance/clean, -/obj/random/maintenance/cargo, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining_eva) +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) "ahs" = ( /obj/structure/railing{ dir = 1 @@ -4516,38 +4392,39 @@ /area/rnd/testingroom) "ahz" = ( /obj/structure/railing{ - dir = 8 + dir = 1 + }, +/obj/structure/railing{ + dir = 4 }, -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) +"ahA" = ( +/obj/structure/catwalk, /obj/random/junk, /obj/random/junk, /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) -"ahA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning, -/obj/random/junk, -/obj/random/junk, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) "ahB" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining_eva) +"ahC" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) -"ahC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/storage/surface_eva) "ahD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/effect/floor_decal/industrial/warning{ @@ -4586,8 +4463,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) @@ -4701,7 +4577,6 @@ "ahQ" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/borderfloor{ @@ -4987,7 +4862,6 @@ /obj/machinery/button/remote/blast_door{ id = "suckysucky"; name = "Scrubber Blast Door-Controller"; - pixel_x = 0; pixel_y = 32 }, /obj/structure/cable/green{ @@ -5008,15 +4882,13 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "aio" = ( /obj/machinery/camera/network/research{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/tiled, /area/rnd/testingroom) @@ -5053,8 +4925,7 @@ /area/maintenance/lower/mining_eva) "ais" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) @@ -5083,8 +4954,7 @@ /area/rnd/testingroom) "aiw" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/structure/cable/green{ d1 = 4; @@ -5101,7 +4971,6 @@ alarm_id = "pen_nine"; breach_detection = 0; dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled, @@ -5215,7 +5084,6 @@ /obj/item/weapon/reagent_containers/dropper, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -25 }, /obj/effect/floor_decal/borderfloor, @@ -5282,8 +5150,7 @@ /area/rnd/testingroom) "aiR" = ( /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ - name = "Research Testing Scrubber"; - use_power = 1 + name = "Research Testing Scrubber" }, /turf/simulated/floor/tiled, /area/rnd/testingroom) @@ -5346,8 +5213,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "aiW" = ( -/turf/simulated/mineral, -/area/engineering/engine_room) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/lower/xenoflora) "aiX" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/disposalpipe/segment{ @@ -5513,7 +5388,6 @@ /obj/machinery/alarm{ breach_detection = 0; dir = 8; - icon_state = "alarm0"; pixel_x = 25; rcon_setting = 3; report_danger_level = 0 @@ -5539,8 +5413,7 @@ /area/engineering/atmos_intake) "aji" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/reinforced, /area/rnd/testingroom) @@ -5570,8 +5443,7 @@ /area/crew_quarters/sleep/Dorm_7) "ajm" = ( /obj/machinery/vending/tool{ - dir = 1; - icon_state = "tool" + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -5837,8 +5709,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -5897,18 +5768,13 @@ /turf/simulated/wall, /area/holodeck_control) "ajP" = ( -/obj/structure/railing{ +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack, -/obj/random/maintenance/research, -/obj/random/maintenance/research, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/public_garden_maintenence) +/obj/random/junk, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) "ajQ" = ( /obj/structure/railing{ dir = 1 @@ -5916,15 +5782,14 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/public_garden_maintenence) "ajR" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/public_garden_maintenence) +/obj/effect/floor_decal/rust, +/obj/random/cigarettes, +/obj/random/junk, +/obj/random/junk, +/obj/random/tool, +/obj/effect/landmark/teleplumb_exit, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) "ajS" = ( /turf/simulated/wall, /area/tether/surfacebase/public_garden_one) @@ -6004,12 +5869,12 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_one) "ajZ" = ( -/obj/structure/railing{ +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/public_garden_maintenence) +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) "aka" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -6018,7 +5883,6 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 30 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -6136,8 +6000,7 @@ /area/maintenance/lower/public_garden_maintenence) "akj" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/closet/hydrant{ pixel_x = -32 @@ -6166,24 +6029,22 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/public_garden_maintenence) "akm" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/public_garden_maintenence) +/obj/machinery/atmospherics/pipe/tank/air, +/turf/simulated/floor/plating, +/area/storage/surface_eva) "akn" = ( /turf/simulated/mineral, /area/maintenance/lower/public_garden_maintenence) "ako" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/random/maintenance/research, -/obj/random/maintenance/research, -/obj/random/drinkbottle, -/turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenence) +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/random/maintenance/cargo, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/mining_eva) "akp" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -6217,14 +6078,20 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/public_garden_maintenence) "akt" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenence) +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/mining_eva) "aku" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenence) +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/table/rack, +/obj/random/maintenance/clean, +/obj/random/maintenance/cargo, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/mining_eva) "akv" = ( /obj/effect/floor_decal/techfloor{ dir = 9 @@ -6280,14 +6147,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -6306,9 +6170,7 @@ /area/tether/surfacebase/public_garden_one) "akE" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -6360,16 +6222,19 @@ /area/maintenance/lower/public_garden_maintenence) "akH" = ( /obj/machinery/camera/network/outside{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/holodeck_control) "akI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/firecloset, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/public_garden_maintenence) +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, +/obj/random/junk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) "akJ" = ( /obj/structure/table/rack, /obj/random/maintenance/research, @@ -6489,15 +6354,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "akY" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/railing{ + dir = 8 }, +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/obj/random/junk, +/obj/random/junk, +/obj/random/maintenance/clean, /turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenence) +/area/maintenance/lower/trash_pit) "akZ" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -6532,9 +6398,7 @@ /area/tether/surfacebase/public_garden_one) "ald" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -6558,9 +6422,7 @@ /area/tether/surfacebase/public_garden) "ale" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -6878,12 +6740,11 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "alu" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) +/obj/effect/floor_decal/industrial/warning, +/obj/random/junk, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) "alv" = ( /obj/structure/railing{ dir = 8 @@ -6999,30 +6860,18 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "alD" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) "alE" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 6 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) +/turf/simulated/floor/plating, +/area/storage/surface_eva) "alF" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -7152,8 +7001,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 @@ -7280,8 +7128,7 @@ /area/rnd/tankstorage) "ama" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/machinery/computer/area_atmos/tag{ dir = 4; @@ -7292,8 +7139,7 @@ /area/rnd/tankstorage) "amb" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -7414,7 +7260,6 @@ /obj/random/tech_supply, /obj/machinery/requests_console{ department = "Tool Storage"; - departmentType = 0; pixel_y = 30 }, /turf/simulated/floor/tiled, @@ -7423,8 +7268,7 @@ /obj/machinery/hologram/holopad, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/floor/tiled, /area/storage/primary) @@ -7457,8 +7301,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable/green{ d1 = 4; @@ -7641,9 +7484,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/storage/primary) @@ -7664,7 +7505,6 @@ /obj/effect/floor_decal/industrial/warning/dust, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/steel_dirty, @@ -7712,7 +7552,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -7763,7 +7602,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/disposalpipe/segment, @@ -7789,8 +7627,7 @@ "amU" = ( /obj/structure/reagent_dispensers/fueltank, /obj/machinery/ai_status_display{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/tiled, /area/storage/primary) @@ -7800,8 +7637,7 @@ }, /obj/machinery/status_display{ layer = 4; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/tiled, /area/storage/primary) @@ -7942,15 +7778,14 @@ /turf/simulated/floor/reinforced, /area/rnd/testingroom) "anf" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/catwalk, /obj/effect/floor_decal/rust, -/obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" +/obj/random/junk, +/obj/random/junk, +/obj/random/maintenance/cargo, +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/random/junk, -/obj/random/junk, -/obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "ang" = ( @@ -7964,9 +7799,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 10 @@ -8023,7 +7856,6 @@ pixel_y = -24 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -8062,7 +7894,6 @@ /obj/machinery/disposal, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/structure/disposalpipe/trunk{ @@ -8086,22 +7917,45 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "anq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, +/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{ + pixel_y = 13 + }, +/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{ + pixel_x = 9 + }, +/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{ + pixel_x = -7; + pixel_y = -7 + }, +/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{ + pixel_x = -10; + pixel_y = 5 + }, +/obj/item/trash/raisins{ + desc = "This trash looks like it's had one too many."; + name = "Wasted waste" + }, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/random/junk, -/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "anr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" +/obj/structure/catwalk, +/obj/random/cigarettes, +/obj/random/junk, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "ans" = ( @@ -8161,12 +8015,10 @@ "anw" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/rust, @@ -8202,8 +8054,7 @@ /area/hallway/lower/first_west) "anA" = ( /obj/machinery/alarm{ - pixel_y = 22; - target_temperature = 293.15 + pixel_y = 22 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -8229,9 +8080,7 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -8330,7 +8179,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /turf/simulated/floor/tiled/techfloor, @@ -8340,7 +8188,6 @@ /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/techfloor, @@ -8352,17 +8199,15 @@ }, /area/maintenance/lower/atmos) "anL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/atmospherics/binary/passive_gate/on{ - dir = 4 +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/storage/surface_eva) +/area/maintenance/lower/trash_pit) "anM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/machinery/floodlight, /turf/simulated/floor/plating, @@ -8394,8 +8239,6 @@ /area/hallway/lower/first_west) "anQ" = ( /obj/machinery/computer/guestpass{ - dir = 2; - icon_state = "guest"; pixel_y = 28 }, /obj/structure/disposalpipe/segment{ @@ -8415,9 +8258,7 @@ /area/tether/surfacebase/north_stairs_one) "anR" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/disposalpipe/segment{ @@ -8453,14 +8294,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "anT" = ( /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 30 }, /obj/structure/disposalpipe/segment{ @@ -8484,7 +8323,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 2; - icon_state = "pipe-j1s"; name = "Primary Tool Storage"; sortType = "Primary Tool Storage" }, @@ -8502,8 +8340,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -8511,8 +8348,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, @@ -8521,8 +8357,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -8534,8 +8369,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 @@ -8553,12 +8387,10 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance/int{ - name = "Emergency Storage"; - req_one_access = list() + name = "Emergency Storage" }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/surface_one_hall) @@ -8571,8 +8403,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/atrium) @@ -8588,8 +8419,7 @@ /obj/machinery/floodlight, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/atrium) @@ -8611,7 +8441,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -8646,8 +8475,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -8693,8 +8521,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/atrium) @@ -8706,15 +8533,15 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/atrium) "aop" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/action_figure, -/obj/random/action_figure, -/obj/random/action_figure, -/obj/structure/closet/wardrobe/grey{ - starts_with = list(/obj/structure/barricade/cutout/viva, /obj/item/clothing/under/color/grey = 3, /obj/item/clothing/shoes/black = 3, /obj/item/clothing/head/soft/grey = 3, /obj/item/clothing/mask/gas/wwii = 3, /obj/item/weapon/storage/toolbox/mechanical = 3, /obj/item/clothing/gloves/fyellow = 3, /obj/item/weapon/card/id/gold/captain/spare/fakespare = 3, /obj/item/weapon/soap/syndie = 3, /obj/item/weapon/storage/box/mousetraps = 3) +/obj/structure/catwalk, +/obj/random/junk, +/obj/random/junk, +/obj/random/maintenance/clean, +/obj/structure/cable{ + icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/area/maintenance/lower/trash_pit) "aoq" = ( /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside1) @@ -8728,7 +8555,6 @@ /obj/structure/railing, /obj/structure/grille, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; frequency = 1379; id_tag = "civ_airlock_pump" }, @@ -8744,7 +8570,6 @@ }, /obj/structure/grille, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 2; frequency = 1379; id_tag = "civ_airlock_pump" }, @@ -8775,7 +8600,6 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /turf/simulated/floor/tiled/dark, @@ -8800,8 +8624,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /obj/machinery/door/window/southleft, /obj/item/clothing/mask/gas, @@ -8821,8 +8644,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 5; - icon_state = "warning" + dir = 5 }, /obj/machinery/door/window/southright, /obj/item/clothing/mask/gas, @@ -8844,8 +8666,7 @@ /obj/item/weapon/soap, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/floor/tiled/dark, /area/storage/surface_eva) @@ -8971,22 +8792,18 @@ "aoN" = ( /obj/structure/sign/directions/medical{ dir = 1; - icon_state = "direction_med"; pixel_y = 8 }, /obj/structure/sign/directions/science{ dir = 1; - icon_state = "direction_sci"; pixel_y = 3 }, /obj/structure/sign/directions/security{ dir = 1; - icon_state = "direction_sec"; pixel_y = -4 }, /obj/structure/sign/directions/engineering{ dir = 1; - icon_state = "direction_eng"; pixel_y = -10 }, /turf/simulated/wall, @@ -9000,8 +8817,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) @@ -9033,8 +8849,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -9070,8 +8885,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/atrium) @@ -9096,8 +8910,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) @@ -9168,8 +8981,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -9344,7 +9156,6 @@ /obj/random/maintenance/research, /obj/random/drinkbottle, /obj/machinery/light_switch{ - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/plating, @@ -9353,11 +9164,12 @@ /turf/simulated/floor/plating, /area/vacant/vacant_site) "apm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/atmospherics/binary/passive_gate/on{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/vacant/vacant_site) +/area/storage/surface_eva) "apn" = ( /obj/structure/cable/green{ d1 = 1; @@ -9488,8 +9300,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 @@ -9673,7 +9484,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/borderfloor{ @@ -9699,9 +9509,9 @@ /turf/simulated/floor/plating, /area/vacant/vacant_site) "apW" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, -/area/vacant/vacant_site) +/area/maintenance/lower/xenoflora) "apX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9718,9 +9528,7 @@ pixel_y = 2 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/storage/art) @@ -9751,7 +9559,6 @@ "aqc" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/landmark{ @@ -9888,7 +9695,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -9923,7 +9729,6 @@ pixel_y = -1 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, @@ -9951,9 +9756,7 @@ /obj/structure/table/reinforced, /obj/effect/floor_decal/industrial/warning, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled/dark, @@ -10010,7 +9813,6 @@ /obj/item/device/radio/off, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/camera/network/civilian{ @@ -10062,9 +9864,7 @@ dir = 10 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) @@ -10073,18 +9873,17 @@ /turf/simulated/floor/plating, /area/vacant/vacant_site) "aqz" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/lower/xenoflora) +"aqA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/cap/visible/supply{ dir = 1 }, /turf/simulated/floor/plating, /area/vacant/vacant_site) -"aqA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green, -/turf/simulated/floor/plating, -/area/vacant/vacant_site) "aqB" = ( /obj/structure/table/standard, /obj/item/device/camera, @@ -10226,8 +10025,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) @@ -10236,16 +10034,13 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) "aqR" = ( -/obj/effect/map_effect/portal/line/side_a{ - dir = 2 - }, +/obj/effect/map_effect/portal/line/side_a, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/lowernortheva/external) "aqS" = ( @@ -10311,8 +10106,7 @@ icon_state = "1-2" }, /obj/machinery/camera/network/tether{ - dir = 8; - icon_state = "camera" + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -10337,8 +10131,7 @@ "ara" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/camera/network/civilian{ dir = 1 @@ -10375,9 +10168,9 @@ /turf/simulated/floor/tiled, /area/storage/art) "are" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/lower/xenoflora) +/obj/structure/cable/green, +/turf/simulated/floor/plating, +/area/vacant/vacant_site) "arf" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -10405,36 +10198,31 @@ /turf/simulated/floor/water/pool, /area/tether/surfacebase/surface_one_hall) "arh" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/vacant_site) -"ari" = ( -/obj/structure/railing{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/lower/vacant_site) +/area/maintenance/lower/xenoflora) +"ari" = ( +/turf/simulated/floor, +/area/maintenance/lower/xenoflora) "arj" = ( /obj/structure/railing{ dir = 1 }, /obj/structure/cable, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) "ark" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) "arl" = ( @@ -10445,13 +10233,10 @@ /area/maintenance/lower/vacant_site) "arm" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/vending/loadout/accessory, /turf/simulated/floor/tiled, @@ -10556,7 +10341,6 @@ /obj/structure/table/standard, /obj/machinery/recharger, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -28 }, /turf/simulated/floor/tiled, @@ -10565,9 +10349,7 @@ /obj/structure/catwalk, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/random/junk, /turf/simulated/floor/tiled/techfloor, @@ -10612,28 +10394,19 @@ /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) "arC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" +/obj/structure/railing{ + dir = 1 }, -/obj/structure/cable/green{ - d1 = 16; - d2 = 0; - icon_state = "16-0" - }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/rust, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) "arD" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/vending/loadout/gadget, /turf/simulated/floor/tiled, @@ -10643,8 +10416,7 @@ /obj/item/bodybag/cryobag, /obj/item/weapon/tool/crowbar, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -10701,8 +10473,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 @@ -10752,12 +10523,18 @@ /turf/simulated/floor/plating, /area/vacant/vacant_site) "arL" = ( -/obj/structure/railing{ - dir = 1 +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) +/obj/structure/cable/green{ + d1 = 16; + d2 = 0; + icon_state = "16-0" + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) "arM" = ( /obj/structure/railing{ dir = 4 @@ -10776,8 +10553,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/computer/guestpass{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/lightgrey/border{ @@ -10792,7 +10568,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "arO" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, /obj/structure/cable/green{ d1 = 1; @@ -10811,14 +10586,12 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) "arQ" = ( /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/machinery/camera/network/medbay{ @@ -10842,7 +10615,6 @@ }, /obj/structure/bed/roller, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, @@ -10930,8 +10702,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, @@ -10939,8 +10710,7 @@ "asc" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/grass, /area/tether/surfacebase/surface_one_hall) @@ -10970,8 +10740,7 @@ dir = 9 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -11034,10 +10803,13 @@ /turf/simulated/floor/tiled/monofloor, /area/hallway/lower/first_west) "asn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/vacant/vacant_site) +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/obj/random/cutout, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) "aso" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, @@ -11089,7 +10861,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /obj/effect/floor_decal/borderfloor/corner2{ @@ -11146,8 +10917,7 @@ }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -11179,9 +10949,7 @@ dir = 5 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/effect/floor_decal/borderfloor/corner2{ @@ -11244,7 +11012,6 @@ "asD" = ( /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /obj/effect/floor_decal/borderfloor{ @@ -11309,8 +11076,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/rust, /obj/effect/floor_decal/rust, @@ -11320,8 +11086,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ dir = 2; @@ -11333,9 +11098,7 @@ "asJ" = ( /obj/structure/catwalk, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled/techfloor, @@ -11423,23 +11186,15 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) @@ -11597,12 +11352,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "atl" = ( -/obj/structure/railing{ - dir = 1; - icon_state = "railing0" +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/water/pool, -/area/tether/surfacebase/surface_one_hall) +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) "atm" = ( /obj/structure/bed/chair/wood, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11615,8 +11372,7 @@ /area/crew_quarters/visitor_dining) "atn" = ( /obj/machinery/status_display{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 @@ -11768,20 +11524,31 @@ /turf/simulated/wall, /area/tether/surfacebase/tram) "atz" = ( -/obj/machinery/door/blast/regular, -/turf/simulated/wall, -/area/tether/surfacebase/tram) -"atA" = ( -/obj/machinery/door/blast/regular, -/turf/simulated/floor/maglev, -/area/tether/surfacebase/tram) -"atB" = ( -/obj/machinery/door/blast/regular, +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) +"atA" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/tether/surfacebase/tram) +"atB" = ( +/turf/simulated/floor/maglev, +/area/tether/surfacebase/tram) "atC" = ( -/obj/structure/sign/warning/docking_area, -/turf/simulated/wall, +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "atD" = ( /obj/structure/closet/excavation, @@ -11791,8 +11558,7 @@ "atE" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -11874,8 +11640,7 @@ /area/tether/surfacebase/medical/lowerhall) "atK" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/random/trash_pile, /turf/simulated/floor/tiled/techfloor, @@ -11950,7 +11715,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -11989,8 +11753,7 @@ /area/crew_quarters/locker) "atU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled, /area/crew_quarters/locker) @@ -12003,7 +11766,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -12015,9 +11777,7 @@ "atX" = ( /obj/structure/bed/chair, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -12038,10 +11798,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aua" = ( -/obj/machinery/light{ - dir = 1 +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "aub" = ( /obj/effect/floor_decal/industrial/danger{ @@ -12059,12 +11822,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "aue" = ( -/turf/simulated/floor/maglev, -/area/tether/surfacebase/tram) -"auf" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 }, +/obj/machinery/camera/network/civilian{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "aug" = ( @@ -12122,8 +11885,7 @@ dir = 6 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) @@ -12169,17 +11931,14 @@ name_tag = "Civ West Subgrid" }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/substation/civ_west) "aum" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Civ West"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green{ icon_state = "0-8" @@ -12204,8 +11963,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance/common{ name = "Mining Maintenance Access" @@ -12247,7 +12005,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /turf/simulated/floor/tiled, @@ -12366,8 +12123,7 @@ }, /obj/machinery/computer/guestpass{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) @@ -12379,15 +12135,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "auD" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 - }, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/machinery/door/blast/regular, +/turf/simulated/wall, /area/tether/surfacebase/tram) "auE" = ( /turf/simulated/wall, @@ -12437,14 +12186,12 @@ "auH" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, /obj/effect/floor_decal/rust, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /obj/machinery/camera/network/engineering{ dir = 4 @@ -12474,15 +12221,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plating, @@ -12497,12 +12242,10 @@ /obj/item/weapon/virusdish/random, /obj/item/weapon/virusdish/random, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /obj/machinery/camera/network/medbay{ - dir = 8; - icon_state = "camera" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -12556,8 +12299,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 @@ -12608,16 +12350,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rnd/external) -"auX" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/tether/surfacebase/tram; - base_turf = /turf/simulated/floor/tiled/techfloor/grid; - docking_controller = null; - landmark_tag = "escape_station"; - name = "Tether Surface Base" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/tram) "auY" = ( /obj/structure/cable/green{ d1 = 1; @@ -12680,8 +12412,7 @@ dir = 10 }, /obj/machinery/camera/network/tether{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) @@ -12697,8 +12428,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/airlock/engineering{ name = "Civilian West Substation"; @@ -12723,8 +12453,7 @@ icon_state = "2-4" }, /obj/machinery/alarm{ - pixel_y = 22; - target_temperature = 293.15 + pixel_y = 22 }, /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -12739,15 +12468,16 @@ /turf/simulated/floor/plating, /area/maintenance/lower/solars) "avi" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/engi{ + id_tag = "elevescaper"; + name = "Elevator Maintenance" }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/lower/solars) +/area/maintenance/lower/xenoflora) "avj" = ( /obj/machinery/door/airlock/maintenance/common{ name = "Solars Maintenance Access" @@ -12963,7 +12693,6 @@ dir = 1 }, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; pixel_x = 10; pixel_y = 36 @@ -13054,9 +12783,7 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable/green{ @@ -13096,7 +12823,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /turf/simulated/floor/tiled, @@ -13274,19 +13000,10 @@ /turf/simulated/floor/plating, /area/maintenance/lower/solars) "avO" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/maintenance/lower/solars) +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) "avP" = ( /obj/structure/cable{ icon_state = "1-8" @@ -13309,8 +13026,7 @@ "avR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, @@ -13318,8 +13034,7 @@ "avS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/white, /area/medical/virology) @@ -13335,9 +13050,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13388,8 +13101,7 @@ /obj/structure/bed/padded, /obj/item/weapon/bedsheet/green, /obj/machinery/camera/network/medbay{ - dir = 8; - icon_state = "camera" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -13447,8 +13159,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -13486,14 +13197,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) -"awk" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'HIGH VOLTAGE'"; - icon_state = "shock"; - name = "HIGH VOLTAGE" - }, -/turf/simulated/wall, -/area/tether/surfacebase/tram) "awl" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -13602,19 +13305,21 @@ dir = 1 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/monotile, /area/hallway/lower/first_west) "awr" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, +/obj/effect/floor_decal/rust, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "aws" = ( @@ -13623,7 +13328,6 @@ /area/maintenance/lower/solars) "awt" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -13664,8 +13368,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) @@ -13706,8 +13409,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/machinery/camera/network/medbay{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) @@ -13751,22 +13453,17 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "awB" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/button/remote/airlock{ + id = "elevescaper"; + name = "elevator escape button"; + pixel_y = 32 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) +/area/maintenance/lower/xenoflora) "awC" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -13787,8 +13484,7 @@ /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, /obj/machinery/atmospherics/pipe/zpipe/up/supply, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/cable{ icon_state = "16-0" @@ -13900,8 +13596,7 @@ dir = 4 }, /obj/machinery/camera/network/tether{ - dir = 8; - icon_state = "camera" + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 @@ -13962,7 +13657,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/table/glass, @@ -13971,8 +13665,7 @@ /area/security/checkpoint) "awR" = ( /obj/machinery/vending/snack{ - dir = 4; - icon_state = "snack" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) @@ -14062,6 +13755,10 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "awW" = ( @@ -14090,6 +13787,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "awX" = ( @@ -14122,6 +13822,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) "awY" = ( @@ -14158,6 +13861,9 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) "axa" = ( @@ -14281,8 +13987,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -14451,7 +14156,6 @@ dir = 8 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -14459,7 +14163,6 @@ "axq" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -30 }, /obj/effect/floor_decal/corner/lightgrey/border, @@ -14511,7 +14214,6 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, @@ -14545,8 +14247,7 @@ /area/tether/surfacebase/tram) "axz" = ( /obj/machinery/vending/cola{ - dir = 4; - icon_state = "Soda_Machine" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) @@ -14604,19 +14305,14 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "axC" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/railing{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance/rnd{ - name = "Science Maintenance" +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/solars) +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) "axD" = ( /obj/effect/floor_decal/rust, /obj/structure/cable{ @@ -14628,14 +14324,14 @@ /turf/simulated/floor/plating, /area/maintenance/lower/solars) "axE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/solars) +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) "axF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14675,28 +14371,19 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "axI" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) +/area/maintenance/lower/solars) "axJ" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet/green, /obj/machinery/status_display{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -14718,9 +14405,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "axL" = ( @@ -14778,8 +14462,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/structure/cable/green{ d1 = 1; @@ -14790,6 +14473,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "axR" = ( @@ -14831,7 +14515,6 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 30 }, /obj/effect/floor_decal/corner/lightgrey/border{ @@ -14887,9 +14570,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -14958,9 +14639,7 @@ "ayd" = ( /obj/machinery/shower{ dir = 4; - icon_state = "shower"; - pixel_x = 2; - pixel_y = 0 + pixel_x = 2 }, /obj/structure/window/reinforced{ dir = 4 @@ -14975,7 +14654,6 @@ /obj/structure/table/standard, /obj/random/medical, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -14985,11 +14663,8 @@ "ayf" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, -/obj/structure/disposalpipe/segment, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, @@ -15053,12 +14728,10 @@ /obj/structure/table/glass, /obj/item/device/radio{ anchored = 1; - broadcasting = 0; canhear_range = 7; frequency = 1487; icon = 'icons/obj/items.dmi'; icon_state = "red_phone"; - listening = 1; name = "Virology Emergency Phone"; pixel_x = -6; pixel_y = 8 @@ -15180,8 +14853,7 @@ /area/rnd/hallway) "ayt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/hidden/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15323,9 +14995,7 @@ /obj/structure/bed/padded, /obj/item/weapon/bedsheet/green, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -15349,21 +15019,30 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/tagger{ + dir = 2; + name = "package tagger - Void"; + sort_tag = "Void" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) "ayC" = ( /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) "ayD" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance/medical{ - locked = 1; - name = "Medical Maintenance Access"; - req_access = list(5) +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/turf/simulated/floor/plating, -/area/medical/virologyaccess) +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) "ayE" = ( /obj/machinery/firealarm{ dir = 8; @@ -15417,9 +15096,7 @@ /obj/structure/table/glass, /obj/item/weapon/storage/box/monkeycubes, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -15478,9 +15155,7 @@ dir = 6 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/locker/laundry_arrival) @@ -15545,9 +15220,7 @@ pixel_y = -1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/effect/floor_decal/borderfloor{ @@ -15603,6 +15276,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) "aza" = ( @@ -15612,12 +15286,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) "azb" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/light/small{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) +/area/maintenance/lower/xenoflora) "azc" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -15705,7 +15379,6 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 30 }, /obj/effect/floor_decal/corner/lightgrey/border{ @@ -15731,8 +15404,7 @@ }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -15741,9 +15413,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/effect/floor_decal/corner/lightgrey/border{ @@ -15794,16 +15464,14 @@ /area/tether/surfacebase/tram) "azn" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/effect/landmark/tram, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "azo" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/status_display{ pixel_y = 30 @@ -15828,15 +15496,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) -"azr" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/tram) "azs" = ( /turf/simulated/wall/r_wall, /area/maintenance/lower/solars) @@ -15859,8 +15518,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/hallway) @@ -15877,8 +15535,7 @@ /obj/item/weapon/hand_labeler, /obj/structure/table/glass, /obj/machinery/camera/network/medbay{ - dir = 4; - icon_state = "camera" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -15975,7 +15632,6 @@ /obj/item/weapon/storage/box/cups, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -16005,8 +15661,7 @@ "azE" = ( /obj/structure/railing, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) @@ -16016,13 +15671,17 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) "azG" = ( -/obj/structure/disposalpipe/tagger{ - dir = 2; - name = "package tagger - Void"; - sort_tag = "Void" +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'CRUSH WARNING'."; + name = "\improper CRUSH WARNING"; + pixel_y = -32 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/railing{ + dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) +/area/maintenance/lower/xenoflora) "azH" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -16061,22 +15720,9 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "azK" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/xenoflora) "azL" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 @@ -16134,7 +15780,6 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -30 }, /obj/effect/floor_decal/corner/lightgrey/border, @@ -16183,8 +15828,7 @@ "azT" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 22; - pixel_y = 0 + pixel_x = 22 }, /obj/structure/cable/green{ d1 = 2; @@ -16197,31 +15841,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "azU" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "ward_tint" +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'CRUSH WARNING'."; + name = "\improper CRUSH WARNING"; + pixel_y = -32 }, -/obj/structure/grille, -/obj/machinery/door/blast/shutters{ - closed_layer = 10; - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "medbayquar"; - layer = 1; - name = "Medbay Emergency Lockdown Shutters"; - opacity = 0; - open_layer = 1 +/obj/effect/floor_decal/industrial/warning, +/obj/structure/railing{ + dir = 8 }, /turf/simulated/floor/plating, -/area/tether/surfacebase/lowernorthhall) +/area/maintenance/lower/xenoflora) "azV" = ( /turf/simulated/wall, /area/medical/virology) @@ -16271,9 +15904,7 @@ "azZ" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -16290,8 +15921,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -16304,10 +15934,6 @@ /area/maintenance/lowmedbaymaint) "aAb" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/medical{ - name = "Medical Maintenance Access"; - req_access = list(5) - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -16319,6 +15945,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "aAc" = ( @@ -16351,6 +15978,7 @@ d2 = 4; icon_state = "2-4" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) "aAd" = ( @@ -16362,8 +15990,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 22; - pixel_y = 0 + pixel_x = 22 }, /obj/machinery/light, /obj/effect/floor_decal/borderfloorwhite/corner2{ @@ -16380,13 +16007,16 @@ pixel_y = -28; req_access = list(67) }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) "aAe" = ( /obj/structure/bed/padded, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/effect/floor_decal/corner/lime{ @@ -16446,8 +16076,89 @@ name = "Medical Maintenance Access"; req_access = list(5) }, +/obj/machinery/door/blast/shutters{ + closed_layer = 10; + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "medbayquar"; + layer = 1; + name = "Medbay Emergency Lockdown Shutters"; + opacity = 0; + open_layer = 1 + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) +"aAj" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance/rnd{ + name = "Science Maintenance" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/lower/solars) +"aAk" = ( +/obj/effect/floor_decal/rust, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/lower/solars) +"aAl" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/lower/solars) +"aAm" = ( +/obj/random/junk, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aAn" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aAo" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aAp" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aAq" = ( +/obj/structure/table/rack, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aAr" = ( +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "aAs" = ( /obj/structure/cable{ d1 = 2; @@ -16459,17 +16170,16 @@ /area/maintenance/lower/solars) "aAt" = ( /obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/alarm{ - pixel_y = 22; - target_temperature = 293.15 - }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/maintenance/lower/solars) +/area/maintenance/lower/research) "aAu" = ( /obj/structure/cable{ d1 = 4; @@ -16480,23 +16190,38 @@ /area/maintenance/lower/solars) "aAv" = ( /obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 5 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/maintenance/lower/solars) +/area/maintenance/lower/research) "aAw" = ( /obj/structure/cable{ - d1 = 4; - d2 = 8; icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/lower/solars) +/area/maintenance/lower/research) "aAx" = ( /obj/structure/cable{ d1 = 4; @@ -16592,6 +16317,37 @@ "aAD" = ( /turf/simulated/wall, /area/maintenance/lowmedbaymaint) +"aAE" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aAF" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/random/junk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "aAG" = ( /turf/simulated/mineral, /area/maintenance/lowmedbaymaint) @@ -16621,6 +16377,30 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/lowernortheva) +"aAK" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/obj/random/junk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aAL" = ( +/obj/effect/floor_decal/rust, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "aAM" = ( /obj/structure/closet/crate, /obj/random/maintenance/engineering, @@ -16655,8 +16435,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, @@ -16681,6 +16460,31 @@ /obj/random/contraband, /turf/simulated/floor/plating, /area/tether/surfacebase/surface_one_hall) +"aAT" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aAU" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aAV" = ( +/obj/structure/railing, +/obj/structure/table/rack, +/obj/item/clothing/suit/suspenders, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "aAW" = ( /obj/structure/cable/green{ d1 = 2; @@ -16709,6 +16513,88 @@ }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) +"aAY" = ( +/obj/structure/railing, +/obj/structure/closet/crate, +/obj/item/device/camera, +/obj/item/device/tape/random, +/obj/item/device/taperecorder/empty, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aAZ" = ( +/obj/structure/railing, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aBa" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aBb" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aBc" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/closet/crate, +/obj/random/cigarettes, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aBd" = ( +/obj/random/trash_pile, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aBe" = ( +/obj/structure/railing, +/obj/structure/table/rack, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/weapon/tank/emergency, +/obj/item/weapon/tank/emergency, +/obj/item/weapon/tank/emergency, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aBf" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aBg" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/visible/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "aBh" = ( /obj/structure/cable{ d1 = 2; @@ -16723,6 +16609,53 @@ }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) +"aBj" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aBk" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/plating, +/area/vacant/vacant_site/east) +"aBl" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aBm" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "aBn" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -16763,6 +16696,32 @@ }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) +"aBr" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aBs" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/turf/simulated/floor/plating, +/area/vacant/vacant_site/east) +"aBt" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "aBu" = ( /obj/structure/cable/heavyduty{ icon_state = "0-2" @@ -16820,7 +16779,6 @@ "aBz" = ( /obj/machinery/power/apc{ name = "south bump"; - pixel_x = 0; pixel_y = -32 }, /obj/machinery/light_switch{ @@ -16869,7 +16827,6 @@ /obj/effect/floor_decal/corner/brown/border, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -16943,68 +16900,79 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "aBH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/obj/machinery/light/small{ - dir = 8 +/obj/effect/floor_decal/rust, +/obj/structure/railing{ + dir = 1 }, +/obj/structure/closet/crate, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aBI" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/railing{ + dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/structure/table/rack, +/obj/item/clothing/suit/fire/firefighter, +/obj/item/weapon/tank/oxygen/red, +/obj/item/clothing/mask/gas/wwii, +/obj/item/clothing/head/hardhat/red, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aBJ" = ( /turf/simulated/wall/r_wall, /area/maintenance/lower/research) "aBK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) -"aBL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank, -/obj/machinery/light/small{ +/obj/structure/railing{ dir = 1 }, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) -"aBM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, +"aBL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 10 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) +"aBM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 6 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "aBN" = ( -/obj/random/trash_pile, -/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aBO" = ( /turf/simulated/wall, /area/maintenance/lower/research) "aBP" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aBQ" = ( @@ -17123,8 +17091,7 @@ }, /obj/machinery/computer/guestpass{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 @@ -17201,6 +17168,60 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) +"aCh" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aCi" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aCj" = ( +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/surface_atmos) +"aCk" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/floor_decal/industrial/warning/corner, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/surface_atmos) +"aCl" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/surface_atmos) "aCm" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -17219,9 +17240,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -17243,6 +17262,13 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/rnd/hallway) +"aCp" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "aCq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -17280,108 +17306,67 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aCu" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 5 +/obj/structure/railing, +/obj/structure/closet/crate, +/obj/item/clothing/head/that, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/machinery/light/small{ + dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aCv" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aCw" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aCx" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable/cyan{ + d2 = 4; + icon_state = "0-4" }, -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Atmospherics Subgrid"; + name_tag = "Atmospherics Subgrid" }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/maintenance/substation/surface_atmos) "aCy" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 + dir = 5 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aCz" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/random/junk, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/structure/catwalk, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aCA" = ( @@ -17422,13 +17407,18 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aCC" = ( -/obj/effect/floor_decal/rust, -/obj/structure/railing{ - dir = 8 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/maintenance/asmaint2) "aCD" = ( /obj/machinery/recharge_station, /obj/structure/disposalpipe/segment, @@ -17457,7 +17447,6 @@ /obj/structure/reagent_dispensers/watertank, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -17491,9 +17480,16 @@ /turf/simulated/floor/plating, /area/vacant/vacant_site/east) "aCK" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/vacant/vacant_site/east) +/area/maintenance/asmaint2) "aCL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17562,8 +17558,7 @@ /area/crew_quarters/visitor_dining) "aCT" = ( /obj/machinery/vending/fitness{ - dir = 4; - icon_state = "fitness" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) @@ -17592,6 +17587,37 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) +"aCW" = ( +/obj/structure/cable/green{ + icon_state = "16-0" + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) +"aCX" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aCY" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) +"aCZ" = ( +/obj/random/junk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "aDa" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ @@ -17639,7 +17665,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -17664,10 +17689,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aDk" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/bone/skull/unathi, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aDl" = ( @@ -17717,7 +17739,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /obj/effect/floor_decal/borderfloor{ @@ -17734,8 +17755,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/machinery/alarm{ - pixel_y = 22; - target_temperature = 293.15 + pixel_y = 22 }, /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -17749,7 +17769,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -17766,26 +17785,20 @@ /area/crew_quarters/visitor_dining) "aDv" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/lino, /area/crew_quarters/visitor_dining) "aDw" = ( /obj/machinery/vending/coffee{ - dir = 4; - icon_state = "coffee" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aDx" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, /turf/simulated/floor/plating, -/area/maintenance/lower/solars) +/area/maintenance/lower/research) "aDy" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 @@ -17908,6 +17921,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) +"aDI" = ( +/turf/simulated/floor/plating, +/area/engineering/atmos) "aDJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -17936,6 +17952,11 @@ /obj/structure/stairs/north, /turf/simulated/floor/tiled, /area/rnd/hallway) +"aDM" = ( +/obj/structure/ladder/up, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "aDN" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -17944,8 +17965,7 @@ dir = 4 }, /obj/machinery/status_display{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -17959,7 +17979,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -17979,15 +17998,9 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/rnd) "aDR" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/maintenance/lower/atmos) "aDS" = ( /obj/machinery/door/airlock/maintenance/common{ name = "Laundry Maintenance Access" @@ -18066,7 +18079,6 @@ /area/crew_quarters/visitor_dining) "aDZ" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; pixel_x = 10; pixel_y = 36 @@ -18077,7 +18089,6 @@ name = "Cafe Shutters"; pixel_x = -10; pixel_y = 36; - req_access = list(); req_one_access = list(25) }, /obj/structure/sink{ @@ -18101,7 +18112,6 @@ "aEb" = ( /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /turf/simulated/floor/tiled, @@ -18123,8 +18133,7 @@ /area/tether/surfacebase/cargostore/warehouse) "aEe" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -18275,8 +18284,7 @@ /area/rnd/hallway) "aEq" = ( /obj/machinery/door/airlock/maintenance/int{ - name = "Emergency Storage"; - req_one_access = list() + name = "Emergency Storage" }, /obj/structure/cable/green{ d1 = 4; @@ -18302,24 +18310,28 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/rnd) "aEu" = ( -/obj/structure/railing, -/obj/structure/railing{ +/obj/machinery/atmospherics/pipe/manifold/visible/purple{ + dir = 4 + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/processing) +"aEv" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/camera/network/engineering{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/lower/research) -"aEv" = ( -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/engineering/atmos/processing) "aEw" = ( /obj/effect/floor_decal/rust, /obj/structure/railing, @@ -18329,78 +18341,53 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aEx" = ( -/obj/structure/railing, -/obj/structure/table/rack, -/obj/item/clothing/suit/suspenders, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/maintenance/lower/atmos) "aEy" = ( -/obj/structure/railing, -/obj/structure/closet/crate, -/obj/item/device/camera, -/obj/item/device/tape/random, -/obj/item/device/taperecorder/empty, -/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/maintenance/lower/atmos) "aEz" = ( /obj/structure/railing, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aEA" = ( -/obj/structure/railing, -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) -"aEB" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) -"aEC" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 9 }, -/obj/structure/closet/crate, -/obj/random/cigarettes, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/lower/research) -"aED" = ( -/obj/random/trash_pile, -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, +/area/engineering/atmos/processing) +"aEB" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/lower/research) -"aEE" = ( -/obj/structure/railing, +/area/engineering/atmos/processing) +"aEC" = ( /obj/structure/table/rack, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/weapon/tank/emergency, -/obj/item/weapon/tank/emergency, -/obj/item/weapon/tank/emergency, -/obj/effect/decal/cleanable/dirt, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/maintenance/lower/atmos) +"aED" = ( +/obj/structure/closet/crate, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) +"aEE" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "aEF" = ( /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ - autoclose = 1; dir = 2; id_tag = null; - name = "Construction Site"; - req_access = list() + name = "Construction Site" }, /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/surface_one_hall) @@ -18528,7 +18515,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -18667,9 +18653,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -18694,26 +18678,13 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/rnd) "aFk" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/alarm{ + pixel_y = 22 }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/supply{ - dir = 8 - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, +/obj/structure/table/bench/steel, +/obj/random/cigarettes, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/maintenance/lower/atmos) "aFl" = ( /obj/structure/cable{ d1 = 4; @@ -18730,21 +18701,26 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aFm" = ( -/obj/structure/cable{ +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 +/obj/machinery/holosign/bar{ + id = "maintbar"; + pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/lower/atmos) "aFn" = ( /obj/structure/cable{ d1 = 4; @@ -18762,17 +18738,25 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aFo" = ( -/obj/structure/cable{ +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/visible/supply, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/lower/atmos) "aFp" = ( /obj/structure/cable{ d1 = 4; @@ -18850,11 +18834,9 @@ /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ - autoclose = 1; dir = 2; id_tag = null; - name = "Cafe"; - req_access = list() + name = "Cafe" }, /obj/structure/cable/green{ d1 = 4; @@ -19021,7 +19003,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled, @@ -19084,8 +19065,7 @@ department = "Science"; departmentType = 2; name = "Science Requests Console"; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -19372,9 +19352,7 @@ dir = 9 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -19479,16 +19457,14 @@ }, /obj/machinery/power/apc/high{ dir = 4; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/simulated/floor/tiled, /area/rnd/hallway) "aGr" = ( /obj/structure/bed/chair/sofa/brown/right, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/brown/border{ dir = 1 @@ -19518,14 +19494,19 @@ /turf/simulated/wall, /area/vacant/vacant_site/east) "aGu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/turf/simulated/floor/plating, -/area/vacant/vacant_site/east) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/wood, +/area/vacant/vacant_bar) "aGv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -19569,7 +19550,6 @@ "aGA" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -25 }, /obj/structure/bed/chair/wood{ @@ -19655,8 +19635,7 @@ dir = 4 }, /obj/machinery/newscaster{ - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -19802,6 +19781,19 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/cargostore/office) +"aGR" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/item/weapon/stool/padded, +/turf/simulated/floor/wood, +/area/vacant/vacant_bar) "aGS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -19851,7 +19843,6 @@ /obj/effect/floor_decal/corner/mauve/border, /obj/machinery/computer/guestpass{ dir = 1; - icon_state = "guest"; pixel_y = -28 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -19883,7 +19874,6 @@ dir = 8 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -19935,35 +19925,28 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aHd" = ( -/obj/structure/cable{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/turf/simulated/floor/wood, +/area/vacant/vacant_bar) "aHe" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/lower/atmos) "aHf" = ( /obj/structure/cable{ icon_state = "4-8" @@ -19978,27 +19961,18 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aHg" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/random/action_figure, +/obj/random/action_figure, +/obj/random/action_figure, +/obj/structure/closet/wardrobe/grey{ + starts_with = list(/obj/structure/barricade/cutout/viva, /obj/item/clothing/under/color/grey = 3, /obj/item/clothing/shoes/black = 3, /obj/item/clothing/head/soft/grey = 3, /obj/item/clothing/mask/gas/wwii = 3, /obj/item/weapon/storage/toolbox/mechanical = 3, /obj/item/clothing/gloves/fyellow = 3, /obj/item/weapon/card/id/gold/captain/spare/fakespare = 3, /obj/item/weapon/soap/syndie = 3, /obj/item/weapon/storage/box/mousetraps = 3) }, -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/maintenance/lower/atmos) "aHh" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/structure/reagent_dispensers/water_cooler/full, @@ -20018,13 +19992,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "aHj" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 +/obj/machinery/door/window/southright{ + req_access = list(5) }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/vacant/vacant_site/east) +/area/maintenance/lower/atmos) "aHk" = ( /obj/effect/floor_decal/borderfloor, /obj/structure/bed/chair{ @@ -20080,8 +20052,7 @@ dir = 10 }, /obj/structure/sign/nosmoking_2{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/tiled, /area/rnd/hallway) @@ -20138,12 +20109,10 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/hallway) "aHu" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, +/obj/structure/window/reinforced, +/obj/structure/closet/boxinggloves, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/maintenance/lower/atmos) "aHv" = ( /turf/simulated/wall/r_wall, /area/maintenance/substation/surface_atmos) @@ -20151,34 +20120,28 @@ /obj/effect/floor_decal/rust, /obj/random/trash_pile, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aHx" = ( -/obj/effect/floor_decal/rust, -/obj/structure/railing{ - dir = 1; - icon_state = "railing0" +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 }, -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/maintenance/lower/atmos) "aHy" = ( -/obj/structure/railing{ - dir = 1; - icon_state = "railing0" +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 28 }, -/obj/structure/table/rack, -/obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/oxygen/red, -/obj/item/clothing/mask/gas/wwii, -/obj/item/clothing/head/hardhat/red, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/maintenance/lower/atmos) "aHz" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -20197,16 +20160,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) "aHB" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 +/obj/effect/floor_decal/rust, +/obj/structure/toilet{ + pixel_y = 10 }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/maintDorm3) "aHC" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 @@ -20229,16 +20188,31 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aHE" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 10 +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24; + pixel_y = 6 }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/machinery/button/remote/airlock{ + id = "maintdorm2"; + name = "Room 2 Lock"; + pixel_x = 23; + pixel_y = -4; + specialfunctions = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/maintDorm2) "aHF" = ( /obj/structure/table/rack, /obj/structure/window/reinforced{ @@ -20327,21 +20301,14 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "aHO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 6 - }, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22 +/obj/structure/toilet{ + pixel_y = 10 }, /turf/simulated/floor/plating, -/area/maintenance/asmaint2) +/area/crew_quarters/sleep/maintDorm2) "aHP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) @@ -20424,41 +20391,58 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/cargostore) "aHW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24; + pixel_y = 6 + }, +/obj/machinery/button/remote/airlock{ + id = "maintdorm1"; + name = "Room 1 Lock"; + pixel_x = 23; + pixel_y = -4; + specialfunctions = 4 + }, /obj/structure/cable/green{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 2; + icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/maintDorm1) "aHX" = ( +/obj/effect/floor_decal/rust, +/obj/structure/sink{ + pixel_y = 22 + }, +/obj/structure/mirror{ + dir = 4; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/maintDorm1) +"aHY" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) -"aHY" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 24 - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/turf/simulated/floor/wood, +/area/vacant/vacant_bar) "aHZ" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/vacant/vacant_bar) "aIa" = ( /turf/simulated/floor/plating, /area/maintenance/lower/research) @@ -20479,34 +20463,24 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aId" = ( -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/table/woodentable, +/obj/machinery/microwave, /turf/simulated/floor/plating, -/area/maintenance/substation/surface_atmos) +/area/crew_quarters/sleep/maintDorm3) "aIe" = ( -/obj/structure/cable{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 2; + icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/warning/corner, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/substation/surface_atmos) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/maintDorm3) "aIf" = ( /obj/structure/cable{ d1 = 4; @@ -20521,39 +20495,36 @@ /turf/simulated/floor/plating, /area/maintenance/substation/surface_atmos) "aIg" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/floor_decal/industrial/warning, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/maintenance/substation/surface_atmos) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/maintDorm3) "aIh" = ( /turf/simulated/wall/r_wall, /area/engineering/atmos) "aIi" = ( -/obj/structure/railing{ +/obj/structure/table, +/obj/item/frame, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/maintDorm2) +"aIj" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) -"aIj" = ( -/obj/structure/railing, -/obj/structure/closet/crate, -/obj/item/clothing/head/that, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/maintDorm2) "aIk" = ( /obj/structure/railing, /obj/structure/table/rack, @@ -20737,20 +20708,24 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "aIE" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) -"aIF" = ( +/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/crew_quarters/sleep/maintDorm2) +"aIF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/crew_quarters/sleep/maintDorm2) "aIG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -20761,26 +20736,23 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aIH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/structure/table, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/maintDorm1) "aII" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/crew_quarters/sleep/maintDorm1) "aIJ" = ( /obj/effect/floor_decal/rust, /obj/structure/catwalk, @@ -20812,26 +20784,15 @@ /turf/simulated/floor/plating, /area/maintenance/substation/surface_atmos) "aIM" = ( -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/alarm{ + dir = 8; + pixel_x = 25 }, -/obj/machinery/power/sensor{ - name = "Powernet Sensor - Atmospherics Subgrid"; - name_tag = "Atmospherics Subgrid" - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" - }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/substation/surface_atmos) +/area/crew_quarters/sleep/maintDorm1) "aIN" = ( /obj/structure/cable/cyan{ d2 = 8; @@ -20858,8 +20819,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/machinery/space_heater, /turf/simulated/floor/tiled/techmaint, @@ -20869,13 +20829,10 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/tiled/techmaint, @@ -20883,33 +20840,26 @@ "aIR" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "aIS" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/tiled/techmaint, @@ -20924,20 +20874,16 @@ /area/engineering/atmos) "aIU" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/machinery/camera/network/engineering, /obj/machinery/portable_atmospherics/powered/pump/filled, @@ -20946,13 +20892,10 @@ "aIV" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/portable_atmospherics/powered/pump/filled, /turf/simulated/floor/tiled/techmaint, @@ -20962,13 +20905,10 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/portable_atmospherics/powered/pump/filled, /turf/simulated/floor/tiled/techmaint, @@ -20980,47 +20920,35 @@ dir = 5 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 5; - icon_state = "bordercolor" + dir = 5 }, /obj/fiftyspawner/steel, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "aIY" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 5 - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/vacant/vacant_bar) "aIZ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/vacant/vacant_bar) "aJa" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/maintDorm3) "aJb" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 @@ -21042,8 +20970,7 @@ }, /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/steeldecal/steel_decals_central6{ - dir = 4; - icon_state = "steel_decals_central6" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -21065,8 +20992,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -21163,8 +21089,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/loading{ - dir = 8; - icon_state = "loadingarea" + dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -21279,19 +21204,21 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) "aJu" = ( -/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d2 = 4; + icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/item/stack/material/wood{ + amount = 10 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) +/obj/structure/table, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/maintDorm2) "aJv" = ( /obj/effect/floor_decal/rust, /obj/structure/cable/green{ @@ -21303,35 +21230,33 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "aJw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/maintenance/asmaint2) +/area/crew_quarters/sleep/maintDorm1) "aJx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - icon_state = "16-0" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ + d1 = 1; d2 = 8; - icon_state = "0-8" + icon_state = "1-8" }, /turf/simulated/floor/plating, -/area/maintenance/asmaint2) +/area/crew_quarters/sleep/maintDorm1) "aJy" = ( /obj/structure/table/standard, /obj/item/weapon/stamp/cargo, @@ -21382,8 +21307,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 22; - pixel_y = 0 + pixel_x = 22 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore/office) @@ -21406,19 +21330,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "aJD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) -"aJE" = ( -/obj/machinery/light/small{ - dir = 4; - pixel_y = 0 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/light_construct/small, /turf/simulated/floor/plating, -/area/maintenance/lower/research) +/area/crew_quarters/sleep/maintDorm1) +"aJE" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/vacant/vacant_bar) "aJF" = ( /turf/simulated/wall/r_wall, /area/engineering/atmos/gas_storage) @@ -21438,15 +21359,13 @@ "aJH" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/machinery/space_heater, /turf/simulated/floor/tiled/techmaint, @@ -21507,8 +21426,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/item/taperoll/atmos, /obj/item/stack/cable_coil/random_belt, @@ -21673,8 +21591,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) @@ -21696,17 +21613,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) "aKg" = ( -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/vacant/vacant_bar) "aKh" = ( /obj/structure/table/rack, /obj/item/clothing/suit/fire/firefighter, @@ -21739,7 +21649,6 @@ department = "Atmospherics"; departmentType = 3; name = "Atmos RC"; - pixel_x = 0; pixel_y = 28 }, /obj/item/weapon/tool/wrench, @@ -21770,8 +21679,6 @@ /obj/machinery/button/remote/blast_door{ id = "atmoslockdown"; name = "Atmospherics Lockdown"; - pixel_x = 0; - pixel_y = 0; req_one_access = list(10,24) }, /turf/simulated/floor/tiled, @@ -21834,8 +21741,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/machinery/space_heater, /turf/simulated/floor/tiled/techmaint, @@ -21881,8 +21787,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/item/weapon/storage/box/lights/mixed, /turf/simulated/floor/tiled/techmaint, @@ -21896,8 +21801,7 @@ "aKy" = ( /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -21939,7 +21843,6 @@ /obj/random/plushie, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -22122,12 +22025,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "aKS" = ( -/obj/random/junk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/maintDorm1) "aKT" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/industrial/outline/yellow, @@ -22220,17 +22121,25 @@ /area/engineering/atmos) "aLe" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) "aLf" = ( -/obj/item/weapon/bone/skull/unathi, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/vacant/vacant_bar) "aLg" = ( /turf/simulated/wall, /area/crew_quarters/sleep/Dorm_7) @@ -22301,8 +22210,7 @@ /area/rnd/external) "aLo" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 6 @@ -22310,7 +22218,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals3, /obj/machinery/embedded_controller/radio/airlock/phoron{ id_tag = "rnd_s_airlock"; - pixel_x = 0; pixel_y = 30 }, /obj/machinery/airlock_sensor/phoron{ @@ -22355,15 +22262,13 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/external) "aLr" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 4 @@ -22434,10 +22339,15 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aLw" = ( -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/table/bench/padded, +/turf/simulated/floor/wood, +/area/vacant/vacant_bar) "aLx" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/floor_decal/industrial/outline/yellow, @@ -22476,7 +22386,6 @@ "aLA" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -22519,8 +22428,7 @@ icon_state = "4-8" }, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/machinery/atmospherics/binary/pump/on{ name = "Ports to Waste" @@ -22558,8 +22466,7 @@ name = "Air to Ports" }, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -22573,9 +22480,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aLL" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/engineering/atmos) +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/wood, +/area/vacant/vacant_bar) "aLM" = ( /turf/simulated/floor/reinforced{ name = "Holodeck Projector Floor" @@ -22598,13 +22505,11 @@ "aLO" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -22663,9 +22568,7 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /obj/random/drinkbottle, @@ -22697,7 +22600,6 @@ }, /obj/structure/mirror{ dir = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -22708,8 +22610,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_8) @@ -22760,8 +22661,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/rnd/external) @@ -22807,7 +22707,6 @@ "aMg" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled/techmaint, @@ -22884,8 +22783,7 @@ /area/engineering/atmos) "aMo" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/machinery/meter, /turf/simulated/floor/tiled, @@ -22929,8 +22827,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -23086,8 +22983,7 @@ /area/crew_quarters/sleep/Dorm_8) "aMI" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -23203,8 +23099,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -23216,8 +23111,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 @@ -23261,15 +23155,13 @@ /area/engineering/atmos) "aNd" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -23326,7 +23218,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -23462,7 +23353,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -23473,7 +23363,6 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -23481,8 +23370,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -23546,9 +23434,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/rnd/external) "aNx" = ( -/obj/machinery/camera/network/research{ - dir = 2 - }, +/obj/machinery/camera/network/research, /obj/machinery/floodlight, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/rnd/external) @@ -23586,8 +23472,7 @@ /area/engineering/atmos/gas_storage) "aNC" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -23607,8 +23492,7 @@ /area/engineering/atmos) "aNF" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -23620,8 +23504,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -23643,8 +23526,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -23663,8 +23545,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -23743,8 +23624,7 @@ dir = 10 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/structure/extinguisher_cabinet{ pixel_x = 25 @@ -23755,11 +23635,9 @@ /turf/simulated/wall, /area/crew_quarters/sleep/Dorm_6) "aNT" = ( -/obj/structure/ladder/up, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/item/stack/material/steel, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/maintDorm3) "aNU" = ( /obj/machinery/portable_atmospherics/canister/phoron, /obj/effect/floor_decal/industrial/outline/yellow, @@ -23787,8 +23665,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/cyan{ d1 = 1; @@ -23802,8 +23679,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -23825,8 +23701,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -23839,8 +23714,7 @@ /area/engineering/atmos) "aOd" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -23852,8 +23726,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -23870,8 +23743,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -23909,13 +23781,11 @@ "aOm" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -23984,9 +23854,7 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /obj/random/carp_plushie, @@ -24018,7 +23886,6 @@ }, /obj/structure/mirror{ dir = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -24029,8 +23896,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_6) @@ -24061,8 +23927,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -24075,8 +23940,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -24103,8 +23967,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -24112,9 +23975,7 @@ /obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -24264,8 +24125,7 @@ /area/crew_quarters/sleep/Dorm_6) "aOQ" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -24331,8 +24191,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -24380,7 +24239,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -24521,7 +24379,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -24532,7 +24389,6 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -24540,8 +24396,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -24739,8 +24594,7 @@ /area/engineering/atmos) "aPx" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -24752,8 +24606,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -24770,22 +24623,19 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/atmos) "aPB" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/effect/floor_decal/borderfloor{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -24797,8 +24647,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -24936,7 +24785,6 @@ "aPS" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -25 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -24968,7 +24816,6 @@ dir = 4 }, /obj/machinery/atmospherics/binary/pump/on{ - dir = 2; name = "Waste Compresser" }, /turf/simulated/floor/tiled, @@ -24982,8 +24829,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -24993,8 +24839,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -25004,8 +24849,7 @@ /area/engineering/atmos) "aQa" = ( /obj/machinery/atmospherics/pipe/tank/oxygen{ - dir = 1; - icon_state = "o2_map" + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -25034,13 +24878,11 @@ "aQe" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -25129,9 +24971,7 @@ /obj/item/weapon/storage/box/donkpockets, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/wood, @@ -25147,7 +24987,6 @@ }, /obj/structure/mirror{ dir = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -25158,15 +24997,13 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_4) "aQo" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/atmos/processing) @@ -25194,8 +25031,7 @@ /area/engineering/atmos/processing) "aQt" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/machinery/light{ dir = 4 @@ -25216,8 +25052,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -25232,8 +25067,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -25245,8 +25079,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 1; - icon_state = "bordercolorcorner" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -25264,8 +25097,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -25277,8 +25109,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -25290,8 +25121,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -25303,8 +25133,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -25314,8 +25143,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -25327,8 +25155,7 @@ dir = 6 }, /obj/machinery/computer/supplycomp{ - dir = 1; - icon_state = "computer" + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) @@ -25482,8 +25309,7 @@ /area/crew_quarters/sleep/Dorm_4) "aQQ" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -25585,8 +25411,7 @@ /area/engineering/atmos) "aRf" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/meter, /turf/simulated/floor/tiled, @@ -25635,7 +25460,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -25740,7 +25564,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -25751,7 +25574,6 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -25759,8 +25581,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -25816,8 +25637,7 @@ /area/engineering/atmos/processing) "aRv" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/processing) @@ -25832,15 +25652,13 @@ /area/engineering/atmos/processing) "aRy" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green{ - dir = 4; - icon_state = "map" + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/processing) "aRz" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple{ - dir = 8; - icon_state = "map" + dir = 8 }, /obj/machinery/meter, /turf/simulated/floor/tiled, @@ -25892,8 +25710,7 @@ /area/engineering/atmos) "aRG" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 1; - icon_state = "map" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -25908,8 +25725,7 @@ /area/engineering/atmos) "aRI" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/meter, /turf/simulated/floor/tiled, @@ -25921,8 +25737,7 @@ /area/engineering/atmos) "aRK" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -25966,8 +25781,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -26106,8 +25920,7 @@ name = "CO2 Filter"; tag_east = 2; tag_north = 1; - tag_south = 5; - tag_west = 0 + tag_south = 5 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -26155,15 +25968,13 @@ /area/engineering/atmos) "aSg" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "aSh" = ( /obj/machinery/atmospherics/pipe/tank/nitrogen{ - dir = 1; - icon_state = "n2_map" + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -26192,13 +26003,11 @@ "aSl" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -26233,9 +26042,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -26283,9 +26090,7 @@ /obj/item/weapon/storage/box/donkpockets, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/wood, @@ -26301,7 +26106,6 @@ }, /obj/structure/mirror{ dir = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -26312,8 +26116,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_2) @@ -26344,8 +26147,7 @@ /area/engineering/atmos/processing) "aSB" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/cable/cyan{ d1 = 1; @@ -26431,8 +26233,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -26450,8 +26251,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -26555,8 +26355,7 @@ /area/crew_quarters/sleep/Dorm_2) "aTb" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -26630,7 +26429,6 @@ "aTl" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/atmospherics/unary/heat_exchanger{ @@ -26647,8 +26445,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/black/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -26694,7 +26491,6 @@ "aTs" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -25 }, /turf/simulated/floor/tiled, @@ -26706,7 +26502,6 @@ "aTu" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled, @@ -26754,7 +26549,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -26822,13 +26616,10 @@ /area/crew_quarters/visitor_lodging) "aTB" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/vending/loadout/loadout_misc, /turf/simulated/floor/tiled, @@ -26850,7 +26641,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -26861,7 +26651,6 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -26869,8 +26658,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -26920,8 +26708,7 @@ /area/crew_quarters/sleep/Dorm_2) "aTJ" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 6; - icon_state = "intact" + dir = 6 }, /obj/machinery/door/firedoor, /obj/structure/grille, @@ -26957,8 +26744,7 @@ /area/engineering/atmos/processing) "aTL" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/door/firedoor, /obj/structure/grille, @@ -26985,8 +26771,7 @@ /area/engineering/atmos/processing) "aTN" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ - dir = 4; - icon_state = "co2_map" + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -26999,8 +26784,7 @@ /area/engineering/atmos) "aTP" = ( /obj/machinery/atmospherics/pipe/tank/phoron{ - dir = 4; - icon_state = "phoron_map" + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -27013,8 +26797,7 @@ /area/engineering/atmos) "aTR" = ( /obj/machinery/atmospherics/pipe/tank/nitrous_oxide{ - dir = 4; - icon_state = "n2o_map" + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) @@ -27112,19 +26895,19 @@ /turf/simulated/wall, /area/crew_quarters/showers) "aUc" = ( -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -27133,21 +26916,20 @@ /obj/machinery/alarm{ pixel_y = 22 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUh" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 }, /obj/effect/floor_decal/corner/white/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/structure/undies_wardrobe, /obj/machinery/camera/network/civilian, @@ -27158,8 +26940,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/structure/table/standard, /obj/machinery/light{ @@ -27176,8 +26957,7 @@ dir = 5 }, /obj/effect/floor_decal/corner/white/border{ - dir = 5; - icon_state = "bordercolor" + dir = 5 }, /obj/structure/table/standard, /obj/item/device/communicator, @@ -27230,14 +27010,11 @@ dir = 9 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/structure/closet/emcloset, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -27246,13 +27023,10 @@ dir = 5 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 5; - icon_state = "bordercolor" + dir = 5 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/machinery/gear_painter, /turf/simulated/floor/tiled, @@ -27262,20 +27036,17 @@ dir = 8 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 10 }, /obj/effect/floor_decal/corner/grey/bordercorner2{ - dir = 10; - icon_state = "bordercolorcorner2" + dir = 10 }, -/obj/structure/extinguisher_cabinet{ +/obj/machinery/light_switch{ dir = 4; - icon_state = "extinguisher_closed"; - pixel_x = -30 + pixel_x = -24 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -27290,11 +27061,9 @@ /area/crew_quarters/visitor_laundry) "aUr" = ( /obj/machinery/door/airlock/multi_tile/glass{ - autoclose = 1; dir = 2; id_tag = null; - name = "Laundry"; - req_access = list() + name = "Laundry" }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/structure/cable/green{ @@ -27326,6 +27095,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aUt" = ( @@ -27333,8 +27108,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 8 @@ -27344,8 +27118,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/grey/bordercorner2{ - dir = 8; - icon_state = "bordercolorcorner2" + dir = 8 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -27353,6 +27126,12 @@ /obj/machinery/washing_machine, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aUv" = ( @@ -27422,36 +27201,46 @@ /turf/simulated/floor/plating, /area/engineering/atmos_intake) "aUE" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/table/woodentable, +/obj/item/clothing/mask/smokable/cigarette/joint{ + desc = "Ever been to orbit?" + }, /turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/area/crew_quarters/sleep/maintDorm3) "aUF" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/table/bench/padded, +/turf/simulated/floor/wood, +/area/vacant/vacant_bar) "aUG" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 5 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUH" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 6 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUI" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, /obj/machinery/light, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUK" = ( /obj/effect/floor_decal/borderfloor{ @@ -27532,12 +27321,11 @@ dir = 4 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, -/obj/machinery/light_switch{ +/obj/structure/extinguisher_cabinet{ dir = 8; - pixel_x = 24 + pixel_x = 30 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -27551,8 +27339,7 @@ "aUS" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/plating, /area/engineering/atmos/processing) @@ -27560,10 +27347,15 @@ /turf/simulated/wall/r_wall, /area/maintenance/lower/atmos) "aUU" = ( -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/table/woodentable, +/obj/machinery/light_construct, +/turf/simulated/floor/wood, +/area/vacant/vacant_bar) "aUV" = ( /obj/machinery/alarm{ pixel_y = 22 @@ -27572,21 +27364,15 @@ /area/maintenance/lower/atmos) "aUW" = ( /obj/machinery/shower{ - dir = 4; - icon_state = "shower"; - pixel_x = 0; - pixel_y = 0 + dir = 4 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUX" = ( /obj/machinery/shower{ - dir = 8; - icon_state = "shower"; - pixel_x = 0; - pixel_y = 0 + dir = 8 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aUY" = ( /obj/effect/floor_decal/borderfloor{ @@ -27677,34 +27463,45 @@ /area/crew_quarters/visitor_laundry) "aVe" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVf" = ( /obj/machinery/washing_machine, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVg" = ( /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVh" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/grey/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/visitor_laundry) +/obj/structure/table/bench/padded, +/turf/simulated/floor/plating, +/area/vacant/vacant_bar) "aVi" = ( /obj/structure/bed/chair/comfy/black, /obj/effect/floor_decal/borderfloor{ dir = 5 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 5; - icon_state = "bordercolor" + dir = 5 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -27734,7 +27531,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; name = "Atmospherics Lockdown"; @@ -27743,39 +27539,42 @@ /turf/simulated/floor/plating, /area/engineering/atmos/processing) "aVl" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/purple{ - dir = 4; - icon_state = "map" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/turf/simulated/floor/plating, -/area/engineering/atmos/processing) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/maintDorm3) "aVm" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera/network/engineering{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/plating, -/area/engineering/atmos/processing) +/area/crew_quarters/sleep/maintDorm3) "aVn" = ( /turf/simulated/wall, /area/maintenance/lower/atmos) "aVo" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 25 + }, /turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/area/crew_quarters/sleep/maintDorm3) "aVp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/area/crew_quarters/sleep/maintDorm2) "aVq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -27783,7 +27582,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aVr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -27792,7 +27591,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aVs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -27805,7 +27604,7 @@ /obj/machinery/door/airlock{ name = "Unisex Showers" }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aVt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -27944,6 +27743,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVB" = ( @@ -27958,6 +27763,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVC" = ( @@ -27972,6 +27783,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVD" = ( @@ -27980,8 +27797,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -28004,7 +27820,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; name = "Atmospherics Lockdown"; @@ -28013,18 +27828,22 @@ /turf/simulated/floor/plating, /area/engineering/atmos/processing) "aVG" = ( -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 9; - icon_state = "intact" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/engineering/atmos/processing) +/area/crew_quarters/sleep/maintDorm1) "aVH" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/engineering/atmos/processing) +/obj/machinery/alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/structure/table, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/maintDorm1) "aVI" = ( /obj/machinery/light/small{ dir = 8 @@ -28033,7 +27852,7 @@ /area/maintenance/lower/atmos) "aVJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aVK" = ( /obj/effect/floor_decal/borderfloor{ @@ -28144,6 +27963,12 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVR" = ( @@ -28155,6 +27980,12 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVS" = ( @@ -28170,8 +28001,7 @@ dir = 6 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 6; - icon_state = "bordercolor" + dir = 6 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -28179,7 +28009,6 @@ /obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; frequency = 1441; - icon_state = "map_injector"; id = "atmos_out"; use_power = 1 }, @@ -28197,7 +28026,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; name = "Atmospherics Lockdown"; @@ -28206,19 +28034,16 @@ /turf/simulated/floor/plating, /area/engineering/atmos/processing) "aVW" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/engineering/atmos/processing) +/area/crew_quarters/sleep/maintDorm3) "aVX" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/double, /turf/simulated/floor/plating, -/area/engineering/atmos/processing) +/area/crew_quarters/sleep/maintDorm3) "aVY" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, @@ -28257,20 +28082,20 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aWg" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aWh" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aWi" = ( /obj/effect/floor_decal/borderfloor{ @@ -28354,12 +28179,10 @@ dir = 8 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/machinery/vending/loadout/costume{ - dir = 4; - icon_state = "theater" + dir = 4 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -28398,22 +28221,19 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "aWu" = ( -/obj/structure/table/rack, -/obj/random/maintenance/engineering, -/obj/random/maintenance/engineering, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/maintDorm2) "aWv" = ( /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "aWw" = ( -/obj/structure/closet/crate, -/obj/random/maintenance/engineering, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/obj/structure/table, +/obj/item/stack/material/wood{ + amount = 10 + }, +/turf/simulated/floor/wood, +/area/vacant/vacant_bar) "aWx" = ( /obj/structure/closet, /obj/random/maintenance/clean, @@ -28447,31 +28267,30 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aWE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aWF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aWG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "aWH" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 }, /obj/effect/floor_decal/corner/white/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /obj/structure/closet/secure_closet/personal, /obj/item/clothing/under/bathrobe, @@ -28483,7 +28302,6 @@ /obj/machinery/light, /obj/structure/cable/green, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -28507,8 +28325,7 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/white/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -28533,12 +28350,10 @@ dir = 8 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/machinery/vending/fitness{ - dir = 4; - icon_state = "fitness" + dir = 4 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -28547,12 +28362,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/machinery/vending/cola{ - dir = 8; - icon_state = "Soda_Machine" + dir = 8 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -28563,9 +28376,11 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/engineering/atmos_intake) "aWP" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/engineering/atmos/processing) +/area/crew_quarters/sleep/maintDorm3) "aWQ" = ( /obj/machinery/light{ dir = 8 @@ -28574,9 +28389,9 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar) "aWR" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) +/obj/structure/table, +/turf/simulated/floor/plating, +/area/crew_quarters/sleep/maintDorm3) "aWS" = ( /obj/structure/table, /turf/simulated/floor/wood, @@ -28584,8 +28399,7 @@ "aWT" = ( /obj/structure/table/bench/padded, /obj/machinery/light_construct{ - dir = 4; - icon_state = "tube-construct-stage1" + dir = 4 }, /turf/simulated/floor/wood, /area/vacant/vacant_bar) @@ -28607,17 +28421,13 @@ dir = 10 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/vending/cigarette{ - dir = 4; - icon_state = "cigs" + dir = 4 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -28667,15 +28477,16 @@ /obj/effect/floor_decal/corner/grey/border, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 9 }, /obj/effect/floor_decal/corner/grey/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 + }, +/obj/machinery/vending/nifsoft_shop{ + dir = 1 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -28704,7 +28515,6 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/grey/border, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -28716,19 +28526,15 @@ dir = 6 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 6; - icon_state = "bordercolor" + dir = 6 }, /obj/structure/closet/crate, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -28743,14 +28549,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "aXf" = ( -/obj/machinery/alarm{ - pixel_y = 22 +/obj/structure/bed/chair/comfy/black{ + dir = 4 }, -/obj/structure/table/bench/steel, -/obj/random/cigarettes, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/maintDorm2) "aXg" = ( /obj/structure/ladder/up, /obj/effect/floor_decal/industrial/outline/yellow, @@ -28818,91 +28621,9 @@ /turf/simulated/floor/wood, /area/maintenance/lower/atmos) "aXn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/holosign/bar{ - id = "maintbar"; - pixel_y = 32 - }, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/lower/atmos) -"aXo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/lower/atmos) -"aXp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/lower/atmos) -"aXq" = ( -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/lower/atmos) +/obj/random/junk, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/maintDorm2) "aXr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28920,31 +28641,9 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/lower/atmos) -"aXs" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/lower/atmos) "aXt" = ( /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -28975,8 +28674,7 @@ dir = 4 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/structure/cable/green{ d1 = 4; @@ -29009,8 +28707,7 @@ icon_state = "pipe-j2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -29027,11 +28724,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/lower/atmos) -"aXx" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/lower/atmos) "aXy" = ( /obj/random/cash, /turf/simulated/floor/plating, @@ -29047,21 +28739,6 @@ /obj/item/weapon/pen, /turf/simulated/floor/wood, /area/vacant/vacant_bar) -"aXB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) "aXC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -29077,55 +28754,6 @@ /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/vacant/vacant_bar) -"aXD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/item/weapon/stool/padded, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) -"aXE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) -"aXF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) "aXG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -29143,8 +28771,7 @@ "aXH" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -29167,15 +28794,6 @@ "aXJ" = ( /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/lower/atmos) -"aXK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/lower/atmos) -"aXL" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/lower/atmos) "aXM" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29188,18 +28806,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/lower/atmos) -"aXN" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/lower/atmos) "aXO" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29238,42 +28844,10 @@ /obj/effect/decal/cleanable/vomit, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"aXT" = ( -/obj/machinery/door/window/southright{ - req_access = list(5) - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"aXU" = ( -/obj/structure/window/reinforced, -/obj/structure/closet/boxinggloves, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"aXV" = ( -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"aXW" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "aXX" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/structure/table/steel, /turf/simulated/floor/wood, @@ -29288,11 +28862,6 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_bar) -"aXZ" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) "aYa" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -29316,8 +28885,7 @@ dir = 8 }, /obj/machinery/light_construct{ - dir = 4; - icon_state = "tube-construct-stage1" + dir = 4 }, /turf/simulated/floor/wood, /area/vacant/vacant_bar) @@ -29385,33 +28953,15 @@ /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"aYl" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "aYm" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"aYn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "aYo" = ( /obj/machinery/light_construct{ - dir = 8; - icon_state = "tube-construct-stage1" + dir = 8 }, /turf/simulated/floor/wood, /area/vacant/vacant_bar) @@ -29439,7 +28989,6 @@ }, /obj/structure/mirror{ dir = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -29450,10 +28999,6 @@ }, /turf/simulated/floor/tiled/white, /area/vacant/vacant_bar) -"aYt" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm3) "aYu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -29486,19 +29031,10 @@ }, /obj/structure/mirror{ dir = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/maintDorm3) -"aYw" = ( -/obj/effect/floor_decal/rust, -/obj/structure/toilet{ - pixel_y = 10 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/maintDorm3) "aYx" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -29506,51 +29042,16 @@ /obj/machinery/disposal, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm2) -"aYy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24; - pixel_y = 6 - }, -/obj/machinery/button/remote/airlock{ - id = "maintdorm2"; - name = "Room 2 Lock"; - pixel_x = 23; - pixel_y = -4; - specialfunctions = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm2) "aYz" = ( /obj/structure/sink{ pixel_y = 22 }, /obj/structure/mirror{ dir = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm2) -"aYA" = ( -/obj/structure/toilet{ - pixel_y = 10 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm2) "aYB" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -29558,46 +29059,6 @@ /obj/machinery/disposal, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) -"aYC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24; - pixel_y = 6 - }, -/obj/machinery/button/remote/airlock{ - id = "maintdorm1"; - name = "Room 1 Lock"; - pixel_x = 23; - pixel_y = -4; - specialfunctions = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm1) -"aYD" = ( -/obj/effect/floor_decal/rust, -/obj/structure/sink{ - pixel_y = 22 - }, -/obj/structure/mirror{ - dir = 4; - pixel_x = 0; - pixel_y = 32 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/maintDorm1) "aYE" = ( /obj/structure/toilet{ pixel_y = 10 @@ -29622,15 +29083,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"aYH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) "aYI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29646,19 +29098,6 @@ }, /turf/simulated/floor/plating, /area/vacant/vacant_bar) -"aYJ" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/vacant/vacant_bar) -"aYK" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/vacant/vacant_bar) "aYL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -29696,32 +29135,10 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/white, /area/vacant/vacant_bar) -"aYP" = ( -/obj/structure/table/woodentable, -/obj/machinery/microwave, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm3) -"aYQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm3) "aYR" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock{ @@ -29735,100 +29152,26 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/maintDorm3) -"aYS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/maintDorm3) "aYT" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/maintDorm3) -"aYU" = ( -/obj/structure/table, -/obj/item/frame, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm2) -"aYV" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm2) -"aYW" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm2) -"aYX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm2) "aYY" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/maintDorm2) -"aYZ" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm1) -"aZa" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm1) "aZb" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock{ @@ -29851,34 +29194,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) -"aZd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 25; - pixel_y = 0 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm1) -"aZe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/vacant/vacant_bar) -"aZf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/plating, -/area/vacant/vacant_bar) "aZg" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -29919,7 +29234,6 @@ /area/vacant/vacant_bar) "aZj" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -29929,17 +29243,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm3) -"aZk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm3) "aZl" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -29963,24 +29266,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/maintDorm3) -"aZn" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/item/stack/material/wood{ - amount = 10 - }, -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm2) "aZo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -30015,39 +29300,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/maintDorm2) -"aZr" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm1) -"aZs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm1) -"aZt" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/light_construct/small, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm1) "aZu" = ( /obj/machinery/shower{ dir = 1 @@ -30063,17 +29315,6 @@ /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plating, /area/vacant/vacant_bar) -"aZx" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) -"aZy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) "aZz" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm3) @@ -30082,11 +29323,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm3) -"aZB" = ( -/obj/structure/table/woodentable, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm2) "aZC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -30095,56 +29331,12 @@ "aZD" = ( /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm1) -"aZE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm1) -"aZF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/table/woodentable, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) -"aZG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/table/bench/padded, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) -"aZH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) "aZI" = ( /obj/machinery/light_construct{ - dir = 1; - icon_state = "tube-construct-stage1" + dir = 1 }, /turf/simulated/floor/wood, /area/vacant/vacant_bar) -"aZJ" = ( -/obj/item/stack/material/steel, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm3) "aZK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -30153,20 +29345,11 @@ "aZL" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light_construct{ - dir = 1; - icon_state = "tube-construct-stage1" + dir = 1 }, /obj/structure/table, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm3) -"aZM" = ( -/obj/structure/table/woodentable, -/obj/item/clothing/mask/smokable/cigarette/joint{ - desc = "Ever been to orbit?" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm3) "aZN" = ( /obj/structure/table, /obj/item/stack/material/wood{ @@ -30181,8 +29364,7 @@ "aZP" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light_construct{ - dir = 1; - icon_state = "tube-construct-stage1" + dir = 1 }, /obj/structure/table, /turf/simulated/floor/wood, @@ -30198,46 +29380,16 @@ "aZS" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light_construct{ - dir = 1; - icon_state = "tube-construct-stage1" + dir = 1 }, /obj/random/junk, /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm1) -"aZT" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm1) "aZU" = ( /obj/structure/table/woodentable, /obj/item/weapon/storage/fancy/markers, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) -"aZV" = ( -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/structure/table/bench/padded, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) -"aZW" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/table/woodentable, -/obj/machinery/light_construct, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) "aZX" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -30279,56 +29431,12 @@ /obj/structure/table/bench/padded, /turf/simulated/floor/wood, /area/vacant/vacant_bar) -"bac" = ( -/obj/structure/table/bench/padded, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/vacant/vacant_bar) "bad" = ( /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm3) -"bae" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm3) -"baf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm3) -"bag" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 25; - pixel_y = 0 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm3) "bah" = ( /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm2) -"bai" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm2) "baj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -30338,33 +29446,14 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm2) -"bak" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm2) "bal" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm2) -"bam" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm1) -"ban" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm1) "bao" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -30374,16 +29463,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm1) -"bap" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 25; - pixel_y = 0 - }, -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm1) "baq" = ( /obj/structure/sign/warning, /turf/simulated/wall, @@ -30410,32 +29489,6 @@ /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/vacant/vacant_bar) -"bav" = ( -/obj/structure/table/bench/padded, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) -"baw" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm3) -"bax" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm3) -"bay" = ( -/obj/structure/bed/double/padded, -/obj/effect/decal/cleanable/dirt, -/obj/item/weapon/bedsheet/double, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm3) -"baz" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm2) "baA" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -30469,48 +29522,16 @@ /obj/structure/stairs/west, /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside1) -"baH" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/material/wood{ - amount = 10 - }, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar) -"baI" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm3) -"baJ" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/maintDorm3) "baK" = ( /obj/structure/bed/chair/comfy/black{ dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm3) -"baL" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm2) "baM" = ( /obj/item/stack/material/steel, /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm2) -"baN" = ( -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm2) "baO" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -30583,7 +29604,6 @@ "baZ" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/plating, @@ -30618,8 +29638,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/rust, @@ -30695,9 +29714,7 @@ dir = 4 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/effect/floor_decal/corner/brown/border{ @@ -30710,7 +29727,6 @@ dir = 1 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = 30 }, /obj/structure/disposalpipe/segment{ @@ -30757,7 +29773,6 @@ /area/tether/surfacebase/surface_one_hall) "bbo" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -30765,8 +29780,7 @@ icon_state = "0-4" }, /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals3, /obj/effect/floor_decal/steeldecal/steel_decals3{ @@ -30787,8 +29801,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/corner/brown/border{ dir = 1 @@ -30939,19 +29952,6 @@ }, /turf/simulated/floor, /area/maintenance/substation/SurfMedsubstation) -"bbB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) "bbC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -31032,8 +30032,7 @@ /area/hallway/lower/first_west) "bbI" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/substation/SurfMedsubstation) @@ -31078,8 +30077,7 @@ /area/maintenance/substation/SurfMedsubstation) "bbM" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/substation/SurfMedsubstation) @@ -31119,8 +30117,9 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "bbQ" = ( -/turf/simulated/mineral, -/area/tether/surfacebase/surface_one_hall) +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/tether/elevator) "bbR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31171,8 +30170,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/rust, @@ -31254,7 +30252,6 @@ /obj/effect/floor_decal/corner/brown/border, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -31285,14 +30282,6 @@ "bcd" = ( /turf/simulated/mineral, /area/maintenance/lower/xenoflora) -"bce" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) "bcf" = ( /obj/structure/table/glass, /obj/item/weapon/storage/box/gloves{ @@ -31343,19 +30332,19 @@ /obj/effect/floor_decal/steeldecal/steel_decals5, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) -"bck" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "bcl" = ( /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) "bcm" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "bcn" = ( /obj/structure/closet/crate, /obj/random/tool, @@ -31369,98 +30358,59 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) -"bco" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "bcp" = ( /obj/machinery/alarm{ pixel_y = 22 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "bcq" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance/engi{ + id_tag = "elevescapel"; + name = "Elevator Maintenance" + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) "bcr" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/remote/airlock{ + id = "elevescapel"; + name = "elevator escape button"; + pixel_y = 32 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) "bcs" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'CRUSH WARNING'."; + name = "\improper CRUSH WARNING"; + pixel_y = 32 }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) -"bct" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) -"bcu" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "bcv" = ( /obj/structure/disposalpipe/up{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) -"bcw" = ( -/obj/structure/disposalpipe/segment, -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) -"bcx" = ( -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) -"bcy" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22 - }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) "bcz" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, -/obj/effect/decal/cleanable/dirt, -/obj/random/trash, -/obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) "bcA" = ( @@ -31471,19 +30421,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/random/trash, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) "bcC" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, /obj/random/unidentified_medicine, /obj/random/firstaid, /obj/random/drinkbottle, -/obj/effect/decal/cleanable/cobweb{ - icon_state = "cobweb2" - }, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) "bcD" = ( @@ -31493,27 +30441,23 @@ dir = 9 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "bcE" = ( /obj/structure/closet/wardrobe/white, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 }, /obj/effect/floor_decal/corner/grey/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -31522,8 +30466,7 @@ /area/crew_quarters/visitor_laundry) "bcF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -31542,19 +30485,16 @@ "bcG" = ( /obj/structure/undies_wardrobe, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, /obj/effect/floor_decal/corner/grey/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -31567,8 +30507,7 @@ dir = 5 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 5; - icon_state = "bordercolor" + dir = 5 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -31577,13 +30516,11 @@ dir = 8 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/landmark{ name = "morphspawn" @@ -31595,8 +30532,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -31606,8 +30542,7 @@ dir = 10 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) @@ -31629,8 +30564,7 @@ dir = 6 }, /obj/effect/floor_decal/corner/grey/border{ - dir = 6; - icon_state = "bordercolor" + dir = 6 }, /obj/structure/closet/firecloset, /turf/simulated/floor/tiled, @@ -31639,24 +30573,20 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/plating, /area/engineering/atmos/processing) "bcQ" = ( /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -31687,8 +30617,7 @@ /area/crew_quarters/visitor_laundry) "bcU" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -31710,20 +30639,6 @@ }, /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside1) -"bcW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark{ - name = "maint_pred" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) -"bcX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark{ - name = "maint_pred" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bcY" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -31735,8 +30650,7 @@ /area/maintenance/lower/public_garden_maintenence) "bcZ" = ( /obj/machinery/computer/HolodeckControl{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -31747,7 +30661,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -31755,8 +30668,7 @@ icon_state = "0-4" }, /obj/effect/floor_decal/techfloor/orange/corner{ - dir = 8; - icon_state = "techfloororange_corners" + dir = 8 }, /obj/structure/cable/green{ d1 = 2; @@ -31802,16 +30714,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenence) -"bdf" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenence) "bdg" = ( /obj/machinery/door/airlock{ name = "Holodeck" @@ -31829,15 +30731,13 @@ dir = 9 }, /obj/effect/floor_decal/techfloor/hole{ - dir = 4; - icon_state = "techfloor_hole_left" + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/holodeck_control) "bdi" = ( /obj/effect/floor_decal/techfloor/orange/corner{ - dir = 1; - icon_state = "techfloororange_corners" + dir = 1 }, /obj/structure/cable/green{ d1 = 1; @@ -31850,8 +30750,7 @@ /obj/structure/catwalk, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/cable/green{ d1 = 1; @@ -31908,7 +30807,6 @@ /obj/machinery/button/windowtint{ id = "holodeck"; pixel_x = 35; - pixel_y = 0; range = 14; req_access = newlist() }, @@ -31920,9 +30818,7 @@ alarm_id = "anomaly_testing"; breach_detection = 0; dir = 8; - frequency = 1439; pixel_x = 22; - pixel_y = 0; report_danger_level = 0 }, /obj/structure/cable/green{ @@ -31986,8 +30882,7 @@ dir = 10 }, /obj/effect/floor_decal/techfloor/hole/right{ - dir = 4; - icon_state = "techfloor_hole_right" + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/holodeck_control) @@ -31995,8 +30890,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/techfloor/orange/corner{ - dir = 8; - icon_state = "techfloororange_corners" + dir = 8 }, /obj/structure/cable/green{ d1 = 1; @@ -32013,8 +30907,7 @@ pixel_x = 28 }, /obj/effect/floor_decal/techfloor/orange/corner{ - dir = 1; - icon_state = "techfloororange_corners" + dir = 1 }, /obj/structure/cable/green{ d1 = 1; @@ -32026,8 +30919,7 @@ "bdz" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 22; - pixel_y = 0 + pixel_x = 22 }, /obj/machinery/camera/network/civilian{ dir = 1 @@ -32080,8 +30972,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -32101,14 +30992,11 @@ dir = 9 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -32123,8 +31011,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -32133,8 +31020,7 @@ /area/tether/surfacebase/public_garden_one) "bdF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -32143,16 +31029,14 @@ /area/tether/surfacebase/public_garden_one) "bdG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "bdH" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) @@ -32172,8 +31056,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) @@ -32196,9 +31079,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) -"blL" = ( -/turf/simulated/floor, -/area/tether/surfacebase/outside/outside1) "bqI" = ( /turf/simulated/wall, /area/tether/surfacebase/security/brig/storage) @@ -32237,8 +31117,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -32256,8 +31135,7 @@ /area/tether/surfacebase/surface_one_hall) "bzb" = ( /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig) @@ -32267,11 +31145,19 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) +"bHR" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "bJz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32317,7 +31203,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -32406,8 +31291,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /turf/simulated/floor/tiled, /area/rnd/hallway) @@ -32418,11 +31302,9 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ - autoclose = 1; dir = 2; id_tag = null; - name = "Laundry"; - req_access = list() + name = "Laundry" }, /obj/structure/cable/green{ d1 = 4; @@ -32437,21 +31319,6 @@ }, /turf/simulated/floor/tiled/monofloor, /area/crew_quarters/locker/laundry_arrival) -"cpD" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) "cqZ" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -32460,17 +31327,13 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 10 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 @@ -32497,19 +31360,18 @@ /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +"cwS" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "cAR" = ( /turf/simulated/floor/looking_glass/center, /area/looking_glass/lg_1) -"cBf" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) "cGJ" = ( /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) @@ -32590,8 +31452,7 @@ lg_id = "one" }, /obj/effect/floor_decal/spline/plain{ - dir = 9; - icon_state = "spline_plain" + dir = 9 }, /obj/structure/cable/green{ d2 = 2; @@ -32680,16 +31541,13 @@ /area/tether/surfacebase/security/lowerhall) "dju" = ( /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/structure/table/steel, /obj/machinery/alarm{ @@ -32739,8 +31597,7 @@ "dyd" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) @@ -32755,8 +31612,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/camera/network/northern_star{ dir = 1 @@ -32841,7 +31697,6 @@ "dPC" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, @@ -32851,9 +31706,7 @@ /area/tether/surfacebase/security/brig) "dYd" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled/steel_dirty, @@ -32895,8 +31748,7 @@ /area/tether/surfacebase/security/brig) "eeo" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/green{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) @@ -32966,6 +31818,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/washing_machine, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/lowernorthhall) "evF" = ( @@ -32995,7 +31848,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -33070,25 +31922,10 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) -"eIL" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "eJQ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -33138,14 +31975,12 @@ /area/tether/surfacebase/surface_one_hall) "fcT" = ( /turf/simulated/floor/looking_glass{ - dir = 8; - icon_state = "origin_arrow" + dir = 8 }, /area/looking_glass/lg_1) "ffD" = ( /turf/simulated/floor/looking_glass{ - dir = 10; - icon_state = "origin_arrow" + dir = 10 }, /area/looking_glass/lg_1) "fmY" = ( @@ -33195,7 +32030,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -33203,33 +32037,19 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"fBN" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) "fCk" = ( /obj/machinery/atmospherics/pipe/tank/nitrous_oxide{ - dir = 4; - icon_state = "n2o_map" + dir = 4 }, /turf/simulated/floor, /area/tether/surfacebase/security/gasstorage) "fDx" = ( /obj/machinery/door/airlock/maintenance/sec{ name = "Riot Control"; - req_access = list(); req_one_access = list(63,24) }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -33248,16 +32068,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor, /area/tether/surfacebase/security/gasstorage) -"fGP" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "fLB" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 5 @@ -33287,7 +32097,6 @@ "geO" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/industrial/warning{ @@ -33334,8 +32143,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable{ icon_state = "1-8" @@ -33399,8 +32207,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) @@ -33417,8 +32224,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -33436,8 +32242,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/landmark{ name = "lightsout" @@ -33451,8 +32256,7 @@ /obj/structure/table/steel, /obj/item/toy/stickhorse, /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -33466,27 +32270,6 @@ /obj/random/maintenance/cargo, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/vacant_site) -"gvC" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -23; - pixel_y = 0 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) -"gwo" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) "gxa" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -33573,23 +32356,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) -"gOA" = ( -/obj/structure/railing{ - dir = 1; - icon_state = "railing0" - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "gVe" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -33597,8 +32363,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 @@ -33619,14 +32384,12 @@ /area/maintenance/lowmedbaymaint) "gZN" = ( /turf/simulated/floor/looking_glass{ - dir = 9; - icon_state = "origin_arrow" + dir = 9 }, /area/looking_glass/lg_1) "hco" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ @@ -33641,11 +32404,6 @@ }, /turf/simulated/floor, /area/tether/surfacebase/security/gasstorage) -"hcz" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "hdh" = ( /obj/machinery/door/airlock/security{ name = "The Hole"; @@ -33746,20 +32504,9 @@ /area/tether/surfacebase/security/brig) "hAe" = ( /turf/simulated/floor/looking_glass{ - dir = 5; - icon_state = "origin_arrow" + dir = 5 }, /area/looking_glass/lg_1) -"hBE" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "hDd" = ( /obj/machinery/door/airlock/glass_security{ name = "Firing Range"; @@ -33874,8 +32621,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -33930,7 +32676,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "brig_lockdown"; name = "Security Blast Doors"; @@ -33987,6 +32732,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/hallway) +"iee" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "igw" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) @@ -34026,8 +32782,7 @@ /area/tether/surfacebase/surface_one_hall) "iue" = ( /turf/simulated/floor/looking_glass{ - dir = 1; - icon_state = "origin_arrow" + dir = 1 }, /area/looking_glass/lg_1) "iwE" = ( @@ -34097,23 +32852,19 @@ /obj/structure/table/steel, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/freezer, /area/tether/surfacebase/security/brig/bathroom) "iWx" = ( /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/machinery/cryopod{ dir = 4 @@ -34234,8 +32985,7 @@ "jDI" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/effect/floor_decal/corner/lightorange{ dir = 10 @@ -34361,9 +33111,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -34428,20 +33176,16 @@ /area/tether/surfacebase/security/weaponsrange) "kwN" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/structure/bed/padded, /obj/item/weapon/bedsheet, @@ -34583,8 +33327,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 9 @@ -34656,8 +33399,7 @@ /area/tether/surfacebase/surface_one_hall) "kUN" = ( /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /obj/structure/bed/chair{ dir = 4 @@ -34667,6 +33409,20 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig) +"laR" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "lbu" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -34710,7 +33466,6 @@ "lhM" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ - dir = 1; id = "Cell 2"; name = "Cell 2" }, @@ -34728,8 +33483,7 @@ /area/maintenance/lower/research) "loj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) @@ -34812,9 +33566,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/device/radio/intercom/department/security{ dir = 8; - icon_state = "secintercom"; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) @@ -34836,12 +33588,10 @@ icon_state = "1-8" }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) @@ -34851,8 +33601,7 @@ /area/tether/surfacebase/security/weaponsrange) "lLD" = ( /obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -34878,9 +33627,7 @@ icon_state = "4-8" }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/disposalpipe/segment{ @@ -34912,8 +33659,7 @@ /area/medical/virologyisolation) "lNp" = ( /turf/simulated/floor/looking_glass/optional{ - dir = 4; - icon_state = "origin_optional_arrow" + dir = 4 }, /area/looking_glass/lg_1) "lNt" = ( @@ -34923,8 +33669,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/industrial/danger{ dir = 4 @@ -34941,8 +33686,7 @@ /obj/item/weapon/reagent_containers/glass/bucket, /obj/structure/table/steel, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) @@ -35021,8 +33765,7 @@ dir = 6 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) @@ -35066,16 +33809,13 @@ /area/tether/surfacebase/surface_one_hall) "mrO" = ( /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/structure/closet/secure_closet/brig{ id = "Cell 2" @@ -35111,8 +33851,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -35273,8 +34012,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/light_switch{ dir = 8; @@ -35434,8 +34172,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -35451,15 +34188,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) -"nmh" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing, -/obj/random/cutout, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "nmD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -35538,8 +34266,7 @@ dir = 9 }, /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) @@ -35583,8 +34310,7 @@ /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/structure/cable{ d1 = 1; @@ -35598,7 +34324,6 @@ /area/maintenance/lower/mining_eva) "nID" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -35636,9 +34361,7 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -35648,7 +34371,6 @@ "ocx" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ - dir = 1; id = "Cell 1"; name = "Cell 1" }, @@ -35671,7 +34393,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -35738,6 +34459,9 @@ /obj/item/device/radio/intercom{ pixel_y = -24 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "orf" = ( @@ -35750,8 +34474,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -35769,8 +34492,7 @@ /area/tether/surfacebase/security/lowerhall) "orF" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/structure/cable/green{ icon_state = "1-8" @@ -35782,8 +34504,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -35861,9 +34582,7 @@ "ozx" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/simulated/floor/tiled/freezer, /area/tether/surfacebase/security/brig/bathroom) @@ -35903,8 +34622,7 @@ /area/tether/surfacebase/surface_one_hall) "oRz" = ( /turf/simulated/floor/looking_glass{ - dir = 4; - icon_state = "origin_arrow" + dir = 4 }, /area/looking_glass/lg_1) "oTK" = ( @@ -35942,9 +34660,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -35954,8 +34670,7 @@ "pdo" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) @@ -35970,7 +34685,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/green, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -35994,24 +34708,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) -"poN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/xenoflora) "ptv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) @@ -36063,20 +34765,16 @@ /area/tether/surfacebase/surface_one_hall) "qjE" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/structure/bed/padded, /obj/item/weapon/bedsheet, @@ -36163,8 +34861,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -36177,7 +34874,6 @@ }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/glass{ - dir = 4; name = "Dorms & Cafe" }, /turf/simulated/floor/tiled/monofloor{ @@ -36186,7 +34882,6 @@ /area/tether/surfacebase/surface_one_hall) "qOa" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -36210,8 +34905,7 @@ /area/crew_quarters/locker) "qPR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/green{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -36288,8 +34982,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 @@ -36302,7 +34995,6 @@ "qYs" = ( /obj/machinery/door/airlock/maintenance/sec{ name = "Riot Control"; - req_access = list(); req_one_access = list(63,24) }, /obj/structure/disposalpipe/segment{ @@ -36374,9 +35066,7 @@ /obj/effect/floor_decal/industrial/warning, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) @@ -36392,8 +35082,7 @@ icon_state = "2-4" }, /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -36500,9 +35189,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -36613,18 +35300,6 @@ /obj/effect/floor_decal/corner/lightorange, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) -"srC" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/public_garden_maintenence) "svZ" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -36720,8 +35395,7 @@ /area/tether/surfacebase/surface_one_hall) "sIO" = ( /turf/simulated/floor/looking_glass{ - dir = 6; - icon_state = "origin_arrow" + dir = 6 }, /area/looking_glass/lg_1) "sLi" = ( @@ -36742,12 +35416,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"sQN" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/random/cutout, -/turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenence) "sVX" = ( /obj/structure/table/steel, /obj/item/weapon/material/twohanded/fireaxe/foam, @@ -36784,16 +35452,13 @@ /area/tether/surfacebase/security/brig) "tiJ" = ( /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/structure/closet/secure_closet/brig{ id = "Cell 1" @@ -36807,8 +35472,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -36859,8 +35523,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -36966,8 +35629,7 @@ /area/tether/surfacebase/lowernorthhall) "tRJ" = ( /obj/effect/floor_decal/spline/plain{ - dir = 10; - icon_state = "spline_plain" + dir = 10 }, /obj/machinery/button/remote/airlock{ dir = 8; @@ -37034,8 +35696,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor, /area/tether/surfacebase/security/gasstorage) @@ -37110,13 +35771,11 @@ /area/crew_quarters/locker) "uzs" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/green{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) @@ -37217,8 +35876,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) @@ -37425,24 +36083,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) -"vPZ" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/obj/random/junk, -/obj/random/maintenance/clean, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) "vRL" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) "vSS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -37467,8 +36113,7 @@ /area/tether/surfacebase/security/lowerhall) "vTn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/machinery/alarm{ pixel_y = 22 @@ -37504,8 +36149,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -37526,8 +36170,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -37545,16 +36188,13 @@ /area/tether/surfacebase/security/brig) "wwm" = ( /obj/effect/floor_decal/corner/lightorange{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/lightorange/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/structure/table/steel, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -37616,9 +36256,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "wzA" = ( @@ -37629,29 +36267,13 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) -"wIo" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) "wQS" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 5 @@ -37705,40 +36327,29 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/brig) -"xdA" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/brig) +"wXW" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tether/surfacebase/tram; + base_turf = /turf/simulated/floor/tiled/techfloor/grid; + docking_controller = null; + landmark_tag = "escape_station"; + name = "Tether Surface Base" }, -/obj/structure/cable/green{ - d1 = 16; - d2 = 0; - icon_state = "16-0" - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/public_garden_maintenence) +/turf/simulated/floor/tiled/techfloor/grid, +/area/tether/surfacebase/tram) "xdV" = ( /obj/structure/cable/green{ d1 = 4; @@ -37826,8 +36437,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -37855,8 +36465,7 @@ icon_state = "1-2" }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/looking_glass/lg_1) @@ -37866,16 +36475,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) -"xYn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) "xYx" = ( /obj/structure/table/steel, /obj/machinery/microwave, @@ -39807,7 +38406,7 @@ aad aad aad aad -aad +bcV aad aad aad @@ -40238,7 +38837,7 @@ aad aad aad aad -bcV +aad aad aad aad @@ -40969,8 +39568,8 @@ adK aeo aeo aeo -afq -afq +aeo +aeo adK aah aah @@ -41112,7 +39711,7 @@ aep adK aeV aeo -afR +afq adK aah aah @@ -41146,7 +39745,7 @@ aAs aBu aCc aCc -aDx +aCc aCc aER aib @@ -41284,7 +39883,7 @@ aah aah aah auK -aAt +aaT auK auK auK @@ -41994,7 +40593,7 @@ aah aah aah auK -aAv +aAl auK aah aah @@ -42136,7 +40735,7 @@ agv agv agv azs -aAw +aAu auK aah aah @@ -42148,7 +40747,7 @@ aah aah aah aah -aiW +aah aah aah aah @@ -42396,7 +40995,7 @@ ajS aah agU ahi -ahC +alE aiz ajo aov @@ -42562,7 +41161,7 @@ ahP aiH aiL azs -aAw +aAu auK aah aah @@ -42679,9 +41278,9 @@ aah aah aah agU -ahk +akm ahE -anL +apm agU aow apd @@ -43269,7 +41868,7 @@ aDr avG ahT auK -axC +aAj abN abN abN @@ -43368,7 +41967,7 @@ aah aah aah ajL -akY +akZ ajM ajT ajY @@ -43511,7 +42110,7 @@ aah aah ajL akZ -ajP +abs ajS ajS ajS @@ -43795,10 +42394,10 @@ aah aah ajL akZ -ajR +abt ajU -ajZ -ajZ +aki +aki aki akl aah @@ -43937,12 +42536,12 @@ aah aah ajL bcY -bdf +bdn bdj bdn bdn bds -akm +ajQ aah aah ajS @@ -44084,7 +42683,7 @@ uiK uiK uiK bcY -srC +abu kdi uFh ajL @@ -44111,7 +42710,7 @@ apj apj arK apl -asn +apo apl ata atH @@ -44119,9 +42718,9 @@ aul auH auK avK -awr +axI awU -axE +aAk abN aeR aeR @@ -44135,9 +42734,9 @@ abN ovG jkt awn -aHO +aBM aIC -aJu +aCC aJZ aKL aLs @@ -44226,7 +42825,7 @@ npK qJT uiK ajM -xdA +aby aki akz akG @@ -44253,7 +42852,7 @@ apl apl apl apl -apW +apl apl apl atH @@ -44389,10 +42988,10 @@ anP aju aoE apl -apW apl apl -apW +apl +apl apo apl aqy @@ -44421,7 +43020,7 @@ aGX adn adn adn -aJw +aCK aKa aKL aKL @@ -44513,7 +43112,7 @@ ajL akl aks ajL -akI +acj akR ale alp @@ -44530,16 +43129,16 @@ any anP ajv aoF -apm apX -aqz +apX +aqA aqZ apl apl apl apl apl -apW +apl atH atH atH @@ -44563,7 +43162,7 @@ aGX adn alY adn -aJx +aCW aKa aah aah @@ -44653,7 +43252,7 @@ dfJ uiK aah akn -akt +abE jbU akJ akT @@ -44674,19 +43273,19 @@ adj aoG apn apn -aqA -apW +are +apl +apl apl apl apl apl -apW atb apj apj auK avf -avO +awr aws abN abN @@ -44794,10 +43393,10 @@ geO rDJ uiK aah -ako -aku -sQN -aku +abC +abF +abG +abF akR alh als @@ -44816,13 +43415,13 @@ adk aoE apo apo -apW +apl apl aqy apl -apW apl -apW +apl +apl apj apj apj @@ -45103,7 +43702,7 @@ apj apj apl apl -apW +apl apl apl apj @@ -45111,7 +43710,7 @@ apj apj apj auK -avi +avh abm abn abn @@ -45245,7 +43844,7 @@ apj apj apj apl -apW +apl apl aso apj @@ -45981,8 +44580,8 @@ aFf aGp aGZ aHt -aHW -aHZ +aBN +aIa aBO aah aah @@ -46123,8 +44722,8 @@ aFL aGq aHa awn -aHX -aIE +aBP +aCv aBO aBO aBO @@ -46265,17 +44864,17 @@ awn awn awn awn -aHX -aIF -aJD -aKg -aKS +aBP +aCw +aLv +aCY +aCZ aLv aMf aLv -aJD -aJD -aJD +aLv +aLv +aLv aej aPm aPN @@ -46388,16 +44987,16 @@ uqH mHO csb nBm -nmh -poN -fGP +asn +atl +axC kCz csb imW tMP alJ apu -aBH +aAm aCt aDi aDO @@ -46407,17 +45006,17 @@ aDi aah aah aBO -aHX +aBP aIG -aJE -aHZ -aHZ -aHZ -aHZ -aHZ -aHZ +aCX +aIa +aIa +aIa +aIa +aIa +aIa +aIa aIa -aHZ aOR aPn aPO @@ -46518,12 +45117,12 @@ ahS bbP bbS bbG -bck -bcw -bck -bcy -bco -bco +apW +aqz +apW +arh +axS +axS bcl apu agy @@ -46532,15 +45131,15 @@ alb alb alb alC -alD -alE +axE +ayD alF alG alH alK acW -aBI -aCu +aAn +aAv aDi aDP aEs @@ -46549,16 +45148,16 @@ aDi aah aah aBO -aHY +aCh aIG aBO aKh -aHZ -aLw +aIa +aDx aBO aMM aNy -aNT +aDM aIa aOR aPo @@ -46661,16 +45260,16 @@ adh adO ahl bcn -bco -bcx -bct -bck -bck -bck +axS +bcl +azb +apW +apW +apW bbX aiC alt -alu +alv alv apu bcq @@ -46682,7 +45281,7 @@ avT avT avT aBJ -aCv +aAw aDi aDQ aEt @@ -46691,7 +45290,7 @@ aDi aah aah aBO -aHZ +aIa aIG aJF aJF @@ -46824,7 +45423,7 @@ axS axS aAM aBJ -aCw +aAE aDi aDi aDi @@ -46834,7 +45433,7 @@ aah aah aBO aIa -aIH +aIG aJF aKi aKi @@ -46957,7 +45556,7 @@ ate apu apu apu -bcr +adr avT agb agb @@ -46966,7 +45565,7 @@ agb agb agb aBJ -aCw +aAE aBO aah aah @@ -46975,7 +45574,7 @@ aah aah aah aBO -aHZ +aIa aIG aJF aKj @@ -46999,11 +45598,11 @@ aTM aTM aUD aTM -aVl -aVG -aVW +aEu +aEA aWq -aWP +aWq +aQW aOR aah aah @@ -47099,8 +45698,8 @@ ate apu bcd apu -bcr -avT +bcs +azG agb agc agc @@ -47108,7 +45707,7 @@ agc agh agb aBJ -aCw +aAE aBO aah aah @@ -47117,7 +45716,7 @@ aah aah aah aBO -bcW +aCi aHc aJF aKk @@ -47141,9 +45740,9 @@ aSC bcP aSC aUS -aVm -aVH -aVX +aEv +aSC +aEB aWr aQW aOR @@ -47237,20 +45836,20 @@ aoH bcd apu aqb -arL +ate apu bcd apu bcB -avT -agb +azK +bbQ agc agc agc agc agb aBJ -aCw +aAE aBO aah aah @@ -47260,7 +45859,7 @@ aah aah aBO aIb -aII +aHc aJF aJF aJF @@ -47379,12 +45978,12 @@ aoH bcd apu aqb -arL +ate apu bcd apu bcs -avT +azU agb agc agc @@ -47392,7 +45991,7 @@ agc agc agb aBJ -aCw +aAE aBO aah aah @@ -47427,7 +46026,7 @@ aah aah aah aVn -aUE +aTZ aWs aVn aah @@ -47521,11 +46120,11 @@ aoH bcd apu aqb -arL +ate apu bcd apu -bcr +aiW avT agb agc @@ -47534,7 +46133,7 @@ agc agc agb aBJ -aCw +aAE aBO aah aah @@ -47542,8 +46141,8 @@ aah aah aBO aHb -aHu -aHu +aBt +aBt aIK aIh aKm @@ -47663,12 +46262,12 @@ apu apu apu aqb -arL +ate apu bcd apu -bcr -avU +adr +avT agb agb agc @@ -47676,7 +46275,7 @@ agc agi agb avU -aCw +aAE aBO aah aah @@ -47711,16 +46310,16 @@ aah aah aah aVn -aUE -aWu +aTZ +aEC aVn aXe aXy aXR aYk aTZ -aUE -aUE +aTZ +aTZ aVn aah aah @@ -47801,7 +46400,7 @@ aqb aqb aqb arw -arL +ate arX apu aqb @@ -47809,8 +46408,8 @@ atf apu bcd apu -bcr -agM +adr +apu agM axg axT @@ -47818,7 +46417,7 @@ axT azL aAN agM -aCx +aAF aBO aah aah @@ -47827,7 +46426,7 @@ aah aBO aHc aHv -aId +aCj aIL aIh aKo @@ -47853,15 +46452,15 @@ aIh aah aah aVn -aUE +aTZ aWv aVn -aXf +aFk aTZ aXS -aUE -aUE -aYl +aTZ +aTZ +aYk aTZ aVn aah @@ -47933,7 +46532,7 @@ bbT bbc aup sLi -ahp +ako ahX anQ aeG @@ -47951,8 +46550,8 @@ atg apu bcd apu -bcr -bbQ +awB +bcd agM axh axU @@ -47960,17 +46559,17 @@ ayG azM aAO agM -aCv +aAw aBO aah aah aah aah aBO -aHd +aBl aeb -aIe -aIM +aCk +aCx aJG aKp aKW @@ -47995,16 +46594,16 @@ aIh aah aah aVn -aUE -aWw +aTZ +aED aVn aXe -aUE -aXT -aYl -aUE aTZ -aUE +aHj +aYk +aTZ +aTZ +aTZ aVn aah aah @@ -48075,7 +46674,7 @@ abT abT abT tCV -ahq +akt ahX aiS aeH @@ -48083,7 +46682,7 @@ aoM apw ahX aqF -are +ari aqb aqb arZ @@ -48093,7 +46692,7 @@ apu apu apu apu -bcq +avi apu agM agM @@ -48102,14 +46701,14 @@ ayH azN agM agM -aCv +aAw aBO aah aah aah aah aBO -aHe +aHf aHv aIf aIN @@ -48141,12 +46740,12 @@ aTZ aWx aVn aXg -aUE -aXU -aYm -aYl aTZ -aUE +aHu +aYm +aYk +aTZ +aTZ aVn aah aah @@ -48207,17 +46806,17 @@ abT vCb acS acS -adp +acS adt agd bbs bbC qDR -blL -blL +eQz +eQz abT wzA -ahr +aku ahX anR aeH @@ -48235,25 +46834,25 @@ ath axS apu bcz -bct +azb bcv -bco +axS agM axW ayI azO agM -aBK -aCy +aAo +aAE aBO aah aah aah aah aBO -aHe +aHf aHv -aIg +aCl aIO aIh aKq @@ -48280,7 +46879,7 @@ aUT aVn aVn aTZ -bcX +aEE aVn aVn aXz @@ -48346,7 +46945,7 @@ aah aah aah abT -acj +abH acX acX adL @@ -48355,11 +46954,11 @@ bbg bbu bbD adt -blL -blL +eQz +eQz abT tCV -ahq +akt ahX anS aeK @@ -48377,7 +46976,7 @@ apu axS apu bcA -bco +axS apu apu agM @@ -48385,8 +46984,8 @@ axX ayG azP agM -aBL -aCz +aAp +aAK aBO aah aah @@ -48421,14 +47020,14 @@ aIh aTZ aTZ aVI -aUE -aUE +aTZ +aTZ aTZ aXh aTZ -aXV +aHx +aTZ aTZ -aUE aTZ aZv aVn @@ -48491,14 +47090,14 @@ abT acQ adl ado -xYn +aco adt bbh bbv bbE adt eQz -blL +eQz abT tCV ahs @@ -48519,7 +47118,7 @@ apu axS apu bcC -bco +axS apu bcd agM @@ -48527,8 +47126,8 @@ axY ayG azQ agM -aBM -aCw +aAq +aAE aBO aah aah @@ -48560,16 +47159,16 @@ aTn aTP aTP aIh -aUE -aUU +aTZ +aWy aTZ aTZ aWy aTZ aXi -aUE -aXW -aYn +aTZ +aYm +aHy aYF aTZ aZv @@ -48661,7 +47260,7 @@ ati apu apu apu -bcu +avO agM agM agM @@ -48669,16 +47268,16 @@ axZ ayJ azR agM -aBN -aCw +aAr +aAE aBO aah aah aah aah aBO -aHe -aHx +aHf +aBH aIh aIQ aJI @@ -48702,7 +47301,7 @@ aRM aPG aTY aIh -aUU +aWy aTZ aVn aVn @@ -48780,10 +47379,10 @@ jPk lpK lDW hPU -cpD -fBN -wIo -cBf +afC +lDW +afR +lDW hQP anv aia @@ -48801,9 +47400,9 @@ apu asL atj atL -bcm -bcm -bcm +atL +atL +atL agM ahc ahu @@ -48819,8 +47418,8 @@ aBO aBO aBO aBO -aHg -aHy +aBm +aBI aIh aIR aJJ @@ -48844,7 +47443,7 @@ aTo aTQ aTQ aIh -aUE +aTZ aTZ aVn aVZ @@ -48854,11 +47453,11 @@ aXj aXA aXX aYo -aYH +aHY aXk aZw aWc -aZV +aUF bas aad aad @@ -48944,8 +47543,8 @@ asL apu agM agM -bcm -bcm +atL +atL agM agM agM @@ -48953,16 +47552,16 @@ ayb ayG rYl aAQ -aBP +aAt aCB aDj -aDR -aDR -aFk +aAT +aAT +aBf aFM -hBE -eIL -gOA +aBj +aBr +aBK aIh aIS aJK @@ -48986,21 +47585,21 @@ aTq aIh aIh aIh -aUE -aUE +aTZ +aTZ aVn aWa aWA -aWR -aWR -aXB +aWA +aWA +aGu aXY aXY aYI -aZe +aIY aXY -aZF -aZW +aLf +aUU aYd aad aad @@ -49063,12 +47662,12 @@ acg abT aeB afd -afC +adp tEo ndH -bbB +agH bbe -bce +ahB bcS ahX aiZ @@ -49087,8 +47686,8 @@ apu ahc agM bcp -bcm -bcm +atL +atL atL atj ayc @@ -49096,14 +47695,14 @@ ayG dCc aAR aBQ -aCC -aDk -aDk -aEu +aAL +aBQ +aBQ +aAU aFl aFN ohi -hcz +ohi loc aec aIT @@ -49129,19 +47728,19 @@ aTR aTR aIh aUV -aUE +aTZ aVn abz aWB aWS aWB aXC -aXZ +aWS aWS aWA aXk -aZx -aZG +aJE +aLw aZX bas aad @@ -49241,12 +47840,12 @@ aBO aBO aBO aBO -aEv -aFm +aEz +aFl aBO aBO aBO -aHB +aHC aIh aIU aJM @@ -49277,11 +47876,11 @@ aWb aWC aWC aWC -aXD +aGR aYa aYp aWA -aYK +aXk aWA aWA aYd @@ -49384,11 +47983,11 @@ aah aah aBO aEw -aFm +aFl aBO aah aBO -aHB +aHC aIh aIV aJN @@ -49412,18 +48011,18 @@ aTo aTS aTS aIh -aUE -aVo +aTZ +aEx aVn aWc aWc aWc aWA -aXE +aHd aYb aYb -aYJ -aYJ +aHZ +aHZ aYb aYb aZY @@ -49525,12 +48124,12 @@ aah aah aah aBO -aEx -aFm +aAV +aFl aBO aah aBO -aHB +aHC aIh aIW aJM @@ -49555,17 +48154,17 @@ aIh aIh aIh aTZ -aVp +aEy aVn aWd aWd aWc aXk -aXF +aXG aWA aXk -aYK -aZf +aXk +aIZ aWA aWA aZZ @@ -49667,8 +48266,8 @@ aah aah aah aBO -aEy -aFm +aAY +aFl aBO aah aBO @@ -49695,8 +48294,8 @@ aSO aTr aer aTZ -aUE -aUE +aTZ +aTZ aTZ aVn aWe @@ -49707,8 +48306,8 @@ aXG aXk aWA aWA -aWR -aWR +aWA +aWA aXk aWc aWc @@ -49809,8 +48408,8 @@ agM aah aah aBO -aEv -aFm +aEz +aFl aBO aah aBO @@ -49837,9 +48436,9 @@ aQy aTs aIh aUa -aUF -aUE -aUE +aDR +aTZ +aTZ aVn aWd aWd @@ -49850,8 +48449,8 @@ aYc aYq aYL aeI -aZy -aZy +aKg +aKg baa bat aWB @@ -49956,9 +48555,9 @@ aFn aBO aah aBO -aHE -aEB -aIY +aBL +aBb +aCy aIh aKq aJI @@ -49993,7 +48592,7 @@ aYd aYM aYd aYd -aZH +aLL bab bau aWB @@ -50093,14 +48692,14 @@ ayh ayh ayh ayh -aEA +aAZ aFl aBO aah aBO -aDk -aIi -aIZ +aBQ +aCp +aCz aIh aKq aJI @@ -50128,7 +48727,7 @@ aUW aWf aUc aUb -aXn +aFm aXJ aYd aYr @@ -50137,8 +48736,8 @@ aZh aYd aZI aWc -aXZ -baH +aWS +aWw bas baU baU @@ -50235,14 +48834,14 @@ aBR aCD aDl ayh -aco +aBa aFl aBO aah aBO aBO aEz -aJa +aHD aIh aKx aKx @@ -50270,16 +48869,16 @@ aUc aUc aUc aUb -aXo -aXK +aXu +aHe aYd aYs aYO aZi aYd aWA -bac -bav +aVh +aWc aWc bas aad @@ -50361,7 +48960,7 @@ arz asc arz arz -atl +apC aqf aqf arg @@ -50377,13 +48976,13 @@ aBS aCE aDm aDS -aEB -aFo +aBb +aBg aBO aah aah aBO -aEv +aEz aHC aIh aKy @@ -50412,8 +49011,8 @@ aUX aWg aUc aUb -aXp -aXL +aXr +aXJ aYd aYd aYd @@ -50503,7 +49102,7 @@ arz aoR arz asO -atl +apC aqf aqf arg @@ -50519,13 +49118,13 @@ aBT aCF aDn ayh -aEC -aFm +aBc +aFl aBO aah aah aBO -aIj +aCu aHC aIh aIh @@ -50554,17 +49153,17 @@ aUb aWh aWD aUb -aXp +aXr aXJ aYe -aYt -aYP +bad +aId aZj aZz -aZJ +aNT bad bad -baI +aWP baR aad aad @@ -50645,7 +49244,7 @@ arz asd arz arz -atl +apC aqf aqf arg @@ -50661,14 +49260,14 @@ aBT aCG aDo ayh -aED +aBd aFl aBO aah aah aBO aIk -aHB +aHC aBO aKz aIa @@ -50696,17 +49295,17 @@ aUW aWf aWE aUb -aXq +aXt aXM aYf aYu -aYQ -aZk +aIe +aJa aZA aZK -bae +aVl bad -baJ +aWR baR baU aad @@ -50803,8 +49402,8 @@ ayh ayh ayh ayh -aEE -aFm +aBe +aFl aBO aah aah @@ -50812,9 +49411,9 @@ aBO aBO aJb aBO -aHZ -aLf -aLL +aIa +aDk +aDI aIh aNh aNP @@ -50839,15 +49438,15 @@ aUc aWE aUb aXr -aXx +aXP aYe aYe aYR aYe aYe aZL -baf -baw +aVm +aVW baK aYe aad @@ -50984,13 +49583,13 @@ aXr aXJ aYe aYv -aYS +aIg aZl aYe -aZM +aUE +aZz +aZz aZz -bax -bax baR aad aad @@ -51090,7 +49689,7 @@ ayh aCJ aFq aCJ -aGu +aBk aCJ agM ayG @@ -51122,17 +49721,17 @@ aUb aWh aWF aUb -aXs +aFo aXJ aYe -aYw +aHB aYT aZm aYe aZN -bag -bay -aYt +aVo +aVX +bad baR baU baU @@ -51229,11 +49828,11 @@ ayh ayh ayh ayh -aCK +aCJ aFr -aCK -aCK -aCK +aCJ +aCJ +aCJ agM aeM aJd @@ -51264,8 +49863,8 @@ aUW aWf aWE aUb -aXp -aXL +aXr +aXJ aYe aYe aYe @@ -51370,12 +49969,12 @@ ldI agM aCJ aCJ -aCK +aCJ aCJ aFs -aCK -aCK -aCK +aCJ +aCJ +aCJ agM ayG aJe @@ -51407,16 +50006,16 @@ aVJ aWG aUb aXr -aXL +aXJ aYg aYx -aYU -aZn -aZB +aIi +aJu +aZQ aZO bah -baz -baL +aWu +aXf baS baU baU @@ -51510,14 +50109,14 @@ mSz qhq oib agM -aCK -aCK -aCK -aCK -aCK aCJ aCJ -aCK +aCJ +aCJ +aCJ +aCJ +aCJ +aCJ agM aIm aJf @@ -51549,16 +50148,16 @@ aUc aUc aUb aXt -aXN +aXO aYh -aYy -aYV +aHE +aIj aZo aZC aZC -bai -baz -aZB +aVp +aWu +aZQ baS baU baU @@ -51614,7 +50213,7 @@ aeU aef aef afE -azU +aef aef aef aEY @@ -51653,13 +50252,13 @@ ayG qRI agM aCJ -aCK aCJ -aCK -aCK aCJ -aCK -aCK +aCJ +aCJ +aCJ +aCJ +aCJ agM aIn aJg @@ -51694,7 +50293,7 @@ aXu aXJ aYg aYg -aYW +aIE aYg aYg aZP @@ -51756,7 +50355,7 @@ aah aah aah akA -aah +aAG aah aef aEZ @@ -51795,11 +50394,11 @@ oVr mrR agM aCJ -aCK -aCK aCJ -aCK -aCK +aCJ +aCJ +aCJ +aCJ aCJ aCJ agM @@ -51836,13 +50435,13 @@ aXv aXJ aYg aYz -aYX +aIF aZp aYg aZQ -bak -bak -baN +bah +bah +aXn baS baU aad @@ -51898,7 +50497,7 @@ aah aah aah akA -aah +aAG aah aef aFa @@ -51937,13 +50536,13 @@ ayG jnj agM cOq -aCK -aCK -aCK -aCK -aCK aCJ -aHj +aCJ +aCJ +aCJ +aCJ +aCJ +aBs agM aEH aJh @@ -51974,14 +50573,14 @@ aVL aWj aWI aUb -aXp -aXL +aXr +aXJ aYg -aYA +aHO aYY aZq aYg -aZB +aZQ bal baB bah @@ -52025,10 +50624,10 @@ aad aad aad aar -aaI abL -acA -adg +abL +abL +abL aea afb atO @@ -52040,7 +50639,7 @@ aah aah aah anF -aah +aAG aah aef aFb @@ -52116,8 +50715,8 @@ aVM aWk aWJ aUb -aXp -aXL +aXr +aXJ aYg aYg aYg @@ -52182,7 +50781,7 @@ aah aah aah akA -aah +aAG aah aef aef @@ -52259,15 +50858,15 @@ aUb aUb aUb aXr -aXx +aXP aYi aYB -aYZ -aZr +aIH +aJw aZD aZR -bam -bam +baD +baD baO baT baU @@ -52324,7 +50923,7 @@ axP axP axP akA -aah +aAI aah aah aah @@ -52403,13 +51002,13 @@ aWU aXw aXO aYj -aYC -aZa -aZs -aZE -aZE -ban -aZT +aHW +aII +aJx +aKS +aKS +aVG +aZD baP baT baU @@ -52466,8 +51065,8 @@ ayZ aAc aAi asT -aah -aah +aAI +adK aah aah aah @@ -52486,7 +51085,7 @@ aah apF aqP apF -arC +arL arO asi asw @@ -52542,7 +51141,7 @@ aVO aWm aWL aVn -aXx +aXP aXP aYi aYi @@ -52607,9 +51206,9 @@ ayC aza aAd axP -awB -aah -aah +aAz +aAI +adK aah aah aah @@ -52627,8 +51226,8 @@ aah aah apF aqQ -ari -arh +arl +ark apF ash asx @@ -52687,14 +51286,14 @@ aVn aVn aVn aYi -aYD +aHX aZc -aZt +aJD aYi -aZT -aZT +aZD +aZD baD -aZT +aZD baT baU aad @@ -52749,9 +51348,9 @@ ayC azE axP axP -axI -aah -aah +axK +aAI +adK aah aah aah @@ -52769,7 +51368,7 @@ aah aah apF aqP -ari +arl apF apF ash @@ -52827,16 +51426,16 @@ aWo aWM aWV aVn -aop +aHg aYi aYE -aZd +aIM aZu aYi aZU -bap +aVH baE -bam +baD baT baU aad @@ -52892,19 +51491,19 @@ azF axP aeF axK -aah -aah +aAI +adK aah aah aah aah aah aaU -abs -aby -gvC -abC -abE +agQ +ahp +ahC +akI +anf aaU aah aah @@ -52961,11 +51560,11 @@ aSW aTD aSo acw -aUP +aVS aVe aVA aVQ -aUP +bHR aUP bcT aVn @@ -53033,27 +51632,27 @@ axP axP axP aeJ -azK -aah -aah +aAz +aAI +adK aah aah aah aah aah aaU -abt -agQ +agS +ahq +ajP +akY anq -ahz -abF aaU aaU aaU aaU aaU abR -arh +ark apF aah ash @@ -53103,11 +51702,11 @@ aSX aTE aSo acz -aUP +bcT aVf aVB aVf -aUP +cwS aUP aWX aUm @@ -53170,32 +51769,32 @@ aff auo adG ayf -ayD -azb -azG -adr +aff +aAI +aAI +aAD afy azT aAa -aah +adK aah aah bbj bbj bbj bbj -abu -anf -ahg -ahA -abG +agT +ahr +ajR +alu +anr abJ abM abJ abJ abO abS -ark +arC apF aah ash @@ -53245,11 +51844,11 @@ aSY aTF aSo afZ -aUP +bcT aVf aVB aVf -aUP +cwS aUP aWY aUm @@ -53297,7 +51896,7 @@ aad aad aad aad -bcV +aad aad aad aad @@ -53319,25 +51918,25 @@ azV azV azV aAb -aah +adK aah bbj bbj bbI bbM bbj -agH -agS -anr -ahB -gwo +ahg +ahz +ajZ +alD +anL aaU aaU aaU aaU aaU aql -ari +arl apF aah ash @@ -53387,11 +51986,11 @@ aSX aTG aSo arm -aUP +bcT aVf aUs aUu -aVP +iee aVP aWZ bcj @@ -53461,18 +52060,18 @@ azW aAe aeE aAz -aah +adK aah bbj bbx bbJ bbV bbj -abH -agT -abH -agT -vPZ +ahk +ahA +ahk +ahA +aop aaU aah aah @@ -53529,11 +52128,11 @@ aSZ aSo aSo arD -aUP +bcT aVf aVB aVf -aUP +cwS aUP aXa aUm @@ -53603,7 +52202,7 @@ azX aAg aeE aAz -aah +adK aah bbj bby @@ -53671,11 +52270,11 @@ aTa aTH aSo aTB -aUP +bcm aVg aVC aVR -aWp +laR aWp aXb aUm @@ -53745,7 +52344,7 @@ azY aAh aeE aAz -aah +adK aAW bbr bbz @@ -53814,7 +52413,7 @@ aTI aSo aUo aUQ -aVh +bHR aUP aVS aga @@ -54480,7 +53079,7 @@ aah aah aah atx -aua +auB auB auB auB @@ -54616,13 +53215,13 @@ aah aah aah aah -aah -aah -aah -aah -baU aty -aub +atx +atx +atx +atx +aty +afH aub aub aub @@ -54758,32 +53357,32 @@ aah aah aah aah -aah -aah -aah -aah -baU -atz -auc -auc -auc -auc -auc -auc -auc -auc -azr -azr -azr -auc -auc -auc -auc -auc -auc +auD auc auc atz +auc +auc +atA +atA +atA +atA +atA +auc +auc +auc +atA +auc +atA +auc +auc +auc +atA +atA +atA +atA +atA +auD aad aad aad @@ -54900,12 +53499,7 @@ aah aah aah aah -aah -aah -aah -aad -aad -atz +auD aud aud aud @@ -54915,7 +53509,6 @@ aud aud aud aud -auX aud aud aud @@ -54925,7 +53518,13 @@ aud aud aud aud -atz +aud +aud +aud +aud +aud +aud +auD aad aad aad @@ -55042,32 +53641,32 @@ aad aad aah aah -aah -aad -aad -aad -aad -atA -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -atA +auD +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +wXW +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +auD aad aad aad @@ -55184,32 +53783,32 @@ aad aad aad aad -aad -aad -aad -aad -aad +auD atB -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud -aud atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +auD aad aad aad @@ -55326,12 +53925,7 @@ aad aad aad aad -aad -aad -aad -aad -aad -atB +auD aud aud aud @@ -55351,7 +53945,12 @@ aud aud aud aud -atB +aud +aud +aud +aud +aud +auD aad aad aad @@ -55468,12 +54067,7 @@ aad aad aad aad -aad -aad -aad -aad -aad -atB +auD aud aud aud @@ -55493,7 +54087,12 @@ aud aud aud aud -atB +aud +aud +aud +aud +aud +auD aad aad aad @@ -55610,12 +54209,7 @@ aad aad aad aad -aad -aad -aad -aad -aad -atB +auD aud aud aud @@ -55635,7 +54229,12 @@ aud aud aud aud -atB +aud +aud +aud +aud +aud +auD aad aad aad @@ -55752,32 +54351,32 @@ aad aad aad aad -aad -aad -aad -aad -aad -atA -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -aue -atA +auD +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +auD aad aad aad @@ -55894,12 +54493,7 @@ aad aad aad aad -aad -aad -aad -aad -aad -atz +auD aud aud aud @@ -55919,7 +54513,12 @@ aud aud aud aud -atz +aud +aud +aud +aud +aud +auD aad aad aad @@ -56036,32 +54635,32 @@ aad aad aad aad -aad -aad -aad -aad -aad -atz -auf auD -auf -afH +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud auD -auf -auf -auD -auf -auf -auf -auD -auf -auf -auD -afH -auf -auD -auf -atz aad aad aad @@ -56178,32 +54777,32 @@ aad aad aad aad -aad -aad -aad -aad -aad -atC -atx -atx -atx -atx -awk -atx -atx -atx -atx -awk -atx -atx -atx -atx -awk -atx -atx -atx -atx -atC +auD +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +auD aad aad aad @@ -56276,7 +54875,7 @@ aad aad aad aad -aad +bcV aad aad aad @@ -56320,32 +54919,32 @@ aad aad aad aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad +auD +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +atB +auD aad aad aad @@ -56462,32 +55061,32 @@ aad aad aad aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad +auD +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +aud +auD aad aad aad @@ -56604,32 +55203,32 @@ aad aad aad aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad +auD +atC +atC +aua +atC +atC +atC +aua +atC +atC +aue +aua +atC +atC +aua +atC +atC +atC +aua +atC +aue +atC +aua +atC +atC +auD aad aad aad @@ -56746,32 +55345,32 @@ aad aad aad aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad -aad +aty +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +atx +aty aad aad aad diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index a0d8da34e8f..3b7cead3e94 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -67,9 +67,7 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) @@ -211,6 +209,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aar" = ( @@ -221,9 +222,7 @@ dir = 1 }, /turf/simulated/floor/wood, -/area/tether/surfacebase/medical/uppernorthstairwell{ - name = "\improper North Medical Stairwell" - }) +/area/tether/surfacebase/medical/centralhall) "aat" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -245,17 +244,19 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aau" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/railing{ + dir = 4 }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/random/cigarettes, +/obj/effect/floor_decal/techfloor{ + dir = 9 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/centralhall) +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) "aav" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -332,9 +333,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) @@ -389,8 +388,7 @@ /area/tether/surfacebase/medical/centralhall) "aaH" = ( /obj/machinery/vending/coffee{ - dir = 8; - icon_state = "coffee" + dir = 8 }, /obj/structure/window/reinforced, /turf/simulated/floor/wood, @@ -418,10 +416,6 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aaJ" = ( -/obj/item/device/radio/intercom/department/medbay{ - dir = 8; - pixel_x = -24 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -552,9 +546,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloorwhite/corner2, -/obj/effect/floor_decal/corner/pink/bordercorner2{ - dir = 2 - }, +/obj/effect/floor_decal/corner/pink/bordercorner2, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/examroom) "aaQ" = ( @@ -593,16 +585,12 @@ /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -683,7 +671,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -691,8 +678,7 @@ "aaX" = ( /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -713,8 +699,7 @@ /area/tether/surfacebase/medical/centralhall) "aaY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 @@ -731,15 +716,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aaZ" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/structure/sign/poster{ - pixel_y = 32 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -752,14 +731,16 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 10 }, +/obj/machinery/button/remote/airlock{ + desc = "A remote control switch for the medbay recovery room door."; + id = "MedicalRecovery"; + name = "Exit Button"; + pixel_x = -5; + pixel_y = 24 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "aba" = ( -/obj/item/device/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 24 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -770,6 +751,9 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/structure/sign/poster{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "abb" = ( @@ -906,7 +890,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = -32 }, /turf/simulated/floor/tiled/white, @@ -968,11 +951,6 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "abr" = ( -/obj/machinery/button/windowtint{ - id = "patient_room_a"; - pixel_x = 26; - pixel_y = -26 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, @@ -983,11 +961,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -24; - pixel_y = -30 - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; @@ -1026,7 +999,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -1041,39 +1013,14 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 8 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppernorthstairwell{ name = "\improper North Medical Stairwell" }) -"abv" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/centralhall) "abw" = ( /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -1117,6 +1064,11 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_x = -28 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "abz" = ( @@ -1152,12 +1104,17 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, +/obj/machinery/button/windowtint{ + id = "ward_tint"; + pixel_x = -24; + pixel_y = 8; + range = 12 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "abC" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -1201,11 +1158,6 @@ /turf/simulated/open, /area/tether/surfacebase/medical/centralstairwell) "abG" = ( -/obj/machinery/button/windowtint{ - id = "patient_room_b"; - pixel_x = -26; - pixel_y = -26 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, @@ -1216,11 +1168,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 24; - pixel_y = -30 - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; @@ -1244,8 +1191,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor, /area/chapel/main) @@ -1285,8 +1231,7 @@ dir = 1 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -1339,18 +1284,18 @@ }, /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) "abP" = ( @@ -1366,9 +1311,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/light{ - dir = 1 - }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) "abR" = ( @@ -1391,8 +1333,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -35; - pixel_y = 0 + pixel_x = -35 }, /obj/machinery/light{ dir = 8 @@ -1420,6 +1361,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) "abU" = ( @@ -1429,17 +1373,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "abV" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 24 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/alarm{ + pixel_y = 22 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppernorthstairwell{ @@ -1527,7 +1462,6 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/structure/bed/chair, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acd" = ( @@ -1543,7 +1477,6 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/structure/bed/chair, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "ace" = ( @@ -1576,8 +1509,7 @@ /obj/machinery/photocopier, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) @@ -1597,7 +1529,6 @@ id = "medbayquar"; name = "Medbay Emergency Lockdown Control"; pixel_x = -36; - pixel_y = 0; req_access = list(5) }, /obj/machinery/button/remote/airlock{ @@ -1612,7 +1543,6 @@ id = "virologyquar"; name = "Virology Emergency Lockdown Control"; pixel_x = -28; - pixel_y = 0; req_access = list(5) }, /obj/machinery/button/windowtint{ @@ -1673,14 +1603,11 @@ "acq" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ dir = 4; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/techfloor{ dir = 4 @@ -1726,20 +1653,6 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 5 }, -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for the medbay recovery room door."; - dir = 8; - id = "SurfMedicalResleeving"; - name = "Exit Button"; - pixel_x = 28; - pixel_y = -4 - }, -/obj/machinery/button/windowtint/multitint{ - dir = 8; - id = "surfresleeving"; - pixel_x = 28; - pixel_y = 8 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acv" = ( @@ -1762,24 +1675,13 @@ dir = 8 }, /obj/machinery/camera/network/medbay{ - dir = 9; - icon_state = "camera" - }, -/obj/machinery/alarm{ - breach_detection = 0; - dir = 8; - icon_state = "alarm0"; - pixel_x = 25; - rcon_setting = 3; - report_danger_level = 0 + dir = 9 }, /obj/structure/window/reinforced{ dir = 1 }, /turf/simulated/floor/wood, -/area/tether/surfacebase/medical/uppernorthstairwell{ - name = "\improper North Medical Stairwell" - }) +/area/tether/surfacebase/medical/centralhall) "acy" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, @@ -1798,12 +1700,16 @@ /obj/item/weapon/stamp/cmo, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, /turf/simulated/floor/carpet, /area/tether/surfacebase/medical/cmo) "acB" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/machinery/computer/med_data/laptop{ + dir = 1; + pixel_y = 4 + }, /turf/simulated/floor/carpet, /area/tether/surfacebase/medical/cmo) "acC" = ( @@ -1812,22 +1718,17 @@ "acD" = ( /obj/structure/table/glass, /obj/machinery/computer/skills{ - dir = 8; - icon_state = "laptop"; - pixel_x = 4; - pixel_y = -3 - }, -/obj/machinery/computer/med_data/laptop{ - dir = 8; - pixel_x = -4; + dir = 1; + pixel_x = -9; pixel_y = 4 }, /obj/machinery/requests_console{ announcementConsole = 1; department = "Chief Medical Officer's Desk"; departmentType = 5; + dir = 8; name = "Chief Medical Officer RC"; - pixel_x = 30 + pixel_x = 22 }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) @@ -1896,6 +1797,9 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 4 }, +/obj/machinery/alarm{ + pixel_y = 22 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "acJ" = ( @@ -1906,11 +1810,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acK" = ( @@ -1920,9 +1819,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acL" = ( @@ -1930,8 +1826,7 @@ /obj/item/device/reagent_scanner, /obj/item/device/mass_spectrometer/adv, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /obj/structure/cable/green{ d1 = 1; @@ -2026,8 +1921,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -2046,7 +1940,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2065,6 +1958,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/sign/poster{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/evidence) "acW" = ( @@ -2088,7 +1984,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "2-4" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) @@ -2246,17 +2142,14 @@ /turf/simulated/wall, /area/tether/surfacebase/medical/examroom) "adj" = ( -/obj/machinery/shower{ - dir = 4; - icon_state = "shower"; - pixel_x = 2; - pixel_y = 0 - }, /obj/structure/curtain/open/shower/medical, /obj/effect/floor_decal/steeldecal/steel_decals10, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 4 }, +/obj/machinery/shower{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "adk" = ( @@ -2372,11 +2265,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "adt" = ( @@ -2416,9 +2304,7 @@ "adA" = ( /obj/structure/table/reinforced, /obj/machinery/computer/med_data/laptop{ - dir = 8; - pixel_x = 0; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) @@ -2458,7 +2344,6 @@ "adE" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /turf/simulated/floor/tiled/dark, @@ -2468,31 +2353,17 @@ name = "Evidence Closet" }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/evidence) "adG" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "adH" = ( -/obj/machinery/organ_printer/flesh, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -2505,6 +2376,23 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 6 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/button/remote/airlock{ + desc = "A remote control switch for the medbay recovery room door."; + dir = 8; + id = "SurfMedicalResleeving"; + name = "Exit Button"; + pixel_x = 28; + pixel_y = -4 + }, +/obj/machinery/button/windowtint/multitint{ + dir = 8; + id = "surfresleeving"; + pixel_x = 28; + pixel_y = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "adI" = ( @@ -2550,8 +2438,7 @@ dir = 8 }, /obj/machinery/camera/network/medbay{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) @@ -2725,7 +2612,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite/corner2{ @@ -2740,7 +2626,6 @@ "adZ" = ( /obj/machinery/computer/guestpass{ dir = 1; - icon_state = "guest"; pixel_y = -28 }, /obj/effect/floor_decal/borderfloorwhite, @@ -2751,6 +2636,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 9 }, +/obj/machinery/organ_printer/flesh, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aea" = ( @@ -2806,8 +2692,7 @@ /obj/structure/table/glass, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/item/weapon/clipboard, /obj/effect/floor_decal/borderfloorwhite{ @@ -2822,8 +2707,7 @@ /obj/structure/window/reinforced, /obj/machinery/dnaforensics, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) @@ -2874,8 +2758,7 @@ /obj/structure/window/reinforced, /obj/structure/filingcabinet, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) @@ -2898,13 +2781,12 @@ /turf/simulated/wall/r_wall, /area/tether/surfacebase/outside/outside2) "aem" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall, /area/tether/surfacebase/medical/patient_a) "aen" = ( /obj/machinery/vending/loadout/uniform, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 @@ -2912,6 +2794,11 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 6 }, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -28 + }, +/obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aeo" = ( @@ -2935,8 +2822,7 @@ /obj/structure/filingcabinet/chestdrawer, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) @@ -2961,8 +2847,7 @@ /obj/structure/table/glass, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/item/weapon/clipboard, /obj/effect/floor_decal/borderfloorwhite{ @@ -2996,8 +2881,7 @@ /obj/structure/table/glass, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/item/weapon/clipboard, /obj/effect/floor_decal/borderfloorwhite{ @@ -3077,8 +2961,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -3103,8 +2986,7 @@ /area/tether/surfacebase/security/detective) "aeI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -3144,8 +3026,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -3361,14 +3242,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -27; + pixel_y = -28 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/cmo) "afe" = ( -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 24; - pixel_y = -30 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -3378,8 +3259,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, @@ -3438,14 +3318,19 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/machinery/button/windowtint{ + id = "patient_room_a"; + pixel_x = -3; + pixel_y = -22 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 6; + pixel_y = -22 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/patient_a) "afi" = ( -/obj/machinery/button/windowtint{ - id = "patient_room_c"; - pixel_x = -26; - pixel_y = -26 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, @@ -3456,11 +3341,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 24; - pixel_y = -30 - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; @@ -3499,6 +3379,16 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 6; + pixel_y = -22 + }, +/obj/machinery/button/windowtint{ + id = "patient_room_c"; + pixel_x = -3; + pixel_y = -22 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/patient_c) "afl" = ( @@ -3535,7 +3425,6 @@ "afm" = ( /obj/machinery/light_switch{ dir = 1; - pixel_x = 0; pixel_y = -28 }, /obj/structure/disposalpipe/segment{ @@ -3581,6 +3470,16 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 6; + pixel_y = -22 + }, +/obj/machinery/button/windowtint{ + id = "patient_room_b"; + pixel_x = -3; + pixel_y = -22 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/patient_b) "afo" = ( @@ -3610,8 +3509,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, @@ -3620,8 +3518,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/catwalk, /obj/structure/catwalk, @@ -3736,8 +3633,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) @@ -3756,8 +3652,7 @@ /area/tether/surfacebase/security/middlehall) "afG" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -3766,8 +3661,7 @@ dir = 4 }, /obj/machinery/vending/fitness{ - dir = 4; - icon_state = "fitness" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) @@ -3784,13 +3678,10 @@ }, /obj/item/device/radio/intercom/department/security{ dir = 8; - icon_state = "secintercom"; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/tiled/dark, @@ -3990,7 +3881,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -4053,14 +3943,25 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/examroom) "aga" = ( -/obj/machinery/door/airlock/multi_tile/metal/mait{ - dir = 1; - name = "Maintenance Access" +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ + dir = 1 }, -/obj/machinery/door/firedoor/glass, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white, -/area/maintenance/lower/north) +/obj/machinery/atmospherics/pipe/zpipe/up/supply{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 16; + d2 = 0; + icon_state = "16-0" + }, +/obj/structure/cable/green, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence/upper) "agb" = ( /obj/machinery/door/airlock/command{ id_tag = "cmodoor"; @@ -4111,8 +4012,17 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "agf" = ( -/turf/simulated/wall/r_wall, -/area/tether/surfacebase/medical/cmo) +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/bar) "agg" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/medical{ @@ -4161,8 +4071,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/lower/north) @@ -4178,14 +4087,12 @@ /obj/structure/catwalk, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/lower/north) @@ -4258,8 +4165,7 @@ "agv" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -4424,7 +4330,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/dark, @@ -4445,8 +4350,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/lower/north) @@ -4455,8 +4359,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/surface_two_hall) @@ -4520,8 +4423,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ icon_state = "2-4" @@ -4584,8 +4486,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4607,8 +4508,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -4621,21 +4521,12 @@ }, /obj/machinery/computer/guestpass{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/machinery/door/firedoor/glass/hidden, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "aha" = ( -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for the medbay recovery room door."; - dir = 2; - id = "SurfMedicalResleevingMaintExit"; - name = "Exit Button"; - pixel_x = 28; - pixel_y = -28 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, @@ -4657,6 +4548,9 @@ /obj/structure/bookcase, /obj/item/weapon/book/manual/security_space_law, /obj/item/weapon/book/manual/security_space_law, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) "ahe" = ( @@ -4664,7 +4558,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -4695,7 +4588,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -4708,13 +4600,15 @@ /obj/structure/bookcase, /obj/item/weapon/book/manual/security_space_law, /obj/item/weapon/book/manual/security_space_law, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officeb) "ahl" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -4733,8 +4627,7 @@ icon_state = "1-2" }, /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -4770,8 +4663,7 @@ }, /obj/structure/closet/secure_closet/security, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/item/device/holowarrant, /turf/simulated/floor/tiled/dark, @@ -4803,12 +4695,10 @@ /area/tether/surfacebase/security/outfitting) "ahr" = ( /obj/effect/floor_decal/borderfloorblack/corner{ - dir = 8; - icon_state = "borderfloorcorner_black" + dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /obj/structure/table/bench/steel, /obj/effect/landmark/start{ @@ -4834,7 +4724,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/item/device/holowarrant, @@ -4870,8 +4759,7 @@ /obj/machinery/vending/security, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) @@ -4900,8 +4788,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) @@ -4959,8 +4846,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/window/basic{ dir = 4 @@ -4992,7 +4878,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction{ dir = 1; - icon_state = "pipe-j1s"; name = "CMO Office"; sortType = "CMO Office" }, @@ -5026,17 +4911,11 @@ }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/firealarm{ - dir = 1; - pixel_x = 0; - pixel_y = -24 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "ahH" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; - icon_state = "pipe-j1s"; name = "CMO Office"; sortType = "CMO Office" }, @@ -5045,7 +4924,6 @@ "ahI" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; - icon_state = "pipe-j1s"; name = "Medical Breakroom"; sortType = "Medical Breakroom" }, @@ -5059,8 +4937,7 @@ "ahK" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -5239,8 +5116,7 @@ /obj/structure/closet/secure_closet/security, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/item/device/holowarrant, /turf/simulated/floor/tiled/dark, @@ -5347,7 +5223,6 @@ "ail" = ( /obj/structure/table/steel, /obj/item/ammo_magazine/m45/rubber{ - pixel_x = 0; pixel_y = 9 }, /obj/item/ammo_magazine/m45/rubber{ @@ -5355,7 +5230,6 @@ pixel_y = 3 }, /obj/item/ammo_magazine/m45/rubber{ - pixel_x = 0; pixel_y = -3 }, /obj/machinery/recharger/wallcharger{ @@ -5401,8 +5275,7 @@ /area/tether/surfacebase/security/armory) "aip" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -5466,7 +5339,6 @@ /obj/structure/table/glass, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /turf/simulated/floor/tiled/white, @@ -5540,6 +5412,9 @@ /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "aiy" = ( @@ -5585,8 +5460,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/morgue) @@ -5612,6 +5486,10 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 9 }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aiC" = ( @@ -5627,8 +5505,7 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -5642,26 +5519,11 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "aiE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, +/obj/machinery/portable_atmospherics/powered/scrubber, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; - dir = 8; - name = "west bump"; - pixel_x = -28 + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenence/upper) @@ -5722,8 +5584,7 @@ dir = 8 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) @@ -5795,7 +5656,6 @@ dir = 8 }, /obj/structure/sign/poster{ - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled/white, @@ -5827,7 +5687,6 @@ /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -5888,6 +5747,12 @@ req_access = list(5); req_one_access = list(5) }, +/obj/machinery/button/remote/airlock{ + desc = "A remote control switch for the medbay recovery room door."; + id = "SurfMedicalResleevingMaintExit"; + name = "Exit Button"; + pixel_x = -24 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "aiU" = ( @@ -5935,8 +5800,7 @@ }, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) @@ -5960,22 +5824,19 @@ /area/tether/surfacebase/security/detective/officea) "aja" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) "ajb" = ( /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) "ajc" = ( /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officeb) @@ -6019,8 +5880,7 @@ /area/tether/surfacebase/security/detective/officeb) "ajg" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -6192,8 +6052,7 @@ pixel_y = 3 }, /obj/item/weapon/storage/box/flashshells{ - pixel_x = 1; - pixel_y = 0 + pixel_x = 1 }, /obj/item/weapon/storage/box/beanbags{ pixel_x = 4; @@ -6246,17 +6105,11 @@ /obj/structure/table/rack/steel, /obj/item/clothing/gloves/arm_guard/laserproof, /obj/item/clothing/shoes/leg_guard/laserproof, -/obj/item/clothing/suit/armor/laserproof{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/clothing/suit/armor/laserproof, /obj/item/clothing/head/helmet/laserproof, /obj/item/clothing/gloves/arm_guard/laserproof, /obj/item/clothing/shoes/leg_guard/laserproof, -/obj/item/clothing/suit/armor/laserproof{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/clothing/suit/armor/laserproof, /obj/item/clothing/head/helmet/laserproof, /obj/structure/window/reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -6354,9 +6207,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -6465,8 +6316,7 @@ dir = 4 }, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -6503,14 +6353,6 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "ajU" = ( -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for the medbay recovery room door."; - dir = 4; - id = "MedicalRecovery"; - name = "Exit Button"; - pixel_x = -26; - pixel_y = 26 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -6571,17 +6413,9 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) "ajZ" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officea) "aka" = ( -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/detective/officeb) "akb" = ( @@ -6746,8 +6580,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) @@ -6777,7 +6610,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 1; - icon_state = "pipe-j1s"; name = "Medical Breakroom"; sortType = "Medical Breakroom" }, @@ -6816,8 +6648,7 @@ dir = 5 }, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/morgue) @@ -6835,7 +6666,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's set to ree-Anur-ntertanment, I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -6890,7 +6720,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -6920,7 +6749,6 @@ dir = 9 }, /obj/structure/sign/poster{ - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled/white, @@ -6939,10 +6767,6 @@ /area/tether/surfacebase/medical/uppersouthstairwell) "akG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" - }, -/obj/machinery/light{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -7023,9 +6847,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -7056,8 +6878,7 @@ /area/tether/surfacebase/medical/centralhall) "akP" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/junction, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -7101,11 +6922,23 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "akR" = ( -/turf/simulated/wall/r_wall, -/area/tether/surfacebase/medical/uppersouthstairwell) +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/structure/sign/poster{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/middlehall) "akS" = ( /obj/structure/window/reinforced, /obj/machinery/vending/fitness{ @@ -7282,8 +7115,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -7301,8 +7133,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -7331,8 +7162,7 @@ pixel_y = 22 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -7350,8 +7180,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -7398,8 +7227,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -7420,8 +7248,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -7450,15 +7277,13 @@ "als" = ( /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 @@ -7621,8 +7446,7 @@ "alG" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/structure/cable/green{ d1 = 1; @@ -7662,7 +7486,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled/techfloor, @@ -7764,7 +7587,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 1; - icon_state = "extinguisher_closed"; pixel_y = 32 }, /turf/simulated/floor/tiled/white, @@ -7781,8 +7603,7 @@ dir = 8 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) @@ -7810,15 +7631,13 @@ dir = 6 }, /obj/structure/sign/poster{ - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "alW" = ( /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 @@ -7947,8 +7766,7 @@ }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -8019,6 +7837,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/light, /turf/simulated/floor/lino, /area/tether/surfacebase/security/detective/officea) "amj" = ( @@ -8026,12 +7845,12 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/light, /turf/simulated/floor/lino, /area/tether/surfacebase/security/detective/officeb) "amk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -8155,7 +7974,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/floor_decal/borderfloor, @@ -8257,8 +8075,7 @@ /area/tether/surfacebase/security/armory) "amz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -8296,8 +8113,7 @@ pixel_x = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -8418,6 +8234,10 @@ /obj/item/device/universal_translator, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) +"amN" = ( +/obj/structure/catwalk, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/mining) "amO" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/cable/green{ @@ -8439,16 +8259,148 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) +"amQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence/upper) +"amR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/maintenance/lower/north) +"amS" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/maintenance/lower/north) +"amT" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/mining) +"amU" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait{ + dir = 1; + name = "Maintenance Access" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/maintenance/lower/north) +"amV" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/mining) +"amW" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/floor_decal/rust, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/mining) "amX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) +"amY" = ( +/obj/effect/floor_decal/rust, +/obj/structure/closet/crate, +/obj/random/maintenance/cargo, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) +"amZ" = ( +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) +"ana" = ( +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/obj/random/cutout, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) +"anb" = ( +/obj/structure/railing, +/obj/effect/floor_decal/techfloor/hole{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) +"anc" = ( +/obj/structure/railing, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) +"and" = ( +/obj/structure/railing, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) "ane" = ( /obj/machinery/light{ dir = 1 @@ -8477,8 +8429,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) @@ -8564,7 +8515,9 @@ "ano" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced/polarized/full{ + id = "wardenwindows" + }, /turf/simulated/floor, /area/tether/surfacebase/security/warden) "anp" = ( @@ -8592,11 +8545,12 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "anq" = ( -/obj/machinery/door/airlock/glass_security{ - name = "Warden's Office"; - req_access = list(3) - }, /obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/security{ + name = "Warden's Office"; + req_access = list(3); + req_one_access = list() + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "anr" = ( @@ -8670,9 +8624,7 @@ /obj/structure/bedsheetbin, /obj/random/soap, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) @@ -8692,6 +8644,18 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) +"anz" = ( +/obj/structure/railing, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) "anA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -8706,9 +8670,39 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) +"anB" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) "anC" = ( /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) +"anD" = ( +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/mining) +"anE" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/mining) "anF" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/table/glass, @@ -8716,6 +8710,16 @@ /obj/structure/table/glass, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) +"anG" = ( +/obj/effect/floor_decal/rust, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) "anH" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/bed/chair{ @@ -8747,8 +8751,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/item/weapon/storage/box/cups{ pixel_x = 8; @@ -8768,6 +8771,12 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) +"anL" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/mining) "anM" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/reinforced/polarized/full{ @@ -8795,6 +8804,18 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) +"anO" = ( +/obj/effect/floor_decal/rust, +/obj/random/trash_pile, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/mining) +"anP" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/mining) "anQ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -8809,19 +8830,82 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) +"anS" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/mining) "anT" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) +"anU" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/bar) +"anV" = ( +/obj/effect/floor_decal/rust, +/obj/item/weapon/pen/crayon/red, +/turf/simulated/floor, +/area/maintenance/lower/north) +"anW" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining) +"anX" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 9 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) +"anY" = ( +/obj/effect/floor_decal/rust, +/obj/item/clothing/glasses/welding, +/turf/simulated/floor, +/area/maintenance/lower/north) +"anZ" = ( +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor/hole, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) +"aoa" = ( +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) +"aob" = ( +/obj/item/weapon/pickaxe/hand, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/maintenance/lower/north) +"aoc" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/lower/bar) +"aod" = ( +/obj/effect/floor_decal/rust, +/obj/effect/decal/remains/human, +/turf/simulated/floor, +/area/maintenance/lower/north) "aoe" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/effect/floor_decal/borderfloor{ @@ -8850,8 +8934,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) @@ -8859,7 +8942,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/effect/floor_decal/borderfloor{ @@ -9021,8 +9103,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -9038,13 +9119,11 @@ /area/tether/surfacebase/security/middlehall) "aou" = ( /obj/machinery/computer/prisoner{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/item/device/radio/intercom{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -9072,6 +9151,11 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/button/windowtint/multitint{ + id = "wardenwindows"; + pixel_x = -55; + pixel_y = 26 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "aow" = ( @@ -9095,8 +9179,7 @@ req_access = list(3) }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -9147,8 +9230,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 @@ -9227,8 +9309,7 @@ "aoC" = ( /obj/structure/closet/bombcloset/double, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) @@ -9257,12 +9338,10 @@ "aoF" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -9270,28 +9349,15 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "aoG" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/random/cigarettes, -/obj/effect/floor_decal/techfloor{ - dir = 9 - }, -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 26 - }, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/floor_decal/rust, +/obj/item/toy/figure/ninja, +/turf/simulated/floor, /area/maintenance/lower/north) "aoH" = ( -/obj/machinery/light/small{ - dir = 8; - pixel_y = 0 - }, /obj/machinery/recharge_station, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "aoI" = ( @@ -9327,14 +9393,51 @@ "aoL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) "aoM" = ( /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) +"aoN" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) +"aoO" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor/hole/right, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) +"aoP" = ( +/obj/random/junk, +/turf/simulated/floor, +/area/maintenance/lower/north) "aoQ" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/cable/green{ @@ -9347,6 +9450,25 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) +"aoR" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) +"aoS" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) "aoT" = ( /obj/item/device/radio/intercom{ dir = 4; @@ -9360,6 +9482,14 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) +"aoU" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/obj/random/cutout, +/turf/simulated/floor/tiled/techmaint, +/area/maintenance/lower/bar) "aoV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -9381,9 +9511,50 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) +"aoX" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/bar) +"aoY" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + name = "Maintenance Access" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) "aoZ" = ( -/turf/simulated/wall/r_wall, -/area/tether/surfacebase/medical/recoveryward) +/turf/simulated/floor/tiled/techfloor, +/area/chapel/main) +"apa" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) +"apb" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) "apc" = ( /obj/structure/cable/green, /obj/structure/cable/green{ @@ -9396,6 +9567,98 @@ }, /turf/simulated/floor, /area/maintenance/substation/medsec) +"apd" = ( +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Command Subgrid"; + name_tag = "Command Subgrid" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/green, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/command) +"ape" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"apf" = ( +/obj/structure/cable{ + icon_state = "16-0" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/disposalpipe/up, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"apg" = ( +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"aph" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"api" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"apj" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"apk" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"apl" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"apm" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) "apn" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -9456,8 +9719,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -9487,8 +9749,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9566,12 +9827,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ dir = 8 }, @@ -9608,7 +9865,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/structure/disposalpipe/segment{ @@ -9637,8 +9893,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) @@ -9666,12 +9921,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ dir = 8 }, @@ -9726,8 +9977,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -9736,8 +9986,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) @@ -9773,9 +10022,7 @@ }, /obj/item/device/radio/intercom/department/security{ dir = 8; - icon_state = "secintercom"; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -9860,6 +10107,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) +"apU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) "apV" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -9886,8 +10140,7 @@ "apY" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /obj/machinery/status_display{ level = 4; @@ -9905,7 +10158,6 @@ "aqa" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, @@ -9937,8 +10189,7 @@ }, /obj/machinery/disposal, /obj/machinery/camera/network/medbay{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) @@ -9969,12 +10220,98 @@ /obj/structure/bedsheetbin, /obj/random/soap, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) +"aqg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"aqh" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/machinery/light/small{ + dir = 1 + }, +/mob/living/simple_mob/animal/passive/snake/noodle, +/turf/simulated/floor/grass, +/area/chapel/main) +"aqi" = ( +/obj/structure/flora/ausbushes/ppflowers, +/mob/living/simple_mob/animal/passive/mouse/white/apple, +/turf/simulated/floor/grass, +/area/chapel/main) +"aqj" = ( +/obj/structure/symbol/da{ + pixel_x = 32 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"aqk" = ( +/obj/effect/decal/remains/human, +/obj/random/action_figure, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"aql" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"aqm" = ( +/obj/structure/table/rack, +/obj/random/maintenance/research, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"aqn" = ( +/obj/structure/closet, +/obj/random/maintenance/research, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"aqo" = ( +/obj/item/weapon/storage/fancy/cigar/havana, +/obj/random/drinkbottle, +/turf/simulated/floor/plating, +/area/tether/surfacebase/surface_two_hall) +"aqp" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/closet, +/obj/random/maintenance/research, +/obj/random/maintenance/clean, +/obj/random/tool, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"aqq" = ( +/obj/structure/catwalk, +/obj/structure/grille/broken, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"aqr" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"aqs" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "aqt" = ( /obj/structure/sign/poster, /turf/simulated/wall, @@ -10050,8 +10387,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" + dir = 4 }, /obj/structure/cable/green{ d1 = 4; @@ -10179,10 +10515,12 @@ "aqJ" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/structure/window/reinforced/polarized/full{ + id = "wardenwindows" + }, /turf/simulated/floor, /area/tether/surfacebase/security/warden) "aqK" = ( @@ -10348,12 +10686,6 @@ /turf/simulated/floor/plating, /area/maintenance/lower/north) "aqW" = ( -/obj/machinery/button/windowtint{ - id = "ward_tint"; - pixel_x = -24; - pixel_y = 8; - range = 12 - }, /obj/effect/landmark{ name = "lightsout" }, @@ -10373,6 +10705,40 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/breakroom) +"aqY" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"aqZ" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/structure/sign/warning/caution{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"ara" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"arb" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) "arc" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/standard, @@ -10385,6 +10751,64 @@ "ard" = ( /turf/simulated/wall, /area/maintenance/lower/bar) +"are" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 1 + }, +/obj/random/tool, +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 4 + }, +/obj/structure/sign/warning/caution{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"arf" = ( +/obj/effect/floor_decal/industrial/danger/corner{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"arg" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"arh" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"ari" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/random/trash_pile, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "arj" = ( /obj/structure/railing{ dir = 4 @@ -10399,9 +10823,17 @@ /turf/simulated/floor/virgo3b, /area/tether/surfacebase/outside/outside2) "arm" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/virgo3b, -/area/tether/surfacebase/outside/outside2) +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "arn" = ( /obj/structure/table/standard{ name = "plastic table frame" @@ -10479,41 +10911,25 @@ /turf/simulated/wall, /area/tether/surfacebase/public_garden_two) "arv" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/zpipe/up/supply{ - dir = 1 - }, +/obj/structure/catwalk, /obj/structure/cable/green{ - d1 = 16; - d2 = 0; - icon_state = "16-0" + icon_state = "0-4" }, -/obj/structure/cable/green, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenence/upper) +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "arw" = ( -/obj/machinery/portable_atmospherics/powered/scrubber, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, /obj/structure/cable/green{ - icon_state = "1-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenence/upper) +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "arx" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/brig/bathroom) @@ -10523,8 +10939,7 @@ name = "Security Officer" }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/brig/bathroom) @@ -10587,13 +11002,15 @@ "arE" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/structure/window/reinforced/polarized/full{ + id = "wardenwindows" + }, /turf/simulated/floor, /area/tether/surfacebase/security/warden) "arF" = ( @@ -10664,8 +11081,7 @@ /obj/item/clothing/head/helmet/space/void/security, /obj/machinery/alarm{ dir = 4; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -10683,8 +11099,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/evastorage) @@ -10737,8 +11152,7 @@ pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) @@ -10747,16 +11161,33 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/flasher/portable, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) +"arQ" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 1 + }, +/obj/random/trash_pile, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "arR" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/catwalk, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/mining) +/obj/random/junk, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "arS" = ( /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -10771,11 +11202,69 @@ "arU" = ( /obj/structure/catwalk, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/lower/mining) +"arV" = ( +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"arW" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/railing, +/obj/effect/floor_decal/rust, +/obj/random/cutout, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"arX" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"arY" = ( +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"arZ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"asa" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "asb" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/undies_wardrobe, @@ -10878,6 +11367,61 @@ /obj/item/weapon/storage/fancy/candle_box, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) +"ask" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 1 + }, +/obj/random/junk, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"asl" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 1 + }, +/obj/random/junk, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"asm" = ( +/obj/item/toy/plushie/kitten{ + desc = "An odd appearing, cryptic plush of a cat."; + name = "Pablo" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/tether/surfacebase/outside/outside2) +"asn" = ( +/obj/item/clothing/under/batter, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/tether/surfacebase/outside/outside2) +"aso" = ( +/obj/machinery/space_heater, +/turf/simulated/floor/plating, +/area/tether/surfacebase/emergency_storage/atmos) +"asp" = ( +/obj/structure/cable/cyan{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/emergency_storage/atmos) "asq" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 10 @@ -10910,9 +11454,7 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 @@ -10921,9 +11463,7 @@ /area/tether/surfacebase/public_garden_two) "asu" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 @@ -10953,12 +11493,19 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) +"asx" = ( +/obj/item/clothing/shoes/boots/jackboots{ + desc = "Very old and worn baseball cleats."; + name = "baseball cleats" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/tether/surfacebase/outside/outside2) "asy" = ( /obj/structure/table/rack/holorack, /obj/random/maintenance/clean, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -11090,6 +11637,7 @@ /obj/effect/landmark/start{ name = "Warden" }, +/obj/structure/curtain/open/bed, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "asH" = ( @@ -11108,6 +11656,9 @@ /obj/effect/floor_decal/corner/red/border{ dir = 6 }, +/obj/machinery/newscaster/security_unit{ + pixel_x = 32 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/warden) "asJ" = ( @@ -11118,8 +11669,7 @@ /obj/item/weapon/tank/jetpack/carbondioxide, /obj/item/weapon/tank/jetpack/carbondioxide, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -11177,15 +11727,31 @@ }, /turf/simulated/floor, /area/maintenance/substation/medsec) +"asO" = ( +/obj/item/clothing/head/soft/black{ + desc = "Its a dusty old cap, It hides most your eyes." + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/tether/surfacebase/outside/outside2) "asP" = ( /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/flora/pottedplant/large, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) +"asQ" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/emergency_storage/atmos) +"asR" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/tether/surfacebase/emergency_storage/atmos) "asS" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 8 @@ -11214,19 +11780,13 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "asU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "4-8" +/obj/item/weapon/material/twohanded/baseballbat{ + desc = "This bat looks very off."; + health = 500 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/mining) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/tether/surfacebase/outside/outside2) "asV" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -11293,14 +11853,40 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining) +"ata" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/obj/structure/table/rack, +/obj/random/maintenance/research, +/obj/random/maintenance/research, +/obj/random/maintenance/clean, +/obj/random/drinkbottle, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "atb" = ( /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/machinery/recharge_station, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) +"atc" = ( +/obj/structure/table/standard, +/obj/item/device/t_scanner, +/obj/item/weapon/storage/box/lights/mixed, +/obj/item/weapon/storage/box/lights/mixed, +/obj/item/weapon/storage/briefcase/inflatable, +/obj/random/maintenance/clean, +/obj/random/maintenance/medical, +/obj/random/maintenance/research, +/obj/random/tech_supply, +/turf/simulated/floor/plating, +/area/tether/surfacebase/emergency_storage/atmos) "atd" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -11318,8 +11904,7 @@ /obj/item/weapon/bedsheet/medical, /obj/structure/curtain/open/privacy, /obj/machinery/camera/network/medbay{ - dir = 8; - icon_state = "camera" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -11329,6 +11914,19 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) +"atf" = ( +/obj/machinery/floodlight, +/turf/simulated/floor/plating, +/area/tether/surfacebase/emergency_storage/atmos) +"atg" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) "ath" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 @@ -11337,14 +11935,52 @@ dir = 1 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) +"ati" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/table/rack, +/obj/random/maintenance/clean, +/turf/simulated/floor, +/area/maintenance/lower/south) +"atj" = ( +/obj/item/weapon/newspaper, +/turf/simulated/floor, +/area/maintenance/lower/south) +"atk" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"atl" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "atm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -11371,8 +12007,7 @@ dir = 4 }, /obj/effect/floor_decal/techfloor/hole{ - dir = 4; - icon_state = "techfloor_hole_left" + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) @@ -11385,6 +12020,167 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/bar) +"atr" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 4 + }, +/obj/random/trash_pile, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) +"ats" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"att" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/storage) +"atu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/red{ + dir = 6 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/engineering/pumpstation) +"atv" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) +"atw" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 1 + }, +/obj/random/trash_pile, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"atx" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"aty" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) +"atz" = ( +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) +"atA" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) +"atB" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/obj/machinery/portable_atmospherics/powered/scrubber, +/turf/simulated/floor/plating, +/area/maintenance/engineering/pumpstation) +"atC" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) "atD" = ( /obj/structure/catwalk, /obj/structure/railing{ @@ -11463,8 +12259,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/brig/bathroom) @@ -11547,8 +12342,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -11574,8 +12368,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -11634,42 +12427,87 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/north) -"atX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"atW" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) +"atX" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/firedoor/glass, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white, -/area/maintenance/lower/north) +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + name = "Reading Rooms"; + sortType = "Reading Rooms" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) "atY" = ( /turf/simulated/wall, /area/maintenance/lower/mining) "atZ" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining) -"aua" = ( /obj/structure/railing{ dir = 4 }, -/obj/structure/railing{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining) +/area/maintenance/lower/south) +"aua" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "aub" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -11679,6 +12517,19 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /turf/simulated/floor/plating, /area/maintenance/lower/mining) +"auc" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/cable/green, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "aud" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -11702,6 +12553,18 @@ /obj/item/weapon/bedsheet/mime, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) +"aug" = ( +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "auh" = ( /obj/structure/stairs/south, /turf/simulated/floor/virgo3b, @@ -11752,6 +12615,18 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/brig/bathroom) +"aun" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/corner, +/obj/effect/floor_decal/rust, +/obj/random/cutout, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "auo" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 6 @@ -11761,9 +12636,7 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 25 @@ -11935,99 +12808,83 @@ /turf/simulated/floor, /area/maintenance/lower/north) "auB" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/random/maintenance/cargo, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, +/obj/effect/floor_decal/techfloor, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/area/maintenance/asmaint2) "auC" = ( -/obj/structure/railing, +/obj/effect/floor_decal/techfloor, +/obj/structure/railing{ + dir = 1 + }, /obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/area/maintenance/asmaint2) "auD" = ( -/obj/structure/railing, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/obj/structure/railing{ + dir = 1 + }, /obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/random/cutout, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/area/maintenance/asmaint2) "auE" = ( -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/techfloor/hole{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) -"auF" = ( -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) -"auG" = ( -/obj/structure/railing, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) -"auH" = ( -/obj/structure/railing, -/obj/structure/cable{ +/obj/structure/cable/cyan{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) -"auI" = ( -/obj/structure/railing{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/storage) +"auF" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 4 + }, +/obj/structure/cable/cyan{ d1 = 1; - d2 = 8; - icon_state = "1-8" + d2 = 2; + icon_state = "1-2" }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 +/obj/machinery/meter, +/turf/simulated/floor/plating, +/area/maintenance/engineering/pumpstation) +"auG" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/red{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/meter, +/turf/simulated/floor/plating, +/area/maintenance/engineering/pumpstation) +"auH" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) +"auI" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/area/maintenance/lower/south) "auJ" = ( /obj/structure/catwalk, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, @@ -12038,6 +12895,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/north) +"auK" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) "auL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -12049,9 +12914,7 @@ dir = 9 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) @@ -12069,20 +12932,27 @@ /turf/simulated/floor, /area/maintenance/substation/medsec) "auO" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining) +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "auP" = ( /obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, +/obj/effect/floor_decal/rust, +/obj/random/trash_pile, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining) +/area/maintenance/asmaint2) "auQ" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -12124,9 +12994,7 @@ "auU" = ( /obj/structure/catwalk, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/disposalpipe/segment{ @@ -12188,8 +13056,7 @@ dir = 4 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -12280,7 +13147,6 @@ dir = 10 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /obj/machinery/camera/network/civilian{ @@ -12303,8 +13169,7 @@ /area/tether/surfacebase/public_garden_two) "avk" = ( /obj/machinery/shower{ - dir = 1; - icon_state = "shower" + dir = 1 }, /obj/structure/curtain/open/shower/security, /obj/effect/floor_decal/steeldecal/steel_decals10{ @@ -12419,8 +13284,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -12431,8 +13295,7 @@ "avs" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -12459,16 +13322,16 @@ /turf/simulated/floor, /area/maintenance/lower/north) "avu" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/catwalk, /obj/structure/cable/green{ - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "avv" = ( /obj/structure/catwalk, /obj/effect/floor_decal/rust, @@ -12544,16 +13407,28 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/north) +"avC" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "avD" = ( /turf/simulated/wall, /area/tether/surfacebase/surface_two_hall) "avE" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/floodlight, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/engineering/atmos/storage) "avF" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -12670,8 +13545,7 @@ /obj/structure/bed/padded, /obj/item/weapon/bedsheet/red, /obj/effect/floor_decal/techfloor/hole/right{ - dir = 4; - icon_state = "techfloor_hole_right" + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) @@ -12715,8 +13589,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 8; - icon_state = "up-scrubbers" + dir = 8 }, /obj/structure/cable/green{ icon_state = "0-8" @@ -12811,30 +13684,34 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "awe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/random/trash_pile, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/plating, +/area/engineering/atmos/storage) "awf" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/light/small, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining) -"awg" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining) +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/engineering/pumpstation) +"awg" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "awh" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment, @@ -12859,8 +13736,7 @@ "awk" = ( /obj/effect/floor_decal/rust, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/cable/green, /obj/structure/cable/green{ @@ -12915,16 +13791,20 @@ /turf/simulated/floor/tiled/techmaint, /area/maintenance/lower/bar) "awq" = ( -/obj/structure/railing{ - dir = 1 +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 9 }, -/obj/structure/railing{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 9 }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/lower/bar) +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "awr" = ( /obj/random/cigarettes, /obj/random/toy, @@ -12979,14 +13859,12 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/machinery/light_switch{ pixel_x = 25; @@ -13019,8 +13897,7 @@ dir = 4 }, /obj/structure/window/reinforced/tinted{ - dir = 8; - icon_state = "twindow" + dir = 8 }, /turf/simulated/floor/plating, /area/tether/surfacebase/security/interrogation) @@ -13035,8 +13912,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 @@ -13060,16 +13936,24 @@ /turf/simulated/mineral, /area/maintenance/lower/north) "awE" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, /obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/lower/north) +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "awF" = ( /obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/item/weapon/pen/crayon/red, -/turf/simulated/floor, -/area/maintenance/lower/north) +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "awG" = ( /obj/structure/railing{ dir = 1 @@ -13089,12 +13973,25 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "awI" = ( -/obj/structure/railing{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "16-0" }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/zpipe/up/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "awJ" = ( /obj/structure/railing{ dir = 1 @@ -13127,6 +14024,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/surface_two_hall) +"awN" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "awO" = ( /obj/structure/grille, /obj/structure/railing, @@ -13150,20 +14061,42 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/surface_two_hall) "awR" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining) -"awS" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 9 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) +"awS" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "awT" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -13218,8 +14151,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 4; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/interrogation) @@ -13257,11 +14189,15 @@ /turf/simulated/open, /area/maintenance/lower/north) "axf" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, /obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/item/clothing/glasses/welding, -/turf/simulated/floor, -/area/maintenance/lower/north) +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "axg" = ( /obj/effect/floor_decal/techfloor{ dir = 10 @@ -13270,16 +14206,28 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "axh" = ( -/obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/hole, -/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/area/maintenance/asmaint2) "axi" = ( -/obj/effect/floor_decal/techfloor, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/effect/floor_decal/rust, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "axj" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -13307,8 +14255,7 @@ dir = 1 }, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) @@ -13324,6 +14271,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"axn" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "axo" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -13334,8 +14292,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -13349,8 +14306,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -13367,8 +14323,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -13379,8 +14334,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/extinguisher_cabinet{ pixel_y = 30 @@ -13397,8 +14351,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -13415,8 +14368,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -13439,8 +14391,7 @@ "axv" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/weapon/deck/cah/black{ @@ -13454,16 +14405,13 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -13477,7 +14425,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable{ @@ -13606,15 +14553,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining) "axJ" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "axK" = ( /obj/structure/catwalk, /turf/simulated/open, @@ -13639,11 +14582,10 @@ /area/maintenance/lower/bar) "axN" = ( /obj/structure/railing{ - dir = 4 + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/lower/bar) +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) "axO" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, @@ -13698,17 +14640,17 @@ /area/tether/surfacebase/security/interrogation) "axW" = ( /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/interrogation) "axX" = ( -/obj/item/weapon/pickaxe/hand, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/lower/north) +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/floor_decal/corner_techfloor_grid, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) "axY" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -13725,6 +14667,35 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) +"axZ" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) +"aya" = ( +/obj/structure/lattice, +/obj/structure/cable/green{ + d1 = 32; + icon_state = "32-1" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/open, +/area/maintenance/asmaint2) +"ayb" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "ayc" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -13745,6 +14716,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"ayg" = ( +/obj/effect/floor_decal/corner_techfloor_grid/full{ + dir = 4 + }, +/obj/random/trash_pile, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) "ayh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -13760,6 +14738,14 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"ayj" = ( +/obj/structure/catwalk, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "ayk" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -13783,15 +14769,21 @@ /turf/simulated/mineral, /area/maintenance/lower/bar) "ayn" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/bar) -"ayo" = ( -/turf/simulated/wall{ - can_open = 0 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/area/maintenance/lower/bar) +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "ayp" = ( /obj/effect/catwalk_plated/dark, /turf/simulated/open, @@ -13828,8 +14820,7 @@ /area/maintenance/lower/bar) "ayu" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) @@ -13849,17 +14840,28 @@ /turf/simulated/floor/water/indoors, /area/tether/surfacebase/fish_farm) "ayx" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/remains/human, -/turf/simulated/floor, -/area/maintenance/lower/north) +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 28 + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "ayy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/item/toy/figure/ninja, -/turf/simulated/floor, -/area/maintenance/lower/north) +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "ayz" = ( /obj/machinery/light/small{ dir = 8 @@ -13878,25 +14880,14 @@ /area/maintenance/lower/north) "ayA" = ( /obj/effect/floor_decal/techfloor{ - dir = 1 + dir = 10 }, -/obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/hole/right{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 5 }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/area/maintenance/asmaint2) "ayB" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -13911,34 +14902,24 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "ayC" = ( -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, /obj/effect/floor_decal/techfloor, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/obj/structure/closet, +/obj/random/contraband, +/obj/random/maintenance/research, +/obj/random/maintenance/research, +/obj/random/maintenance/clean, +/obj/random/tool, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/area/maintenance/asmaint2) "ayD" = ( -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/hole/right, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/area/maintenance/asmaint2) "ayE" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -13958,6 +14939,20 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"ayG" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "ayH" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, @@ -13980,12 +14975,25 @@ /obj/effect/floor_decal/corner/green/border, /obj/structure/disposalpipe/sortjunction{ dir = 4; - icon_state = "pipe-j1s"; name = "Command Meeting Room"; sortType = "Command Meeting Room" }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"ayK" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) +"ayL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "ayM" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, @@ -14046,15 +15054,13 @@ /area/maintenance/lower/bar) "ayT" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "ayU" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) @@ -14071,6 +15077,34 @@ "ayW" = ( /turf/simulated/wall, /area/tether/surfacebase/north_staires_two) +"ayX" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 5 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) +"ayY" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) +"ayZ" = ( +/obj/structure/railing, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "aza" = ( /obj/structure/railing{ dir = 1 @@ -14179,8 +15213,7 @@ /area/maintenance/lower/bar) "azo" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) @@ -14193,8 +15226,7 @@ /area/tether/surfacebase/fish_farm) "azr" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/water/deep/indoors, /area/tether/surfacebase/fish_farm) @@ -14211,29 +15243,47 @@ /turf/simulated/floor, /area/maintenance/lower/north) "azv" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/lower/north) +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/effect/floor_decal/rust, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "azw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/turf/simulated/floor, -/area/maintenance/lower/north) +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/closet/crate, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/research, +/obj/random/maintenance/research, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "azx" = ( /obj/random/obstruction, /turf/simulated/floor, /area/maintenance/lower/north) "azy" = ( +/obj/structure/catwalk, /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "azz" = ( /turf/simulated/open, /area/tether/surfacebase/north_staires_two) @@ -14264,8 +15314,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/window/basic{ dir = 4 @@ -14323,7 +15372,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -14360,8 +15408,7 @@ "azM" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/teleporter) @@ -14377,8 +15424,7 @@ "azO" = ( /obj/item/weapon/stool/padded, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/item/device/radio/intercom{ dir = 1; @@ -14429,12 +15475,15 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "azT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "azU" = ( /obj/structure/catwalk, /obj/structure/ladder/up, @@ -14484,8 +15533,7 @@ }, /obj/item/device/radio/intercom{ dir = 1; - pixel_y = 24; - req_access = list() + pixel_y = 24 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) @@ -14501,28 +15549,36 @@ /turf/simulated/floor, /area/maintenance/lower/north) "aAf" = ( -/obj/random/obstruction, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/lower/north) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "aAg" = ( -/obj/effect/floor_decal/techfloor{ - dir = 8 +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/obj/effect/floor_decal/techfloor/hole/right{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 5 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/obj/effect/floor_decal/rust, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "aAh" = ( /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -14532,8 +15588,7 @@ "aAi" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -14601,8 +15656,7 @@ /area/teleporter) "aAq" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/teleporter) @@ -14638,14 +15692,21 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "aAu" = ( -/obj/structure/railing{ - dir = 8 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/obj/random/cutout, -/turf/simulated/floor/tiled/techmaint, -/area/maintenance/lower/bar) +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "aAv" = ( /obj/structure/railing{ dir = 4 @@ -14700,7 +15761,6 @@ "aAD" = ( /obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "extinguisher_closed"; pixel_x = 30 }, /turf/simulated/open, @@ -14723,8 +15783,7 @@ "aAH" = ( /obj/structure/closet/firecloset, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -14844,10 +15903,12 @@ /turf/simulated/floor/plating, /area/maintenance/lower/bar) "aAX" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/maintenance/lower/bar) +/area/maintenance/asmaint2) "aAY" = ( /obj/machinery/door/airlock/maintenance/common{ name = "Morgue Access" @@ -14857,8 +15918,7 @@ /area/maintenance/lower/bar) "aAZ" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) @@ -14873,15 +15933,13 @@ /area/maintenance/lower/bar) "aBb" = ( /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/wall, /area/tether/surfacebase/fish_farm) "aBc" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, @@ -14933,22 +15991,18 @@ "aBj" = ( /obj/structure/sign/directions/medical{ dir = 1; - icon_state = "direction_med"; pixel_y = 8 }, /obj/structure/sign/directions/science{ dir = 1; - icon_state = "direction_sci"; pixel_y = 3 }, /obj/structure/sign/directions/security{ dir = 1; - icon_state = "direction_sec"; pixel_y = -4 }, /obj/structure/sign/directions/engineering{ dir = 4; - icon_state = "direction_eng"; pixel_y = -10 }, /turf/simulated/wall, @@ -15010,13 +16064,11 @@ /area/teleporter) "aBr" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /turf/simulated/floor/tiled/dark, @@ -15025,8 +16077,7 @@ /obj/machinery/shieldwallgen, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" + dir = 10 }, /turf/simulated/floor/tiled/dark, /area/teleporter) @@ -15064,17 +16115,17 @@ }, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plating, /area/maintenance/lower/bar) "aBx" = ( /obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/lower/bar) +/area/maintenance/asmaint2) "aBy" = ( /obj/structure/catwalk, /obj/structure/closet, @@ -15088,8 +16139,7 @@ /obj/random/maintenance/clean, /obj/random/tool, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/lower/bar) @@ -15112,8 +16162,7 @@ /area/tether/surfacebase/fish_farm) "aBC" = ( /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/water/deep/indoors, /area/tether/surfacebase/fish_farm) @@ -15142,7 +16191,6 @@ /obj/item/stack/cable_coil/pink, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -15164,8 +16212,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -15177,8 +16224,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -15194,8 +16240,7 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -15212,8 +16257,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -15228,8 +16272,7 @@ dir = 2 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -15244,8 +16287,7 @@ /area/tether/surfacebase/north_staires_two) "aBM" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/structure/cable{ icon_state = "4-8" @@ -15255,8 +16297,7 @@ /area/tether/surfacebase/north_staires_two) "aBN" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/structure/cable{ icon_state = "4-8" @@ -15269,8 +16310,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 @@ -15284,16 +16324,14 @@ /area/tether/surfacebase/north_staires_two) "aBP" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_staires_two) "aBQ" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -15379,7 +16417,7 @@ }, /obj/structure/railing, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/area/chapel/main) "aCa" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -15390,7 +16428,7 @@ }, /obj/structure/railing, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/area/chapel/main) "aCb" = ( /obj/machinery/light/small{ dir = 1 @@ -15399,14 +16437,14 @@ dir = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/area/chapel/main) "aCc" = ( /obj/effect/floor_decal/techfloor{ dir = 1 }, /obj/machinery/camera/network/tether, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/area/chapel/main) "aCd" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -15419,26 +16457,31 @@ pixel_x = 24 }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/area/chapel/main) "aCe" = ( -/obj/structure/catwalk, -/obj/structure/cable{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/multi_tile/metal/mait{ - name = "Maintenance Access" +/obj/effect/floor_decal/techfloor{ + dir = 8 }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/area/maintenance/asmaint2) "aCf" = ( -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "aCg" = ( /obj/structure/filingcabinet/filingcabinet, /turf/simulated/floor/tiled/dark, @@ -15476,8 +16519,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/chapel/chapel_morgue) @@ -15494,8 +16536,7 @@ "aCo" = ( /obj/structure/railing, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/water/deep/indoors, /area/tether/surfacebase/fish_farm) @@ -15515,8 +16556,7 @@ /area/tether/surfacebase/fish_farm) "aCs" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -15529,13 +16569,10 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 @@ -15643,7 +16680,6 @@ dir = 4 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -15659,7 +16695,6 @@ "aCB" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15674,8 +16709,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable{ icon_state = "1-4" @@ -15692,14 +16726,12 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, @@ -15708,8 +16740,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -15733,8 +16764,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -15753,8 +16783,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -15771,8 +16800,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -15890,7 +16918,6 @@ "aCR" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/cable{ @@ -15914,32 +16941,40 @@ "aCU" = ( /obj/structure/stairs/west, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/area/chapel/main) "aCV" = ( -/turf/simulated/floor/tiled/dark, -/area/maintenance/lower/bar) +/obj/effect/floor_decal/techfloor{ + dir = 8; + icon_state = "techfloororange_edges" + }, +/turf/simulated/floor/tiled/techfloor, +/area/chapel/main) "aCW" = ( /obj/effect/floor_decal/techfloor/corner{ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/maintenance/lower/bar) +/area/chapel/main) "aCX" = ( -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/dark, +/obj/structure/sign/nanotrasen, +/turf/simulated/wall, /area/maintenance/lower/bar) "aCY" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/maintenance/lower/bar) +/obj/structure/catwalk, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "aCZ" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, -/area/maintenance/lower/bar) +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "aDa" = ( /obj/machinery/alarm{ pixel_y = 22 @@ -15949,7 +16984,7 @@ icon_state = "techfloororange_edges" }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/area/chapel/main) "aDb" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, @@ -15959,6 +16994,9 @@ /obj/machinery/alarm{ pixel_y = 22 }, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "aDd" = ( @@ -16005,8 +17043,7 @@ "aDj" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/fish_farm) @@ -16016,15 +17053,13 @@ /area/tether/surfacebase/fish_farm) "aDl" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "aDm" = ( /obj/effect/floor_decal/spline/plain{ - dir = 8; - icon_state = "spline_plain" + dir = 8 }, /turf/simulated/floor/beach/sand/desert, /area/tether/surfacebase/fish_farm) @@ -16058,8 +17093,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -16080,8 +17114,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 @@ -16098,8 +17131,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -16111,8 +17143,7 @@ /area/tether/surfacebase/surface_two_hall) "aDs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -16151,8 +17182,7 @@ /area/tether/surfacebase/surface_two_hall) "aDw" = ( /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -16183,12 +17213,10 @@ "aDz" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/bridge_hallway) @@ -16207,8 +17235,7 @@ icon_state = "2-4" }, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/bridge_hallway) @@ -16243,7 +17270,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/structure/cable/green{ @@ -16257,10 +17283,8 @@ }, /obj/item/device/radio/intercom{ broadcasting = 1; - dir = 2; frequency = 1473; name = "Confession Intercom"; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled/dark, @@ -16283,7 +17307,6 @@ }, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /turf/simulated/floor/tiled/dark, @@ -16295,9 +17318,7 @@ /obj/structure/cable, /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Command"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /turf/simulated/floor/plating, /area/maintenance/substation/command) @@ -16315,8 +17336,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/light/small{ dir = 4 @@ -16347,7 +17367,7 @@ "aDL" = ( /obj/effect/floor_decal/techfloor/corner, /turf/simulated/floor/tiled/dark, -/area/maintenance/lower/bar) +/area/chapel/main) "aDM" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 1; @@ -16355,42 +17375,25 @@ }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/dark, -/area/maintenance/lower/bar) +/area/chapel/main) "aDN" = ( /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /turf/simulated/floor/tiled/dark, -/area/maintenance/lower/bar) +/area/chapel/main) "aDO" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, -/area/maintenance/lower/bar) +/area/chapel/main) "aDP" = ( /turf/simulated/wall, /area/chapel/main) "aDQ" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "chaplainpet" - }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techfloor, /area/chapel/main) "aDR" = ( /obj/machinery/light_switch{ @@ -16449,7 +17452,6 @@ }, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /turf/simulated/floor/tiled/dark, @@ -16554,68 +17556,55 @@ /turf/simulated/floor/plating, /area/maintenance/lower/rnd) "aEf" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 +/obj/structure/railing{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/south) "aEg" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/south) "aEh" = ( -/obj/random/trash_pile, -/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/light/small, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/south) "aEi" = ( /obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/bridge_hallway) "aEj" = ( -/obj/machinery/power/sensor{ - name = "Powernet Sensor - Command Subgrid"; - name_tag = "Command Subgrid" +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/rust, +/obj/machinery/light_switch{ + pixel_y = 25 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" +/obj/effect/decal/cleanable/cobweb{ + icon_state = "cobweb2" }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/green, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/command) +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/asmaint2) "aEk" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /turf/simulated/floor/plating, @@ -16624,8 +17613,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/substation/command) @@ -16634,11 +17622,10 @@ dir = 10 }, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/area/chapel/main) "aEn" = ( /obj/structure/cable/green{ d1 = 32; @@ -16648,11 +17635,10 @@ /obj/structure/lattice, /obj/machinery/door/firedoor/glass, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/open, -/area/maintenance/lower/bar) +/area/chapel/main) "aEo" = ( /obj/effect/floor_decal/techfloor/corner{ dir = 8 @@ -16683,7 +17669,7 @@ icon_state = "2-4" }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/area/chapel/main) "aEp" = ( /obj/structure/cable/green{ d1 = 16; @@ -16693,36 +17679,32 @@ /obj/effect/floor_decal/techfloor, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/disposalpipe/up{ dir = 8 }, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /obj/machinery/atmospherics/pipe/zpipe/up/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 8; - icon_state = "up-scrubbers" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/area/chapel/main) "aEq" = ( /obj/effect/floor_decal/techfloor{ dir = 6 }, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/area/chapel/main) "aEr" = ( /obj/machinery/light/small{ dir = 8 @@ -16733,23 +17715,42 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, -/area/maintenance/lower/bar) +/area/chapel/main) "aEs" = ( -/obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/grass, -/area/chapel/main) -"aEt" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/grass, -/area/chapel/main) -"aEu" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/machinery/alarm{ - pixel_y = 22 +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/turf/simulated/floor/grass, -/area/chapel/main) +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) +"aEt" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) +"aEu" = ( +/obj/item/clothing/mask/gas, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/structure/closet/walllocker_double{ + dir = 8; + pixel_x = -28 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) "aEv" = ( /obj/machinery/door/airlock{ name = "Chapel Morgue"; @@ -16770,8 +17771,7 @@ /area/chapel/chapel_morgue) "aEx" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/railing{ dir = 8 @@ -16780,19 +17780,16 @@ /area/tether/surfacebase/fish_farm) "aEy" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/floor/water/deep/indoors, /area/tether/surfacebase/fish_farm) "aEz" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/water/deep/indoors, /area/tether/surfacebase/fish_farm) @@ -16863,43 +17860,32 @@ /turf/simulated/floor/plating, /area/maintenance/lower/rnd) "aEG" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/asmaint2) "aEH" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) -"aEI" = ( -/obj/structure/cable{ - icon_state = "16-0" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/up, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) -"aEJ" = ( -/obj/machinery/alarm{ +/obj/structure/extinguisher_cabinet{ dir = 8; - icon_state = "alarm0"; - pixel_x = 24 + pixel_x = 30 }, -/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/asmaint2) +"aEI" = ( +/obj/random/trash_pile, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/atmos) +"aEJ" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "aEK" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -16944,7 +17930,6 @@ /obj/machinery/door/blast/regular{ closed_layer = 10; density = 0; - dir = 1; icon_state = "pdoor0"; id = "bridge blast"; layer = 1; @@ -16980,9 +17965,7 @@ /area/maintenance/commandmaint) "aEP" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable/green{ @@ -17015,8 +17998,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/substation/command) @@ -17058,26 +18040,45 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, -/area/maintenance/lower/bar) +/area/chapel/main) "aEX" = ( -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, -/area/chapel/main) +/obj/machinery/portable_atmospherics/powered/scrubber, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) "aEY" = ( -/turf/simulated/floor/grass, -/area/chapel/main) +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/mob/living/simple_mob/animal/passive/mouse/brown/Tom, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) "aEZ" = ( -/mob/living/simple_mob/animal/passive/snake/noodle, -/turf/simulated/floor/grass, -/area/chapel/main) +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) "aFa" = ( -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass, -/area/chapel/main) +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) "aFb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -17118,9 +18119,7 @@ alarm_id = "anomaly_testing"; breach_detection = 0; dir = 8; - frequency = 1439; pixel_x = 22; - pixel_y = 0; report_danger_level = 0 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -17134,8 +18133,7 @@ }, /obj/machinery/disposal, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -17161,8 +18159,7 @@ icon_state = "1-8" }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/disposalpipe/segment, /obj/structure/railing{ @@ -17179,19 +18176,13 @@ /turf/simulated/open, /area/maintenance/lower/rnd) "aFk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 +/obj/machinery/light/small{ + dir = 1 }, +/obj/structure/railing, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/atmos) "aFl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17206,18 +18197,21 @@ /turf/simulated/floor/plating, /area/maintenance/lower/rnd) "aFn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, +/obj/structure/railing, +/obj/structure/closet, +/obj/random/maintenance/clean, +/obj/random/maintenance/research, +/obj/random/maintenance/research, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/atmos) "aFo" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, +/obj/structure/railing, +/obj/structure/closet, +/obj/random/maintenance/clean, +/obj/random/junk, +/obj/random/maintenance/research, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/atmos) "aFp" = ( /turf/simulated/wall/r_wall, /area/bridge/meeting_room) @@ -17245,8 +18239,7 @@ "aFs" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17259,8 +18252,7 @@ icon_state = "4-8" }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -17274,8 +18266,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -17412,35 +18403,43 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/maintenance/lower/bar) +/area/chapel/main) "aFF" = ( /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/dark, -/area/maintenance/lower/bar) +/area/chapel/main) "aFG" = ( /obj/structure/sign/department/chapel, /turf/simulated/wall, /area/chapel/main) "aFH" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/effect/floor_decal/techfloor{ + dir = 10 }, -/mob/living/simple_mob/animal/passive/mouse/white/apple, -/turf/simulated/floor/grass, -/area/chapel/main) +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) "aFI" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/storage/box/snakesnackbox, -/turf/simulated/floor/grass, -/area/chapel/main) +/obj/machinery/shower{ + dir = 8; + pixel_x = -2 + }, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/hole, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) "aFJ" = ( /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -17488,8 +18487,7 @@ dir = 1 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -17498,8 +18496,7 @@ /area/chapel/chapel_morgue) "aFO" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) @@ -17518,19 +18515,23 @@ /turf/simulated/floor/plating, /area/maintenance/lower/rnd) "aFR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/kitchenspike, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/south) "aFS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/closet, +/obj/random/maintenance/clean, +/obj/item/stack/flag/red{ + amount = 1 + }, +/obj/item/stack/flag/blue{ + amount = 1 }, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/south) "aFT" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -17542,39 +18543,37 @@ /turf/simulated/floor/plating, /area/maintenance/lower/rnd) "aFU" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/obj/random/junk, +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/asmaint2) "aFV" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 +/obj/effect/floor_decal/rust, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/asmaint2) "aFW" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/effect/decal/cleanable/dirt, +/obj/random/junk, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/atmos) "aFX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/machinery/light/small{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/south) "aFY" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -17603,8 +18602,14 @@ /area/tether/surfacebase/surface_two_hall) "aGb" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 + }, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Bridge"; + departmentType = 5; + name = "Bridge RC"; + pixel_y = 32 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -17646,9 +18651,7 @@ /area/bridge/meeting_room) "aGf" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; - pixel_x = 0; pixel_y = 26 }, /obj/structure/cable/green{ @@ -17661,9 +18664,7 @@ pixel_y = 30 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/structure/cable/green{ d1 = 2; @@ -17750,26 +18751,44 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "aGn" = ( -/obj/structure/girder/displaced, -/turf/simulated/floor/plating, +/obj/machinery/washing_machine, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/sign/nosmoking_2{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "aGo" = ( -/obj/structure/firedoor_assembly, +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "chaplainpet" + }, /turf/simulated/floor, -/area/maintenance/lower/bar) +/area/chapel/main) "aGp" = ( -/obj/structure/girder/displaced, -/turf/simulated/floor, -/area/maintenance/lower/bar) +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/structure/closet/hydrant{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "aGq" = ( /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17785,13 +18804,8 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "aGs" = ( -/obj/machinery/door/airlock{ - name = "Noodle Office"; - req_access = list(27) - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/lino, -/area/chapel/main) +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/asmaint2) "aGt" = ( /obj/machinery/door/blast/shutters{ dir = 2; @@ -17807,8 +18821,7 @@ /area/chapel/chapel_morgue) "aGu" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/floor/beach/sand/desert, /area/tether/surfacebase/fish_farm) @@ -17820,13 +18833,11 @@ /turf/simulated/wall, /area/maintenance/lower/rnd) "aGx" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/item/clothing/mask/balaclava, +/obj/item/clothing/mask/bandana, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/south) "aGy" = ( /turf/simulated/mineral, /area/maintenance/lower/rnd) @@ -17843,21 +18854,16 @@ /turf/simulated/floor/plating, /area/maintenance/lower/rnd) "aGB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, +/obj/structure/table/steel, +/obj/item/weapon/handcuffs/fuzzy, +/obj/item/weapon/handcuffs/legcuffs/fuzzy, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/south) "aGC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, +/obj/structure/bed, +/obj/effect/decal/cleanable/blood, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/south) "aGD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17924,33 +18930,26 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "aGO" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/closet/hydrant{ - pixel_x = 32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_two_hall) +/obj/effect/floor_decal/rust, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/asmaint2) "aGP" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/bar) +/obj/structure/flora/ausbushes/sparsegrass, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/chapel/main) "aGQ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -17965,8 +18964,7 @@ /area/chapel/main) "aGS" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /turf/simulated/floor/carpet, /area/chapel/main) @@ -17983,13 +18981,6 @@ /obj/effect/landmark/start{ name = "Chaplain" }, -/obj/machinery/button/windowtint{ - dir = 1; - id = "chaplainpet"; - name = "interior window tint"; - pixel_x = -10; - pixel_y = 30 - }, /obj/machinery/button/windowtint{ dir = 1; id = "chaplainwindow"; @@ -18034,8 +19025,7 @@ "aGY" = ( /obj/machinery/door/airlock/maintenance/common, /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, @@ -18043,8 +19033,7 @@ "aGZ" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -18109,8 +19098,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, @@ -18119,11 +19107,6 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/structure/extinguisher_cabinet{ - dir = 8; - icon_state = "extinguisher_closed"; - pixel_x = 30 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -18136,8 +19119,8 @@ dir = 1; pixel_y = -25 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/bar) +/turf/simulated/floor/grass, +/area/chapel/main) "aHj" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -18156,19 +19139,26 @@ /turf/simulated/mineral, /area/maintenance/asmaint2) "aHn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/symbol/da{ - pixel_x = 32 +/obj/effect/decal/cleanable/blood, +/obj/item/device/tape{ + desc = "No Talk" }, -/obj/structure/disposalpipe/segment, +/obj/item/clothing/suit/varsity/brown{ + desc = "Showdown" + }, +/obj/item/clothing/head/richard, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/atmos) "aHo" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/remains/human, -/obj/random/action_figure, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/atmos) "aHp" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -18182,8 +19172,7 @@ /obj/machinery/button/windowtint{ dir = 1; id = "meetingroom"; - pixel_x = -25; - pixel_y = 0 + pixel_x = -25 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -18242,8 +19231,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -18295,52 +19283,59 @@ /area/chapel/main) "aHC" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/chapel/main) "aHD" = ( /obj/machinery/camera/network/outside{ - dir = 5; - icon_state = "camera" + dir = 5 }, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside2) "aHE" = ( /turf/simulated/wall, /area/maintenance/asmaint2) "aHF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, +/obj/structure/table/steel, +/obj/item/clothing/head/welding/demon, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/south) "aHG" = ( /turf/simulated/floor, /area/maintenance/lower/rnd) "aHH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack, -/obj/random/maintenance/research, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/south) "aHI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet, -/obj/random/maintenance/research, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, +/obj/effect/decal/cleanable/blood, +/obj/item/clothing/shoes/athletic{ + desc = "Assault" + }, +/obj/item/clothing/under/pants{ + desc = "Overdose" + }, +/obj/item/weapon/material/twohanded/baseballbat{ + desc = "Decadence"; + health = 1989 + }, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/atmos) "aHJ" = ( -/obj/item/weapon/storage/fancy/cigar/havana, -/obj/effect/decal/cleanable/dirt, -/obj/random/drinkbottle, +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/tether/surfacebase/surface_two_hall) +/area/maintenance/lower/atmos) "aHK" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -18377,8 +19372,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -18449,23 +19443,17 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "aHT" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/cable/green{ - d2 = 8; - dir = 2; - icon_state = "0-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/chapel/main) "aHU" = ( @@ -18479,12 +19467,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/chapel/main) "aHV" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/chapel/main) "aHW" = ( @@ -18539,48 +19537,48 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "aId" = ( -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, /obj/structure/closet, -/obj/random/maintenance/research, -/obj/random/maintenance/clean, -/obj/random/tool, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aIe" = ( -/obj/structure/catwalk, -/obj/structure/grille/broken, -/obj/effect/decal/cleanable/dirt, +/obj/random/maintenance/security, +/obj/random/contraband, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, /obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aIf" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 +/obj/item/clothing/suit/storage/vest/hoscoat/jensen{ + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0); + desc = "Its an old, dusty trenchcoat... what a shame."; + name = "trenchcoat" }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/black{ +/turf/simulated/floor/plating, +/area/maintenance/lower/south) +"aIe" = ( +/obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, +/obj/structure/railing, +/obj/structure/closet/crate, +/obj/random/maintenance/research, +/obj/random/maintenance/research, +/obj/random/cigarettes, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aIg" = ( -/obj/machinery/door/firedoor/glass, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance/common, +/area/maintenance/lower/atmos) +"aIf" = ( +/obj/effect/floor_decal/rust, +/obj/item/clothing/glasses/sunglasses{ + desc = "My vision is augmented"; + name = "Augmented shades" + }, /turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aIh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, +/area/maintenance/lower/south) +"aIg" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/atmos) +"aIh" = ( +/obj/effect/floor_decal/techfloor, +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "aIi" = ( /turf/simulated/wall, /area/rnd/rdoffice) @@ -18592,47 +19590,45 @@ /turf/simulated/floor, /area/maintenance/lower/rnd) "aIk" = ( -/obj/machinery/door/firedoor/glass, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance/common, +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/atmos) "aIl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/danger{ - dir = 8; - icon_state = "danger" - }, -/obj/structure/sign/warning/caution{ - pixel_y = 32 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/obj/structure/table/rack, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/engineering, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) "aIm" = ( /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/lower/rnd) "aIn" = ( -/obj/structure/cable{ - icon_state = "2-4" +/obj/structure/railing{ + dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/railing{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/atmos) "aIo" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ +/obj/effect/floor_decal/techfloor, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) "aIp" = ( /obj/structure/cable{ icon_state = "4-8" @@ -18643,21 +19639,26 @@ /turf/simulated/floor/plating, /area/maintenance/lower/rnd) "aIq" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/structure/railing{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/effect/floor_decal/techfloor, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/random/trash_pile, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) "aIr" = ( /obj/machinery/photocopier, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -18680,9 +19681,7 @@ }, /obj/machinery/disposal, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -18696,8 +19695,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -18777,7 +19775,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ dir = 1; - icon_state = "pipe-j1s"; name = "Chapel"; sortType = "Chapel" }, @@ -18802,8 +19799,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - icon_state = "map-scrubbers" + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/chapel/main) @@ -18893,39 +19889,28 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "aIK" = ( -/obj/effect/floor_decal/techfloor{ - dir = 8 +/obj/structure/table/steel, +/obj/machinery/vending/wallmed1{ + emagged = 1; + pixel_y = 32; + shut_up = 0 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/obj/item/weapon/tool/wirecutters, +/obj/item/weapon/tool/wrench, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/atmos) "aIL" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aIM" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/black{ +/obj/machinery/light/small{ dir = 1 }, -/obj/random/tool, -/obj/effect/floor_decal/industrial/danger/corner{ - dir = 4 +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) +"aIM" = ( +/obj/effect/decal/cleanable/cobweb{ + icon_state = "cobweb2" }, -/obj/structure/sign/warning/caution{ - pixel_x = 32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "aIN" = ( /turf/simulated/floor/reinforced, /area/rnd/rdoffice) @@ -18940,12 +19925,11 @@ /turf/simulated/wall/r_wall, /area/rnd/rdoffice) "aIQ" = ( -/obj/effect/floor_decal/industrial/danger/corner{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/obj/structure/table/steel, +/obj/item/weapon/tape_roll, +/obj/item/stack/medical/bruise_pack, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/atmos) "aIR" = ( /obj/structure/grille, /obj/structure/railing{ @@ -18987,8 +19971,7 @@ /obj/structure/table/woodentable, /obj/item/weapon/storage/box/cups, /obj/machinery/camera/network/command{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/wood, /area/bridge/meeting_room) @@ -19002,8 +19985,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, @@ -19046,32 +20028,18 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "aJe" = ( -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/atmos) "aJf" = ( /obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "aJg" = ( /obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "aJh" = ( /mob/living/simple_mob/slime/xenobio/rainbow/kendrick, /turf/simulated/floor/reinforced, @@ -19156,13 +20124,11 @@ /turf/simulated/floor/tiled, /area/rnd/rdoffice) "aJp" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/bed/chair/office/dark{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/atmos) "aJq" = ( /turf/simulated/wall/r_wall, /area/maintenance/lower/rnd) @@ -19193,8 +20159,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, @@ -19262,18 +20227,14 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "aJA" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 +/obj/machinery/alarm{ + pixel_y = 22 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 }, -/obj/random/trash_pile, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/turf/simulated/floor/plating, +/area/maintenance/substation/tcomms) "aJB" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -19286,8 +20247,7 @@ /area/rnd/rdoffice) "aJC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -19296,8 +20256,7 @@ /area/rnd/rdoffice) "aJD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -19309,7 +20268,6 @@ }, /obj/machinery/door/window/eastleft{ dir = 8; - icon_state = "left"; name = "Kendrick's Pen"; req_access = list(30); req_one_access = list(19) @@ -19318,16 +20276,13 @@ /area/rnd/rdoffice) "aJE" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -19336,8 +20291,7 @@ /area/rnd/rdoffice) "aJF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -19357,17 +20311,18 @@ /turf/simulated/floor/tiled, /area/rnd/rdoffice) "aJI" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, /obj/machinery/requests_console{ announcementConsole = 1; department = "Research Director's Desk"; departmentType = 5; + dir = 8; name = "Research Director RC"; - pixel_x = 30; + pixel_x = 22; pixel_y = -2 }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, @@ -19404,8 +20359,7 @@ /area/maintenance/lower/rnd) "aJN" = ( /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers, /obj/machinery/atmospherics/pipe/zpipe/down/supply, @@ -19441,7 +20395,6 @@ /area/chapel/office) "aJR" = ( /obj/machinery/light_switch{ - dir = 2; name = "light switch "; pixel_x = 10; pixel_y = 32 @@ -19491,64 +20444,51 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "aJX" = ( -/obj/structure/railing{ +/obj/machinery/light/small{ dir = 4 }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "aJY" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - icon_state = "0-4" +/obj/machinery/turretid/lethal{ + ailock = 1; + check_synth = 1; + control_area = /area/tcommsat/chamber; + desc = "A firewall prevents AIs from interacting with this device."; + name = "Telecoms lethal turret control"; + pixel_x = 29; + req_access = list(61); + req_one_access = list(12) }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/obj/effect/decal/cleanable/cobweb2, +/turf/simulated/floor/tiled/dark, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) "aJZ" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aKa" = ( /obj/structure/railing{ dir = 8 }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 1 - }, -/obj/random/trash_pile, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) +"aKa" = ( +/obj/structure/table/steel, +/obj/item/bodybag, +/obj/item/bodybag, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "aKb" = ( /turf/simulated/wall/r_wall, /area/server) "aKc" = ( /obj/machinery/photocopier, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 @@ -19816,8 +20756,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass/hidden, @@ -19885,14 +20824,12 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "aKK" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/obj/structure/table/steel, +/obj/item/device/nif/bad, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "aKL" = ( /obj/machinery/atmospherics/unary/vent_pump{ - dir = 2; icon_state = "map_vent_out"; use_power = 1 }, @@ -19917,8 +20854,7 @@ /area/server) "aKN" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6; - icon_state = "intact" + dir = 6 }, /obj/effect/floor_decal/techfloor{ dir = 1 @@ -19942,9 +20878,7 @@ "aKP" = ( /obj/machinery/papershredder, /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 @@ -19992,17 +20926,14 @@ dir = 4 }, /obj/machinery/camera/network/research{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "aKU" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Research"; - charge = 0; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green, /obj/structure/cable/green{ @@ -20034,14 +20965,21 @@ /turf/simulated/floor, /area/maintenance/substation/research) "aKX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/effect/floor_decal/industrial/warning/corner{ +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) "aKY" = ( /obj/machinery/atmospherics/pipe/zpipe/up/supply{ dir = 1 @@ -20154,8 +21092,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, @@ -20200,6 +21137,20 @@ }, /turf/simulated/floor/lino, /area/chapel/office) +"aLp" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) "aLq" = ( /obj/machinery/door/morgue{ dir = 2; @@ -20216,22 +21167,16 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "aLs" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/random/cutout, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/obj/structure/table/rack, +/obj/item/device/flashlight, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "aLt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" + dir = 8 }, /turf/simulated/floor/bluegrid{ name = "Server Base"; @@ -20271,9 +21216,7 @@ /area/server) "aLx" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 @@ -20310,7 +21253,6 @@ }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/flora/pottedplant/stoutbush, @@ -20361,8 +21303,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/engineering{ name = "Science Substation"; @@ -20377,20 +21318,10 @@ /turf/simulated/floor, /area/maintenance/substation/research) "aLF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/random/junk, +/obj/item/weapon/broken_bottle, /turf/simulated/floor/plating, -/area/maintenance/lower/rnd) +/area/maintenance/lower/atmos) "aLG" = ( /obj/machinery/door/airlock/maintenance/engi, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -20521,8 +21452,7 @@ name = "Chaplain" }, /obj/structure/bed/chair/wood/wings{ - dir = 1; - icon_state = "wooden_chair_wings" + dir = 1 }, /turf/simulated/floor/lino, /area/chapel/office) @@ -20542,7 +21472,6 @@ }, /obj/structure/cable/green{ d2 = 8; - dir = 2; icon_state = "0-8" }, /turf/simulated/floor/lino, @@ -20575,18 +21504,15 @@ "aLZ" = ( /obj/item/device/radio/intercom{ broadcasting = 1; - dir = 2; frequency = 1473; name = "Confession Intercom"; - pixel_x = 0; pixel_y = -24 }, /obj/structure/bed/chair{ dir = 4 }, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/chapel/main) @@ -20594,25 +21520,21 @@ /obj/structure/grille, /obj/structure/window/reinforced/tinted, /obj/structure/window/reinforced/tinted{ - dir = 4; - icon_state = "twindow" + dir = 4 }, /obj/structure/window/reinforced/tinted{ dir = 1 }, /obj/structure/window/reinforced/tinted{ - dir = 8; - icon_state = "twindow" + dir = 8 }, /turf/simulated/floor, /area/chapel/main) "aMb" = ( /obj/item/device/radio/intercom{ broadcasting = 1; - dir = 2; frequency = 1473; name = "Confession Intercom"; - pixel_x = 0; pixel_y = -24 }, /obj/structure/bed/chair{ @@ -20633,19 +21555,19 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/tether/surfacebase/outside/outside2) "aMe" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/obj/structure/bed/chair, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "aMf" = ( -/obj/effect/floor_decal/techfloor{ +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/railing{ dir = 4 }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "aMg" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 1; @@ -20777,7 +21699,6 @@ /obj/effect/floor_decal/borderfloor, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -26 }, /obj/effect/floor_decal/corner/yellow/border, @@ -20803,8 +21724,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, @@ -20818,8 +21738,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2, /turf/simulated/floor/tiled/techmaint, @@ -20865,7 +21784,6 @@ "aMD" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -30 }, /turf/simulated/floor/tiled/techmaint, @@ -20892,8 +21810,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -20954,19 +21871,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/south) "aMO" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ +/obj/machinery/light_construct{ dir = 4 }, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/turf/simulated/floor/plating, +/area/vacant/vacant_bar_upper) "aMP" = ( /obj/structure/window/reinforced{ dir = 4 @@ -21180,7 +22089,6 @@ dir = 6 }, /obj/machinery/newscaster{ - pixel_x = 0; pixel_y = -30 }, /turf/simulated/floor/tiled/techmaint, @@ -21244,8 +22152,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/tiled/techmaint, @@ -21261,33 +22168,18 @@ /turf/simulated/wall, /area/tether/surfacebase/east_stairs_two) "aNp" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 1 - }, -/obj/random/junk, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/obj/structure/catwalk, +/obj/structure/table/steel, +/obj/random/cigarettes, +/obj/item/weapon/flame/lighter/random, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "aNq" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 1 - }, -/obj/random/junk, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/obj/structure/catwalk, +/obj/structure/table/steel, +/obj/item/weapon/flame/candle, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "aNr" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -21437,7 +22329,6 @@ /obj/structure/closet/wardrobe/robotics_black, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/dark, @@ -21450,16 +22341,13 @@ /area/tether/surfacebase/emergency_storage/atmos) "aNE" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/yellow{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/powered/scrubber, @@ -21467,36 +22355,30 @@ /area/engineering/lower/lobby) "aNF" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/yellow{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/structure/bed/chair, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "aNG" = ( /obj/effect/floor_decal/corner/yellow{ - dir = 1; - icon_state = "corner_white" + dir = 1 }, /obj/structure/bed/chair, /obj/machinery/light{ dir = 1 }, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 6; - icon_state = "borderfloor_shifted" + dir = 6 }, /obj/effect/floor_decal/corner/red/border/shifted{ - dir = 6; - icon_state = "bordercolor_shifted" + dir = 6 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -21511,13 +22393,10 @@ /area/engineering/lower/lobby) "aNI" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -21526,12 +22405,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -21554,15 +22431,13 @@ dir = 5 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 5; - icon_state = "bordercolor" + dir = 5 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/structure/disposalpipe/trunk{ dir = 8 @@ -21585,7 +22460,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -21646,8 +22520,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) @@ -21658,20 +22531,26 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) "aNW" = ( -/obj/item/toy/plushie/kitten{ - desc = "An odd appearing, cryptic plush of a cat."; - name = "Pablo" +/obj/structure/railing{ + dir = 8 }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/closet/crate, +/obj/random/maintenance/clean, +/obj/random/maintenance/engineering, /turf/simulated/floor/plating, -/area/tether/surfacebase/outside/outside2) +/area/maintenance/lower/atmos) "aNX" = ( -/obj/item/clothing/under/batter, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/closet, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, /turf/simulated/floor/plating, -/area/tether/surfacebase/outside/outside2) +/area/maintenance/lower/atmos) "aNY" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 @@ -21679,18 +22558,17 @@ /obj/effect/floor_decal/corner_techfloor_grid{ dir = 5 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "aNZ" = ( -/obj/effect/floor_decal/rust, /obj/structure/railing{ dir = 4 }, /obj/effect/floor_decal/corner_techfloor_grid{ dir = 5 }, +/obj/effect/floor_decal/techfloor/hole, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "aOa" = ( @@ -21713,7 +22591,6 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/tiled/techfloor, @@ -21997,8 +22874,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -22033,7 +22909,6 @@ /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/mauve/bordercorner2, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -22064,24 +22939,16 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/emergency_storage/atmos) "aOu" = ( -/obj/machinery/space_heater, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/tether/surfacebase/emergency_storage/atmos) -"aOv" = ( -/obj/structure/cable/cyan{ - d2 = 2; - icon_state = "0-2" +/obj/machinery/light/small, +/obj/structure/railing{ + dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 +/obj/structure/railing{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, +/obj/random/trash_pile, /turf/simulated/floor/plating, -/area/tether/surfacebase/emergency_storage/atmos) +/area/maintenance/lower/atmos) "aOw" = ( /obj/machinery/light_switch{ dir = 4; @@ -22092,8 +22959,7 @@ /area/engineering/lower/lobby) "aOx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -22108,15 +22974,13 @@ /area/engineering/lower/lobby) "aOA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "aOB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, @@ -22130,15 +22994,13 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 5; - icon_state = "bordercolorcorner2" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -22191,46 +23053,37 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) -"aOJ" = ( -/obj/item/clothing/shoes/boots/jackboots{ - desc = "Very old and worn baseball cleats."; - name = "baseball cleats" - }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/tether/surfacebase/outside/outside2) -"aOK" = ( -/obj/item/clothing/head/soft/black{ - desc = "Its a dusty old cap, It hides most your eyes." - }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/tether/surfacebase/outside/outside2) "aOL" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) -"aOM" = ( -/obj/structure/railing{ +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole/right{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "aON" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/catwalk, -/obj/random/junk, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "aOO" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor, /area/maintenance/lower/south) "aOP" = ( @@ -22285,9 +23138,7 @@ /area/server) "aOW" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 @@ -22335,8 +23186,7 @@ dir = 6 }, /obj/machinery/camera/network/research{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/staircase/secondfloor) @@ -22359,19 +23209,6 @@ "aPc" = ( /turf/simulated/wall, /area/rnd/research) -"aPd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8; - pixel_x = 0 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/emergency_storage/atmos) -"aPe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/tether/surfacebase/emergency_storage/atmos) "aPf" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -22388,8 +23225,7 @@ }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/int{ - name = "Emergency Storage"; - req_one_access = list() + name = "Emergency Storage" }, /turf/simulated/floor/plating, /area/tether/surfacebase/emergency_storage/atmos) @@ -22544,8 +23380,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -22568,8 +23403,6 @@ /obj/machinery/button/remote/blast_door{ id = "atmoslockdown"; name = "Atmospherics Lockdown"; - pixel_x = 0; - pixel_y = 0; req_one_access = list(10,24) }, /turf/simulated/floor/carpet, @@ -22604,34 +23437,34 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) -"aPv" = ( -/obj/item/weapon/material/twohanded/baseballbat{ - desc = "This bat looks very off."; - health = 500 - }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/tether/surfacebase/outside/outside2) "aPw" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) -"aPx" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "aPy" = ( -/obj/effect/floor_decal/rust, -/obj/structure/catwalk, /obj/structure/closet/crate, /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/random/maintenance/cargo, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 10 + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 4 + }, +/obj/item/weapon/material/minihoe, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/seeds/random, +/obj/item/seeds/random, +/obj/item/seeds/random, +/obj/item/seeds/random, +/turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "aPz" = ( /obj/structure/dogbed, @@ -22644,51 +23477,21 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) -"aPA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 10 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) -"aPB" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) "aPC" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 10 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) -"aPD" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/structure/table/rack, -/obj/random/maintenance/research, -/obj/random/maintenance/research, -/obj/random/maintenance/clean, -/obj/random/drinkbottle, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "aPE" = ( /obj/effect/floor_decal/borderfloor{ - dir = 8; - icon_state = "borderfloor"; - pixel_x = 0 + dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/firealarm{ dir = 8; @@ -22716,8 +23519,7 @@ /area/rnd/staircase/secondfloor) "aPI" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/open, /area/rnd/staircase/secondfloor) @@ -22730,9 +23532,7 @@ /area/rnd/breakroom) "aPL" = ( /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/wood, @@ -22779,7 +23579,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -22791,7 +23590,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's set to Free-Anur-Entertanment, I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/wood, @@ -22799,7 +23597,6 @@ "aPS" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/flora/pottedplant/stoutbush, @@ -22820,34 +23617,14 @@ /obj/random/maintenance/research, /turf/simulated/floor/plating, /area/tether/surfacebase/emergency_storage/atmos) -"aPU" = ( -/obj/structure/table/standard, -/obj/item/device/t_scanner, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/briefcase/inflatable, -/obj/random/maintenance/clean, -/obj/random/maintenance/medical, -/obj/random/maintenance/research, -/obj/random/tech_supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/tether/surfacebase/emergency_storage/atmos) -"aPV" = ( -/obj/machinery/floodlight, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/tether/surfacebase/emergency_storage/atmos) "aPW" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, /obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; dir = 8; name = "west bump"; pixel_x = -28 @@ -22857,22 +23634,19 @@ /area/engineering/lower/lobby) "aPX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 6; - icon_state = "intact" + dir = 6 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "aPY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 1; - icon_state = "map" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "aPZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/machinery/meter, /turf/simulated/floor/tiled, @@ -22890,8 +23664,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -22912,15 +23685,13 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 6 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 6; - icon_state = "bordercolorcorner2" + dir = 6 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -22929,8 +23700,7 @@ /area/engineering/lower/lobby) "aQf" = ( /obj/machinery/computer/station_alert{ - dir = 4; - icon_state = "computer" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/engineering/lower/breakroom) @@ -22976,14 +23746,11 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) "aQl" = ( -/obj/effect/floor_decal/rust, /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 }, @@ -23003,6 +23770,9 @@ /obj/effect/floor_decal/corner_techfloor_grid{ dir = 10 }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "aQn" = ( @@ -23028,16 +23798,6 @@ /obj/structure/frame/computer, /turf/simulated/floor, /area/maintenance/lower/south) -"aQq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 9 - }, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) "aQr" = ( /obj/structure/frame{ anchored = 1 @@ -23076,7 +23836,6 @@ "aQx" = ( /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/random/tool, @@ -23166,8 +23925,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/white/border/shifted, /obj/effect/floor_decal/corner/yellow{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/structure/flora/pottedplant/subterranean, /turf/simulated/floor/tiled, @@ -23176,8 +23934,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/blue/border/shifted, /obj/effect/floor_decal/corner/yellow{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -23189,8 +23946,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/white/border/shifted, /obj/effect/floor_decal/corner/yellow{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -23202,8 +23958,7 @@ /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/white/border/shifted, /obj/effect/floor_decal/corner/yellow{ - dir = 10; - icon_state = "corner_white" + dir = 10 }, /obj/structure/bed/chair{ dir = 1 @@ -23215,20 +23970,17 @@ /area/engineering/lower/lobby) "aQN" = ( /obj/effect/floor_decal/corner/yellow{ - dir = 8; - icon_state = "corner_white" + dir = 8 }, /obj/structure/bed/chair{ dir = 1 }, /obj/machinery/light, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 5; - icon_state = "borderfloor_shifted" + dir = 5 }, /obj/effect/floor_decal/corner/blue/border/shifted{ - dir = 5; - icon_state = "bordercolor_shifted" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) @@ -23255,8 +24007,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2, /turf/simulated/floor/tiled, @@ -23279,8 +24030,7 @@ dir = 6 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 6; - icon_state = "bordercolor" + dir = 6 }, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/yellow/bordercorner2, @@ -23403,55 +24153,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) -"aRe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, -/obj/structure/table/rack, -/obj/random/maintenance/clean, -/turf/simulated/floor, -/area/maintenance/lower/south) -"aRf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/weapon/newspaper, -/turf/simulated/floor, -/area/maintenance/lower/south) -"aRg" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/lower/south) -"aRh" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aRi" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "aRj" = ( /obj/random/tool, /turf/simulated/floor/plating, @@ -23465,8 +24166,7 @@ department = "Science"; departmentType = 2; name = "Science Requests Console"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /obj/structure/bed/chair/comfy/brown{ dir = 1 @@ -23510,8 +24210,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/structure/table/rack{ dir = 8; @@ -23530,13 +24229,10 @@ /area/engineering/lower/atmos_eva) "aRr" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/alarm{ pixel_y = 22 @@ -23552,8 +24248,7 @@ dir = 5 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 5; - icon_state = "bordercolor" + dir = 5 }, /obj/structure/table/standard, /obj/item/weapon/storage/briefcase/inflatable{ @@ -23567,9 +24262,7 @@ pixel_x = -3 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -23669,17 +24362,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) -"aRB" = ( -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 4 - }, -/obj/random/trash_pile, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) "aRC" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 5 @@ -23697,7 +24379,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /turf/simulated/floor/tiled/techfloor, @@ -23709,8 +24390,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) @@ -23721,8 +24401,10 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) @@ -23753,31 +24435,6 @@ can_open = 1 }, /area/maintenance/lower/south) -"aRJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) -"aRK" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 - }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "aRL" = ( /obj/random/maintenance/research, /turf/simulated/floor/plating, @@ -23823,8 +24480,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/structure/table/rack{ dir = 8; @@ -23850,8 +24506,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/structure/table/standard, /obj/item/device/suit_cooling_unit, @@ -23869,8 +24524,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/structure/closet/secure_closet/atmos_personal, /obj/machinery/camera/network/engineering, @@ -23878,13 +24532,10 @@ /area/engineering/lower/atmos_lockers) "aRV" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/structure/closet/secure_closet/atmos_personal, /obj/machinery/alarm{ @@ -23894,20 +24545,15 @@ /area/engineering/lower/atmos_lockers) "aRW" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/structure/closet/secure_closet/atmos_personal, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/light{ @@ -23923,17 +24569,13 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/vending/engivend, /turf/simulated/floor/tiled, @@ -23946,8 +24588,7 @@ dir = 5 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 5; - icon_state = "bordercolor" + dir = 5 }, /obj/machinery/vending/tool, /turf/simulated/floor/tiled, @@ -23978,13 +24619,10 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -23993,12 +24631,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /turf/simulated/floor/tiled/monotile, /area/engineering/atmos) @@ -24035,16 +24671,6 @@ /obj/machinery/shieldgen, /turf/simulated/floor/plating, /area/engineering/atmos/storage) -"aSg" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/engineering/atmos/storage) "aSh" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -24054,8 +24680,7 @@ /area/maintenance/engineering/pumpstation) "aSi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/cable/cyan{ d2 = 2; @@ -24064,30 +24689,10 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) -"aSj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 6; - icon_state = "intact" - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/engineering/pumpstation) -"aSk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/powered/scrubber, -/turf/simulated/floor/plating, -/area/maintenance/engineering/pumpstation) "aSl" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -24124,8 +24729,7 @@ dir = 9 }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) @@ -24155,38 +24759,6 @@ /obj/random/maintenance/clean, /turf/simulated/floor, /area/maintenance/lower/south) -"aSr" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 1 - }, -/obj/random/trash_pile, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aSs" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "aSt" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -24212,60 +24784,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"aSw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 6 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aSx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aSy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "aSz" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -24367,15 +24885,13 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/machinery/suit_cycler/engineering{ name = "Atmospherics suit cycler" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/lower/atmos_eva) @@ -24396,15 +24912,13 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 5; - icon_state = "bordercolorcorner2" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/lower/atmos_eva) @@ -24413,17 +24927,13 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 10; - icon_state = "bordercolorcorner2" + dir = 10 }, /turf/simulated/floor/tiled, /area/engineering/lower/atmos_lockers) @@ -24450,15 +24960,13 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 5 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 5; - icon_state = "bordercolorcorner2" + dir = 5 }, /turf/simulated/floor/tiled, /area/engineering/lower/atmos_lockers) @@ -24499,10 +25007,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/engineering/atmos/storage) -"aSU" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/engineering/atmos/storage) "aSV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, @@ -24514,7 +25018,6 @@ /obj/machinery/portable_atmospherics/powered/pump/filled, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/simulated/floor/plating, @@ -24532,22 +25035,8 @@ /area/maintenance/engineering/pumpstation) "aSY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/red{ - dir = 8; - icon_state = "map" - }, -/turf/simulated/floor/plating, -/area/maintenance/engineering/pumpstation) -"aSZ" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, -/obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) "aTa" = ( @@ -24572,15 +25061,13 @@ "aTb" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; - icon_state = "pipe-j1s"; name = "Janitor Closet"; sortType = "Janitor Closet" }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24702,68 +25189,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/south) -"aTi" = ( -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) -"aTj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) -"aTk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - name = "Reading Rooms"; - sortType = "Reading Rooms" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) "aTl" = ( /obj/structure/table/rack, /obj/random/maintenance/research, @@ -24776,8 +25201,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -24787,52 +25211,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) -"aTm" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) -"aTn" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "aTo" = ( /obj/structure/catwalk, /obj/effect/floor_decal/rust, @@ -24846,80 +25224,10 @@ dir = 6 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) -"aTq" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green, -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aTr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aTs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor/corner, -/obj/effect/floor_decal/rust, -/obj/random/cutout, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aTt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/techfloor, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor/hole, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aTu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/techfloor, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aTv" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "aTw" = ( /obj/structure/flora/pottedplant/stoutbush, /obj/machinery/camera/network/research{ @@ -24974,8 +25282,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/machinery/power/apc{ cell_type = /obj/item/weapon/cell/super; @@ -25197,21 +25504,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/engineering/atmos/storage) -"aTR" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/engineering/atmos/storage) "aTS" = ( /obj/structure/cable/cyan{ d1 = 4; @@ -25222,8 +25514,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/plating, /area/engineering/atmos/storage) @@ -25268,28 +25559,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) -"aTX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/meter, -/turf/simulated/floor/plating, -/area/maintenance/engineering/pumpstation) -"aTY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/hidden/red{ - dir = 8; - icon_state = "map" - }, -/obj/machinery/meter, -/turf/simulated/floor/plating, -/area/maintenance/engineering/pumpstation) "aTZ" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -25314,8 +25583,7 @@ dir = 4 }, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 6 @@ -25329,94 +25597,11 @@ "aUc" = ( /turf/simulated/wall, /area/janitor) -"aUd" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) -"aUe" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) -"aUf" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) -"aUg" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) -"aUh" = ( -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aUi" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/random/trash_pile, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "aUj" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"aUk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aUl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/alarm{ - dir = 8; - icon_state = "alarm0"; - pixel_x = 24 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "aUm" = ( /turf/simulated/wall, /area/rnd/breakroom/bathroom) @@ -25491,15 +25676,13 @@ dir = 10 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/camera/network/engineering{ @@ -25523,16 +25706,14 @@ dir = 6 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 6; - icon_state = "bordercolor" + dir = 6 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 6 }, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 6; - icon_state = "bordercolorcorner2" + dir = 6 }, /obj/effect/floor_decal/corner/yellow/bordercorner2, /obj/machinery/recharge_station, @@ -25543,15 +25724,13 @@ dir = 10 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 8 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 8; - icon_state = "bordercolorcorner2" + dir = 8 }, /obj/structure/closet/secure_closet/engineering_electrical, /turf/simulated/floor/tiled, @@ -25589,15 +25768,13 @@ dir = 6 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 6; - icon_state = "bordercolor" + dir = 6 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 6 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 6; - icon_state = "bordercolorcorner2" + dir = 6 }, /obj/structure/table/standard, /obj/item/clothing/gloves/black, @@ -25633,8 +25810,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2, /turf/simulated/floor/tiled/monotile, @@ -25665,13 +25841,6 @@ /obj/machinery/floodlight, /turf/simulated/floor/plating, /area/engineering/atmos/storage) -"aUE" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/floodlight, -/obj/machinery/light/small, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/engineering/atmos/storage) "aUF" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/dispenser, @@ -25679,7 +25848,6 @@ /area/engineering/atmos/storage) "aUG" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -32 }, @@ -25688,35 +25856,6 @@ /obj/machinery/power/thermoregulator, /turf/simulated/floor/plating, /area/engineering/atmos/storage) -"aUH" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark{ - name = "morphspawn" - }, -/turf/simulated/floor/plating, -/area/engineering/atmos/storage) -"aUI" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/engineering/pumpstation) -"aUJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/hidden/red{ - dir = 8; - icon_state = "map" - }, -/turf/simulated/floor/plating, -/area/maintenance/engineering/pumpstation) "aUK" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -25728,19 +25867,16 @@ /area/tether/surfacebase/east_stairs_two) "aUL" = ( /obj/effect/floor_decal/corner/purple{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/structure/mopbucket, /obj/item/weapon/mop, /obj/item/weapon/reagent_containers/glass/bucket, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled, @@ -25750,16 +25886,13 @@ pixel_y = 32 }, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/structure/mopbucket, /obj/item/weapon/mop, @@ -25774,20 +25907,16 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/structure/mopbucket, /obj/item/weapon/mop, @@ -25796,16 +25925,13 @@ /area/janitor) "aUO" = ( /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/structure/janitorialcart, /obj/structure/sink/kitchen{ @@ -25816,16 +25942,13 @@ "aUP" = ( /obj/structure/janitorialcart, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /obj/machinery/alarm{ pixel_y = 22 @@ -25838,16 +25961,13 @@ "aUQ" = ( /obj/structure/janitorialcart, /obj/effect/floor_decal/borderfloor/shifted{ - dir = 1; - icon_state = "borderfloor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple/border/shifted{ - dir = 1; - icon_state = "bordercolor_shifted" + dir = 1 }, /obj/effect/floor_decal/corner/purple{ - dir = 5; - icon_state = "corner_white" + dir = 5 }, /turf/simulated/floor/tiled, /area/janitor) @@ -25862,54 +25982,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"aUS" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) -"aUT" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) -"aUU" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aUV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "aUW" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -25920,92 +25992,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) -"aUX" = ( -/obj/structure/cable/green{ - icon_state = "16-0" - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/zpipe/up/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aUY" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aUZ" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aVa" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aVb" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "aVc" = ( /obj/machinery/washing_machine, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -26023,7 +26009,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 24 }, /obj/structure/cable/green{ @@ -26053,14 +26038,10 @@ "aVh" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/structure/mirror{ @@ -26166,9 +26147,7 @@ /obj/machinery/button/remote/blast_door{ id = "janitor_blast"; name = "Desk Shutters"; - pixel_x = -22; - pixel_y = 0; - pixel_z = 0 + pixel_x = -22 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -26199,8 +26178,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/janitor) @@ -26212,8 +26190,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/tiled/techfloor, @@ -26230,8 +26207,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -26241,8 +26217,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/lower/south) @@ -26252,8 +26227,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/lower/south) @@ -26264,44 +26238,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"aVE" = ( -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aVF" = ( -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aVG" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "aVH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -26338,8 +26274,7 @@ /area/rnd/breakroom/bathroom) "aVL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -26349,27 +26284,13 @@ "aVM" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 29 }, /turf/simulated/floor/tiled/white, /area/rnd/breakroom/bathroom) -"aVN" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aVO" = ( -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "aVP" = ( /turf/simulated/wall/r_wall, /area/engineering/atmos) @@ -26378,8 +26299,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/machinery/camera/network/engineering, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -26389,13 +26309,10 @@ /area/engineering/atmos) "aVR" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/alarm{ pixel_y = 22 @@ -26415,9 +26332,7 @@ icon_state = "2-4" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -26426,15 +26341,13 @@ dir = 6 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -26461,9 +26374,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -26472,15 +26383,13 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 @@ -26494,21 +26403,16 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -26523,9 +26427,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -26534,8 +26436,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -26551,9 +26452,7 @@ icon_state = "2-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -26562,8 +26461,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -26574,16 +26472,13 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -26597,9 +26492,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -26608,15 +26501,13 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 @@ -26635,8 +26526,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -26668,13 +26558,10 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -26683,12 +26570,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /obj/structure/cable/cyan{ d1 = 4; @@ -26723,9 +26608,7 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -26734,15 +26617,13 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/structure/cable/cyan{ d1 = 4; @@ -26759,16 +26640,13 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/structure/cable/cyan{ d1 = 4; @@ -26782,9 +26660,7 @@ /area/engineering/atmos) "aWf" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -26793,12 +26669,10 @@ dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 1; - icon_state = "map" + dir = 1 }, /obj/structure/cable/cyan{ d1 = 4; @@ -26809,9 +26683,7 @@ /area/engineering/atmos) "aWg" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -26820,12 +26692,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/cable/cyan{ d1 = 4; @@ -26836,20 +26706,16 @@ /area/engineering/atmos) "aWh" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/cable/cyan{ d1 = 4; @@ -26863,9 +26729,7 @@ /area/engineering/atmos) "aWi" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -26874,12 +26738,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/structure/cable/cyan{ d1 = 4; @@ -26893,9 +26755,7 @@ /area/engineering/atmos) "aWj" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -26904,12 +26764,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/structure/cable/cyan{ d1 = 1; @@ -26920,9 +26778,7 @@ /area/engineering/atmos) "aWk" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -26931,8 +26787,7 @@ dir = 10 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/red, /turf/simulated/floor/tiled, @@ -26942,8 +26797,7 @@ dir = 5 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 5; - icon_state = "bordercolor" + dir = 5 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -26971,12 +26825,9 @@ "aWo" = ( /obj/machinery/door/window/eastleft{ dir = 8; - icon_state = "left"; name = "Janitorial Desk" }, /obj/machinery/door/window/eastleft{ - dir = 4; - icon_state = "left"; name = "Janitorial Desk"; req_access = list(26) }, @@ -27034,12 +26885,10 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/light/small{ - dir = 8; - pixel_y = 0 + dir = 8 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -27053,21 +26902,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) -"aWw" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) -"aWx" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/floor_decal/corner_techfloor_grid, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) "aWy" = ( /obj/effect/floor_decal/corner_techfloor_grid/full{ dir = 4 @@ -27082,39 +26916,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) -"aWA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -22 - }, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aWB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/lattice, -/obj/structure/cable/green{ - d1 = 32; - d2 = 1; - icon_state = "32-1" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/open, -/area/maintenance/asmaint2) -"aWC" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/techfloor/hole{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "aWD" = ( /turf/simulated/floor/tiled/white, /area/rnd/breakroom/bathroom) @@ -27124,10 +26925,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/breakroom/bathroom) -"aWF" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "aWG" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -27153,7 +26950,6 @@ }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; layer = 1; @@ -27169,8 +26965,7 @@ dir = 10 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -27208,7 +27003,6 @@ /obj/effect/floor_decal/corner/yellow/border, /obj/structure/disposalpipe/sortjunction{ dir = 4; - icon_state = "pipe-j1s"; name = "Drone Fabrication"; sortType = "Drone Fabrication" }, @@ -27241,8 +27035,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -27275,8 +27068,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 6; - icon_state = "intact" + dir = 6 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -27287,8 +27079,7 @@ /area/engineering/atmos) "aWS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -27303,8 +27094,7 @@ /area/engineering/atmos) "aWT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -27321,8 +27111,7 @@ /area/engineering/atmos) "aWU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -27330,8 +27119,7 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -27345,14 +27133,12 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction{ dir = 4; - icon_state = "pipe-j1s"; name = "Atmospherics"; sortType = "Atmospherics" }, @@ -27383,8 +27169,7 @@ pixel_y = -32 }, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 @@ -27396,8 +27181,7 @@ /obj/effect/floor_decal/corner/yellow/border, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -27411,8 +27195,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/yellow/border, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -27423,19 +27206,16 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 9; - icon_state = "bordercolorcorner2" + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) "aXb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -27445,8 +27225,7 @@ /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/yellow/bordercorner2, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -27458,8 +27237,7 @@ /obj/effect/floor_decal/corner/yellow/border, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 @@ -27470,8 +27248,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 4; - icon_state = "intact" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -27483,8 +27260,7 @@ }, /obj/effect/floor_decal/corner/yellow/border, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -27496,8 +27272,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 6; - icon_state = "bordercolor" + dir = 6 }, /obj/machinery/camera/network/engineering{ dir = 1 @@ -27526,13 +27301,10 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ - dir = 10; - icon_state = "bordercolorcorner2" + dir = 10 }, /turf/simulated/floor/tiled, /area/janitor) @@ -27563,93 +27335,6 @@ }, /turf/simulated/floor/tiled, /area/janitor) -"aXl" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) -"aXm" = ( -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) -"aXn" = ( -/obj/effect/floor_decal/corner_techfloor_grid/full{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/random/trash_pile, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) -"aXo" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aXp" = ( -/obj/structure/catwalk, -/obj/machinery/alarm{ - dir = 8; - icon_state = "alarm0"; - pixel_x = 24 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aXq" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aXr" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "aXs" = ( /obj/machinery/door/airlock{ name = "Unit 2" @@ -27674,13 +27359,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"aXw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "aXx" = ( /turf/simulated/wall/r_wall, /area/engineering/drone_fabrication) @@ -27705,8 +27383,7 @@ /area/engineering/drone_fabrication) "aXA" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/machinery/camera/network/engineering{ dir = 4 @@ -27775,8 +27452,7 @@ /area/engineering/atmos) "aXK" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/machinery/camera/network/engineering{ dir = 8 @@ -27811,9 +27487,7 @@ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 10; - icon_state = "borderfloorcorner2"; - pixel_x = 0 + dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -27905,8 +27579,7 @@ icon_state = "pipe-c" }, /obj/structure/extinguisher_cabinet{ - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -27935,70 +27608,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/catwalk, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/south) -"aXU" = ( -/obj/effect/floor_decal/techfloor{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aXV" = ( -/obj/effect/floor_decal/techfloor, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/structure/closet, -/obj/random/contraband, -/obj/random/maintenance/research, -/obj/random/maintenance/research, -/obj/random/maintenance/clean, -/obj/random/tool, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aXW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aXX" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/floor_decal/techfloor, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aXY" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "aXZ" = ( /obj/machinery/light/small, /obj/machinery/recharge_station, @@ -28013,8 +27628,7 @@ /area/rnd/breakroom/bathroom) "aYb" = ( /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/rnd/breakroom/bathroom) @@ -28025,8 +27639,7 @@ dir = 1 }, /obj/machinery/shower{ - dir = 1; - icon_state = "shower" + dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 @@ -28040,17 +27653,10 @@ /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"aYe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "aYf" = ( /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/cyan{ @@ -28094,8 +27700,7 @@ pixel_y = 28 }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" + dir = 8 }, /obj/machinery/light/small{ dir = 4 @@ -28115,7 +27720,6 @@ "aYk" = ( /obj/structure/cable/cyan{ d1 = 32; - d2 = 1; icon_state = "32-1" }, /obj/structure/lattice, @@ -28133,15 +27737,13 @@ dir = 9 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 9; - icon_state = "bordercolor" + dir = 9 }, /obj/machinery/light{ dir = 1 }, /obj/machinery/computer/general_air_control/large_tank_control{ dir = 4; - frequency = 1441; input_tag = "atmos_out"; name = "Atmos Intake Control"; output_tag = "atmos_in"; @@ -28151,20 +27753,16 @@ /area/engineering/atmos/monitoring) "aYm" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 1; - icon_state = "bordercolorcorner2" + dir = 1 }, /obj/structure/table/standard, /obj/item/taperoll/atmos, @@ -28173,8 +27771,6 @@ /obj/machinery/button/remote/blast_door{ id = "atmoslockdown"; name = "Atmospherics Lockdown"; - pixel_x = 0; - pixel_y = 0; req_one_access = list(10,24) }, /turf/simulated/floor/tiled, @@ -28203,20 +27799,16 @@ icon_state = "4-8" }, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 1; - icon_state = "bordercolor" + dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 4; - icon_state = "bordercolorcorner2" + dir = 4 }, /obj/machinery/computer/power_monitor, /turf/simulated/floor/tiled, @@ -28235,8 +27827,7 @@ dir = 5 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 5; - icon_state = "bordercolor" + dir = 5 }, /obj/machinery/computer/rcon, /obj/machinery/light{ @@ -28269,20 +27860,9 @@ /obj/random/powercell, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"aYt" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) -"aYu" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "aYv" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/camera/network/tether{ dir = 4 @@ -28291,8 +27871,7 @@ /area/tether/surfacebase/east_stairs_two) "aYw" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) @@ -28300,8 +27879,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) @@ -28315,8 +27893,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's set to history channel, the show is talking about modern aliens. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) @@ -28331,8 +27908,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/purple/bordercorner2{ - dir = 8; - icon_state = "bordercolorcorner2" + dir = 8 }, /obj/structure/closet/jcloset, /obj/item/weapon/soap/nanotrasen, @@ -28382,8 +27958,7 @@ dir = 5 }, /obj/machinery/computer/drone_control{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/machinery/firealarm{ dir = 8; @@ -28410,8 +27985,7 @@ /area/engineering/drone_fabrication) "aYI" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/effect/floor_decal/rust, /obj/structure/disposalpipe/segment, @@ -28431,8 +28005,7 @@ /area/engineering/atmos) "aYL" = ( /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /turf/simulated/open, /area/engineering/atmos) @@ -28441,12 +28014,10 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/machinery/computer/atmoscontrol{ - dir = 4; - icon_state = "computer" + dir = 4 }, /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) @@ -28473,8 +28044,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/structure/table/standard, /obj/item/weapon/storage/firstaid/regular, @@ -28487,28 +28057,6 @@ /obj/random/toolbox, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"aYS" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 5 - }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) -"aYT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "aYU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -28554,21 +28102,10 @@ dir = 5 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) -"aYZ" = ( -/obj/structure/railing, -/obj/effect/floor_decal/techfloor{ - dir = 9 - }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "aZa" = ( /obj/structure/railing, /obj/effect/floor_decal/techfloor{ @@ -28586,19 +28123,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) -"aZc" = ( -/obj/structure/railing, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aZd" = ( -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "aZe" = ( /obj/structure/railing, /turf/simulated/floor/plating, @@ -28616,8 +28140,7 @@ fabricator_tag = "Atmos" }, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) @@ -28640,8 +28163,7 @@ /area/engineering/drone_fabrication) "aZk" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" + dir = 8 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -28654,8 +28176,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 8; - icon_state = "bordercolor" + dir = 8 }, /obj/machinery/computer/area_atmos/tag{ dir = 4; @@ -28694,8 +28215,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 4; - icon_state = "bordercolor" + dir = 4 }, /obj/structure/table/standard, /obj/item/weapon/paper_bin{ @@ -28732,83 +28252,6 @@ /obj/structure/stairs/east, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) -"aZw" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/effect/floor_decal/rust, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aZx" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/research, -/obj/random/maintenance/research, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) -"aZy" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aZz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aZA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aZB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/effect/floor_decal/techfloor, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "aZC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -28830,17 +28273,6 @@ /obj/effect/floor_decal/techfloor, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"aZE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "aZF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -28861,7 +28293,6 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; layer = 1; @@ -28904,12 +28335,10 @@ /area/engineering/drone_fabrication) "aZK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/engineering/drone_fabrication) @@ -28918,8 +28347,7 @@ dir = 10 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /obj/structure/closet/firecloset, /turf/simulated/floor/tiled, @@ -28929,8 +28357,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) @@ -28958,8 +28385,7 @@ dir = 6 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 6; - icon_state = "bordercolor" + dir = 6 }, /obj/structure/disposalpipe/trunk{ dir = 8 @@ -28988,40 +28414,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) -"aZT" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/rust, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aZU" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/rust, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "aZV" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -29055,8 +28447,7 @@ /area/maintenance/asmaint2) "aZX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -29072,19 +28463,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"aZY" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) -"aZZ" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "baa" = ( /obj/effect/floor_decal/techfloor/corner, /obj/machinery/drone_fabricator{ @@ -29115,8 +28493,7 @@ dir = 10 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 10; - icon_state = "bordercolor" + dir = 10 }, /obj/machinery/computer/station_alert{ dir = 1 @@ -29127,8 +28504,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, /obj/machinery/computer/atmos_alert{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/machinery/camera/network/engineering{ dir = 1 @@ -29140,28 +28516,13 @@ dir = 6 }, /obj/effect/floor_decal/corner/yellow/border{ - dir = 6; - icon_state = "bordercolor" + dir = 6 }, /obj/machinery/computer/security/engineering{ dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos/monitoring) -"bah" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) -"bai" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "baj" = ( /obj/structure/railing, /obj/structure/railing{ @@ -29195,44 +28556,17 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"bao" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "bap" = ( /obj/structure/ladder, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"baq" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "bar" = ( /obj/effect/floor_decal/techfloor{ dir = 6 }, /obj/machinery/computer/drone_control{ - dir = 4; - icon_state = "computer" + dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) @@ -29255,19 +28589,10 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"bav" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "baw" = ( /obj/structure/catwalk, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/plating, @@ -29298,16 +28623,14 @@ /area/maintenance/lower/atmos) "baB" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/cryopod/robot, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) "baC" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1; - icon_state = "warning" + dir = 1 }, /obj/machinery/computer/cryopod/robot{ pixel_y = -32 @@ -29319,8 +28642,7 @@ /area/engineering/drone_fabrication) "baD" = ( /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /obj/machinery/light/small{ dir = 4 @@ -29332,17 +28654,6 @@ /obj/machinery/disposal, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) -"baE" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/random/trash_pile, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "baF" = ( /obj/structure/railing{ dir = 1 @@ -29352,31 +28663,6 @@ /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"baG" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) -"baH" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) -"baI" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "baJ" = ( /obj/structure/railing{ dir = 8 @@ -29392,28 +28678,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"baL" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) -"baM" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "baN" = ( /obj/random/trash_pile, /turf/simulated/floor/plating, @@ -29441,18 +28705,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) -"baR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/floor_decal/rust, -/obj/machinery/light_switch{ - pixel_y = 25 - }, -/obj/effect/decal/cleanable/cobweb{ - icon_state = "cobweb2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/asmaint2) "baS" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/closet/firecloset, @@ -29467,10 +28719,6 @@ "baU" = ( /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"baV" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "baW" = ( /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -29507,78 +28755,17 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) -"bbb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/asmaint2) "bbc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) -"bbd" = ( -/obj/structure/extinguisher_cabinet{ - dir = 8; - icon_state = "extinguisher_closed"; - pixel_x = 30 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/asmaint2) -"bbe" = ( -/obj/random/trash_pile, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bbf" = ( /obj/structure/catwalk, /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"bbg" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"bbh" = ( -/obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" - }, -/obj/structure/railing, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"bbi" = ( -/obj/structure/railing, -/obj/structure/closet, -/obj/random/maintenance/clean, -/obj/random/maintenance/research, -/obj/random/maintenance/research, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"bbj" = ( -/obj/structure/railing, -/obj/structure/closet, -/obj/random/maintenance/clean, -/obj/random/junk, -/obj/random/maintenance/research, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bbk" = ( /obj/structure/railing, /obj/structure/table/rack, @@ -29611,39 +28798,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"bbp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/kitchenspike, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) -"bbq" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/closet, -/obj/random/maintenance/clean, -/obj/item/stack/flag/red{ - amount = 1 - }, -/obj/item/stack/flag/blue{ - amount = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "bbr" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) -"bbs" = ( -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 4; - pixel_y = 0 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "bbt" = ( /obj/structure/cable/green{ d1 = 1; @@ -29652,32 +28810,10 @@ }, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) -"bbu" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/asmaint2) -"bbv" = ( -/obj/effect/floor_decal/rust, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/asmaint2) "bbw" = ( /obj/structure/cable/green{ d2 = 8; @@ -29690,21 +28826,10 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) -"bbx" = ( -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"bby" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bbz" = ( /obj/structure/railing, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/open, /area/engineering/atmos) @@ -29719,24 +28844,6 @@ }, /turf/simulated/open, /area/engineering/atmos) -"bbC" = ( -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) -"bbD" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "bbE" = ( /obj/structure/railing{ dir = 8 @@ -29746,10 +28853,6 @@ /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"bbF" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/asmaint2) "bbG" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty, @@ -29775,7 +28878,6 @@ /obj/structure/catwalk, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; icon_state = "pdoor0"; id = "atmoslockdown"; layer = 1; @@ -29807,26 +28909,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"bbN" = ( -/obj/structure/table/steel, -/obj/item/clothing/mask/balaclava, -/obj/item/clothing/mask/bandana, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) -"bbO" = ( -/obj/structure/table/steel, -/obj/item/weapon/handcuffs/fuzzy, -/obj/item/weapon/handcuffs/legcuffs/fuzzy, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) -"bbP" = ( -/obj/structure/bed, -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "bbQ" = ( /obj/structure/railing{ dir = 8 @@ -29882,12 +28964,6 @@ /obj/structure/bed, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) -"bbV" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/light/small, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/asmaint2) "bbW" = ( /obj/structure/table/steel, /obj/effect/floor_decal/rust, @@ -29909,12 +28985,10 @@ /area/maintenance/lower/atmos) "bbZ" = ( /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" + dir = 1 }, /obj/structure/mirror{ dir = 4; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/carpet, @@ -29924,29 +28998,6 @@ /obj/item/weapon/bedsheet/rainbow, /turf/simulated/floor/wood, /area/maintenance/lower/atmos) -"bcb" = ( -/obj/effect/decal/cleanable/blood, -/obj/item/device/tape{ - desc = "No Talk" - }, -/obj/item/clothing/suit/varsity/brown{ - desc = "Showdown" - }, -/obj/item/clothing/head/richard, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"bcc" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bcd" = ( /obj/structure/catwalk, /obj/machinery/camera/network/engineering{ @@ -29972,29 +29023,11 @@ /obj/item/clothing/under/color/black, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"bch" = ( -/obj/structure/table/steel, -/obj/item/clothing/head/welding/demon, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "bci" = ( /obj/structure/table/steel, /obj/item/clothing/glasses/sunglasses/blindfold, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"bcj" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - dir = 8; - icon_state = "alarm0"; - pixel_x = 24 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "bck" = ( /turf/simulated/floor/wood, /area/maintenance/lower/atmos) @@ -30007,45 +29040,6 @@ /obj/item/clothing/accessory/scarf/stripedred, /turf/simulated/floor/wood, /area/maintenance/lower/atmos) -"bcn" = ( -/obj/effect/decal/cleanable/blood, -/obj/item/clothing/shoes/athletic{ - desc = "Assault" - }, -/obj/item/clothing/under/pants{ - desc = "Overdose" - }, -/obj/item/weapon/material/twohanded/baseballbat{ - desc = "Decadence"; - health = 1989 - }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"bco" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"bcp" = ( -/obj/structure/closet, -/obj/random/maintenance/security, -/obj/random/contraband, -/obj/random/maintenance/engineering, -/obj/random/maintenance/engineering, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/item/clothing/suit/storage/vest/hoscoat/jensen{ - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0); - desc = "Its an old, dusty trenchcoat... what a shame."; - name = "trenchcoat" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "bcq" = ( /obj/machinery/door/firedoor/glass, /obj/structure/simple_door/wood, @@ -30055,19 +29049,6 @@ /obj/structure/railing, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"bcs" = ( -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"bct" = ( -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/atmos) "bcu" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -30080,23 +29061,10 @@ dir = 1 }, /obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" - }, -/obj/structure/railing, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/atmos) -"bcw" = ( -/obj/effect/floor_decal/techfloor{ dir = 1 }, /obj/structure/railing, -/obj/structure/closet/crate, -/obj/random/maintenance/research, -/obj/random/maintenance/research, -/obj/random/cigarettes, -/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) "bcx" = ( @@ -30112,16 +29080,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"bcz" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/item/clothing/glasses/sunglasses{ - desc = "My vision is augmented"; - icon_state = "sun"; - name = "Augmented shades" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/south) "bcA" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -30145,43 +29103,11 @@ /obj/item/weapon/storage/box/donkpockets, /turf/simulated/floor/wood, /area/maintenance/lower/atmos) -"bcE" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"bcF" = ( -/obj/structure/catwalk, -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bcG" = ( /obj/effect/floor_decal/techfloor, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"bcH" = ( -/obj/effect/floor_decal/techfloor, -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"bcI" = ( -/obj/effect/floor_decal/techfloor, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"bcJ" = ( -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bcK" = ( /obj/structure/catwalk, /obj/machinery/light/small{ @@ -30189,22 +29115,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/south) -"bcL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/engineering, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) "bcM" = ( /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "bcN" = ( /obj/structure/catwalk, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/lower/south) @@ -30224,9 +29141,7 @@ "bcP" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/wood, /area/maintenance/lower/atmos) @@ -30240,16 +29155,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"bcS" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bcT" = ( /obj/structure/railing{ dir = 1 @@ -30327,15 +29232,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) -"bdc" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) "bdd" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -30350,8 +29246,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -30461,8 +29356,7 @@ dir = 8 }, /obj/structure/plushie/carp{ - dir = 4; - icon_state = "carpplushie" + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) @@ -30474,18 +29368,10 @@ "bdm" = ( /obj/structure/plushie/ian{ dir = 8; - icon_state = "ianplushie"; pixel_y = 6 }, /turf/simulated/floor/wood, /area/maintenance/lower/atmos) -"bdn" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bdo" = ( /obj/structure/railing, /obj/effect/floor_decal/techfloor{ @@ -30565,9 +29451,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -30700,38 +29584,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) -"bdB" = ( -/obj/effect/floor_decal/techfloor, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) -"bdC" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/random/trash_pile, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) "bdD" = ( /obj/structure/catwalk, /obj/effect/floor_decal/techfloor, @@ -30770,16 +29622,14 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/readingrooms) "bdG" = ( /obj/structure/plushie/drone{ - dir = 1; - icon_state = "droneplushie" + dir = 1 }, /turf/simulated/floor/wood, /area/maintenance/lower/atmos) @@ -30801,18 +29651,6 @@ /obj/effect/decal/cleanable/blood, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/atmos) -"bdJ" = ( -/obj/structure/table/steel, -/obj/machinery/vending/wallmed1{ - emagged = 1; - pixel_y = 32; - shut_up = 0 - }, -/obj/item/weapon/tool/wirecutters, -/obj/item/weapon/tool/wrench, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/atmos) "bdK" = ( /obj/structure/railing{ dir = 1 @@ -30826,21 +29664,6 @@ /obj/random/cutout, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"bdM" = ( -/obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"bdN" = ( -/obj/effect/decal/cleanable/cobweb{ - icon_state = "cobweb2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bdO" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/supply, @@ -30871,36 +29694,16 @@ /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"bdU" = ( -/obj/structure/table/steel, -/obj/item/weapon/tape_roll, -/obj/item/stack/medical/bruise_pack, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/atmos) -"bdV" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/atmos) "bdW" = ( /obj/structure/table/steel, /obj/item/stack/medical/splint/ghetto, /obj/random/technology_scanner, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) -"bdX" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bdY" = ( /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) @@ -30910,11 +29713,6 @@ /obj/item/weapon/storage/fancy/candle_box, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"bea" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "beb" = ( /obj/structure/railing{ dir = 8 @@ -30940,8 +29738,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, @@ -30950,8 +29747,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 + name = "HIGH VOLTAGE" }, /turf/simulated/wall, /area/maintenance/substation/tcomms) @@ -30972,20 +29768,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/readingrooms) -"bei" = ( -/obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 - }, -/turf/simulated/floor/reinforced, -/area/rnd/outpost/xenobiology/outpost_slimepens) "bej" = ( /obj/machinery/camera/network/research/xenobio{ network = list("Xenobiology") @@ -31029,7 +29816,6 @@ "ben" = ( /obj/machinery/processor, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; pixel_x = 4; pixel_y = 26 @@ -31043,7 +29829,6 @@ pixel_y = 21 }, /obj/machinery/alarm{ - pixel_x = 0; pixel_y = 30 }, /obj/machinery/computer/security/xenobio, @@ -31107,19 +29892,11 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) -"bew" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bex" = ( /obj/structure/table/steel, /obj/random/medical/lite, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/simulated/floor/tiled/techfloor, @@ -31148,8 +29925,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 1; @@ -31167,16 +29943,6 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) -"beD" = ( -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/substation/tcomms) "beE" = ( /obj/machinery/power/apc{ dir = 4; @@ -31204,7 +29970,6 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/research{ name = "Slime Pen 1"; - req_access = list(); req_one_access = list(47,55) }, /obj/machinery/door/blast/regular{ @@ -31230,7 +29995,6 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/research{ name = "Slime Pen 2"; - req_access = list(); req_one_access = list(47,55) }, /obj/machinery/door/blast/regular{ @@ -31250,28 +30014,11 @@ }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) -"beM" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"beN" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "beO" = ( /obj/machinery/mecha_part_fabricator/pros{ component_coeff = 0.9; desc = "A machine used for construction of legit prosthetics. You weren't sure if cardboard was considered an engineering material until now."; dir = 4; - emagged = 0; name = "Legitimate Prosthetics Fabricator"; req_access = list(); res_max_amount = 150000; @@ -31334,8 +30081,7 @@ /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Telecomms"; charge = 100000; - output_attempt = 0; - outputting = 0 + output_attempt = 0 }, /obj/structure/cable/green{ icon_state = "0-4" @@ -31408,9 +30154,7 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled/dark, @@ -31438,8 +30182,7 @@ "bfj" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) @@ -31540,11 +30283,6 @@ }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) -"bfs" = ( -/obj/structure/morgue, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bft" = ( /obj/structure/closet/crate/freezer, /obj/machinery/light/small{ @@ -31603,34 +30341,12 @@ "bfA" = ( /obj/machinery/camera/network/tcomms, /turf/simulated/floor/tiled/dark, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) -"bfB" = ( -/obj/machinery/turretid/lethal{ - ailock = 1; - check_synth = 1; - control_area = /area/tcommsat/chamber; - desc = "A firewall prevents AIs from interacting with this device."; - name = "Telecoms lethal turret control"; - pixel_x = 29; - pixel_y = 0; - req_access = list(61); - req_one_access = list(12) - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/obj/effect/decal/cleanable/cobweb2, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, /area/tcomsat{ name = "\improper Telecomms Lobby" }) "bfC" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/tcommsat/computer) @@ -31651,15 +30367,13 @@ /area/tcommsat/computer) "bfF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" + dir = 1 }, /turf/simulated/floor/tiled, /area/tcommsat/computer) "bfG" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - icon_state = "intact" + dir = 10 }, /turf/simulated/floor/tiled, /area/tcommsat/computer) @@ -31687,7 +30401,6 @@ id = "xenobiodiv1"; name = "Divider 1 Blast Doors"; pixel_x = -38; - pixel_y = 0; req_access = list(55) }, /obj/machinery/button/remote/blast_door{ @@ -31705,9 +30418,7 @@ req_access = list(55) }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) @@ -31723,7 +30434,6 @@ id = "xenobiodiv2"; name = "Divider 2 Blast Doors"; pixel_x = 38; - pixel_y = 0; req_access = list(55) }, /obj/machinery/button/remote/blast_door{ @@ -31754,10 +30464,6 @@ /obj/structure/morgue, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"bfQ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/atmos) "bfR" = ( /turf/simulated/mineral, /area/maintenance/lower/atmos) @@ -31802,7 +30508,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /turf/simulated/floor/tiled, @@ -31817,14 +30522,11 @@ desc = "A firewall prevents AIs from interacting with this device."; name = "Telecoms Foyer turret control"; pixel_x = 29; - pixel_y = 0; req_access = list(61); req_one_access = list(12) }, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; - pixel_x = 0; pixel_y = 26 }, /turf/simulated/floor/tiled, @@ -31919,8 +30621,7 @@ /area/tcommsat/computer) "bgh" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /turf/simulated/floor/tiled, /area/tcommsat/computer) @@ -31947,7 +30648,6 @@ }, /obj/machinery/camera/network/research/xenobio{ dir = 9; - icon_state = "camera"; network = list("Xenobiology") }, /turf/simulated/floor/reinforced, @@ -32059,32 +30759,10 @@ }, /obj/machinery/camera/network/research/xenobio{ dir = 4; - icon_state = "camera"; network = list("Xenobiology") }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) -"bgt" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"bgu" = ( -/obj/structure/table/steel, -/obj/item/bodybag, -/obj/item/bodybag, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"bgv" = ( -/obj/structure/table/steel, -/obj/item/device/nif/bad, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bgw" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, @@ -32133,23 +30811,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) -"bgC" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, /area/tcommsat/entrance{ name = "\improper Telecomms Entrance" }) @@ -32183,8 +30844,7 @@ }, /obj/machinery/door/airlock/hatch{ name = "Telecomms Foyer"; - req_access = list(61); - req_one_access = list(12) + req_access = list(61) }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, @@ -32245,23 +30905,6 @@ }, /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) -"bgI" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, /area/tcomsat{ name = "\improper Telecomms Lobby" }) @@ -32330,29 +30973,13 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) -"bgM" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, /area/tcomsat{ name = "\improper Telecomms Lobby" }) "bgN" = ( /obj/machinery/door/airlock/hatch{ name = "Telecoms Control Room"; - req_access = list(61); - req_one_access = list(12) + req_access = list(61) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -32375,8 +31002,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, @@ -32388,8 +31014,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -32408,8 +31033,7 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -32455,8 +31079,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -32516,28 +31139,14 @@ }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) -"bhc" = ( -/obj/structure/table/rack, -/obj/item/device/flashlight, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bhd" = ( /obj/structure/closet/secure_closet/personal, /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) -"bhe" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar_upper) "bhf" = ( /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -32546,13 +31155,6 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) -"bhg" = ( -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar_upper) "bhh" = ( /turf/simulated/floor/plating, /area/vacant/vacant_bar_upper) @@ -32592,7 +31194,6 @@ dir = 1 }, /obj/item/device/radio/intercom{ - dir = 2; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -32621,8 +31222,7 @@ dir = 1 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/tcomsat{ @@ -32659,7 +31259,6 @@ }) "bht" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -32674,7 +31273,6 @@ }, /obj/machinery/alarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/simulated/floor/tiled, @@ -32694,7 +31292,6 @@ /area/tcommsat/computer) "bhw" = ( /obj/machinery/atmospherics/unary/freezer{ - dir = 2; icon_state = "freezer_1"; set_temperature = 73; use_power = 1 @@ -32720,8 +31317,7 @@ /area/tcommsat/computer) "bhz" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/machinery/airlock_sensor/airlock_exterior{ frequency = 1381; @@ -32739,8 +31335,7 @@ id_tag = "server_access_outer"; locked = 1; name = "Telecoms Server Access"; - req_access = list(61); - req_one_access = list(12) + req_access = list(61) }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -32764,7 +31359,6 @@ frequency = 1381; id_tag = "server_access_airlock"; name = "Server Access Airlock"; - pixel_x = 0; pixel_y = 25; tag_airpump = "server_access_pump"; tag_chamber_sensor = "server_access_sensor"; @@ -32921,8 +31515,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass/hidden{ - dir = 2; - icon_state = "door_open" + dir = 2 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) @@ -33123,8 +31716,7 @@ id_tag = "server_access_inner"; locked = 1; name = "Telecoms Server Access"; - req_access = list(61); - req_one_access = list(12) + req_access = list(61) }, /turf/simulated/floor/tiled/dark{ nitrogen = 100; @@ -33146,8 +31738,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) @@ -33202,17 +31793,14 @@ id = "xenobiodiv3"; name = "Divider 3 Blast Doors"; pixel_x = -25; - pixel_y = 0; req_access = list(55) }, /obj/machinery/alarm{ dir = 4; - pixel_x = -35; - pixel_y = 0 + pixel_x = -35 }, /obj/machinery/camera/network/research/xenobio{ - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) @@ -33231,7 +31819,6 @@ id = "xenobiodiv4"; name = "Divider 4 Blast Doors"; pixel_x = 38; - pixel_y = 0; req_access = list(55) }, /obj/machinery/button/remote/blast_door{ @@ -33261,29 +31848,13 @@ }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) -"bir" = ( -/obj/random/junk, -/obj/item/weapon/broken_bottle, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bis" = ( /obj/machinery/light_construct{ - dir = 8; - icon_state = "tube-construct-stage1" + dir = 8 }, /obj/structure/closet/secure_closet/personal, /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) -"bit" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/vacant/vacant_bar_upper) "biu" = ( /obj/structure/table/rack/shelf/steel, /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, @@ -33291,8 +31862,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice, /obj/item/weapon/reagent_containers/food/drinks/bottle/lemonjuice, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) @@ -33481,14 +32051,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) @@ -33561,21 +32129,6 @@ }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) -"biP" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"biQ" = ( -/obj/structure/bed/chair, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "biR" = ( /obj/structure/bed/chair, /obj/random/junk, @@ -33586,10 +32139,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"biT" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/vacant/vacant_bar_upper) "biU" = ( /obj/structure/cable/green{ d1 = 1; @@ -33654,8 +32203,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -33671,8 +32219,7 @@ /obj/item/weapon/stock_parts/subspace/ansible, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -33713,8 +32260,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) @@ -33816,17 +32362,6 @@ }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) -"bjq" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bjr" = ( /obj/structure/railing{ dir = 1 @@ -34004,13 +32539,6 @@ }, /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) -"bjK" = ( -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/double, -/obj/structure/curtain/open/privacy, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar_upper) "bjL" = ( /obj/structure/cable/green{ d1 = 1; @@ -34120,7 +32648,6 @@ id = "xenobiodiv5"; name = "Divider 5 Blast Doors"; pixel_x = -30; - pixel_y = 0; req_access = list(55) }, /obj/machinery/button/remote/blast_door{ @@ -34131,9 +32658,7 @@ req_access = list(55) }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/button/remote/blast_door{ id = "xenobiopen7"; @@ -34144,8 +32669,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -35; - pixel_y = 0 + pixel_x = -35 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) @@ -34160,7 +32684,6 @@ id = "xenobiodiv6"; name = "Divider 6 Blast Doors"; pixel_x = 38; - pixel_y = 0; req_access = list(55) }, /obj/machinery/button/remote/blast_door{ @@ -34178,8 +32701,7 @@ req_access = list(55) }, /obj/machinery/camera/network/research/xenobio{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) @@ -34206,12 +32728,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"bkb" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bkc" = ( /obj/structure/table/standard, /obj/item/weapon/stock_parts/micro_laser, @@ -34253,12 +32769,10 @@ }) "bkf" = ( /obj/structure/sign/nosmoking_2{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/bluegrid{ name = "Mainframe Base"; @@ -34330,8 +32844,7 @@ /area/tcommsat/chamber) "bkn" = ( /obj/structure/sign/nosmoking_2{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/light{ dir = 4 @@ -34474,20 +32987,11 @@ /obj/structure/table/steel, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"bky" = ( -/obj/machinery/light_construct{ - dir = 4; - icon_state = "tube-construct-stage1" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/vacant/vacant_bar_upper) "bkz" = ( /obj/machinery/telecomms/bus/preset_one, /turf/simulated/floor/tiled/dark{ @@ -34609,14 +33113,6 @@ }, /turf/simulated/floor/reinforced, /area/rnd/outpost/xenobiology/outpost_slimepens) -"bkM" = ( -/obj/structure/catwalk, -/obj/structure/table/steel, -/obj/effect/decal/cleanable/dirt, -/obj/random/cigarettes, -/obj/item/weapon/flame/lighter/random, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "bkN" = ( /obj/item/device/radio/intercom{ dir = 8; @@ -34733,7 +33229,6 @@ /obj/effect/floor_decal/industrial/outline/blue, /obj/structure/cable/green{ d1 = 32; - d2 = 1; icon_state = "32-1" }, /turf/simulated/floor/wood, @@ -34842,8 +33337,7 @@ /area/tether/surfacebase/southhall) "bll" = ( /obj/machinery/camera/network/outside{ - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside2) @@ -34880,7 +33374,6 @@ "blo" = ( /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; - req_access = list(); req_one_access = list(47,55) }, /obj/structure/cable/green{ @@ -34919,7 +33412,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/research{ name = "Xenobiology Lab"; - req_access = list(); req_one_access = list(47,55) }, /obj/machinery/door/firedoor, @@ -34939,8 +33431,7 @@ /area/rnd/outpost/xenobiology/outpost_slimepens) "blt" = ( /obj/machinery/camera/network/outside{ - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside2) @@ -34949,19 +33440,6 @@ /obj/structure/bed/chair, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"blv" = ( -/obj/structure/catwalk, -/obj/structure/bed/chair, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"blw" = ( -/obj/structure/catwalk, -/obj/structure/table/steel, -/obj/effect/decal/cleanable/dirt, -/obj/item/weapon/flame/candle, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "blx" = ( /obj/structure/catwalk, /obj/effect/landmark{ @@ -34969,41 +33447,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"bly" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/engineering, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"blz" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/closet, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) -"blA" = ( -/obj/machinery/light/small, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/random/trash_pile, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "blB" = ( /obj/machinery/camera/network/tcomms{ dir = 1 @@ -35118,12 +33561,10 @@ id = "phoroncelldoor9"; name = "Phoron Cell 9 Doorlock"; pixel_x = -38; - pixel_y = 0; specialfunctions = 4 }, /obj/machinery/light_switch{ dir = 1; - pixel_x = 0; pixel_y = 38 }, /turf/simulated/floor/tiled/dark, @@ -35194,7 +33635,6 @@ id = "phoroncelldoor10"; name = "Phoron Cell 10 Doorlock"; pixel_x = 38; - pixel_y = 0; specialfunctions = 4 }, /turf/simulated/floor/tiled/dark, @@ -35239,7 +33679,6 @@ /obj/machinery/door/airlock/research{ id_tag = "phoroncelldoor9"; name = "Slime Pen 9"; - req_access = list(); req_one_access = list(47,55) }, /obj/machinery/door/firedoor, @@ -35253,8 +33692,7 @@ "blW" = ( /obj/structure/stairs/north, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/railing{ dir = 8 @@ -35267,8 +33705,7 @@ "blX" = ( /obj/structure/stairs/north, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/window/basic{ dir = 1 @@ -35278,12 +33715,10 @@ "blY" = ( /obj/structure/stairs/north, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /obj/structure/window/basic{ dir = 1 @@ -35305,7 +33740,6 @@ /obj/machinery/door/airlock/research{ id_tag = "phoroncelldoor10"; name = "Slime Pen 10"; - req_access = list(); req_one_access = list(47,55) }, /obj/machinery/door/firedoor, @@ -35359,8 +33793,7 @@ /area/rnd/outpost/xenobiology/outpost_slimepens) "bmf" = ( /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) @@ -35404,7 +33837,6 @@ /obj/machinery/alarm/monitor/isolation{ alarm_id = "slime_pens"; dir = 1; - pixel_x = 0; pixel_y = -22 }, /turf/simulated/floor/reinforced, @@ -35415,7 +33847,6 @@ }, /obj/machinery/camera/network/research/xenobio{ dir = 10; - icon_state = "camera"; network = list("Xenobiology") }, /turf/simulated/floor/reinforced, @@ -35500,7 +33931,6 @@ alarm_id = null; breach_detection = 0; dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/disposalpipe/trunk{ @@ -35538,7 +33968,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -25 }, /turf/simulated/floor/tiled/dark, @@ -35560,8 +33989,9 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/substation/medsec) "boD" = ( -/turf/simulated/wall/r_wall, -/area/tether/surfacebase/medical/bathroom) +/obj/structure/sign/department/chapel, +/turf/simulated/wall, +/area/maintenance/lower/bar) "boF" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop{ @@ -35590,7 +34020,6 @@ /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -35618,8 +34047,7 @@ dir = 4 }, /obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() + name = "Shower" }, /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled, @@ -35642,7 +34070,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable{ @@ -35681,8 +34108,7 @@ dir = 8 }, /obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() + name = "Shower" }, /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled, @@ -35705,8 +34131,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/railing, /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /obj/structure/cable/green{ icon_state = "16-0" @@ -35756,8 +34181,7 @@ dir = 1 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -35784,9 +34208,7 @@ dir = 9 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) @@ -35812,8 +34234,7 @@ /obj/structure/lattice, /obj/machinery/door/firedoor/glass, /obj/structure/railing{ - dir = 1; - icon_state = "railing0" + dir = 1 }, /obj/structure/cable/green{ d1 = 32; @@ -35877,8 +34298,7 @@ dir = 4 }, /obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() + name = "Shower" }, /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled, @@ -35900,8 +34320,7 @@ dir = 8 }, /obj/machinery/door/window/northleft{ - name = "Shower"; - req_access = list() + name = "Shower" }, /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled, @@ -35912,8 +34331,7 @@ /area/tether/surfacebase/medical/breakroom) "bpL" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/wall, /area/tether/surfacebase/medical/breakroom) @@ -35960,8 +34378,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -35975,28 +34392,48 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) +"djo" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/machinery/camera/network/civilian, +/turf/simulated/floor/grass, +/area/chapel/main) "djt" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/flora/pottedplant, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) +"dSO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) +"dXv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/dark, +/area/chapel/main) "ebp" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/vending/snack, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) -"foy" = ( -/obj/structure/railing{ - dir = 1; - icon_state = "railing0" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining) "fxr" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) @@ -36037,6 +34474,14 @@ /obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/outside/outside2) +"llG" = ( +/obj/machinery/space_heater, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) "lsC" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -36044,6 +34489,10 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) +"lOO" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/grass, +/area/chapel/main) "mnt" = ( /obj/machinery/light/small{ dir = 1 @@ -36054,8 +34503,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -36065,6 +34513,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"mUP" = ( +/obj/structure/bed/padded, +/obj/effect/floor_decal/techfloor, +/obj/machinery/firealarm{ + pixel_y = -26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) +"mWq" = ( +/obj/structure/catwalk, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) "nFT" = ( /obj/structure/cable{ icon_state = "4-8" @@ -36079,13 +34539,48 @@ /obj/item/weapon/deck/cah, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) -"oXI" = ( -/obj/structure/railing{ - dir = 1; - icon_state = "railing0" +"pah" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock{ + name = "Noodle Office"; + req_access = list(27) + }, +/turf/simulated/floor/tiled/dark, +/area/chapel/main) +"pLH" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 10 + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/area/maintenance/lower/south) +"qpA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/catwalk, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) +"qDE" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -28 + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/bar) "rJc" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/landmark/start{ @@ -36096,6 +34591,24 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) +"sVf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/button/windowtint{ + dir = 1; + id = "chaplainpet"; + name = "interior window tint"; + pixel_x = -4; + pixel_y = 30 + }, +/turf/simulated/floor/tiled/dark, +/area/chapel/main) "sZp" = ( /obj/structure/cable{ icon_state = "4-8" @@ -36112,14 +34625,33 @@ /obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) +"tuO" = ( +/obj/effect/floor_decal/corner_techfloor_grid, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) +"tED" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 10 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -25 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) "tHa" = ( /obj/structure/railing{ - dir = 4; - icon_state = "railing0" + dir = 4 }, /obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining) +"tPB" = ( +/turf/simulated/floor/grass, +/area/chapel/main) "unM" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -36130,14 +34662,11 @@ "uKv" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/structure/bed/chair{ dir = 4 @@ -36147,20 +34676,37 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) -"vlQ" = ( +"voE" = ( +/obj/effect/floor_decal/corner_techfloor_grid, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) +"vTb" = ( +/obj/structure/catwalk, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/glass, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white, -/area/maintenance/lower/north) +/turf/simulated/floor/plating, +/area/maintenance/lower/south) +"wqU" = ( +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) "xbt" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/sign/poster{ @@ -36186,8 +34732,7 @@ /area/tether/surfacebase/medical/breakroom) "xSO" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) @@ -39498,7 +38043,7 @@ adt adt adt aac -arm +arl arl atE atE @@ -39640,7 +38185,7 @@ adt adt adt aac -arm +arl asq arl auh @@ -40844,15 +39389,15 @@ aab aab aab bdS -bei +bkt beG bfj bfJ -bei +bkt beG bfj bim -bei +bkt beG bfj bjU @@ -41938,30 +40483,30 @@ adt adt aHm aHm -aId -aIK -aJe +aqp +aYD +arg aJz -aJX -aJX -aJX -aJX -aJX -aNp +arm +arm +arm +arm +arm +ask aOb aOb -aJX +arm aQt -aJX -aRK -aSr -aJX -aUh -aJX -aJX -aJX -aXo -aXU +arm +ats +atw +arm +aOb +arm +arm +arm +aQt +ayA aHE adt adt @@ -42081,29 +40626,29 @@ adt aHm aHm aHm -aIL aJf aJf -aJY -aIL -aIL -aMe -aIL -aIL -aIL -aKK -aIL -aIL -aRh -aMe -aIL -aIL -aIL -aIL -aIL -aKK -aIL -aXV +aJf +arv +aJf +aJf +arY +aJf +aJf +aJf +arR +aJf +aJf +atk +arY +aJf +aJf +aJf +aJf +aJf +arR +aJf +ayC aHE adt adt @@ -42222,30 +40767,30 @@ adt adt aHm aHm -aIe -aIL -aIL -aIL -aJZ -aKK -aIL -aIL -aIL -aIL -aIL -aMe -aIL -aIL -aJZ -aIL -aJZ -aIL -aIL -aIL -aIL -aMe -aIL -aXW +aqq +aJf +aJf +aJf +arw +arR +aJf +aJf +aJf +aJf +aJf +arY +aJf +aJf +arw +aJf +arw +aJf +aJf +aJf +aJf +arY +aJf +ayD aHE adt adt @@ -42364,30 +40909,30 @@ adt adt aHm aHm -aIf -aIM -aJg -aJA -aKa -aJg -aLs -aMf -aMO -aNq -aJg -aJg -aPD -aJg -aRi -aJg -aSs -aTq -aUi -aUU -aVE -aIL -aXp -aXX +aqr +are +arh +ari +arQ +arh +arW +arZ +asa +asl +arh +arh +ata +arh +atl +arh +atx +auc +auP +awE +axh +aJf +ayj +ayG aHE adt adt @@ -42480,8 +41025,8 @@ ani aoj apv aqD -arv -aiE +aga +amQ atJ auk auk @@ -42506,7 +41051,7 @@ adt adt aGy aHE -aIg +aqs aHE aHE aHE @@ -42622,7 +41167,7 @@ anj anj apw aqE -arw +aiE asy ajV ajV @@ -42647,8 +41192,8 @@ aBb awY awY aGy -aHF -aIh +aql +aql aGw aGy aGy @@ -42669,7 +41214,7 @@ aQv aHE aHE aHE -aWA +axZ aHE adt adt @@ -42809,9 +41354,9 @@ aQw aQw aQw aUj -aUV -aVF -aWB +awF +axi +aya aHE adt adt @@ -42931,7 +41476,7 @@ aEB axR awY aGy -aHF +aql aIi aIN aJh @@ -43073,7 +41618,7 @@ axR aGv aGY aEc -aHF +aql aIi aIO aJi @@ -43093,7 +41638,7 @@ aQw aSt aQw aHE -aUX +awI aHE adt adt @@ -43215,7 +41760,7 @@ axR axR awY aGy -aHF +aql aIi aIP aJj @@ -43235,7 +41780,7 @@ aQy aSu aQv aHE -aUY +awN aHE adt adt @@ -43377,7 +41922,7 @@ aRM aSv aHE aHE -aUZ +awR aHE aHE aHE @@ -43499,8 +42044,8 @@ aFP awY awY aGw -aEg -aEg +aEc +aEc aIP aJl aJF @@ -43516,18 +42061,18 @@ aOY aOY aRk aRM -aSw -aTr -aUk -aVa -aVG -aVG -aXq -aVG -aVG -aVG -aZw -aZT +aty +aug +avu +awS +axn +axn +ayn +axn +axn +axn +azv +aAg aHE adt abn @@ -43641,8 +42186,8 @@ axR axR awY awY -aEg -aHF +aEc +aql aIP aJm aJG @@ -43658,18 +42203,18 @@ aPF aQz aQz aRM -aSx -aTs -aUl -aVb -aVb -aWC -aXr -aXY -aXY -aXY -aZx -aZU +atz +aun +avC +axf +axf +ayb +ayx +ayK +ayK +ayK +azw +aAu aHE adt abn @@ -43783,8 +42328,8 @@ axR axR axR awY -aHF -aHF +aql +aql aIP aJn aJH @@ -43800,8 +42345,8 @@ aPG aPH aPH aRM -aSx -aTt +atz +auB aUm aUm aUm @@ -43926,7 +42471,7 @@ axR awY awY aGy -aEg +aEc aIP aJo aJI @@ -43942,8 +42487,8 @@ aPH aPH aPH aRM -aSy -aTu +atA +auC aUm aVc aVH @@ -43951,8 +42496,8 @@ aWD aXs aXZ aUm -aYZ -aZy +ayZ +azy aZW aHE aHE @@ -44068,7 +42613,7 @@ axR awY aGw aGw -aIk +aqY aIP aIP aIP @@ -44084,8 +42629,8 @@ aPI aPH aPH aRM -aSx -aTv +atz +auD aUm aVd aVI @@ -44094,14 +42639,14 @@ aUm aUm aUm aZa -aZz +azT aZX -bao +aCe bay baQ bba bbt -bbF +aGs bbT aHE adt @@ -44210,9 +42755,9 @@ aFP awY aGw aGw -aIl -aIQ -aEg +aqZ +arf +aEc aJJ aKh aKU @@ -44236,13 +42781,13 @@ aXt aYa aUm aZb -aZA +aAf aHE aHE aHE -baR -bbb -bbu +aEj +aEG +aFU bbG bbU aHE @@ -44317,7 +42862,7 @@ aeP afD agv ahl -ahY +akR ajg ake ali @@ -44352,9 +42897,9 @@ axR awY aGw aGw -aEg -aEg -aEg +aEc +aEc +aEc aJJ aKi aKV @@ -44378,15 +42923,15 @@ aUm aUm aUm aZa -aZB +aZD aHE aHm aHE baS bbc -bbv +aFV bbG -bbV +aGO aHE adt adt @@ -44493,10 +43038,10 @@ axR awY awY aGw -aHH -aEg -aEg -aEg +aqm +aEc +aEc +aEc aJJ aKj aKW @@ -44519,13 +43064,13 @@ aWE aWD aYb aUm -aZc +aZa aZC aHE aHm aHE baT -bbd +aEH bbw bbH bbW @@ -44635,10 +43180,10 @@ axR awY aGy aGw -aHI +aqn aIm -aEg -aEg +aEc +aEc aJK aKk aJJ @@ -44661,7 +43206,7 @@ aUm aXu aYc aUm -aZd +aZe aZD aHE aHE @@ -44758,9 +43303,9 @@ ann auy auA ajE -awE +aAA awD -awE +aAA awD awD awY @@ -44778,13 +43323,13 @@ awY aGy aGw aGw -aIn +ara +aEd aEd -aJp aJL aKl -aKX -aLF +arV +arX aMp aNb aNA @@ -44809,8 +43354,8 @@ aYD bap baz baU -bbe -bbx +aEI +aFW baz bbX bck @@ -44900,10 +43445,10 @@ ann auy auA ajE -awE +aAA axe -awE -awE +aAA +aAA awD azs aAb @@ -44920,7 +43465,7 @@ awY aGy aGw aGw -aIo +aIp aEc aJq aJM @@ -44941,17 +43486,17 @@ aTA aUo aPJ aQw -aWF +aQw aXv aYd aYD aQw -aZE -aZY -baq +aZC +aAX +aCf baz -baV -baV +baU +baU baU baz bbY @@ -45042,11 +43587,11 @@ ann auy auA ajE -awE -awE -awE -ayx -awE +aAA +aAA +aAA +aod +aAA azt aAc aAy @@ -45082,19 +43627,19 @@ aSF aTB aTB aVi -aVN +axJ aWG -aXw -aYe -aXw +ayy +aZf +ayy aZf aZF -aZZ -aZZ +aBx +aBx baA baW bbf -bby +baW baz bbZ bcl @@ -45184,10 +43729,10 @@ ann auy auA ajE -awF -awE -awE -awE +anV +aAA +aAA +aAA awD azs aAd @@ -45200,11 +43745,11 @@ aDY avD aFg aFQ -aGx -aGx aEd aEd -aIq +aEd +aEd +arb aGy aJq aJO @@ -45224,7 +43769,7 @@ aQF aRm aUp aPJ -aVO +aYd aWH aQw aXx @@ -45235,8 +43780,8 @@ aXx aXx aXx baX -bbg -bby +aEJ +baW baz bca bcm @@ -45326,10 +43871,10 @@ ann auz avt ajE -awE -axf -awE -ayy +aAA +anY +aAA +aoG ajE azs azs @@ -45340,8 +43885,8 @@ azs aDq aDZ avD -aEH -aFR +aFh +aFl aEc aEc aGy @@ -45377,8 +43922,8 @@ baa bar aXx aXx -bbh -bby +aFk +baW baz baz baz @@ -45391,9 +43936,9 @@ baz baz baz baz -bby -bby -bhc +baW +baW +aLs bhR baz baz @@ -45468,9 +44013,9 @@ ann auA auy ajE -awE -awE -awE +aAA +aAA +aAA awD ajE azu @@ -45519,32 +44064,32 @@ bab aYF baB aXx -bbi -bby +aFn +baW baz -bcb -bcn +aHn +aHI baz -bcE -baV +aIg +baU baU baz bdT bet -beM -bby -bby -bby -bby -bby +bka baW -biP -bjq -bdX +baW +baW +baW +baW +baW +bdK +aMf +aJg bka bkx -bkM -bby +aNp +baW blu blR aab @@ -45610,12 +44155,12 @@ anr auA auy ajE -awE -awE -axX +aAA +aAA +aob awD ajE -azv +auA aAe aAA avD @@ -45625,7 +44170,7 @@ aDs aEb avD aFh -aFR +aFl aEc aGy aGy @@ -45661,33 +44206,33 @@ bac bas baB aXx -bbj -bby +aFo +baW baz baz baz baz baW baW -bby +baW baA -bby -bcF -beN -bby -bcS -bgt +baW +bbf +aJX +baW +aIn +aJZ baX -bco +aHJ baW -bby baW -bby -bkb baW -bby -bby -blv +baW +bkV +baW +baW +baW +blu blR adt aab @@ -45757,7 +44302,7 @@ awD awD awD ajE -azw +aoP auA aAB avD @@ -45767,7 +44312,7 @@ avD avD avD aFh -aFS +aFl aGy aGy aGy @@ -45783,7 +44328,7 @@ aKo aJO aND aOt -aPd +asQ aPT aQI aRq @@ -45807,11 +44352,11 @@ bbk baW baW baW -bby -bby -bby -bcS -bdn +baW +baW +baW +aIn +baX baz baz baz @@ -45829,7 +44374,7 @@ baz baz baz baW -blw +aNq baz adt adt @@ -45900,7 +44445,7 @@ ajE ajE ajE azx -aAf +azx ajE avD aBJ @@ -45924,9 +44469,9 @@ aKo aMr aJO aND -aOu -aPe -aPU +aso +asR +atc aQI aRr aRR @@ -45945,26 +44490,26 @@ aZk aYI baD aXx -baV -bbg +baU +aEJ +baW +aHo +aHJ baW -bcc -bco baW -bby bcT baz baz -bdU +aIQ beu beO -bfs +bfP bfP baz baz bhS baU -biQ +aMe bjr bjs bjs @@ -46034,15 +44579,15 @@ aeX aeX aeX auA -avu +anG avW awG axg ajE ayz ayV -azy -aAg +ayV +aoS aAC aBh aBK @@ -46051,7 +44596,7 @@ aDt aEd aEE aFj -aFU +apk aGy aGy aGy @@ -46066,9 +44611,9 @@ aKZ azg aNc aND -aOv +asp aPf -aPV +atf aQI aRs aRS @@ -46093,27 +44638,27 @@ bbI aVP aVP baW -bby +baW bcU baz bdH -bdV +aJe bev beP -baV baU -bgu +baU +aKa baz bhT -baV +baU biR bjr bjs bjs bjs baz -bby -bly +baW +aNW baz adt adt @@ -46175,13 +44720,13 @@ aqR arM aeX aeX -auB -avu +amY +anG avX awH -axh +anZ ajE -ayA +aoN ayW ayW ayW @@ -46192,8 +44737,8 @@ aCy ayW aEe aEF -aFk -aFV +aph +apl aGy aGy aGy @@ -46235,18 +44780,18 @@ bbJ bcd aVP baW -bby +baW bcV baz bdI -bdV -baV +aJe baU baU -bfQ -bgv +baU +beQ +aKK baz -baV +baU baU biS bjr @@ -46254,8 +44799,8 @@ bjs bjs bjs baz -bby -blz +baW +aNX baz adt adt @@ -46317,11 +44862,11 @@ aqS arN aeX aeX -auC +amZ avv avX -awI -axi +awH +aoa ajE ayB ayW @@ -46332,10 +44877,10 @@ azz aBM aCz ayW -aEf -aEG +apb +ape aFl -aEg +aEc aGz aGy aGy @@ -46380,24 +44925,24 @@ baU baW bcT baz -bdJ -bdV -bew +aIK +aJe +aJp beQ -bea +aIg baU bgw baz bhU -bir -biQ +aLF +aMe bjr bjs bjs bjs baz -bby -blA +baW +aOu baz adt adt @@ -46459,11 +45004,11 @@ aqT arO aeX aeX -auD +ana avw avY awJ -axi +aoa ajE ayB ayW @@ -46474,10 +45019,10 @@ azz aBN aCA ayW -aEg -aEH +aEc +aFh aFm -aEg +aEc aGA aGw aGw @@ -46485,7 +45030,7 @@ aGw aGw aGw aJr -aEg +aEc aKr aLc ayd @@ -46518,8 +45063,8 @@ aXB bbK bbJ aVP -baV -bcF +baU +bbf baz baz baz @@ -46527,7 +45072,7 @@ bdW bex beR bft -baV +baU baz baz baz @@ -46539,7 +45084,7 @@ baz baz baz bbf -bby +baW baz adt adt @@ -46601,13 +45146,13 @@ aqU aqU aeX aeX -auE +anb avx avY awK axj ajE -ayC +ayB ayW ayW ayW @@ -46616,18 +45161,18 @@ aBj aBO aCB ayW -aEh -aEH -aFn -aFW -aGB -aFo -aHn -aFo -aFo -aFo -aGC -aEg +aGz +aFh +api +apm +aqg +apj +aqj +apj +apj +apj +aLH +aEc avD aLd ayd @@ -46660,8 +45205,8 @@ aXB bbA bce aVP -baV -bby +baU +baW baW baW baz @@ -46669,7 +45214,7 @@ baz baz baz baz -bea +aIg baz bfR bfR @@ -46679,7 +45224,7 @@ bjs bjs bjs bjs -baV +baU baW baW baz @@ -46722,8 +45267,8 @@ aab aab aab aab -aab -aab +aac +aac aab aab ael @@ -46743,13 +45288,13 @@ aqU arP aeX aeX -auF +anc avx avY ajE ajE ajE -ayD +aoO ayW azA ayW @@ -46758,11 +45303,11 @@ aBk aBP aCC ayW -aEg -aEI -aFo -aFX -aGC +aEc +apf +apj +apU +aLH aGw aGw avD @@ -46804,14 +45349,14 @@ bbJ aVP baU baW -bby -bby +baW +baW bdK -bdX -bdX +aJg +aJg beS baz -baV +baU baz bfR bfR @@ -46821,8 +45366,8 @@ bjs bjs bjs bjs -baV -bby +baU +baW baW baz adt @@ -46885,7 +45430,7 @@ aeX aeX aeX aeX -auG +and avy avZ awL @@ -46900,14 +45445,14 @@ aBl aBQ aCD aDu -aEg -aEJ -aEg -aFR -aEg +aEc +apg +aEc +aFl +aEc aGw -aHo -aHJ +aqk +aqo avD awd avD @@ -46947,10 +45492,10 @@ aVP bcr baW baW -bby -bby -bby -bby +baW +baW +baW +baW beT baz baU @@ -47027,7 +45572,7 @@ aeX aeX aeX aeX -auH +anz avz awa avD @@ -47095,7 +45640,7 @@ baz baz baz baz -baV +baU bgx bhd bhd @@ -47104,8 +45649,8 @@ bhd bgx bjI bhW -bjK -biT +bjI +bhh bjI bgx adt @@ -47163,13 +45708,13 @@ ako alB aeX aeX -aoG +aau apT apT bpO asM atU -auI +anB avA awb avD @@ -47228,25 +45773,25 @@ aXB bbA bbJ aVP -bcs -bby +bcr +baW bcW baz bdL bdY -bea +aIg baU bfu baU bgx -bhe -bhe bhW -biT +bhW +bhW +bhh bjt bjJ -biT -bhe +bhh +bhW bhW bhW bgx @@ -47370,23 +45915,23 @@ aXB bbA bcf aVP -bct -bby +bcu +baW bcX baz -baV -baV -bew +baU +baU +aJp beU baz baz bgx bhf bhV -bit +bhV biU bgx -bjK +bjI bhW bjI bhW @@ -47513,25 +46058,25 @@ bbA bbJ aVP bcu -bby +baW bcY baz -bdM +aIL bdZ bey beV baz bfR bgx -bhg +bjJ bhh bhW biV bgx bhW bhW -biT -biT +bhh +bhh bhW bgx adt @@ -47655,13 +46200,13 @@ bbA bbJ aVP bcu -bby +baW bcG bcR -baV -bea +baU +aIg bez -baV +baU baz bfR bgx @@ -47672,7 +46217,7 @@ biW bju bjL bjL -bit +bhV bjL bkX bgx @@ -47777,7 +46322,7 @@ aNk aRx aSe aSS -aTR +auE aUD aSd aWe @@ -47797,11 +46342,11 @@ bbA bbJ aVP bcv -bby +baW bcZ baz -bdN -baV +aIM +baU baU baU baz @@ -47813,8 +46358,8 @@ biu biX bgx bhW -bhe -bky +bhW +aMO bhW bhh bgx @@ -47920,7 +46465,7 @@ aRx aSf aST aTS -aUE +avE aSd aWf aWZ @@ -47938,8 +46483,8 @@ aXB bbA bbJ aVP -bct -bcH +bcu +aIh baz baz baz @@ -48060,7 +46605,7 @@ aQg aQT aRx aSe -aSU +aSS aTT aUF aSd @@ -48080,8 +46625,8 @@ aXB bbA bbJ aVP -bcw -bcI +aIe +bcG baz bdo aLX @@ -48202,7 +46747,7 @@ aQh aQU aRx aSe -aSU +aSS aTU aUG aSd @@ -48223,7 +46768,7 @@ bbL bbJ aVP bcx -bcJ +aIk baA bdp bdO @@ -48303,8 +46848,8 @@ ajG ajG ajG ajE -atX -aga +amR +amU ajE avD avD @@ -48343,10 +46888,10 @@ aPr aQi aQV aRx -aSg +att aSV aTV -aUH +awe aSd aWg aXb @@ -48571,7 +47116,7 @@ aad aah aam aap -aau +aaz aaz aaz aaE @@ -48658,7 +47203,7 @@ adt adt bfw bfV -bgC +aKX bhn bfw adt @@ -48729,8 +47274,8 @@ amL akv ajG ajE -vlQ -aga +amS +amU ajE aac aac @@ -48771,8 +47316,8 @@ aQW aRx aSi aSX -aTX -aUI +auF +awf aVq aWj aXe @@ -48781,12 +47326,12 @@ aYs aYR aZq aZr -bah -aPx +bcK +aLX aLX aLY bbl -bbC +aFX bbM bcg aLY @@ -48873,7 +47418,7 @@ ajG tpu kPb tpu -oXI +awH aac adt avD @@ -48911,26 +47456,26 @@ aNj aNj aNj aRx -aSj +atu +aSY +auG aSY -aTY -aUJ aVr aWk aXf aXL -aYt -aYS -aYu -aYu -bai +ayL +ayX +aZr +aZr +aTo aLX aLX aLY bbm -bbD -aYu -aYu +bbM +aZr +aZr aLY adt adt @@ -49012,10 +47557,10 @@ fIS amL apY ajG -arR -asU +amN +amT tHa -foy +amV atY atY avD @@ -49053,26 +47598,26 @@ adt adt adt aRy -aSk -aSZ +aTZ +atB aTZ aTZ aVp aWl aXg aVP -aYu -aYT +aZr +ayY aZr aZr baj aLX -baE +aCZ aLY -aYu aZr -bbN -bch +aZr +aGx +aHF aLY adt adt @@ -49156,10 +47701,10 @@ apZ ajG arS asV -atZ -auO -auO -awe +amV +anD +anD +anO avD axy ayf @@ -49298,10 +47843,10 @@ aqa ajG arS asW -atZ -auO -auO -auO +amV +anD +anD +anD avD axz ahH @@ -49351,11 +47896,11 @@ aZs aZQ aNo aLX -baG +baK aLY bbn aZr -bbO +aGB bci aLY adt @@ -49364,7 +47909,7 @@ aLY bdw aLX bef -beD +aJA beZ bfx bfZ @@ -49440,10 +47985,10 @@ akr aqX arT asX -aua -auP -avE -auO +amW +anE +anL +anD avD axA ahI @@ -49456,7 +48001,7 @@ aBr aze aCP aDG -aEj +apd aER aFu aGi @@ -49493,10 +48038,10 @@ aZt aZR aNo bau -baG +baK aLY bbo -aYu +aZr aZr aZr aLY @@ -49510,7 +48055,7 @@ beE bfa bfy bga -bgI +bgG bgc bhY biw @@ -49585,7 +48130,7 @@ asY aub auQ avF -awf +anP avD axB ayh @@ -49635,12 +48180,12 @@ aZs aZS aNo aLX -baG +baK baY aZr -bbD -bbP -aYu +bbM +aGC +aZr aLY adt adt @@ -49727,7 +48272,7 @@ asZ arS auR asV -awg +anS avD axC ayi @@ -49776,13 +48321,13 @@ aYY aZu aZu aNo -aPx -baH +aLX +aEf aLY -bbp +aFR +aZr +aZr aZr -aYu -aYu aLY aLY aLY @@ -49862,7 +48407,7 @@ any akq akq akq -boD +akq akq akq akq @@ -49918,8 +48463,8 @@ aUc aZs aZs aNo -aPx -baI +aLX +aEg aLY aLY aLY @@ -49994,7 +48539,7 @@ abz abz abz abz -agf +abz aaW aam aiM @@ -50004,7 +48549,7 @@ abd aoK aqd asP -boD +akq boZ bpi bpI @@ -50060,25 +48605,25 @@ aUc aZv aZv aNo -aPx -aPx -baZ aLX -aPx -aPx aLX baZ aLX -bcL +aLX +aLX +aLX +baZ +aLX +aIl bdb bdA aLY adt adt bfc -bfB +aJY bgd -bgM +aLp bhu bgT biy @@ -50183,8 +48728,8 @@ ayd ayd aMG avD -aNW -aOJ +asm +asx adt adt adt @@ -50205,15 +48750,15 @@ aNo aLX baJ aLY -bbq +aFS bbE bbQ -bcj +aHH aLY aOa -aPB -bdc -bdB +bcM +bdb +aIo aLY adt beF @@ -50308,11 +48853,11 @@ aBv ayl aCT aDK -ayl +aGp aET aFy aGm -aGO +aHh aHh aHy aHQ @@ -50325,9 +48870,9 @@ ayl ayl aMI avD -aNX -aOK -aPv +asn +asO +asU adt adt adt @@ -50344,7 +48889,7 @@ aUc adt aLY bak -aPx +aLX baK aLY aLY @@ -50354,8 +48899,8 @@ aLY aLY aLX bcM -bdc -bdB +bdb +aIo aLY adt beF @@ -50453,9 +48998,9 @@ avD avD aEU aFz -avD -avD -avD +aDP +aGo +aGo aDP aHR aFG @@ -50486,8 +49031,8 @@ aUc adt aLY bal -aPx -baL +aLX +aEh aLY adt adt @@ -50496,8 +49041,8 @@ adt aLY aLX bcM -bdc -bdC +bdb +aIq aLY adt beF @@ -50580,7 +49125,7 @@ akq auX asV atY -awR +anW axH aym aym @@ -50595,9 +49140,9 @@ aCU aEm ard aFA -aGn -aGP +aDP aGP +aqi aDP aHS aIx @@ -50628,7 +49173,7 @@ aUc adt aLY bam -aPx +aLX baK aLY adt @@ -50714,15 +49259,15 @@ aar aiK aiK akH -akR -akR -akR -akR +aiK +aiK +aiK +aiK aiK auX asV atY -awR +anW axI aym aym @@ -50732,15 +49277,15 @@ ard aAS ard aCa -ato -ato +aoZ +aoZ aEn ard aFA aGo -aGP -aGP -aDP +lOO +tPB +aGo aHT aIy aIZ @@ -50752,13 +49297,13 @@ aLT aMK aJv aNZ -aOM -aOM +mWq +mWq aQm aLY -aRB +atr aSn -aTi +atC aUc aUQ aVy @@ -50864,9 +49409,9 @@ aiK auX asV atY -awR -awR -ayn +anW +anW +aoc aym aym aym @@ -50874,13 +49419,13 @@ ard aAT ard aCb -aCV -aCV +aGR +aGR aEo aEV aFB -aGp -aGP +aDP +djo aHi aDP aHU @@ -50893,14 +49438,14 @@ aLn aJU aJU aJv -aOa -aLX -aPx -aPx +wqU +qpA +dSO +tED aLY aRC -aPB -aTj +bcM +atW aUc aUc aVz @@ -50912,15 +49457,15 @@ aLY aLY aLY aLY -bav +aCY aLY aLY bbr aLY aLY aLY -bcp -bcz +aId +aIf baY aZr bdy @@ -51008,7 +49553,7 @@ avJ ard ard ard -ayo +ard ayP ard ard @@ -51016,15 +49561,15 @@ ard aAU ard aCc -aCV -aCV +aGR +aGR aEp ard aFC aGo -aGP -aGP -aDP +tPB +tPB +pah aHV aIA aGR @@ -51035,30 +49580,30 @@ aKF aLU aML aJv -aLX +aRC aON -aLX -aPx +tuO +pLH aLY aRD -aPB -aTk -aUd +bcM +atX +auH aUR aVA aWu -aXl +aSo aXT -aXl -aXl -aXl -aXl -aXl -aXl -baM -baM -baM -aXl +aSo +aSo +aSo +aSo +aSo +aSo +aSo +aSo +aSo +aSo bbR aLY aLY @@ -51148,12 +49693,12 @@ aiK auY avJ awl -awS -axJ -axJ +anX +ayQ +ayQ ayQ azi -azT +aoR ard aAS ard @@ -51163,11 +49708,11 @@ aDL aEq ard aFC -aGn -aGP -aGP aDP -aHV +aqh +lOO +aDP +sVf aIA aGR aJw @@ -51177,16 +49722,16 @@ aLo aLV aMM aJv -aLX -aLX +voE +aON aPy aLY aLY aRE -aPB +bcM aTl -aUe -aUS +auI +awg aVB aLX aLX @@ -51198,14 +49743,14 @@ aLY aLY baw baN -aPx -bbs +aLX +bcN aLX bbS -aXl -aXl -aXl -aXl +aSo +aSo +aSo +aSo bde bdE aLY @@ -51273,7 +49818,7 @@ adp aec afb afX -abv +abq agN akN abC @@ -51300,16 +49845,16 @@ ard aAV ard ard -aCX +aGr aDM ard ard aFD aDP +aGo +aGo aDP -aDP -aDP -aHV +dXv aIA aGR aJv @@ -51325,10 +49870,10 @@ aLY aLY aQZ aRF -aOM -aTm -aUf -aUS +atv +atZ +auK +awg aVC aWv aPC @@ -51441,8 +49986,8 @@ azV azV aAW aBw -aCe -aCY +aoY +aDN aDN aEr aEW @@ -51462,18 +50007,18 @@ aLW aMN aMN aMN -aMN +vTb aMN aQn aRa aRG aSo -aTn -aUg -aUT +aua +auO +awq aVD -aWw -aXm +axN +aPC aLY adt adt @@ -51556,7 +50101,7 @@ adm adT aeB afk -afX +acC acI agQ akP @@ -51581,13 +50126,13 @@ axK azl avL avL -aAX -aBx -aCf -aCZ +avL +aoX +apa +aDO +aDO +aDO aDO -aCZ -aCZ aFF aGr aGR @@ -51614,8 +50159,8 @@ aTo aLX aLX aLX -aWx -aXn +axX +ayg aLY adt adt @@ -51722,15 +50267,15 @@ ayr axM azm azW -aAu +aoU avL -avb +agf ard aDa -aDP -aDQ -aDQ -aFG +aCV +ard +ard +boD aDP aGR aGR @@ -51857,20 +50402,20 @@ amb aiK avb avL -awq +anU awX -axN ays ays -axN +ays +ays ays aAv avL -avb +qDE ard -ato +aoZ aDQ -aEs +ard aEX aFH aDP @@ -52011,11 +50556,11 @@ avL avb ard aDb +aCX +ard +aEY +mUP aDP -aEt -aEY -aEY -aGs aGT aHj aHA @@ -52153,10 +50698,10 @@ avM aBy ard aDc -aDP +aEt aEu aEZ -aEs +llG aDP aGU aHk @@ -52175,7 +50720,7 @@ aLY aOP aPz aQp -aRe +ati aRC aOP aLY @@ -52295,11 +50840,11 @@ aAY ard ard aDd -aDP +aGn aEs aFa aFI -aDQ +aDP aGT aHl aHB @@ -52315,10 +50860,10 @@ aDP adt aLY aOP -aPA +aPC aQp -aRf -aRJ +atj +aRC aOP aLY adt @@ -52415,7 +50960,7 @@ adi ahN ajC ahN -aoZ +ahN ahN ahN ahN @@ -52437,10 +50982,10 @@ ato ard ard ard -aDP -aDP -aDQ -aDP +ard +ard +ard +ard aDP aGS aGT @@ -52457,10 +51002,10 @@ adt adt aLY aOQ -aPB -aQq -aQq -aPB +bcM +atg +atg +bcM aSq aLY adt @@ -52557,7 +51102,7 @@ ajA akL abb anT -aoZ +ahN arc ath boL @@ -52599,10 +51144,10 @@ aMc adt aLY aOP -aPA +aPC aQr aQr -aRJ +aRC aOP aLY adt @@ -52610,9 +51155,9 @@ adt adt adt adt -adt -adt -adt +abn +abn +abn adt adt adt @@ -52743,24 +51288,24 @@ aLY aOP aPC aQs -aRg -aRJ +aQs +aRC aOP aLY adt adt adt adt -adt -aab -aab -aab -aab -aab -aab -aab -aab -aab +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn aab adt adt @@ -52845,7 +51390,7 @@ ahN abh auL ahN -ard +ahN asi ato ato @@ -52894,13 +51439,13 @@ adt adt adt adt +abn +abn +abn aab aab -aab -aab -aab -aab -aab +abn +abn aab aab aab @@ -52987,7 +51532,7 @@ ahN abh auL boL -ard +ahN asj atp auf @@ -52997,9 +51542,9 @@ awv ard aab aab -aab -aab -aab +abn +abn +abn ard aBa aBz @@ -53025,19 +51570,19 @@ abn abn abn abn -aeG abn abn abn -aeG -aeG -aeG -aab -aab -aab -aab -aab -aab +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn aab aab aab @@ -53129,7 +51674,7 @@ ahN asb auM boP -ard +ahN ard atq atq @@ -53140,10 +51685,10 @@ ard aab aab aab -aab -aab -aab -aab +abn +abn +abn +abn aBz aCk aDh @@ -53153,32 +51698,32 @@ aFd aFM aBz abn -aeG +abn aHD -aeG -aeG -aeG -aeG -aeG -aeG abn abn abn -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aab -aab -aab -aab -aab +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn aab aab aab @@ -53267,13 +51812,11 @@ ahN ahN ahN ahN -aoZ -aoZ -aoZ -aoZ -aac -aab -aab +ahN +ahN +ahN +ahN +ahN aab aab aab @@ -53286,6 +51829,8 @@ aab aab aab aab +abn +abn aBz aCl aDi @@ -53294,32 +51839,32 @@ aEw aFe aFN aBz -aab -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aab -aab -aab -aab +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn aab aab aab @@ -53427,7 +51972,7 @@ aab aab aab aab -aab +abn aBz aBz aBz @@ -53436,31 +51981,31 @@ aBz aBz aBz aBz -aab -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aab -aab -aab +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +aac +aac +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn aab aab aab @@ -53569,39 +52114,39 @@ aab aab aab aab -aab -aab -aab +abn +abn +abn adt adt adt -aab -aab -aab -aab -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aab -aab +abn +abn +abn +abn +abn +abn +abn +abn +aac +aac +abn +abn +abn +abn +abn +aac +aac +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn aab aab aab @@ -53712,37 +52257,37 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab +abn +abn +abn +abn aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aab +abn +abn +abn +abn +abn +abn +abn +abn +aac +aac +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn aab aab aab @@ -53855,36 +52400,36 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab +abn +abn +abn aeG aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aab +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn aab aab aab @@ -53998,35 +52543,35 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab +abn +abn aeG aeG aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aab +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn aab aab aab @@ -54141,33 +52686,33 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG +abn aeG aeG aeG aeG aeG +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn aeG +abn +abn +abn aab aab aab @@ -54283,27 +52828,27 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab +abn +aeG +aeG +aeG +aeG +aeG aac aac -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn +abn aeG aeG aeG @@ -54425,25 +52970,25 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab +abn +aeG +aeG +aeG +aeG +aeG aac aac +abn +abn +abn +abn +abn +abn +abn +abn aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG -aeG +abn +abn aeG aeG aeG @@ -54567,33 +53112,33 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab +abn +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +abn +abn +abn +abn +abn +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG aab aab aab @@ -54710,32 +53255,32 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +abn +abn +abn +abn +aeG +abn +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG aab aab aab @@ -54852,32 +53397,32 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG aab aab aab @@ -54994,32 +53539,32 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG +aeG aab aab aab diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index ef0c541ff78..f30a7570b25 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -204,13 +204,14 @@ name = "\improper North Medical Stairwell" }) "aas" = ( -/obj/structure/railing, -/obj/structure/railing{ - icon_state = "railing0"; - dir = 4 - }, -/turf/simulated/open/virgo3b, -/area/tether/surfacebase/outside/outside3) +/obj/structure/table/rack, +/obj/random/maintenance/medical, +/obj/random/maintenance/clean, +/obj/random/medical/lite, +/obj/random/maintenance/medical, +/obj/random/toy, +/turf/simulated/floor/plating, +/area/maintenance/lower/medsec_maintenance) "aat" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -558,8 +559,7 @@ /obj/item/clothing/suit/straight_jacket, /obj/item/clothing/mask/muzzle, /obj/machinery/status_display{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) @@ -650,9 +650,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, @@ -716,24 +714,19 @@ "abd" = ( /obj/structure/railing, /obj/structure/railing{ - icon_state = "railing0"; dir = 4 }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) "abe" = ( -/obj/machinery/camera/network/medbay, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppernorthstairwell{ - name = "\improper North Medical Stairwell" - }) +/obj/structure/closet, +/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla, +/turf/simulated/floor/plating, +/area/maintenance/lower/medsec_maintenance) "abf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -792,6 +785,9 @@ /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 4 }, +/obj/structure/sign/poster{ + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "abj" = ( @@ -801,9 +797,7 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, @@ -945,8 +939,7 @@ dir = 4 }, /obj/machinery/camera/network/medbay{ - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) @@ -955,8 +948,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -967,8 +959,7 @@ /area/tether/surfacebase/medical/triage) "abx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/structure/window/reinforced{ dir = 4 @@ -1035,9 +1026,7 @@ /obj/machinery/light, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 2 - }, +/obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/red/bordercorner2, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) @@ -1162,15 +1151,13 @@ dir = 4 }, /obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j1" + dir = 4 }, /obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /obj/structure/cable/green{ d1 = 4; @@ -1249,7 +1236,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "abS" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/item/weapon/reagent_containers/food/drinks/cup{ + desc = "Taste liberty"; + name = "Cup of Liber-tea" + }, /turf/simulated/floor/plating, /area/maintenance/lower/medsec_maintenance) "abT" = ( @@ -1457,8 +1448,7 @@ }, /obj/machinery/light_switch{ dir = 4; - pixel_x = -25; - pixel_y = 0 + pixel_x = -25 }, /obj/effect/floor_decal/borderfloorwhite/corner2{ dir = 8 @@ -1670,8 +1660,7 @@ pixel_y = -4 }, /obj/machinery/camera/network/medbay{ - dir = 8; - icon_state = "camera" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -1684,6 +1673,10 @@ name = "east bump"; pixel_x = 28 }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "acy" = ( @@ -1766,8 +1759,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) @@ -1817,8 +1809,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) @@ -1839,14 +1830,7 @@ name = "\improper North Medical Stairwell" }) "acN" = ( -/obj/machinery/camera/network/medbay{ - dir = 10 - }, /obj/structure/railing, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24 - }, /turf/simulated/open, /area/tether/surfacebase/medical/uppernorthstairwell{ name = "\improper North Medical Stairwell" @@ -1862,9 +1846,11 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 + }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -2020,12 +2006,14 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 9 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/vitals_monitor, /obj/machinery/vitals_monitor, /obj/machinery/light, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "adb" = ( @@ -2049,13 +2037,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "ade" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, @@ -2107,8 +2103,7 @@ "adh" = ( /obj/machinery/papershredder, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -2126,11 +2121,21 @@ /area/tether/surfacebase/security/iaa/officecommon) "adi" = ( /obj/machinery/door/airlock/glass_security{ - name = "Front Desk"; - req_access = list(63); - req_one_access = list(63) + id_tag = "BrigFoyer"; + layer = 2.8; + name = "Security"; + req_one_access = list(38,63) }, /obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "adj" = ( @@ -2146,8 +2151,7 @@ icon_state = "pipe-c" }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 @@ -2167,12 +2171,10 @@ pixel_y = 7 }, /obj/effect/floor_decal/spline/plain{ - dir = 8; - icon_state = "spline_plain" + dir = 8 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/landmark/start{ name = "Internal Affairs Agent" @@ -2184,8 +2186,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) @@ -2240,8 +2241,7 @@ }, /obj/machinery/recharger, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -2252,22 +2252,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "adp" = ( -/obj/machinery/alarm{ - pixel_y = 22 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" - }, -/obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 +/obj/effect/floor_decal/corner/red/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) @@ -2277,8 +2269,7 @@ "adr" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -2309,11 +2300,24 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "adt" = ( -/obj/structure/closet, -/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/vacant/vacant_shop) "adu" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -2332,6 +2336,8 @@ pixel_x = -28 }, /obj/structure/cable/green{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/tiled/white, @@ -2448,7 +2454,7 @@ dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/machinery/button/windowtint/doortint{ +/obj/machinery/button/windowtint/multitint{ id = "medbayfoyer"; pixel_x = -8; pixel_y = -24 @@ -2554,11 +2560,15 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "adL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table/steel, +/obj/random/tech_supply, +/obj/effect/floor_decal/rust, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) +/area/rnd/research_storage) "adM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -2569,11 +2579,6 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -30; - pixel_y = -24 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, @@ -2587,9 +2592,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "adN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -2645,24 +2648,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "adT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/camera/network/security{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/bordercorner{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "adU" = ( @@ -2675,8 +2669,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) @@ -2697,8 +2690,7 @@ pixel_y = 1 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -2719,18 +2711,15 @@ /turf/simulated/wall, /area/tether/surfacebase/security/processing) "adX" = ( -/obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start{ - name = "Security Officer" - }, /obj/machinery/camera/network/security, -/obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) @@ -2796,27 +2785,25 @@ pixel_x = -10; pixel_y = -30 }, +/obj/machinery/camera/network/medbay{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppernorthstairwell{ name = "\improper North Medical Stairwell" }) "aef" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/computer/security{ - dir = 8 - }, /obj/machinery/light{ dir = 1 }, -/obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) @@ -2830,6 +2817,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "aeh" = ( @@ -2933,11 +2925,14 @@ /obj/machinery/firealarm{ pixel_y = 26 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/effect/floor_decal/borderfloor{ - dir = 9 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ - dir = 9 + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) @@ -2978,21 +2973,20 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "aet" = ( @@ -3006,15 +3000,35 @@ /obj/effect/floor_decal/corner/red/border{ dir = 5 }, +/obj/structure/closet/walllocker_double{ + dir = 4; + pixel_x = 28 + }, +/obj/item/device/flash, +/obj/item/device/flash, +/obj/random/drinkbottle, +/obj/item/device/camera_film, +/obj/item/device/tape/random, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa/officecommon) "aeu" = ( -/obj/structure/railing{ - dir = 4; - icon_state = "railing0" +/obj/machinery/atmospherics/pipe/zpipe/up, +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, +/obj/machinery/atmospherics/pipe/zpipe/up/supply, +/obj/machinery/light/small{ + dir = 4 }, -/turf/simulated/open/virgo3b, -/area/tether/surfacebase/outside/outside3) +/obj/structure/cable{ + icon_state = "16-0" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/disposalpipe/up{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/rnd/research_storage) "aev" = ( /obj/structure/cable/green{ d1 = 1; @@ -3112,7 +3126,6 @@ req_one_access = list(5) }, /obj/machinery/door/firedoor/multi_tile{ - icon_state = "door_open"; dir = 2 }, /turf/simulated/floor/tiled/white, @@ -3201,35 +3214,31 @@ /area/tether/surfacebase/surface_three_hall) "aeI" = ( /obj/structure/table/bench/steel, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, /obj/effect/floor_decal/borderfloor{ dir = 5 }, /obj/effect/floor_decal/corner/red/border{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "aeJ" = ( /turf/simulated/wall, /area/tether/surfacebase/security/lobby) "aeK" = ( -/obj/machinery/door/window/brigdoor/eastleft{ - dir = 2; - req_access = list(63) +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" - }, -/obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/rnd/research_storage) "aeL" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -3241,7 +3250,6 @@ "aeM" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite, @@ -3270,8 +3278,7 @@ /obj/structure/disposalpipe/trunk, /obj/machinery/disposal, /obj/machinery/camera/network/medbay{ - dir = 8; - icon_state = "camera" + dir = 8 }, /obj/item/device/radio/intercom{ dir = 4; @@ -3314,8 +3321,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 4; - icon_state = "warningcorner" + dir = 4 }, /obj/machinery/camera/network/medbay{ dir = 4 @@ -3337,14 +3343,10 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks{ - pixel_y = 0 - }, +/obj/item/weapon/storage/box/masks, /obj/machinery/alarm{ dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -3468,13 +3470,8 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, -/obj/machinery/button/windowtint{ - id = "surfsurgery2"; - pixel_x = -26 - }, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -3586,24 +3583,19 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "afm" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced, -/obj/machinery/button/remote/airlock{ - id = "BrigFoyer"; - name = "Brig Foyer"; - pixel_x = -6; - pixel_y = 0; - req_access = list(1) +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "afn" = ( @@ -3671,27 +3663,37 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "afs" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced, -/obj/machinery/door/window/brigdoor/eastleft{ - req_access = list(63) +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "aft" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, -/obj/effect/floor_decal/corner/red/border{ +/obj/effect/floor_decal/corner/red/bordercorner{ dir = 8 }, /turf/simulated/floor/tiled, @@ -3726,24 +3728,32 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "afw" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/red/bordercorner, -/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "afx" = ( @@ -3787,6 +3797,16 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 6; + pixel_y = -22 + }, +/obj/machinery/button/windowtint{ + id = "surfsurgery2"; + pixel_x = -3; + pixel_y = -22 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) "afB" = ( @@ -3841,9 +3861,7 @@ }, /obj/structure/table/glass, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -3853,7 +3871,6 @@ }, /obj/structure/extinguisher_cabinet{ dir = 4; - icon_state = "extinguisher_closed"; pixel_x = -30 }, /turf/simulated/floor/tiled/white, @@ -3912,9 +3929,6 @@ /obj/machinery/atmospherics/unary/freezer{ dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 25 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, @@ -3924,11 +3938,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_x = 0; - pixel_y = 39 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "afI" = ( @@ -3961,22 +3970,8 @@ /turf/simulated/wall, /area/rnd/staircase/thirdfloor) "afL" = ( -/obj/machinery/atmospherics/pipe/zpipe/up, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, -/obj/machinery/atmospherics/pipe/zpipe/up/supply, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "16-0" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/up{ - dir = 8 - }, +/obj/effect/floor_decal/rust, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/rnd/research_storage) "afM" = ( @@ -4024,6 +4019,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "afS" = ( @@ -4052,30 +4048,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) "afV" = ( -/obj/machinery/door/airlock/glass_security{ - id_tag = "BrigFoyer"; - layer = 2.8; - name = "Security"; - req_one_access = list(38,63) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/effect/floor_decal/rust, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 1; + icon_state = "pipe-c" }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/lobby) +/turf/simulated/floor/plating, +/area/rnd/research_storage) "afW" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -4244,8 +4223,7 @@ /area/tether/surfacebase/medical/admin) "agj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -4292,8 +4270,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) @@ -4315,9 +4292,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/firealarm{ dir = 8; @@ -4405,13 +4380,13 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/surface_three_hall) "agy" = ( -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/disposalpipe/segment, +/obj/structure/table/steel, +/obj/item/weapon/storage/bag/circuits/basic, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/rnd/research_storage) @@ -4481,14 +4456,6 @@ /turf/simulated/open, /area/rnd/research_storage) "agD" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/table/steel, -/obj/item/weapon/storage/bag/circuits/basic, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/rnd/research_storage) @@ -4527,23 +4494,17 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "agG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ +/obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 +/obj/effect/floor_decal/corner/red{ + dir = 6 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/computer/secure_data{ + pixel_y = -4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) @@ -4655,19 +4616,20 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa/officecommon) "agP" = ( +/obj/structure/table/reinforced, +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/door/window/brigdoor/eastright{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 + dir = 5 }, +/obj/machinery/recharger, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "agQ" = ( @@ -4700,40 +4662,34 @@ /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "agT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ +/obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 +/obj/effect/floor_decal/corner/red{ + dir = 6 }, +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/item/weapon/storage/box/donut, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "agU" = ( /obj/effect/landmark{ name = "lightsout" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/hologram/holopad, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/bordercorner{ - dir = 1 +/obj/effect/floor_decal/corner/red/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) @@ -4743,14 +4699,10 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) @@ -4759,13 +4711,16 @@ dir = 8; pixel_x = -26 }, -/obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/red/border{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "agX" = ( @@ -4818,10 +4773,13 @@ name = "Medical Storage"; sortType = "Medical Storage" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "ahc" = ( @@ -4865,7 +4823,6 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "ahg" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, /obj/structure/railing, /obj/structure/disposalpipe/segment, @@ -4916,7 +4873,6 @@ name = "west bump"; pixel_x = -28 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/rnd/research_storage) "ahl" = ( @@ -4934,30 +4890,31 @@ /area/tether/surfacebase/surface_three_hall) "ahm" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/rnd/research_storage) "ahn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/rnd/research_storage) +"aho" = ( /obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/rnd/research_storage) -"aho" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/rnd/research_storage) "ahp" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -5004,10 +4961,6 @@ /area/crew_quarters/panic_shelter) "ahu" = ( /obj/structure/table/bench/steel, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -5020,6 +4973,10 @@ /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 5 }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "ahv" = ( @@ -5053,47 +5010,47 @@ name = "Security"; req_one_access = list(38,63) }, +/obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "ahx" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, -/obj/effect/floor_decal/steeldecal/steel_decals4{ +/obj/effect/floor_decal/corner/red{ dir = 6 }, +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "ahy" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/bed/chair/office/dark, +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/obj/effect/landmark/start{ + name = "Security Officer" }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "ahz" = ( @@ -5102,17 +5059,18 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "ahA" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/computer/security{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "ahB" = ( @@ -5137,11 +5095,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ahC" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/cable/green{ d1 = 1; d2 = 4; @@ -5149,10 +5102,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "ahD" = ( @@ -5220,8 +5169,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5236,22 +5184,20 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/security/lobby) "ahI" = ( -/obj/machinery/door/window/brigdoor/eastleft{ - dir = 1; - req_access = list(63) - }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22; - pixel_y = 0 +/obj/effect/floor_decal/corner/red{ + dir = 6 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 9 }, -/obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) @@ -5261,12 +5207,24 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/structure/disposalpipe/junction, /obj/machinery/hologram/holopad, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "ahK" = ( @@ -5341,9 +5299,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "ahQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -5351,6 +5307,11 @@ dir = 2; icon_state = "pipe-c" }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "ahR" = ( @@ -5387,26 +5348,31 @@ /area/rnd/workshop) "ahV" = ( /obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/button/remote/airlock{ id = "BrigFoyer"; name = "Brig Foyer"; pixel_x = -6; - pixel_y = 0; req_access = list(1) }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/weapon/paper_bin{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/item/weapon/pen/blue{ + pixel_x = 5; + pixel_y = 5 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) @@ -5424,22 +5390,24 @@ /area/tether/surfacebase/medical/lobby) "ahX" = ( /obj/structure/table/reinforced, +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/door/window/brigdoor/eastleft{ - req_access = list(63) +/obj/structure/window/reinforced, +/obj/machinery/door/window/brigdoor/eastright{ + dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/door/window/westleft{ + dir = 4 }, -/obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" - }, -/obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) @@ -5466,7 +5434,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "aia" = ( @@ -5537,7 +5508,6 @@ /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -5547,8 +5517,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -5563,9 +5532,7 @@ }, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -5771,27 +5738,22 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "aiz" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/firealarm{ +/obj/structure/disposalpipe/segment{ dir = 8; - pixel_x = -24 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/machinery/vending/assist{ - dir = 4 + icon_state = "pipe-c" }, /turf/simulated/floor/plating, /area/rnd/research_storage) "aiA" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/effect/floor_decal/rust, +/obj/machinery/vending/assist{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/rnd/research_storage) "aiB" = ( @@ -5915,12 +5877,10 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -5951,12 +5911,10 @@ name = "Security Officer" }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) @@ -5979,29 +5937,23 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 2 - }, +/obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/red/bordercorner2, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aiP" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 2; d2 = 8; - icon_state = "2-8" + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aiQ" = ( @@ -6013,12 +5965,10 @@ }, /obj/machinery/light, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) @@ -6065,6 +6015,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/item/weapon/book/manual/security_space_law, +/obj/item/weapon/book/manual/security_space_law, /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/security/lobby) "aiV" = ( @@ -6410,15 +6362,12 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "ajy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/table/steel, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/item/device/gps/science, /turf/simulated/floor/plating, /area/rnd/research_storage) "ajz" = ( @@ -6535,14 +6484,13 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "ajI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/up{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/railing{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, +/obj/structure/table/steel, +/obj/effect/floor_decal/rust, +/obj/item/device/gps/science, /turf/simulated/floor/plating, /area/rnd/research_storage) "ajJ" = ( @@ -6610,6 +6558,9 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "ajO" = ( @@ -6630,17 +6581,9 @@ }, /area/tether/surfacebase/security/lobby) "ajP" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "ajQ" = ( @@ -6806,7 +6749,6 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/paleblue/full{ - icon_state = "corner_white_full"; dir = 1 }, /turf/simulated/floor/tiled/white, @@ -7011,7 +6953,6 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/paleblue/full{ - icon_state = "corner_white_full"; dir = 8 }, /turf/simulated/floor/tiled/white, @@ -7078,8 +7019,7 @@ /obj/item/weapon/reagent_containers/glass/beaker/large, /obj/item/weapon/reagent_containers/dropper, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) @@ -7214,6 +7154,11 @@ name = "Library Desk Door"; req_access = list(37) }, +/obj/machinery/light_switch{ + dir = 4; + on = 0; + pixel_x = -24 + }, /turf/simulated/floor/carpet, /area/library) "akN" = ( @@ -8405,7 +8350,9 @@ /area/tether/surfacebase/surface_three_hall) "ani" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "anj" = ( @@ -8726,14 +8673,14 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "anN" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "anO" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/universal, @@ -9567,18 +9514,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -28; + pixel_y = 26 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "api" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/appliance/cooker/grill, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 5 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/button/remote/blast_door{ + id = "kitchen2"; + name = "Kitchen shutters"; + pixel_x = -24 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23; + pixel_y = 9 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -11563,12 +11519,12 @@ /area/tether/surfacebase/surface_three_hall) "asw" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/alarm{ - pixel_y = 25 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start{ + name = "Chef" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "asx" = ( @@ -11611,8 +11567,7 @@ "asA" = ( /obj/machinery/firealarm{ dir = 8; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -11744,24 +11699,6 @@ dir = 1 }, /obj/structure/closet/secure_closet/freezer/fridge, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) -"asM" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "asN" = ( @@ -11868,15 +11805,13 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "asZ" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, /obj/machinery/light{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/table/woodentable, /turf/simulated/floor/grass, /area/hydroponics) "ata" = ( @@ -11915,9 +11850,10 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "atf" = ( -/obj/machinery/appliance/cooker/fryer, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 +/obj/structure/table/standard, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -12059,10 +11995,8 @@ /obj/machinery/camera/network/outside{ dir = 5 }, -/obj/machinery/appliance/cooker/oven, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 - }, +/obj/structure/table/standard, +/obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atx" = ( @@ -12101,9 +12035,9 @@ "atA" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -12133,16 +12067,14 @@ /turf/simulated/wall, /area/rnd/research_storage) "atF" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/disposalpipe/up{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, /area/rnd/research_storage) "atG" = ( /turf/simulated/wall/r_wall, @@ -12173,7 +12105,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/table/standard, +/obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atK" = ( @@ -12186,24 +12118,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"atL" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ - pixel_x = 3 - }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ - pixel_x = -3 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "atM" = ( /obj/structure/table/standard, -/obj/machinery/microwave, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/item/weapon/material/knife/butch, +/obj/item/weapon/material/kitchen/rollingpin, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atN" = ( @@ -12215,29 +12134,28 @@ /area/crew_quarters/bar) "atO" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/landmark/start{ - name = "Chef" +/obj/structure/table/standard, +/obj/item/weapon/reagent_containers/dropper, +/obj/item/weapon/reagent_containers/food/condiment/enzyme{ + layer = 5 + }, +/obj/item/weapon/reagent_containers/food/condiment/enzyme{ + layer = 5 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atP" = ( -/obj/machinery/button/remote/blast_door{ - id = "kitchen"; - name = "Kitchen shutters"; - pixel_x = -24; - pixel_y = -24 - }, /obj/machinery/light{ dir = 8 }, +/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/appliance/mixer/cereal, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 + dir = 8 }, +/obj/structure/closet/secure_closet/freezer/kitchen, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atQ" = ( @@ -12246,9 +12164,14 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/structure/table/standard, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atR" = ( @@ -12977,6 +12900,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/table/woodentable, /turf/simulated/floor/grass, /area/hydroponics) "avh" = ( @@ -13177,13 +13101,6 @@ /obj/effect/floor_decal/corner/beige{ dir = 6 }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/machinery/computer/guestpass{ - dir = 8; - pixel_x = 25 - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "avB" = ( @@ -13200,13 +13117,13 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "avD" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/appliance/mixer/candy, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 6 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/obj/machinery/button/remote/blast_door{ + id = "kitchen"; + name = "Kitchen shutters"; + pixel_x = -24 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -13282,8 +13199,12 @@ /turf/simulated/floor/plating, /area/crew_quarters/bar) "avL" = ( -/obj/machinery/chem_master/condimaster, -/turf/simulated/floor/tiled/white, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass{ + name = "Hydroponics"; + req_one_access = list(35,28) + }, +/turf/simulated/floor/tiled/freezer, /area/crew_quarters/kitchen) "avM" = ( /obj/effect/floor_decal/corner/beige{ @@ -13439,18 +13360,8 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) -"awc" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "awd" = ( /obj/machinery/librarycomp, -/obj/machinery/light/small{ - dir = 8 - }, /obj/structure/table/woodentable, /turf/simulated/floor/carpet, /area/library) @@ -13545,6 +13456,13 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/captain) "awm" = ( +/obj/machinery/button/remote/airlock{ + id = "barbackdoor"; + name = "Back Door Locks"; + pixel_x = -29; + pixel_y = 30; + specialfunctions = 4 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "awn" = ( @@ -13616,14 +13534,15 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "awv" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/shutters{ + id = "kitchen2"; + layer = 3.3; + name = "Kitchen Shutters" }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -13829,21 +13748,13 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "awI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 }, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/structure/disposalpipe/junction{ dir = 4 }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 5 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "awJ" = ( @@ -14206,20 +14117,27 @@ /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) "axn" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/machinery/door/airlock/glass_security{ + name = "Front Desk"; + req_access = list(63); + req_one_access = list(63) }, +/obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 4 }, -/turf/simulated/floor/tiled/eris/cafe, -/area/hydroponics) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) "axo" = ( /obj/structure/bed/chair/comfy, /obj/effect/landmark/start{ name = "Bartender" }, /obj/structure/disposalpipe/segment, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "axp" = ( @@ -14230,17 +14148,8 @@ info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest."; name = "Shotgun permit" }, -/obj/machinery/light_switch{ - pixel_x = 25 - }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) -"axq" = ( -/obj/machinery/camera/network/civilian{ - dir = 4 - }, -/turf/simulated/floor/grass, -/area/maintenance/lower/xenoflora) "axr" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 @@ -14275,16 +14184,14 @@ }, /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ - pixel_x = 3 + dir = 1 }, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/machinery/chemical_dispenser/bar_soft/full, -/obj/machinery/recharger, +/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "axu" = ( @@ -14701,27 +14608,37 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar) "aya" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/machinery/space_heater, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/barbackmaintenance) "ayb" = ( -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/structure/bed/chair/comfy/beige, +/turf/simulated/floor/tiled/eris/steel/bar_dance, +/area/tether/surfacebase/barbackmaintenance) "ayc" = ( -/obj/machinery/vending/wallmed1/public{ - pixel_y = 28 +/obj/structure/cable/green{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/machinery/button/windowtint{ + id = "secreet"; + name = "Window Tint Control"; + pixel_x = -25; + range = 15 + }, +/turf/simulated/floor/tiled/eris/steel/bar_dance, +/area/tether/surfacebase/barbackmaintenance) "ayd" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/eris/steel/bar_dance, +/area/tether/surfacebase/barbackmaintenance) "aye" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14748,11 +14665,17 @@ /turf/simulated/wall/r_wall, /area/tether/surfacebase/botanystorage) "ayh" = ( -/obj/machinery/door/airlock{ - name = "Unit 3" +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/barbackmaintenance) "ayi" = ( /obj/structure/disposalpipe/sortjunction{ name = "Research"; @@ -14973,42 +14896,52 @@ /turf/simulated/floor/tiled, /area/rnd/staircase/thirdfloor) "ayC" = ( -/obj/machinery/door/airlock{ - name = "Unit 2" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) -"ayD" = ( -/obj/machinery/door/airlock{ - name = "Unit 1" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) -"ayE" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) -"ayF" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/toilet{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) -"ayG" = ( -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/effect/floor_decal/corner/red/border{ + dir = 8 }, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/lobby) +"ayD" = ( +/obj/structure/bed/chair/comfy/beige{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/steel/bar_dance, +/area/tether/surfacebase/barbackmaintenance) +"ayE" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/barbackmaintenance) +"ayF" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/barbackmaintenance) +"ayG" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/library) "ayH" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -15035,17 +14968,27 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "ayI" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/structure/bed/chair/comfy/black{ + dir = 8 }, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/effect/landmark/start{ + name = "Librarian" + }, +/turf/simulated/floor/carpet, +/area/library) "ayJ" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/structure/sink{ + pixel_y = 20 }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/barbackmaintenance) +/obj/structure/mirror{ + dir = 4; + pixel_y = 32 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "ayK" = ( /obj/machinery/door/airlock/glass_research{ name = "Xenoflora Research"; @@ -15380,9 +15323,6 @@ dir = 8 }, /obj/machinery/disposal, -/obj/machinery/light/small{ - dir = 4 - }, /turf/simulated/floor/wood, /area/library) "azi" = ( @@ -15449,18 +15389,16 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/library/study) "azn" = ( -/obj/random/tech_supply, -/obj/structure/table/steel, -/obj/random/maintenance/engineering, -/obj/item/stack/cable_coil/random, -/obj/machinery/light/small{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/substation/bar{ - name = "\improper Surface Civilian Substation" - }) +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled, +/area/rnd/research_storage) "azo" = ( /obj/structure/closet{ name = "materials" @@ -16005,6 +15943,8 @@ icon_state = "1-2" }, /obj/structure/table/standard, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/microwave, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aAa" = ( @@ -16051,16 +15991,19 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aAe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/barbackmaintenance) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "aAf" = ( /obj/structure/cable/green{ d1 = 2; @@ -16115,36 +16058,23 @@ /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora) "aAi" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/barbackmaintenance) +/obj/machinery/hologram/holopad, +/turf/simulated/floor/wood, +/area/library) "aAj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/vending/wallmed1/public{ + pixel_x = -28 }, /obj/structure/cable/green{ d1 = 1; - d2 = 8; - icon_state = "1-8" + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/barbackmaintenance) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "aAk" = ( /obj/structure/flora/pottedplant/unusual, /obj/machinery/firealarm{ @@ -16305,11 +16235,23 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/library/study) "aAx" = ( -/obj/structure/railing{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/barbackmaintenance) +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/bar{ + name = "\improper Surface Civilian Substation" + }) "aAy" = ( /obj/structure/table/woodentable, /obj/item/weapon/paper_bin{ @@ -16321,6 +16263,9 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/library/study) "aAz" = ( +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/carpet, /area/library) "aAA" = ( @@ -16361,9 +16306,14 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/botanystorage) "aAE" = ( -/obj/structure/closet/firecloset, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/barbackmaintenance) +/obj/structure/table/woodentable, +/obj/item/weapon/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/weapon/pen, +/turf/simulated/floor/carpet, +/area/library) "aAF" = ( /obj/structure/cable/green{ d1 = 1; @@ -16441,12 +16391,13 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/table/standard, -/obj/item/device/destTagger{ - pixel_x = 4; - pixel_y = 3 +/obj/machinery/chem_master/condimaster, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 10 }, -/obj/item/weapon/packageWrap, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aAM" = ( @@ -16850,11 +16801,13 @@ /turf/simulated/floor/wood, /area/library) "aBt" = ( -/obj/structure/bed/chair/office/dark, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/structure/bed/chair/comfy/black{ + dir = 4 }, -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/carpet, /area/library) "aBu" = ( /obj/machinery/holoplant, @@ -16867,8 +16820,12 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) "aBv" = ( -/obj/structure/bed/chair/office/dark, -/turf/simulated/floor/wood, +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/item/weapon/paper, +/turf/simulated/floor/carpet, /area/library) "aBw" = ( /obj/machinery/door/firedoor/glass, @@ -16889,14 +16846,13 @@ /turf/simulated/floor/tiled, /area/rnd/staircase/thirdfloor) "aBx" = ( -/obj/structure/table/standard, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/microwave, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aBy" = ( @@ -16962,21 +16918,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aBD" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/box/donkpockets{ - pixel_x = 3; - pixel_y = 3 +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker{ - pixel_x = 5 +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 6 }, -/obj/item/weapon/reagent_containers/food/snacks/mint, +/obj/machinery/appliance/mixer/cereal, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aBE" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -17351,8 +17302,11 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "aCf" = ( -/obj/structure/table/standard, -/obj/item/weapon/book/manual/chef_recipes, +/obj/machinery/appliance/mixer/candy, +/obj/effect/floor_decal/industrial/warning/dust, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aCg" = ( @@ -17422,8 +17376,10 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_hallway) "aCn" = ( -/obj/machinery/portable_atmospherics/powered/pump/filled, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "aCo" = ( /obj/structure/grille, @@ -17453,11 +17409,6 @@ dir = 8 }, /obj/structure/closet/secure_closet/freezer/meat, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aCr" = ( @@ -17627,22 +17578,26 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aCF" = ( -/obj/machinery/light/small{ +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/library) "aCG" = ( /obj/machinery/bookbinder, -/obj/machinery/light/small{ - dir = 8 - }, /turf/simulated/floor/wood, /area/library) "aCH" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, +/obj/structure/table/woodentable, +/obj/machinery/photocopier/faxmachine{ + department = "Library Conference Room" + }, /turf/simulated/floor/wood, /area/library) "aCI" = ( @@ -17726,25 +17681,6 @@ /turf/simulated/wall, /area/rnd/outpost/xenobiology/outpost_stairs) "aCP" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/substation/bar{ - name = "\improper Surface Civilian Substation" - }) -"aCQ" = ( /obj/structure/cable{ icon_state = "0-8" }, @@ -17757,9 +17693,21 @@ dir = 8; pixel_x = 24 }, -/obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, +/area/maintenance/substation/bar{ + name = "\improper Surface Civilian Substation" + }) +"aCQ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/plating, /area/maintenance/substation/bar{ name = "\improper Surface Civilian Substation" }) @@ -17984,8 +17932,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -18621,14 +18568,9 @@ "aEu" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 + dir = 4 }, -/obj/item/weapon/tape_roll, -/obj/item/device/flashlight/lamp/green{ - pixel_x = 1; - pixel_y = 5 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/library) "aEv" = ( /obj/structure/disposalpipe/segment{ @@ -18696,13 +18638,13 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_hallway) "aEz" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/packageWrap, -/obj/item/weapon/paper_bin{ - pixel_x = 1; - pixel_y = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/wood, +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/simulated/floor/carpet, /area/library) "aEA" = ( /obj/structure/railing{ @@ -18718,23 +18660,31 @@ /turf/simulated/floor/grass, /area/hydroponics) "aEC" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/bookcase{ + name = "bookcase (Adult)" }, /turf/simulated/floor/wood, /area/library) "aED" = ( -/obj/structure/table/woodentable, -/obj/machinery/photocopier/faxmachine{ - department = "Library Conference Room" +/obj/structure/bookcase{ + name = "bookcase (Fiction)" }, +/obj/item/weapon/book/custom_library/fiction/blacksmithandkinglybloke, +/obj/item/weapon/book/custom_library/fiction/irishairmanforseesdeath, +/obj/item/weapon/book/custom_library/fiction/myrock, +/obj/item/weapon/book/custom_library/fiction/starsandsometimesfallingones, +/obj/item/weapon/book/custom_library/fiction/truelovehathmyheart, /turf/simulated/floor/wood, /area/library) "aEE" = ( -/obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/green{ - pixel_x = 1; - pixel_y = 5 +/obj/structure/bookcase{ + name = "bookcase (Adult)" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/wood, /area/library) @@ -18743,29 +18693,29 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aEG" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 - }, +/obj/structure/bed/chair/office/dark, /turf/simulated/floor/carpet, /area/library) "aEH" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/paper, -/obj/item/weapon/pen, -/obj/item/weapon/book/codex, -/turf/simulated/floor/carpet, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/bookcase/bookcart, +/turf/simulated/floor/wood, /area/library) "aEI" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 8 +/obj/structure/bookcase{ + name = "bookcase (Non-Fiction)" }, -/turf/simulated/floor/carpet, +/obj/item/weapon/book/codex/lore/robutt, +/obj/item/weapon/book/codex, +/obj/item/weapon/book/custom_library/nonfiction/freesirisailightbulbs, +/turf/simulated/floor/wood, /area/library) "aEJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/hologram/holopad, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -18774,14 +18724,17 @@ /turf/simulated/floor/wood, /area/library) "aEK" = ( -/obj/structure/table/woodentable, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/random/tech_supply, +/obj/structure/table/steel, +/obj/random/maintenance/engineering, +/obj/item/stack/cable_coil/random, +/obj/machinery/light/small{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/library) +/turf/simulated/floor/plating, +/area/maintenance/substation/bar{ + name = "\improper Surface Civilian Substation" + }) "aEL" = ( /obj/structure/closet/secure_closet/hydroponics, /obj/effect/floor_decal/borderfloor{ @@ -18833,27 +18786,29 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aEO" = ( -/obj/item/weapon/dice/d20, -/obj/item/weapon/dice, +/obj/structure/cable/green, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d2 = 4; + icon_state = "0-4" }, -/obj/structure/table/woodentable, -/turf/simulated/floor/wood, -/area/library) +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Surface Civilian Subgrid"; + name_tag = "Surface Civilian Subgrid" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/bar{ + name = "\improper Surface Civilian Substation" + }) "aEP" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Librarian" +/obj/structure/bed/chair/office/dark{ + dir = 8 }, /turf/simulated/floor/carpet, /area/library) "aEQ" = ( -/obj/structure/table/woodentable, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -18862,37 +18817,28 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/recharger, /turf/simulated/floor/wood, /area/library) "aER" = ( -/obj/structure/bookcase{ - name = "bookcase (Reference)" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/item/weapon/book/manual/anomaly_spectroscopy, -/obj/item/weapon/book/manual/anomaly_testing, -/obj/item/weapon/book/manual/atmospipes, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/book/manual/command_guide, -/obj/item/weapon/book/manual/detective, -/obj/item/weapon/book/manual/engineering_construction, -/obj/item/weapon/book/manual/engineering_guide, -/obj/item/weapon/book/manual/engineering_particle_accelerator, -/obj/item/weapon/book/manual/engineering_singularity_safety, -/obj/item/weapon/book/manual/evaguide, -/obj/item/weapon/book/manual/excavation, -/turf/simulated/floor/wood, +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/simulated/floor/carpet, /area/library) "aES" = ( -/obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ - layer = 5 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ - layer = 5 +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, -/obj/item/weapon/reagent_containers/dropper, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aET" = ( @@ -18903,30 +18849,16 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar) "aEU" = ( -/obj/structure/bookcase{ - name = "bookcase (Reference)" - }, -/obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/book/manual/mass_spectrometry, -/obj/item/weapon/book/manual/materials_chemistry_analysis, -/obj/item/weapon/book/manual/medical_cloning, -/obj/item/weapon/book/manual/medical_diagnostics_manual, -/obj/item/weapon/book/manual/research_and_development, -/obj/item/weapon/book/manual/resleeving, -/obj/item/weapon/book/manual/ripley_build_and_repair, -/obj/item/weapon/book/manual/robotics_cyborgs, -/obj/item/weapon/book/manual/rust_engine, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/stasis, -/obj/item/weapon/book/manual/supermatter_engine, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/library) "aEV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/wood, +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/simulated/floor/carpet, /area/library) "aEW" = ( /obj/effect/floor_decal/spline/plain{ @@ -18936,6 +18868,9 @@ /obj/machinery/chemical_dispenser/bar_soft/full{ dir = 8 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/lino, /area/crew_quarters/bar) "aEX" = ( @@ -18948,9 +18883,6 @@ /turf/simulated/floor/grass, /area/hydroponics) "aEY" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -18988,9 +18920,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFc" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -19002,23 +18931,38 @@ /turf/simulated/floor/wood, /area/library) "aFd" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/structure/bookcase{ + name = "bookcase (Religious)" + }, +/obj/item/weapon/book/custom_library/religious/feastofkubera, +/obj/item/weapon/book/custom_library/religious/storyoflordganesha, +/obj/item/weapon/book/custom_library/religious/sungoddessofkorea, +/obj/item/weapon/book/custom_library/religious/wayofbleedingswan, /turf/simulated/floor/wood, /area/library) "aFe" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/deck/cards, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/wood, /area/library) "aFf" = ( -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/outdoors/grass/sif/virgo3b, -/area/tether/surfacebase/outside/outside3) +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/vending/nifsoft_shop, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "aFg" = ( /obj/structure/cable/green{ d1 = 2; @@ -19034,10 +18978,19 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFh" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/remains/deer, -/turf/simulated/floor/outdoors/grass/sif/virgo3b, -/area/tether/surfacebase/outside/outside3) +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/substation/bar{ + name = "\improper Surface Civilian Substation" + }) "aFi" = ( /obj/structure/table/glass, /obj/machinery/cell_charger, @@ -19123,12 +19076,8 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "aFn" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/wood, /area/library) @@ -19179,15 +19128,15 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) "aFq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/clothing/gloves/fyellow, +/obj/item/weapon/book{ + author = "Urist McHopefulsoul"; + desc = "It contains fourty blank pages followed by the entire screenplay of a movie called 'Requiem for a Dream'"; + name = "A Comprehensive Guide to Assisting" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/barbackmaintenance) +/turf/simulated/floor/plating, +/area/tether/surfacebase/shuttle_pad) "aFr" = ( /obj/structure/cable/green{ d1 = 1; @@ -19197,36 +19146,34 @@ /turf/simulated/floor/wood, /area/library) "aFs" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/library) "aFt" = ( -/obj/structure/bookcase{ - name = "bookcase (Fiction)" - }, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 }, /turf/simulated/floor/wood, /area/library) "aFu" = ( -/obj/structure/bookcase{ - name = "bookcase (Fiction)" +/obj/structure/bed/chair/office/dark{ + dir = 4 }, -/turf/simulated/floor/wood, +/obj/effect/landmark/start{ + name = "Librarian" + }, +/turf/simulated/floor/carpet, /area/library) "aFv" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/barbackmaintenance) +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/rnd/robotics) "aFw" = ( /obj/structure/closet/crate, /obj/item/target, @@ -19241,34 +19188,16 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "aFx" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/under/color/grey, +/obj/item/clothing/mask/gas/wwii, +/obj/item/weapon/storage/belt/utility/full, /turf/simulated/floor/plating, -/area/maintenance/substation/bar{ - name = "\improper Surface Civilian Substation" - }) +/area/tether/surfacebase/shuttle_pad) "aFy" = ( -/obj/machinery/light/small{ +/obj/structure/bed/chair/comfy/beige{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "aFz" = ( /obj/structure/cable/green{ @@ -19280,19 +19209,10 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "aFA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/structure/bed/chair/comfy/beige{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/eris/steel/bar_light, /area/tether/surfacebase/barbackmaintenance) "aFB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -19561,44 +19481,26 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "aFU" = ( -/obj/structure/bookcase{ - name = "bookcase (Religious)" - }, -/turf/simulated/floor/wood, +/obj/structure/table/woodentable, +/turf/simulated/floor/carpet, /area/library) "aFV" = ( -/obj/structure/cable/green, /obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/sensor{ - name = "Powernet Sensor - Surface Civilian Subgrid"; - name_tag = "Surface Civilian Subgrid" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/substation/bar{ - name = "\improper Surface Civilian Substation" - }) -"aFW" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 2; + d1 = 4; d2 = 8; - icon_state = "2-8" + icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/rnd/robotics) +"aFW" = ( +/obj/machinery/optable{ + name = "Robotics Operating Table" }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/substation/bar{ - name = "\improper Surface Civilian Substation" - }) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/tiled/dark, +/area/rnd/robotics/surgeryroom2) "aFX" = ( /obj/random/tech_supply, /obj/structure/table/steel, @@ -19738,10 +19640,17 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aGh" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/freezer{ + name = "Kitchen"; + req_access = list(28) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aGi" = ( @@ -19750,9 +19659,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/table/standard, -/obj/machinery/reagentgrinder, +/obj/machinery/appliance/cooker/fryer, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aGj" = ( @@ -19867,15 +19780,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) -"aGr" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/table/standard, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "aGs" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/research{ @@ -19934,22 +19838,34 @@ /area/tether/surfacebase/surface_three_hall) "aGw" = ( /obj/structure/bookcase{ - name = "bookcase (Non-Fiction)" + name = "bookcase (Reference)" }, -/obj/item/weapon/book/codex/lore/robutt, +/obj/item/weapon/book/manual/hydroponics_pod_people, +/obj/item/weapon/book/manual/mass_spectrometry, +/obj/item/weapon/book/manual/materials_chemistry_analysis, +/obj/item/weapon/book/manual/medical_cloning, +/obj/item/weapon/book/manual/medical_diagnostics_manual, +/obj/item/weapon/book/manual/research_and_development, +/obj/item/weapon/book/manual/resleeving, +/obj/item/weapon/book/manual/ripley_build_and_repair, +/obj/item/weapon/book/manual/robotics_cyborgs, +/obj/item/weapon/book/manual/rust_engine, +/obj/item/weapon/book/manual/security_space_law, +/obj/item/weapon/book/manual/standard_operating_procedure, +/obj/item/weapon/book/manual/stasis, +/obj/item/weapon/book/manual/supermatter_engine, /turf/simulated/floor/wood, /area/library) "aGx" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 +/obj/structure/sink{ + pixel_y = 20 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/mirror{ + dir = 4; + pixel_y = 32 }, -/turf/simulated/floor/wood, -/area/library) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "aGy" = ( /obj/structure/railing, /obj/structure/grille, @@ -20216,9 +20132,18 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aGY" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/item/weapon/tape_roll, +/obj/item/weapon/packageWrap, +/obj/item/weapon/dice, +/obj/item/weapon/dice/d20, +/obj/item/weapon/deck/cards, +/obj/item/weapon/folder/yellow, +/obj/structure/closet/walllocker_double{ + dir = 8; + pixel_x = -28 }, +/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/weapon/storage/pill_bottle/dice_nerd, /turf/simulated/floor/wood, /area/library) "aGZ" = ( @@ -20280,16 +20205,21 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aHc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/bed/chair/office/dark{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/library) "aHd" = ( /obj/machinery/newscaster{ pixel_y = 28 }, -/turf/simulated/floor/wood, +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/turf/simulated/floor/carpet, /area/library) "aHe" = ( /obj/structure/table/woodentable, @@ -20313,8 +20243,22 @@ /area/hallway/lower/third_south) "aHg" = ( /obj/structure/bookcase{ - name = "bookcase (Non-Fiction)" + name = "bookcase (Reference)" }, +/obj/item/weapon/book/manual/anomaly_spectroscopy, +/obj/item/weapon/book/manual/anomaly_testing, +/obj/item/weapon/book/manual/atmospipes, +/obj/item/weapon/book/manual/barman_recipes, +/obj/item/weapon/book/manual/chef_recipes, +/obj/item/weapon/book/manual/command_guide, +/obj/item/weapon/book/manual/detective, +/obj/item/weapon/book/manual/engineering_construction, +/obj/item/weapon/book/manual/engineering_guide, +/obj/item/weapon/book/manual/engineering_particle_accelerator, +/obj/item/weapon/book/manual/engineering_singularity_safety, +/obj/item/weapon/book/manual/evaguide, +/obj/item/weapon/book/manual/excavation, +/obj/item/weapon/book/custom_library/reference/fistfulofd6splayersguide, /turf/simulated/floor/wood, /area/library) "aHh" = ( @@ -20457,11 +20401,10 @@ /turf/simulated/floor/plating, /area/crew_quarters/bar) "aHs" = ( -/obj/structure/table/gamblingtable, -/obj/item/weapon/storage/pill_bottle/dice, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aHt" = ( @@ -20548,38 +20491,25 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aHB" = ( -/obj/structure/table/gamblingtable, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/table/marble, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aHC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/spiderling_remains, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/light/small{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "aHD" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/mirror{ - pixel_x = 27 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/rnd/robotics) "aHE" = ( /obj/structure/window/basic/full, /obj/structure/grille, @@ -20644,12 +20574,6 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 5 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aHI" = ( @@ -20679,13 +20603,6 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/machinery/button/remote/blast_door{ - id = "mechbay-inner"; - name = "Mech Bay"; - pixel_y = -26; - req_access = list(29,47); - req_one_access = list(47) - }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aHK" = ( @@ -20799,7 +20716,6 @@ alarm_id = "anomaly_testing"; breach_detection = 0; dir = 8; - frequency = 1439; pixel_x = 22; pixel_y = -7; report_danger_level = 0 @@ -20971,19 +20887,15 @@ /area/hallway/lower/third_south) "aId" = ( /obj/effect/floor_decal/industrial/warning, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/generic, +/obj/structure/railing{ + dir = 1 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "aIe" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/generic, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "aIf" = ( @@ -21001,13 +20913,13 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "aIg" = ( -/obj/item/weapon/stool/padded, /obj/effect/floor_decal/spline/plain{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aIh" = ( @@ -21268,9 +21180,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aIE" = ( -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/photocopier, /turf/simulated/floor/wood, /area/library) "aIF" = ( @@ -21296,7 +21206,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aIH" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/marble, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aII" = ( @@ -21356,12 +21266,20 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar) "aIN" = ( -/obj/structure/table/gamblingtable, -/obj/item/weapon/deck/cards, -/turf/simulated/floor/carpet/turcarpet, -/area/crew_quarters/bar) +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "aIO" = ( -/obj/item/weapon/stool/padded, /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) @@ -21716,11 +21634,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aJv" = ( -/obj/structure/table/gamblingtable, -/obj/item/weapon/storage/pill_bottle/dice_nerd, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/table/marble, +/obj/machinery/recharger, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aJw" = ( @@ -21854,7 +21772,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aJK" = ( -/obj/item/weapon/stool/padded, /obj/effect/floor_decal/spline/plain{ dir = 4 }, @@ -21862,6 +21779,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aJL" = ( @@ -21959,17 +21877,12 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics/mechbay) "aJS" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/machinery/computer/security/telescreen/entertainment{ + icon_state = "frame"; + pixel_x = -64 }, -/obj/machinery/button/remote/blast_door{ - id = "mechbay"; - name = "Mech Bay Access"; - pixel_x = -30; - pixel_y = 30 - }, -/turf/simulated/floor/bluegrid, -/area/rnd/robotics/mechbay) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "aJT" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -22126,16 +22039,13 @@ /turf/simulated/wall, /area/tether/surfacebase/shuttle_pad) "aKk" = ( -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/clothing/gloves/fyellow, -/obj/item/weapon/book{ - author = "Urist McHopefulsoul"; - desc = "It contains fourty blank pages followed by the entire screenplay of a movie called 'Requiem for a Dream'"; - name = "A Comprehensive Guide to Assisting" +/obj/machinery/optable{ + name = "Robotics Operating Table" }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/tether/surfacebase/shuttle_pad) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/tiled/dark, +/area/rnd/robotics/surgeryroom1) "aKl" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -22175,11 +22085,11 @@ /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/bar) "aKo" = ( -/obj/item/weapon/stool/padded, /obj/effect/floor_decal/spline/plain{ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aKp" = ( @@ -22228,10 +22138,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aKv" = ( @@ -22277,16 +22185,11 @@ /area/tether/surfacebase/surface_three_hall) "aKy" = ( /obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/sink/kitchen{ + pixel_y = 28 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 + dir = 10 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -22385,13 +22288,10 @@ /turf/simulated/floor/reinforced, /area/tether/surfacebase/shuttle_pad) "aKJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/rnd/robotics) +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tether) "aKK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22517,12 +22417,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "aKY" = ( -/obj/item/clothing/under/color/grey, -/obj/item/clothing/mask/gas/wwii, -/obj/item/weapon/storage/belt/utility/full, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/tether/surfacebase/shuttle_pad) +/obj/machinery/atmospherics/unary/engine{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tourbus/engines) "aKZ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -22555,9 +22455,6 @@ /area/tether/surfacebase/servicebackroom) "aLc" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/effect/landmark/start{ name = "Chef" }, @@ -22739,15 +22636,9 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "aLu" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/rnd/robotics) +/obj/machinery/atmospherics/pipe/tank/air, +/turf/simulated/floor/plating, +/area/tether/surfacebase/topairlock) "aLv" = ( /obj/structure/cable/green{ d1 = 4; @@ -22939,7 +22830,11 @@ /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) "aLP" = ( -/obj/machinery/camera/network/civilian, +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, /turf/simulated/floor/wood, /area/library) "aLQ" = ( @@ -22992,14 +22887,11 @@ /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "aLW" = ( -/obj/machinery/optable{ - name = "Robotics Operating Table" +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 6 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/tiled/dark, -/area/rnd/robotics/surgeryroom2) +/turf/simulated/floor/plating, +/area/tether/surfacebase/topairlock) "aLX" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -23221,13 +23113,12 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) "aMs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/atmospherics/binary/passive_gate/on{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/rnd/robotics) +/turf/simulated/floor/plating, +/area/tether/surfacebase/topairlock) "aMt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23751,8 +23642,7 @@ /area/rnd/robotics/mechbay) "aNx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -24976,11 +24866,18 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) "aQf" = ( -/obj/machinery/camera/network/outside{ - dir = 6 +/obj/structure/sink{ + pixel_y = 20 }, -/turf/simulated/floor/outdoors/grass/sif/virgo3b, -/area/tether/surfacebase/outside/outside3) +/obj/structure/mirror{ + dir = 4; + pixel_y = 32 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "aQg" = ( /obj/machinery/vending/cola{ dir = 4 @@ -25999,7 +25896,6 @@ alarm_id = "anomaly_testing"; breach_detection = 0; dir = 8; - frequency = 1439; pixel_x = 22; pixel_y = -7; report_danger_level = 0 @@ -26044,10 +25940,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/o2{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/storage/firstaid/o2, /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, @@ -26103,11 +25996,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/alarm{ - dir = 1; - pixel_x = 30; - pixel_y = -22 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -26233,19 +26121,13 @@ dir = 4; pixel_x = 26 }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 2; - pixel_y = -28 - }, /obj/machinery/librarypubliccomp, /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/library) "aSG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/landmark/start{ name = "Medical Doctor" @@ -26280,10 +26162,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/toxin{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/storage/firstaid/toxin, /obj/effect/floor_decal/corner/green/full, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -26296,10 +26175,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/fire{ - pixel_x = 0; - pixel_y = 0 - }, +/obj/item/weapon/storage/firstaid/fire, /obj/effect/floor_decal/corner/yellow/full{ dir = 4 }, @@ -26308,48 +26184,12 @@ /area/tether/surfacebase/medical/storage) "aSM" = ( /obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/window/reinforced/polarized/full{ + id = "medbayfoyer" }, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/triage) -"aSN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/triage) -"aSO" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tether) -"aSP" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tourbus/engines) "aSQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -26531,8 +26371,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) @@ -26692,15 +26531,8 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "aTE" = ( -/obj/structure/table/woodentable, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/simulated/floor/grass, -/area/hydroponics) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "aTF" = ( /obj/structure/closet/crate/plastic, /obj/structure/disposalpipe/segment{ @@ -26756,8 +26588,12 @@ }, /obj/item/weapon/pen, /obj/item/device/flashlight/lamp/green{ - pixel_y = 14; - pixel_x = 10 + pixel_x = 10; + pixel_y = 14 + }, +/obj/item/weapon/storage/box/body_record_disk{ + pixel_x = -3; + pixel_y = -3 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) @@ -26766,7 +26602,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -26969,8 +26804,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -26978,6 +26812,11 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, +/obj/item/weapon/paper_bin{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/item/weapon/pen, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aUj" = ( @@ -27063,6 +26902,7 @@ /area/hallway/lower/third_south) "aUq" = ( /obj/structure/closet/secure_closet/freezer/meat, +/obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "aUr" = ( @@ -27114,10 +26954,15 @@ /area/tether/surfacebase/public_garden_three) "aUx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aUy" = ( @@ -27155,8 +27000,7 @@ /area/tether/surfacebase/public_garden_three) "aUA" = ( /obj/machinery/status_display{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/borderfloorwhite{ @@ -27278,8 +27122,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/borderfloorwhite{ @@ -27507,7 +27350,6 @@ /obj/structure/table/reinforced, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/effect/floor_decal/borderfloorwhite, @@ -27688,14 +27530,11 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "aVw" = ( -/obj/effect/floor_decal/spline/plain{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/simulated/floor/grass, -/area/hydroponics) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "aVx" = ( /obj/machinery/firealarm{ dir = 8; @@ -27737,24 +27576,24 @@ /turf/simulated/floor/grass, /area/hydroponics) "aVC" = ( -/obj/structure/bed/chair/wood{ +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/simulated/floor/grass, -/area/hydroponics) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "aVD" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4 @@ -27762,6 +27601,11 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "aVE" = ( @@ -27831,6 +27675,9 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, +/obj/structure/sign/poster{ + pixel_y = -32 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aVN" = ( @@ -27903,10 +27750,6 @@ "aVT" = ( /obj/structure/table/standard, /obj/item/device/healthanalyzer, -/obj/machinery/button/windowtint{ - id = "surfsurgery2"; - pixel_x = -26 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) @@ -28415,8 +28258,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) @@ -28527,8 +28369,7 @@ }, /obj/machinery/light_switch{ dir = 4; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -28543,6 +28384,10 @@ }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, +/obj/machinery/button/windowtint{ + id = "surfsurgery2"; + pixel_x = -22 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "aXd" = ( @@ -28590,8 +28435,8 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aXf" = ( -/obj/structure/bookcase{ - name = "bookcase (Adult)" +/obj/machinery/camera/network/civilian{ + dir = 1 }, /turf/simulated/floor/wood, /area/library) @@ -28676,9 +28521,6 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aXo" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -28798,7 +28640,6 @@ /obj/structure/closet/hydrant{ pixel_x = 32 }, -/obj/structure/bookcase/bookcart, /turf/simulated/floor/wood, /area/library) "aXx" = ( @@ -28883,17 +28724,11 @@ /turf/simulated/floor/plating, /area/bridge) "aXC" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/start{ - name = "Librarian" - }, /turf/simulated/floor/wood, /area/library) "aXD" = ( @@ -28981,17 +28816,6 @@ /obj/item/weapon/implantcase/chem, /turf/simulated/floor/plating, /area/rnd/research_storage) -"aXI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/table/steel, -/obj/random/tech_supply, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/rnd/research_storage) "aXJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29039,45 +28863,12 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"aXN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/rnd/research_storage) -"aXO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/rnd/research_storage) "aXP" = ( /obj/structure/disposalpipe/up{ dir = 8 }, /turf/simulated/floor/plating, /area/rnd/research_storage) -"aXQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/rnd/research_storage) -"aXR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/rnd/research_storage) "aXS" = ( /obj/structure/bed/chair/comfy, /obj/machinery/camera/network/civilian, @@ -29269,26 +29060,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"aYk" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) "aYl" = ( /obj/structure/lattice, /obj/structure/disposalpipe/down, @@ -29723,23 +29494,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) -"aZg" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/grass, -/area/hydroponics) "aZh" = ( /obj/machinery/door/airlock/glass_command{ name = "Bridge"; @@ -30084,9 +29838,6 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "aZJ" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, /obj/structure/cable/green{ d1 = 1; d2 = 8; @@ -30237,9 +29988,6 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 4 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, @@ -30252,11 +30000,21 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 6 }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aZX" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/foodcart, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aZY" = ( @@ -30550,16 +30308,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/beige/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, /turf/simulated/floor/tiled, @@ -30590,13 +30346,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "baA" = ( -/obj/item/weapon/stool/padded, /obj/structure/disposalpipe/segment{ dir = 8 }, /obj/machinery/light{ dir = 8 }, +/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "baB" = ( @@ -30611,10 +30367,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/camera/network/civilian{ - dir = 1 - }, -/turf/simulated/floor/grass, +/turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "baC" = ( /obj/machinery/vending/cola{ @@ -30645,14 +30398,21 @@ /area/hallway/lower/third_south) "baE" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/table/standard, +/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, +/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "baF" = ( @@ -30759,21 +30519,18 @@ /area/tether/surfacebase/surface_three_hall) "baM" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/button/remote/blast_door{ - id = "kitchen2"; - name = "Kitchen shutters"; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "baN" = ( @@ -30785,12 +30542,31 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "baO" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/vending/dinnerware{ +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "baP" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -30821,9 +30597,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"baR" = ( -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/barbackmaintenance) "baS" = ( /obj/structure/disposalpipe/segment, /obj/structure/window/reinforced/full, @@ -30856,9 +30629,9 @@ dir = 1; pixel_y = -25 }, -/obj/machinery/computer/security/telescreen/entertainment{ - icon_state = "frame"; - pixel_x = 32 +/obj/machinery/computer/guestpass{ + dir = 8; + pixel_x = 25 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -30991,11 +30764,6 @@ /area/tether/surfacebase/entertainment) "bbm" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/item/weapon/paper{ - desc = ""; - info = "Yes hello, the goat in the freezer is named 'Spike'. Please do not fuck with Spike. He doesn't have the best temper."; - name = "Important notice from Rancher Jim" - }, /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 @@ -31263,6 +31031,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/camera/network/civilian{ + dir = 9 + }, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "bbJ" = ( @@ -31395,26 +31166,24 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar) "bbW" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/barbackmaintenance) -"bbX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/barbackmaintenance) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -28; + pixel_y = -25 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "bbY" = ( /obj/effect/floor_decal/spline/plain, /obj/item/weapon/stool/padded, @@ -31447,7 +31216,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/camera/network/civilian, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bcb" = ( @@ -31477,16 +31249,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bcd" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/barbackmaintenance) "bce" = ( /obj/structure/cable/green{ d1 = 1; @@ -31503,8 +31267,15 @@ /area/tether/surfacebase/servicebackroom) "bcf" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/table/standard, +/obj/item/weapon/paper{ + desc = ""; + info = "Yes hello, the goat in the freezer is named 'Spike'. Please do not fuck with Spike. He doesn't have the best temper."; + name = "Important notice from Rancher Jim" + }, +/obj/item/weapon/book/manual/chef_recipes, +/obj/structure/noticeboard{ + pixel_x = 32 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -32108,19 +31879,17 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "bda" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/standard, +/obj/item/weapon/storage/box/donkpockets{ + pixel_x = 3; + pixel_y = 3 }, -/obj/machinery/door/airlock/freezer{ - name = "Kitchen"; - req_access = list(28) - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/item/weapon/reagent_containers/food/snacks/mint, +/obj/item/weapon/reagent_containers/glass/beaker{ + pixel_x = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bdb" = ( @@ -32358,10 +32127,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bdy" = ( @@ -32374,14 +32143,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) -"bdz" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/barbackmaintenance) "bdA" = ( /obj/structure/lattice, /turf/simulated/open, @@ -32417,18 +32178,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"bdE" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "bdF" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -32473,19 +32222,17 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bdK" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "bdL" = ( -/obj/machinery/floodlight, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/barbackmaintenance) +/obj/machinery/door/airlock{ + name = "Unit 1" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "bdM" = ( /obj/structure/cable/green{ d1 = 1; @@ -32496,10 +32243,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"bdN" = ( -/obj/machinery/portable_atmospherics/powered/scrubber, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/barbackmaintenance) "bdO" = ( /obj/structure/table/woodentable, /obj/item/weapon/packageWrap, @@ -32546,9 +32289,6 @@ /area/crew_quarters/bar) "bdR" = ( /obj/structure/kitchenspike, -/obj/machinery/camera/network/civilian{ - dir = 9 - }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "bdS" = ( @@ -32576,87 +32316,44 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) -"bdU" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) "bdV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) -"bdW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) -"bdX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +"bdZ" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/barbackmaintenance) -"bdY" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) -"bdZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) -"bea" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) -"beb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) -"bec" = ( /obj/machinery/light/small{ - dir = 1 + dir = 8 }, -/obj/machinery/space_heater, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/eris/steel/bar_dance, +/area/tether/surfacebase/barbackmaintenance) +"bea" = ( +/turf/simulated/floor/tiled/eris/steel/bar_dance, +/area/tether/surfacebase/barbackmaintenance) +"beb" = ( +/obj/structure/bed/chair/comfy/beige, +/turf/simulated/floor/tiled/eris/steel/bar_light, +/area/tether/surfacebase/barbackmaintenance) +"bec" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "secreet"; + name = "Tintable Window" + }, +/obj/structure/window/reinforced/polarized{ + id = "secreet"; + name = "Tintable Window" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, /area/tether/surfacebase/barbackmaintenance) "bed" = ( /obj/structure/disposalpipe/segment, @@ -32680,21 +32377,20 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bef" = ( +/obj/structure/toilet{ + dir = 8 + }, /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether/surfacebase/barbackmaintenance) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "beg" = ( -/obj/structure/bed/chair/comfy/beige, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether/surfacebase/barbackmaintenance) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "beh" = ( /obj/machinery/newscaster{ pixel_y = -28 @@ -32712,28 +32408,34 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bei" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/cable/green, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether/surfacebase/barbackmaintenance) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "bej" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23; + pixel_y = 22 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bek" = ( @@ -32746,33 +32448,35 @@ /obj/item/device/radio/intercom{ pixel_y = -25 }, +/obj/machinery/vending/dinnerware{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bel" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 4 +/obj/machinery/door/airlock{ + name = "Unit 2" }, -/turf/simulated/floor/tiled/eris/steel/bar_light, -/area/tether/surfacebase/barbackmaintenance) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "bem" = ( -/obj/structure/table/gamblingtable, -/turf/simulated/floor/tiled/eris/steel/bar_dance, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "ben" = ( -/obj/structure/table/gamblingtable, -/obj/item/weapon/storage/pill_bottle/dice, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether/surfacebase/barbackmaintenance) -"beo" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/steel/bar_light, -/area/tether/surfacebase/barbackmaintenance) -"bep" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /obj/structure/cable/green{ d1 = 1; @@ -32781,6 +32485,21 @@ }, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) +"beo" = ( +/obj/structure/table/gamblingtable, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/steel/bar_dance, +/area/tether/surfacebase/barbackmaintenance) +"bep" = ( +/obj/structure/table/gamblingtable, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/item/weapon/storage/pill_bottle/dice, +/turf/simulated/floor/tiled/eris/steel/bar_dance, +/area/tether/surfacebase/barbackmaintenance) "beq" = ( /obj/machinery/door/airlock/freezer{ name = "Kitchen Cold Room"; @@ -32841,11 +32560,6 @@ /area/crew_quarters/kitchen) "bev" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; @@ -32854,28 +32568,28 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start{ + name = "Chef" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bew" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/light_switch{ - pixel_x = 24 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bex" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/computer/guestpass{ + pixel_y = 23 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bey" = ( @@ -32903,6 +32617,8 @@ /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/standard, +/obj/machinery/microwave, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "beA" = ( @@ -32957,8 +32673,8 @@ /area/hydroponics) "beF" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -32986,9 +32702,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "beI" = ( @@ -33164,7 +32878,7 @@ "bfb" = ( /obj/machinery/door/airlock/freezer{ name = "Service"; - req_access = list(28) + req_one_access = list(35,28) }, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -33183,18 +32897,13 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bfe" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/camera/network/civilian{ - dir = 1 +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -25 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -33290,20 +32999,15 @@ /area/tether/surfacebase/servicebackroom) "bfn" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/table/standard, +/obj/machinery/reagentgrinder, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bfo" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, +/obj/structure/table/gamblingtable, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bfp" = ( @@ -33413,47 +33117,64 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "bfz" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether/surfacebase/barbackmaintenance) -"bfA" = ( -/obj/structure/table/gamblingtable, -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether/surfacebase/barbackmaintenance) -"bfB" = ( -/obj/structure/bed/chair/wood, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether/surfacebase/barbackmaintenance) -"bfC" = ( -/obj/structure/table/gamblingtable, -/obj/item/weapon/deck/cards, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether/surfacebase/barbackmaintenance) -"bfD" = ( /obj/structure/bed/chair/comfy/beige{ dir = 8 }, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) -"bfE" = ( -/obj/machinery/light/small, +"bfA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) -"bfF" = ( -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether/surfacebase/barbackmaintenance) -"bfG" = ( +"bfB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +"bfC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /obj/structure/cable/green{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 4; + icon_state = "1-4" }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/barbackmaintenance) +"bfD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/eris/steel/bar_dance, +/area/tether/surfacebase/barbackmaintenance) +"bfE" = ( +/obj/structure/bed/chair/wood, +/turf/simulated/floor/tiled/eris/steel/bar_dance, +/area/tether/surfacebase/barbackmaintenance) +"bfF" = ( +/obj/structure/bed/chair/comfy/beige{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/steel/bar_dance, +/area/tether/surfacebase/barbackmaintenance) +"bfG" = ( +/obj/structure/table/gamblingtable, +/obj/item/weapon/storage/pill_bottle/dice_nerd, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bfH" = ( @@ -33496,7 +33217,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "bfK" = ( -/obj/machinery/light/small, +/obj/structure/table/gamblingtable, +/obj/item/weapon/deck/cards, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bfL" = ( @@ -33510,23 +33232,18 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/servicebackroom) "bfM" = ( -/obj/structure/bed/chair/comfy/beige{ +/obj/machinery/door/airlock{ + name = "Unit 3" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +"bfN" = ( +/obj/machinery/recharge_station, +/obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether/surfacebase/barbackmaintenance) -"bfN" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether/surfacebase/barbackmaintenance) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "bfO" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -33539,22 +33256,16 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bfP" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/steel/bar_light, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "bfQ" = ( -/obj/structure/table/gamblingtable, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23 }, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) @@ -33563,10 +33274,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bfS" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/structure/bed/chair/comfy/beige{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) @@ -33619,9 +33331,6 @@ /obj/machinery/chemical_dispenser/bar_alc/full{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/light{ dir = 1 }, @@ -33651,6 +33360,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, +/obj/machinery/camera/network/civilian{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bga" = ( @@ -33684,7 +33396,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bgf" = ( -/obj/machinery/camera/network/civilian, +/obj/structure/noticeboard{ + pixel_y = 29 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgg" = ( @@ -33743,15 +33457,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/entertainment/stage) "bgl" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 8 +/obj/structure/table/gamblingtable, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/steel/bar_light, +/turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bgm" = ( /obj/machinery/alarm{ @@ -33763,12 +33473,22 @@ /area/tether/surfacebase/southhall) "bgn" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/table/standard, +/obj/item/weapon/storage/box/beakers{ + name = "box of measuring cups"; + pixel_x = 2; + pixel_y = 3; + starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7) + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgo" = ( @@ -33779,41 +33499,51 @@ /area/tether/surfacebase/entertainment/stage) "bgp" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) -"bgq" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/structure/table/standard, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"bgr" = ( -/obj/effect/floor_decal/corner/grey/diagonal, +"bgq" = ( /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/appliance/cooker/oven, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) +"bgr" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/machinery/appliance/cooker/grill, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 10 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgs" = ( -/obj/machinery/hologram/holopad, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/standard, +/obj/item/weapon/packageWrap, +/obj/item/device/destTagger{ + pixel_x = 4; + pixel_y = 3 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgt" = ( @@ -33834,6 +33564,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/alarm{ + pixel_y = 25 + }, +/obj/item/weapon/tool/wrench, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgu" = ( @@ -33865,27 +33599,18 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/sink/kitchen{ - pixel_y = 28 - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/barbackmaintenance) "bgz" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -33970,24 +33695,25 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bgG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/button/windowtint{ - id = "secreet"; - name = "Window Tint Control"; - pixel_x = -25; - range = 15 +/obj/structure/table/gamblingtable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bgH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio/intercom{ - dir = 8; - pixel_x = -24 +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "secreet"; + name = "Tintable Window" }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, +/obj/structure/window/reinforced/polarized{ + dir = 4; + id = "secreet"; + name = "Tintable Window" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, /area/tether/surfacebase/barbackmaintenance) "bgI" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -34001,6 +33727,7 @@ /area/tether/surfacebase/servicebackroom) "bgJ" = ( /obj/machinery/door/airlock{ + id_tag = "barbackdoor"; name = "Service"; req_access = list(25) }, @@ -34059,10 +33786,6 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "bgP" = ( @@ -34107,7 +33830,6 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/bar_backroom) "bgR" = ( -/obj/machinery/door/airlock/maintenance/common, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -34120,87 +33842,57 @@ dir = 8 }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/techmaint, -/area/crew_quarters/bar) -"bgS" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/techmaint, /area/crew_quarters/barrestroom) -"bgT" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +"bgS" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) +"bgT" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "secreet"; + name = "Tintable Window" + }, +/obj/structure/window/reinforced/polarized{ + id = "secreet"; + name = "Tintable Window" + }, +/obj/structure/window/reinforced/polarized{ + dir = 4; + id = "secreet"; + name = "Tintable Window" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/surfacebase/barbackmaintenance) "bgU" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether/surfacebase/barbackmaintenance) +/obj/machinery/vending/nifsoft_shop, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/southhall) "bgV" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secreet"; - name = "Tintable Window" +/obj/machinery/vending/sovietsoda{ + dir = 8 }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/barbackmaintenance) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/southhall) "bgW" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secreet"; - name = "Tintable Window" +/obj/machinery/vending/cigarette{ + dir = 8 }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/cable/green, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/barbackmaintenance) +/turf/simulated/floor/tiled, +/area/tether/surfacebase/southhall) "bgX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -34208,31 +33900,6 @@ /obj/machinery/camera/network/research/xenobio, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) -"bgY" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/cable/green, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/barbackmaintenance) -"bgZ" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/tiled/eris/steel/bar_dance, -/area/tether/surfacebase/barbackmaintenance) "bha" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -34254,63 +33921,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) -"bhb" = ( -/obj/structure/grille, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/window/reinforced/polarized{ - id = "secreet"; - name = "Tintable Window" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/barbackmaintenance) -"bhc" = ( -/obj/structure/grille, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/window/reinforced/polarized/full{ - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/window/reinforced/polarized{ - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/barbackmaintenance) -"bhd" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/window/reinforced/polarized{ - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/cable/green, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/barbackmaintenance) "bhe" = ( /obj/machinery/hologram/holopad, /obj/machinery/camera/network/research/xenobio{ @@ -34528,12 +34138,9 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/southhall) "bhz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - icon_state = "map-scrubbers" + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) @@ -34601,18 +34208,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/tether/surfacebase/southhall) -"bhL" = ( -/obj/machinery/atmospherics/pipe/tank/air, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/tether/surfacebase/topairlock) -"bhM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/tether/surfacebase/topairlock) "bhN" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/effect/floor_decal/industrial/warning{ @@ -34633,12 +34228,10 @@ "bhP" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10; - icon_state = "intact" + dir = 10 }, /obj/machinery/alarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/effect/floor_decal/rust, @@ -34659,18 +34252,9 @@ /obj/machinery/light/small, /turf/simulated/floor/plating, /area/tether/surfacebase/topairlock) -"bhS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/atmospherics/binary/passive_gate/on{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/topairlock) "bhT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/machinery/floodlight, /turf/simulated/floor/plating, @@ -34689,7 +34273,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -34763,7 +34346,6 @@ dir = 1 }, /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /turf/simulated/floor/tiled/dark, @@ -34797,8 +34379,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" + dir = 5 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) @@ -34869,8 +34450,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" + dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -35136,8 +34716,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) @@ -35173,7 +34752,6 @@ pixel_y = -1 }, /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -24 }, @@ -35260,7 +34838,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's set to Free-Anur-Entertanment, I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled, @@ -35269,7 +34846,6 @@ /obj/machinery/power/apc{ dir = 1; name = "north bump"; - pixel_x = 0; pixel_y = 28 }, /obj/structure/cable/green{ @@ -35410,8 +34986,7 @@ /area/tether/surfacebase/cafeteria) "bje" = ( /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) @@ -35433,8 +35008,7 @@ /area/tether/surfacebase/topairlock) "bjh" = ( /obj/machinery/vending/fitness{ - dir = 4; - icon_state = "fitness" + dir = 4 }, /obj/effect/floor_decal/corner/lightgrey{ dir = 5 @@ -35491,8 +35065,7 @@ /area/tether/surfacebase/topairlock) "bjo" = ( /obj/machinery/vending/coffee{ - dir = 4; - icon_state = "coffee" + dir = 4 }, /obj/effect/floor_decal/corner/lightgrey{ dir = 5 @@ -35531,7 +35104,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ desc = "Looks like it's set to history channel, the show is talking about modern aliens. I wonder what else is on?"; icon_state = "frame"; - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled, @@ -35620,13 +35192,11 @@ dir = 6 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/structure/table/glass, /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -4; - pixel_y = 0 + pixel_x = -4 }, /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; @@ -35640,13 +35210,16 @@ /area/tether/surfacebase/medical/triage) "bjJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "bjO" = ( /obj/machinery/status_display{ - density = 0; layer = 4; - pixel_x = 0; pixel_y = 32 }, /obj/machinery/portable_atmospherics/canister/oxygen/prechilled, @@ -35665,8 +35238,7 @@ /area/tether/surfacebase/medical/triage) "bjT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5; - icon_state = "intact-supply" + dir = 5 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) @@ -35680,9 +35252,7 @@ /obj/item/device/sleevemate, /obj/item/weapon/storage/box/body_record_disk, /obj/machinery/light{ - dir = 4; - icon_state = "tube1"; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -35698,7 +35268,6 @@ "bjY" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /obj/machinery/camera/network/medbay{ @@ -35924,15 +35493,6 @@ "bkC" = ( /turf/simulated/wall, /area/rnd/robotics/resleeving) -"bkD" = ( -/obj/machinery/optable{ - name = "Robotics Operating Table" - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/tiled/dark, -/area/rnd/robotics/surgeryroom1) "bkE" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -36044,14 +35604,14 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; - id = "shuttle blast"; + id = "tourbus_windows"; name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/eris/under, /area/shuttle/tourbus/general) "bkO" = ( @@ -36233,8 +35793,7 @@ /area/rnd/robotics/resleeving) "blm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5; - icon_state = "intact" + dir = 5 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -36271,8 +35830,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1; - icon_state = "warningcorner" + dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -36310,8 +35868,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -36335,8 +35892,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25; - pixel_y = 0 + pixel_x = 25 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/borderfloorwhite{ @@ -36424,7 +35980,6 @@ "blH" = ( /obj/structure/table/standard, /obj/machinery/firealarm{ - dir = 2; layer = 3.3; pixel_x = 4; pixel_y = 26 @@ -36448,7 +36003,6 @@ }, /obj/item/device/radio/intercom/department/medbay{ dir = 1; - pixel_x = 0; pixel_y = 24 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -36582,9 +36136,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 2 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -36609,22 +36161,22 @@ /obj/structure/bed/chair/wheelchair{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "32-2" - }, /obj/machinery/power/apc{ cell_type = /obj/item/weapon/cell/super; dir = 8; name = "west bump"; pixel_x = -30 }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "bmk" = ( /obj/structure/closet/crate{ icon_state = "crate"; - name = "Grenade Crate"; - opened = 0 + name = "Grenade Crate" }, /obj/item/weapon/grenade/chem_grenade, /obj/item/weapon/grenade/chem_grenade, @@ -36756,9 +36308,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bmx" = ( -/obj/machinery/light{ - dir = 2 - }, +/obj/machinery/light, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -36908,8 +36458,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled/white, @@ -36984,8 +36533,15 @@ dir = 4 }, /obj/structure/cable/green{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "bng" = ( @@ -36993,6 +36549,11 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "bnj" = ( @@ -37388,8 +36949,7 @@ }, /obj/item/device/radio/beacon, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - icon_state = "map-scrubbers" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -37535,8 +37095,7 @@ /area/tether/surfacebase/medical/admin) "boy" = ( /obj/effect/floor_decal/spline/plain{ - dir = 9; - icon_state = "spline_plain" + dir = 9 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -37544,14 +37103,13 @@ }, /obj/structure/window/reinforced/polarized{ dir = 8; - id = "cmo_office" + id = "iaar" }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "boA" = ( /obj/effect/floor_decal/spline/plain{ - dir = 8; - icon_state = "spline_plain" + dir = 8 }, /obj/structure/cable/green{ d1 = 4; @@ -37560,18 +37118,17 @@ }, /obj/structure/window/reinforced/polarized{ dir = 8; - id = "cmo_office" + id = "iaar" }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "boB" = ( /obj/effect/floor_decal/spline/plain{ - dir = 8; - icon_state = "spline_plain" + dir = 8 }, /obj/structure/window/reinforced/polarized{ dir = 8; - id = "cmo_office" + id = "iaar" }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) @@ -37581,7 +37138,7 @@ }, /obj/structure/window/reinforced/polarized{ dir = 8; - id = "cmo_office" + id = "iaar" }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) @@ -37602,16 +37159,33 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"brV" = ( -/obj/structure/railing{ - dir = 1; - icon_state = "railing0" +"bqw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/railing{ +/obj/machinery/requests_console/preset/hos{ + dir = 4; + pixel_x = -54 + }, +/turf/simulated/floor/carpet, +/area/tether/surfacebase/security/hos) +"bsa" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "kitchen"; + layer = 3.3; + name = "Kitchen Shutters" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/chemical_dispenser/bar_soft/full{ dir = 8 }, -/turf/simulated/open/virgo3b, -/area/tether/surfacebase/outside/outside3) +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "bsb" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -37715,8 +37289,7 @@ "bTC" = ( /obj/structure/table/reinforced, /obj/machinery/computer/skills{ - dir = 1; - icon_state = "laptop" + dir = 1 }, /obj/effect/floor_decal/spline/plain{ dir = 10 @@ -37759,6 +37332,13 @@ dir = 4 }, /obj/effect/map_helper/airlock/door/simple, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "tourbus_windows"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/tourbus/general) "cbn" = ( @@ -37773,14 +37353,18 @@ /area/tether/surfacebase/security/briefingroom) "cbM" = ( /obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/structure/closet/walllocker_double{ dir = 8; - icon_state = "spline_plain" - }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22; - pixel_y = 0 + pixel_x = -28 }, +/obj/item/device/camera, +/obj/item/device/camera_film, +/obj/item/device/taperecorder, +/obj/item/device/tape/random, +/obj/item/device/tape/random, +/obj/item/weapon/storage/secure/briefcase, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "ceN" = ( @@ -37881,7 +37465,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light/small, +/obj/machinery/light, /turf/simulated/floor/wood, /area/library) "cEx" = ( @@ -37911,6 +37495,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"cGs" = ( +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/bar) "cGt" = ( /obj/structure/cable/green{ d1 = 4; @@ -37944,8 +37531,7 @@ /area/rnd/research/researchdivision) "cMO" = ( /obj/effect/floor_decal/spline/plain{ - dir = 6; - icon_state = "spline_plain" + dir = 6 }, /obj/structure/window/reinforced/polarized{ dir = 4; @@ -38055,6 +37641,31 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"dbk" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + dir = 4; + id = "mechbay"; + name = "Mech Bay" + }, +/obj/machinery/button/remote/blast_door{ + id = "mechbay-inner"; + name = "Mech Bay"; + pixel_x = 27; + pixel_y = -5; + req_access = list(29,47); + req_one_access = list(47) + }, +/obj/machinery/button/remote/blast_door{ + id = "mechbay"; + name = "Mech Bay"; + pixel_x = 27; + pixel_y = 6; + req_access = list(29,47); + req_one_access = list(47) + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rnd/robotics/mechbay) "ddl" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 5 @@ -38078,15 +37689,15 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; dir = 4; icon_state = "pdoor0"; - id = "shuttle blast"; + id = "tourbus_windows"; name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/eris/under, /area/shuttle/tourbus/cockpit) "dgA" = ( @@ -38358,8 +37969,7 @@ "efR" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/floor_decal/spline/plain{ - dir = 1; - icon_state = "spline_plain" + dir = 1 }, /obj/machinery/power/apc{ dir = 1; @@ -38374,7 +37984,6 @@ "ehr" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -38522,15 +38131,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) @@ -38679,15 +38287,6 @@ }, /turf/simulated/wall, /area/tether/surfacebase/medical/storage) -"fNt" = ( -/obj/structure/cable/green{ - dir = 1 - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/steel_dirty, -/area/shuttle/tourbus/engines) "fNA" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/floor_decal/borderfloor{ @@ -38766,8 +38365,7 @@ /area/teleporter/departing) "gfg" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) @@ -38888,7 +38486,6 @@ /obj/effect/landmark{ name = "lightsout" }, -/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -38934,7 +38531,6 @@ /area/tether/surfacebase/southhall) "gSr" = ( /obj/machinery/power/apc{ - dir = 2; name = "south bump"; pixel_y = -28 }, @@ -39001,9 +38597,7 @@ /area/tether/surfacebase/security/breakroom) "gZR" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -39027,6 +38621,12 @@ /obj/machinery/computer/operating, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) +"hfN" = ( +/obj/machinery/camera/network/civilian{ + dir = 4 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "hgf" = ( /obj/machinery/door/firedoor/glass/hidden{ dir = 2 @@ -39122,7 +38722,9 @@ "hCz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/hatch, +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/shuttle_pad) @@ -39197,8 +38799,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 22; - pixel_y = 0 + pixel_x = 22 }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) @@ -39232,10 +38833,22 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "ieN" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 +/obj/effect/floor_decal/borderfloor{ + dir = 6 }, -/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/corner/red/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 6 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "ifI" = ( @@ -39350,9 +38963,7 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 2 - }, +/obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/red/bordercorner2, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) @@ -39387,6 +38998,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) +"iOL" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/uppernorthstairwell{ + name = "\improper North Medical Stairwell" + }) "iQr" = ( /obj/machinery/hologram/holopad, /obj/effect/landmark/start{ @@ -39663,6 +39283,13 @@ req_one_access = list(19,43,67); specialfunctions = 4 }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "tourbus_windows"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/tourbus/general) "jPW" = ( @@ -39672,8 +39299,16 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, +/obj/structure/sign/poster{ + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) +"jRO" = ( +/obj/effect/floor_decal/spline/plain, +/obj/item/weapon/stool/padded, +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/bar) "jSV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -39726,6 +39361,11 @@ /obj/structure/closet/emergsuit_wall{ pixel_y = 32 }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "tourbus_windows"; + name = "window blast shields" + }, /turf/simulated/floor/tiled/eris/white/orangecorner, /area/shuttle/tourbus/cockpit) "keg" = ( @@ -39750,8 +39390,7 @@ "keV" = ( /obj/effect/floor_decal/spline/plain, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) @@ -39833,11 +39472,6 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "kun" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; - req_access = list(67) - }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, @@ -39908,33 +39542,22 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"kyU" = ( -/obj/structure/railing{ - dir = 1; - icon_state = "railing0" - }, -/obj/structure/railing{ - dir = 4; - icon_state = "railing0" - }, -/turf/simulated/open/virgo3b, -/area/tether/surfacebase/outside/outside3) "kBF" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 }, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/portable_atmospherics/canister/phoron, -/obj/structure/window/reinforced{ - dir = 1 +/obj/machinery/door/window/southleft{ + dir = 1; + req_one_access = list(19,43,67) }, /turf/simulated/floor/tiled/eris/dark/bluecorner, /area/shuttle/tourbus/engines) "kCW" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/floor_decal/spline/plain{ - dir = 1; - icon_state = "spline_plain" + dir = 1 }, /obj/machinery/power/apc{ dir = 1; @@ -39955,8 +39578,7 @@ /area/tether/surfacebase/security/processing) "kGd" = ( /obj/effect/floor_decal/spline/plain{ - dir = 5; - icon_state = "spline_plain" + dir = 5 }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -39978,18 +39600,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "kRa" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner{ +/obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/effect/floor_decal/corner/red/bordercorner{ +/obj/effect/floor_decal/corner/red/border{ dir = 8 }, /turf/simulated/floor/tiled, @@ -40154,22 +39768,19 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "lxa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/wood, +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/carpet, /area/library) "lzq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, /obj/effect/floor_decal/corner/red/bordercorner{ - dir = 8; - icon_state = "bordercolorcorner" + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) @@ -40217,7 +39828,6 @@ "lFG" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight/lamp/green{ - dir = 2; pixel_x = -4; pixel_y = 12 }, @@ -40364,12 +39974,10 @@ /area/tether/surfacebase/security/breakroom) "mwz" = ( /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" + dir = 9 }, /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) @@ -40392,21 +40000,13 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"mAl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack, -/obj/random/maintenance/medical, -/obj/random/maintenance/clean, -/obj/random/medical/lite, -/obj/random/maintenance/medical, -/obj/random/toy, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) "mBz" = ( /obj/structure/closet/lawcloset, /obj/effect/floor_decal/spline/plain{ - dir = 5; - icon_state = "spline_plain" + dir = 5 + }, +/obj/machinery/alarm{ + pixel_y = 22 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) @@ -40646,25 +40246,19 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "nEn" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" - }, -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/red/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 6 - }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/red/bordercorner, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "nJe" = ( @@ -40707,8 +40301,7 @@ /area/hallway/lower/third_south) "nQA" = ( /obj/machinery/camera/network/security{ - dir = 8; - icon_state = "camera" + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -40722,6 +40315,13 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) +"nXZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "nYB" = ( /obj/structure/cable/green{ d1 = 1; @@ -40914,6 +40514,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"oII" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "oIJ" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -40946,8 +40553,7 @@ "oKw" = ( /obj/structure/table/reinforced, /obj/machinery/computer/skills{ - dir = 1; - icon_state = "laptop" + dir = 1 }, /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/dark, @@ -41062,13 +40668,6 @@ /obj/effect/floor_decal/techfloor/orange, /turf/simulated/floor/tiled/techfloor, /area/teleporter/departing) -"oWF" = ( -/obj/structure/railing{ - dir = 1; - icon_state = "railing0" - }, -/turf/simulated/open/virgo3b, -/area/tether/surfacebase/outside/outside3) "oXx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -41244,8 +40843,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/camera/network/security{ - dir = 10 +/obj/machinery/newscaster/security_unit{ + pixel_y = -32 }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) @@ -41415,6 +41014,14 @@ /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/structure/window/reinforced, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "tourbus_windows"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/engines) "qoL" = ( @@ -41471,22 +41078,17 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "qzU" = ( /obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" + dir = 6 }, /obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) @@ -41569,21 +41171,21 @@ /obj/structure/bed/chair/comfy/black, /obj/machinery/button/windowtint{ id = "hos_office"; - pixel_x = -36; - pixel_y = -26; + pixel_x = -32; + pixel_y = -25; req_access = list(58) }, /obj/machinery/button/remote/airlock{ id = "HoSdoor"; name = "Office Door"; - pixel_x = -28; - pixel_y = -24 + pixel_x = -26; + pixel_y = -22 }, /obj/machinery/button/remote/blast_door{ id = "surfbriglockdown"; name = "Brig Lockdown"; - pixel_x = -28; - pixel_y = -36; + pixel_x = -26; + pixel_y = -33; req_access = list(2) }, /obj/effect/landmark/start{ @@ -41592,6 +41194,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/machinery/keycard_auth{ + pixel_x = -36; + pixel_y = -34 + }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) "rbR" = ( @@ -41676,11 +41282,21 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) +"rBz" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "rCt" = ( /obj/structure/closet/lawcloset, /obj/effect/floor_decal/spline/plain{ - dir = 9; - icon_state = "spline_plain" + dir = 9 + }, +/obj/machinery/alarm{ + pixel_y = 22 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) @@ -41731,10 +41347,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "rMS" = ( @@ -41857,6 +41469,21 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"soG" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/landmark/start{ + name = "Chef" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) +"sts" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/foodcart, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "suT" = ( /obj/structure/cable/green{ d1 = 4; @@ -41874,6 +41501,9 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/camera/network/security{ + dir = 8 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) "sDG" = ( @@ -41928,13 +41558,13 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/door/window/southleft{ - dir = 1; - req_one_access = list(19,43,67) - }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 9 }, +/obj/machinery/door/window/southright{ + dir = 1; + req_one_access = list(19,43,67) + }, /turf/simulated/floor/tiled/eris/dark/bluecorner, /area/shuttle/tourbus/engines) "sJv" = ( @@ -42019,8 +41649,7 @@ "sTM" = ( /obj/structure/table/woodentable, /obj/machinery/computer/skills{ - dir = 8; - icon_state = "laptop" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -42111,8 +41740,7 @@ "tki" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) @@ -42427,9 +42055,7 @@ /obj/structure/table/reinforced, /obj/item/device/megaphone, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -42527,11 +42153,8 @@ /obj/machinery/papershredder, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 9 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) @@ -42597,6 +42220,16 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/item/weapon/pen/blue{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/weapon/pen/blade/red{ + pixel_x = -2; + pixel_y = -2 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "voF" = ( @@ -42702,8 +42335,7 @@ /area/tether/surfacebase/security/breakroom) "vEm" = ( /obj/effect/floor_decal/spline/plain{ - dir = 1; - icon_state = "spline_plain" + dir = 1 }, /obj/structure/bookcase, /obj/item/weapon/book/manual/standard_operating_procedure, @@ -42713,8 +42345,7 @@ /obj/item/weapon/book/manual/command_guide, /obj/item/weapon/book/manual/command_guide, /obj/effect/floor_decal/spline/plain{ - dir = 1; - icon_state = "spline_plain" + dir = 1 }, /obj/machinery/camera/network/security, /turf/simulated/floor/tiled/dark, @@ -42791,15 +42422,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) -"vSu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/steel, -/obj/item/weapon/reagent_containers/food/drinks/cup{ - desc = "Taste liberty"; - name = "Cup of Liber-tea" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) "vTf" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -42831,8 +42453,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/teleporter/departing) @@ -42886,13 +42507,20 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor, /area/tether/surfacebase/security/briefingroom) -"wiX" = ( -/obj/machinery/camera/network/civilian{ - dir = 9 +"wju" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "kitchen"; + layer = 3.3; + name = "Kitchen Shutters" }, -/obj/machinery/photocopier, -/turf/simulated/floor/wood, -/area/library) +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "wlf" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -42909,8 +42537,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -22; - pixel_y = 0 + pixel_x = -22 }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) @@ -42933,8 +42560,7 @@ }, /obj/machinery/newscaster{ layer = 3.3; - pixel_x = -27; - pixel_y = 0 + pixel_x = -27 }, /obj/effect/floor_decal/spline/plain{ dir = 10 @@ -43001,16 +42627,36 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; - id = "shuttle blast"; + id = "tourbus_windows"; name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/eris/under, /area/shuttle/tourbus/general) +"wBv" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "kitchen"; + layer = 3.3; + name = "Kitchen Shutters" + }, +/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3 + }, +/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "wKZ" = ( /obj/effect/landmark/start{ name = "Medical Doctor" @@ -43064,9 +42710,7 @@ "wQs" = ( /obj/item/device/radio/intercom/department/security{ dir = 4; - icon_state = "secintercom"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -43229,8 +42873,7 @@ "xsf" = ( /obj/structure/disposalpipe/segment, /obj/machinery/camera/network/security{ - dir = 5; - icon_state = "camera" + dir = 5 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -43303,17 +42946,21 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 22; - pixel_y = 0 +/obj/structure/closet/walllocker_double{ + dir = 4; + pixel_x = 28 }, +/obj/item/device/camera, +/obj/item/device/camera_film, +/obj/item/device/taperecorder, +/obj/item/device/tape/random, +/obj/item/device/tape/random, +/obj/item/weapon/storage/secure/briefcase, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "xHg" = ( /obj/effect/floor_decal/spline/plain{ - dir = 1; - icon_state = "spline_plain" + dir = 1 }, /obj/structure/bookcase, /obj/item/weapon/book/manual/standard_operating_procedure, @@ -43323,8 +42970,7 @@ /obj/item/weapon/book/manual/command_guide, /obj/item/weapon/book/manual/command_guide, /obj/effect/floor_decal/spline/plain{ - dir = 1; - icon_state = "spline_plain" + dir = 1 }, /obj/machinery/camera/network/security, /turf/simulated/floor/tiled/dark, @@ -43372,9 +43018,7 @@ /obj/structure/table/reinforced, /obj/item/weapon/folder/red_hos, /obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 + dir = 1 }, /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -43463,6 +43107,16 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/item/weapon/pen/blade/red{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/pen/blue{ + pixel_x = 2; + pixel_y = 3 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "yhU" = ( @@ -43473,7 +43127,6 @@ }, /obj/machinery/firealarm{ dir = 1; - pixel_x = 0; pixel_y = -25 }, /turf/simulated/floor/wood, @@ -47394,7 +47047,7 @@ aac aac aac aac -aFf +aac aac aac aac @@ -47535,9 +47188,9 @@ aac aac aac aac -aFf -aFh -aFf +aac +aac +aac aac aac aac @@ -47678,7 +47331,7 @@ aac aac aac aac -aFf +aac aac aac aac @@ -48688,7 +48341,7 @@ aac aac aac aac -aac +aaq adG adG adG @@ -51251,7 +50904,7 @@ aLS azL azL azL -aac +aaq aab aab aab @@ -51596,7 +51249,7 @@ aab aab aab aab -aab +aMG aac aac aac @@ -51737,10 +51390,10 @@ aab aab aab aab -aeu -aeu -aac -aac +aNU +adG +aaq +aaq aac aac aac @@ -51787,10 +51440,10 @@ aac aEi aXH axh -aXN -agD +afL +agy ahk -aiz +aiA atE ahi awA @@ -51810,11 +51463,11 @@ aTh aJN aJW aKR -aLW +aFW aMz aNF bkp -bkD +aKk bkP blc aac @@ -51881,8 +51534,8 @@ aab aOm adG adG -aac -aac +aaq +aaq aac aac aac @@ -51927,13 +51580,13 @@ afj afj afi aXG -aXI +adL ayi -aXO -aXQ -aXR -aiA -atF +afV +agD +ahm +ajy +azn awD axI axN @@ -52073,8 +51726,8 @@ aXJ afh aXL afh -ahm -ajy +ahn +ajI atE awx awB @@ -52215,7 +51868,7 @@ aXL afh aXP afh -ahn +aho ajE atT atU @@ -52353,12 +52006,12 @@ awM afj arn afh -afL -agy +aeu +aeK agC ahg -aho -ajI +aiz +atF atT aur avt @@ -52660,9 +52313,9 @@ aAV aCz aHO aAV -aKJ -aLu -aMs +aFv +aFV +aHD aNf aXm aAV @@ -53161,7 +52814,7 @@ adG agQ aWv aWv -kkW +bqw lpg pOZ aWv @@ -53511,7 +53164,7 @@ aXd aHQ aIx aJg -aJS +aJT aKO aLU aKO @@ -53744,7 +53397,7 @@ whW whW iLF adO -ieN +qAt nEn adT afw @@ -53794,7 +53447,7 @@ fgW aGW aHR aAs -aJg +dbk aJU aKQ aLV @@ -53887,11 +53540,11 @@ rnn agb adO adi -aeJ -afV ahw aeJ -adi +aeJ +axn +aeJ aeJ aWn ajM @@ -54029,7 +53682,7 @@ afl eCP adO adp -aeK +afs agG ahx ahI @@ -54068,8 +53721,8 @@ azi aAw azP aCG -aEE -aER +azT +azT aFn aFt aGY @@ -54212,10 +53865,10 @@ azP aLP azT aEU -aBs +aHc aFu aHc -aXf +aEU axg aGZ aHR @@ -54353,9 +54006,9 @@ aCM azP aCH azT -azT -aBs -azT +aEG +aAE +aFU lxa aEV axg @@ -54458,7 +54111,7 @@ aep aft agU kRa -aft +ayC aiR aiW rJT @@ -54494,12 +54147,12 @@ aTT azP azP aIE -aEP +azT aEG -aBs +aEu +aAA aFU -aFU -aHc +aER axg aHb aHR @@ -54518,7 +54171,7 @@ jML jHw jpB qWU -aSP +aKY aKU aOI aPb @@ -54635,13 +54288,13 @@ awd azQ aAz akM +aAi azT -aEH -aAA -aBs -azT -azT -aHc +aEU +aEz +aEP +aEP +aFs axi aGX aHR @@ -54778,7 +54431,7 @@ azR aAA azV azT -aEI +azT aEI aBs aGw @@ -55016,8 +54669,8 @@ aaE abk abP acv -abS -adt +abR +abe aaE aeD afW @@ -55061,7 +54714,7 @@ ayA azW aFr aEJ -aGx +aFr aXo aFc aFr @@ -55086,7 +54739,7 @@ rbR hCB wQf tLv -fNt +qom aKU aOI aPb @@ -55108,10 +54761,10 @@ biA bhE aac aac -aac +aaq adG adG -oWF +aOi aab aab aab @@ -55158,8 +54811,8 @@ aaF abl abQ acw -adL -adL +acw +acw blT blU hLd @@ -55200,13 +54853,13 @@ ajM aoI axk azh -wiX -azT +aMk +ayG aBt -aEu -aEK +azT +aXC aFd -aFs +azT azT aMk aXw @@ -55253,7 +54906,7 @@ bhE bhE bhE adG -oWF +aOi aab aab aab @@ -55301,7 +54954,7 @@ abm abR abR abR -vSu +abS aaE bmo orc @@ -55345,10 +54998,10 @@ axg axg aHd aBv -aEz -aEO +azT +aXC aFe -aFs +azT aBq axg axg @@ -55370,7 +55023,7 @@ caw jHw gHh qWU -aSP +aKY aKU aOI aKj @@ -55395,7 +55048,7 @@ bje bjl bhE adG -oWF +aOi aab aab aab @@ -55438,9 +55091,9 @@ aac aac aac aac -aaF +aaE aky -mAl +aas abR adZ abR @@ -55455,7 +55108,7 @@ agk trA aUs aeG -aix +aFf aWL aNp alj @@ -55485,12 +55138,12 @@ ape aEA ahd axg -azT +ayI aCF -aEC +azT aXC aEC -aCF +aEH aSF axg atH @@ -55524,7 +55177,7 @@ csd ehr bhE bhF -bhM +aLW bhQ bhW bib @@ -55537,7 +55190,7 @@ biR biR bhE adG -oWF +aOi aab aab aab @@ -55679,7 +55332,7 @@ bjf bjm bhE adG -oWF +aOi aab aab aab @@ -55777,7 +55430,7 @@ bcI aAB aCL aut -aFV +aEO aAB aHf aHW @@ -55807,9 +55460,9 @@ ddl hmT gSr bhE -bhL +aLu bhO -bhS +aMs bhE bic bil @@ -55821,7 +55474,7 @@ bjg bjn bhE adG -kyU +aOs aab aab aab @@ -55855,7 +55508,7 @@ aab aab aab aab -aas +aOn ajG ajG aad @@ -55917,9 +55570,9 @@ bgg bdb bdp bgP -aCP -aFx -aFW +aAx +aCQ +aFh aGz aXM aHX @@ -55964,7 +55617,7 @@ bhE bhE adG adG -oWF +aOi aab aab aab @@ -56016,7 +55669,7 @@ acR aap akb aFC -aSN +aSM ahY afz bnX @@ -56059,8 +55712,8 @@ bcU bdd aFY aAB -aCQ -azn +aCP +aEK aFX aAB aZD @@ -56106,7 +55759,7 @@ bjo biF biF adG -oWF +aOi aab aab aab @@ -56248,7 +55901,7 @@ biL bjs biF adG -oWF +aOi aab aab aab @@ -56390,7 +56043,7 @@ biL biL bjw adG -oWF +aOi aab aab aab @@ -56427,7 +56080,7 @@ ajG ajG ajG aag -abe +abq aee aah bjO @@ -56532,7 +56185,7 @@ bjp bjj bjw adG -oWF +aOi aab aab aab @@ -56570,7 +56223,7 @@ ajG ajG aag abq -abq +iOL aah aaI agj @@ -56674,7 +56327,7 @@ bjq bjj bjw adG -oWF +aOi aab aab aab @@ -56777,8 +56430,8 @@ bds aIa aIB ats -aKk -aKY +aFq +aFx aKj aMe aMD @@ -56816,7 +56469,7 @@ bjq bjt biF adG -oWF +aOi aab aab aab @@ -56958,7 +56611,7 @@ bjq bjj bjw adG -oWF +aOi aab aab aab @@ -57100,7 +56753,7 @@ bjr bjj bjw adG -oWF +aOi aab aab aab @@ -57242,7 +56895,7 @@ biL biL bjw adG -oWF +aOi aab aab aab @@ -57355,7 +57008,7 @@ aNk uSA aNJ aNP -aSO +aKJ aKU abg aOk @@ -57384,7 +57037,7 @@ biL bju biF adG -oWF +aOi aab aab aab @@ -57465,7 +57118,7 @@ xUo fOj ahR arG -akH +xEB akH akH aGv @@ -57497,7 +57150,7 @@ aNl aNl aNK aNP -aSO +aKJ aKU abg aOk @@ -57526,7 +57179,7 @@ biL biL bjw adG -oWF +aOi aab aab aab @@ -57608,7 +57261,7 @@ apS ajX aZW baw -baw +baO avn avn aKx @@ -57639,7 +57292,7 @@ aNm aNl aNK aNP -aSO +aKJ aKU abg aOk @@ -57668,7 +57321,7 @@ bjr bjj bjw adG -oWF +aOi aab aab aab @@ -57749,8 +57402,8 @@ aXT aXT bbN aru -avp -avp +aGh +aru avp atl avd @@ -57810,7 +57463,7 @@ bjq bjj bjw adG -oWF +aOi aab aab aab @@ -57885,12 +57538,12 @@ aqh agw apc asZ -aVw -axn +anN +aVO ate -ayG -aZg -bda +ate +baB +asD baM api atf @@ -57903,10 +57556,10 @@ bfZ aHy bee aCT -aIl +cGs aHs baA -aIN +aIl aIO bgD asX @@ -57952,7 +57605,7 @@ bjq bjt biF adG -oWF +aOi aab aab aab @@ -58027,37 +57680,37 @@ aqi apc apc avg -aVy -axn +anN +aVO +ate ate -ayI baB -aru +awv asw beF -anj +bda atO +soG anj -awc bfe avy bgf avM -asX +aJS asX aIl aHB aJv aIH -aIO +jRO bcc bdM bdQ arJ -aGK -aGK -aGK -aGK +arJ +arJ +arJ +arJ aKj aKj aKj @@ -58094,7 +57747,7 @@ bjq bjj bjw adG -oWF +aOi aab aab aab @@ -58164,7 +57817,7 @@ ioG aom aXZ aYd -aYk +adt aqj aoH aww @@ -58179,10 +57832,10 @@ beu aqY anj anj +oII anj -aGh aLc -avo +wBv avz avM asX @@ -58195,22 +57848,22 @@ aKq bck aKr beh -aGK +ayM aya bcd ayh ayE -aGK +bfP aAl aId bdA ayM -bgG -bgH -bfo -bfN -bgZ -bhb +aac +aac +aac +aac +aac +aac aac aac aac @@ -58236,7 +57889,7 @@ bjp bjj bjw adG -oWF +aOi aab aab aab @@ -58312,7 +57965,7 @@ apg apc aGH aVB -axn +aVO aZQ bga bgc @@ -58323,7 +57976,7 @@ azZ atJ atQ bfd -awc +anj avm avz avM @@ -58339,20 +57992,20 @@ aAF bcb bgS bgy -bdY -aGK -aGK -aGK -aAx +bgy +bem +bfC +bcd +bcd aIe bdK ayM -bef -bel -bfz -bfP -bfK -bhc +aac +aac +aac +aac +aac +aac aac aac aac @@ -58378,7 +58031,7 @@ biL biL bjw adG -oWF +aOi aab aab aab @@ -58452,20 +58105,20 @@ awP awP awP awP -aTE -aVC -axn +aGH +aVB +aVO bdB ayL baP -aru +avp asL bdx bez beI bgn aKu -awc +anj avo avz avM @@ -58479,22 +58132,22 @@ bbP bcm aAG bgF -aGK -ayd -bdZ -ayC -ayF -aGK -aAE -baR -bdL ayM -beg -bem -bfA -bfQ -bfM -bhc +ayM +ayM +ayM +ayF +ayM +ayM +ayM +ayM +ayM +aac +aac +aac +aac +aac +aac aac aac aac @@ -58520,7 +58173,7 @@ biL bjv biF adG -oWF +aOi aab aab aab @@ -58600,14 +58253,14 @@ aVO ate aFK bbI -aru +avp aCq -beH +baq atM -atL +bgx aBx -bfn -aLc +baq +anj avo avz avM @@ -58621,22 +58274,22 @@ bbT bcm aAG bfR -aGK +ayM ayc bdZ -aGK -aGK -aGK -aCn -baR -bdN -ayM -beg ben -bfB +bfD bfQ -bfM -bhc +aCn +bea +bec +aac +aac +aac +aac +aac +aac +aac aac aac aac @@ -58662,7 +58315,7 @@ biF biF biF adG -oWF +aOi aab aab aab @@ -58745,11 +58398,11 @@ aru aru aKy beH -anj +bfn baq bgp baE -awc +aLc axt avA aCi @@ -58763,22 +58416,22 @@ bbU bdJ aAG aIS -aGK -bdU +ayM +bdV bea ayD -ayF -aGK -aFq -bbX -bdW -ayM -beg -bem -bfC -bfQ -bfM -bhc +bfF +bfS +bea +bea +bec +aac +aac +aac +aac +aac +aac +aac aac aac aac @@ -58800,11 +58453,11 @@ bhm bhH beU aPs -aac +aaq adG adG adG -oWF +aOi aab aab aab @@ -58883,17 +58536,17 @@ aWE aWE beE beM -aru +amY ani -bcf -bdE anj -baq -bgp -baE -awv -aru -aru +bgx +anj +bgx +nXZ +bgx +anj +wju +bsa aru bgj aET @@ -58905,22 +58558,22 @@ bbV aAc aEl baC -aGK +ayM bdV beb -aGK -aGK -aGK -aFv -baR -aFv -ayM -bgU beo -bfD +bfG bgl -bfK -bhc +aFA +bea +bec +aac +aac +aac +aac +aac +aac +aac aac aac aac @@ -59026,16 +58679,16 @@ beC beK bcN bcg -anN +anj atA aAL -avL +anj aGi bgq bgr anj -aZX -baO +anj +anj aru avJ aIM @@ -59047,22 +58700,22 @@ bfY bbY aIf aIU -aGK +ayM ayd ayb -ayb -bfE -aGK -aFy -bdz -bdX -bgT -bei bep -bfG -bfS -bfF -bhc +bfE +bgG +aFy +bea +bec +aac +aac +aac +aac +aac +aac +aac aac aac aac @@ -59085,7 +58738,7 @@ bhI bhI bhK adG -brV +aOF aab aab aab @@ -59167,15 +58820,15 @@ aVP aVP aFS beO -amY +aru +aES +aIN +aCf +anj +bgx +nXZ baq anj -aCf -aru -bgx -anj -baE -bgs anj anj bcu @@ -59189,23 +58842,23 @@ bbS bbZ aIf baT -aGK -aHD -aHD -aHD -aHD -aGK +ayM +bea +beb +bfo +bfK +bfo aFA -ayM +bea bec -ayM -bgV -bgW -bgY -bgY -bgY -bhd -aQf +aac +aac +aac +aac +aac +aac +aac +aac aac aac aac @@ -59227,7 +58880,7 @@ bhI bhI bhK adG -oWF +aOi aab aab aab @@ -59309,13 +58962,13 @@ aVy aVy aop aKm -aru -asM -anj +avL +atA +aZX aBD -aES -aGr anj +bgx +rBz bew bfp bfl @@ -59331,16 +58984,16 @@ bgC bgE aIf baW -aGK -aGK -aGK -aGK -aGK -aGK +ayM +bea aHC -ayM -ayM -ayM +bfz +bfz +bfz +aHC +bea +bec +aac aac aac aac @@ -59361,15 +59014,15 @@ aac aac aac aPs -beU -beU -beU +bgU +bgV +bgW aPs bhI bhI aPs adG -oWF +aOi aab aab aab @@ -59470,18 +59123,18 @@ ato bcp atN arJ -arJ -bgR -arJ aGK -aAi -aAe -aAe -aAe -aAe -aAj -ayM -aac +bgR +aGK +aGK +aGK +aGK +aGK +aGK +aGK +bgH +bgH +bgT aac aac aac @@ -59511,7 +59164,7 @@ aPs aPs aPs adG -oWF +aOi aab aab aab @@ -59596,10 +59249,10 @@ awQ aru bgt bbm -baX -anj +bcf +bgs bch -anj +sts aru bge bfm @@ -59615,14 +59268,12 @@ aJt ayJ bbW aAe -aAe +aVC aAj -ayM -ayM -ayM -ayM -ayM -ayM +bei +bfA +aTE +aGK aac aac aac @@ -59651,9 +59302,11 @@ aac aac aac aac +aac +aac +aaq adG -adG -oWF +aOi aab aab aab @@ -59754,12 +59407,17 @@ aIQ aph azt aJt -ayM -ayM -ayM -ayM -ayM -ayM +aGx +aTE +aVw +aTE +beg +aTE +bfB +aTE +aGK +aaq +aaq aac aac aac @@ -59770,12 +59428,6 @@ aac aac aac aac -aac -aac -aac -aac -aac -aab aab aac aac @@ -59792,8 +59444,9 @@ aac aac aac aac -aab -aNM +aac +aac +aac aNM aab aab @@ -59863,7 +59516,7 @@ acV acV axr ayK -axq +hfN atg aSy aop @@ -59896,24 +59549,23 @@ axy aHv bdO aJt +aGx +aTE +aGK +bdL +aGK +bel +aGK +bfM +aGK +aaq +aaq aac aac aac aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aab -aab -aab +aab +aab aab aab aab @@ -59933,8 +59585,9 @@ aac aac aac aac -aab -aab +aac +aac +aac aab aab aab @@ -60038,17 +59691,17 @@ bdn aKs axu aJt -aac -aac -aac -aab -aab -aab -aab -aab -aab -aab -aab +aQf +aTE +aGK +bef +aGK +bef +aGK +bfN +aGK +adG +aOi aab aac aac @@ -60063,7 +59716,7 @@ aab aab aab aab -aab +aac aac aac aac @@ -60180,34 +59833,34 @@ axp bbQ axx aJt +aGK +aGK +aGK +aGK +aGK +aGK +aGK +aGK +aGK +adG +aOi +aab +aab +aab +aab +aab +aab +aab +aab +aab +aab +aab +aab +aab +aab +aab aac aac -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aac aac aac aac @@ -60323,6 +59976,15 @@ aJt aJt aJt adG +adG +adG +adG +adG +adG +adG +adG +adG +adG aOi aab aab @@ -60373,15 +60035,6 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab aaa "} (120,1,1) = {" @@ -60465,15 +60118,15 @@ adG adG adG adG -aOi -aab -aab -aab -aab -aab -aab -aab -aab +adG +aNB +aNM +aNM +aNM +aNM +aNM +aNM +aNM aab aab aab @@ -60607,7 +60260,7 @@ aNM aNM aNM aNM -aab +aNM aab aab aab diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index c6f77b2b27b..c369da1318a 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -655,12 +655,9 @@ /turf/simulated/floor/tiled/dark, /area/tether/station/burial) "abi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -23; - pixel_y = 0 - }, +/obj/structure/closet, +/obj/random/contraband, +/obj/random/junk, /turf/simulated/floor, /area/maintenance/station/eng_lower) "abj" = ( @@ -1178,7 +1175,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) "acj" = ( -/obj/effect/decal/cleanable/dirt, +/obj/random/junk, /turf/simulated/floor, /area/maintenance/station/eng_lower) "ack" = ( @@ -1251,13 +1248,34 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"acv" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/cap/visible/scrubbers{ - dir = 4 +"acu" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23; + pixel_y = 0 }, /turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) +/area/maintenance/station/eng_lower) +"acv" = ( +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/random/junk, +/obj/structure/symbol/lo{ + pixel_x = -32 + }, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) +"acw" = ( +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/random/junk, +/obj/random/maintenance/engineering, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "acx" = ( /obj/structure/cable/green{ d1 = 2; @@ -1281,12 +1299,13 @@ /turf/simulated/wall/r_wall, /area/engineering/hallway) "acA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet, -/obj/random/contraband, -/obj/random/junk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor, -/area/maintenance/station/eng_lower) +/area/engineering/shaft) "acB" = ( /obj/structure/table/steel, /obj/random/tool, @@ -1347,25 +1366,19 @@ /turf/simulated/wall/r_wall, /area/engineering/engine_smes) "acM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/structure/disposalpipe/broken{ - dir = 4; - icon_state = "pipe-b" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) +/area/maintenance/station/eng_lower) "acN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -1512,10 +1525,22 @@ /turf/simulated/floor, /area/engineering/engine_monitoring) "adg" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2"; + pixel_y = 0 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor, -/area/maintenance/station/eng_lower) +/area/maintenance/substation/civilian) "adh" = ( /obj/structure/girder, /turf/simulated/floor, @@ -1525,6 +1550,14 @@ /obj/random/drinkbottle, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"adj" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor, +/area/storage/emergency_storage/emergency4) "adk" = ( /obj/structure/railing{ dir = 1 @@ -1625,6 +1658,14 @@ }, /turf/simulated/floor, /area/vacant/vacant_restaurant_lower) +"adq" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/storage/emergency_storage/emergency4) "adr" = ( /obj/structure/flora/pottedplant, /obj/effect/floor_decal/corner/blue/full{ @@ -1636,6 +1677,23 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary) +"ads" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/random/junk, +/turf/simulated/floor, +/area/maintenance/substation/civilian) "adt" = ( /obj/structure/cable/green{ d1 = 1; @@ -1932,6 +1990,19 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"adU" = ( +/obj/machinery/light/small, +/obj/structure/closet/firecloset/full/double, +/turf/simulated/floor, +/area/storage/emergency_storage/emergency4) +"adV" = ( +/obj/structure/closet/crate, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/engineering, +/obj/random/junk, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "adW" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ @@ -1958,6 +2029,31 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) +"adZ" = ( +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/random/maintenance/clean, +/obj/random/maintenance/engineering, +/obj/random/tool, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/random/maintenance/engineering, +/obj/random/maintenance/clean, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "aea" = ( /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) @@ -1965,10 +2061,37 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"aec" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/random/junk, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "aed" = ( /obj/machinery/computer/supplycomp, /turf/simulated/floor/tiled/dark, /area/bridge/secondary) +"aee" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "aef" = ( /obj/random/junk, /obj/random/trash, @@ -2009,24 +2132,29 @@ /turf/simulated/floor, /area/hallway/station/docks) "ael" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" +/obj/machinery/atmospherics/valve/digital/open, +/obj/structure/railing{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/meter{ - frequency = 1443; - id = "dist_aux_meter"; - name = "Distribution Loop" - }, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; pixel_y = 0 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor, -/area/hallway/station/docks) +/area/maintenance/station/eng_lower) +"aem" = ( +/obj/machinery/atmospherics/valve/open, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "aen" = ( /turf/simulated/floor/tiled, /area/engineering/workshop) @@ -2252,6 +2380,28 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) +"aeD" = ( +/obj/machinery/atmospherics/valve/open, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) +"aeE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/random/junk, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "aeF" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -2316,6 +2466,19 @@ /obj/random/tool, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"aeM" = ( +/obj/structure/railing, +/obj/structure/disposalpipe/segment, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/engineering, +/obj/random/junk, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "aeN" = ( /obj/machinery/alarm{ dir = 8; @@ -2393,6 +2556,12 @@ /obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"aeV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "aeW" = ( /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) @@ -2408,6 +2577,25 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary) +"aeZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/engineering, +/obj/random/medical/lite, +/obj/random/tool, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "afa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -2604,6 +2792,18 @@ }, /turf/simulated/floor/tiled, /area/bridge/secondary) +"afm" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/closet, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/engineering, +/obj/random/maintenance/medical, +/obj/random/tool, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "afn" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -2781,6 +2981,9 @@ /area/hallway/station/atrium) "afA" = ( /obj/machinery/hologram/holopad, +/obj/machinery/camera/network/tether{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) "afB" = ( @@ -3076,6 +3279,14 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"afZ" = ( +/obj/structure/closet/crate, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/engineering, +/obj/random/maintenance/security, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "aga" = ( /obj/machinery/floor_light/prebuilt{ on = 1 @@ -3732,6 +3943,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"agV" = ( +/obj/random/cutout, +/turf/simulated/floor, +/area/vacant/vacant_restaurant_lower) "agW" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -3906,6 +4121,12 @@ }, /turf/simulated/floor/tiled, /area/bridge/secondary) +"ahi" = ( +/obj/machinery/atmospherics/pipe/cap/visible/scrubbers{ + dir = 4 + }, +/turf/simulated/floor, +/area/vacant/vacant_restaurant_lower) "ahj" = ( /obj/structure/cable{ d1 = 1; @@ -4266,6 +4487,19 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) +"ahM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/cap/visible/supply{ + dir = 4 + }, +/turf/simulated/floor, +/area/vacant/vacant_restaurant_lower) "ahN" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -4278,6 +4512,29 @@ }, /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) +"ahO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/rust, +/obj/structure/disposalpipe/broken{ + dir = 4; + icon_state = "pipe-b" + }, +/turf/simulated/floor, +/area/vacant/vacant_restaurant_lower) +"ahP" = ( +/obj/item/clothing/head/cone, +/turf/simulated/floor, +/area/vacant/vacant_restaurant_lower) "ahQ" = ( /obj/machinery/light{ dir = 4 @@ -4339,17 +4596,9 @@ /turf/simulated/floor/tiled/dark, /area/gateway) "ahY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/random/junk, -/obj/structure/symbol/lo{ - pixel_x = -32 - }, +/obj/random/tool, /turf/simulated/floor, -/area/maintenance/station/eng_lower) +/area/vacant/vacant_restaurant_lower) "ahZ" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -4416,6 +4665,24 @@ }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/office) +"aig" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/random/junk, +/turf/simulated/floor, +/area/crew_quarters/sleep/cryo) "aih" = ( /obj/structure/cable/green{ d1 = 4; @@ -4723,6 +4990,11 @@ /obj/item/clothing/glasses/meson, /turf/simulated/floor/tiled, /area/engineering/engine_airlock) +"aiG" = ( +/obj/item/weapon/cell/potato, +/obj/item/frame/apc, +/turf/simulated/floor, +/area/vacant/vacant_restaurant_lower) "aiH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -4779,14 +5051,18 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "aiO" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/obj/structure/closet/crate, +/obj/item/clothing/mask/gas, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/cargo, +/obj/random/action_figure, +/obj/item/clothing/mask/gas, +/obj/machinery/atmospherics/binary/passive_gate/on, +/turf/simulated/floor/plating, +/area/hallway/station/docks) "aiP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -4799,15 +5075,23 @@ /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "aiR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack{ +/obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8; - layer = 2.9 + icon_state = "map" + }, +/obj/machinery/meter{ + frequency = 1443; + id = "dist_aux_meter"; + name = "Distribution Loop" + }, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 }, -/obj/random/junk, -/obj/random/maintenance/engineering, /turf/simulated/floor, -/area/maintenance/station/eng_lower) +/area/hallway/station/docks) "aiS" = ( /turf/simulated/floor/tiled/dark, /area/gateway) @@ -4998,6 +5282,13 @@ }, /turf/simulated/floor/tiled, /area/gateway/prep_room) +"ajk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5; + icon_state = "intact" + }, +/turf/simulated/floor, +/area/hallway/station/docks) "ajl" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1; @@ -5336,6 +5627,10 @@ }, /turf/simulated/floor/tiled, /area/gateway/prep_room) +"ajW" = ( +/obj/random/trash_pile, +/turf/simulated/floor, +/area/hallway/station/docks) "ajX" = ( /obj/machinery/light{ dir = 4; @@ -5397,6 +5692,16 @@ /obj/machinery/floodlight, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) +"ake" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/abandonedlibrary) "akf" = ( /obj/machinery/button/remote/blast_door{ id = "PubPrep"; @@ -5422,6 +5727,11 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway) +"aki" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood/broken, +/area/maintenance/abandonedlibrary) "akj" = ( /obj/item/device/radio/intercom{ dir = 2; @@ -5614,6 +5924,10 @@ }, /turf/simulated/floor/tiled, /area/gateway/prep_room) +"akB" = ( +/obj/random/trash, +/turf/simulated/floor/wood, +/area/maintenance/abandonedlibrary) "akC" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5648,6 +5962,17 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway) +"akI" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/maintenance/abandonedlibrary) "akJ" = ( /obj/structure/window/reinforced{ dir = 4 @@ -5693,6 +6018,22 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) +"akN" = ( +/obj/structure/table/woodentable, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/item/weapon/book/codex/lore/news, +/obj/random/contraband, +/turf/simulated/floor/carpet, +/area/maintenance/abandonedlibrary) "akO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -5708,6 +6049,22 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_airlock) +"akP" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/carpet, +/area/maintenance/abandonedlibrary) +"akQ" = ( +/turf/simulated/floor/wood/broken, +/area/maintenance/abandonedlibrary) "akR" = ( /obj/structure/table/reinforced, /obj/item/weapon/storage/briefcase/inflatable{ @@ -5739,6 +6096,24 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor, /area/engineering/storage) +"akU" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 25 + }, +/turf/simulated/floor/plating, +/area/maintenance/abandonedlibrary) +"akV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood/broken, +/area/maintenance/abandonedlibrary) +"akW" = ( +/obj/structure/table/woodentable, +/obj/random/tool, +/obj/random/medical, +/turf/simulated/floor/plating, +/area/maintenance/abandonedlibrary) "akX" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 @@ -5751,6 +6126,12 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) +"akY" = ( +/obj/machinery/newscaster{ + pixel_x = 30 + }, +/turf/simulated/floor/plating, +/area/maintenance/abandonedlibrary) "akZ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/engineering{ @@ -5821,6 +6202,11 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway) +"alf" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/table, +/turf/simulated/floor/plating, +/area/maintenance/abandonedlibrary) "alg" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass{ @@ -6176,6 +6562,13 @@ "alN" = ( /turf/simulated/wall/r_wall, /area/maintenance/abandonedlibrary) +"alO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/maintenance/abandonedlibrary) "alP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6222,6 +6615,23 @@ "alT" = ( /turf/simulated/wall, /area/storage/emergency_storage/emergency4) +"alU" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/table, +/turf/simulated/floor/plating, +/area/maintenance/abandonedlibrary) +"alV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/abandonedlibrary) "alW" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/steeldecal/steel_decals_central6{ @@ -6263,6 +6673,16 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"alZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/carpet, +/area/maintenance/abandonedlibrary) "ama" = ( /obj/structure/table/marble, /obj/machinery/floor_light/prebuilt{ @@ -6283,6 +6703,15 @@ /obj/item/weapon/reagent_containers/spray/cleaner, /turf/simulated/floor/wood, /area/hallway/station/atrium) +"amb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/maintenance/abandonedlibrary) "amc" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 @@ -6351,16 +6780,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/cap/visible/supply{ - dir = 4 - }, -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) +/turf/simulated/floor/plating, +/area/maintenance/abandonedlibrary) "ami" = ( /obj/structure/table/woodentable, /obj/machinery/door/blast/shutters{ @@ -6531,31 +6952,11 @@ /turf/simulated/floor/wood, /area/hallway/station/atrium) "amz" = ( -/obj/machinery/alarm{ - pixel_y = 22 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/random/maintenance/clean, -/obj/random/maintenance/engineering, -/obj/random/tool, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/random/maintenance/engineering, -/obj/random/maintenance/clean, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/turf/simulated/floor/plating, +/area/maintenance/abandonedlibrary) "amA" = ( /obj/structure/disposalpipe/up{ dir = 4 @@ -6852,14 +7253,8 @@ /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) "ane" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/engineering/shaft) +/turf/simulated/floor/wood/broken, +/area/maintenance/abandonedlibraryconference) "anf" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -6893,14 +7288,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) +/turf/simulated/floor/wood, +/area/maintenance/abandonedlibraryconference) "ani" = ( /obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/maintenance/abandonedlibrary) +/turf/simulated/floor/plating, +/area/maintenance/abandonedlibraryconference) "anj" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -6951,13 +7344,26 @@ "anp" = ( /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) -"ans" = ( -/obj/item/stack/tile/wood{ - amount = 10 +"anq" = ( +/obj/structure/bed/chair/office/dark, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) +/area/maintenance/abandonedlibraryconference) +"anr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood/broken, +/area/maintenance/abandonedlibraryconference) +"ans" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/simulated/floor/wood/broken, +/area/maintenance/abandonedlibraryconference) "ant" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6997,16 +7403,19 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "anv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/broken, -/area/maintenance/abandonedlibrary) -"anw" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) +/area/maintenance/abandonedlibraryconference) +"anw" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/wood/broken, +/area/maintenance/abandonedlibraryconference) "anx" = ( /obj/random/junk, /turf/simulated/floor/wood/broken, @@ -7179,16 +7588,22 @@ /turf/simulated/floor/greengrid/nitrogen, /area/engineering/engine_room) "anI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/trash, +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/wood, -/area/maintenance/abandonedlibrary) +/area/maintenance/abandonedlibraryconference) "anJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) +/area/maintenance/abandonedlibraryconference) "anK" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet, @@ -7267,34 +7682,16 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "anS" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, -/area/maintenance/abandonedlibrary) +/area/maintenance/abandonedlibraryconference) "anT" = ( -/obj/structure/table/woodentable, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/weapon/book/codex/lore/news, -/obj/random/contraband, -/turf/simulated/floor/carpet, -/area/maintenance/abandonedlibrary) +/turf/simulated/floor/wood/broken, +/area/maintenance/abandonedlibraryconference) "anU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -7330,9 +7727,12 @@ /turf/simulated/floor/wood, /area/maintenance/abandonedlibrary) "anY" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, +/obj/random/maintenance/engineering, +/obj/item/weapon/flame/lighter/zippo, +/obj/random/tool, /turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) +/area/maintenance/abandonedlibraryconference) "anZ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -7344,19 +7744,11 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "aoa" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 1 +/obj/item/stack/tile/wood{ + amount = 10 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/carpet, -/area/maintenance/abandonedlibrary) +/turf/simulated/floor/plating, +/area/maintenance/abandonedlibraryconference) "aob" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -7381,9 +7773,11 @@ /turf/simulated/floor/wood, /area/maintenance/abandonedlibrary) "aoe" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, /turf/simulated/floor/wood/broken, -/area/maintenance/abandonedlibrary) +/area/maintenance/abandonedlibraryconference) "aof" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Civilian Substation Bypass" @@ -7495,6 +7889,12 @@ }, /turf/simulated/floor, /area/engineering/storage) +"aop" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/maintenance/abandonedlibraryconference) "aoq" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -7508,6 +7908,14 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) +"aor" = ( +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 + }, +/turf/simulated/floor/wood/broken, +/area/maintenance/abandonedlibraryconference) "aos" = ( /obj/structure/cable/green{ d1 = 1; @@ -7531,13 +7939,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/engineering/hallway) -"aou" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 25 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) "aov" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -7567,20 +7968,6 @@ }, /turf/simulated/wall/r_wall, /area/engineering/hallway) -"aoz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/broken, -/area/maintenance/abandonedlibrary) -"aoA" = ( -/obj/structure/table/woodentable, -/obj/effect/decal/cleanable/dirt, -/obj/random/tool, -/obj/random/medical, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) "aoB" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -7611,13 +7998,6 @@ /obj/structure/table, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) -"aoD" = ( -/obj/machinery/newscaster{ - pixel_x = 30 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) "aoE" = ( /obj/random/junk, /obj/effect/decal/cleanable/cobweb, @@ -7670,16 +8050,6 @@ "aoO" = ( /turf/simulated/wall/r_wall, /area/storage/emergency_storage/emergency4) -"aoP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) -"aoQ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/carpet, -/area/maintenance/abandonedlibrary) "aoR" = ( /obj/structure/grille, /obj/machinery/door/firedoor/border_only, @@ -7688,11 +8058,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) -"aoS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/tile/carpet, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) "aoT" = ( /obj/structure/table/woodentable, /obj/item/weapon/paper, @@ -7727,23 +8092,6 @@ /obj/fiftyspawner/glass, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) -"aoY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) -"apa" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) "apd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7753,62 +8101,12 @@ }, /turf/simulated/floor/carpet, /area/maintenance/abandonedlibrary) -"apf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) "apg" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/engineering/break_room) -"aph" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/carpet, -/area/maintenance/abandonedlibrary) -"api" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/trash_pile, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) -"apj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) -"apk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) -"apl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) "apm" = ( /turf/simulated/floor/carpet, /area/maintenance/abandonedlibrary) @@ -8652,10 +8950,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/abandonedlibraryconference) -"aqA" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/broken, -/area/maintenance/abandonedlibraryconference) "aqB" = ( /obj/structure/cable/green{ d1 = 4; @@ -8687,17 +8981,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"aqC" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/maintenance/abandonedlibraryconference) "aqD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4; @@ -8809,11 +9092,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"aqP" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibraryconference) "aqQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4; @@ -8923,10 +9201,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/abandonedlibraryconference) -"aqX" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibraryconference) "aqY" = ( /obj/structure/bed/chair/office/dark, /obj/structure/cable/green{ @@ -8938,40 +9212,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/maintenance/abandonedlibraryconference) -"aqZ" = ( -/obj/structure/bed/chair/office/dark, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibraryconference) -"ara" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/broken, -/area/maintenance/abandonedlibraryconference) -"arb" = ( -/obj/machinery/atmospherics/valve/digital/open, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "arc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9047,13 +9287,6 @@ "ari" = ( /turf/simulated/floor/plating, /area/maintenance/abandonedlibraryconference) -"arj" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/broken, -/area/maintenance/abandonedlibraryconference) "ark" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/space_heater, @@ -9120,13 +9353,6 @@ /obj/item/weapon/storage/toolbox/electrical, /turf/simulated/floor/tiled, /area/engineering/workshop) -"ars" = ( -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibraryconference) "art" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9141,27 +9367,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/workshop) -"arv" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/broken, -/area/maintenance/abandonedlibraryconference) -"arw" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/maintenance/abandonedlibraryconference) "arx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9184,14 +9389,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) -"arA" = ( -/obj/machinery/atmospherics/valve/open, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "arB" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 4; @@ -9278,13 +9475,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/workshop) -"arL" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibraryconference) "arM" = ( /turf/simulated/wall/r_wall, /area/maintenance/substation/engineering) @@ -9310,10 +9500,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) -"arP" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/maintenance/abandonedlibraryconference) "arQ" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/cyan, /turf/simulated/floor/tiled, @@ -9325,15 +9511,6 @@ /obj/machinery/meter, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) -"arS" = ( -/obj/machinery/alarm{ - dir = 8; - icon_state = "alarm0"; - pixel_x = 24 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/broken, -/area/maintenance/abandonedlibraryconference) "arT" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/red{ dir = 4; @@ -9341,14 +9518,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"arU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/random/maintenance/engineering, -/obj/item/weapon/flame/lighter/zippo, -/obj/random/tool, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibraryconference) "arV" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -9359,13 +9528,6 @@ icon_state = "monotile" }, /area/engineering/hallway) -"arW" = ( -/obj/item/stack/tile/wood{ - amount = 10 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibraryconference) "arX" = ( /obj/structure/cable/green{ d1 = 1; @@ -9389,24 +9551,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, /area/engineering/hallway) -"arY" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/broken, -/area/maintenance/abandonedlibraryconference) "arZ" = ( /obj/structure/disposalpipe/segment, /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"asa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "asb" = ( /obj/structure/cable/green{ d1 = 4; @@ -9429,22 +9578,6 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"asd" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/maintenance/abandonedlibraryconference) -"ase" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood/broken, -/area/maintenance/abandonedlibraryconference) "asf" = ( /obj/random/trash, /turf/simulated/floor/plating, @@ -9705,13 +9838,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tether/station/visitorhallway/office) -"asD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "asE" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -10089,37 +10215,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tether/station/visitorhallway/office) -"ato" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/closet, -/obj/effect/decal/cleanable/dirt, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/engineering, -/obj/random/maintenance/medical, -/obj/random/tool, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) -"atp" = ( -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/engineering, -/obj/random/junk, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) -"atq" = ( -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/engineering, -/obj/random/maintenance/security, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "atr" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -11682,19 +11777,6 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway) -"avP" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "avQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -11721,12 +11803,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary) -"avS" = ( -/obj/machinery/light/small, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/firecloset/full/double, -/turf/simulated/floor, -/area/storage/emergency_storage/emergency4) "avT" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -13084,21 +13160,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/spacedorm4) -"ays" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "ayt" = ( /turf/simulated/wall, /area/crew_quarters/sleep/spacedorm4) @@ -13381,6 +13442,10 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner{ dir = 4 }, +/obj/machinery/vending/nifsoft_shop{ + pixel_x = 12; + pixel_y = 2 + }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway) "ayQ" = ( @@ -13917,15 +13982,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/visitorhallway) -"azB" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "azC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14323,11 +14379,6 @@ }, /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) -"aAq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/trash_pile, -/turf/simulated/floor, -/area/hallway/station/docks) "aAr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4; @@ -16565,24 +16616,6 @@ /obj/structure/curtain/open/shower/engineering, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/engi_wash) -"aEW" = ( -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2"; - pixel_y = 0 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/substation/civilian) "aEX" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Civilian"; @@ -16597,15 +16630,6 @@ /obj/structure/cable/green, /turf/simulated/floor, /area/maintenance/substation/civilian) -"aEZ" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/storage/emergency_storage/emergency4) "aFc" = ( /obj/machinery/alarm{ dir = 4; @@ -16626,15 +16650,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/storage/emergency_storage/emergency4) -"aFf" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/storage/emergency_storage/emergency4) "aFJ" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -16783,24 +16798,6 @@ "aGB" = ( /turf/simulated/wall/r_wall, /area/engineering/engineering_airlock) -"aGI" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/substation/civilian) "aGP" = ( /obj/structure/cable{ d1 = 4; @@ -17174,17 +17171,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) -"aKr" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "aKt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17811,24 +17797,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engineering_monitoring) -"aOj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "aOL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -18108,24 +18076,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) -"aRr" = ( -/obj/machinery/atmospherics/valve/open, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "aRw" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 @@ -18461,40 +18411,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"aUE" = ( -/obj/structure/railing, -/obj/structure/disposalpipe/segment, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/engineering, -/obj/random/junk, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) -"aUF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/engineering, -/obj/random/medical/lite, -/obj/random/tool, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "aUI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -19067,17 +18983,6 @@ /obj/random/junk, /turf/simulated/floor, /area/crew_quarters/sleep/cryo) -"bcO" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/crew_quarters/sleep/cryo) "bdi" = ( /obj/structure/cable{ d1 = 2; @@ -19563,40 +19468,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/crew_quarters/sleep/cryo) -"bhL" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/crew_quarters/sleep/cryo) -"bid" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/crew_quarters/sleep/cryo) "bir" = ( /obj/structure/cable/green{ d1 = 1; @@ -19889,14 +19760,6 @@ }, /turf/simulated/floor/tiled, /area/storage/tools) -"bpz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" - }, -/turf/simulated/floor, -/area/hallway/station/docks) "bqb" = ( /obj/structure/cable/green{ d1 = 1; @@ -20668,20 +20531,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/tether/station/dock_two) -"bXs" = ( -/obj/structure/closet/crate, -/obj/item/clothing/mask/gas, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/effect/decal/cleanable/dirt, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/cargo, -/obj/random/action_figure, -/obj/item/clothing/mask/gas, -/obj/machinery/atmospherics/binary/passive_gate/on, -/turf/simulated/floor/plating, -/area/hallway/station/docks) "bXG" = ( /obj/structure/table/reinforced, /obj/machinery/light, @@ -20743,10 +20592,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor, /area/vacant/vacant_restaurant_lower) -"bYl" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) "bYm" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor, @@ -20799,16 +20644,6 @@ /obj/item/clothing/gloves/yellow, /turf/simulated/floor/tiled, /area/engineering/workshop) -"bZk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/clothing/head/cone, -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) -"bZm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) "bZt" = ( /obj/structure/dispenser{ phorontanks = 0 @@ -20818,11 +20653,6 @@ "bZv" = ( /turf/simulated/floor/plating, /area/vacant/vacant_restaurant_lower) -"bZz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/tool, -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) "bZD" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor, @@ -20852,12 +20682,6 @@ /obj/random/junk, /turf/simulated/floor, /area/vacant/vacant_restaurant_lower) -"bZP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/weapon/cell/potato, -/obj/item/frame/apc, -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) "bZQ" = ( /obj/random/trash, /turf/simulated/floor, @@ -20976,6 +20800,20 @@ }, /turf/simulated/floor/plating, /area/tether/station/dock_two) +"crl" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/vending/nifsoft_shop, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "cto" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21154,11 +20992,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"dop" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/cutout, -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) "dsY" = ( /obj/effect/floor_decal/corner_techfloor_grid, /obj/effect/floor_decal/techfloor/corner, @@ -30243,9 +30076,9 @@ bYj bYj bZF bZD -bZP -bYl -bYl +aiG +bYj +bYj bYj aeF bZZ @@ -30388,7 +30221,7 @@ bZD bYj bZS bZD -bZm +bZD aeF aAV rKn @@ -30497,7 +30330,7 @@ agJ aac arq alK -ane +acA aot aft afu @@ -30521,14 +30354,14 @@ and aTX aVN alv -dop -bYl +agV bYj bYj -bZm -bZm -bZz -bYl +bYj +bZD +bZD +ahY +bYj bZD bYj aeF @@ -30664,15 +30497,15 @@ aIO aVK alv bYk -acv +ahi +bYj +bYj +bYj +bYj bYj bYj bYj -bYl -bYl -bYl bYj -bYl awu bCg rKn @@ -30806,15 +30639,15 @@ aIO aVW alv bYm -amh +ahM bYj -bZz +ahY bYj bZK bYj -bYl -bYl -bZk +bYj +bYj +ahP aeI aBi rKn @@ -30947,11 +30780,11 @@ anQ aSB aVP alv -bYl -acM -bZk -bYl -bYl +bYj +ahO +ahP +bYj +bYj bYj bZQ bYj @@ -31089,9 +30922,9 @@ awm aXX aCb alv -bYl +bYj adp -bZm +bZD bfF bYj bYj @@ -32750,9 +32583,9 @@ aaa aai aaj abC -acA -adg abi +acj +acu aeg arM arM @@ -32892,8 +32725,8 @@ aai abQ ack aam -acj -acj +ack +ack ack aef abP @@ -33067,14 +32900,14 @@ aci aLl aET aaV -atp -api +adV +ahq aMt aqs amA ard arZ -aUE +aeM aqs afC ahb @@ -33178,8 +33011,8 @@ aca ack ack adh -acj -acj +ack +ack ack aaY adG @@ -33210,14 +33043,14 @@ aDj aER aaV aIo -aKr +aec aMr aqt amB -arA -asa -asD -ato +aem +aeE +aeV +afm afC aha acp @@ -33318,10 +33151,10 @@ abn abT abT ack -acj -acj -acj -acj +ack +ack +ack +ack ack abC adG @@ -33330,9 +33163,9 @@ ack ach ack akq -api -ahY -aiR +ahq +acv +acw amR ang aik @@ -33351,12 +33184,12 @@ aaV aaV aaV aaV -amz +adZ aUX aMx -aOj -arb -aRr +aee +ael +aeD aSO aUI aWj @@ -33369,8 +33202,8 @@ bhg axD axZ bno -ael -bpz +aiR +ajk bqj awu avH @@ -33461,7 +33294,7 @@ abQ ack ace ack -acj +ack ack ach aeL @@ -33474,9 +33307,9 @@ aeG agf ahf aeG -aiO -aiO -aiO +aeG +aeG +aeG wDo acq anD @@ -33485,11 +33318,11 @@ apU aal apU atT -avP -avP -ays -avP -avP +apU +apU +acM +apU +apU apU apU aGy @@ -33500,8 +33333,8 @@ aYf akv arC asc -aUF -atq +aeZ +afZ afC arh acp @@ -33509,11 +33342,11 @@ bdT aaT axb axE -bXs +aiO bnl azl azl -aAq +ajW awu avJ aDx @@ -33625,9 +33458,9 @@ aah aik ioI ach -acj -aiR -api +ack +acw +ahq aiX abC anE @@ -33775,8 +33608,8 @@ aik ach aBH aDs -aEW -aGI +adg +ads alQ aeO afy @@ -34056,7 +33889,7 @@ uyn acc rEb aik -azB +azJ alQ alQ alQ @@ -34198,7 +34031,7 @@ kth aHe rEb aik -azB +azJ alT asu aFc @@ -34343,8 +34176,8 @@ aik azJ alT aDP -aEZ -avS +adj +adU aoO aeO aeO @@ -34485,7 +34318,7 @@ aik azJ alT amE -aFf +adq aoi alT aes @@ -34630,7 +34463,7 @@ alT aFe alT alT -asY +crl acm acm acm @@ -36936,8 +36769,8 @@ asG asG aqW ari -ars -arU +anv +anY asf aqd aat @@ -37076,10 +36909,10 @@ apm apF aqd aqy -aqX -aqX -arv -arP +ari +ari +anw +anS asj aqd aat @@ -37218,10 +37051,10 @@ apn apH aqd aqz -aqA -arj -arw -arP +ane +ans +anI +anS ari ast aat @@ -37348,23 +37181,23 @@ amQ aum aaT anp -ans -anI -anS -anY -aoe -aoz -aoe -aoe +apt +akB +akI +anp +akQ +akV +akQ +akQ apt anp aqn -aqA -aqA +ane +ane arm arD -arW -aqX +aoa +ari ast aat aat @@ -37489,24 +37322,24 @@ bmv amS amT amV -anh -anv -anJ -anT -aoa +ake +aki +apz +akN +akP aos -anv -anv +aki +aki aoW apz apR aqp -aqC +anh aqY aro arG -arY -arP +aoe +anS ast aat aat @@ -37631,24 +37464,24 @@ bmA atK bpf amX -ani -anw +apS +aob anK anU aob aob -aoe -anw -aoY +akQ +aob +alO aob apS aqr -aqP -aqZ +ani +anq arp arJ -asd -arP +aop +anS ast aat aat @@ -37779,17 +37612,17 @@ anp anV anp ann -aoA -aoP -apa +akW +alf +alU apA apV aqd aqU -ara -aqX -arL -aqA +anr +ari +anJ +ane ari ast aat @@ -37920,18 +37753,18 @@ anx anM ann anm -aoe +akQ aoC -anY +anp apd anp apW aqw aqV arc -aqX -arP -aqA +ari +anS +ane asj aqd aat @@ -38051,7 +37884,7 @@ auo auZ aCU asI -bhL +bhJ aus asY acm @@ -38062,18 +37895,18 @@ anA ann anW aoc -aou -aoD -aoQ -apf +akU +akY +apm +alV apm apY aqd aqd arg ari -arS -ase +anT +aor asq aqd aat @@ -38193,7 +38026,7 @@ baQ ava aua asI -bid +aig aus atu acm @@ -38207,7 +38040,7 @@ aAk amU amU aoR -aph +alZ aoR apZ amU @@ -38335,7 +38168,7 @@ asI aeq agz asI -bhL +bhJ aus att acm @@ -38348,8 +38181,8 @@ aAk byy amU aoE -aoS -apj +aoK +amb apC aqb amU @@ -38490,8 +38323,8 @@ aAk aDh amU aoK -anY -apk +anp +amh anp aqc amU @@ -38632,8 +38465,8 @@ aCC byA amU aoL -anY -apl +anp +amz apE amU amU @@ -38758,9 +38591,9 @@ aEG aEJ auO baT -bcO baT -bcO +baT +baT bir aus abY diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 7eba7016ad3..e313924444a 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -44,9 +44,13 @@ /turf/simulated/floor/tiled, /area/security/brig/bathroom) "ah" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) +/obj/effect/floor_decal/rust, +/obj/random/trash, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor, +/area/maintenance/station/sec_lower) "ai" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/steeldecal/steel_decals5, @@ -87,9 +91,12 @@ /turf/simulated/floor/tiled, /area/security/brig) "am" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/security/brig) +/obj/random/junk, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor, +/area/maintenance/station/sec_lower) "an" = ( /obj/effect/floor_decal/corner/red{ dir = 9; @@ -273,23 +280,25 @@ /turf/simulated/floor/tiled/monotile, /area/security/brig) "aB" = ( -/obj/effect/floor_decal/corner/white/border{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/techfloor{ + dir = 1 }, -/obj/item/weapon/paper/crumpled{ - name = "basketball" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) +/turf/simulated/floor, +/area/maintenance/station/sec_lower) "aC" = ( -/obj/effect/floor_decal/corner/white/border{ - dir = 4; - icon_state = "bordercolor" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor, +/area/maintenance/station/sec_lower) "aD" = ( /obj/effect/floor_decal/corner/white/border{ dir = 1 @@ -336,30 +345,25 @@ /turf/simulated/floor/tiled, /area/security/security_cell_hallway) "aJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, +/obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/structure/catwalk, /obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/green, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor, -/area/security/riot_control) +/area/maintenance/station/sec_lower) "aK" = ( -/obj/machinery/atmospherics/binary/pump, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/security/riot_control) +/obj/structure/table/glass, +/obj/item/clothing/accessory/stethoscope, +/obj/item/device/healthanalyzer, +/turf/simulated/floor/tiled/white, +/area/maintenance/station/sec_lower) "aL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -393,15 +397,21 @@ /turf/simulated/floor/tiled/dark, /area/security/recstorage) "aN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) +/obj/effect/floor_decal/rust, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/dark, +/area/security/brig) "aO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/trash_pile, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) +/obj/effect/floor_decal/corner/white/border{ + dir = 8 + }, +/obj/item/weapon/paper/crumpled{ + name = "basketball" + }, +/turf/simulated/floor/tiled/monotile, +/area/security/brig) "aP" = ( /turf/simulated/mineral/floor/vacuum, /area/mine/explored/upper_level) @@ -433,11 +443,22 @@ /turf/simulated/floor/tiled/freezer, /area/security/brig/bathroom) "aU" = ( -/obj/structure/railing, -/obj/effect/floor_decal/spline/plain, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/table/steel, +/obj/item/weapon/soap/nanotrasen, +/turf/simulated/floor/tiled/freezer, +/area/security/brig/bathroom) "aV" = ( /obj/structure/railing{ dir = 4 @@ -519,10 +540,9 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "aZ" = ( -/obj/machinery/atmospherics/valve/digital, -/obj/effect/decal/cleanable/dirt, +/obj/random/cutout, /turf/simulated/floor, -/area/security/riot_control) +/area/maintenance/station/sec_lower) "ba" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -618,9 +638,22 @@ /turf/simulated/floor, /area/maintenance/station/sec_lower) "bf" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/freezer, +/area/security/brig/bathroom) "bg" = ( /turf/simulated/wall/r_wall, /area/maintenance/station/exploration) @@ -652,23 +685,14 @@ /turf/simulated/floor/tiled, /area/security/brig/visitation) "bj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/freezer, -/area/security/brig/bathroom) +/turf/simulated/floor, +/area/maintenance/station/sec_lower) "bk" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -950,21 +974,20 @@ /turf/simulated/floor/tiled, /area/security/brig) "bE" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/green, -/obj/effect/floor_decal/corner/lightorange/bordercorner{ - dir = 4; - icon_state = "bordercolorcorner" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/structure/bed/chair{ - dir = 1 +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled, /area/security/brig) @@ -1205,25 +1228,17 @@ /turf/simulated/floor/tiled, /area/security/security_cell_hallway) "bR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_dirty, -/area/security/brig) -"bS" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/closet, /obj/item/clothing/glasses/sunglasses/blindfold, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"bS" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/turf/simulated/floor/tiled, +/area/security/brig) "bT" = ( /turf/simulated/wall/r_wall, /area/tether/exploration/showers) @@ -1328,7 +1343,6 @@ icon_state = "map_injector"; id = "riot_inject" }, -/obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/security/brig) @@ -1405,21 +1419,27 @@ /turf/simulated/floor/tiled, /area/security/security_cell_hallway) "cg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/green, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/security/brig) +/obj/structure/closet, +/turf/simulated/floor, +/area/maintenance/station/sec_lower) "ch" = ( /turf/simulated/wall/r_wall, /area/security/brig/bathroom) "ci" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel_dirty, +/area/security/brig) "cj" = ( /obj/effect/floor_decal/borderfloor{ dir = 1; @@ -1735,23 +1755,10 @@ /turf/simulated/floor/tiled, /area/security/security_cell_hallway) "cD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 9 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/steel_dirty, /area/security/brig) "cE" = ( /obj/effect/floor_decal/borderfloor{ @@ -1856,9 +1863,11 @@ /turf/simulated/floor/tiled, /area/tether/exploration/crew) "cJ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/engineering/shaft) +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/security/brig) "cK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -1931,10 +1940,16 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "cP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel_dirty, /area/security/brig) "cQ" = ( @@ -2032,15 +2047,12 @@ /turf/simulated/floor/tiled/dark, /area/security/recstorage) "cW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/green, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) +/turf/simulated/floor/tiled, +/area/security/brig) "cX" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -2274,19 +2286,16 @@ /turf/simulated/floor/tiled, /area/tether/exploration/crew) "dn" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light/small{ + dir = 8 + }, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_dirty, -/area/security/brig) +/turf/simulated/floor/plating, +/area/engineering/shaft) "do" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 8; @@ -2558,14 +2567,15 @@ /turf/simulated/floor/tiled, /area/tether/exploration/crew) "dK" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/unary/outlet_injector{ + dir = 8; + frequency = 1442; + icon_state = "map_injector"; + id = "riot_inject" }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/engineering/shaft) +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/steel_dirty, +/area/security/brig) "dL" = ( /obj/structure/cable/green{ d1 = 4; @@ -2632,14 +2642,7 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "dP" = ( -/obj/machinery/atmospherics/unary/outlet_injector{ - dir = 8; - frequency = 1442; - icon_state = "map_injector"; - id = "riot_inject" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/steel_dirty, /area/security/brig) "dQ" = ( @@ -2652,28 +2655,12 @@ /turf/simulated/floor/tiled, /area/security/brig) "dR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/random/junk, +/obj/effect/floor_decal/techfloor{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance/sec{ - name = "Riot Control"; - req_one_access = list(2,10,24) - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/security/riot_control) +/turf/simulated/floor, +/area/maintenance/station/sec_lower) "dS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -2732,13 +2719,16 @@ /turf/simulated/floor/tiled, /area/security/security_cell_hallway) "dU" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/effect/floor_decal/rust, +/obj/structure/table/rack{ dir = 8; - icon_state = "propulsion_l" + layer = 2.9 }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1) +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/engineering/shaft) "dV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -2983,9 +2973,22 @@ /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "es" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled/steel_dirty, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/green, +/obj/effect/floor_decal/corner/lightorange/bordercorner{ + dir = 4; + icon_state = "bordercolorcorner" + }, +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/security/brig) "et" = ( /obj/machinery/light/small{ @@ -3015,6 +3018,15 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/port) +"ev" = ( +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/random/maintenance/engineering, +/obj/random/maintenance/clean, +/turf/simulated/floor/plating, +/area/engineering/shaft) "ew" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3665,15 +3677,18 @@ }, /area/tether/elevator) "fx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/random/maintenance/engineering, -/obj/random/maintenance/clean, -/turf/simulated/floor/plating, -/area/engineering/shaft) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/security/brig) "fy" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -4594,21 +4609,32 @@ /obj/random/maintenance/research, /turf/simulated/floor, /area/maintenance/station/exploration) +"gS" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor, +/area/maintenance/station/sec_lower) "gT" = ( -/obj/structure/shuttle/engine/propulsion{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/security/brig) +"gU" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1) -"gU" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_r" +/obj/machinery/camera/network/security{ + dir = 10; + icon_state = "camera" }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1) +/turf/simulated/floor/tiled, +/area/security/brig) "gV" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -4871,6 +4897,11 @@ }, /turf/simulated/floor/tiled, /area/engineering/locker_room) +"hq" = ( +/obj/effect/floor_decal/rust, +/obj/structure/catwalk, +/turf/simulated/floor, +/area/maintenance/station/sec_lower) "hr" = ( /turf/simulated/wall, /area/maintenance/station/eng_upper) @@ -5147,6 +5178,29 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/exploration/crew) +"hL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/green, +/turf/simulated/floor, +/area/security/riot_control) +"hM" = ( +/obj/structure/catwalk, +/turf/simulated/floor/airless, +/area/maintenance/station/sec_lower) "hN" = ( /obj/structure/railing{ dir = 8 @@ -5256,6 +5310,10 @@ }, /turf/simulated/floor/tiled/dark, /area/security/interrogation) +"hZ" = ( +/obj/machinery/atmospherics/binary/pump, +/turf/simulated/floor, +/area/security/riot_control) "ia" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -5452,6 +5510,19 @@ /obj/random/maintenance/research, /turf/simulated/floor, /area/maintenance/station/exploration) +"iq" = ( +/obj/machinery/atmospherics/valve/digital, +/turf/simulated/floor, +/area/security/riot_control) +"ir" = ( +/obj/structure/closet, +/obj/random/maintenance/security, +/obj/random/contraband, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/station/sec_lower) "is" = ( /turf/simulated/floor/tiled, /area/engineering/locker_room) @@ -5977,6 +6048,45 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) +"iZ" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance/sec{ + name = "Riot Control"; + req_one_access = list(2,10,24) + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/security/riot_control) +"ja" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/station/eng_upper) "jb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6092,6 +6202,18 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) +"jh" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/station/sec_lower) "ji" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -6104,9 +6226,17 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "jj" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) +/area/maintenance/station/sec_lower) "jk" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -6633,39 +6763,36 @@ /turf/simulated/floor/plating, /area/maintenance/station/sec_lower) "jQ" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/station/sec_lower) "jR" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/station/sec_lower) +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor, +/area/storage/tech) "jS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/apc; + dir = 8; + name = "west bump"; + pixel_x = -28 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/random/junk, +/obj/random/junk, +/obj/random/maintenance/security, /turf/simulated/floor/plating, -/area/maintenance/station/sec_lower) +/area/maintenance/station/eng_upper) "jT" = ( /obj/structure/table/standard, /obj/item/weapon/aiModule/asimov, @@ -6878,6 +7005,20 @@ "kp" = ( /turf/simulated/wall/r_wall, /area/tether/exploration/equipment) +"kq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/station/eng_upper) "kr" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Exploration Subgrid"; @@ -7127,6 +7268,15 @@ /obj/item/device/analyzer, /turf/simulated/floor/plating, /area/storage/tech) +"kN" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/airless, +/area/maintenance/station/sec_lower) "kO" = ( /obj/structure/table/rack{ dir = 8; @@ -7270,6 +7420,16 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/maintenance/station/eng_upper) +"kY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/effect/floor_decal/techfloor, +/turf/simulated/floor, +/area/maintenance/station/sec_lower) "kZ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -7369,6 +7529,13 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) +"le" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/catwalk, +/turf/simulated/floor, +/area/maintenance/station/sec_lower) "lf" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Exploration Substation Bypass" @@ -7627,14 +7794,48 @@ /turf/simulated/floor, /area/storage/tech) "ly" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/item/weapon/circuitboard/transhuman_synthprinter{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/item/weapon/circuitboard/rdconsole{ + pixel_x = 0; + pixel_y = 2 + }, +/obj/item/weapon/circuitboard/destructive_analyzer, +/obj/item/weapon/circuitboard/protolathe{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/weapon/circuitboard/rdserver{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, /area/storage/tech) "lz" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/weapon/circuitboard/security/mining{ + pixel_x = 1; + pixel_y = 3 + }, +/obj/item/weapon/circuitboard/autolathe, +/obj/item/weapon/circuitboard/scan_consolenew{ + pixel_x = 6; + pixel_y = -3 + }, +/turf/simulated/floor/plating, /area/storage/tech) "lA" = ( /obj/structure/table/steel, @@ -7684,17 +7885,13 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "lE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/random/junk, +/obj/structure/railing{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) @@ -8119,49 +8316,30 @@ /turf/simulated/floor, /area/storage/tech) "mi" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/railing{ dir = 4 }, -/obj/item/weapon/circuitboard/transhuman_synthprinter{ - pixel_x = -3; - pixel_y = 4 - }, -/obj/item/weapon/circuitboard/rdconsole{ - pixel_x = 0; - pixel_y = 2 - }, -/obj/item/weapon/circuitboard/destructive_analyzer, -/obj/item/weapon/circuitboard/protolathe{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/item/weapon/circuitboard/rdserver{ - pixel_x = 6; - pixel_y = -4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/storage/tech) +/area/maintenance/station/eng_upper) "mj" = ( /obj/structure/table/rack{ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/security/mining{ - pixel_x = 1; - pixel_y = 3 +/obj/item/weapon/circuitboard/secure_data{ + pixel_x = -2; + pixel_y = 2 }, -/obj/item/weapon/circuitboard/autolathe, -/obj/item/weapon/circuitboard/scan_consolenew{ - pixel_x = 6; +/obj/item/weapon/circuitboard/security{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/item/weapon/circuitboard/skills{ + pixel_x = 4; pixel_y = -3 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/storage/tech) "mk" = ( @@ -8240,12 +8418,28 @@ /turf/simulated/open, /area/maintenance/station/eng_upper) "mq" = ( -/obj/structure/railing{ - dir = 8 +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/weapon/circuitboard/powermonitor{ + pixel_x = 0; + pixel_y = 3 + }, +/obj/item/weapon/circuitboard/stationalert_engineering{ + pixel_x = 2; + pixel_y = 1 + }, +/obj/item/weapon/circuitboard/security/engineering{ + pixel_x = 5; + pixel_y = -1 + }, +/obj/item/weapon/circuitboard/atmos_alert{ + pixel_x = 6; + pixel_y = -3 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) +/area/storage/tech) "mr" = ( /obj/structure/railing{ dir = 4 @@ -8487,23 +8681,16 @@ /turf/simulated/floor, /area/storage/tech) "mJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/railing{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/storage/tech) +/turf/simulated/floor/plating, +/area/maintenance/station/eng_upper) "mK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8562,10 +8749,26 @@ }, /turf/simulated/open, /area/engineering/foyer_mezzenine) +"mN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/station/eng_upper) "mO" = ( /obj/structure/catwalk, /turf/simulated/open, /area/engineering/foyer_mezzenine) +"mP" = ( +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/station/eng_upper) "mQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -8608,17 +8811,23 @@ /turf/simulated/floor, /area/maintenance/station/exploration) "mS" = ( -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "mT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/closet, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/junk, +/obj/random/tool, +/obj/random/maintenance/security, +/obj/random/maintenance/engineering, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "mU" = ( @@ -8885,6 +9094,14 @@ /obj/effect/landmark/free_ai_shell, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) +"nk" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_l" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1) "nl" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -8919,6 +9136,20 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/ai_cyborg_station) +"no" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/closet, +/obj/random/maintenance/clean, +/obj/random/maintenance/engineering, +/obj/random/maintenance/medical, +/obj/random/junk, +/obj/random/medical/lite, +/obj/random/tool, +/obj/random/maintenance/security, +/turf/simulated/floor/plating, +/area/maintenance/station/eng_upper) "np" = ( /obj/structure/table/standard, /obj/item/weapon/phone, @@ -8927,6 +9158,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_cyborg_station) +"nq" = ( +/obj/machinery/light/small, +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/plating, +/area/maintenance/station/eng_upper) "nr" = ( /obj/structure/cable/green{ d1 = 4; @@ -9006,49 +9242,20 @@ /turf/simulated/floor/plating, /area/storage/tech) "nx" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 +/obj/structure/shuttle/engine/propulsion{ + dir = 8 }, -/obj/item/weapon/circuitboard/secure_data{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/weapon/circuitboard/security{ - pixel_x = 1; - pixel_y = -1 - }, -/obj/item/weapon/circuitboard/skills{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/storage/tech) +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1) "ny" = ( -/obj/structure/table/rack{ +/obj/structure/shuttle/engine/propulsion{ dir = 8; - layer = 2.9 + icon_state = "propulsion_r" }, -/obj/item/weapon/circuitboard/powermonitor{ - pixel_x = 0; - pixel_y = 3 - }, -/obj/item/weapon/circuitboard/stationalert_engineering{ - pixel_x = 2; - pixel_y = 1 - }, -/obj/item/weapon/circuitboard/security/engineering{ - pixel_x = 5; - pixel_y = -1 - }, -/obj/item/weapon/circuitboard/atmos_alert{ - pixel_x = 6; - pixel_y = -3 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/storage/tech) +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1) "nz" = ( /obj/machinery/light_switch{ dir = 8; @@ -9056,6 +9263,18 @@ }, /turf/simulated/floor, /area/storage/tech) +"nA" = ( +/obj/random/powercell, +/turf/simulated/floor/plating, +/area/vacant/vacant_restaurant_upper) +"nB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor, +/area/maintenance/station/micro) "nC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9109,17 +9328,16 @@ /turf/simulated/floor, /area/maintenance/station/exploration) "nG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/railing{ - dir = 4 +/obj/machinery/alarm{ + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) +/turf/simulated/floor, +/area/maintenance/station/micro) "nH" = ( /obj/structure/cable{ icon_state = "1-2" @@ -9323,10 +9541,6 @@ }, /turf/simulated/floor, /area/storage/tech) -"oc" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/storage/tech) "od" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -9504,18 +9718,6 @@ }, /turf/simulated/open, /area/maintenance/station/eng_upper) -"ow" = ( -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) "ox" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9755,18 +9957,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) -"oS" = ( -/obj/structure/closet, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/junk, -/obj/random/tool, -/obj/random/maintenance/security, -/obj/random/maintenance/engineering, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) "oV" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -9850,34 +10040,6 @@ }, /turf/simulated/open, /area/engineering/foyer_mezzenine) -"pg" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/closet, -/obj/random/maintenance/clean, -/obj/random/maintenance/engineering, -/obj/random/maintenance/medical, -/obj/random/junk, -/obj/random/medical/lite, -/obj/random/tool, -/obj/random/maintenance/security, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) -"ph" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) "pi" = ( /obj/structure/cable{ icon_state = "1-2" @@ -9932,7 +10094,7 @@ "pn" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, -/area/medical/psych) +/area/hallway/station/port) "po" = ( /turf/simulated/wall, /area/medical/psych) @@ -10443,15 +10605,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/pathfinder_office) -"qk" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/vacant/vacant_restaurant_upper) -"ql" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/vacant/vacant_restaurant_upper) "qm" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -10709,16 +10862,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"qG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) "qH" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -11984,11 +12127,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) -"tG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/powercell, -/turf/simulated/floor/plating, -/area/vacant/vacant_restaurant_upper) "tH" = ( /obj/machinery/light{ dir = 4; @@ -12233,16 +12371,6 @@ }, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) -"ul" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/trash, -/turf/simulated/floor/plating, -/area/vacant/vacant_restaurant_upper) -"um" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/turf/simulated/floor/plating, -/area/vacant/vacant_restaurant_upper) "un" = ( /obj/structure/stairs/north, /turf/simulated/floor/tiled, @@ -14348,15 +14476,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/maintenance/station/micro) -"yi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor, -/area/maintenance/station/micro) "yj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14370,25 +14489,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/station/micro) -"yl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - dir = 1; - icon_state = "alarm0"; - pixel_y = -22 - }, -/turf/simulated/floor, -/area/maintenance/station/micro) -"ym" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/micro) "yn" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -17082,18 +17182,6 @@ "DF" = ( /turf/simulated/floor/tiled, /area/security/brig) -"DG" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/random/maintenance/engineering, -/obj/random/maintenance/engineering, -/obj/random/maintenance/engineering, -/turf/simulated/floor/plating, -/area/engineering/shaft) "DH" = ( /obj/structure/sign/department/ai, /turf/simulated/wall/r_wall, @@ -17115,11 +17203,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"DK" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "DL" = ( /turf/simulated/wall, /area/hallway/station/starboard) @@ -17133,12 +17216,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"DO" = ( -/obj/machinery/light/small, -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) "DP" = ( /obj/structure/railing{ dir = 1 @@ -17387,10 +17464,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) -"Em" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, -/area/security/brig) "En" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/bed/chair{ @@ -17462,14 +17535,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) -"Et" = ( -/obj/structure/railing, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "Eu" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -17496,22 +17561,6 @@ /obj/structure/disposalpipe/junction/yjunction, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) -"Ev" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) -"Ew" = ( -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/dark, -/area/security/brig) "Ex" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -17570,14 +17619,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/recoveryrestroom) -"EH" = ( -/obj/random/junk, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "EI" = ( /obj/structure/sink{ dir = 4; @@ -17642,17 +17683,6 @@ /obj/effect/floor_decal/corner/pink/border, /turf/simulated/floor/tiled/white, /area/medical/exam_room) -"EM" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" - }, -/turf/simulated/floor/tiled, -/area/security/brig) "EN" = ( /obj/structure/table/glass, /obj/item/weapon/paper_bin{ @@ -18004,13 +18034,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"Fs" = ( -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "Ft" = ( /obj/structure/closet, /obj/item/clothing/accessory/poncho/roles/medical, @@ -18047,22 +18070,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor, /area/maintenance/station/sec_lower) -"Fw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/security/brig) "Fy" = ( /obj/structure/closet/secure_closet/explorer, /obj/effect/floor_decal/borderfloor, @@ -18592,14 +18599,6 @@ }, /turf/simulated/floor/tiled, /area/security/brig/visitation) -"Iz" = ( -/obj/effect/floor_decal/rust, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "IB" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -18661,24 +18660,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/airless, /area/space) -"IX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) -"IZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/security/brig) "Jb" = ( /obj/structure/barricade, /turf/simulated/floor/airless, @@ -18704,12 +18685,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"Jh" = ( -/obj/effect/floor_decal/rust, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "Jl" = ( /obj/structure/cable/green{ icon_state = "32-2" @@ -18857,27 +18832,6 @@ "KI" = ( /turf/simulated/wall, /area/tether/station/public_meeting_room) -"KJ" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/apc; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/random/junk, -/obj/random/junk, -/obj/random/maintenance/security, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) "KQ" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -19075,11 +19029,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) -"LW" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/airless, -/area/maintenance/station/sec_lower) "LZ" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/shuttle/floor, @@ -19101,16 +19050,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/station/sec_lower) -"Ms" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/airless, -/area/maintenance/station/sec_lower) "Mu" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -19223,29 +19162,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) -"MT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) -"MX" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "Na" = ( /obj/structure/table/glass, /obj/item/weapon/book/manual/medical_diagnostics_manual, @@ -19304,24 +19220,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) -"Nj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) "Nm" = ( /obj/structure/bed/chair{ dir = 8 @@ -19467,13 +19365,6 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/sec_lower) -"Os" = ( -/obj/structure/table/glass, -/obj/item/clothing/accessory/stethoscope, -/obj/item/device/healthanalyzer, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white, -/area/maintenance/station/sec_lower) "Ot" = ( /obj/structure/cable{ d1 = 4; @@ -19672,20 +19563,6 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) -"PA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) -"PE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "PF" = ( /turf/simulated/wall{ can_open = 1 @@ -19821,15 +19698,6 @@ /obj/structure/closet/emcloset, /turf/simulated/floor, /area/maintenance/station/sec_lower) -"Qk" = ( -/obj/effect/floor_decal/rust, -/obj/random/trash, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "Ql" = ( /obj/structure/disposalpipe/segment, /obj/structure/table/steel, @@ -19893,14 +19761,6 @@ /obj/item/clothing/shoes/sandal, /turf/simulated/floor/tiled, /area/security/brig) -"Qy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/turf/simulated/floor/tiled, -/area/security/brig) "QD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -19998,27 +19858,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"QQ" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) -"QR" = ( -/obj/structure/table/steel, -/obj/random/maintenance/engineering, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "QS" = ( /obj/machinery/light/small, /obj/structure/table/rack{ @@ -20037,13 +19876,6 @@ }, /turf/simulated/floor/airless, /area/shuttle/large_escape_pod1) -"QW" = ( -/obj/effect/floor_decal/rust, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "QZ" = ( /obj/structure/railing, /obj/effect/floor_decal/techfloor{ @@ -20176,13 +20008,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"RW" = ( -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "RX" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -20264,23 +20089,9 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor, /area/maintenance/station/sec_lower) -"SJ" = ( -/obj/random/junk, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "SQ" = ( /turf/simulated/floor/tiled, /area/hallway/station/port) -"ST" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "SV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20303,10 +20114,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) -"SY" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white, -/area/maintenance/station/sec_lower) "Ta" = ( /obj/structure/frame, /turf/simulated/floor, @@ -20359,16 +20166,6 @@ }, /turf/simulated/open, /area/engineering/foyer_mezzenine) -"Tj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet, -/obj/random/maintenance/security, -/obj/random/contraband, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/station/sec_lower) "Tk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -20553,14 +20350,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) -"Uk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "Ul" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -20604,13 +20393,6 @@ "UD" = ( /turf/simulated/shuttle/wall/hard_corner, /area/shuttle/large_escape_pod1) -"UE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_dirty, -/area/security/brig) "UH" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -20680,17 +20462,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/port) -"UV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "UZ" = ( /obj/structure/inflatable, /turf/simulated/floor, @@ -20722,14 +20493,6 @@ /obj/structure/bed/chair/shuttle, /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod1) -"Vj" = ( -/obj/effect/floor_decal/rust, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "Vk" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -20839,14 +20602,6 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) -"VJ" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "VK" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20894,11 +20649,6 @@ dir = 1 }, /area/hallway/station/starboard) -"Wc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/cutout, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "We" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20981,11 +20731,6 @@ /obj/structure/barricade, /turf/simulated/floor, /area/medical/morgue) -"WJ" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "WL" = ( /obj/structure/bed/chair{ dir = 1 @@ -21018,18 +20763,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/stairs_two) -"WS" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/engineering/shaft) "WU" = ( /obj/machinery/vending/wallmed1{ layer = 3.3; @@ -21069,13 +20802,6 @@ }, /turf/simulated/floor, /area/security/riot_control) -"Xs" = ( -/obj/effect/floor_decal/corner/white/border{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/monotile, -/area/security/brig) "Xx" = ( /obj/structure/railing{ dir = 8 @@ -21122,17 +20848,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) -"XH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "XJ" = ( /obj/random/maintenance/engineering, /obj/structure/table/rack{ @@ -21378,29 +21093,6 @@ /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/station/sec_lower) -"Za" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/table/steel, -/obj/item/weapon/soap/nanotrasen, -/turf/simulated/floor/tiled/freezer, -/area/security/brig/bathroom) -"Zb" = ( -/obj/structure/closet/emcloset, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "Zk" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 6 @@ -21545,17 +21237,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/tether/exploration/crew) -"ZW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/techfloor, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "ZZ" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -25756,7 +25437,7 @@ UH NY UH Nm -Ms +kN RR eM aa @@ -25893,12 +25574,12 @@ FZ FZ at Ob -LW +hM Yh -IX -IX +Yd +Yd Or -ZW +kY at FZ FZ @@ -26015,27 +25696,27 @@ Qs at Hb UJ -RW -RW -Iz -RW +Tm +Tm +Zr +Tm Tm Tm NZ Zr Zr Tm -RW -RW -SJ +Tm +Tm +dR Zr Zr Tm -RW -RW +Tm +Tm RF NA -Jh +hq at at at @@ -26157,23 +25838,23 @@ Ug at DR Ty -PA -IX +Or +Yd Yd Yd Or XM -WJ -ST -IX -Yd -ST -ST -ST +XM Lf -QW -Jh -IX +Yd +Yd +Lf +Lf +Lf +Lf +gS +hq +Yd Yd Yd Yd @@ -26181,22 +25862,22 @@ Wj at Qs at -WJ -Uk -IX +XM +le +Yd Yd Or XM Ln pG -qk +pG pG pG ss pG pG pG -qk +pG pd pd pd @@ -26331,16 +26012,16 @@ JH at at pG -qk -qk -qk +pG +pG +pG pG qm -qk -ul -qk +pG +qW +pG vm -qk +pG eg aP aP @@ -26444,12 +26125,12 @@ ZL at Na MN -SY -bf +MN +RS WE KU at -bf +RS at aP kI @@ -26459,8 +26140,8 @@ at RS RS RS -bf -bf +RS +RS RS at ac @@ -26476,11 +26157,11 @@ pG pG qV qm -ql -ql -qk +qm +qm +pG +pG pG -qk pG pG eg @@ -26582,27 +26263,27 @@ RS RS at TW -UV +OY at -Os -SY +aK +MN Tq -bf +RS MN Xc at -bf +RS at ac aP aP aP at -QR -bf +ZE +RS +RS +RS RS -bf -bf Mn at aP @@ -26617,12 +26298,12 @@ pd pG pG qW -qk -qk pG -qk -um -qk +pG +pG +pG +qV +pG pG pG eg @@ -26724,7 +26405,7 @@ RS RS at QZ -UV +OY at NN QN @@ -26741,8 +26422,8 @@ ac aP at dr -bf -bf +RS +RS RS RS QS @@ -26758,11 +26439,11 @@ aP pd pG pG -qk -qk +pG +pG st sY -tG +nA pG pG sv @@ -26866,7 +26547,7 @@ RS RS PF TW -UV +OY at at at @@ -26899,8 +26580,8 @@ nY aP pd pG -qk -qk +pG +pG pG st sZ @@ -27008,15 +26689,15 @@ RS RS at QZ -UV +OY at MK -DK +Lo +RS +RS +RS RS RS -bf -bf -bf RS at ac @@ -27149,8 +26830,8 @@ NM RS RS at -Fs -UV +TW +OY at cL RS @@ -27291,11 +26972,11 @@ NM NM RS at -Qk -UV +ah +OY Ln -bf -DK +RS +Lo at ac ac @@ -27303,10 +26984,10 @@ bW Jl Jp PW -WS -dK +dn +en +en en -dK fY gt UL @@ -27317,7 +26998,7 @@ GD jB fX kL -ly +mh mh mH kK @@ -27325,7 +27006,7 @@ oa oG kJ pG -qk +pG qX pG sv @@ -27433,8 +27114,8 @@ Qs NM NM at -Fs -UV +TW +OY at RS RS @@ -27443,12 +27124,12 @@ ac ac bW ck -cJ +Zy dh Go Zy -DG -fx +dU +ev fX gu HS @@ -27459,15 +27140,15 @@ WM jC fX kM -lz -mi +jR +ly mI nw ob oH kJ pG -qk +pG qY pG sv @@ -27575,8 +27256,8 @@ Qs Ug KG at -Fs -UV +TW +OY at Ww RS @@ -27602,14 +27283,14 @@ jC fX aW kK +lz +mK mj -mJ -nx kK oI kJ pG -ql +qm ed pG sv @@ -27717,8 +27398,8 @@ at at at at -EH -PE +am +YM ch ch ch @@ -27746,8 +27427,8 @@ kO kK mk mK -ny -oc +mq +kK oJ kJ pH @@ -27856,11 +27537,11 @@ ac at FC Ik -Zb +PX MK at -Vj -MX +UO +ZL ch ag av @@ -27889,7 +27570,7 @@ kK kK mK kK -oc +kK oK kJ pI @@ -27998,11 +27679,11 @@ ac at RS RS -bf +RS RS at -Vj -PE +UO +YM ch ag aw @@ -28148,7 +27829,7 @@ LB ae ai ax -Za +aU Fq af cG @@ -28280,8 +27961,8 @@ ac ac ac at -bf -bf +RS +RS RS RS at @@ -28291,7 +27972,7 @@ ch ag ay aT -bj +bf af aq cp @@ -28424,7 +28105,7 @@ ac at RS RS -bf +RS RS Ln TW @@ -28572,12 +28253,12 @@ at Kg Hc aS -ah +UR aA MC HH -cD -Qy +bE +bS cr Lx bI @@ -28712,22 +28393,22 @@ at at at UO -XH +Hc aS UR -Xs -aU +ak +MC bl aL bZ -Fw +ci cN -bR +cP dN eq eQ -dn -IZ +fx +gT cm HK Xx @@ -28854,20 +28535,20 @@ aP ac at UO -XH +Hc aS EE -aB +aO ak bm DF ar bb bt -cg +cW bv bB -bE +es dQ Ye cn @@ -28996,11 +28677,11 @@ aP kI at TW -XH +Hc aS Rg -aC -aC +Rg +Rg br DF au @@ -29011,7 +28692,7 @@ bw bD bF ZH -EM +gU Rq cs cu @@ -29138,22 +28819,22 @@ aP aP at TW -XH +Hc aS -ah -aC -aU +UR +Rg +MC GG bG cb -UE -cP +cD +cJ DF +dK dP -es -cP -Em -Em +cJ +DF +DF YE ct cv @@ -29280,9 +28961,9 @@ aP aP at TW -MT +aC aS -ah +UR aD MC XC @@ -29301,7 +28982,7 @@ Ng JD TY aE -aK +hZ bn TY TY @@ -29421,8 +29102,8 @@ ac ac ac at -Fs -QQ +TW +aJ aS aS aS @@ -29442,8 +29123,8 @@ aS gW Eu cx -aJ -aZ +hL +iq bo Xp TY @@ -29563,10 +29244,10 @@ at at at at -Et +QZ HP aS -am +Gw aF aS XT @@ -29698,18 +29379,18 @@ ab RB Ly RS -Ev +ha SI YD SI SI SI Fv -VJ +aB Rb aS -Ew -am +aN +Gw aS ca yL @@ -29728,7 +29409,7 @@ Oc TY TY TY -dR +iZ TY TY kj @@ -29841,9 +29522,9 @@ Mq Ql SI RT -bf -bf -DK +RS +RS +Lo Rr PX at @@ -29851,7 +29532,7 @@ QZ XA aS Gw -am +Gw aS cM Wy @@ -29870,10 +29551,10 @@ gV hU hU aj -Nj +ja kj Pd -KJ +jS kj kj nE @@ -29982,8 +29663,8 @@ ab at VH RS -DK -DK +Lo +Lo at at at @@ -30123,7 +29804,7 @@ ab ab RB ZJ -DK +Lo Si Py at @@ -30157,13 +29838,13 @@ aj jN hr kV +kq +oP lE -mq -ow oz oV oP -pg +no hr qw rl @@ -30265,7 +29946,7 @@ ab ab RB Zl -bf +RS Oj Xk at @@ -30273,7 +29954,7 @@ aP aP aP at -Fs +TW YM RS aj @@ -30301,11 +29982,11 @@ kj kW lF mr -mT -nG -ph -mS -DO +mi +mJ +mN +mP +nq hr Fu Vw @@ -30415,7 +30096,7 @@ ac aP ac at -Fs +TW YM RS aj @@ -30446,7 +30127,7 @@ ms mU nH pi -qG +mS DQ DT DX @@ -30588,7 +30269,7 @@ fq fq fq fq -jj +jL pj kj rW @@ -30700,7 +30381,7 @@ aP aP at TW -WJ +XM RS aj bY @@ -30722,7 +30403,7 @@ WL iw fd fN -jQ +jh kk fq fu @@ -30730,7 +30411,7 @@ fu fu fu fq -jj +jL kj pO Fk @@ -30864,7 +30545,7 @@ hw ia fd jl -jR +jj kk fq fu @@ -31005,8 +30686,8 @@ fd fd fd fd -Tj -jS +ir +jQ kk fq fu @@ -31131,24 +30812,24 @@ xL at RS RS -cW -bf -bf +bj RS -aN -aN +RS +RS +XM +XM XM Qu fi XM -aN -aN XM XM -aN -aN XM -jS +XM +XM +XM +XM +jQ kk fq fu @@ -31156,7 +30837,7 @@ fu fu fu fq -oS +mT kj eN rW @@ -31271,11 +30952,11 @@ MO Ej XM Qu -aN -aN -aN -aN -aN +XM +XM +XM +XM +XM XM XM be @@ -31413,12 +31094,12 @@ OA FA QG at -aO -Wc +fN +aZ bx -bS -ci -ci +bR +cg +cg bA bA bA @@ -33163,7 +32844,7 @@ yJ yJ yJ yJ -yi +nB sB ac ac @@ -33589,7 +33270,7 @@ yJ eT eT yJ -yl +nG sB ac ac @@ -33731,7 +33412,7 @@ yJ eT eT yJ -ym +yj sB ac ac @@ -36126,11 +35807,11 @@ hl DI RX DL -dU -gT -gT -gT -gU +nk +nx +nx +nx +ny oY sW ef diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index dcc22918f5d..a82fdd2dfd6 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -30,12 +30,24 @@ /turf/simulated/floor/tiled, /area/security/eva) "aah" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1379; + master_tag = "sec_fore_airlock"; + name = "interior access button"; + pixel_x = 25; + pixel_y = 25; + req_one_access = list(13) }, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/excursion/cargo) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5; + icon_state = "intact" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/security/eva) "aai" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -46,6 +58,19 @@ /obj/structure/barricade, /turf/simulated/floor/tiled, /area/security/hallwayaux) +"aaj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4; + icon_state = "intact-scrubbers" + }, +/obj/effect/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled, +/area/security/eva) "aak" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -66,6 +91,15 @@ /obj/effect/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled, /area/security/eva) +"aal" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/security/eva) "aam" = ( /obj/machinery/door/airlock/glass_external, /obj/structure/sign/securearea{ @@ -92,6 +126,24 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/security/eva) +"aao" = ( +/obj/machinery/camera/network/security{ + dir = 10; + icon_state = "camera" + }, +/obj/machinery/atmospherics/binary/passive_gate/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/security/eva) +"aap" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/simulated/floor/tiled, +/area/security/eva) +"aaq" = ( +/obj/random/cutout, +/turf/simulated/floor, +/area/maintenance/station/ai) "aar" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8; @@ -123,6 +175,11 @@ }, /turf/simulated/floor/tiled, /area/maintenance/station/sec_upper) +"aau" = ( +/obj/item/frame, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/maintenance/station/ai) "aav" = ( /obj/structure/cable/green{ d1 = 4; @@ -138,6 +195,17 @@ /obj/machinery/door/airlock/glass_security, /turf/simulated/floor/tiled, /area/security/hallway) +"aaw" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/random/maintenance/engineering, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/turf/simulated/floor, +/area/maintenance/station/ai) "aax" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/glass_external, @@ -154,6 +222,16 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/security/eva) +"aaz" = ( +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tool, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/turf/simulated/floor, +/area/maintenance/station/ai) "aaA" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -175,6 +253,32 @@ }, /turf/simulated/floor/tiled, /area/security/hallway) +"aaB" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/power/apc{ + dir = 2; + name = "south bump"; + pixel_y = -28 + }, +/obj/structure/cable/green, +/turf/simulated/floor, +/area/maintenance/substation/security) +"aaC" = ( +/obj/random/junk, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor, +/area/maintenance/substation/security) +"aaD" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor, +/area/maintenance/station/sec_upper) "aaE" = ( /obj/structure/window/reinforced/full, /turf/simulated/floor, @@ -210,6 +314,18 @@ }, /turf/simulated/floor/tiled, /area/security/hallway) +"aaH" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/catwalk, +/turf/simulated/floor, +/area/maintenance/station/sec_upper) "aaI" = ( /turf/simulated/wall, /area/maintenance/station/sec_upper) @@ -309,6 +425,67 @@ /obj/structure/sign/warning/secure_area, /turf/simulated/wall/r_wall, /area/space) +"aaP" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/camera/network/command{ + dir = 10; + icon_state = "camera" + }, +/turf/simulated/floor, +/area/maintenance/station/ai) +"aaQ" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 + }, +/turf/simulated/floor, +/area/maintenance/station/ai) +"aaR" = ( +/obj/machinery/atmospherics/unary/engine{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/excursion/cargo) +"aaS" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/camera/network/command{ + dir = 4; + icon_state = "camera" + }, +/turf/simulated/floor, +/area/maintenance/station/ai) +"aaT" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/turf/simulated/floor, +/area/maintenance/cargo) "aaU" = ( /turf/simulated/wall/r_wall, /area/security/eva) @@ -322,6 +499,48 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/maintenance/station/sec_upper) +"aaW" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/closet/crate, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, +/turf/simulated/floor, +/area/maintenance/station/ai) +"aaX" = ( +/obj/structure/table, +/turf/simulated/floor, +/area/maintenance/station/ai) +"aaY" = ( +/obj/item/stack/material/steel{ + amount = 6 + }, +/turf/simulated/floor, +/area/maintenance/station/ai) +"aaZ" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor, +/area/maintenance/station/ai) +"aba" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor, +/area/maintenance/station/ai) +"abb" = ( +/obj/structure/catwalk, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 + }, +/turf/simulated/floor, +/area/maintenance/station/sec_upper) "abc" = ( /turf/simulated/wall, /area/security/eva) @@ -344,12 +563,42 @@ /obj/structure/grille, /turf/simulated/floor, /area/maintenance/station/sec_upper) +"abg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/maintenance/cargo) "abh" = ( /obj/structure/railing{ dir = 1 }, /turf/space, /area/space) +"abi" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor, +/area/maintenance/cargo) +"abj" = ( +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1; + icon_state = "bulb1" + }, +/turf/simulated/floor, +/area/maintenance/station/ai) +"abk" = ( +/obj/structure/railing, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor, +/area/maintenance/cargo) "abl" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -359,6 +608,29 @@ "abm" = ( /turf/simulated/wall, /area/maintenance/substation/security) +"abn" = ( +/obj/structure/railing, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_x = 0; + pixel_y = 28 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor, +/area/maintenance/cargo) +"abo" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1; + icon_state = "railing0" + }, +/turf/simulated/floor, +/area/maintenance/station/sec_upper) "abp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -368,6 +640,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"abq" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor, +/area/maintenance/station/elevator) "abr" = ( /obj/effect/floor_decal/borderfloor{ dir = 1; @@ -463,6 +741,12 @@ }, /turf/simulated/floor/tiled, /area/security/hallwayaux) +"abv" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/catwalk, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor, +/area/maintenance/station/sec_upper) "abw" = ( /obj/structure/cable/green{ d1 = 1; @@ -476,6 +760,12 @@ }, /turf/simulated/floor, /area/maintenance/substation/security) +"abx" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/maintenance/cargo) "aby" = ( /obj/structure/cable{ d1 = 1; @@ -532,6 +822,52 @@ }, /turf/simulated/floor, /area/maintenance/substation/security) +"abC" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/turf/simulated/floor, +/area/maintenance/station/elevator) +"abD" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/maintenance/cargo) +"abE" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/junk, +/turf/simulated/floor, +/area/maintenance/cargo) +"abF" = ( +/turf/simulated/floor, +/area/maintenance/cargo) +"abG" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/power/apc{ + dir = 2; + name = "south bump"; + pixel_y = -32 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/simulated/floor, +/area/maintenance/cargo) "abH" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -632,6 +968,19 @@ /obj/effect/floor_decal/corner/red/bordercorner, /turf/simulated/floor/tiled, /area/security/hallwayaux) +"abR" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/turf/simulated/floor, +/area/maintenance/cargo) +"abS" = ( +/obj/machinery/atmospherics/pipe/cap/hidden, +/turf/simulated/floor/plating, +/area/maintenance/station/elevator) "abT" = ( /obj/structure/table/steel, /obj/machinery/cell_charger, @@ -648,6 +997,15 @@ }, /turf/simulated/floor, /area/maintenance/substation/security) +"abU" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/maintenance/cargo) "abV" = ( /obj/structure/closet/crate, /obj/random/maintenance/security, @@ -694,6 +1052,19 @@ }, /turf/simulated/floor/tiled, /area/security/hallway) +"aca" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/plating, +/area/maintenance/station/elevator) "acb" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/sec{ @@ -710,6 +1081,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/maintenance/station/sec_upper) +"acc" = ( +/turf/simulated/floor, +/area/storage/emergency_storage/emergency3) +"acd" = ( +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/random/trash_pile, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor, +/area/maintenance/station/elevator) "ace" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -742,6 +1134,9 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor, /area/security/hallwayaux) +"ach" = ( +/turf/simulated/floor/plating, +/area/maintenance/station/elevator) "aci" = ( /obj/effect/floor_decal/borderfloor{ dir = 1; @@ -793,17 +1188,30 @@ }, /turf/simulated/floor/tiled, /area/security/hallwayaux) -"acl" = ( -/obj/effect/decal/cleanable/dirt, +"ack" = ( /obj/effect/floor_decal/rust, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -28 - }, -/obj/structure/cable/green, +/obj/machinery/light/small, /turf/simulated/floor, -/area/maintenance/substation/security) +/area/storage/emergency_storage/emergency3) +"acl" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/closet/crate, +/obj/random/maintenance/cargo, +/obj/random/maintenance/medical, +/obj/random/maintenance/clean, +/obj/random/junk, +/obj/random/tool, +/obj/random/maintenance/clean, +/obj/effect/floor_decal/rust, +/obj/item/weapon/storage/box/lights/mixed, +/turf/simulated/floor, +/area/maintenance/station/elevator) +"acm" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/structure/railing, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor, +/area/maintenance/station/elevator) "acn" = ( /obj/machinery/door/airlock/engineering{ name = "Security Substation"; @@ -838,25 +1246,9 @@ /turf/simulated/floor/tiled, /area/security/hallwayaux) "acp" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "sec_fore_airlock"; - name = "interior access button"; - pixel_x = 25; - pixel_y = 25; - req_one_access = list(13) - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/security/eva) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/station/elevator) "acq" = ( /obj/random/trash_pile, /obj/effect/decal/cleanable/cobweb{ @@ -902,6 +1294,19 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor, /area/security/hallwayaux) +"acu" = ( +/obj/structure/railing, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/random/maintenance/cargo, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) +"acv" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) "acw" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -936,15 +1341,19 @@ /turf/simulated/floor, /area/maintenance/station/ai) "acz" = ( -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor, -/area/maintenance/substation/security) +/area/maintenance/station/cargo) "acA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1026,6 +1435,16 @@ "acK" = ( /turf/simulated/floor/reinforced, /area/tether/exploration) +"acL" = ( +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) "acM" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -1035,6 +1454,11 @@ }, /turf/simulated/floor/tiled, /area/security/hallwayaux) +"acN" = ( +/obj/random/junk, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) "acO" = ( /obj/structure/table/woodentable, /obj/structure/cable/green{ @@ -1155,6 +1579,12 @@ }, /turf/simulated/floor/tiled, /area/security/hallwayaux) +"acZ" = ( +/obj/structure/catwalk, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) "ada" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -1240,6 +1670,17 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"adi" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/maintenance/station/cargo) "adj" = ( /turf/simulated/wall/rshull, /area/shuttle/excursion/general) @@ -1272,6 +1713,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"adn" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_x = 0; + pixel_y = 24 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor, +/area/maintenance/station/cargo) +"ado" = ( +/obj/structure/table/rack{ + dir = 1 + }, +/obj/random/maintenance/cargo, +/obj/random/maintenance/clean, +/turf/simulated/floor, +/area/maintenance/station/cargo) "adp" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, @@ -1296,16 +1758,13 @@ /turf/simulated/floor/tiled/white, /area/security/security_bathroom) "adr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, +/obj/structure/closet, +/obj/random/junk, +/obj/random/maintenance/cargo, +/obj/random/maintenance/clean, +/obj/random/tech_supply, /turf/simulated/floor, -/area/maintenance/station/sec_upper) +/area/maintenance/station/cargo) "ads" = ( /obj/structure/bed/chair/office/dark, /obj/effect/landmark/start{ @@ -1344,10 +1803,20 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "adw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/maintenance/station/sec_upper) +/obj/effect/floor_decal/rust, +/obj/random/maintenance/cargo, +/obj/random/maintenance/clean, +/obj/random/toy, +/obj/structure/closet, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4; + icon_state = "railing0" + }, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) "adx" = ( /obj/machinery/door/airlock/maintenance/common, /obj/effect/floor_decal/rust, @@ -1380,13 +1849,23 @@ /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "adA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/obj/structure/catwalk, /turf/simulated/floor, -/area/maintenance/station/sec_upper) +/area/maintenance/station/cargo) "adB" = ( /turf/simulated/wall/r_wall, /area/quartermaster/belterdock) @@ -1437,6 +1916,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"adI" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor, +/area/maintenance/station/cargo) "adJ" = ( /obj/item/device/radio/intercom{ dir = 4; @@ -1445,20 +1935,25 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "adK" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_l" +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/turf/simulated/floor/tiled/asteroid_steel/airless, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/mining_outpost/shuttle) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor, +/area/maintenance/station/cargo) "adL" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/tiled/asteroid_steel/airless, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/mining_outpost/shuttle) +/turf/simulated/floor, +/area/maintenance/station/cargo) "adM" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -1476,9 +1971,38 @@ }, /turf/simulated/floor/tiled, /area/security/hallwayaux) +"adN" = ( +/obj/random/trash_pile, +/obj/structure/railing{ + dir = 4; + icon_state = "railing0" + }, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) +"adO" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor, +/area/maintenance/station/cargo) "adP" = ( /turf/simulated/wall, /area/security/security_bathroom) +"adQ" = ( +/obj/machinery/door/airlock/engineering{ + name = "Cargo Substation"; + req_one_access = list(11,24,50) + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/maintenance/substation/cargo) "adR" = ( /turf/simulated/wall/r_wall, /area/security/breakroom) @@ -1492,6 +2016,18 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/cargo) +"adU" = ( +/obj/machinery/door/airlock/engineering{ + name = "Cargo Substation"; + req_one_access = list(11,24,50) + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/maintenance/substation/cargo) "adV" = ( /turf/simulated/wall/r_wall, /area/maintenance/station/ai) @@ -1505,31 +2041,99 @@ /turf/simulated/shuttle/floor/yellow, /area/shuttle/mining_outpost/shuttle) "adX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/machinery/power/terminal, +/obj/structure/cable{ + icon_state = "0-8" }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/rust, +/obj/structure/cable, +/obj/machinery/light/small{ + dir = 1 }, -/obj/effect/landmark{ - name = "morphspawn" - }, -/turf/simulated/floor/tiled, -/area/security/eva) +/turf/simulated/floor, +/area/maintenance/substation/cargo) "adY" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_r" +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Cargo Subgrid"; + name_tag = "Cargo Subgrid" }, -/turf/simulated/floor/tiled/asteroid_steel/airless, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/mining_outpost/shuttle) +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/cable/green, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 25; + pixel_y = 0 + }, +/turf/simulated/floor, +/area/maintenance/substation/cargo) +"adZ" = ( +/obj/structure/railing, +/obj/structure/closet/crate, +/obj/random/maintenance/medical, +/obj/random/maintenance/clean, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) +"aea" = ( +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 + }, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) +"aeb" = ( +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) +"aec" = ( +/obj/structure/railing, +/obj/structure/closet/crate, +/obj/random/maintenance/cargo, +/obj/random/maintenance/clean, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) "aed" = ( /obj/structure/railing, /turf/space, /area/space) +"aee" = ( +/obj/structure/railing, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, +/obj/random/maintenance/clean, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) +"aef" = ( +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/structure/railing, +/obj/structure/closet/crate, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) +"aeg" = ( +/obj/structure/railing, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/random/maintenance/clean, +/obj/random/tech_supply, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) "aeh" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -1618,6 +2222,15 @@ }, /turf/simulated/floor/bluegrid, /area/ai) +"aen" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) "aeo" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -1654,19 +2267,20 @@ /turf/simulated/floor/tiled, /area/security/hallwayaux) "aes" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_l" + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/mining_outpost/shuttle) +"aet" = ( +/obj/structure/shuttle/engine/propulsion{ dir = 8 }, -/obj/structure/railing, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor, -/area/maintenance/cargo) +/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/mining_outpost/shuttle) "aeu" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -1720,6 +2334,14 @@ }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) +"aex" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_r" + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/mining_outpost/shuttle) "aey" = ( /turf/simulated/floor/carpet, /area/security/breakroom) @@ -1831,10 +2453,6 @@ }, /turf/simulated/floor/wood, /area/security/breakroom) -"aeI" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/ai) "aeJ" = ( /turf/simulated/floor/wood, /area/security/breakroom) @@ -1856,16 +2474,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) -"aeL" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/maintenance/cargo) "aeM" = ( /obj/structure/railing{ dir = 4 @@ -1952,12 +2560,6 @@ /obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"aeS" = ( -/obj/item/frame, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/ai) "aeT" = ( /turf/simulated/wall, /area/security/security_equiptment_storage) @@ -2238,11 +2840,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/security/hallway) -"afE" = ( -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/ai) "afF" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -2511,16 +3108,6 @@ "agK" = ( /turf/simulated/floor, /area/maintenance/station/ai) -"agX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/security/eva) "agY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2531,6 +3118,11 @@ d2 = 8; icon_state = "0-8" }, +/obj/machinery/power/apc{ + dir = 2; + name = "south bump"; + pixel_y = -28 + }, /turf/simulated/floor/tiled, /area/security/eva) "agZ" = ( @@ -2782,18 +3374,6 @@ /obj/machinery/camera/network/command, /turf/simulated/floor/bluegrid, /area/ai) -"aid" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/random/maintenance/engineering, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/ai) "aie" = ( /obj/structure/cable/cyan{ d2 = 8; @@ -3454,16 +4034,6 @@ /obj/item/weapon/storage/box/donut, /turf/simulated/floor/carpet, /area/security/breakroom) -"ajO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/random/maintenance/cargo, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) "ajP" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -3611,17 +4181,6 @@ "ako" = ( /turf/simulated/wall/r_wall, /area/security/security_equiptment_storage) -"akp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera/network/security{ - dir = 10; - icon_state = "camera" - }, -/obj/machinery/atmospherics/binary/passive_gate/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/security/eva) "akq" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -3685,14 +4244,6 @@ /obj/random/maintenance/clean, /turf/simulated/floor, /area/maintenance/station/sec_upper) -"aku" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 4 - }, -/obj/random/trash_pile, -/turf/simulated/floor, -/area/maintenance/station/sec_upper) "akx" = ( /obj/item/device/radio/intercom{ pixel_y = -24 @@ -3820,19 +4371,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) -"akM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/maintenance/station/sec_upper) "akN" = ( /obj/effect/floor_decal/borderfloor/shifted{ dir = 1; @@ -4995,20 +5533,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"anh" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/camera/network/command{ - dir = 10; - icon_state = "camera" - }, -/turf/simulated/floor, -/area/maintenance/station/ai) "ani" = ( /obj/structure/bookcase, /obj/item/weapon/book/manual/security_space_law, @@ -5435,11 +5959,6 @@ /obj/structure/grille, /turf/space, /area/space) -"aou" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) "aoy" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5540,15 +6059,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/storage) -"aoO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor, -/area/maintenance/cargo) "aoP" = ( /obj/structure/disposalpipe/tagger{ dir = 8; @@ -5561,14 +6071,6 @@ }, /turf/simulated/floor, /area/maintenance/cargo) -"aoQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/cargo) "aoR" = ( /obj/random/trash_pile, /obj/effect/floor_decal/rust, @@ -5973,34 +6475,6 @@ }, /turf/simulated/floor, /area/maintenance/cargo) -"apv" = ( -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor, -/area/maintenance/cargo) -"apw" = ( -/obj/structure/railing, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/cargo) -"apx" = ( -/obj/structure/railing, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 28 - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/cargo) "apy" = ( /obj/structure/railing, /obj/structure/cable/green{ @@ -6339,20 +6813,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/hallway) -"aqn" = ( -/obj/machinery/door/firedoor/glass, -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor, -/area/maintenance/station/sec_upper) -"aqo" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/cargo) "aqp" = ( /obj/structure/disposalpipe/segment, /obj/structure/catwalk, @@ -6531,20 +6991,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor, /area/maintenance/station/elevator) -"aqW" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor, -/area/maintenance/cargo) "aqX" = ( /obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment, @@ -6781,25 +7227,6 @@ /obj/structure/railing, /turf/simulated/floor, /area/maintenance/station/elevator) -"arE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor, -/area/maintenance/station/elevator) -"arF" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/random/junk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/cargo) -"arG" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/cargo) "arH" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor, @@ -6951,12 +7378,6 @@ }, /turf/simulated/open, /area/maintenance/station/ai) -"arT" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor, -/area/maintenance/station/ai) "arU" = ( /obj/structure/catwalk, /obj/structure/disposalpipe/segment{ @@ -7048,44 +7469,12 @@ }, /turf/simulated/floor/tiled, /area/security/security_processing) -"aso" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/maintenance/station/elevator) "asp" = ( /turf/simulated/wall/r_wall, /area/hallway/station/upper) "asq" = ( /turf/simulated/wall, /area/hallway/station/upper) -"asr" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -32 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/cargo) -"ass" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/turf/simulated/floor, -/area/maintenance/cargo) "ast" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -7599,11 +7988,6 @@ "atl" = ( /turf/simulated/wall/r_wall, /area/maintenance/station/elevator) -"atm" = ( -/obj/machinery/atmospherics/pipe/cap/hidden, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/station/elevator) "atn" = ( /turf/simulated/shuttle/wall/voidcraft/green{ hard_corner = 1 @@ -7934,20 +8318,6 @@ }, /turf/simulated/floor, /area/maintenance/station/elevator) -"auh" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/station/elevator) "aui" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator) @@ -8170,15 +8540,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) -"auC" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor, -/area/maintenance/station/ai) "auD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8377,10 +8738,6 @@ /obj/machinery/space_heater, /turf/simulated/floor, /area/storage/emergency_storage/emergency3) -"avc" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/storage/emergency_storage/emergency3) "avd" = ( /obj/structure/closet/crate, /obj/random/junk, @@ -8708,25 +9065,6 @@ }, /turf/simulated/floor/tiled, /area/security/lobby) -"avM" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt, -/obj/random/trash_pile, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor, -/area/maintenance/station/elevator) "avN" = ( /obj/structure/cable{ icon_state = "1-2" @@ -8743,10 +9081,6 @@ }, /turf/simulated/floor, /area/maintenance/station/elevator) -"avO" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/station/elevator) "avP" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -8766,12 +9100,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor, /area/storage/emergency_storage/emergency3) -"avS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/machinery/light/small, -/turf/simulated/floor, -/area/storage/emergency_storage/emergency3) "avT" = ( /obj/effect/floor_decal/rust, /obj/machinery/portable_atmospherics/powered/pump/filled, @@ -8953,20 +9281,6 @@ }, /turf/simulated/floor/tiled, /area/security/lobby) -"awr" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/closet/crate, -/obj/random/maintenance/cargo, -/obj/random/maintenance/medical, -/obj/random/maintenance/clean, -/obj/random/junk, -/obj/random/tool, -/obj/random/maintenance/clean, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/item/weapon/storage/box/lights/mixed, -/turf/simulated/floor, -/area/maintenance/station/elevator) "aws" = ( /obj/structure/cable{ icon_state = "1-2" @@ -9240,18 +9554,6 @@ }, /turf/simulated/floor/tiled, /area/security/lobby) -"awW" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/structure/railing, -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/elevator) -"awX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/maintenance/station/elevator) "axa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -10512,23 +10814,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"azC" = ( -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) -"azD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) "azE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -10816,25 +11101,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"aAi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) -"aAj" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) -"aAk" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) "aAl" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/full, @@ -11578,30 +11844,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) -"aBH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/maintenance/station/cargo) -"aBI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor, -/area/maintenance/station/cargo) "aBJ" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -11614,11 +11856,6 @@ }, /turf/simulated/floor/plating, /area/medical/chemistry) -"aBK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/floor/tiled, -/area/security/eva) "aBL" = ( /obj/machinery/camera/network/cargo{ dir = 8; @@ -12027,18 +12264,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/substation/medical) -"aCC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/maintenance/station/cargo) "aCD" = ( /turf/simulated/floor/wood, /area/quartermaster/qm) @@ -12330,29 +12555,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/steel_grid, /area/tether/station/stairs_three) -"aDd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 24 - }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor, -/area/maintenance/station/cargo) -"aDe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack{ - dir = 1 - }, -/obj/random/maintenance/cargo, -/obj/random/maintenance/clean, -/turf/simulated/floor, -/area/maintenance/station/cargo) "aDf" = ( /turf/simulated/wall, /area/tether/station/stairs_three) @@ -12385,15 +12587,6 @@ dir = 4 }, /area/tether/station/stairs_three) -"aDi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet, -/obj/random/junk, -/obj/random/maintenance/cargo, -/obj/random/maintenance/clean, -/obj/random/tech_supply, -/turf/simulated/floor, -/area/maintenance/station/cargo) "aDj" = ( /obj/structure/sign/department/medbay, /turf/simulated/wall, @@ -12693,22 +12886,6 @@ /obj/structure/table/steel, /turf/simulated/floor/tiled, /area/security/security_processing) -"aDT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/random/maintenance/cargo, -/obj/random/maintenance/clean, -/obj/random/toy, -/obj/structure/closet, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4; - icon_state = "railing0" - }, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) "aDU" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Medical"; @@ -12737,59 +12914,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/medical) -"aDX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor, -/area/maintenance/station/cargo) -"aDY" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor, -/area/maintenance/station/cargo) -"aDZ" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor, -/area/maintenance/station/cargo) -"aEa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor, -/area/maintenance/station/cargo) "aEb" = ( /obj/structure/cable/green{ d1 = 2; @@ -13161,15 +13285,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/reception) -"aEP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/trash_pile, -/obj/structure/railing{ - dir = 4; - icon_state = "railing0" - }, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) "aEQ" = ( /obj/machinery/alarm{ dir = 8; @@ -13236,42 +13351,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/medical) -"aEV" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor, -/area/maintenance/station/cargo) -"aEW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/engineering{ - name = "Cargo Substation"; - req_one_access = list(11,24,50) - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/maintenance/substation/cargo) -"aEX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/engineering{ - name = "Cargo Substation"; - req_one_access = list(11,24,50) - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/maintenance/substation/cargo) "aEY" = ( /obj/structure/cable/green{ d1 = 1; @@ -13554,20 +13633,6 @@ }, /turf/simulated/floor, /area/maintenance/substation/cargo) -"aFC" = ( -/obj/machinery/power/terminal, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/effect/floor_decal/industrial/warning, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/obj/structure/cable, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor, -/area/maintenance/substation/cargo) "aFD" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8; @@ -13737,27 +13802,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"aFY" = ( -/obj/machinery/power/sensor{ - name = "Powernet Sensor - Cargo Subgrid"; - name_tag = "Cargo Subgrid" - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/green, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 25; - pixel_y = 0 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/substation/cargo) "aFZ" = ( /obj/structure/closet/wardrobe/chemistry_white, /obj/item/weapon/storage/box/pillbottles, @@ -15528,7 +15572,7 @@ dir = 4; id = "QMLoad" }, -/turf/simulated/floor, +/turf/simulated/floor/tiled, /area/quartermaster/storage) "aIY" = ( /obj/machinery/conveyor{ @@ -18143,22 +18187,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai_core_foyer) -"aPk" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, -/turf/simulated/floor, -/area/maintenance/station/ai) "aPq" = ( /obj/machinery/camera/network/security{ dir = 10; @@ -18371,20 +18399,6 @@ }, /turf/simulated/open, /area/security/brig) -"aQm" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/camera/network/command{ - dir = 4; - icon_state = "camera" - }, -/turf/simulated/floor, -/area/maintenance/station/ai) "aQp" = ( /obj/effect/landmark{ name = "morphspawn" @@ -18426,14 +18440,6 @@ /obj/random/maintenance/medical, /turf/simulated/floor/plating, /area/maintenance/station/cargo) -"aQv" = ( -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/random/maintenance/medical, -/obj/random/maintenance/clean, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) "aQw" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -18484,10 +18490,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/station/cargo) -"aQD" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) "aQE" = ( /obj/effect/landmark/start{ name = "Medical Doctor" @@ -18498,15 +18500,6 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/medbreak) -"aQF" = ( -/obj/machinery/alarm{ - dir = 8; - icon_state = "alarm0"; - pixel_x = 24 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) "aQG" = ( /turf/simulated/wall, /area/quartermaster/belterdock) @@ -18573,11 +18566,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"aQM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/junk, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) "aQN" = ( /obj/machinery/light/small{ dir = 1 @@ -18588,31 +18576,6 @@ /obj/structure/railing, /turf/simulated/floor/plating, /area/maintenance/station/cargo) -"aQO" = ( -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/random/maintenance/cargo, -/obj/random/maintenance/clean, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) -"aQP" = ( -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/random/maintenance/cargo, -/obj/random/maintenance/cargo, -/obj/random/maintenance/clean, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) -"aQQ" = ( -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) "aQR" = ( /obj/machinery/light/small{ dir = 1 @@ -18681,17 +18644,6 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_upper) -"aQZ" = ( -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/random/maintenance/cargo, -/obj/random/maintenance/cargo, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) "aRa" = ( /obj/structure/railing, /obj/structure/railing{ @@ -18707,32 +18659,6 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/sec_upper) -"aRc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1; - icon_state = "railing0" - }, -/turf/simulated/floor, -/area/maintenance/station/sec_upper) -"aRd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor, -/area/maintenance/station/sec_upper) -"aRe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing, -/turf/simulated/floor, -/area/maintenance/station/elevator) "aRf" = ( /obj/effect/floor_decal/borderfloor/corner2{ dir = 8 @@ -18779,17 +18705,6 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/elevator) -"aRl" = ( -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/random/maintenance/clean, -/obj/random/tech_supply, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) "aRm" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -18850,17 +18765,6 @@ }, /turf/simulated/floor, /area/tether/exploration) -"aRr" = ( -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tool, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/ai) "aRs" = ( /obj/machinery/button/windowtint{ id = "sec_processing"; @@ -18893,16 +18797,6 @@ }, /turf/simulated/floor, /area/maintenance/station/ai) -"aRx" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/maintenance/station/ai) "aRy" = ( /obj/structure/railing{ dir = 4 @@ -18918,17 +18812,6 @@ }, /turf/simulated/floor, /area/maintenance/station/ai) -"aRz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor, -/area/maintenance/station/sec_upper) "aRA" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -18939,18 +18822,6 @@ }, /turf/simulated/floor, /area/maintenance/station/ai) -"aRC" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor, -/area/maintenance/station/ai) "aRD" = ( /obj/structure/catwalk, /obj/effect/floor_decal/rust, @@ -18987,17 +18858,6 @@ }, /turf/simulated/floor, /area/maintenance/station/ai) -"aRG" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor, -/area/maintenance/station/ai) "aRH" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -19046,13 +18906,6 @@ }, /turf/simulated/floor, /area/maintenance/station/ai) -"aRN" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/ai) "aRO" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -19083,28 +18936,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/station/ai) -"aRR" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/cargo, -/obj/random/maintenance/cargo, -/turf/simulated/floor, -/area/maintenance/station/ai) -"aRS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/maintenance/cargo) "aRT" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -19119,18 +18950,6 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/cargo) -"aRV" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/ai) -"aRW" = ( -/obj/item/stack/material/steel{ - amount = 6 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/ai) "aRX" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor, @@ -19206,16 +19025,6 @@ }, /turf/simulated/floor, /area/maintenance/cargo) -"aSh" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/maintenance/cargo) "aSi" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -19232,32 +19041,11 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) -"aSk" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/ai) -"aSl" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/ai) "aSm" = ( /obj/random/toy, /obj/structure/closet, /turf/simulated/floor, /area/maintenance/station/ai) -"aSn" = ( -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 1; - icon_state = "bulb1" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/ai) "aSo" = ( /turf/simulated/floor/plating, /area/maintenance/station/cargo) @@ -19392,16 +19180,6 @@ }, /turf/simulated/floor/carpet, /area/security/breakroom) -"aSD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) "aSE" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -22856,16 +22634,11 @@ }, /turf/simulated/floor/tiled, /area/security/security_processing) -"gUi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/cutout, -/turf/simulated/floor, -/area/maintenance/station/ai) "gWG" = ( /obj/structure/bed/chair/shuttle{ dir = 4 }, -/obj/structure/closet/autolok_wall{ +/obj/structure/closet/emergsuit_wall{ pixel_y = 32 }, /turf/simulated/floor/tiled/eris/white, @@ -22889,6 +22662,13 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) +"hai" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "QMLoad" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) "hid" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -23150,7 +22930,7 @@ id = "QMLoad" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor, +/turf/simulated/floor/tiled, /area/quartermaster/storage) "iJT" = ( /obj/structure/shuttle/engine/heater, @@ -23381,7 +23161,7 @@ health = 1e+006 }, /obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/structure/closet/autolok_wall{ +/obj/structure/closet/emergsuit_wall{ pixel_x = 27 }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, @@ -34118,9 +33898,9 @@ amH amH amH amH -avM -awr -awW +acd +acl +acm axN ayy ayz @@ -34541,12 +34321,12 @@ amH amH aSu atl -atm -auh +abS +aca auX -avO +ach awu -awX +acp asp gBy azv @@ -34963,8 +34743,8 @@ yeP yeP aaf aqV -arE -aRe +abq +abC aRk atl atn @@ -35085,7 +34865,7 @@ agY abm abz abw -acl +aaB adS add aSX @@ -35105,7 +34885,7 @@ yeP yeP aaf arD -aso +aRk aRk aSM atl @@ -35222,7 +35002,7 @@ aac aag aak aax -acp +aah ahv abm abA @@ -35247,7 +35027,7 @@ aaf aaf aaf aaI -aqn +abv aaI ayz atl @@ -35364,12 +35144,12 @@ aaU aaU aaU aaU -adX +aaj ahw abm abB aby -acz +aaC adS amW aSX @@ -35384,12 +35164,12 @@ afc afc afc afc -adw -adw -adr +afc +afc +abb amR afc -adw +afc aaI aab asp @@ -35506,8 +35286,8 @@ aaa aaa abc aay -agX -akp +aal +aao abm abm abm @@ -35530,8 +35310,8 @@ aRa vFD aRb afc -aRc -aRd +abo +aQY aaI aab asq @@ -35649,19 +35429,19 @@ aaa abc agZ aha -aBK +aap aan -adw afc -adA -akM +afc +aaD +aaH ajq ajq aqU aqU aaI akt -aku +akJ akJ aaI amR @@ -35798,9 +35578,9 @@ aeW akg aks aTp -aRz -aRz -aRz +aRH +aRH +aRH aRE aRH aRH @@ -36091,8 +35871,8 @@ alV aPx amq abe -aes -aRS +aaT +aSg aiV aab aab @@ -36112,14 +35892,14 @@ axb axR aeP aAH -ajO -aou +acu +acv awf -azC +acL aAH aCx -aDT -aEP +adw +adN aAH aSo aSo @@ -36234,7 +36014,7 @@ amr anz abe aSr -aRS +aSg aiV aab aab @@ -36257,10 +36037,10 @@ aAH aAH aAH aAH -azD +awf aoq -azD -aou +awf +acv aEQ aAH aSo @@ -36376,7 +36156,7 @@ ams aOz abe amV -aRS +aSg aiV aiV aiV @@ -36525,10 +36305,10 @@ aop adT adT apU -aqo -aqW -arF -asr +abx +abD +abE +abG asq asq asq @@ -36541,7 +36321,7 @@ aAH aQg ayP aAH -aAi +acN aBD aCy aDU @@ -36655,7 +36435,7 @@ aUJ aXb aWp iJT -aah +aaR ams aXq abe @@ -36669,8 +36449,8 @@ aiV aiV aiV aiV -arG -ass +abF +abR aiV auo avb @@ -36683,7 +36463,7 @@ aAH aub azE aAH -aAj +acv aBD aCz aDW @@ -36797,7 +36577,7 @@ wRt eug aWp cQa -aah +aaR ams aXq abe @@ -36806,17 +36586,17 @@ aoV aRY aSv aiV -aoO +abg aps apV aqp aqX arH ast -aeL +abU aup -avc -avS +acc +ack aSH wls eZE @@ -36825,7 +36605,7 @@ aAH aAH aAG aAH -aAk +acZ aBD aCB aBD @@ -36965,13 +36745,13 @@ pOc asX atg avp -aBI -aBH -aBH +acz aWm -aCC -aDX -aEV +aWm +aWm +adi +adA +adO aFA aFA aQq @@ -37090,7 +36870,7 @@ abe abe aSg aiV -aoQ +abi apu apW aqr @@ -37112,7 +36892,7 @@ azL azL azL aJY -aDY +adI aGC aGC aWb @@ -37230,10 +37010,10 @@ aOx aOx aOx abe -aSh +aSg aiV aoR -apv +aRY apX aqs aqY @@ -37253,15 +37033,15 @@ aXh aUa aVF azL -aDd -aDZ -aEW +adn +adK +adQ aFB aIO aGC aQu -aQD -aQD +aSo +aSo aAH aAH aAH @@ -37375,7 +37155,7 @@ abe aSw aiV aiV -apw +abk apt aqr aqr @@ -37395,15 +37175,15 @@ aZp aCA aZi azL -aDe -aEa +ado +adL aGC -aFC +adX aIP aGC -aQv -aQF -aQM +adZ +aea +aeb aSo aAH aab @@ -37517,7 +37297,7 @@ abe aSi agJ aiV -apx +abn apt aqr ayY @@ -37537,16 +37317,16 @@ aZp aCA aZn azL -aDi +adr aEb -aEX +adU aFD -aFY +adY aGC aFj aFj aQN -aQD +aSo aAH aab aab @@ -37656,7 +37436,7 @@ abe abe abe abe -aRx +aSi agJ aiV apy @@ -37687,8 +37467,8 @@ aFj aFj aFj aFj -aQO -aQD +aec +aSo aAH aab aab @@ -37798,7 +37578,7 @@ abe aRQ agK aQX -aRx +aSi agJ aiV aiV @@ -37829,7 +37609,7 @@ aIm aIR aMg aFj -aQP +aee aSo aAH aab @@ -37933,14 +37713,14 @@ pPy efQ aWp cQa -aah +aaR ams amq abe aoU -aRV +aaX aRZ -aRx +aSi agJ agJ agJ @@ -38075,12 +37855,12 @@ iEV tEV aWp rUl -aah +aaR ams aQL abe aoU -aRW +aaY agK aSi aRt @@ -38113,8 +37893,8 @@ aKU aIS aJI aFj -aQQ -aQD +aLx +aSo aAH aSY aSY @@ -38227,7 +38007,7 @@ aSb aSi aRt aib -aSl +aib aib agJ aqu @@ -38256,7 +38036,7 @@ aGG aHg aFj aQR -aQD +aSo aAH aSZ aTo @@ -38368,8 +38148,8 @@ abe abe aSx agy -aSn -aSl +abj +aib aib agJ aqu @@ -38397,7 +38177,7 @@ aLA aIT aJK aFj -aQZ +aef aSB aSU aTa @@ -38539,8 +38319,8 @@ aMc aFj aJL aFj -aRl -aSD +aeg +aen aAH aTe aTs @@ -38923,21 +38703,21 @@ adV aRw akV aRA -aRC aRD -aPk +aRD +aaQ aRA aRA -aRG -aQm +aRA +aaS aRy -aRR +aaW aSs aSd aSi -aSk +aaZ arU -auC +arV agJ agJ aqu @@ -39058,17 +38838,17 @@ aaa aaa aaa adV -aeI +agK afp amT adx -anh +aaP adV afy afy afy adV -aeI +agK aRJ aRK aRM @@ -39077,7 +38857,7 @@ aRA aRA aRA anb -arT +aba arV agJ agJ @@ -39200,11 +38980,11 @@ aaa aaa aaa adV -aeI +agK agK aoT adV -aRx +aSi afy afy adu @@ -39213,8 +38993,8 @@ afy aRI aZQ afp -aRN -aeI +aiJ +agK anV apZ aiJ @@ -39343,7 +39123,7 @@ aaa aaa adV alo -aeI +agK apA afy ahy @@ -39484,8 +39264,8 @@ aaa aaa aaa adV -gUi -aeI +aaq +agK apZ afy ahz @@ -39628,7 +39408,7 @@ aaa adV agK agK -aeI +agK afy aem ajt @@ -39672,7 +39452,7 @@ aCN aGO aGO aIv -aGR +hai azO tVq aab @@ -39910,9 +39690,9 @@ aaa aaa aaa adV -aeI -afE -aeI +agK +apZ +agK afy aic ajD @@ -40052,9 +39832,9 @@ aaa aaa aaa adV -aeS -aid -aRr +aau +aaw +aaz afy aie ajD @@ -40112,11 +39892,11 @@ avt avt adD aZS -adK -adL -adL -adL -adY +aes +aet +aet +aet +aex baB adD avt diff --git a/maps/tether/tether-09-solars.dmm b/maps/tether/tether-09-solars.dmm index 882d13a7dd4..db66542c9c6 100644 --- a/maps/tether/tether-09-solars.dmm +++ b/maps/tether/tether-09-solars.dmm @@ -242,12 +242,37 @@ /turf/simulated/floor/virgo3b_indoors, /area/tether/outpost/solars_shed) "az" = ( +/obj/machinery/power/tracker, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/virgo3b, +/area/tether/outpost/solars_outside) +"aA" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/virgo3b, +/area/tether/outpost/solars_outside) +"aB" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -256,8 +281,7 @@ /obj/structure/closet/crate/solar, /turf/simulated/floor/virgo3b_indoors, /area/tether/outpost/solars_shed) -"aA" = ( -/obj/effect/decal/cleanable/dirt, +"aC" = ( /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -266,8 +290,7 @@ /obj/structure/closet/crate/solar, /turf/simulated/floor/virgo3b_indoors, /area/tether/outpost/solars_shed) -"aB" = ( -/obj/effect/decal/cleanable/dirt, +"aD" = ( /obj/structure/table/standard, /obj/item/clothing/gloves/yellow, /obj/structure/cable/yellow{ @@ -277,8 +300,44 @@ }, /turf/simulated/floor/virgo3b_indoors, /area/tether/outpost/solars_shed) -"aC" = ( -/obj/effect/decal/cleanable/dirt, +"aE" = ( +/obj/structure/table/standard, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/item/stack/cable_coil/yellow, +/turf/simulated/floor/virgo3b_indoors, +/area/tether/outpost/solars_shed) +"aF" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/virgo3b_indoors, +/area/tether/outpost/solars_shed) +"aG" = ( +/turf/simulated/floor/virgo3b_indoors, +/area/tether/outpost/solars_shed) +"aH" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/obj/structure/grille, +/turf/simulated/floor/virgo3b_indoors, +/area/tether/outpost/solars_shed) +"aI" = ( +/obj/structure/cable/heavyduty{ + icon_state = "2-4" + }, +/turf/simulated/floor/virgo3b_indoors, +/area/tether/outpost/solars_shed) +"aJ" = ( /obj/structure/cable/heavyduty{ icon_state = "0-8" }, @@ -291,84 +350,18 @@ }, /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_outside) -"aD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/virgo3b_indoors, -/area/tether/outpost/solars_shed) -"aE" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/virgo3b_indoors, -/area/tether/outpost/solars_shed) -"aF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/heavyduty{ - icon_state = "2-4" - }, -/turf/simulated/floor/virgo3b_indoors, -/area/tether/outpost/solars_shed) -"aG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/standard, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/item/stack/cable_coil/yellow, -/turf/simulated/floor/virgo3b_indoors, -/area/tether/outpost/solars_shed) -"aH" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/structure/grille, -/turf/simulated/floor/virgo3b_indoors, -/area/tether/outpost/solars_shed) -"aI" = ( -/obj/machinery/power/tracker, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt, +"aK" = ( /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_outside) -"aJ" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, +"aL" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_outside) -"aK" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/virgo3b, -/area/tether/outpost/solars_outside) -"aL" = ( -/obj/effect/decal/cleanable/dirt, +"aM" = ( /obj/item/weapon/stool, /obj/structure/cable/yellow{ d1 = 1; @@ -377,23 +370,10 @@ }, /turf/simulated/floor/virgo3b_indoors, /area/tether/outpost/solars_shed) -"aM" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/virgo3b, -/area/tether/outpost/solars_outside) "aN" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/machinery/light/small{ - dir = 8; - pixel_x = 0 - }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_outside) "aO" = ( @@ -426,7 +406,6 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "aR" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" @@ -438,7 +417,6 @@ /turf/simulated/floor/virgo3b_indoors, /area/tether/outpost/solars_shed) "aS" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc{ dir = 2; name = "south bump"; @@ -451,7 +429,6 @@ /turf/simulated/floor/virgo3b_indoors, /area/tether/outpost/solars_shed) "aT" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/camera/network/engineering{ dir = 1 }, @@ -466,7 +443,6 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/mine/explored) "aV" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/power/terminal{ icon_state = "term"; dir = 1 @@ -478,29 +454,10 @@ /turf/simulated/floor/virgo3b_indoors, /area/tether/outpost/solars_shed) "aW" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/railing, /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_outside) "aX" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/virgo3b, -/area/tether/outpost/solars_outside) -"aY" = ( -/obj/effect/floor_decal/industrial/warning/dust, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/mine/explored) -"aZ" = ( -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/virgo3b, -/area/tether/outpost/solars_outside) -"ba" = ( /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -510,7 +467,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" @@ -521,6 +477,25 @@ }, /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_outside) +"aY" = ( +/obj/effect/floor_decal/industrial/warning/dust, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/mine/explored) +"aZ" = ( +/obj/machinery/door/airlock/multi_tile/metal/mait, +/turf/simulated/floor/virgo3b_indoors, +/area/tether/outpost/solars_shed) +"ba" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 8; + pixel_x = 0 + }, +/turf/simulated/floor/virgo3b, +/area/tether/outpost/solars_outside) "bb" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; @@ -531,10 +506,16 @@ /turf/simulated/wall, /area/tether/outpost/solars_shed) "bc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/multi_tile/metal/mait, -/turf/simulated/floor/virgo3b_indoors, -/area/tether/outpost/solars_shed) +/obj/effect/floor_decal/rust, +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/cable/heavyduty{ + icon_state = "1-4" + }, +/turf/simulated/floor/virgo3b, +/area/tether/outpost/solars_outside) "bd" = ( /obj/effect/floor_decal/rust, /obj/effect/map_effect/portal/line/side_b{ @@ -613,15 +594,10 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/outpost/solars_outside) "bn" = ( -/obj/effect/floor_decal/rust, -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, /obj/structure/cable/heavyduty{ - icon_state = "1-4" + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/railing, /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_outside) "bo" = ( @@ -633,7 +609,6 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/virgo3b, /area/mine/explored) "bp" = ( @@ -644,7 +619,6 @@ /obj/structure/railing{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/virgo3b, /area/mine/explored) "bq" = ( @@ -676,7 +650,6 @@ /obj/structure/railing{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/virgo3b, /area/mine/explored) "bu" = ( @@ -826,7 +799,6 @@ /obj/structure/railing{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/virgo3b, /area/mine/explored) "bJ" = ( @@ -841,7 +813,6 @@ dir = 8 }, /obj/structure/railing, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/virgo3b, /area/mine/explored) "bL" = ( @@ -878,7 +849,6 @@ dir = 1 }, /obj/structure/railing, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/virgo3b, /area/mine/explored) "bR" = ( @@ -918,7 +888,6 @@ /obj/structure/cable/heavyduty{ icon_state = "2-4" }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/virgo3b, /area/mine/explored) "bV" = ( @@ -1026,11 +995,9 @@ /turf/simulated/wall, /area/rnd/outpost/airlock) "cm" = ( -/obj/structure/cable/ender{ - icon_state = "4-8"; - id = "surface-solars" +/obj/structure/cable/heavyduty{ + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/virgo3b, /area/mine/explored) "cn" = ( @@ -1455,10 +1422,10 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/airlock) "dd" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" +/obj/structure/cable/ender{ + icon_state = "4-8"; + id = "surface-solars" }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/virgo3b, /area/mine/explored) "de" = ( @@ -1877,12 +1844,14 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/airlock) "ec" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, /obj/structure/railing{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/heavyduty{ - icon_state = "1-4" +/obj/structure/railing{ + dir = 4 }, /turf/simulated/floor/virgo3b, /area/mine/explored) @@ -1902,26 +1871,21 @@ /turf/simulated/floor, /area/maintenance/substation/outpost) "ef" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, /obj/structure/railing{ - dir = 1 + dir = 8 + }, +/obj/structure/cable/heavyduty{ + icon_state = "1-4" }, /turf/simulated/floor/virgo3b, /area/mine/explored) "eg" = ( /obj/structure/cable/heavyduty{ - icon_state = "1-2" + icon_state = "4-8" }, /obj/structure/railing{ - dir = 8 + dir = 1 }, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/virgo3b, /area/mine/explored) "eh" = ( @@ -5038,7 +5002,6 @@ /obj/structure/cable/heavyduty{ icon_state = "2-8" }, -/obj/effect/decal/cleanable/dirt, /obj/structure/railing{ dir = 1 }, @@ -6847,13 +6810,9 @@ /area/rnd/outpost/anomaly_lab/analysis) "mu" = ( /obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - icon_state = "railing0"; - dir = 4 + icon_state = "4-8" }, +/obj/structure/railing, /turf/simulated/floor/virgo3b, /area/mine/explored) "mv" = ( @@ -7461,9 +7420,12 @@ /area/rnd/outpost) "nB" = ( /obj/structure/cable/heavyduty{ - icon_state = "4-8" + icon_state = "1-8" + }, +/obj/structure/railing{ + icon_state = "railing0"; + dir = 4 }, -/obj/effect/decal/cleanable/dirt, /obj/structure/railing, /turf/simulated/floor/virgo3b, /area/mine/explored) @@ -7699,18 +7661,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) -"ob" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - icon_state = "railing0"; - dir = 4 - }, -/obj/structure/railing, -/turf/simulated/floor/virgo3b, -/area/mine/explored) "oc" = ( /obj/item/device/radio/intercom{ dir = 4; @@ -18727,10 +18677,10 @@ ad ad ad ad -aI +az +aK +aK aW -aW -aZ af bu ad @@ -18869,10 +18819,10 @@ ad ad ad ax -aJ +aA +aL +aL aX -aX -ba bg bv ad @@ -19153,8 +19103,8 @@ ad ad ad au -az -aL +aB +aM aR au bi @@ -19295,8 +19245,8 @@ ad ad ad au -aA -aE +aC +aG aS au bi @@ -19437,9 +19387,9 @@ ad ad ad au -aB -aE -aE +aD +aG +aG au bi bv @@ -19579,8 +19529,8 @@ ad ad ad au -aG aE +aG aT au bk @@ -19721,10 +19671,10 @@ ad ad ad av -aD -aE -aE -bc +aF +aG +aG +aZ bl bl ad @@ -19863,10 +19813,10 @@ ad ad ad av -aE -aE -aE -aE +aG +aG +aG +aG al bv ad @@ -20005,7 +19955,7 @@ ad ad ad au -aF +aI aO aV bP @@ -20289,11 +20239,11 @@ ad ad ad ad -aC -aK -aK +aJ aN -bn +aN +ba +bc bl ad ad @@ -20431,11 +20381,11 @@ ad ad ad ad -aW -aW -aW -aW -aM +aK +aK +aK +aK +bn bl ad ad @@ -24885,19 +24835,19 @@ bS bS bS bT -eg -eg -eg -eg -eg -eg -eg -eg -eg -eg -eg -eg ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ec +ef kr ez jt @@ -25039,7 +24989,7 @@ ad ad ad ab -ef +eg kr eC mw @@ -25181,7 +25131,7 @@ ab ad ad ab -ef +eg kr eA fc @@ -25323,7 +25273,7 @@ ab ab ab ab -ef +eg kr js kd @@ -25465,7 +25415,7 @@ ab ab ab ab -ef +eg kr kr kr @@ -25473,7 +25423,7 @@ kr kr kr kr -nB +mu ab fC fT @@ -25608,14 +25558,14 @@ ab ab ab ju -mu -mu -mu mv mv mv mv -ob +mv +mv +mv +nB ab fC fT @@ -27711,7 +27661,7 @@ ab ab ab ab -dd +cm aa bj bj @@ -27853,7 +27803,7 @@ ab ab ab ab -cm +dd aa bj bj diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index 42d84c61497..f3121da7e76 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -203,7 +203,8 @@ lateload_single_pick = null //Nothing right now. - planet_datums_to_make = list(/datum/planet/virgo3b) + planet_datums_to_make = list(/datum/planet/virgo3b, + /datum/planet/virgo4) /datum/map/tether/perform_map_generation() @@ -227,6 +228,10 @@ Z_LEVEL_SURFACE_MINE, Z_LEVEL_SOLARS, Z_LEVEL_PLAINS + ) +/datum/planet/virgo4 + expected_z_levels = list( + Z_LEVEL_BEACH ) // Overmap represetation of tether diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm index 7ad7472fc65..8f459766c7a 100644 --- a/maps/tether/tether_shuttles.dm +++ b/maps/tether/tether_shuttles.dm @@ -259,7 +259,6 @@ /obj/machinery/computer/shuttle_control/explore/medivac name = "short jump console" shuttle_tag = "Medivac Shuttle" - req_one_access = list(access_cmo, access_pilot) //////////////////////////////////////// //////// Securiship ///////////// @@ -285,4 +284,3 @@ /obj/machinery/computer/shuttle_control/explore/securiship name = "short jump console" shuttle_tag = "Securiship Shuttle" - req_one_access = list(access_pilot, access_hos) diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index 903026b6577..2d981f1a48d 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -366,7 +366,7 @@ var/global/list/latejoin_tram = list() /obj/structure/closet/secure_closet/guncabinet/excursion/New() ..() - for(var/i = 1 to 3) + for(var/i = 1 to 2) new /obj/item/weapon/gun/energy/locked/frontier(src) // Used at centcomm for the elevator diff --git a/tgui/packages/tgui/interfaces/AppearanceChanger.js b/tgui/packages/tgui/interfaces/AppearanceChanger.js index ca2d7b4952b..647e6f66ff2 100644 --- a/tgui/packages/tgui/interfaces/AppearanceChanger.js +++ b/tgui/packages/tgui/interfaces/AppearanceChanger.js @@ -15,6 +15,9 @@ export const AppearanceChanger = (props, context) => { gender_id, hair_style, facial_hair_style, + ear_style, + tail_style, + wing_style, change_race, change_gender, change_eye_color, @@ -77,6 +80,15 @@ export const AppearanceChanger = (props, context) => { {facial_hair_style ? capitalize(facial_hair_style) : "Not Set"} + + {ear_style ? capitalize(ear_style) : "Not Set"} + + + {tail_style ? capitalize(tail_style) : "Not Set"} + + + {wing_style ? capitalize(wing_style) : "Not Set"} + @@ -115,11 +127,28 @@ export const AppearanceChanger = (props, context) => { ) : null} {change_hair ? ( - setTabIndex(3)}> - Hair - + + setTabIndex(3)}> + Hair + + setTabIndex(5)}> + Ear + + setTabIndex(6)}> + Tail + + setTabIndex(7)}> + Wing + + ) : null} {change_facial_hair ? ( { {(change_color && tabIndex === 2) ? : null} {(change_hair && tabIndex === 3) ? : null} {(change_facial_hair && tabIndex === 4) ? : null} + {(change_hair && tabIndex === 5) ? : null} + {(change_hair && tabIndex === 6) ? : null} + {(change_hair && tabIndex === 7) ? : null} @@ -212,6 +244,12 @@ const AppearanceChangerColors = (props, context) => { skin_color, hair_color, facial_hair_color, + ears_color, + ears2_color, + tail_color, + tail2_color, + wing_color, + wing2_color, } = data; return ( @@ -234,10 +272,36 @@ const AppearanceChangerColors = (props, context) => { ) : null} {change_hair_color ? ( - - -