diff --git a/GainStation13/code/datums/traits.dm b/GainStation13/code/datums/traits.dm index 89484a7b25..58fb96f112 100644 --- a/GainStation13/code/datums/traits.dm +++ b/GainStation13/code/datums/traits.dm @@ -148,3 +148,12 @@ species.liked_food |= MEAT else species.disliked_food &= ~MEAT + +/datum/quirk/biofuel + name = "Biofuel Processor" + desc = "Your robotic body is equipped to eat and digest food the same way organic crew can." + value = 0 + mob_trait = TRAIT_BIOFUEL + +/datum/quirk/biofuel/post_add() + REMOVE_TRAIT(quirk_holder, TRAIT_NO_PROCESS_FOOD, SPECIES_TRAIT) diff --git a/GainStation13/code/game/machinery/deployable.dm b/GainStation13/code/game/machinery/deployable.dm new file mode 100644 index 0000000000..92128e29ab --- /dev/null +++ b/GainStation13/code/game/machinery/deployable.dm @@ -0,0 +1,92 @@ +#define SINGLE "single" +#define VERTICAL "vertical" +#define HORIZONTAL "horizontal" + +#define METAL 1 +#define WOOD 2 +#define SAND 3 + +/obj/structure/barricade/shadoww //GS13 wood barricades + name = "Shadow barricade" + desc = "This space is blocked off by a shadow wood barricade." + icon = 'GainStation13/icons/obj/structures.dmi' + icon_state = "shadowwbarricade" + max_integrity = 50 + bar_material = WOOD + var/drop_amount = 3 + +/obj/structure/barricade/shadoww/attackby(obj/item/I, mob/user) + if(istype(I,/obj/item/stack/sheet/mineral/shadoww)) + var/obj/item/stack/sheet/mineral/shadoww/W = I + if(W.amount < 5) + to_chat(user, "You need at least five shadown planks to make a wall!") + return + else + to_chat(user, "You start adding [I] to [src]...") + if(do_after(user, 50, target=src)) + W.use(5) + new /turf/closed/wall/mineral/shadoww/nonmetal(get_turf(src)) + qdel(src) + return + return ..() + +/obj/structure/barricade/shadoww/make_debris() + new /obj/item/stack/sheet/mineral/shadoww(get_turf(src), drop_amount) + + +/obj/structure/barricade/plaswood + name = "Plaswood barricade" + desc = "This space is blocked off by a plaswood barricade." + icon = 'GainStation13/icons/obj/structures.dmi' + icon_state = "plaswoodwbarricade" + max_integrity = 180 + bar_material = WOOD + var/drop_amount = 3 + +/obj/structure/barricade/plaswood/attackby(obj/item/I, mob/user) + if(istype(I,/obj/item/stack/sheet/mineral/plaswood)) + var/obj/item/stack/sheet/mineral/plaswood/W = I + if(W.amount < 5) + to_chat(user, "You need at least five plaswood planks to make a wall!") + return + else + to_chat(user, "You start adding [I] to [src]...") + if(do_after(user, 50, target=src)) + W.use(5) + new /turf/closed/wall/mineral/plaswood/nonmetal(get_turf(src)) + qdel(src) + return + return ..() + +/obj/structure/barricade/plaswood/make_debris() + new /obj/item/stack/sheet/mineral/plaswood(get_turf(src), drop_amount) + + +/obj/structure/barricade/gmushroom + name = "Mushroom barricade" + desc = "This space is blocked off by a mushroom barricade." + icon = 'GainStation13/icons/obj/structures.dmi' + icon_state = "gmushroombarricade" + max_integrity = 50 + bar_material = WOOD + var/drop_amount = 3 + +/obj/structure/barricade/gmushroom/attackby(obj/item/I, mob/user) + if(istype(I,/obj/item/stack/sheet/mineral/gmushroom)) + var/obj/item/stack/sheet/mineral/gmushroom/W = I + if(W.amount < 5) + to_chat(user, "You need at least five mushroom planks to make a wall!") + return + else + to_chat(user, "You start adding [I] to [src]...") + if(do_after(user, 50, target=src)) + W.use(5) + new /turf/closed/wall/mineral/gmushroom/nonmetal(get_turf(src)) + qdel(src) + return + return ..() + +/obj/structure/barricade/gmushroom/make_debris() + new /obj/item/stack/sheet/mineral/gmushroom(get_turf(src), drop_amount) + +//GS13 wood barricades diff --git a/GainStation13/code/game/objects/effects/landmarks.dm b/GainStation13/code/game/objects/effects/landmarks.dm new file mode 100644 index 0000000000..6dce6cde1f --- /dev/null +++ b/GainStation13/code/game/objects/effects/landmarks.dm @@ -0,0 +1,3 @@ +/obj/effect/landmark/start/psychologist //GS13: Psychology job + name = "Psychologist" + icon_state = "Medical Doctor" diff --git a/GainStation13/code/game/objects/items/stacks/sheets/sheet_types.dm b/GainStation13/code/game/objects/items/stacks/sheets/sheet_types.dm new file mode 100644 index 0000000000..f10387370c --- /dev/null +++ b/GainStation13/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -0,0 +1,146 @@ +//GS13: Shadow Wood + +GLOBAL_LIST_INIT(shadoww_recipes, list ( \ + new/datum/stack_recipe("Shadow wood floor tile", /obj/item/stack/tile/shadoww, 1, 4, 20), \ + new/datum/stack_recipe("Shadow wood table frame", /obj/structure/table_frame/shadoww, 2, time = 10), \ + new/datum/stack_recipe("Shadow wood barricade", /obj/structure/barricade/shadoww, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \ + null, \ + new/datum/stack_recipe("Shadow wood chair", /obj/structure/chair/shadoww, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ + null, \ + new/datum/stack_recipe("Shadow wood barricade", /obj/structure/barricade/shadoww, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \ + null, \ + new/datum/stack_recipe("Dog bed", /obj/structure/bed/shadowwdogbed, 10, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("Dresser", /obj/structure/shadowwdresser, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("shadow wood crate", /obj/structure/closet/crate/shadoww, 6, time = 50, one_per_turf = TRUE, on_floor = TRUE),\ +)) + + +/obj/item/stack/sheet/mineral/shadoww + name = "shadow wood" + desc = "An purplish wood, it's nothing special besides its color." + singular_name = "shadow wood plank" + icon_state = "sheet-shadoww" + item_state = "sheet-shadoww" + icon = 'GainStation13/icons/obj/stack_objects.dmi' + custom_materials = list(/datum/material/wood=MINERAL_MATERIAL_AMOUNT) + sheettype = "shadoww" + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0) + resistance_flags = FLAMMABLE + merge_type = /obj/item/stack/sheet/mineral/shadoww + novariants = TRUE + grind_results = list(/datum/reagent/carbon = 20) + walltype = /turf/closed/wall/mineral/shadoww + +/obj/item/stack/sheet/mineral/shadoww/get_main_recipes() + . = ..() + . += GLOB.shadoww_recipes + +/obj/item/stack/sheet/mineral/shadoww/fifty + amount = 50 + +/obj/item/stack/sheet/mineral/shadoww/twenty + amount = 20 + +/obj/item/stack/sheet/mineral/shadoww/ten + amount = 10 + +/obj/item/stack/sheet/mineral/shadoww/five + amount = 5 + +//GS13: Giant mushroom + +GLOBAL_LIST_INIT(gmushroom_recipes, list ( \ + new/datum/stack_recipe("Mushroom floor tile", /obj/item/stack/tile/gmushroom, 1, 4, 20), \ + new/datum/stack_recipe("Mushroom table frame", /obj/structure/table_frame/gmushroom, 2, time = 10), \ + new/datum/stack_recipe("Mushroom barricade", /obj/structure/barricade/gmushroom, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \ + null, \ + new/datum/stack_recipe("Mushroom chair", /obj/structure/chair/gmushroom, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ + null, \ + new/datum/stack_recipe("Mushroom barricade", /obj/structure/barricade/gmushroom, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \ + null, \ + new/datum/stack_recipe("Dog bed", /obj/structure/bed/gmushroomdogbed, 10, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("Dresser", /obj/structure/gmushroomdresser, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("Mushroom crate", /obj/structure/closet/crate/gmushroom, 6, time = 50, one_per_turf = TRUE, on_floor = TRUE),\ + null, \ +)) + +/obj/item/stack/sheet/mineral/gmushroom + name = "mushroom 'wood'" + desc = "A material similar to wood, except for being fireproof." + singular_name = "mushroom plank" + icon_state = "sheet-gmushroom" + item_state = "sheet-gmushroom" + icon = 'GainStation13/icons/obj/stack_objects.dmi' + sheettype = "gmushroom" + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 0) + resistance_flags = FIRE_PROOF + merge_type = /obj/item/stack/sheet/mineral/gmushroom + novariants = TRUE + grind_results = list(/datum/reagent/carbon = 20) + walltype = /turf/closed/wall/mineral/gmushroom + +/obj/item/stack/sheet/mineral/gmushroom/get_main_recipes() + . = ..() + . += GLOB.gmushroom_recipes + +/obj/item/stack/sheet/mineral/gmushroom/fifty + amount = 50 + +/obj/item/stack/sheet/mineral/gmushroom/twenty + amount = 20 + +/obj/item/stack/sheet/mineral/gmushroom/ten + amount = 10 + +/obj/item/stack/sheet/mineral/gmushroom/five + amount = 5 + +//GS13: Plaswood + +GLOBAL_LIST_INIT(plaswood_recipes, list ( \ + new/datum/stack_recipe("Plaswood floor tile", /obj/item/stack/tile/plaswood, 1, 4, 20), \ + new/datum/stack_recipe("Plaswood table frame", /obj/structure/table_frame/plaswood, 2, time = 10), \ + null, \ + new/datum/stack_recipe("Plaswood chair", /obj/structure/chair/plaswood, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ + null, \ + new/datum/stack_recipe("Plaswood barricade", /obj/structure/barricade/plaswood, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \ + null, \ + new/datum/stack_recipe("Dog bed", /obj/structure/bed/plaswooddogbed, 10, time = 10, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("Dresser", /obj/structure/plaswooddresser, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("Plaswood crate", /obj/structure/closet/crate/plaswood, 6, time = 50, one_per_turf = TRUE, on_floor = TRUE),\ + null, \ +)) + + +/obj/item/stack/sheet/mineral/plaswood + name = "plaswood" + desc = "A type of resistant wood acquired from Plasma Trees. It amost looks like metal!" + singular_name = "plaswood plank" + icon_state = "sheet-plaswood" + item_state = "sheet-plaswood" + icon = 'GainStation13/icons/obj/stack_objects.dmi' + sheettype = "plaswood" + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 80) + resistance_flags = FLAMMABLE | ACID_PROOF + throwforce = 10 + merge_type = /obj/item/stack/sheet/mineral/plaswood + novariants = TRUE + grind_results = list(/datum/reagent/carbon = 20, /datum/reagent/toxin/plasma = 20) + point_value = 23 + walltype = /turf/closed/wall/mineral/plaswood + +/obj/item/stack/sheet/mineral/plaswood/get_main_recipes() + . = ..() + . += GLOB.plaswood_recipes + +/obj/item/stack/sheet/mineral/plaswood/fifty + amount = 50 + +/obj/item/stack/sheet/mineral/plaswood/twenty + amount = 20 + +/obj/item/stack/sheet/mineral/plaswood/ten + amount = 10 + +/obj/item/stack/sheet/mineral/plaswood/five + amount = 5 diff --git a/GainStation13/code/game/objects/items/stacks/tiles/tile_types.dm b/GainStation13/code/game/objects/items/stacks/tiles/tile_types.dm new file mode 100644 index 0000000000..3eb2f5ca7e --- /dev/null +++ b/GainStation13/code/game/objects/items/stacks/tiles/tile_types.dm @@ -0,0 +1,29 @@ +//Mushroom +/obj/item/stack/tile/gmushroom + name = "mushroom floor tile" + singular_name = "mushroom floor tile" + desc = "An easy to fit mushroom floor tile." + icon = 'GainStation13/icons/obj/tiles.dmi' + icon_state = "tile-gmushroom" + turf_type = /turf/open/floor/gmushroom + resistance_flags = FIRE_PROOF + +//Shadow Wood +/obj/item/stack/tile/shadoww + name = "shadow wood floor tile" + singular_name = "shadow wood floor tile" + desc = "An easy to fit wood floor tile." + icon = 'GainStation13/icons/obj/tiles.dmi' + icon_state = "tile-shadoww" + turf_type = /turf/open/floor/shadoww + resistance_flags = FLAMMABLE + +//Plaswood +/obj/item/stack/tile/plaswood + name = "plaswood floor tile" + singular_name = "plaswood floor tile" + desc = "An easy to fit wood floor tile." + icon = 'GainStation13/icons/obj/tiles.dmi' + icon_state = "tile-plaswood" + turf_type = /turf/open/floor/plaswood + resistance_flags = FLAMMABLE | ACID_PROOF diff --git a/GainStation13/code/game/objects/items/storage/firstaid.dm b/GainStation13/code/game/objects/items/storage/firstaid.dm new file mode 100644 index 0000000000..20a9145169 --- /dev/null +++ b/GainStation13/code/game/objects/items/storage/firstaid.dm @@ -0,0 +1,24 @@ +//GS13: Psych Pillbottles for Psychologist +/obj/item/storage/pill_bottle/happinesspsych + name = "happiness pill bottle" + desc = "Contains pills used as a last resort means to temporarily stabilize depression and anxiety. WARNING: side effects may include slurred speech, drooling, and severe addiction." + +/obj/item/storage/pill_bottle/happinesspsych/PopulateContents() + for(var/i in 1 to 5) + new /obj/item/reagent_containers/pill/happinesspsych(src) + +/obj/item/storage/pill_bottle/lsdpsych + name = "mindbreaker toxin pill bottle" + desc = "!FOR THERAPEUTIC USE ONLY! Contains pills used to alleviate the symptoms of Reality Dissociation Syndrome." + +/obj/item/storage/pill_bottle/lsdpsych/PopulateContents() + for(var/i in 1 to 5) + new /obj/item/reagent_containers/pill/lsdpsych(src) + +/obj/item/storage/pill_bottle/paxpsych + name = "pacification pill" + desc = "Contains pills used to temporarily pacify patients that are deemed a harm to themselves or others." + +/obj/item/storage/pill_bottle/paxpsych/PopulateContents() + for(var/i in 1 to 5) + new /obj/item/reagent_containers/pill/paxpsych(src) diff --git a/GainStation13/code/game/objects/structures/beds_chairs/bed.dm b/GainStation13/code/game/objects/structures/beds_chairs/bed.dm new file mode 100644 index 0000000000..df88709e8f --- /dev/null +++ b/GainStation13/code/game/objects/structures/beds_chairs/bed.dm @@ -0,0 +1,30 @@ +//GS13: pet beds +/obj/structure/bed/shadowwdogbed + name = "dog bed" + icon = 'GainStation13/icons/obj/objects.dmi' + icon_state = "shadowwdogbed" + desc = "A comfy-looking dog bed. You can even strap your pet in, in case the gravity turns off." + anchored = FALSE + buildstacktype = /obj/item/stack/sheet/mineral/shadoww + buildstackamount = 10 + var/mob/living/owner = null + +/obj/structure/bed/plaswooddogbed + name = "dog bed" + icon = 'GainStation13/icons/obj/objects.dmi' + icon_state = "plaswooddogbed" + desc = "A comfy-looking dog bed. You can even strap your pet in, in case the gravity turns off." + anchored = FALSE + buildstacktype = /obj/item/stack/sheet/mineral/plaswood + buildstackamount = 10 + var/mob/living/owner = null + +/obj/structure/bed/gmushroomdogbed + name = "dog bed" + icon = 'GainStation13/icons/obj/objects.dmi' + icon_state = "gmushroomdogbed" + desc = "A comfy-looking dog bed. You can even strap your pet in, in case the gravity turns off." + anchored = FALSE + buildstacktype = /obj/item/stack/sheet/mineral/gmushroom + buildstackamount = 10 + var/mob/living/owner = null diff --git a/GainStation13/code/game/objects/structures/beds_chairs/chair.dm b/GainStation13/code/game/objects/structures/beds_chairs/chair.dm new file mode 100644 index 0000000000..71ff15b9ea --- /dev/null +++ b/GainStation13/code/game/objects/structures/beds_chairs/chair.dm @@ -0,0 +1,69 @@ +//Shadow +/obj/structure/chair/shadoww + name = "shadow wood chair" + desc = "Fashionable dark." + icon = 'GainStation13/icons/obj/chairs.dmi' + icon_state = "shadoww_chair" + resistance_flags = FLAMMABLE + max_integrity = 70 + buildstacktype = /obj/item/stack/sheet/mineral/shadoww + buildstackamount = 3 + item_chair = /obj/item/chair/shadoww + +//Plaswood +/obj/structure/chair/plaswood + name = "plaswood chair" + desc = "Hard but confortable to sit." + icon = 'GainStation13/icons/obj/chairs.dmi' + icon_state = "plaswood_chair" + resistance_flags = FLAMMABLE | ACID_PROOF + max_integrity = 90 + buildstacktype = /obj/item/stack/sheet/mineral/plaswood + buildstackamount = 3 + item_chair = /obj/item/chair/plaswood + +//Mushroom +/obj/structure/chair/gmushroom + name = "mushroom chair" + desc = "You don't need to worry about losing your seat in case of fire!" + icon = 'GainStation13/icons/obj/chairs.dmi' + icon_state = "gmushroom_chair" + resistance_flags = FIRE_PROOF + max_integrity = 70 + buildstacktype = /obj/item/stack/sheet/mineral/gmushroom + buildstackamount = 3 + item_chair = /obj/item/chair/gmushroom + +//Toppled chairs +/obj/item/chair/shadoww + name = "shadow wood chair" + icon = 'GainStation13/icons/obj/chairs.dmi' + icon_state = "shadoww_chair_toppled" + item_state = "shadowwchair" + resistance_flags = FLAMMABLE + max_integrity = 70 + hitsound = 'sound/weapons/genhit1.ogg' + origin_type = /obj/structure/chair/shadoww + break_chance = 50 + +/obj/item/chair/plaswood + name = "plaswood chair" + icon = 'GainStation13/icons/obj/chairs.dmi' + icon_state = "plaswood_chair_toppled" + item_state = "plaswoodchair" + resistance_flags = FLAMMABLE | ACID_PROOF + max_integrity = 90 + hitsound = 'sound/weapons/genhit1.ogg' + origin_type = /obj/structure/chair/plaswood + break_chance = 70 + +/obj/item/chair/gmushroom + name = "mushroom chair" + icon = 'GainStation13/icons/obj/chairs.dmi' + icon_state = "gmushroom_chair_toppled" + item_state = "gmushroomchair" + resistance_flags = FIRE_PROOF + max_integrity = 70 + hitsound = 'sound/weapons/genhit1.ogg' + origin_type = /obj/structure/chair/gmushroom + break_chance = 50 diff --git a/GainStation13/code/game/objects/structures/crates_lockers/closets/secure/psychology.dm b/GainStation13/code/game/objects/structures/crates_lockers/closets/secure/psychology.dm new file mode 100644 index 0000000000..2ec39e1c82 --- /dev/null +++ b/GainStation13/code/game/objects/structures/crates_lockers/closets/secure/psychology.dm @@ -0,0 +1,17 @@ +/obj/structure/closet/secure_closet/psychology //GS13: Psychologist job equip locker + name = "psychology locker" + req_access = list(ACCESS_PSYCH) + icon_state = "cabinet" + +/obj/structure/closet/secure_closet/psychology/PopulateContents() + . = ..() + new /obj/item/clothing/under/suit/black(src) + new /obj/item/clothing/under/suit/black/skirt(src) + new /obj/item/clothing/shoes/laceup/(src) + new /obj/item/storage/backpack/medic(src) + new /obj/item/radio/headset/headset_med(src) + new /obj/item/clipboard(src) + new /obj/item/clothing/suit/straight_jacket(src) + new /obj/item/clothing/ears/earmuffs(src) + new /obj/item/clothing/mask/muzzle(src) + new /obj/item/clothing/glasses/sunglasses/blindfold(src) diff --git a/GainStation13/code/game/objects/structures/crates_lockers/crates/wooden.dm b/GainStation13/code/game/objects/structures/crates_lockers/crates/wooden.dm new file mode 100644 index 0000000000..f0930acf53 --- /dev/null +++ b/GainStation13/code/game/objects/structures/crates_lockers/crates/wooden.dm @@ -0,0 +1,24 @@ +//Wood crates +/obj/structure/closet/crate/shadoww + name = "shadown wood crate" + desc = "Works just as well as a metal one." + material_drop = /obj/item/stack/sheet/mineral/shadoww + material_drop_amount = 6 + icon = 'GainStation13/icons/obj/crates.dmi' + icon_state = "shadoww" + +/obj/structure/closet/crate/plaswood + name = "plaswood crate" + desc = "Works just as well as a metal one." + material_drop = /obj/item/stack/sheet/mineral/plaswood + material_drop_amount = 6 + icon = 'GainStation13/icons/obj/crates.dmi' + icon_state = "plaswood" + +/obj/structure/closet/crate/gmushroom + name = "mushroom crate" + desc = "Works just as well as a metal one." + material_drop = /obj/item/stack/sheet/mineral/gmushroom + material_drop_amount = 6 + icon = 'GainStation13/icons/obj/crates.dmi' + icon_state = "gmushroom" diff --git a/GainStation13/code/game/objects/structures/dresser.dm b/GainStation13/code/game/objects/structures/dresser.dm new file mode 100644 index 0000000000..3f3203936e --- /dev/null +++ b/GainStation13/code/game/objects/structures/dresser.dm @@ -0,0 +1,249 @@ +//GS13 Shadow/Mushroom/Plasma dressers +/obj/structure/gmushroomdresser + name = "dresser" + desc = "A nicely-crafted mushroom dresser. It's filled with lots of undies." + icon = 'GainStation13/icons/obj/stationobjs.dmi' + icon_state = "gmushroomdresser" + density = TRUE + anchored = TRUE + +/obj/structure/gmushroomdresser/attackby(obj/item/I, mob/user, params) + if(I.tool_behaviour == TOOL_WRENCH) + to_chat(user, "You begin to [anchored ? "unwrench" : "wrench"] [src].") + if(I.use_tool(src, user, 20, volume=50)) + to_chat(user, "You successfully [anchored ? "unwrench" : "wrench"] [src].") + setAnchored(!anchored) + else + return ..() + +/obj/structure/gmushroomdresser/deconstruct(disassembled = TRUE) + new /obj/item/stack/sheet/mineral/wood(drop_location(), 10) + qdel(src) + +/obj/structure/gmushroomdresser/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) + . = ..() + if(. || !ishuman(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + return + var/mob/living/carbon/human/H = user + + if(H.dna && H.dna.species && (NO_UNDERWEAR in H.dna.species.species_traits)) + to_chat(H, "You are not capable of wearing underwear.") + return + + var/list/undergarment_choices = list("Underwear", "Underwear Color", "Undershirt", "Undershirt Color", "Socks", "Socks Color") + if(!(GLOB.underwear_list[H.underwear]?.has_color)) + undergarment_choices -= "Underwear Color" + if(!(GLOB.undershirt_list[H.undershirt]?.has_color)) + undergarment_choices -= "Undershirt Color" + if(!(GLOB.socks_list[H.socks]?.has_color)) + undergarment_choices -= "Socks Color" + + var/choice = input(H, "Underwear, Undershirt, or Socks?", "Changing") as null|anything in undergarment_choices + if(!H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + return + var/dye_undie = FALSE + var/dye_shirt = FALSE + var/dye_socks = FALSE + switch(choice) + if("Underwear") + var/new_undies = input(H, "Select your underwear", "Changing") as null|anything in GLOB.underwear_list + if(new_undies) + H.underwear = new_undies + H.saved_underwear = new_undies + var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[new_undies] + dye_undie = B?.has_color + if("Undershirt") + var/new_undershirt = input(H, "Select your undershirt", "Changing") as null|anything in GLOB.undershirt_list + if(new_undershirt) + H.undershirt = new_undershirt + H.saved_undershirt = new_undershirt + var/datum/sprite_accessory/underwear/top/T = GLOB.undershirt_list[new_undershirt] + dye_shirt = T?.has_color + if("Socks") + var/new_socks = input(H, "Select your socks", "Changing") as null|anything in GLOB.socks_list + if(new_socks) + H.socks = new_socks + H.saved_socks = new_socks + var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[new_socks] + dye_socks = S?.has_color + if(dye_undie || choice == "Underwear Color") + H.undie_color = recolor_undergarment(H, "underwear", H.undie_color) + if(dye_shirt || choice == "Undershirt Color") + H.shirt_color = recolor_undergarment(H, "undershirt", H.shirt_color) + if(dye_socks || choice == "Socks Color") + H.socks_color = recolor_undergarment(H, "socks", H.socks_color) + + add_fingerprint(H) + H.update_body(TRUE) + +/obj/structure/gmushroomdresser/proc/recolor_undergarment(mob/living/carbon/human/H, garment_type = "underwear", default_color) + var/n_color = input(H, "Choose your [garment_type]'\s color.", "Character Preference", default_color) as color|null + if(!n_color || !H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + return default_color + return sanitize_hexcolor(n_color, 3, FALSE, default_color) + +/obj/structure/plaswooddresser + name = "dresser" + desc = "A nicely-crafted plaswood dresser. It's filled with lots of undies." + icon = 'GainStation13/icons/obj/stationobjs.dmi' + icon_state = "plaswooddresser" + density = TRUE + anchored = TRUE + +/obj/structure/plaswooddresser/attackby(obj/item/I, mob/user, params) + if(I.tool_behaviour == TOOL_WRENCH) + to_chat(user, "You begin to [anchored ? "unwrench" : "wrench"] [src].") + if(I.use_tool(src, user, 20, volume=50)) + to_chat(user, "You successfully [anchored ? "unwrench" : "wrench"] [src].") + setAnchored(!anchored) + else + return ..() + +/obj/structure/plaswooddresser/deconstruct(disassembled = TRUE) + new /obj/item/stack/sheet/mineral/wood(drop_location(), 10) + qdel(src) + +/obj/structure/plaswooddresser/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) + . = ..() + if(. || !ishuman(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + return + var/mob/living/carbon/human/H = user + + if(H.dna && H.dna.species && (NO_UNDERWEAR in H.dna.species.species_traits)) + to_chat(H, "You are not capable of wearing underwear.") + return + + var/list/undergarment_choices = list("Underwear", "Underwear Color", "Undershirt", "Undershirt Color", "Socks", "Socks Color") + if(!(GLOB.underwear_list[H.underwear]?.has_color)) + undergarment_choices -= "Underwear Color" + if(!(GLOB.undershirt_list[H.undershirt]?.has_color)) + undergarment_choices -= "Undershirt Color" + if(!(GLOB.socks_list[H.socks]?.has_color)) + undergarment_choices -= "Socks Color" + + var/choice = input(H, "Underwear, Undershirt, or Socks?", "Changing") as null|anything in undergarment_choices + if(!H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + return + var/dye_undie = FALSE + var/dye_shirt = FALSE + var/dye_socks = FALSE + switch(choice) + if("Underwear") + var/new_undies = input(H, "Select your underwear", "Changing") as null|anything in GLOB.underwear_list + if(new_undies) + H.underwear = new_undies + H.saved_underwear = new_undies + var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[new_undies] + dye_undie = B?.has_color + if("Undershirt") + var/new_undershirt = input(H, "Select your undershirt", "Changing") as null|anything in GLOB.undershirt_list + if(new_undershirt) + H.undershirt = new_undershirt + H.saved_undershirt = new_undershirt + var/datum/sprite_accessory/underwear/top/T = GLOB.undershirt_list[new_undershirt] + dye_shirt = T?.has_color + if("Socks") + var/new_socks = input(H, "Select your socks", "Changing") as null|anything in GLOB.socks_list + if(new_socks) + H.socks = new_socks + H.saved_socks = new_socks + var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[new_socks] + dye_socks = S?.has_color + if(dye_undie || choice == "Underwear Color") + H.undie_color = recolor_undergarment(H, "underwear", H.undie_color) + if(dye_shirt || choice == "Undershirt Color") + H.shirt_color = recolor_undergarment(H, "undershirt", H.shirt_color) + if(dye_socks || choice == "Socks Color") + H.socks_color = recolor_undergarment(H, "socks", H.socks_color) + + add_fingerprint(H) + H.update_body(TRUE) + +/obj/structure/plaswooddresser/proc/recolor_undergarment(mob/living/carbon/human/H, garment_type = "underwear", default_color) + var/n_color = input(H, "Choose your [garment_type]'\s color.", "Character Preference", default_color) as color|null + if(!n_color || !H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + return default_color + return sanitize_hexcolor(n_color, 3, FALSE, default_color) + +/obj/structure/shadowwdresser + name = "dresser" + desc = "A nicely-crafted shadow wood dresser. It's filled with lots of undies." + icon = 'GainStation13/icons/obj/stationobjs.dmi' + icon_state = "shadowwdresser" + density = TRUE + anchored = TRUE + +/obj/structure/shadowwdresser/attackby(obj/item/I, mob/user, params) + if(I.tool_behaviour == TOOL_WRENCH) + to_chat(user, "You begin to [anchored ? "unwrench" : "wrench"] [src].") + if(I.use_tool(src, user, 20, volume=50)) + to_chat(user, "You successfully [anchored ? "unwrench" : "wrench"] [src].") + setAnchored(!anchored) + else + return ..() + +/obj/structure/shadowwdresser/deconstruct(disassembled = TRUE) + new /obj/item/stack/sheet/mineral/wood(drop_location(), 10) + qdel(src) + +/obj/structure/shadowwdresser/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) + . = ..() + if(. || !ishuman(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + return + var/mob/living/carbon/human/H = user + + if(H.dna && H.dna.species && (NO_UNDERWEAR in H.dna.species.species_traits)) + to_chat(H, "You are not capable of wearing underwear.") + return + + var/list/undergarment_choices = list("Underwear", "Underwear Color", "Undershirt", "Undershirt Color", "Socks", "Socks Color") + if(!(GLOB.underwear_list[H.underwear]?.has_color)) + undergarment_choices -= "Underwear Color" + if(!(GLOB.undershirt_list[H.undershirt]?.has_color)) + undergarment_choices -= "Undershirt Color" + if(!(GLOB.socks_list[H.socks]?.has_color)) + undergarment_choices -= "Socks Color" + + var/choice = input(H, "Underwear, Undershirt, or Socks?", "Changing") as null|anything in undergarment_choices + if(!H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + return + var/dye_undie = FALSE + var/dye_shirt = FALSE + var/dye_socks = FALSE + switch(choice) + if("Underwear") + var/new_undies = input(H, "Select your underwear", "Changing") as null|anything in GLOB.underwear_list + if(new_undies) + H.underwear = new_undies + H.saved_underwear = new_undies + var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[new_undies] + dye_undie = B?.has_color + if("Undershirt") + var/new_undershirt = input(H, "Select your undershirt", "Changing") as null|anything in GLOB.undershirt_list + if(new_undershirt) + H.undershirt = new_undershirt + H.saved_undershirt = new_undershirt + var/datum/sprite_accessory/underwear/top/T = GLOB.undershirt_list[new_undershirt] + dye_shirt = T?.has_color + if("Socks") + var/new_socks = input(H, "Select your socks", "Changing") as null|anything in GLOB.socks_list + if(new_socks) + H.socks = new_socks + H.saved_socks = new_socks + var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[new_socks] + dye_socks = S?.has_color + if(dye_undie || choice == "Underwear Color") + H.undie_color = recolor_undergarment(H, "underwear", H.undie_color) + if(dye_shirt || choice == "Undershirt Color") + H.shirt_color = recolor_undergarment(H, "undershirt", H.shirt_color) + if(dye_socks || choice == "Socks Color") + H.socks_color = recolor_undergarment(H, "socks", H.socks_color) + + add_fingerprint(H) + H.update_body(TRUE) + +/obj/structure/shadowwdresser/proc/recolor_undergarment(mob/living/carbon/human/H, garment_type = "underwear", default_color) + var/n_color = input(H, "Choose your [garment_type]'\s color.", "Character Preference", default_color) as color|null + if(!n_color || !H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + return default_color + return sanitize_hexcolor(n_color, 3, FALSE, default_color) diff --git a/GainStation13/code/game/objects/structures/false_walls.dm b/GainStation13/code/game/objects/structures/false_walls.dm new file mode 100644 index 0000000000..1fc633e74d --- /dev/null +++ b/GainStation13/code/game/objects/structures/false_walls.dm @@ -0,0 +1,27 @@ +//Shadow/Mushroom/Plasma false walls +/obj/structure/falsewall/gmushroom + name = "mushroom wall" + desc = "A wall with mushroom plating." + icon = 'GainStation13/icons/turf/walls/gmushroom_wall.dmi' + icon_state = "gmushroom" + mineral = /obj/item/stack/sheet/mineral/gmushroom + walltype = /turf/closed/wall/mineral/gmushroom + canSmoothWith = list(/obj/structure/falsewall/gmushroom, /turf/closed/wall/mineral/gmushroom) + +/obj/structure/falsewall/plaswood + name = "plaswood wall" + desc = "A wall with plaswood plating." + icon = 'GainStation13/icons/turf/walls/plaswood_wall.dmi' + icon_state = "plaswood" + mineral = /obj/item/stack/sheet/mineral/plaswood + walltype = /turf/closed/wall/mineral/plaswood + canSmoothWith = list(/obj/structure/falsewall/plaswood, /turf/closed/wall/mineral/plaswood) + +/obj/structure/falsewall/shadoww + name = "shadow wall" + desc = "A wall with shadow wood plating." + icon = 'GainStation13/icons/turf/walls/shadoww_wall.dmi' + icon_state = "shadoww" + mineral = /obj/item/stack/sheet/mineral/shadoww + walltype = /turf/closed/wall/mineral/shadoww + canSmoothWith = list(/obj/structure/falsewall/shadoww, /turf/closed/wall/mineral/shadoww) diff --git a/GainStation13/code/game/objects/structures/table_frames.dm b/GainStation13/code/game/objects/structures/table_frames.dm new file mode 100644 index 0000000000..bcbed8d5eb --- /dev/null +++ b/GainStation13/code/game/objects/structures/table_frames.dm @@ -0,0 +1,88 @@ +//Plaswood Frames +/obj/structure/table_frame/plaswood + name = "Plaswood table frame" + desc = "Four wooden legs with four framing wooden rods for a wooden table. You could easily pass through this." + icon = 'GainStation13/icons/obj/structures.dmi' + icon_state = "plaswood_frame" + framestack = /obj/item/stack/sheet/mineral/plaswood + framestackamount = 2 + resistance_flags = FLAMMABLE | ACID_PROOF + +/obj/structure/table_frame/plaswood/attackby(obj/item/I, mob/user, params) + if (istype(I, /obj/item/stack)) + var/obj/item/stack/material = I + var/toConstruct // stores the table variant + if(istype(I, /obj/item/stack/sheet/mineral/plaswood)) + toConstruct = /obj/structure/table/plaswood + else if(istype(I, /obj/item/stack/tile/carpet)) + toConstruct = /obj/structure/table/plaswood/plaswoodpoker + + if (toConstruct) + if(material.get_amount() < 1) + to_chat(user, "You need one [material.name] sheet to do this!") + return + to_chat(user, "You start adding [material] to [src]...") + if(do_after(user, 20, target = src) && material.use(1)) + make_new_table(toConstruct) + else + return ..() + + +//Mushroom Frames +/obj/structure/table_frame/gmushroom + name = "mushroom table frame" + desc = "Four wooden legs with four framing wooden rods for a wooden table. You could easily pass through this." + icon = 'GainStation13/icons/obj/structures.dmi' + icon_state = "gmushroom_frame" + framestack = /obj/item/stack/sheet/mineral/gmushroom + framestackamount = 2 + resistance_flags = FIRE_PROOF + +/obj/structure/table_frame/gmushroom/attackby(obj/item/I, mob/user, params) + if (istype(I, /obj/item/stack)) + var/obj/item/stack/material = I + var/toConstruct // stores the table variant + if(istype(I, /obj/item/stack/sheet/mineral/gmushroom)) + toConstruct = /obj/structure/table/gmushroom + else if(istype(I, /obj/item/stack/tile/carpet)) + toConstruct = /obj/structure/table/gmushroom/gmushroompoker + + if (toConstruct) + if(material.get_amount() < 1) + to_chat(user, "You need one [material.name] sheet to do this!") + return + to_chat(user, "You start adding [material] to [src]...") + if(do_after(user, 20, target = src) && material.use(1)) + make_new_table(toConstruct) + else + return ..() + + +//Shadow Wood Frames +/obj/structure/table_frame/shadoww + name = "shadow wood frame" + desc = "Four wooden legs with four framing wooden rods for a wooden table. You could easily pass through this." + icon = 'GainStation13/icons/obj/structures.dmi' + icon_state = "shadoww_frame" + framestack = /obj/item/stack/sheet/mineral/shadoww + framestackamount = 2 + resistance_flags = FLAMMABLE + +/obj/structure/table_frame/shadoww/attackby(obj/item/I, mob/user, params) + if (istype(I, /obj/item/stack)) + var/obj/item/stack/material = I + var/toConstruct // stores the table variant + if(istype(I, /obj/item/stack/sheet/mineral/shadoww)) + toConstruct = /obj/structure/table/shadoww + else if(istype(I, /obj/item/stack/tile/carpet)) + toConstruct = /obj/structure/table/shadoww/shadowwpoker + + if (toConstruct) + if(material.get_amount() < 1) + to_chat(user, "You need one [material.name] sheet to do this!") + return + to_chat(user, "You start adding [material] to [src]...") + if(do_after(user, 20, target = src) && material.use(1)) + make_new_table(toConstruct) + else + return ..() diff --git a/GainStation13/code/game/objects/structures/table_racks.dm b/GainStation13/code/game/objects/structures/table_racks.dm new file mode 100644 index 0000000000..5d7362d160 --- /dev/null +++ b/GainStation13/code/game/objects/structures/table_racks.dm @@ -0,0 +1,68 @@ +//Shadowwood tables +/obj/structure/table/shadoww + name = "Shadow wood table" + desc = "Do not apply fire to this. Rumour says it burns easily." + icon = 'GainStation13/icons/obj/smooth_structures/shadoww_table.dmi' + icon_state = "shadoww_table" + frame = /obj/structure/table_frame/shadoww + framestack = /obj/item/stack/sheet/mineral/shadoww + buildstack = /obj/item/stack/sheet/mineral/shadoww + resistance_flags = FLAMMABLE + max_integrity = 70 + canSmoothWith = list(/obj/structure/table/shadoww, + /obj/structure/table/shadoww/shadowwpoker) + +/obj/structure/table/shadoww/shadowwpoker + name = "gambling table" + desc = "A seedy table for seedy dealings in seedy places." + icon = 'GainStation13/icons/obj/smooth_structures/shadowwpoker_table.dmi' + icon_state = "shadowwpoker_table" + frame = /obj/structure/table_frame/shadoww + buildstack = /obj/item/stack/tile/carpet + +//Plaswood tables +/obj/structure/table/plaswood + name = "plaswood table" + desc = "An strong and grey wooden table." + icon = 'GainStation13/icons/obj/smooth_structures/plaswood_table.dmi' + icon_state = "plaswood_table" + frame = /obj/structure/table_frame/plaswood + framestack = /obj/item/stack/sheet/mineral/plaswood + buildstack = /obj/item/stack/sheet/mineral/plaswood + resistance_flags = FLAMMABLE + max_integrity = 200 + integrity_failure = 50 + armor = list("melee" = 10, "bullet" = 30, "laser" = 30, "energy" = 100, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70) + canSmoothWith = list(/obj/structure/table/plaswood, + /obj/structure/table/plaswood/plaswoodpoker) + +/obj/structure/table/plaswood/plaswoodpoker + name = "gambling table" + desc = "A seedy table for seedy dealings in seedy places." + icon = 'GainStation13/icons/obj/smooth_structures/plaswoodpoker_table.dmi' + icon_state = "plaswoodpoker_table" + frame = /obj/structure/table_frame/plaswood + buildstack = /obj/item/stack/tile/carpet + + +//Mushroom tables +/obj/structure/table/gmushroom + name = "Mushroom table" + desc = "A pinkish table. And is fireproof!" + icon = 'GainStation13/icons/obj/smooth_structures/gmushroom_table.dmi' + icon_state = "gmushroom_table" + frame = /obj/structure/table_frame/gmushroom + framestack = /obj/item/stack/sheet/mineral/gmushroom + buildstack = /obj/item/stack/sheet/mineral/gmushroom + resistance_flags = FIRE_PROOF + max_integrity = 70 + canSmoothWith = list(/obj/structure/table/gmushroom, + /obj/structure/table/gmushroom/gmushroompoker) + +/obj/structure/table/gmushroom/gmushroompoker + name = "gambling table" + desc = "A seedy table for seedy dealings in seedy places." + icon = 'GainStation13/icons/obj/smooth_structures/gmushroompoker_table.dmi' + icon_state = "gmushroompoker_table" + frame = /obj/structure/table_frame/gmushroom + buildstack = /obj/item/stack/tile/carpet diff --git a/GainStation13/code/game/plushes.dm b/GainStation13/code/game/plushes.dm index c1c25e9cab..dda469fec0 100644 --- a/GainStation13/code/game/plushes.dm +++ b/GainStation13/code/game/plushes.dm @@ -77,11 +77,6 @@ icon_state = "metis" attack_verb = list("squished", "goated", "baah'd") -/obj/item/toy/plush/gs13/crowbars - desc = "A plush of a silly-eyed xeno seccie." - icon_state = "crowbars" - attack_verb = list("squished", "crowbared", "beno'd") - /obj/item/toy/plush/gs13/sharky desc = "A plush of a toothy, sharky creature." icon_state = "sharky" diff --git a/GainStation13/code/game/turfs/closed.dm b/GainStation13/code/game/turfs/closed.dm index d552cd6dd0..27b4a75c87 100644 --- a/GainStation13/code/game/turfs/closed.dm +++ b/GainStation13/code/game/turfs/closed.dm @@ -25,3 +25,30 @@ desc = "Somehow, it doesn't melt at all..." icon = 'Gainstation13/icons/turf/walls/wall_candy.dmi' icon_state = "choco_wall1" + +/turf/closed/indestructible/shadoww + name = "shadow wall" + desc = "A wall with shadow wood plating." + icon = 'GainStation13/icons/turf/walls/shadoww_wall.dmi' + icon_state = "shadoww" + baseturfs = /turf/closed/indestructible/shadoww + smooth = SMOOTH_TRUE + canSmoothWith = list(/turf/closed/wall/mineral/shadoww, /obj/structure/falsewall/shadoww, /turf/closed/indestructible/shadoww) + +/turf/closed/indestructible/plaswood + name = "plaswood wall" + desc = "A wall with plaswood plating." + icon = 'GainStation13/icons/turf/walls/plaswood_wall.dmi' + icon_state = "plaswood" + baseturfs = /turf/closed/indestructible/plaswood + smooth = SMOOTH_TRUE + canSmoothWith = list(/turf/closed/wall/mineral/plaswood, /obj/structure/falsewall/plaswood, /turf/closed/indestructible/shadoww) + +/turf/closed/indestructible/gmushroom + name = "mushroom wall" + desc = "A wall with mushroom plating." + icon = 'GainStation13/icons/turf/walls/gmushroom_wall.dmi' + icon_state = "gmushroom" + baseturfs = /turf/closed/indestructible/gmushroom + smooth = SMOOTH_TRUE + canSmoothWith = list(/turf/closed/wall/mineral/gmushroom, /obj/structure/falsewall/gmushroom, /turf/closed/indestructible/gmushroom) diff --git a/GainStation13/code/game/turfs/simulated/floor/fancy_floor.dm b/GainStation13/code/game/turfs/simulated/floor/fancy_floor.dm new file mode 100644 index 0000000000..d7cac032ab --- /dev/null +++ b/GainStation13/code/game/turfs/simulated/floor/fancy_floor.dm @@ -0,0 +1,164 @@ +//Shadow wood +/turf/open/floor/shadoww + desc = "Stylish shadow wood." + icon_state = "shadoww" + floor_tile = /obj/item/stack/tile/shadoww + broken_states = list("shadoww-broken", "shadoww-broken2", "shadoww-broken3", "shadoww-broken4", "shadoww-broken5", "shadoww-broken6", "shadoww-broken7") + footstep = FOOTSTEP_WOOD + barefootstep = FOOTSTEP_WOOD_BAREFOOT + clawfootstep = FOOTSTEP_WOOD_CLAW + heavyfootstep = FOOTSTEP_GENERIC_HEAVY + tiled_dirt = FALSE + +/turf/open/floor/shadoww/examine(mob/user) + . = ..() + . += "There's a few screws and a small crack visible." + +/turf/open/floor/shadoww/screwdriver_act(mob/living/user, obj/item/I) + if(..()) + return TRUE + return pry_tile(I, user) + +/turf/open/floor/shadoww/try_replace_tile(obj/item/stack/tile/T, mob/user, params) + if(T.turf_type == type) + return + var/obj/item/tool = user.is_holding_item_of_type(/obj/item/screwdriver) + if(!tool) + tool = user.is_holding_item_of_type(/obj/item/crowbar) + if(!tool) + return + var/turf/open/floor/plating/P = pry_tile(tool, user, TRUE) + if(!istype(P)) + return + P.attackby(T, user, params) + +/turf/open/floor/shadoww/pry_tile(obj/item/C, mob/user, silent = FALSE) + C.play_tool_sound(src, 80) + return remove_tile(user, silent, (C.tool_behaviour == TOOL_SCREWDRIVER)) + +/turf/open/floor/shadoww/remove_tile(mob/user, silent = FALSE, make_tile = TRUE, forced = FALSE) + if(broken || burnt) + broken = 0 + burnt = 0 + if(user && !silent) + to_chat(user, "You remove the broken planks.") + else + if(make_tile) + if(user && !silent) + to_chat(user, "You unscrew the planks.") + if(floor_tile) + new floor_tile(src) + else + if(user && !silent) + to_chat(user, "You forcefully pry off the planks, destroying them in the process.") + return make_plating() + +//Mushroom wood +/turf/open/floor/gmushroom + desc = "Stylish mushroom 'wood'." + icon_state = "gmushroom" + floor_tile = /obj/item/stack/tile/gmushroom + broken_states = list("gmushroom-broken", "gmushroom-broken2", "gmushroom-broken3", "gmushroom-broken4", "gmushroom-broken5", "gmushroom-broken6", "gmushroom-broken7") + footstep = FOOTSTEP_WOOD + barefootstep = FOOTSTEP_WOOD_BAREFOOT + clawfootstep = FOOTSTEP_WOOD_CLAW + heavyfootstep = FOOTSTEP_GENERIC_HEAVY + tiled_dirt = FALSE + +/turf/open/floor/gmushroom/examine(mob/user) + . = ..() + . += "There's a few screws and a small crack visible." + +/turf/open/floor/gmushroom/screwdriver_act(mob/living/user, obj/item/I) + if(..()) + return TRUE + return pry_tile(I, user) + +/turf/open/floor/gmushroom/try_replace_tile(obj/item/stack/tile/T, mob/user, params) + if(T.turf_type == type) + return + var/obj/item/tool = user.is_holding_item_of_type(/obj/item/screwdriver) + if(!tool) + tool = user.is_holding_item_of_type(/obj/item/crowbar) + if(!tool) + return + var/turf/open/floor/plating/P = pry_tile(tool, user, TRUE) + if(!istype(P)) + return + P.attackby(T, user, params) + +/turf/open/floor/gmushroom/pry_tile(obj/item/C, mob/user, silent = FALSE) + C.play_tool_sound(src, 80) + return remove_tile(user, silent, (C.tool_behaviour == TOOL_SCREWDRIVER)) + +/turf/open/floor/gmushroom/remove_tile(mob/user, silent = FALSE, make_tile = TRUE, forced = FALSE) + if(broken || burnt) + broken = 0 + burnt = 0 + if(user && !silent) + to_chat(user, "You remove the broken planks.") + else + if(make_tile) + if(user && !silent) + to_chat(user, "You unscrew the planks.") + if(floor_tile) + new floor_tile(src) + else + if(user && !silent) + to_chat(user, "You forcefully pry off the planks, destroying them in the process.") + return make_plating() + +//Plaswood +/turf/open/floor/plaswood + desc = "Stylish plaswood." + icon_state = "plaswood" + floor_tile = /obj/item/stack/tile/plaswood + broken_states = list("plaswood-broken", "plaswood-broken2", "plaswood-broken3", "plaswood-broken4", "plaswood-broken5", "plaswood-broken6", "plaswood-broken7") + footstep = FOOTSTEP_WOOD + barefootstep = FOOTSTEP_WOOD_BAREFOOT + clawfootstep = FOOTSTEP_WOOD_CLAW + heavyfootstep = FOOTSTEP_GENERIC_HEAVY + tiled_dirt = FALSE + +/turf/open/floor/plaswood/examine(mob/user) + . = ..() + . += "There's a few screws and a small crack visible." + +/turf/open/floor/plaswood/screwdriver_act(mob/living/user, obj/item/I) + if(..()) + return TRUE + return pry_tile(I, user) + +/turf/open/floor/plaswood/try_replace_tile(obj/item/stack/tile/T, mob/user, params) + if(T.turf_type == type) + return + var/obj/item/tool = user.is_holding_item_of_type(/obj/item/screwdriver) + if(!tool) + tool = user.is_holding_item_of_type(/obj/item/crowbar) + if(!tool) + return + var/turf/open/floor/plating/P = pry_tile(tool, user, TRUE) + if(!istype(P)) + return + P.attackby(T, user, params) + +/turf/open/floor/plaswood/pry_tile(obj/item/C, mob/user, silent = FALSE) + C.play_tool_sound(src, 80) + return remove_tile(user, silent, (C.tool_behaviour == TOOL_SCREWDRIVER)) + +/turf/open/floor/plaswood/remove_tile(mob/user, silent = FALSE, make_tile = TRUE, forced = FALSE) + if(broken || burnt) + broken = 0 + burnt = 0 + if(user && !silent) + to_chat(user, "You remove the broken planks.") + else + if(make_tile) + if(user && !silent) + to_chat(user, "You unscrew the planks.") + if(floor_tile) + new floor_tile(src) + else + if(user && !silent) + to_chat(user, "You forcefully pry off the planks, destroying them in the process.") + return make_plating() diff --git a/GainStation13/code/game/turfs/simulated/wall/mineral_walls.dm b/GainStation13/code/game/turfs/simulated/wall/mineral_walls.dm new file mode 100644 index 0000000000..a8e8891944 --- /dev/null +++ b/GainStation13/code/game/turfs/simulated/wall/mineral_walls.dm @@ -0,0 +1,78 @@ +// GS13: Extra wood walls +/turf/closed/wall/mineral/gmushroom + name = "mushroom wall" + desc = "A wall with mushroom plating." + icon = 'GainStation13/icons/turf/walls/gmushroom_wall.dmi' + icon_state = "gmushroom" + sheet_type = /obj/item/stack/sheet/mineral/gmushroom + hardness = 70 + explosion_block = 0 + canSmoothWith = list(/turf/closed/wall/mineral/gmushroom, /obj/structure/falsewall/gmushroom, /turf/closed/wall/mineral/gmushroom/nonmetal) + +/turf/closed/wall/mineral/gmushroom/attackby(obj/item/W, mob/user) + if(W.sharpness && W.force) + var/duration = (48/W.force) * 2 //In seconds, for now. + if(istype(W, /obj/item/hatchet) || istype(W, /obj/item/fireaxe)) + duration /= 4 //Much better with hatchets and axes. + if(do_after(user, duration*10, target=src)) //Into deciseconds. + dismantle_wall(FALSE,FALSE) + return + return ..() + +/turf/closed/wall/mineral/gmushroom/nonmetal + desc = "A solidly mushroom wall. It's a bit weaker than a wall made with metal." + girder_type = /obj/structure/barricade/gmushroom + hardness = 50 + canSmoothWith = list(/turf/closed/wall/mineral/gmushroom, /obj/structure/falsewall/gmushroom, /turf/closed/wall/mineral/gmushroom/nonmetal) + +/turf/closed/wall/mineral/plaswood + name = "plaswood wall" + desc = "A wall with plaswood plating." + icon = 'GainStation13/icons/turf/walls/plaswood_wall.dmi' + icon_state = "plaswood" + sheet_type = /obj/item/stack/sheet/mineral/plaswood + hardness = 90 + explosion_block = 35 + canSmoothWith = list(/turf/closed/wall/mineral/plaswood, /obj/structure/falsewall/plaswood, /turf/closed/wall/mineral/plaswood/nonmetal) + +/turf/closed/wall/mineral/plaswood/attackby(obj/item/W, mob/user) + if(W.sharpness && W.force) + var/duration = (48/W.force) * 2 //In seconds, for now. + if(istype(W, /obj/item/hatchet) || istype(W, /obj/item/fireaxe)) + duration /= 4 //Much better with hatchets and axes. + if(do_after(user, duration*10, target=src)) //Into deciseconds. + dismantle_wall(FALSE,FALSE) + return + return ..() + +/turf/closed/wall/mineral/plaswood/nonmetal + desc = "A solidly plaswood wall. It's a bit weaker than a wall made with metal." + girder_type = /obj/structure/barricade/plaswood + hardness = 70 + canSmoothWith = list(/turf/closed/wall/mineral/plaswood, /obj/structure/falsewall/plaswood, /turf/closed/wall/mineral/plaswood/nonmetal) + +/turf/closed/wall/mineral/shadoww + name = "shadow wall" + desc = "A wall with shadow wood plating." + icon = 'GainStation13/icons/turf/walls/shadoww_wall.dmi' + icon_state = "shadoww" + sheet_type = /obj/item/stack/sheet/mineral/shadoww + hardness = 70 + explosion_block = 0 + canSmoothWith = list(/turf/closed/wall/mineral/shadoww, /obj/structure/falsewall/shadoww, /turf/closed/wall/mineral/shadoww/nonmetal) + +/turf/closed/wall/mineral/shadoww/attackby(obj/item/W, mob/user) + if(W.sharpness && W.force) + var/duration = (48/W.force) * 2 //In seconds, for now. + if(istype(W, /obj/item/hatchet) || istype(W, /obj/item/fireaxe)) + duration /= 4 //Much better with hatchets and axes. + if(do_after(user, duration*10, target=src)) //Into deciseconds. + dismantle_wall(FALSE,FALSE) + return + return ..() + +/turf/closed/wall/mineral/shadoww/nonmetal + desc = "A solidly shadow wall. It's a bit weaker than a wall made with metal." + girder_type = /obj/structure/barricade/shadoww + hardness = 50 + canSmoothWith = list(/turf/closed/wall/mineral/shadoww, /obj/structure/falsewall/shadoww, /turf/closed/wall/mineral/shadoww/nonmetal) diff --git a/GainStation13/code/mechanics/calorite.dm b/GainStation13/code/mechanics/calorite.dm index f4b7351946..1847b4a723 100644 --- a/GainStation13/code/mechanics/calorite.dm +++ b/GainStation13/code/mechanics/calorite.dm @@ -26,6 +26,7 @@ /turf/closed/mineral/calorite //GS13 mineralType = /obj/item/stack/ore/calorite + scan_state = "rock_Calorite" /obj/item/stack/ore/calorite //GS13 name = "calorite ore" diff --git a/GainStation13/code/mechanics/fattening_gasses.dm b/GainStation13/code/mechanics/fattening_gasses.dm index f376645b05..216f105fb1 100644 --- a/GainStation13/code/mechanics/fattening_gasses.dm +++ b/GainStation13/code/mechanics/fattening_gasses.dm @@ -1,26 +1,24 @@ /obj/item/organ/lungs/proc/lipoifium_breathing(datum/gas_mixture/breath, mob/living/carbon/human/H) - if(breath) - var/pressure = breath.return_pressure() - var/total_moles = breath.total_moles() - var/lipoifium_moles = breath.get_moles(GAS_FAT) - #define PP_MOLES(X) ((X / total_moles) * pressure) - var/gas_breathed = PP_MOLES(lipoifium_moles) // this does the same thing as the bit below but I think this is more readable - // #define PP(air, gas) PP_MOLES(air.get_moles(gas)) - // var/gas_breathed = PP(breath, GAS_FAT) - if(gas_breathed > 0) - // listen I know I can debug this but sometimes having this show up in chat without a pause is more convenient - // message_admins("Lipoifium pp is [gas_breathed]") - // message_admins("Lipoifium moles are [lipoifium_moles]") - H.adjust_fatness(2 * gas_breathed, FATTENING_TYPE_ATMOS) - breath.adjust_moles(GAS_FAT, -gas_breathed) - // TODO: the entire code below is a workaround for default odor not working - // The problem seems to be auxmos'es get_gasses function not acknowledging that lipoifium exists - // which is strange, considering that everything else regarding this gas and auxmos works - // I do not know what kind of spaghetti coding must be going on there, but I pray god has in his - // care the poor sods who have to work on that - var/smell_chance = min(lipoifium_moles * 100 / total_moles, 20) - if(prob(smell_chance)) - to_chat(owner, "You can smell lard.") + if(!breath) + return + + if(breath.total_moles() == 0) + return + + var/total_moles = breath.total_moles() + var/lipoifium_moles = breath.get_moles(GAS_FAT) + #define PP_MOLES(X) ((X / total_moles) * pressure) // this needs to be here because spaghetti, I'm sorry + if(lipoifium_moles <= 0) + return + + H.adjust_fatness(lipoifium_moles * 1500, FATTENING_TYPE_ATMOS) + breath.set_moles(GAS_FAT, 0) + // TODO: the entire code below is a workaround for default odor not working + // The problem seems to be auxmos'es get_gasses function not acknowledging that lipoifium exists + // which is strange, considering that everything else regarding this gas and auxmos works + var/smell_chance = min(lipoifium_moles * 100 / total_moles, 20) + if(prob(smell_chance)) + to_chat(owner, "You can smell lard.") /obj/item/organ/lungs/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/H) diff --git a/GainStation13/code/mechanics/helplessness.dm b/GainStation13/code/mechanics/helplessness.dm index 317e674744..9e647b0722 100644 --- a/GainStation13/code/mechanics/helplessness.dm +++ b/GainStation13/code/mechanics/helplessness.dm @@ -16,6 +16,17 @@ if(!mod_check(I) && HAS_TRAIT(H, TRAIT_NO_MISC) && (slot == ITEM_SLOT_FEET || slot ==ITEM_SLOT_GLOVES || slot == ITEM_SLOT_OCLOTHING)) to_chat(H, "You are too fat to wear [I].") return FALSE + + if(HAS_TRAIT(H, TRAIT_NO_BELT) && slot == ITEM_SLOT_BELT) + if(istype(I, /obj/item/bluespace_belt/primitive) && H?.client?.prefs.helplessness_belts*2 > H.fatness) + return ..() + + if(istype(I, /obj/item/bluespace_belt) && !istype(I, /obj/item/bluespace_belt/primitive)) + return ..() + + to_chat(H, "You are too fat to wear [I].") + return FALSE + return ..() diff --git a/GainStation13/code/mechanics/metal_cruncher.dm b/GainStation13/code/mechanics/metal_cruncher.dm index ef2d5b9d5e..136764899a 100644 --- a/GainStation13/code/mechanics/metal_cruncher.dm +++ b/GainStation13/code/mechanics/metal_cruncher.dm @@ -84,3 +84,7 @@ crunch_value = 15 /obj/item/stack/sheet/mineral/plaswood crunch_value = 15 +/obj/item/stack/sheet/mineral/diamond + crunch_value = 25 + + diff --git a/GainStation13/code/mobs/chocoslime.dm b/GainStation13/code/mobs/chocoslime.dm index fb2785a98f..f9ca1c2e79 100644 --- a/GainStation13/code/mobs/chocoslime.dm +++ b/GainStation13/code/mobs/chocoslime.dm @@ -11,6 +11,9 @@ /// Called when seeing if a target can be attacked. See if the target has the pref on and return accordingly. /mob/living/simple_animal/hostile/proc/check_target_prefs(mob/living/carbon/target) + if(!istype(target)) + return FALSE + return target?.client?.prefs?.weight_gain_weapons /mob/living/simple_animal/hostile/feed/AttackingTarget() diff --git a/GainStation13/code/modules/cargo/bounties/assistant.dm b/GainStation13/code/modules/cargo/bounties/assistant.dm new file mode 100644 index 0000000000..2918fe6d3e --- /dev/null +++ b/GainStation13/code/modules/cargo/bounties/assistant.dm @@ -0,0 +1,21 @@ +//Wood chair bounties +/datum/bounty/item/assistant/shadow_wood_chair + name = "Shadow Wood Chairs" + description = "One of the Commanders is unhappy with his chair. He claims it hurts his back. Ship some shadow wood chairs to humor him." + reward = 1000 + required_count = 5 + wanted_types = list(/obj/structure/chair/shadoww) + +/datum/bounty/item/assistant/mushroom_chair + name = "Mushroom Chairs" + description = "One of the Commanders is unhappy with his chair. He claims it hurts his back. Ship some mushroom chairs to humor him." + reward = 1500 + required_count = 5 + wanted_types = list(/obj/structure/chair/gmushroom) + +/datum/bounty/item/assistant/plaswood_chair + name = "Plaswood Chairs" + description = "One of the Commanders is unhappy with his chair. He claims it hurts his back. Ship some shadow wood chairs to humor him." + reward = 2250 + required_count = 5 + wanted_types = list(/obj/structure/chair/plaswood) diff --git a/GainStation13/code/modules/cargo/bounties/mining.dm b/GainStation13/code/modules/cargo/bounties/mining.dm new file mode 100644 index 0000000000..53bc7bb093 --- /dev/null +++ b/GainStation13/code/modules/cargo/bounties/mining.dm @@ -0,0 +1,21 @@ +//Wood plank bounties +/datum/bounty/item/mining/plaswood + name = "Plaswood Planks" + description = "Central Command's carpentry department needs more exotic wood, send us some plaswood planks!" + reward = 5500 + required_count = 100 + wanted_types = list(/obj/item/stack/sheet/mineral/plaswood) + +/datum/bounty/item/mining/gmushroom + name = "Mushroom Planks" + description = "Central Command's carpentry department needs more exotic 'wood', send us some mushroom planks!" + reward = 1100 + required_count = 100 + wanted_types = list(/obj/item/stack/sheet/mineral/gmushroom) + +/datum/bounty/item/mining/shadoww + name = "Shadow Planks" + description = "Central Command's carpentry department needs more exotic wood, send us some shadow planks!" + reward = 900 + required_count = 100 + wanted_types = list(/obj/item/stack/sheet/mineral/shadoww) diff --git a/GainStation13/code/modules/cargo/packs.dm b/GainStation13/code/modules/cargo/packs.dm index b22f342cf6..e2183bc2b1 100644 --- a/GainStation13/code/modules/cargo/packs.dm +++ b/GainStation13/code/modules/cargo/packs.dm @@ -39,3 +39,47 @@ /obj/item/implanter) crate_name = "livestock implant crate" contraband = TRUE + + +/datum/supply_pack/misc/stripperpole //oldcode port + name = "Stripper Pole Crate" + desc = "No private bar is complete without a stripper pole, show off the goods! Comes with a ready-to-assemble stripper pole, and a complementary wrench to get things set up!" + cost = 3550 + contains = list(/obj/item/polepack, + /obj/item/wrench) + crate_name = "stripper pole crate" + +/datum/supply_pack/critter/fennec //ported from CHOMPstation2 + name = "Fennec Crate" + desc = "Why so ears?" + cost = 5000 + contains = list(/mob/living/simple_animal/pet/fox/fennec) + crate_name = "fennec crate" + +/datum/supply_pack/vending/wardrobes/clothing //existing game item not in cargo for some reason + name = "ClothesMate Supply Crate" + desc = "ClothesMate missing your favorite outfit? Solve that issue today with this autodrobe refill." + cost = 1500 + contains = list(/obj/item/vending_refill/clothing) + crate_name = "clothesmate supply crate" + +/datum/supply_pack/materials/gmushroom50 //buyable special wood planks + name = "50 Mushroom Planks" + desc = "Looks like wood AND is fire proof? Of course you need fifty mushroom planks!" + cost = 1700 + crate_type = /obj/structure/closet/secure_closet/cargo + contains = list(/obj/item/stack/sheet/mineral/gmushroom/fifty) + +/datum/supply_pack/materials/plaswood50 + name = "50 Plaswood Planks" + desc = "Who need metal when you can have fifty plaswood planks?" + cost = 6000 + crate_type = /obj/structure/closet/secure_closet/cargo + contains = list(/obj/item/stack/sheet/mineral/plaswood/fifty) + +/datum/supply_pack/materials/shadoww50 + name = "50 Shadow Wood Planks" + desc = "Time to bring the dark side with fifty shadow wooden planks!" + cost = 1450 + crate_type = /obj/structure/closet/secure_closet/cargo + contains = list(/obj/item/stack/sheet/mineral/shadoww/fifty) diff --git a/GainStation13/code/modules/client/preferences/preferences.dm b/GainStation13/code/modules/client/preferences/preferences.dm index 3ad11a65e4..d8ce7cf670 100644 --- a/GainStation13/code/modules/client/preferences/preferences.dm +++ b/GainStation13/code/modules/client/preferences/preferences.dm @@ -56,6 +56,8 @@ var/helplessness_clothing_jumpsuit = FALSE ///What fatness level prevents the user from wearing non-jumpsuit clothing var/helplessness_clothing_misc = FALSE + // What fatness level prevents the user from wearing belts. Also affects the max weight the PBS Belt can hide + var/helplessness_belts = FALSE ///What fatness level prevents the user from wearing anything on their back var/helplessness_clothing_back = FALSE ///What fatness level prevents the user from being buckled to anything? diff --git a/GainStation13/code/modules/events/bluespace_belt_failure.dm b/GainStation13/code/modules/events/bluespace_belt_failure.dm new file mode 100644 index 0000000000..b7c3af50c2 --- /dev/null +++ b/GainStation13/code/modules/events/bluespace_belt_failure.dm @@ -0,0 +1,37 @@ +/datum/round_event_control/bluespace_belt_failure + name = "Bluespace Belt Failure" + description = "Causes Primitive Bluespace Belts to fail in a way identical to an EMP" + category = EVENT_CATEGORY_ANOMALIES + typepath = /datum/round_event/bluespace_belt_failure + + weight = 15 // should be infinite >:) + + max_occurrences = 8 + + alert_observers = FALSE + +/datum/round_event/bluespace_belt_failure + var/length = 0 + +/datum/round_event/bluespace_belt_failure/setup() + length = rand(25, 50) + end_when = length + start_when = rand(1, 5) + announce_when = rand(0, 4) + +/datum/round_event/bluespace_belt_failure/start() + for(var/mob/living/carbon/human/C in shuffle(GLOB.alive_mob_list)) + if(!C.client) + continue + if(C.stat == DEAD) + continue + // if (HAS_TRAIT(C,TRAIT_EXEMPT_HEALTH_EVENTS)) + // continue + if(!C.belt || !istype(C.belt, /obj/item/bluespace_belt/primitive)) + continue + if(!is_station_level(C.z)) + continue + C.belt.emp_act(length) + +/datum/round_event/bluespace_belt_failure/announce(fake) + priority_announce("Bluespace Fluctuations have been detected near the station. Certain Bluespace based equipment may stop working correctly for a short period of time.", "Bluespace Fluctuations Alert") diff --git a/GainStation13/code/modules/food_and_drinks/metal_food.dm b/GainStation13/code/modules/food_and_drinks/metal_food.dm new file mode 100644 index 0000000000..be4f9954e1 --- /dev/null +++ b/GainStation13/code/modules/food_and_drinks/metal_food.dm @@ -0,0 +1,63 @@ +////////////////////// +//////METAL FOOD////// +////////////////////// + + +/obj/item/metal_food + icon = 'GainStation13/icons/obj/food/metal_food.dmi' + desc = "Looks shiny." + w_class = WEIGHT_CLASS_SMALL + var/crunch_value = 0 // value per bite + var/crunch_left = 2 // means 3 bites left + + +// Maybe I should not put it here or making separate object for that... +/obj/item/metal_food/attack(mob/living/M, mob/living/user) + if(HAS_TRAIT(M, TRAIT_METAL_CRUNCHER)) + if(crunch_value > 0) + if(M == user) + user.visible_message("[user] crunches on some of [src].", "You crunch on some of [src].") + else + M.visible_message("[user] attempts to feed some of [src] to [M].", "[user] attempts to feed some of [src] to [M].") + playsound(M,'sound/items/eatfood.ogg', rand(10,50), 1) + use(1) + M.nutrition += crunch_value + if(crunch_left == 0) + qdel(src) + else + crunch_left -= 1 + else + if(M == user) + user.visible_message("[user] fails to crunch some of [src].", "Your teeth feel sore when you try to crunch on some of [src].") + else + M.visible_message("[user] attempts to feed some of [src] to [M].", "[user] attempts to feed some of [src] to [M].") + return + . = ..() + + +/obj/item/metal_food/Initialize(mapload) + . = ..() + +/obj/item/metal_food/mburger + name = "Metal Burger" + icon_state = "mburger" + crunch_value = 15 + +/obj/item/metal_food/mburger_calorite + name = "Calorite Burger" + icon_state = "mburger_calorite" + crunch_value = 35 + +/obj/item/metal_food/mram + name = "Old RAM module" + desc = "It's an obsolete RAM module. You can see some dust on it and spoiled electronics" + icon_state = "mRAM" + crunch_value = 1 + crunch_left = 4 + +/obj/item/metal_food/mfries + name = "Fried rods" + desc = "It looks like fries, but made out of metal. Can we call it french rods?" + icon_state = "mfrench_rods" + crunch_value = 1 + crunch_left = 9 diff --git a/GainStation13/code/modules/food_and_drinks/recipes/metal_food_recipes.dm b/GainStation13/code/modules/food_and_drinks/recipes/metal_food_recipes.dm new file mode 100644 index 0000000000..29b93e2b99 --- /dev/null +++ b/GainStation13/code/modules/food_and_drinks/recipes/metal_food_recipes.dm @@ -0,0 +1,27 @@ +/datum/crafting_recipe/food/mburger + name = "Metal Burger" + reqs = list( + /obj/item/stack/sheet/mineral/gold = 1, + /obj/item/stack/sheet/mineral/silver = 1, + /obj/item/stack/sheet/metal = 1 + ) + result = /obj/item/metal_food/mburger + subcategory = CAT_MISCELLANEOUS //CAT_BURGER + +/datum/crafting_recipe/food/mburger_calorite + name = "Calotite Burger" + reqs = list( + /obj/item/stack/sheet/mineral/gold = 1, + /obj/item/stack/sheet/mineral/calorite = 1, + /obj/item/stack/sheet/metal = 1 + ) + result = /obj/item/metal_food/mburger_calorite + subcategory = CAT_MISCELLANEOUS //CAT_BURGER + +/datum/crafting_recipe/food/mfries + name = "Fried rods" + reqs = list( + /obj/item/stack/rods = 3 + ) + result = /obj/item/metal_food/mfries + subcategory = CAT_MISCELLANEOUS //CAT_BURGER diff --git a/GainStation13/code/modules/hydroponics/grown/towercap.dm b/GainStation13/code/modules/hydroponics/grown/towercap.dm new file mode 100644 index 0000000000..e7d47f2b4f --- /dev/null +++ b/GainStation13/code/modules/hydroponics/grown/towercap.dm @@ -0,0 +1,36 @@ +//extra chopped wood logs +/obj/item/grown/log/gmushroom + seed = null + name = "mushroom log" + desc = "Looks like candy! Do not eat it." + icon = 'GainStation13/icons/obj/hydroponics/harvest.dmi' + icon_state = "mushroom_log" + plank_type = /obj/item/stack/sheet/mineral/gmushroom + plank_name = "mushroom planks" + +/obj/item/grown/log/gmushroom/CheckAccepted(obj/item/I) + return FALSE + +/obj/item/grown/log/shadowtree + seed = null + name = "shadow log" + desc = "A piece of dark log." + icon = 'GainStation13/icons/obj/hydroponics/harvest.dmi' + icon_state = "shadow_log" + plank_type = /obj/item/stack/sheet/mineral/shadoww + plank_name = "shadow planks" + +/obj/item/grown/log/gmushroom/CheckAccepted(obj/item/I) + return FALSE + +/obj/item/grown/log/plasmatree + seed = null + name = "plasma tree log" + desc = "A heavy piece log." + icon = 'GainStation13/icons/obj/hydroponics/harvest.dmi' + icon_state = "plasmatree_log" + plank_type = /obj/item/stack/sheet/mineral/plaswood + plank_name = "plaswood planks" + +/obj/item/grown/log/plasmatree/CheckAccepted(obj/item/I) + return FALSE diff --git a/GainStation13/code/modules/jobs/job_types/psychologist.dm b/GainStation13/code/modules/jobs/job_types/psychologist.dm new file mode 100644 index 0000000000..d083b29f45 --- /dev/null +++ b/GainStation13/code/modules/jobs/job_types/psychologist.dm @@ -0,0 +1,43 @@ +/datum/job/psychologist + title = "Psychologist" + flag = MED_PSYCH + department_head = list("Chief Medical Officer", "Head of Personnel") + department_flag = MEDSCI + faction = "Station" + total_positions = 1 + spawn_positions = 1 + minimal_player_age = 1 + supervisors = "the chief medical officer, and head of personnel" + selection_color = "#74b5e0" + exp_requirements = 240 + exp_type = EXP_TYPE_CREW + + outfit = /datum/outfit/job/psychologist + departments = DEPARTMENT_BITFLAG_MEDICAL + + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_PSYCH) + minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_PSYCH) + paycheck = PAYCHECK_MEDIUM + paycheck_department = ACCOUNT_MED + bounty_types = CIV_JOB_MED + + display_order = JOB_DISPLAY_ORDER_PSYCH + threat = 0.5 + +/datum/outfit/job/psychologist + name = "Psychologist" + jobtype = /datum/job/psychologist + + belt = /obj/item/pda/medical + ears = /obj/item/radio/headset/headset_med + uniform = /obj/item/clothing/under/suit/black + shoes = /obj/item/clothing/shoes/laceup + l_hand = /obj/item/clipboard + + backpack = /obj/item/storage/backpack/medic + satchel = /obj/item/storage/backpack/satchel/med + duffelbag = /obj/item/storage/backpack/duffelbag/med + + backpack_contents = list(/obj/item/storage/pill_bottle/mannitol, /obj/item/storage/pill_bottle/psicodine, /obj/item/storage/pill_bottle/paxpsych, /obj/item/storage/pill_bottle/happinesspsych, /obj/item/storage/pill_bottle/lsdpsych) + + chameleon_extras = /obj/item/gun/syringe diff --git a/GainStation13/code/modules/language/language_holder.dm b/GainStation13/code/modules/language/language_holder.dm new file mode 100644 index 0000000000..17eb0ab587 --- /dev/null +++ b/GainStation13/code/modules/language/language_holder.dm @@ -0,0 +1,12 @@ + +/datum/language_holder/spacerussian //Neo-Russkiya + understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), + /datum/language/spacerussian = list(LANGUAGE_ATOM)) + spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM), + /datum/language/spacerussian = list(LANGUAGE_ATOM)) + +/datum/language_holder/tajara //Siik'Tajr + understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), + /datum/language/tajara = list(LANGUAGE_ATOM)) + spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM), + /datum/language/tajara = list(LANGUAGE_ATOM)) diff --git a/GainStation13/code/modules/language/spacerussian.dm b/GainStation13/code/modules/language/spacerussian.dm new file mode 100644 index 0000000000..783b9e84fe --- /dev/null +++ b/GainStation13/code/modules/language/spacerussian.dm @@ -0,0 +1,23 @@ +/datum/language/spacerussian + name = "Neo-Russkiya" + desc = "Neo-Russkiya, a bastard mix of Galactic Common and old Russian. The official language of the USSP. It has started to see use outside of the fringe in hobby circles and protest groups." + speech_verb = "articulates" + ask_verb = "questions" + exclaim_verb = "exaggerates" + whisper_verb = "mutters" + key = "?" + flags = TONGUELESS_SPEECH + icon = 'GainStation13/icons/misc/language.dmi' + sentence_chance = 0 + default_priority = 80 + syllables = list("dyen","bar","bota","vyek","tvo","slov","slav","syen","doup","vah","laz","gloz","yet", + "nyet","da","sky","glav","glaz","netz","doomat","zat","moch","boz", + "comy","vrad","vrade","tay","bli","ay","nov","livn","tolv","glaz","gliz", + "ouy","zet","yevt","dat","botat","nev","novy","vzy","nov","sho","obsh","dasky", + "key","skey","ovsky","skaya","bib","kiev","studen","var","bul","vyan", + "tzion","vaya","myak","gino","volo","olam","miti","nino","menov","perov", + "odasky","trov","niki","ivano","dostov","sokol","oupa","pervom","schel", + "tizan","chka","tagan","dobry","okt","boda","veta","idi","cyk","blyt","hui","na", + "udi","litchki","casa","linka","toly","anatov","vich","vech","vuch","toi","ka","vod") + icon_state = "spacerussia" + chooseable_roundstart = TRUE diff --git a/GainStation13/code/modules/language/tajara.dm b/GainStation13/code/modules/language/tajara.dm new file mode 100644 index 0000000000..9a8c5ba10c --- /dev/null +++ b/GainStation13/code/modules/language/tajara.dm @@ -0,0 +1,18 @@ +/datum/language/tajara + name = "Siik'Tajr" + desc = "The traditionally employed tongue of Ahdomai, composed of expressive yowls and chirps. Native to the Tajaran." + speech_verb = "mrowls" + ask_verb = "mrowls inquisitively" + exclaim_verb = "yowls loudly" + whisper_verb = "mrowls quietly" + key = "j" + flags = TONGUELESS_SPEECH + icon = 'GainStation13/icons/misc/language.dmi' + sentence_chance = 0 + default_priority = 80 + syllables = list("rr","rr","tajr","kir","raj","kii","mir","kra","ahk","nal","vah","khaz","jri","ran","darr", + "mi","jri","dynh","manq","rhe","zar","rrhaz","kal","chur","eech","thaa","dra","jurl","mah","sanu","dra","ii'r", + "ka","aasi","far","wa","baq","ara","qara","zir","sam","mak","hrar","nja","rir","khan","jun","dar","rik","kah", + "hal","ket","jurl","mah","tul","cresh","azu","ragh") + icon_state = "taja" + chooseable_roundstart = TRUE diff --git a/GainStation13/code/modules/loadout/backpack.dm b/GainStation13/code/modules/loadout/backpack.dm index 3631b0c6e2..515f3f614f 100644 --- a/GainStation13/code/modules/loadout/backpack.dm +++ b/GainStation13/code/modules/loadout/backpack.dm @@ -1,5 +1,14 @@ -/datum/gear/backpack/bluespace_belt - name = "Bluespace Belt" - category = LOADOUT_SUBCATEGORY_BACKPACK_GENERAL - path = /obj/item/bluespace_belt +// /datum/gear/backpack/bluespace_belt +// name = "Bluespace Belt" +// category = LOADOUT_CATEGORY_BACKPACK +// subcategory = LOADOUT_SUBCATEGORY_BACKPACK_GENERAL +// path = /obj/item/bluespace_belt +// cost = 5 + +/datum/gear/backpack/bluespace_belt_primitive + name = "Primitive Bluespace Belt" + // category = LOADOUT_SUBCATEGORY_BACKPACK_GENERAL + path = /obj/item/bluespace_belt/primitive cost = 5 + category = LOADOUT_CATEGORY_BACKPACK + subcategory = LOADOUT_SUBCATEGORY_BACKPACK_GENERAL \ No newline at end of file diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/ears.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/ears.dm index 6aefd1d22c..fd98a3833e 100644 --- a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/ears.dm +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/ears.dm @@ -53,3 +53,23 @@ icon = 'GainStation13/icons/mob/markings/mam_ears.dmi' color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/ears/mam_ears/elf + name = "Elf" + icon = 'GainStation13/icons/mob/markings/mam_ears.dmi' + icon_state = "elf" + +/datum/sprite_accessory/ears/human/elf + name = "Elf" + icon = 'GainStation13/icons/mob/markings/mam_ears.dmi' + icon_state = "elf" + +/datum/sprite_accessory/ears/mam_ears/kip + name = "Kip" + icon = 'GainStation13/icons/mob/markings/mam_ears.dmi' + icon_state = "kip" + +/datum/sprite_accessory/ears/human/kip + name = "Kip" + icon = 'GainStation13/icons/mob/markings/mam_ears.dmi' + icon_state = "kip" \ No newline at end of file diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm index dda2bde3c1..74be6aeea3 100644 --- a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm @@ -5,6 +5,78 @@ NEWHAIR(Elize, hair_elize) NEWHAIR(Lem, hair_lem) NEWHAIR(Straight (Floorlength), hair_straightfloorlength) +NEWHAIR(Beehive (Alt), hair_beehivealt) //Rest of the oldcode styles +NEWHAIR(Antonio, hair_antonio) +NEWHAIR(Angelique, hair_angelique) +NEWHAIR(Big Curls, hair_bigcurls) +NEWHAIR(Blindbangs, hair_blindbangs) +NEWHAIR(Boyish 1, hair_boyish1) +NEWHAIR(Boyish 2, hair_boyish2) +NEWHAIR(Boyish 3, hair_boyish3) +NEWHAIR(Boyish 4, hair_boyish4) +NEWHAIR(Boyish 5, hair_boyish5) +NEWHAIR(Boyish Short 1, hair_bshort) +NEWHAIR(Boyish Short 2, hair_bshort2) +NEWHAIR(Boyish Short 3, hair_bshort3) +NEWHAIR(Braid (Alt), hair_braidalt) +NEWHAIR(Braided (Long), hair_longbraid) +NEWHAIR((Hyper) Curtains, hair_curtains) +NEWHAIR(Damsel, hair_damsel) +NEWHAIR(Darcy, hair_darcy) +NEWHAIR(Deathhawk, hair_deathhawk) +NEWHAIR(Emma, hair_emma) +NEWHAIR(Emo (Right), hair_emoright) +NEWHAIR(Fabio, hair_fabio) +NEWHAIR(Froofy (Long), hair_froofylong) +NEWHAIR(Gamzee, hair_gamzee) +NEWHAIR(Glamour (Alt), hair_glamourh) +NEWHAIR(Glossy, hair_glossy) +NEWHAIR(Grudge, hair_grudge) +NEWHAIR(Half Shaved (Left), hair_halfshavedL) +NEWHAIR(Half Shaved (Right), hair_halfshavedR) +NEWHAIR(Hyena Mane, hair_hyenamane) +NEWHAIR(Immovable, hair_immovable) +NEWHAIR(Jane, hair_jane) +NEWHAIR(Kanaya, hair_kanaya) +NEWHAIR(Longs Dreads, hair_dreadlongalt) +NEWHAIR(Mia, hair_mia) +NEWHAIR(Mia (Long), hair_mialong) +NEWHAIR(Mid Back, hair_midb) +NEWHAIR(Myopia, hair_myopia) +NEWHAIR(Nepeta, hair_nepeta) +NEWHAIR(Ponytail (Jean), hair_jeanponytail) +NEWHAIR(Rockstar Curls, hair_rockstarcurls) +NEWHAIR(Sabitsuki, hair_sabitsuki) +NEWHAIR(Shouldersweep, hair_shouldersweep) +NEWHAIR(Straight (Over Eye), hair_straightovereye) +NEWHAIR(Straight (Side), hair_straightside) +NEWHAIR(Straight (Short), hair_straightshort) +NEWHAIR(Straight (Long), hair_straightlong) +NEWHAIR(Suave, hair_suave) +NEWHAIR(Suave 2, hair_suave2) +NEWHAIR(Sweepshave, hair_sweepshave) +NEWHAIR(Swept Fringe, hair_sweptfringe) +NEWHAIR(Taro, hair_taro) +NEWHAIR(Undercut Long, hair_undercutlong) +NEWHAIR(Vriska, hair_vriska) +NEWHAIR(Wavy (Long), hair_wavylong) +NEWHAIR(Wavy (Over Eye), hair_wavyovereye) +NEWHAIR(Zone, hair_zone) +NEWHAIR(Tail Hair, hair_tailhair) +NEWHAIR((Hyper) Hairfre, hair_hairfre) +NEWHAIR((Hyper) Side Hair, hair_tailhair2) +NEWHAIR(2b, hair_2b) +NEWHAIR(Male (Pod), pod_hair_male) +NEWHAIR(Female (Pod), pod_hair_female) +NEWHAIR(Cabbage (Pod), pod_hair_cabbage) +NEWHAIR(Fig (Pod), pod_hair_fig) +NEWHAIR(Hibiscus (Pod), pod_hair_hibiscus) +NEWHAIR(Ivy (Pod), pod_hair_ivy) +NEWHAIR(Orchid (Pod), pod_hair_orchid) +NEWHAIR(Prayer (Pod), pod_hair_prayer) +NEWHAIR(Rose (Pod), pod_hair_rose) +NEWHAIR(Shrub (Pod), pod_hair_shrub) +NEWHAIR(Spinach (Pod), pod_hair_spinach) //End of oldcode styles #undef NEWHAIR diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm index 32d38c386a..20fe48e92b 100644 --- a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm @@ -15,12 +15,14 @@ icon_state = "fatdrake" color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN + taur_mode = STYLE_PAW_TAURIC /datum/sprite_accessory/taur/fatwolf //ported from Vorestation name = "Fat Wolf" icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' icon_state = "fatwolf" color_src = MUTCOLORS + taur_mode = STYLE_PAW_TAURIC /datum/sprite_accessory/taur/fatliz //ported from Vorestation name = "Fat Lizard" @@ -28,6 +30,7 @@ icon_state = "fatliz" color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN + taur_mode = STYLE_PAW_TAURIC /datum/sprite_accessory/taur/longtailfluff //ported from Vorestation name = "Long Fluffy Tail" @@ -41,6 +44,7 @@ icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' icon_state = "fatsynthwolf" color_src = MUTCOLORS + taur_mode = STYLE_PAW_TAURIC /datum/sprite_accessory/taur/bigleggies //ported from Vorestation name = "Big Leggies" @@ -54,6 +58,7 @@ icon_state = "fatnaga" color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN + taur_mode = STYLE_SNEK_TAURIC /datum/sprite_accessory/taur/altnaga //ported from Vorestation name = "Alt Naga" @@ -61,3 +66,20 @@ icon_state = "altnaga" color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN + taur_mode = STYLE_SNEK_TAURIC + +/datum/sprite_accessory/taur/fatdrakelights //Edited fat drake but with lights + name = "Fat Drake (lights)" + icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' + icon_state = "fdsynthlights" + color_src = MATRIXED + matrixed_sections = MATRIX_ALL + taur_mode = STYLE_PAW_TAURIC + +/datum/sprite_accessory/taur/drakelights //Edited drake but with lights + name = "Drake (lights)" + icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' + icon_state = "drakelights" + color_src = MATRIXED + matrixed_sections = MATRIX_ALL + taur_mode = STYLE_PAW_TAURIC diff --git a/GainStation13/code/modules/mob/living/species.dm b/GainStation13/code/modules/mob/living/species.dm index 12fff6fc92..b71ba4816c 100644 --- a/GainStation13/code/modules/mob/living/species.dm +++ b/GainStation13/code/modules/mob/living/species.dm @@ -5,6 +5,7 @@ var/obj/item/organ/genital/butt/butt = H.getorganslot(ORGAN_SLOT_BUTT) var/obj/item/organ/genital/belly/belly = H.getorganslot(ORGAN_SLOT_BELLY) var/obj/item/organ/genital/breasts/breasts = H.getorganslot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/taur_belly/tbelly = H.getorganslot(ORGAN_SLOT_TAUR_BELLY) //GS13 TAUR BELLY EDIT if(butt) if(butt.max_size > 0) @@ -18,6 +19,12 @@ belly.modify_size(size_change) else belly.modify_size(size_change) + if(tbelly) //GS13 TAUR BELLY EDIT + if(tbelly.max_size > 0) + if((tbelly.size + size_change) <= tbelly.max_size) + tbelly.modify_size(size_change) + else + tbelly.modify_size(size_change) if(breasts) if(breasts.max_size > 0) if((breasts.cached_size + size_change) <= breasts.max_size) @@ -196,6 +203,32 @@ REMOVE_TRAIT(fatty, TRAIT_NO_MISC, HELPLESSNESS_TRAIT) + if(preferences.helplessness_belts) + if(!HAS_TRAIT_FROM(fatty, TRAIT_NO_BELT, HELPLESSNESS_TRAIT)) + if(fatty.fatness >= preferences.helplessness_belts) + ADD_TRAIT(fatty, TRAIT_NO_BELT, HELPLESSNESS_TRAIT) + + // if(istype(fatty.belt, /obj/item/bluespace_belt)) + var/obj/item/bluespace_belt/primitive/PBS_belt = fatty.belt + if(istype(PBS_belt) && fatty.fatness > preferences.helplessness_belts) + // to_chat(fatty, "[PBS_belt] can no longer contain your weight!") + fatty.visible_message("[PBS_belt] fails as it's unable to contain [fatty]'s bulk!", "[PBS_belt] fails as it's unable to contain your bulk!") + fatty.dropItemToGround(PBS_belt) + + var/obj/item/storage/belt/belt = fatty.belt + if(istype(belt)) + // to_chat(fatty, "[belt] can no longer contain your weight!") + fatty.visible_message("With a loud ripping sound, [fatty]'s [belt] snaps open!", "With a loud ripping sound, your [belt] snaps open!") + fatty.dropItemToGround(belt) + + else if(fatty.fatness < preferences.helplessness_belts) + to_chat(fatty, "You feel thin enough to put on belts now. ") + REMOVE_TRAIT(fatty, TRAIT_NO_BELT, HELPLESSNESS_TRAIT) + + else + if(HAS_TRAIT_FROM(fatty, TRAIT_NO_BELT, HELPLESSNESS_TRAIT)) + REMOVE_TRAIT(fatty, TRAIT_NO_BELT, HELPLESSNESS_TRAIT) + if(preferences.helplessness_clothing_back) if(!HAS_TRAIT_FROM(fatty, TRAIT_NO_BACKPACK, HELPLESSNESS_TRAIT)) if(fatty.fatness >= preferences.helplessness_clothing_back) diff --git a/GainStation13/code/modules/mob/living/taur_belly.dm b/GainStation13/code/modules/mob/living/taur_belly.dm new file mode 100644 index 0000000000..d2eb5afbe0 --- /dev/null +++ b/GainStation13/code/modules/mob/living/taur_belly.dm @@ -0,0 +1,77 @@ +/obj/item/organ/genital/taur_belly //I know, I know a this is just a copy of belly.dm code. + name = "taur belly" + desc = "You see a belly on their taur body." + icon_state = "belly" + icon = 'GainStation13/icons/obj/genitals/taur_belly/taur_belly_drake.dmi' //drake belly as placeholder + zone = BODY_ZONE_CHEST // ugh... I think this is a target on a health doll + slot = ORGAN_SLOT_TAUR_BELLY + w_class = 3 + size = 0 + var/max_size = 0 + shape = TAUR_BELLY_SHAPE_DEF//"taur_belly" + var/statuscheck = FALSE + genital_flags = UPDATE_OWNER_APPEARANCE|GENITAL_CAN_TAUR + masturbation_verb = "massage" + var/sent_full_message = TRUE //defaults to 1 since they're full to start + var/inflatable = FALSE + var/size_cached = 0 + var/prev_size = 0 + layer_index = TAUR_BELLY_LAYER_INDEX + + +/obj/item/organ/genital/taur_belly/modify_size(modifier, min = TAUR_BELLY_SIZE_DEF, max = TAUR_BELLY_SIZE_MAX) + var/new_value = clamp(size_cached + modifier, starting_size, max) + if(new_value == size_cached) + return + prev_size = size_cached + size_cached = new_value + size = round(size_cached) + update() + ..() + +/obj/item/organ/genital/taur_belly/update_appearance() + //GS13 + // Default settings + var/datum/sprite_accessory/S = GLOB.taur_belly_shapes_list[shape] //GS13 - get belly shape + var/icon_shape_state = S ? S.icon_state : "belly" + icon_state = "[icon_shape_state]_[size]" + //var/icon_shape = S ? S.icon : "hyperstation/icons/obj/genitals/belly.dmi" //fallback to default belly in case we cant find a shape + //icon = icon_shape + +// Fullnes not implemented yet +/* + switch(owner.fullness) + if(FULLNESS_LEVEL_BLOATED to FULLNESS_LEVEL_BEEG) + icon = 'hyperstation/icons/obj/genitals/belly_round.dmi' //We use round belly to represent stuffedness + icon_state = "belly_round_[size]" + if(FULLNESS_LEVEL_BEEG to FULLNESS_LEVEL_NOMOREPLZ) + icon = 'hyperstation/icons/obj/genitals/belly_round.dmi' + icon_state = "belly_round_[size+1]" + if(FULLNESS_LEVEL_NOMOREPLZ to INFINITY) + icon = 'hyperstation/icons/obj/genitals/belly_round.dmi' + icon_state = "belly_round_[size+2]" +*/ + if(owner) + if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"]) + if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow... + var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need. + color = SKINTONE2HEX(H.skin_tone) + if(!H.dna.skin_tone_override) + icon_state += "_s" + else + color = "#[owner.dna.features["taur_belly_color"]]" + +/obj/item/organ/genital/taur_belly/get_features(mob/living/carbon/human/H) + var/datum/dna/D = H.dna + if(D.species.use_skintones && D.features["genitals_use_skintone"]) + color = SKINTONE2HEX(H.skin_tone) + else + color = "#[D.features["taur_belly_color"]]" + size = D.features["taur_belly_size"] + max_size = D.features["max_taur_belly_size"] + starting_size = D.features["belly_size"] + shape = D.features["taur_belly_shape"] + inflatable = D.features["taur_inflatable_belly"] + toggle_visibility(D.features["taur_belly_visibility"], FALSE) + + diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm index 9cef5cb2ab..8c7901bea2 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm @@ -8,6 +8,7 @@ reagent_state = LIQUID color = "#e2e1b1" metabolization_rate = 0.5 * REAGENTS_METABOLISM + chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_BIOFUEL_PROCESS /datum/reagent/consumable/lipoifier/on_mob_life(mob/living/carbon/M) M.adjust_fatness(15, FATTENING_TYPE_CHEM) @@ -22,6 +23,7 @@ // GS13 tweak metabolization_rate = 0.7 * REAGENTS_METABOLISM overdose_threshold = 105 + chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_BIOFUEL_PROCESS /datum/reagent/medicine/lipolicide/overdose_process(mob/living/carbon/C) . = ..() @@ -51,6 +53,7 @@ reagent_state = LIQUID taste_description = "fizziness" metabolization_rate = 2 * REAGENTS_METABOLISM + chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_BIOFUEL_PROCESS /datum/reagent/consumable/fizulphite/on_mob_life(mob/living/carbon/M) if(M && M?.client?.prefs.weight_gain_chems) @@ -69,6 +72,7 @@ reagent_state = LIQUID taste_description = "smoothness" metabolization_rate = 0.8 * REAGENTS_METABOLISM + chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_BIOFUEL_PROCESS /datum/reagent/consumable/extilphite/on_mob_life(mob/living/carbon/M) if(M && M?.client?.prefs.weight_gain_chems) @@ -91,6 +95,7 @@ reagent_state = LIQUID taste_description = "sulfury sweetness" metabolization_rate = 0.5 * REAGENTS_METABOLISM //Done by Zestyspy, Jan 2023 + chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_BIOFUEL_PROCESS /datum/reagent/consumable/flatulose/on_mob_life(mob/living/carbon/M) if(M && M?.client?.prefs.weight_gain_chems) @@ -136,6 +141,7 @@ taste_description = "blueberry pie" var/no_mob_color = FALSE value = 10 //it sells. Make that berry factory + chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_BIOFUEL_PROCESS //screw it let robots have juice why not /datum/reagent/blueberry_juice/on_mob_life(mob/living/carbon/M) if(M?.client) diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/fermi_fat.dm b/GainStation13/code/modules/reagents/chemistry/reagents/fermi_fat.dm index 2e4968752a..068adfc5b6 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/fermi_fat.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/fermi_fat.dm @@ -8,6 +8,7 @@ overdose_threshold = 50 metabolization_rate = REAGENTS_METABOLISM / 4 can_synth = FALSE //DO NOT MAKE THIS SNYTHESIZABLE, THESE CHEMS ARE SUPPOSED TO NOT BE USED COMMONLY + chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_BIOFUEL_PROCESS overdose_threshold = 50 addiction_threshold = 100 @@ -150,6 +151,7 @@ pH = 7 metabolization_rate = REAGENTS_METABOLISM / 4 can_synth = FALSE + chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_BIOFUEL_PROCESS overdose_threshold = 50 diff --git a/GainStation13/code/modules/reagents/reagent_containers/pill.dm b/GainStation13/code/modules/reagents/reagent_containers/pill.dm new file mode 100644 index 0000000000..98c6340149 --- /dev/null +++ b/GainStation13/code/modules/reagents/reagent_containers/pill.dm @@ -0,0 +1,18 @@ +//GS13: Pysch pills +/obj/item/reagent_containers/pill/lsdpsych + name = "antipsychotic pill" + desc = "Talk to your healthcare provider immediately if hallucinations worsen or new hallucinations emerge." + icon_state = "pill14" + list_reagents = list(/datum/reagent/toxin/mindbreaker = 5) + +/obj/item/reagent_containers/pill/happinesspsych + name = "mood stabilizer pill" + desc = "Used to temporarily alleviate anxiety and depression, take only as prescribed." + icon_state = "pill_happy" + list_reagents = list(/datum/reagent/drug/happiness = 5) + +/obj/item/reagent_containers/pill/paxpsych + name = "pacification pill" + desc = "Used to temporarily suppress violent, homicidal, or suicidal behavior in patients." + icon_state = "pill12" + list_reagents = list(/datum/reagent/pax = 5) diff --git a/GainStation13/code/modules/research/designs/nutri_designs.dm b/GainStation13/code/modules/research/designs/nutri_designs.dm index 89ac62e498..90aa4d546e 100644 --- a/GainStation13/code/modules/research/designs/nutri_designs.dm +++ b/GainStation13/code/modules/research/designs/nutri_designs.dm @@ -112,6 +112,17 @@ category = list("Misc", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE +/datum/design/primitive_bluespace_belt + name = "Primitive Bluespace Belt" + desc = "A primitive belt made using bluespace technology. The power of space and time, used to hide the fact you are fat. This one requires cells to continue operating, and may suffer from random failures." + id = "primitive_bluespace_belt" + build_type = PROTOLATHE + construction_time = 100 + materials = list(/datum/material/iron = 4000, /datum/material/silver = 2000, ) + build_path = /obj/item/bluespace_belt/primitive + category = list("Misc", "Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + /datum/design/cookie_synthesizer name = "Cookie Synthesizer" desc = "A self-charging miraculous device that's able to produce cookies." diff --git a/GainStation13/code/modules/research/techweb/nutritech_nodes.dm b/GainStation13/code/modules/research/techweb/nutritech_nodes.dm index 4df02f5a03..f172faedb5 100644 --- a/GainStation13/code/modules/research/techweb/nutritech_nodes.dm +++ b/GainStation13/code/modules/research/techweb/nutritech_nodes.dm @@ -5,7 +5,7 @@ display_name = "Nutri-Tech Tools" description = "Ending world hunger was never made easier!" prereq_ids = list("biotech", "adv_engi") - design_ids = list("calorite_collar", "ci-nutrimentturbo", "bluespace_belt", "adipoelectric_transformer", "cookie_synthesizer", "borg_upgrade_cookiesynthesizer", "borg_upgrade_feedingtube", "ci-fatmobility","bluespace_collar_receiver","bluespace_collar_transmitter") + design_ids = list("calorite_collar", "ci-nutrimentturbo", "bluespace_belt", "primitive_bluespace_belt", "adipoelectric_transformer", "cookie_synthesizer", "borg_upgrade_cookiesynthesizer", "borg_upgrade_feedingtube", "ci-fatmobility","bluespace_collar_receiver","bluespace_collar_transmitter") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) boost_item_paths = list(/obj/item/gun/energy/fatoray, /obj/item/gun/energy/fatoray/cannon, /obj/item/trash/fatoray_scrap1, /obj/item/trash/fatoray_scrap2) hidden = TRUE diff --git a/GainStation13/code/modules/surgery/breast_augmentation.dm b/GainStation13/code/modules/surgery/breast_augmentation.dm new file mode 100644 index 0000000000..e045ad6495 --- /dev/null +++ b/GainStation13/code/modules/surgery/breast_augmentation.dm @@ -0,0 +1,75 @@ +/datum/surgery/breast_augmentation + name = "Breast augmentation" + steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/augment_breasts, /datum/surgery_step/close) + target_mobtypes = list(/mob/living/carbon/human) + possible_locs = list(BODY_ZONE_CHEST) + +/datum/surgery_step/augment_breasts + name = "augment breasts" + implements = list(/obj/item/scalpel = 100, /obj/item/stack/sheet/plastic = 100, /obj/item/melee/transforming/energy/sword = 75, /obj/item/kitchen/knife = 65, + /obj/item/shard = 45, /obj/item = 30) // 30% success with any sharp item. + time = 32 + repeatable = TRUE + +/datum/surgery_step/augment_breasts/tool_check(mob/user, obj/item/tool) + if(istype(tool, /obj/item/cautery) || istype(tool, /obj/item/gun/energy/laser)) + return FALSE + return !tool.get_temperature() + +/datum/surgery_step/augment_breasts/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + //Patient has titties + if(target.has_breasts()) + if(tool.get_sharpness()) + display_results(user, target, "You begin to cut the excess out of [target]'s breasts, bringing them down a cup size...", + "[user] begins to augment [target]'s breasts.", + "[user] begins to augment [target]'s breasts.") + if(istype(tool, /obj/item/stack/sheet/plastic)) + display_results(user, target, "You begin to mold, shape, and then add plastic to [target]'s breasts, increasing their cup size by 1...", + "[user] begins to augment [target]'s breasts.", + "[user] begins to augment [target]'s breasts.") + //Patient does not have titties + else + if(istype(tool, /obj/item/stack/sheet/plastic)) + display_results(user, target, "You begin to remodel [target]'s chest, creating a new pair of breasts which are barely A cups...", + "[user] begins to perform plastic surgery on [target].", + "[user] begins to perform plastic surgery on [target].") + +/datum/surgery_step/augment_breasts/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + var/obj/item/organ/genital/breasts/B = target.getorganslot("breasts") + //Patient has titties + if(B) + //Reduce their size (you fucking monster) + if(tool.get_sharpness()) + B.cached_size = B.cached_size - 1 + B.update() + return 1 + //Increase the size (that's more like it!) + if(istype(tool, /obj/item/stack/sheet/plastic)) + var/obj/item/stack/sheet/plastic/pS = tool + pS.use(1) + + B.cached_size = B.cached_size + 1 + B.update() + return 1 + //Patient does not have titties + else + //Give 'em titties + if(istype(tool, /obj/item/stack/sheet/plastic)) + //Makes it so no one has any weird coloured tits + var/mob/living/carbon/human/H = target + if(H.dna.species.use_skintones) + H.dna.features["breasts_color"] = SKINTONE2HEX(H.skin_tone) + else + H.dna.features["breasts_color"] = H.dna.features["mcolor"] + + var/obj/item/stack/sheet/plastic/pS = tool + pS.amount = pS.amount - 1 + pS.use(1) + + var/obj/item/organ/genital/breasts/nB = new + nB.size = "flat" + nB.cached_size = 0 + nB.prev_size = 0 + nB.Insert(target) + nB.update() + return 1 diff --git a/GainStation13/code/modules/surgery/penis_augmentation.dm b/GainStation13/code/modules/surgery/penis_augmentation.dm new file mode 100644 index 0000000000..56b8ff0a6e --- /dev/null +++ b/GainStation13/code/modules/surgery/penis_augmentation.dm @@ -0,0 +1,73 @@ +/datum/surgery/penis_augmentation + name = "Penis augmentation" + steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/augment_penis, /datum/surgery_step/close) + target_mobtypes = list(/mob/living/carbon/human) + possible_locs = list(BODY_ZONE_PRECISE_GROIN) + +/datum/surgery_step/augment_penis + name = "augment penis" + implements = list(/obj/item/scalpel = 100, /obj/item/stack/sheet/plastic = 100, /obj/item/melee/transforming/energy/sword = 75, /obj/item/kitchen/knife = 65, + /obj/item/shard = 45, /obj/item = 30) // 30% success with any sharp item. + time = 32 + repeatable = TRUE + +/datum/surgery_step/augment_penis/tool_check(mob/user, obj/item/tool) + if(istype(tool, /obj/item/cautery) || istype(tool, /obj/item/gun/energy/laser)) + return FALSE + return !tool.get_temperature() + +/datum/surgery_step/augment_penis/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + //Patient has a cock + if(target.has_penis()) + if(tool.get_sharpness()) + display_results(user, target, "You begin to reshape [target]'s penis, decreasing it's length by an inch...", + "[user] begins to augment [target]'s penis.", + "[user] begins to augment [target]'s penis.") + if(istype(tool, /obj/item/stack/sheet/plastic)) + display_results(user, target, "You begin to mold, shape, and then add plastic to [target]'s penis, making it one inch bigger...", + "[user] begins to augment [target]'s penis.", + "[user] begins to augment [target]'s penis.") + //Patient does not have a cock + else + if(istype(tool, /obj/item/stack/sheet/plastic)) + display_results(user, target, "You begin to remodel [target]'s groin, creating a new penis of length 1 inch...", + "[user] begins to perform plastic surgery on [target].", + "[user] begins to perform plastic surgery on [target].") + +/datum/surgery_step/augment_penis/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + var/obj/item/organ/genital/penis/P = target.getorganslot("penis") + //Patient has a cock + if(P) + //Reduce their size + if(tool.get_sharpness()) + P.length = P.length - 1 + P.update() + return 1 + //Increase the size + if(istype(tool, /obj/item/stack/sheet/plastic)) + var/obj/item/stack/sheet/plastic/pS = tool + pS.use(1) + + P.length = P.length + 1 + P.update() + return 1 + //Patient does not have a cock + else + //Give 'em a cock + if(istype(tool, /obj/item/stack/sheet/plastic)) + //Makes it so no one has a weird coloured dick + var/mob/living/carbon/human/H = target + if(H.dna.species.use_skintones) + H.dna.features["penis_color"] = SKINTONE2HEX(H.skin_tone) + else + H.dna.features["penis_color"] = H.dna.features["mcolor"] + + var/obj/item/stack/sheet/plastic/pS = tool + pS.use(1) + + var/obj/item/organ/genital/penis/nP = new + nP.length = 1 + nP.prev_length = 0 + nP.Insert(target) + nP.update() + return 1 diff --git a/GainStation13/code/obj/items/bluespace_belt.dm b/GainStation13/code/obj/items/bluespace_belt.dm index f550e783e3..3054efd022 100644 --- a/GainStation13/code/obj/items/bluespace_belt.dm +++ b/GainStation13/code/obj/items/bluespace_belt.dm @@ -8,16 +8,19 @@ equip_sound = 'GainStation13/sound/items/equip/toolbelt_equip.ogg' drop_sound = 'GainStation13/sound/items/handling/toolbelt_drop.ogg' pickup_sound = 'GainStation13/sound/items/handling/toolbelt_pickup.ogg' + var/equipped = FALSE // is it in the belt slot? /obj/item/bluespace_belt/equipped(mob/user, slot) ..() if(!iscarbon(user)) return var/mob/living/carbon/U = user - if(slot ==ITEM_SLOT_BELT) + if(slot == ITEM_SLOT_BELT) + equipped = TRUE to_chat(U, "You put the belt around your waist and your mass begins to shrink...") U.hider_add(src) - else + else if(equipped) + equipped = FALSE to_chat(user, "The belt is opened, letting your mass flow out!") U.hider_remove(src) @@ -26,9 +29,204 @@ if(!iscarbon(user)) return var/mob/living/carbon/U = user - to_chat(U, "The belt is opened, letting your mass flow out!") + if (equipped) + to_chat(U, "The belt is opened, letting your mass flow out!") U.hider_remove(src) /obj/item/bluespace_belt/proc/fat_hide(var/mob/living/carbon/user) return -(user.fatness_real - 1) +/obj/item/bluespace_belt/primitive + name = "primitive bluespace belt" + desc = "A primitive belt made using bluespace technology. The power of space and time, used to hide the fact you are fat. This one requires cells to continue operating, and may suffer from random failures." + icon = 'GainStation13/icons/obj/clothing/bluespace_belt.dmi' + icon_state = "primitive_belt" + item_state = "primitive_belt" + + var/cell_type = /obj/item/stock_parts/cell/high + var/obj/item/stock_parts/cell/cell + var/maximum_power_drain = 50 + var/fatness_to_power_coefficient = 136 // FATNESS_LEVEL_BLOB*2 BFI divided by this equals 50, our maximum power drain + var/mob/living/carbon/user // the fatass who's weight we must track for power drain calcs + var/overloaded = FALSE // is it EMP'ed? + +/obj/item/bluespace_belt/primitive/examine(mob/user) + . = ..() + if(cell && cell.charge) + . += "It seems to have [DisplayEnergy(cell.charge)] of power remaining." + else + . += "It seems to be out of power." + +/obj/item/bluespace_belt/primitive/Initialize(mapload) + . = ..() + if(!cell && cell_type) + cell = new cell_type + +/obj/item/bluespace_belt/primitive/emp_act(severity) + . = ..() + + if(cell && !(. & EMP_PROTECT_CONTENTS)) + cell.emp_act(severity) + + overloaded = TRUE + to_chat(loc, "\The [src] overloads!") + deactivate() + addtimer(CALLBACK(src, PROC_REF(emp_act_end)), severity*10, TIMER_UNIQUE | TIMER_NO_HASH_WAIT | TIMER_OVERRIDE) + +/obj/item/bluespace_belt/primitive/proc/emp_act_end() + overloaded = FALSE + activate() + +/obj/item/bluespace_belt/primitive/proc/activate() + if (overloaded) + deactivate() + return + + if(!cell) + deactivate() + return + + if(!cell.charge) + deactivate() + return + + if(!isnull(user) && equipped) + user.hider_add(src) + + icon_state = "primitive_belt" + START_PROCESSING(SSprocessing, src) + +/obj/item/bluespace_belt/primitive/proc/deactivate() + if(!isnull(user)) + user.hider_remove(src) + + STOP_PROCESSING(SSprocessing, src) + icon_state = "primitive_belt_off" + +/obj/item/bluespace_belt/primitive/fat_hide(var/mob/living/carbon/user) + var/weight_to_hide = 0 + if(preferences.helplessness_belts) + var/belts_pref = user?.client?.prefs.helplessness_belts + weight_to_hide = min(belts_pref, user.fatness_real - 1) + else + weight_to_hide = min(FATNESS_LEVEL_BLOB*2, user.fatness_real - 1) + return -(weight_to_hide) + + +/obj/item/bluespace_belt/primitive/equipped(mob/U, slot) + ..() + if(!iscarbon(U)) + user = null + return + + user = U + if(slot == ITEM_SLOT_BELT && !cell) + equipped = TRUE + to_chat(user, "You put the belt around your waist, but it seems that the battery is missing!") + deactivate() + else if(slot == ITEM_SLOT_BELT && !cell.charge) + equipped = TRUE + to_chat(user, "You put the belt around your waist, but it seems that the battery is dead!") + deactivate() + else if(slot == ITEM_SLOT_BELT && cell.charge) + equipped = TRUE + to_chat(user, "You put the belt around your waist and your mass begins to shrink...") + activate() + else + if(equipped) + equipped = FALSE + to_chat(user, "The belt is opened, letting your mass flow out!") + user.hider_remove(src) + // user = null + +/obj/item/bluespace_belt/primitive/attackby(obj/item/W, mob/person) + if (istype(W, /obj/item/stock_parts/cell)) + if(!person.transferItemToLoc(W, src)) + return + if (!cell) + to_chat(person, "You put the cell into the belt") + else + to_chat(person, "You swiftly replace the cell in the belt") + person.put_in_hands(cell) + cell = W + + // if (cell.charge) + // icon_state = "primitive_belt" + // else + // icon_state = "primitive_belt_off" + + // START_PROCESSING(SSprocessing, src) + + // if(cell.charge) + // if(equipped) + // to_chat(person, "Your mass begins to shrink as the belt is powered again...") + // user = person + // activate() + + + + if (equipped && cell.charge) + to_chat(person, "Your mass begins to shrink as the belt is powered again...") + user = person + + // // user.hider_add(src) + activate() + + + +/obj/item/bluespace_belt/primitive/attack_self(mob/person) + if (!cell) + return + + // if(!isnull(user)) + // user.hider_remove(src) + + to_chat(person, "You take the cell out of the belt, letting your mass flow out!") + person.put_in_hands(cell) + cell = null + deactivate() + // user = null + +/obj/item/bluespace_belt/primitive/AltClick(mob/person) + . = ..() + + if (!cell) + return + + // if(!isnull(user)) + // user.hider_remove(src) + + to_chat(person, "You take the cell out of the belt, letting your mass flow out!") + // icon_state = "primitive_belt_off" + // user = null + person.put_in_hands(cell) + cell = null + // STOP_PROCESSING(SSprocessing, src) + deactivate() + + +/obj/item/bluespace_belt/primitive/dropped(mob/person) + ..() + user = null + +/obj/item/bluespace_belt/primitive/process() + if(isnull(user)) + return + + if (!cell) + return + + if (!cell.charge) + // icon_state = "primitive_belt_off" + // user.hider_remove(src) + to_chat(user, "The belt beeps as it's battery runs out, and your mass starts flowing out!") + // user = null + // STOP_PROCESSING(SSprocessing, src) + deactivate() + return + + + var/power_drain = clamp(user.fatness_real / fatness_to_power_coefficient, 0, maximum_power_drain) + power_drain = min(power_drain, cell.charge) + cell.use(power_drain) + cell.update_icon() \ No newline at end of file diff --git a/GainStation13/icons/misc/language.dmi b/GainStation13/icons/misc/language.dmi new file mode 100644 index 0000000000..87e6f8e4a9 Binary files /dev/null and b/GainStation13/icons/misc/language.dmi differ diff --git a/GainStation13/icons/mob/markings/mam_ears.dmi b/GainStation13/icons/mob/markings/mam_ears.dmi index 840c5da152..b7b7f86eab 100644 Binary files a/GainStation13/icons/mob/markings/mam_ears.dmi and b/GainStation13/icons/mob/markings/mam_ears.dmi differ diff --git a/GainStation13/icons/mob/markings/mam_taur.dmi b/GainStation13/icons/mob/markings/mam_taur.dmi index 736e047fb8..7f42ff7d16 100644 Binary files a/GainStation13/icons/mob/markings/mam_taur.dmi and b/GainStation13/icons/mob/markings/mam_taur.dmi differ diff --git a/GainStation13/icons/obj/clothing/bluespace_belt.dmi b/GainStation13/icons/obj/clothing/bluespace_belt.dmi index 19c6fa6bdb..761e586a9d 100644 Binary files a/GainStation13/icons/obj/clothing/bluespace_belt.dmi and b/GainStation13/icons/obj/clothing/bluespace_belt.dmi differ diff --git a/GainStation13/icons/obj/crates.dmi b/GainStation13/icons/obj/crates.dmi new file mode 100644 index 0000000000..13703aa19b Binary files /dev/null and b/GainStation13/icons/obj/crates.dmi differ diff --git a/GainStation13/icons/obj/food/metal_food.dmi b/GainStation13/icons/obj/food/metal_food.dmi new file mode 100644 index 0000000000..73de0ffaee Binary files /dev/null and b/GainStation13/icons/obj/food/metal_food.dmi differ diff --git a/GainStation13/icons/obj/genitals/taur_belly/taur_belly_drake.dmi b/GainStation13/icons/obj/genitals/taur_belly/taur_belly_drake.dmi new file mode 100644 index 0000000000..e3cf3151fb Binary files /dev/null and b/GainStation13/icons/obj/genitals/taur_belly/taur_belly_drake.dmi differ diff --git a/GainStation13/icons/obj/hydroponics/harvest.dmi b/GainStation13/icons/obj/hydroponics/harvest.dmi index c8e3d4d042..c2e4af3a06 100644 Binary files a/GainStation13/icons/obj/hydroponics/harvest.dmi and b/GainStation13/icons/obj/hydroponics/harvest.dmi differ diff --git a/GainStation13/icons/obj/plushes.dmi b/GainStation13/icons/obj/plushes.dmi index 303f0712bf..315871aaa3 100644 Binary files a/GainStation13/icons/obj/plushes.dmi and b/GainStation13/icons/obj/plushes.dmi differ diff --git a/GainStation13/icons/obj/smooth_structures/gmushroom_table.dmi b/GainStation13/icons/obj/smooth_structures/gmushroom_table.dmi new file mode 100644 index 0000000000..42feccf233 Binary files /dev/null and b/GainStation13/icons/obj/smooth_structures/gmushroom_table.dmi differ diff --git a/GainStation13/icons/obj/smooth_structures/gmushroompoker_table.dmi b/GainStation13/icons/obj/smooth_structures/gmushroompoker_table.dmi new file mode 100644 index 0000000000..b5e396e30d Binary files /dev/null and b/GainStation13/icons/obj/smooth_structures/gmushroompoker_table.dmi differ diff --git a/GainStation13/icons/obj/smooth_structures/plaswood_table.dmi b/GainStation13/icons/obj/smooth_structures/plaswood_table.dmi new file mode 100644 index 0000000000..4710cea48c Binary files /dev/null and b/GainStation13/icons/obj/smooth_structures/plaswood_table.dmi differ diff --git a/GainStation13/icons/obj/smooth_structures/plaswoodpoker_table.dmi b/GainStation13/icons/obj/smooth_structures/plaswoodpoker_table.dmi new file mode 100644 index 0000000000..85bdbcbc79 Binary files /dev/null and b/GainStation13/icons/obj/smooth_structures/plaswoodpoker_table.dmi differ diff --git a/GainStation13/icons/obj/smooth_structures/shadoww_table.dmi b/GainStation13/icons/obj/smooth_structures/shadoww_table.dmi new file mode 100644 index 0000000000..2d62fe8f9a Binary files /dev/null and b/GainStation13/icons/obj/smooth_structures/shadoww_table.dmi differ diff --git a/GainStation13/icons/obj/smooth_structures/shadowwpoker_table.dmi b/GainStation13/icons/obj/smooth_structures/shadowwpoker_table.dmi new file mode 100644 index 0000000000..1903c23c02 Binary files /dev/null and b/GainStation13/icons/obj/smooth_structures/shadowwpoker_table.dmi differ diff --git a/GainStation13/icons/obj/stationobjs.dmi b/GainStation13/icons/obj/stationobjs.dmi new file mode 100644 index 0000000000..e4314307e8 Binary files /dev/null and b/GainStation13/icons/obj/stationobjs.dmi differ diff --git a/GainStation13/icons/obj/structure/flora.dm b/GainStation13/icons/obj/structure/flora.dm index f2248f4d6b..64dc8dedd0 100644 --- a/GainStation13/icons/obj/structure/flora.dm +++ b/GainStation13/icons/obj/structure/flora.dm @@ -39,7 +39,7 @@ user.visible_message("[user] fells [src] with the [W].","You fell [src] with the [W].", "You hear the sound of a tree falling.") playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 100 , 0, 0) for(var/i=1 to log_amount) - new /obj/item/grown/log(get_turf(src)) + new /obj/item/grown/log/gmushroom(get_turf(src)) var/obj/structure/gmushroom/gmushroomstump/S = new(loc) S.name = "[name] stump" @@ -91,7 +91,7 @@ user.visible_message("[user] fells [src] with the [W].","You fell [src] with the [W].", "You hear the sound of a tree falling.") playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 100 , 0, 0) for(var/i=1 to log_amount) - new /obj/item/grown/log(get_turf(src)) + new /obj/item/grown/log/shadowtree(get_turf(src)) var/obj/structure/shadowtree/shadowtreestump/S = new(loc) S.name = "[name] stump" @@ -142,7 +142,7 @@ user.visible_message("[user] fells [src] with the [W].","You fell [src] with the [W].", "You hear the sound of a tree falling.") playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 100 , 0, 0) for(var/i=1 to log_amount) - new /obj/item/grown/log(get_turf(src)) + new /obj/item/grown/log/plasmatree(get_turf(src)) var/obj/structure/plasmatree/plasmatreestump/S = new(loc) S.name = "[name] stump" diff --git a/GainStation13/icons/obj/structures.dmi b/GainStation13/icons/obj/structures.dmi new file mode 100644 index 0000000000..61f8e7aec5 Binary files /dev/null and b/GainStation13/icons/obj/structures.dmi differ diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index ce834d885a..69ce4c2686 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -233,7 +233,6 @@ "eA" = (/obj/machinery/power/apc/highcap/five_k{dir = 2; name = "Laundry APC"; pixel_y = -24},/obj/structure/cable,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/workroom) "eB" = (/obj/machinery/light,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/workroom) "eC" = (/obj/structure/closet/crate,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/workroom) -"eD" = (/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "eE" = (/obj/structure/closet/crate,/obj/item/bedsheet/patriot,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/workroom) "eF" = (/obj/structure/closet/crate,/obj/item/card/id/away/hotel,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/workroom) "eG" = (/turf/closed/wall,/area/ruin/space/has_grav/hotel/dock) @@ -351,7 +350,6 @@ "gP" = (/obj/structure/table/wood,/turf/open/floor/plasteel/grimy,/area/ruin/space/has_grav/hotel/dock) "gQ" = (/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/dock) "gR" = (/obj/structure/musician/piano,/turf/open/floor/plasteel/grimy,/area/ruin/space/has_grav/hotel/bar) -"gS" = (/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "gT" = (/obj/machinery/light{dir = 8},/obj/item/reagent_containers/food/condiment/milk,/obj/item/reagent_containers/food/condiment/milk,/obj/item/reagent_containers/food/condiment/milk,/obj/structure/closet/secure_closet/freezer/fridge{req_access_txt = "200"},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) "gU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) "gV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) @@ -375,7 +373,6 @@ "hn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) "ho" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/bar) "hp" = (/obj/machinery/light{dir = 4},/turf/open/floor/carpet,/area/ruin/space/has_grav/hotel) -"hr" = (/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "hs" = (/obj/structure/table/wood,/turf/open/floor/carpet,/area/ruin/space/has_grav/hotel/dock) "ht" = (/obj/structure/table,/obj/item/storage/box/monkeycubes,/obj/item/storage/box/monkeycubes,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/bar) "hu" = (/obj/structure/closet/crate/freezer,/obj/item/reagent_containers/food/snacks/meat/slab/bear,/obj/item/reagent_containers/food/snacks/meat/slab/bear,/obj/item/reagent_containers/food/snacks/meat/slab/corgi,/obj/item/reagent_containers/food/snacks/meat/slab/corgi,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/pug,/obj/item/reagent_containers/food/snacks/meat/slab/pug,/obj/item/reagent_containers/food/snacks/meat/slab/xeno,/obj/item/reagent_containers/food/snacks/meat/slab/xeno,/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard,/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant,/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/bar) @@ -408,7 +405,6 @@ "hV" = (/obj/structure/table/wood,/obj/item/instrument/violin,/turf/open/floor/plasteel/grimy,/area/ruin/space/has_grav/hotel/bar) "hW" = (/obj/structure/chair/stool,/turf/open/floor/plasteel/grimy,/area/ruin/space/has_grav/hotel/bar) "hX" = (/obj/structure/flora/ausbushes/brflowers,/obj/structure/flora/ausbushes/ywflowers,/obj/machinery/light,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) -"hY" = (/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "hZ" = (/obj/structure/closet/chefcloset,/obj/machinery/light{dir = 1; pixel_y = 16},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) "ia" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/closed/wall,/area/ruin/space/has_grav/hotel) "ib" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/closed/wall,/area/ruin/space/has_grav/hotel/power) @@ -572,8 +568,7 @@ "lf" = (/obj/effect/turf_decal/stripes/line{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/security) "lg" = (/obj/structure/bed,/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/security) "lh" = (/turf/open/floor/plasteel/white/side{dir = 8},/area/ruin/space/has_grav/hotel/pool) -"li" = (/obj/effect/light_emitter,/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) -"lj" = (/obj/machinery/pool/filter{pixel_y = 15},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) +"lj" = (/obj/machinery/pool/filter{pixel_y = 15},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "lk" = (/obj/structure/window/reinforced/fulltile,/turf/open/floor/carpet,/area/ruin/space/has_grav/hotel/dock) "ll" = (/obj/structure/table,/obj/item/card/id/away/hotel,/obj/item/card/id/away/hotel,/obj/item/card/id/away/hotel,/obj/item/card/id/away/hotel,/obj/item/card/id/away/hotel,/obj/item/card/id/away/hotel,/obj/item/crowbar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/workroom) "lm" = (/obj/machinery/shower{dir = 4},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals9"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/pool) @@ -583,7 +578,6 @@ "lq" = (/obj/machinery/light/small,/obj/machinery/atmospherics/components/unary/tank/air{dir = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/power) "lr" = (/obj/structure/table,/obj/item/restraints/handcuffs,/obj/item/restraints/handcuffs,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/security) "ls" = (/obj/structure/chair{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/security) -"lt" = (/obj/effect/light_emitter,/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "drain"; name = "drain"},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "lu" = (/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/pool) "lv" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 2},/turf/open/floor/plating/airless,/area/ruin/unpowered/no_grav) "lw" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/security) @@ -639,7 +633,7 @@ "mu" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/custodial) "mv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/custodial) "mw" = (/obj/structure/cable{icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/custodial) -"mx" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/structure/pool/Lboard,/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) +"mx" = (/obj/structure/pool/Lboard,/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "my" = (/obj/structure/cable{icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/open/floor/plating,/area/ruin/space/has_grav/hotel) "mz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/hotel) "mA" = (/obj/machinery/door/airlock/public/glass{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/carpet,/area/ruin/space/has_grav/hotel/dock) @@ -678,7 +672,7 @@ "nj" = (/obj/effect/turf_decal/tile/purple{dir = 4},/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/floor/plasteel/yellowsiding{dir = 1},/area/ruin/space/has_grav/hotel/pool) "nk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "nl" = (/obj/item/toy/beach_ball,/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) -"nm" = (/obj/structure/pool/ladder{dir = 1; pixel_y = -24},/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "drain"; name = "drain"},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) +"nm" = (/obj/structure/pool/ladder{dir = 1; pixel_y = -24},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "nn" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/purple,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "no" = (/obj/machinery/door/airlock{dir = 4; name = "Men's Changing"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/obj/structure/curtain,/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/pool) "np" = (/obj/structure/table,/obj/item/reagent_containers/rag/towel{pixel_x = 4; pixel_y = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/pool) @@ -708,10 +702,8 @@ "nO" = (/obj/machinery/light/floor{name = "ceiling light"},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "oJ" = (/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "drain"; name = "drain"},/obj/machinery/vending/gato,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "oK" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/bar) -"pd" = (/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "pi" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel/yellowsiding,/area/ruin/space/has_grav/hotel/pool) "pq" = (/obj/structure/flora/ausbushes/ppflowers,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel) -"pD" = (/obj/effect/turf_decal/tile/purple,/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "pV" = (/obj/structure/mirror{pixel_y = 32},/obj/structure/sink{pixel_y = 24},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_6) "qs" = (/obj/machinery/vending/autodrobe/all_access,/turf/open/floor/wood,/area/ruin/space/has_grav/hotel/dock) "qC" = (/obj/machinery/vending/clothing,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) @@ -720,15 +712,13 @@ "rs" = (/obj/machinery/light{dir = 1; pixel_y = 16},/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/ppflowers,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) "ru" = (/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/obj/machinery/teleport/hub,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/dock) "rP" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/structure/railing,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/hotel/bar) -"so" = (/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/floor/plasteel/yellowsiding/corner{dir = 1},/area/ruin/space/has_grav/hotel/pool) +"so" = (/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/light_emitter,/turf/open/floor/plasteel/yellowsiding/corner{dir = 1},/area/ruin/space/has_grav/hotel/pool) "sx" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/purple,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "sN" = (/obj/machinery/door/airlock/external/glass,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/power) -"te" = (/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "drain"; name = "drain"},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "tI" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) -"ux" = (/obj/machinery/light/floor,/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "vp" = (/obj/machinery/iv_drip/feeding_tube,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/bar) "vr" = (/obj/structure/flora/ausbushes/brflowers,/obj/structure/flora/ausbushes/lavendergrass,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) -"vL" = (/obj/structure/pool/ladder,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) +"vL" = (/obj/structure/pool/ladder,/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "we" = (/obj/structure/window{dir = 1; icon_state = "window"},/obj/structure/table/glass,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "ws" = (/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/lavendergrass,/obj/machinery/light{dir = 1; pixel_y = 16},/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) "ww" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/computer/teleporter,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/dock) @@ -740,28 +730,25 @@ "xX" = (/obj/structure/flora/ausbushes/lavendergrass,/obj/structure/flora/ausbushes/ppflowers,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) "yf" = (/obj/structure/window{dir = 1; icon_state = "window"},/obj/structure/table,/obj/machinery/chem_dispenser/drinks/fullupgrade,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "yB" = (/obj/structure/window{dir = 1; icon_state = "window"},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/purple,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) -"zl" = (/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "zm" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/bar) "zw" = (/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/wood,/area/ruin/space/has_grav/hotel/dock) "zL" = (/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 6; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/bar) -"zQ" = (/obj/effect/light_emitter,/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "zW" = (/obj/machinery/door/window/eastleft{dir = 1},/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_4) "Ah" = (/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/brflowers,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) "Ao" = (/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel/yellowsiding,/area/ruin/space/has_grav/hotel/pool) "Ay" = (/obj/structure/toilet{dir = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_4) "AE" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) "AI" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/machinery/jukebox,/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar) -"AM" = (/obj/structure/pool/ladder{dir = 2; pixel_y = 24},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) +"AM" = (/obj/structure/pool/ladder{dir = 2; pixel_y = 24},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "Bf" = (/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/ppflowers,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) "BN" = (/obj/machinery/vending/clothing,/turf/open/floor/wood,/area/ruin/space/has_grav/hotel) "BZ" = (/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel/yellowsiding{dir = 4},/area/ruin/space/has_grav/hotel/pool) "Ci" = (/obj/structure/rack/shelf,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/bar) -"Cn" = (/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "CO" = (/obj/structure/toilet{dir = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_5) "Dr" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "Dw" = (/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "drain"; name = "drain"},/obj/structure/rack/shelf,/obj/item/reagent_containers/rag/towel/random{pixel_y = -6},/obj/item/reagent_containers/rag/towel/random{pixel_y = -4},/obj/item/reagent_containers/rag/towel/random{pixel_y = -2},/obj/item/reagent_containers/rag/towel/random,/obj/item/reagent_containers/rag/towel/random{pixel_y = 2},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "DR" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/item/ashtray{pixel_y = -20},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/hotel/bar) -"Ek" = (/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/floor/plasteel/yellowsiding/corner{dir = 4},/area/ruin/space/has_grav/hotel/pool) +"Ek" = (/obj/effect/turf_decal/tile/purple{dir = 4},/obj/effect/light_emitter,/turf/open/floor/plasteel/yellowsiding/corner{dir = 4},/area/ruin/space/has_grav/hotel/pool) "Es" = (/obj/structure/toilet{dir = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_2) "EG" = (/obj/structure/window{dir = 1; icon_state = "window"},/obj/machinery/vending/mealdor,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "EY" = (/obj/structure/toilet{dir = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_6) @@ -780,25 +767,21 @@ "Jw" = (/obj/machinery/door/window/eastleft{dir = 1},/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_3) "Kh" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/structure/chair/wood{dir = 4},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/hotel/bar) "Ki" = (/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/yellowsiding{dir = 8},/area/ruin/space/has_grav/hotel/pool) -"Ko" = (/obj/machinery/pool/drain,/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) +"Ko" = (/obj/machinery/pool/drain,/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "KA" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/bar) "Lt" = (/obj/structure/pool/Rboard,/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/yellowsiding{dir = 8},/area/ruin/space/has_grav/hotel/pool) "LC" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/structure/railing,/obj/structure/chair/wood{dir = 8},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/hotel/bar) "LE" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/purple,/obj/structure/rack,/obj/item/toy/foamblade,/obj/item/toy/katana,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) -"LK" = (/obj/effect/light_emitter,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "Mc" = (/obj/structure/mirror{pixel_y = 32},/obj/structure/sink{pixel_y = 24},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_4) "My" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "MF" = (/obj/machinery/door/airlock/public{dir = 4; id_tag = "hotel_toilet1"; name = "Public Restroom"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/pool) "MQ" = (/obj/machinery/chem_master/condimaster{name = "CondiMaster Neo"},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) -"Nn" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "Nr" = (/obj/structure/table/wood,/obj/item/ashtray,/turf/open/floor/carpet,/area/ruin/space/has_grav/hotel/dock) "Oc" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/pool) -"Oj" = (/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "OE" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/structure/table/reinforced/brass,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/hotel/bar) -"ON" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/yellowsiding/corner{dir = 8},/area/ruin/space/has_grav/hotel/pool) +"ON" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/light_emitter,/turf/open/floor/plasteel/yellowsiding/corner{dir = 8},/area/ruin/space/has_grav/hotel/pool) "OS" = (/obj/machinery/food_cart,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/bar) "OU" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/security) -"Pn" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "PE" = (/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "drain"; name = "drain"},/obj/structure/rack/shelf,/obj/item/toy/beach_ball,/obj/item/toy/beach_ball{pixel_y = 5},/obj/item/toy/beach_ball{pixel_y = 10},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "Qa" = (/obj/machinery/door/window/eastleft{dir = 1},/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_2) "QI" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/structure/railing,/obj/item/ashtray,/obj/structure/table/reinforced/brass,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/hotel/bar) @@ -807,13 +790,10 @@ "Sb" = (/obj/machinery/vending/kink,/turf/open/floor/wood,/area/ruin/space/has_grav/hotel) "SO" = (/obj/structure/window,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "Tq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/vending/autodrobe/all_access,/turf/open/floor/wood,/area/ruin/space/has_grav/hotel/dock) -"Ts" = (/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "Tz" = (/obj/structure/rack/shelf,/obj/item/storage/box/beakers/bluespace,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/bar) -"TW" = (/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "Uc" = (/obj/structure/flora/ausbushes/lavendergrass,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) "Up" = (/obj/machinery/door/window/eastleft{dir = 1},/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_1) "Uq" = (/obj/structure/window,/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/purple,/obj/item/storage/firstaid/regular{pixel_x = -4},/obj/structure/rack,/obj/item/storage/firstaid/o2{pixel_x = 4},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) -"Ut" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "Ve" = (/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/bar) "Vh" = (/obj/structure/window,/obj/structure/table/glass,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "Vl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel/white/side{dir = 5},/area/ruin/space/has_grav/hotel/pool) @@ -825,8 +805,8 @@ "WJ" = (/obj/effect/turf_decal/loading_area{dir = 6; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/bar) "XD" = (/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/bar) "XP" = (/obj/structure/toilet{dir = 8},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 6; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/pool) -"Yx" = (/obj/effect/turf_decal/tile/purple,/turf/open/floor/plasteel/yellowsiding/corner,/area/ruin/space/has_grav/hotel/pool) -"Zb" = (/obj/structure/pool/ladder{dir = 8},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) +"Yx" = (/obj/effect/turf_decal/tile/purple,/obj/effect/light_emitter,/turf/open/floor/plasteel/yellowsiding/corner,/area/ruin/space/has_grav/hotel/pool) +"Zb" = (/obj/structure/pool/ladder{dir = 8},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "Zx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/vending/gato,/turf/open/floor/wood,/area/ruin/space/has_grav/hotel/dock) "ZE" = (/obj/structure/railing{dir = 8},/obj/structure/railing{dir = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/hotel) "ZS" = (/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/floor/plasteel/yellowsiding{dir = 4},/area/ruin/space/has_grav/hotel/pool) @@ -880,15 +860,15 @@ aaaaaaaaabaaajirjAjBiKjCjDjEjFjGjHjIjJjKjLjGjMjNjOjPckcQjQnvwsVXUcAhjTrsnvnfDrqC aaaaaaaaabacajkbkckdkekfiKiKkgjGkhkikjkkklkmknknknjPbLcQjQEGyfWHGkkokokokokUkUkUnkkUkokokokokowekpyBjQkFluluXPjQaaaaaaabaaaaaaaaaaaaaa aaaaaaaaabaaajirkqkrksktkukvkwjGkxkykzkAklkBknknkCjPawcQjQMykUkUlPnhnhnhnhnhnhnhninhnhnhnhnhrdkUkGnnMFlululuINjQaaaaaaabaaaaaaaaaaaaaa aaaaaaaaabaaajirkHkHkHkIkHkHkJjGkKkkkLkMkNkmkOkPknjPawcQjQMynzlPYxnynynynyAonyFhkRpikSkSkSkSONVlnAsxjQjQjQjQjQjQacacacabaaaaaaaaaaaaaa -aaaaaaaaabaaajirkVkWkXkYkZkHlajGlbkklcldkljGlelflgjPawcQjQbMjbfbZSLKljNnNnAMNnNnNnAMNnNnNnliKiVNjbnnjQlmlnlnlojQaaaaaaabaaaaaaaaaaaaaa -aaaaaaabaaaaajirlplplqlplpkHsNjGlrkklskkkljGjGjGjGjPedcQjQMynzlhZSUtIFIFIFIFIFnOIFIFnlIFIFPnKikDnznnjQlmlululojQaaaaabaaaaaaaaaaaaaaaa -aaaaabaalvaaajirkHkHkHkHkHkHajjGlwlxlxlylzjGjMjNlAjPawcQjQMyjbfbBZvLIFnOIFpDCnIFzlpdIFIFuxZbwCVNjbnnjQlmlululojQaaaaabaaaaaaaaaaaaaaaa -aaabaaaalBlClDlEaaaaaaaaaaaaajjGjGlFjGkxklkmknknknjPawcQjQMynzlhZSUtIFIFIFeDhYhYhYOjIFIFIFmxLtkDnzsxjQlGGAGAlIjQaaaaabaaaaaaaaaaaaaaaa -aaabacacacacaclJagagagagagagaljGlKlLjGkxklkBknknkCjPawcQjQbMjbfbZSUtIFIFIFhYzlKoCnhYIFIFIFPnKiVNjRnnnolHlHlHlHjQacacabaaaaaaaaaaaaaaaa -aaabaaaaaaaaaaajaaaaaaaaaaaaaajGlNlOjGkxklkmkOkPknjPawcQjQMynzlhZSUtIFIFIFhYTWIFgShYIFIFIFmxLtkDnznnjQnplHlHlRjQaaaaabaaaaaaaaaaaaaaaa -abaaaaaaaaaaaaajaaaaaaaaaaaaaajGnqlTjGOUlUjGlelflgjPcIfejQMyjbfbBZvLIFnOIFTshYhYhYhrIFIFuxZbwCVNjbnnjQjQjQjQjQjQaaaaabaaaaaaaaaaaaaaaa -abaclVlWlWlWlWlXlYlYlYlYlZacacjGjGjGjGjGjGjGjGjGjGjPcQmajQMynzlhZSUtIFIFIFIFIFnOIFIFIFIFIFPnKikDnzsxjQmbmcmclRjQaaaaabaaaaaaaaaaaaaaaa -abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmemfmgmhmimjmkmlmmcQckjQbMjbfbZSzQtetetenmtetetenmteteteltKiVNjRnnnslHlHlHlHjQaaaaabaaaaaaaaaaaaaaaa +aaaaaaaaabaaajirkVkWkXkYkZkHlajGlbkklcldkljGlelflgjPawcQjQbMjbfbZSIFljIFIFAMIFIFIFAMIFIFIFIFKiVNjbnnjQlmlnlnlojQaaaaaaabaaaaaaaaaaaaaa +aaaaaaabaaaaajirlplplqlplpkHsNjGlrkklskkkljGjGjGjGjPedcQjQMynzlhZSIFIFIFIFIFIFIFIFIFnlIFIFIFKikDnznnjQlmlululojQaaaaabaaaaaaaaaaaaaaaa +aaaaabaalvaaajirkHkHkHkHkHkHajjGlwlxlxlylzjGjMjNlAjPawcQjQMyjbfbBZvLIFnOIFIFIFnOIFIFIFnOIFZbwCVNjbnnjQlmlululojQaaaaabaaaaaaaaaaaaaaaa +aaabaaaalBlClDlEaaaaaaaaaaaaajjGjGlFjGkxklkmknknknjPawcQjQMynzlhZSIFIFIFIFIFIFIFIFIFIFIFIFmxLtkDnzsxjQlGGAGAlIjQaaaaabaaaaaaaaaaaaaaaa +aaabacacacacaclJagagagagagagaljGlKlLjGkxklkBknknkCjPawcQjQbMjbfbZSIFIFIFIFIFIFKoIFIFIFIFIFIFKiVNjRnnnolHlHlHlHjQacacabaaaaaaaaaaaaaaaa +aaabaaaaaaaaaaajaaaaaaaaaaaaaajGlNlOjGkxklkmkOkPknjPawcQjQMynzlhZSIFIFIFIFIFIFIFIFIFIFIFIFmxLtkDnznnjQnplHlHlRjQaaaaabaaaaaaaaaaaaaaaa +abaaaaaaaaaaaaajaaaaaaaaaaaaaajGnqlTjGOUlUjGlelflgjPcIfejQMyjbfbBZvLIFnOIFIFIFnOIFIFIFnOIFZbwCVNjbnnjQjQjQjQjQjQaaaaabaaaaaaaaaaaaaaaa +abaclVlWlWlWlWlXlYlYlYlYlZacacjGjGjGjGjGjGjGjGjGjGjPcQmajQMynzlhZSIFIFIFIFIFIFIFIFIFIFIFIFIFKikDnzsxjQmbmcmclRjQaaaaabaaaaaaaaaaaaaaaa +abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmemfmgmhmimjmkmlmmcQckjQbMjbfbZSIFIFIFIFnmIFIFIFIFIFIFIFIFKiVNjRnnnslHlHlHlHjQaaaaabaaaaaaaaaaaaaaaa abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmlmlmlmlmompmpmpmqhfcvjtmrnzwBEknjnjnjnjIQnjnjnjIQnjnjnjnjsonxkUnnjQmsOcOcmtjQaaaaabaaaaaaaaaaaaaaaa abaclVlWlWlWlWlXlYlYlYlYlZacacacmdmlmlmlmumvmvmvmwntmymznMmBkTkUwBjSjSjSjSjSjSjSjSjSjSjSjSjSnxkUkULEjQlmlululojQacacabaaaaaaaaaaaaaaaa abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmlmEmFmGmHmImlmJmdawedjQSOkQkQVhkQkQkUkUkUkQkQkQkUkUkUkQkQVhkQkQUqjQlmlululojQaaaaabaaaaaaaaaaaaaaaa diff --git a/_maps/RandomZLevels/VR/murderdome.dmm b/_maps/RandomZLevels/VR/murderdome.dmm index 5b5cbbfcfe..97e808b11f 100644 --- a/_maps/RandomZLevels/VR/murderdome.dmm +++ b/_maps/RandomZLevels/VR/murderdome.dmm @@ -236,6 +236,34 @@ initial_gas_mix = "TEMP=2.7" }, /area/awaymission/vr/murderdome) +"J" = ( +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/obj/item/firing_pin, +/turf/open/indestructible, +/area/awaymission/vr/murderdome) +"M" = ( +/obj/effect/landmark/vr_spawn/syndicate, +/turf/open/indestructible, +/area/awaymission/vr/murderdome) "R" = ( /obj/effect/spawner/structure/window/reinforced/indestructable, /turf/open/indestructible, @@ -454,7 +482,7 @@ j j j j -m +M j D b @@ -506,7 +534,7 @@ j b f q -n +J j E b @@ -766,7 +794,7 @@ j j j j -m +M j D b @@ -818,7 +846,7 @@ j b f q -n +J j E b @@ -1078,7 +1106,7 @@ j j j j -m +M j D b @@ -1130,7 +1158,7 @@ j b f q -n +J j E b @@ -1390,7 +1418,7 @@ j j j j -m +M j D b @@ -1442,7 +1470,7 @@ j b f q -n +J j E b @@ -1702,7 +1730,7 @@ j j j j -m +M j D b @@ -1754,7 +1782,7 @@ j b f q -n +J j E b @@ -2014,7 +2042,7 @@ j j j j -m +M j D b @@ -2066,7 +2094,7 @@ j b f q -n +J j E b @@ -2326,7 +2354,7 @@ j j j j -m +M j D b @@ -2378,7 +2406,7 @@ j b f q -n +J j E b @@ -2638,7 +2666,7 @@ j j j j -m +M j D b @@ -2690,7 +2718,7 @@ j b f q -n +J j E b diff --git a/_maps/RandomZLevels/VR/syndicate_trainer.dmm b/_maps/RandomZLevels/VR/syndicate_trainer.dmm index a939b8424e..65b2f1fb7a 100644 --- a/_maps/RandomZLevels/VR/syndicate_trainer.dmm +++ b/_maps/RandomZLevels/VR/syndicate_trainer.dmm @@ -23,25 +23,25 @@ /area/awaymission/centcomAway/cafe) "al" = ( /obj/machinery/vending/dinnerware, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "am" = ( /obj/structure/closet/chefcloset, -/turf/open/indestructible, +/turf/open/floor/plasteel/cafeteria, /area/awaymission/centcomAway/cafe) "ao" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, -/turf/open/indestructible, +/turf/open/floor/plasteel/cafeteria, /area/awaymission/centcomAway/cafe) "ap" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "aq" = ( /obj/structure/table, /obj/machinery/reagentgrinder, -/turf/open/indestructible, +/turf/open/floor/plasteel/cafeteria, /area/awaymission/centcomAway/cafe) "ar" = ( /obj/structure/table, @@ -50,23 +50,23 @@ pixel_y = 3 }, /obj/item/kitchen/rollingpin, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "as" = ( /obj/structure/table, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/food/condiment/enzyme, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "at" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ dir = 1 }, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "au" = ( /obj/machinery/hydroponics, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "av" = ( /obj/item/reagent_containers/glass/bucket, @@ -75,21 +75,21 @@ "ay" = ( /obj/structure/table, /obj/item/kitchen/knife/butcher, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "az" = ( /obj/structure/disposalpipe/segment, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/cafe) "aA" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/turf/open/indestructible, +/turf/open/floor/plasteel/cafeteria, /area/awaymission/centcomAway/cafe) "aB" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle{ dir = 4 }, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "aE" = ( /obj/machinery/portable_atmospherics/canister/air, @@ -97,30 +97,28 @@ /area/awaymission/centcomAway/maint) "aF" = ( /obj/structure/table, -/turf/open/indestructible, +/turf/open/floor/mineral/basaltstone_floor, /area/awaymission/centcomAway/cafe) "aG" = ( /obj/effect/landmark/vr_spawn/syndicate, -/turf/open/indestructible, +/turf/open/floor/mineral/basaltstone_floor, /area/awaymission/centcomAway/cafe) "aH" = ( /obj/structure/closet/secure_closet/personal, -/turf/open/indestructible, +/turf/open/floor/mineral/basaltstone_floor, /area/awaymission/centcomAway/cafe) "aI" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/turf/open/indestructible, +/obj/structure/chair/stool/bar, +/turf/open/floor/carpet/red, /area/awaymission/centcomAway/cafe) "aK" = ( /obj/effect/spawner/structure/window/hollow/reinforced, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "aL" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/shaker, -/turf/open/indestructible, +/turf/open/floor/plasteel/cafeteria, /area/awaymission/centcomAway/cafe) "aM" = ( /obj/structure/table, @@ -128,7 +126,7 @@ pixel_x = -3; pixel_y = 6 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "aP" = ( /obj/machinery/portable_atmospherics/pump, @@ -137,7 +135,7 @@ "aQ" = ( /obj/structure/bed, /obj/item/bedsheet, -/turf/open/indestructible, +/turf/open/floor/mineral/basaltstone_floor, /area/awaymission/centcomAway/cafe) "aR" = ( /obj/machinery/door/airlock/maintenance, @@ -155,18 +153,18 @@ /area/awaymission/centcomAway/cafe) "aY" = ( /obj/structure/sink, -/turf/open/indestructible, +/turf/open/floor/plasteel/cafeteria, /area/awaymission/centcomAway/cafe) "aZ" = ( /obj/structure/table, /obj/machinery/processor{ pixel_y = 10 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/cafeteria, /area/awaymission/centcomAway/cafe) "ba" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/cafe) "bb" = ( /obj/item/radio, @@ -176,7 +174,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "bd" = ( /turf/open/indestructible, @@ -189,7 +187,7 @@ /obj/structure/table, /obj/item/reagent_containers/food/condiment/peppermill, /obj/item/reagent_containers/food/condiment/saltshaker, -/turf/open/indestructible, +/turf/open/floor/plasteel/cafeteria, /area/awaymission/centcomAway/cafe) "bh" = ( /obj/structure/chair{ @@ -236,7 +234,7 @@ /turf/open/indestructible, /area/awaymission/centcomAway/hangar) "bs" = ( -/obj/structure/closet/crate, +/obj/structure/barricade/sandbags, /turf/open/indestructible, /area/awaymission/centcomAway/hangar) "bt" = ( @@ -245,22 +243,22 @@ /area/awaymission/centcomAway/cafe) "bu" = ( /obj/structure/closet/secure_closet/freezer/meat, -/turf/open/indestructible, +/turf/open/floor/plasteel/showroomfloor, /area/awaymission/centcomAway/cafe) "bw" = ( /obj/machinery/chem_master/condimaster{ name = "CondiMaster Neo" }, -/turf/open/indestructible, +/turf/open/floor/plasteel/showroomfloor, /area/awaymission/centcomAway/cafe) "bx" = ( /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "bz" = ( /obj/structure/closet/secure_closet/hydroponics, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "bA" = ( /obj/structure/rack, @@ -277,29 +275,32 @@ /obj/structure/shuttle/engine/heater{ dir = 1 }, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "bF" = ( /obj/machinery/door/airlock/external{ name = "Salvage Shuttle Dock" }, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "bJ" = ( -/obj/structure/chair/comfy/brown, -/turf/open/indestructible, +/obj/effect/landmark/vr_spawn/syndicate, +/turf/open/floor/plasteel/cafeteria, /area/awaymission/centcomAway/cafe) "bK" = ( -/obj/structure/reagent_dispensers/beerkeg, -/turf/open/indestructible, +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ + dir = 1 + }, +/turf/open/floor/wood, /area/awaymission/centcomAway/cafe) "bL" = ( /obj/structure/kitchenspike, -/turf/open/indestructible, +/turf/open/floor/plasteel/showroomfloor, /area/awaymission/centcomAway/cafe) "bM" = ( /obj/machinery/gibber, -/turf/open/indestructible, +/turf/open/floor/plasteel/showroomfloor, /area/awaymission/centcomAway/cafe) "bN" = ( /obj/machinery/autolathe, @@ -308,11 +309,12 @@ "bQ" = ( /obj/structure/table, /obj/item/clothing/glasses/welding, -/turf/open/indestructible, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "bU" = ( /obj/structure/closet/emcloset, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "bV" = ( /turf/open/floor/mineral/titanium, @@ -324,7 +326,7 @@ pixel_y = 4 }, /obj/item/storage/firstaid/toxin, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "bX" = ( /obj/structure/table, @@ -333,7 +335,7 @@ pixel_x = -2; pixel_y = 4 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "bY" = ( /obj/structure/table, @@ -344,16 +346,16 @@ pixel_x = -2; pixel_y = 4 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "cb" = ( -/obj/item/paper_bin, -/obj/structure/table, +/obj/structure/chair/wood{ + dir = 4 + }, /turf/open/indestructible, /area/awaymission/centcomAway/cafe) "cc" = ( -/obj/item/clipboard, -/obj/structure/table, +/obj/effect/landmark/vr_spawn/syndicate, /turf/open/indestructible, /area/awaymission/centcomAway/cafe) "cd" = ( @@ -363,8 +365,18 @@ "ce" = ( /obj/effect/spawner/structure/window/hollow/reinforced, /obj/structure/disposalpipe/segment, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/cafe) +"cf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) "cg" = ( /obj/structure/sign/departments/botany, /turf/closed/indestructible/riveted, @@ -374,7 +386,7 @@ /obj/item/reagent_containers/spray/plantbgone{ pixel_y = 3 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "cj" = ( /obj/machinery/door/airlock/external, @@ -392,11 +404,10 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/awaymission/centcomAway/hangar) "cn" = ( -/turf/open/floor/mineral/titanium/blue, +/turf/closed/indestructible/fakeglass, /area/awaymission/centcomAway/hangar) "co" = ( -/obj/item/pen, -/obj/structure/table, +/obj/effect/spawner/structure/window/hollow/reinforced, /turf/open/indestructible, /area/awaymission/centcomAway/cafe) "cq" = ( @@ -417,7 +428,7 @@ /area/awaymission/centcomAway/maint) "cx" = ( /obj/machinery/door/airlock/maintenance, -/turf/open/floor/mineral/titanium, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "cB" = ( /obj/machinery/door/window/westleft, @@ -425,59 +436,59 @@ /area/awaymission/centcomAway/cafe) "cE" = ( /obj/machinery/seed_extractor, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "cF" = ( /obj/machinery/vending/hydroseeds{ slogan_delay = 700 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "cG" = ( /obj/machinery/vending/hydronutrients, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "cH" = ( /obj/machinery/biogenerator, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "cJ" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, -/turf/open/floor/mineral/titanium/yellow, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "cK" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, -/turf/open/floor/mineral/titanium/yellow, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "cL" = ( /obj/structure/table/reinforced, /obj/item/pen, -/turf/open/floor/mineral/titanium/yellow, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "cM" = ( /obj/structure/table/reinforced, -/turf/open/floor/mineral/titanium/yellow, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "cN" = ( /obj/machinery/sleeper{ dir = 8 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium, /area/awaymission/centcomAway/hangar) "cO" = ( /obj/machinery/sleep_console{ - dir = 8; - icon_state = "console" - }, -/turf/open/floor/mineral/titanium/blue, -/area/awaymission/centcomAway/hangar) -"cP" = ( -/obj/structure/chair{ + icon_state = "console"; dir = 8 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium, +/area/awaymission/centcomAway/hangar) +"cP" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "cS" = ( /obj/structure/disposalpipe/segment{ @@ -494,39 +505,36 @@ /obj/machinery/modular_computer/console{ dir = 4 }, -/turf/open/floor/mineral/titanium/yellow, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "cV" = ( -/obj/structure/chair{ - dir = 1 - }, -/turf/open/floor/mineral/titanium/yellow, +/turf/open/floor/mineral/titanium/old/white, /area/awaymission/centcomAway/hangar) "cW" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/mineral/titanium/yellow, -/area/awaymission/centcomAway/hangar) +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/general) "cX" = ( /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/stamp, -/turf/open/floor/mineral/titanium/yellow, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "da" = ( /obj/structure/table, /obj/item/assembly/flash/handheld, -/turf/open/floor/mineral/titanium/yellow, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "db" = ( -/turf/open/floor/mineral/titanium/yellow, -/area/awaymission/centcomAway/hangar) +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/courtroom) "dc" = ( /obj/structure/chair{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "dd" = ( /obj/structure/reagent_dispensers/fueltank, @@ -535,7 +543,7 @@ "dl" = ( /obj/structure/table, /obj/item/storage/box/handcuffs, -/turf/open/floor/mineral/titanium/yellow, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "dm" = ( /obj/machinery/door/window/northright{ @@ -545,31 +553,31 @@ name = "Security Desk"; req_access_txt = "103" }, -/turf/open/floor/mineral/titanium/yellow, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "dn" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "do" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "dp" = ( /obj/structure/closet/crate/large, /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "dq" = ( /obj/structure/dresser, -/turf/open/indestructible, +/turf/open/floor/mineral/basaltstone_floor, /area/awaymission/centcomAway/cafe) "dr" = ( /obj/structure/table/reinforced, @@ -581,14 +589,14 @@ dir = 1 }, /obj/machinery/disposal/bin, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "dv" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "dw" = ( /obj/structure/tank_dispenser, @@ -599,63 +607,61 @@ /turf/open/indestructible, /area/awaymission/centcomAway/maint) "dz" = ( -/obj/structure/bed, -/turf/open/floor/mineral/titanium/blue, -/area/awaymission/centcomAway/hangar) +/obj/structure/chair, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/thunderdome) "dA" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end, /obj/structure/window/reinforced{ dir = 1 }, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "dB" = ( /obj/structure/ore_box, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "dC" = ( -/obj/structure/table, -/obj/item/storage/fancy/donut_box, -/turf/open/indestructible, -/area/awaymission/centcomAway/cafe) +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/courtroom) "dE" = ( /obj/structure/sink/kitchen{ pixel_y = 28 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/cafeteria, /area/awaymission/centcomAway/cafe) "dG" = ( /obj/structure/bed, -/turf/open/floor/mineral/titanium, +/turf/open/floor/mineral/titanium/old/white, /area/awaymission/centcomAway/hangar) "dL" = ( /obj/machinery/door/airlock/hatch{ name = "Rest Room" }, -/turf/open/floor/mineral/titanium, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "dM" = ( /obj/structure/closet/crate/large, /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "dN" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "dO" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "dQ" = ( /obj/machinery/door/airlock/maintenance, @@ -668,17 +674,17 @@ "dZ" = ( /obj/structure/table, /obj/structure/bedsheetbin, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "ea" = ( /obj/structure/table, /obj/item/hand_labeler, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "eb" = ( /obj/structure/table, /obj/item/storage/box/donkpockets, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "ec" = ( /obj/structure/flora/ausbushes, @@ -692,8 +698,14 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) +"ep" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/indestructible, +/area/awaymission/centcomAway/general) "et" = ( /obj/machinery/door/airlock/hatch{ name = "Cockpit"; @@ -706,33 +718,29 @@ /area/awaymission/centcomAway/general) "ew" = ( /obj/machinery/space_heater, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/maint) "ex" = ( /obj/structure/closet/emcloset, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/maint) "ey" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 4 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/maint) "ez" = ( /obj/structure/table, /obj/item/radio/off, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "eA" = ( -/obj/structure/chair{ - dir = 4; - name = "Prosecution" - }, -/turf/open/floor/mineral/titanium/blue, -/area/awaymission/centcomAway/hangar) +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/thunderdome) "eB" = ( /obj/structure/filingcabinet, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "eG" = ( /obj/effect/vr_clean_master, @@ -746,8 +754,8 @@ /area/awaymission/centcomAway/general) "eI" = ( /obj/machinery/sleep_console{ - dir = 8; - icon_state = "console" + icon_state = "console"; + dir = 8 }, /turf/open/indestructible, /area/awaymission/centcomAway/general) @@ -774,7 +782,7 @@ /obj/structure/chair{ dir = 8 }, -/turf/open/indestructible, +/turf/open/floor/carpet/red, /area/awaymission/centcomAway/courtroom) "eP" = ( /obj/machinery/computer/cloning, @@ -785,8 +793,8 @@ /turf/open/indestructible, /area/awaymission/centcomAway/general) "eR" = ( -/obj/structure/chair, -/turf/open/floor/mineral/titanium/blue, +/obj/structure/chair/comfy/shuttle, +/turf/open/floor/mineral/titanium, /area/awaymission/centcomAway/hangar) "eS" = ( /obj/effect/turf_decal/delivery, @@ -803,11 +811,11 @@ "eU" = ( /obj/machinery/door/window/northleft, /obj/structure/chair, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "eV" = ( /obj/effect/spawner/structure/window/hollow/reinforced, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/general) "eW" = ( /obj/structure/chair{ @@ -821,49 +829,55 @@ "eZ" = ( /obj/structure/table, /obj/item/storage/lockbox, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "fa" = ( /obj/structure/table, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "fb" = ( /obj/structure/frame/computer{ dir = 1 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "fc" = ( /obj/structure/table, /obj/item/clipboard, /obj/item/pen, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) "fd" = ( /obj/structure/table, /obj/item/paper_bin, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/mineral/titanium/old, /area/awaymission/centcomAway/hangar) +"fg" = ( +/obj/machinery/modular_computer/console{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/general) "fh" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ dir = 4 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "fj" = ( /obj/structure/bed, /obj/item/bedsheet, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "fk" = ( /obj/structure/table, /obj/item/storage/box/prisoner, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "fl" = ( /obj/structure/closet/secure_closet/security, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "fm" = ( /turf/open/indestructible, @@ -872,17 +886,17 @@ /obj/effect/spawner/structure/window/hollow/reinforced/end{ dir = 8 }, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "fo" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "fp" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ dir = 4 }, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "fq" = ( /obj/machinery/power/terminal, @@ -896,17 +910,17 @@ /obj/effect/spawner/structure/window/hollow/reinforced/end{ dir = 8 }, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/general) "fv" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/general) "fw" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ dir = 4 }, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/general) "fy" = ( /obj/structure/sign/departments/medbay/alt, @@ -917,7 +931,7 @@ dir = 1 }, /obj/item/storage/box/monkeycubes, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "fB" = ( /obj/structure/window/reinforced{ @@ -926,7 +940,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "fC" = ( /obj/machinery/computer/scan_consolenew, @@ -938,29 +952,29 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "fG" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engineering"; req_access_txt = "32" }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "fH" = ( /obj/structure/table/wood, -/turf/open/indestructible, +/turf/open/floor/carpet/red, /area/awaymission/centcomAway/courtroom) "fJ" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ dir = 1 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "fK" = ( /obj/machinery/door/window/northleft, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "fL" = ( /obj/structure/table/wood, @@ -970,7 +984,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "fM" = ( /obj/machinery/power/smes, @@ -1000,7 +1014,7 @@ /area/awaymission/centcomAway/general) "fR" = ( /obj/machinery/door/window/eastright, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "fT" = ( /obj/machinery/door/airlock/centcom, @@ -1027,42 +1041,42 @@ /area/awaymission/centcomAway/general) "fZ" = ( /obj/structure/table, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "ga" = ( /obj/structure/window/reinforced{ dir = 1 }, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/courtroom) "gb" = ( /obj/structure/grille, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/maint) "gd" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 9 }, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/general) "gf" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle, /obj/structure/window/reinforced{ dir = 8 }, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/general) "gh" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 5 }, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/general) "gj" = ( /obj/structure/chair{ dir = 4 }, -/turf/open/indestructible, +/turf/open/floor/carpet/red, /area/awaymission/centcomAway/courtroom) "gl" = ( /obj/item/xenos_claw, @@ -1072,51 +1086,54 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "go" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/indestructible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "gp" = ( /obj/machinery/shieldgen, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/maint) "gr" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/general) "gs" = ( /obj/machinery/pdapainter, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "gt" = ( /obj/machinery/photocopier, /obj/item/paper/fluff/awaymissions/centcom/gateway_memo, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "gu" = ( /obj/structure/table/reinforced, /obj/machinery/recharger{ pixel_y = 4 }, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "gw" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "gx" = ( /obj/structure/filingcabinet, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "gy" = ( /obj/structure/filingcabinet/chestdrawer, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "gB" = ( /obj/structure/reagent_dispensers/fueltank, @@ -1124,63 +1141,62 @@ /area/awaymission/centcomAway/courtroom) "gE" = ( /obj/structure/closet/secure_closet/engineering_welding, -/turf/open/indestructible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "gF" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge"; req_access_txt = "19" }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "gG" = ( -/obj/structure/chair/comfy/beige{ - dir = 1; - icon_state = "comfychair_beige" - }, -/turf/open/indestructible, -/area/awaymission/centcomAway/general) +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/maint) "gH" = ( /obj/structure/chair, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "gI" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/maint) "gJ" = ( /obj/structure/bodycontainer/morgue, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "gM" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ dir = 1 }, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/general) "gN" = ( /obj/machinery/modular_computer/console{ dir = 4 }, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "gO" = ( /obj/structure/chair/office/dark{ dir = 8 }, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "gP" = ( /obj/structure/chair/office/dark{ dir = 4 }, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "gQ" = ( /obj/machinery/modular_computer/console{ dir = 8 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "gS" = ( /obj/structure/shuttle/engine/propulsion/burst{ @@ -1191,7 +1207,10 @@ "gU" = ( /obj/structure/table, /obj/item/paper/fluff/awaymissions/centcom/gateway_memo, -/turf/open/indestructible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "gW" = ( /turf/open/indestructible, @@ -1200,11 +1219,11 @@ /obj/effect/spawner/structure/window/hollow/reinforced/middle{ dir = 4 }, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/general) "gZ" = ( /obj/structure/chair/office/dark, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "hb" = ( /obj/machinery/vending/cigarette, @@ -1212,7 +1231,7 @@ /area/awaymission/centcomAway/courtroom) "hc" = ( /obj/machinery/door/airlock/shuttle, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "hd" = ( /obj/structure/chair{ @@ -1221,20 +1240,23 @@ /obj/item/radio/intercom{ pixel_y = 25 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "he" = ( /obj/effect/spawner/structure/window/hollow/reinforced, -/turf/open/floor/mineral/titanium, +/turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "hg" = ( /obj/structure/table, /obj/item/stack/cable_coil, -/turf/open/indestructible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "hh" = ( /obj/structure/closet/body_bag, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "hi" = ( /obj/structure/sign/warning/biohazard, @@ -1243,23 +1265,26 @@ "hj" = ( /obj/structure/table/reinforced, /obj/item/storage/box/PDAs, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "hk" = ( /obj/structure/table/reinforced, /obj/item/folder/red, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "hl" = ( /obj/machinery/modular_computer/console{ dir = 1 }, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) +"hm" = ( +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) "ho" = ( /obj/structure/table/reinforced, /obj/item/folder/blue, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "hq" = ( /turf/closed/indestructible/fakeglass, @@ -1270,7 +1295,10 @@ /obj/item/storage/toolbox/electrical{ pixel_y = 5 }, -/turf/open/indestructible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "hy" = ( /obj/structure/sign/warning/securearea, @@ -1285,23 +1313,27 @@ /obj/structure/mirror{ pixel_x = -28 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "hG" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, -/turf/open/indestructible, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "hH" = ( /obj/structure/table/reinforced, /obj/item/storage/box/bodybags, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "hJ" = ( /obj/structure/toilet{ dir = 8 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "hK" = ( /obj/machinery/button/door{ @@ -1314,11 +1346,13 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/indestructible, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "hL" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/indestructible, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "hM" = ( /obj/structure/rack, @@ -1329,7 +1363,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/indestructible, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "hN" = ( /obj/structure/rack, @@ -1337,16 +1372,19 @@ pixel_x = -3; pixel_y = -2 }, -/turf/open/indestructible, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "hO" = ( /obj/structure/closet, -/turf/open/indestructible, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "hP" = ( /obj/structure/table, /obj/item/stack/sheet/metal/fifty, -/turf/open/indestructible, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "hQ" = ( /obj/machinery/power/solar/fake, @@ -1354,12 +1392,12 @@ /area/awaymission/centcomAway/maint) "hR" = ( /obj/structure/closet/secure_closet/medical2, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "hS" = ( /obj/structure/table/wood, /obj/item/paper_bin, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "hU" = ( /obj/structure/sign/warning/vacuum, @@ -1367,36 +1405,42 @@ /area/awaymission/centcomAway/hangar) "hV" = ( /obj/structure/bodycontainer/crematorium, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "hW" = ( -/obj/item/kirbyplants, +/obj/effect/spawner/structure/window/hollow/reinforced, /turf/open/indestructible, /area/awaymission/centcomAway/general) "hX" = ( /obj/machinery/button/crematorium{ pixel_y = 25 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "hY" = ( /obj/structure/closet/secure_closet/injection, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "hZ" = ( /obj/structure/bed, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "ia" = ( /obj/structure/closet/secure_closet/courtroom, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/courtroom) "ib" = ( /obj/structure/chair{ dir = 1 }, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/courtroom) +"id" = ( +/obj/structure/table, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/food/condiment/enzyme, +/turf/open/floor/plasteel/cafeteria, +/area/awaymission/centcomAway/cafe) "ie" = ( /obj/machinery/vending/snack, /turf/open/indestructible, @@ -1425,44 +1469,42 @@ /area/awaymission/centcomAway/hangar) "im" = ( /obj/structure/closet/secure_closet/personal, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "in" = ( /obj/structure/rack, /obj/item/clothing/glasses/night, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "io" = ( /obj/structure/closet/emcloset, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "ip" = ( /obj/structure/bookcase, /obj/effect/decal/cleanable/cobweb, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "iq" = ( /obj/structure/closet/secure_closet/hos, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "ir" = ( /obj/structure/closet/crate/trashcart, /obj/item/reagent_containers/spray/cleaner, /obj/item/reagent_containers/glass/bucket, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "is" = ( /obj/structure/bookcase, /obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "it" = ( -/obj/machinery/door/poddoor/shutters{ - id = "XCCsec3"; - name = "XCC Main Access Shutters" +/obj/structure/chair{ + dir = 1 }, -/obj/effect/turf_decal/delivery, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "iu" = ( /obj/structure/flora/ausbushes, @@ -1503,23 +1545,22 @@ /area/awaymission/centcomAway/hangar) "iF" = ( /obj/machinery/recharge_station, -/turf/open/indestructible, +/turf/open/floor/circuit/red, /area/awaymission/centcomAway/hangar) "iM" = ( /obj/structure/closet/wardrobe/red, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "iN" = ( /obj/structure/mecha_wreckage/seraph, /turf/open/indestructible, /area/awaymission/centcomAway/hangar) "iQ" = ( -/obj/structure/table/reinforced, -/turf/open/indestructible, -/area/awaymission/centcomAway/general) +/turf/open/floor/plasteel/cafeteria, +/area/awaymission/centcomAway/cafe) "iR" = ( /obj/structure/closet/secure_closet/security, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "iT" = ( /obj/structure/table/wood{ @@ -1527,33 +1568,29 @@ }, /obj/item/clothing/mask/cigarette/cigar/havana, /obj/item/reagent_containers/food/drinks/sillycup, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "iU" = ( /obj/structure/table/wood{ dir = 5 }, /obj/item/lighter, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "iV" = ( /obj/structure/table/wood{ dir = 5 }, /obj/item/storage/backpack/satchel, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "iW" = ( /obj/machinery/modular_computer/console, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "iY" = ( /obj/structure/table/reinforced, -/obj/machinery/button/door{ - id = "XCCsec3"; - name = "XCC Shutter 3 Control" - }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "ja" = ( /obj/machinery/button/massdriver{ @@ -1561,59 +1598,59 @@ name = "XCC Mechbay Mass Driver"; pixel_x = 25 }, +/obj/structure/reagent_dispensers/fueltank, /turf/open/indestructible, /area/awaymission/centcomAway/hangar) "jb" = ( /obj/machinery/mecha_part_fabricator, -/turf/open/indestructible, +/turf/open/floor/circuit/red, /area/awaymission/centcomAway/hangar) "jd" = ( /obj/structure/table/wood{ dir = 10 }, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "jg" = ( /obj/structure/table/reinforced, /obj/item/pen, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "jh" = ( /obj/structure/chair{ dir = 8 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "jk" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "jq" = ( /obj/item/stamp, /obj/structure/table/reinforced, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "jr" = ( /obj/structure/table, /obj/item/bot_assembly/medbot, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "js" = ( /obj/structure/table, /obj/item/assembly/flash/handheld, /obj/item/assembly/flash/handheld, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "jt" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/metal/fifty, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "ju" = ( /obj/structure/table, /obj/item/mmi, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "jw" = ( /obj/machinery/door/airlock/maintenance, @@ -1631,11 +1668,16 @@ name = "sand" }, /area/awaymission/centcomAway/general) +"jz" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/shaker, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/cafe) "jB" = ( /obj/structure/chair{ dir = 4 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "jC" = ( /obj/structure/chair{ @@ -1649,7 +1691,7 @@ dir = 4 }, /obj/structure/window/reinforced, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/general) "jL" = ( /obj/machinery/door/poddoor/shutters{ @@ -1677,7 +1719,7 @@ /obj/machinery/door/airlock/external{ name = "Arrival Airlock" }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "jQ" = ( /obj/structure/table, @@ -1685,18 +1727,10 @@ /turf/open/indestructible, /area/awaymission/centcomAway/general) "jR" = ( -/obj/machinery/door/poddoor/shutters{ - id = "XCCsec1"; - name = "XCC Checkpoint 1 Shutters" - }, -/obj/effect/turf_decal/delivery, +/obj/vehicle/ridden/space/speedwagon, /turf/open/indestructible, -/area/awaymission/centcomAway/general) +/area/awaymission/centcomAway/hangar) "jS" = ( -/obj/machinery/door/poddoor/shutters{ - id = "XCCsec2"; - name = "XCC Checkpoint 2 Shutters" - }, /obj/effect/turf_decal/delivery, /turf/open/indestructible, /area/awaymission/centcomAway/general) @@ -1704,6 +1738,9 @@ /obj/structure/sign/warning/vacuum, /turf/closed/indestructible/riveted, /area/awaymission/centcomAway/general) +"jW" = ( +/turf/open/floor/mineral/basaltstone_floor, +/area/awaymission/centcomAway/cafe) "jX" = ( /obj/structure/chair{ dir = 1 @@ -1722,7 +1759,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "kj" = ( /obj/effect/turf_decal/delivery{ @@ -1735,22 +1772,24 @@ dir = 1 }, /obj/structure/window/reinforced, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/general) "kn" = ( /obj/structure/table, /obj/item/flashlight/flare, -/turf/open/indestructible, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "kp" = ( /obj/structure/table, /obj/item/multitool, -/turf/open/indestructible, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "kq" = ( /obj/structure/table/reinforced, /obj/item/paper/pamphlet/centcom/visitor_info, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "kr" = ( /obj/structure/table/reinforced, @@ -1758,12 +1797,12 @@ id = "XCCsec1"; name = "XCC Shutter 1 Control" }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "ku" = ( /obj/item/paper_bin, /obj/structure/table/reinforced, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "kv" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ @@ -1772,25 +1811,25 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/general) "kB" = ( /obj/machinery/photocopier, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "kC" = ( /obj/item/clipboard, /obj/structure/table, /obj/item/taperecorder, /obj/item/stamp, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "kD" = ( /obj/machinery/door/window/northright{ - dir = 2; - icon_state = "right" + icon_state = "right"; + dir = 2 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "kE" = ( /obj/structure/table/reinforced, @@ -1798,13 +1837,13 @@ id = "XCCsec2"; name = "XCC Shutter 2 Control" }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "kJ" = ( /obj/structure/table, /obj/item/storage/box/handcuffs, /obj/item/stamp, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "kK" = ( /obj/machinery/door/airlock/external, @@ -1813,21 +1852,21 @@ "kN" = ( /obj/structure/table/wood, /obj/item/clothing/accessory/medal, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "kO" = ( /obj/structure/table/wood, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "kP" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/trophy/gold_cup, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "kQ" = ( /obj/structure/table/wood, /obj/item/clothing/accessory/medal/gold, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "kS" = ( /turf/closed/indestructible/riveted, @@ -1853,12 +1892,12 @@ "kW" = ( /obj/structure/table, /obj/item/paicard, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "kX" = ( /obj/structure/table, /obj/item/camera, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "kY" = ( /obj/machinery/door/airlock/external, @@ -1867,7 +1906,7 @@ /area/awaymission/centcomAway/thunderdome) "kZ" = ( /obj/machinery/vending/coffee, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "la" = ( /obj/structure/table, @@ -1875,7 +1914,7 @@ /area/awaymission/centcomAway/thunderdome) "lb" = ( /obj/machinery/vending/cigarette, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "lc" = ( /turf/open/indestructible, @@ -1886,7 +1925,7 @@ /area/awaymission/centcomAway/thunderdome) "lf" = ( /obj/effect/spawner/structure/window/hollow/reinforced, -/turf/open/indestructible, +/turf/open/floor/plating, /area/awaymission/centcomAway/thunderdome) "lg" = ( /obj/machinery/door/window/southright, @@ -1900,8 +1939,7 @@ /obj/structure/chair/comfy/black{ dir = 1 }, -/obj/effect/landmark/vr_spawn/syndicate, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "ll" = ( /obj/structure/reagent_dispensers/beerkeg, @@ -1927,11 +1965,11 @@ "lq" = ( /obj/structure/table/wood, /obj/item/radio/off, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "lr" = ( /obj/machinery/icecream_vat, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "ls" = ( /obj/structure/chair{ @@ -1951,12 +1989,15 @@ "lv" = ( /obj/structure/rack, /obj/item/restraints/legcuffs/beartrap, -/obj/item/fireaxe, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "lw" = ( /turf/closed/indestructible/fakeglass, /area/awaymission/centcomAway/thunderdome) +"ly" = ( +/obj/structure/table/wood, +/turf/open/indestructible, +/area/awaymission/centcomAway/cafe) "lz" = ( /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ @@ -1974,7 +2015,7 @@ /area/awaymission/centcomAway/thunderdome) "lB" = ( /obj/item/reagent_containers/rag, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "lD" = ( /obj/structure/sink{ @@ -1985,11 +2026,11 @@ /obj/structure/mirror{ pixel_x = -28 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "lF" = ( /obj/structure/closet/secure_closet/personal, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "lG" = ( /obj/structure/rack, @@ -1999,7 +2040,7 @@ /obj/item/clothing/head/helmet/thunderdome, /obj/item/hatchet, /obj/item/shield/riot, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "lI" = ( /obj/machinery/recharger{ @@ -2027,13 +2068,13 @@ /obj/item/clothing/head/helmet/thunderdome, /obj/item/hatchet, /obj/item/shield/riot, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "lM" = ( /obj/structure/table/reinforced, /obj/item/taperecorder, /obj/item/tape/random, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "lN" = ( /obj/structure/mirror{ @@ -2043,38 +2084,38 @@ dir = 4; pixel_x = 11 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "lS" = ( /obj/machinery/chem_master, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "lU" = ( /obj/structure/urinal{ pixel_y = 32 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "lV" = ( /obj/machinery/shower{ dir = 8 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "lX" = ( /obj/machinery/chem_dispenser, /obj/item/storage/box/beakers, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "lZ" = ( /obj/machinery/shower{ dir = 4 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "ma" = ( /obj/machinery/door/airlock/freezer, -/turf/open/indestructible, +/turf/open/floor/plasteel/showroomfloor, /area/awaymission/centcomAway/cafe) "mb" = ( /obj/machinery/door/poddoor{ @@ -2086,12 +2127,12 @@ /area/awaymission/centcomAway/thunderdome) "mc" = ( /obj/item/soap/nanotrasen, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "md" = ( /obj/structure/rack, /obj/item/gun/energy/laser/retro, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "me" = ( /obj/machinery/vending/boozeomat{ @@ -2103,27 +2144,27 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "mh" = ( /obj/structure/table, /obj/item/reagent_containers/food/snacks/popcorn, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "mi" = ( /obj/structure/disposalpipe/segment, /obj/structure/reagent_dispensers/watertank, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/cafe) "mj" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/window/southright, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/cafe) "mk" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/snacks/popcorn, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "ml" = ( /obj/structure/disposalpipe/segment{ @@ -2136,32 +2177,32 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "mo" = ( /obj/machinery/modular_computer/console{ dir = 1 }, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "mp" = ( /obj/structure/closet/secure_closet/bar, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "mq" = ( /obj/structure/table, /obj/item/storage/box/handcuffs, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "mr" = ( /obj/structure/table, /obj/item/storage/toolbox/electrical, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "ms" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "mt" = ( /obj/machinery/button/door{ @@ -2169,11 +2210,11 @@ name = "XCC Thunderdome Melee!" }, /obj/structure/table/reinforced, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "mu" = ( /obj/structure/chair/comfy/teal, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "mv" = ( /obj/machinery/button/door{ @@ -2181,11 +2222,11 @@ name = "XCC Thunderdome Guns!" }, /obj/structure/table/reinforced, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "mw" = ( /obj/structure/table/reinforced, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "my" = ( /obj/structure/disposalpipe/segment{ @@ -2196,7 +2237,7 @@ "mz" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/window/northright, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/cafe) "mE" = ( /obj/effect/turf_decal/stripes/line{ @@ -2252,10 +2293,9 @@ /area/awaymission/centcomAway/hangar) "mQ" = ( /obj/structure/safe/floor, -/obj/item/clothing/under/rank/centcom/officer, /obj/item/clothing/suit/det_suit, /obj/item/gun/ballistic/revolver/mateba, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/general) "mR" = ( /obj/machinery/door/airlock/centcom, @@ -2274,7 +2314,7 @@ /obj/structure/rack, /obj/item/storage/secure/briefcase, /obj/item/storage/belt/utility/full, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) "mW" = ( /obj/structure/chair/stool{ @@ -2298,15 +2338,7 @@ /area/awaymission/centcomAway/thunderdome) "mZ" = ( /obj/machinery/door/airlock/centcom, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/cafeteria{ - heat_capacity = 1 - }, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) "na" = ( /obj/effect/turf_decal/tile/green{ @@ -2491,48 +2523,420 @@ /obj/item/reagent_containers/food/condiment/sugar, /obj/item/reagent_containers/food/condiment/milk, /obj/item/reagent_containers/food/drinks/ice, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/thunderdome) +"ok" = ( +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks/beer/fullupgrade, +/turf/open/floor/wood, +/area/awaymission/centcomAway/cafe) +"oA" = ( +/obj/effect/vr_clean_master, +/turf/open/floor/wood, +/area/awaymission/centcomAway/general) +"pt" = ( +/obj/machinery/door/airlock/centcom, +/turf/open/floor/mineral/basaltstone_floor, +/area/awaymission/centcomAway/cafe) +"qR" = ( +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks/fullupgrade{ + dir = 1 + }, +/turf/open/floor/wood, +/area/awaymission/centcomAway/cafe) +"qZ" = ( +/obj/structure/table/reinforced, +/obj/item/folder/red, +/turf/open/floor/wood, +/area/awaymission/centcomAway/general) "sL" = ( /obj/machinery/door/airlock/external{ name = "Arrival Airlock" }, /obj/structure/fans/tiny/invisible, -/turf/open/indestructible, +/turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/general) +"tn" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) +"tt" = ( +/obj/machinery/door/airlock/centcom, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/general) +"tw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) +"tE" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/indestructible, +/area/awaymission/centcomAway/maint) +"tT" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/old, +/area/awaymission/centcomAway/hangar) +"uF" = ( +/turf/open/floor/circuit/red, +/area/awaymission/centcomAway/general) +"uH" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/thunderdome) +"uR" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) +"vW" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/courtroom) +"we" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/wood, +/area/awaymission/centcomAway/general) +"wj" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/cafeteria, +/area/awaymission/centcomAway/cafe) +"wu" = ( +/obj/structure/barricade/sandbags, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) +"xm" = ( +/obj/effect/decal/cleanable/oil, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) +"xn" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/turf/open/indestructible, +/area/awaymission/centcomAway/cafe) +"xC" = ( +/obj/structure/girder, +/turf/open/indestructible, +/area/awaymission/centcomAway/hangar) +"xM" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) +"xW" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/food/condiment/saltshaker, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/cafe) +"yx" = ( +/obj/structure/closet/secure_closet/freezer/kitchen, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/cafe) +"yS" = ( +/obj/structure/table, +/obj/machinery/microwave{ + pixel_x = -3; + pixel_y = 6 + }, +/turf/open/floor/plasteel/cafeteria, +/area/awaymission/centcomAway/cafe) "zk" = ( /turf/closed/indestructible/fakeglass, /area/awaymission/centcomAway/general) -"GJ" = ( -/obj/structure/chair, +"zo" = ( +/obj/structure/chair/wood, +/turf/open/indestructible, +/area/awaymission/centcomAway/cafe) +"zO" = ( +/turf/open/floor/wood, +/area/awaymission/centcomAway/cafe) +"Ay" = ( +/obj/item/radio, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/maint) +"Bk" = ( +/obj/structure/table, +/obj/machinery/processor{ + pixel_y = 10 + }, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/cafe) +"BA" = ( +/obj/structure/reagent_dispensers/fueltank, /turf/open/indestructible, /area/awaymission/centcomAway/general) +"BG" = ( +/obj/structure/table, +/obj/item/storage/box/donkpockets{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/kitchen/rollingpin, +/turf/open/floor/plasteel/cafeteria, +/area/awaymission/centcomAway/cafe) +"BJ" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/effect/landmark/vr_spawn/syndicate, +/turf/open/indestructible, +/area/awaymission/centcomAway/cafe) +"CN" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) +"CQ" = ( +/turf/open/floor/mineral/titanium/old, +/area/awaymission/centcomAway/hangar) +"CR" = ( +/obj/effect/landmark/vr_spawn/syndicate, +/turf/open/floor/wood, +/area/awaymission/centcomAway/cafe) +"Di" = ( +/obj/structure/table/reinforced, +/turf/open/floor/carpet/red, +/area/awaymission/centcomAway/cafe) +"Dv" = ( +/obj/structure/table, +/obj/machinery/reagentgrinder, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/cafe) +"EH" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/landmark/vr_spawn/syndicate, +/turf/open/floor/mineral/titanium/old, +/area/awaymission/centcomAway/hangar) +"EZ" = ( +/turf/open/floor/carpet/red, +/area/awaymission/centcomAway/courtroom) +"Fs" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/maint) +"FK" = ( +/obj/machinery/modular_computer/console{ + dir = 8 + }, +/turf/open/floor/wood, +/area/awaymission/centcomAway/general) +"GF" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/open/floor/plasteel/cafeteria, +/area/awaymission/centcomAway/cafe) +"GJ" = ( +/obj/structure/chair, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/general) +"GT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) +"Hl" = ( +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks/fullupgrade, +/turf/open/floor/wood, +/area/awaymission/centcomAway/cafe) +"Iw" = ( +/obj/structure/rack, +/obj/item/clothing/suit/fire, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/maint) +"IP" = ( +/obj/structure/table/wood, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/courtroom) +"JC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) +"JL" = ( +/obj/effect/landmark/vr_spawn/syndicate, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/general) +"JY" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/indestructible, +/area/awaymission/centcomAway/general) +"Ki" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/maint) +"KQ" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/courtroom) "KX" = ( /obj/effect/vr_clean_master, /turf/open/indestructible, /area/awaymission/centcomAway/general) +"Lw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) +"LV" = ( +/turf/closed/indestructible/riveted, +/area/space) +"MF" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) +"Nd" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/carpet/red, +/area/awaymission/centcomAway/courtroom) +"Pd" = ( +/obj/structure/table, +/obj/item/kitchen/knife/butcher, +/turf/open/floor/plasteel/cafeteria, +/area/awaymission/centcomAway/cafe) +"Ph" = ( +/obj/machinery/door/airlock/centcom, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/courtroom) +"Pm" = ( +/obj/structure/table, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/thunderdome) +"PC" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) +"PI" = ( +/obj/structure/chair, +/turf/open/floor/carpet/red, +/area/awaymission/centcomAway/courtroom) +"PR" = ( +/turf/open/floor/plasteel/showroomfloor, +/area/awaymission/centcomAway/cafe) +"PY" = ( +/turf/open/floor/wood, +/area/awaymission/centcomAway/courtroom) +"Ql" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/mineral/titanium/old, +/area/awaymission/centcomAway/hangar) +"Rx" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/turf/open/floor/wood, +/area/awaymission/centcomAway/general) "Tc" = ( /obj/effect/vr_clean_master, /turf/open/indestructible, /area/awaymission/centcomAway/hangar) +"Tu" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/indestructible, +/area/awaymission/centcomAway/cafe) "TG" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/effect/vr_clean_master, -/turf/open/indestructible, +/turf/open/floor/wood, /area/awaymission/centcomAway/courtroom) +"TN" = ( +/obj/machinery/vending/dinnerware, +/turf/open/floor/plasteel/cafeteria, +/area/awaymission/centcomAway/cafe) "TP" = ( /turf/open/space/basic, /area/space) +"TV" = ( +/obj/effect/landmark/vr_spawn/syndicate, +/turf/open/indestructible, +/area/awaymission/centcomAway/maint) "Um" = ( /obj/effect/vr_clean_master, /turf/open/indestructible, /area/awaymission/centcomAway/cafe) +"Vy" = ( +/obj/structure/barricade/sandbags, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/general) "VC" = ( /obj/effect/landmark/vr_spawn/syndicate, /turf/open/indestructible, /area/awaymission/centcomAway/hangar) +"VX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/landmark/vr_spawn/syndicate, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) +"XQ" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/landmark/vr_spawn/syndicate, +/turf/open/floor/mineral/titanium/old, +/area/awaymission/centcomAway/hangar) +"Yq" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) +"YG" = ( +/obj/structure/closet/chefcloset, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/cafe) +"YL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/awaymission/centcomAway/hangar) +"YQ" = ( +/obj/structure/barricade/sandbags, +/turf/open/indestructible, +/area/awaymission/centcomAway/general) (1,1,1) = {" aa @@ -6518,7 +6922,7 @@ jL jL aV aV -aa +LV aa aa aa @@ -6596,37 +7000,37 @@ aa aa aa aV +tw +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc +bc bc -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd -bd hK hU aV @@ -6638,17 +7042,17 @@ iz aV iz aV +cf +bc +VX +bc +bc +bc +bc bc -bd -bd -bd -bd -bd -bd -bd kf +xM hU -aV aa aa aa @@ -6726,6 +7130,7 @@ aa aa aa aV +do bd bd bd @@ -6756,8 +7161,7 @@ bd bd bd bd -bd -bd +uR aV ih iA @@ -6768,6 +7172,7 @@ iA ih iA aV +GT bd bd bd @@ -6776,8 +7181,7 @@ bd bd bd bd -bd -bd +uR aV aa aa @@ -6856,7 +7260,7 @@ aa aa aa aV -bd +do bn bB bB @@ -6868,6 +7272,8 @@ be bd bd bd +bs +bs bd bd bd @@ -6879,15 +7285,13 @@ bd bd bd bd -bd -bd -bd +bs bd bd gS hc gS -bd +uR aV ii iB @@ -6898,6 +7302,7 @@ iB ii iB aV +do bd bd bd @@ -6905,9 +7310,8 @@ bd bd bd bd -bd -bd -bd +xC +uR aV aa aa @@ -6986,11 +7390,11 @@ aa aa aa aV -bd +do bo bC -bV -bV +Ql +Ql bn bn bd @@ -6999,6 +7403,7 @@ bd be bd bd +bs bd bd bd @@ -7010,14 +7415,13 @@ bd bd bd bd -bd -bd +bs bd bd bB hd bB -bd +uR aV ij bd @@ -7028,16 +7432,16 @@ bd ij bd aV +do +xC +bd +bd +jR bd bd bd -bd -bd -bd -bd -bd -bd -bd +xC +uR aV aa aa @@ -7116,12 +7520,12 @@ aa aa aa aV -bd +do bp bC -bV -bV -bV +Ql +Ql +CQ bB bd bd @@ -7129,6 +7533,7 @@ bd bd bd bd +bs bd bd bd @@ -7136,19 +7541,18 @@ bd bd bd bd -bd -bd +bs be bd bd -bd +bs bd bd bB dc bB -bd -aV +uR +mR bd bd bd @@ -7157,10 +7561,8 @@ bd bd bd bd -aV -bd -bd -bd +mR +do bd bd bd @@ -7168,6 +7570,8 @@ bd bd bd bd +xC +uR aV aa aa @@ -7246,7 +7650,7 @@ aa aa aa aV -bd +do bq bC bn @@ -7267,17 +7671,17 @@ bd bd bd bd -bd -bd -bd -bd -bd +bs +bs +bs +bs +bs bd bd bn he bn -bd +uR aV il bd @@ -7288,6 +7692,7 @@ bd bd bd aV +do bd bd bd @@ -7296,8 +7701,7 @@ bd bd bd bd -bd -bd +uR aV aa aa @@ -7376,22 +7780,22 @@ aa aa aa aV -bd +do bn bB bn -cn -cn +bV +bV cJ cU da dl bB -dz -dz -dz -dz -dz +dG +dG +dG +dG +dG bB bn bd @@ -7407,7 +7811,7 @@ be bd bd bd -bd +uR aV im im @@ -7418,16 +7822,16 @@ ja im im aV +do +xC bd bd bd bd bd bd -bd -bd -bd -bd +xC +uR aV aa aa @@ -7506,22 +7910,22 @@ aa aa aa aV -bd +do bd bB bU -cn +bV bV cK cV -db -db +cV +cV bB -bV -bV -bV -bV -bV +CQ +CQ +CQ +CQ +CQ bB bB bB @@ -7537,7 +7941,7 @@ bd bd bd bd -bd +uR aV aV aV @@ -7548,6 +7952,8 @@ aV aV aV aV +do +xC bd bd bd @@ -7555,9 +7961,7 @@ bd bd bd bd -bd -bd -bd +uR aV aa aa @@ -7636,22 +8040,22 @@ aa aa aa aV -bd +do bd bF bV bV bV cL -cW -db -db +cV +cV +cV bB -dz dG -bV -dz -dz +dG +CQ +dG +dG bB ez eb @@ -7667,18 +8071,18 @@ gS hc gS bd -bd +uR aV in aV iF bd bd -bd -bd +hm +hm jr aV -bd +do bd bd be @@ -7687,7 +8091,7 @@ bd bd bd bd -bd +uR aV aa aa @@ -7766,11 +8170,11 @@ aa aa aa aV -be +xm bd bB bW -cn +bV bV cM cX @@ -7783,13 +8187,13 @@ dL bB bB cm -cP -cn +bV +bV fa fo bd bd -bd +VC bd bd bd @@ -7797,18 +8201,18 @@ bB hd bB bd -bd +uR aV -bd +hm aV -bd +hm iN bd jb -bd +hm js aV -bd +do bd bd be @@ -7817,7 +8221,7 @@ bd bd bd VC -bd +uR aV aa aa @@ -7896,11 +8300,11 @@ aa aa aa aV -bd +do bd bB bX -cn +bV bV bV bV @@ -7927,17 +8331,18 @@ bB dc bB bd -bd +uR mT bd mS bd bd VC -bd -bd +CN +hm jt aV +do bd bd bd @@ -7946,8 +8351,7 @@ bd bd bd bd -bd -bd +uR aV aa aa @@ -8026,25 +8430,25 @@ aa aa aa aV -bd +do bd bB bY -cn +bV bV cN -cn cP cP -cn -cP cP bV -cn +cP +cP +EH +bV dZ bB -eA -cn +bV +bV fc fo bd @@ -8057,17 +8461,18 @@ bn he bn bd -bd +uR aV -bd +hm aV -bd +hm bd bd jb -bd +hm ju aV +do bd bd bd @@ -8076,8 +8481,7 @@ bd bd bd bd -bd -bd +uR aV aa aa @@ -8156,7 +8560,7 @@ aa aa aa aV -bd +do bd bF bV @@ -8164,13 +8568,13 @@ bV bV cO cn -dc -dc cn -dc -dc +cn bV cn +cn +cn +bV ea bB eB @@ -8194,11 +8598,11 @@ aV iF bd bd -bd -bd -hG +hm +hm +Yq aV -bd +do be bd bd @@ -8207,7 +8611,7 @@ bd bd bd bd -bd +uR aV aa aa @@ -8286,21 +8690,21 @@ aa aa aa aV -bd +do bd bB bU -cn bV bV bV +tT +tT +XQ bV +tT +tT +tT bV -bV -bV -bV -bV -cn eb bB bB @@ -8317,7 +8721,7 @@ bd bd bd bd -bd +uR aV aV aV @@ -8328,6 +8732,8 @@ aV aV aV aV +do +bs bd bd bd @@ -8335,9 +8741,7 @@ bd bd bd bd -bd -bd -bd +PC aV aa aa @@ -8416,25 +8820,25 @@ aa aa aa aV -bd +do bn bB bn -cn -cn -cP -cP -cP bV -cP -cP -cP bV -cn +bV +bV +bV +bV +bV +bV +bV +bV +bV bU bB bn -bd +dd bd bd bd @@ -8451,21 +8855,21 @@ hM aV aa zk +cW gW gW -gW -gW +cW zk aa aV +do +bs +bs bd bd bd bd -bd -bd -bd -bd +bs bd kn aV @@ -8546,7 +8950,7 @@ aa aa aa aV -bd +do bo bC bn @@ -8571,31 +8975,31 @@ bd bd bd do -bd -bd -bd -bd -bd -bd +hm +wu +wu +wu +hm +hm hN aV aa zk +cW gW gW -gW -gW +cW zk aa aV +do bd bd bd bd -bd -bd -bd -bd +bs +bs +bs bd kn aV @@ -8620,11 +9024,11 @@ aa aa kS lD -lc -lc -lc -lc -lc +eA +eA +eA +eA +eA kS kS aa @@ -8676,12 +9080,12 @@ aa aa aa aV -bd +do bp bC -bV -bV -bV +Ql +Ql +CQ bB bd dd @@ -8701,24 +9105,24 @@ bd bd bd do -bd -bd -bd -bd -bd -bd +hm +hm +hm +hm +hm +hm hO aV aa zk +cW gW gW -gW -gW +cW zk aa aV -bd +GT bd bd bd @@ -8749,13 +9153,13 @@ aa aa aa kS -lc -lc +eA +eA lF kS lU -lc -lc +eA +eA kS aa aa @@ -8806,11 +9210,11 @@ aa aa aa aV -bd +do bq bC -bV -bV +Ql +Ql bn bn bd @@ -8831,23 +9235,24 @@ bd bd bd do -bd -bd -bd -bd -bd -bd +hm +hm +hm +hm +hm +hm hP aV aa zk +cW gW gW -gW -gW +cW zk aa aV +do bd bd bd @@ -8855,9 +9260,8 @@ bd bd bd bd -bd -bd -hG +VC +tn aV aa aa @@ -8879,12 +9283,12 @@ aa aa aa kS -lc -lc +eA +eA lF kS -lc -lc +eA +eA mc kS aa @@ -8936,7 +9340,7 @@ aa aa aa aV -bd +do bn bB bB @@ -8961,33 +9365,33 @@ bd bd bd do -bd -bd -bd -dd -bd -bd +hm +hm +hm +CN +hm +hm bQ aV aa zk +cW gW gW -gW -gW +cW zk aa aV -bd -bd -bd -bd -bd -bd -bd -bd -bd -aV +JC +YL +YL +YL +YL +YL +YL +YL +YL +Lw aV aa aa @@ -9010,7 +9414,7 @@ aa kS kS lF -lc +eA lF kS lV @@ -9066,7 +9470,7 @@ aa aa aa aV -bd +do bd bd bd @@ -9081,30 +9485,30 @@ bd bd bd aV -bs -bd -bd -bd -bd -bd -bd -bd +dv +YL +YL +YL +YL +YL bd +YL +YL go gE gE gU hg hx -hG +MF hG aV aa zk +cW gW gW -gW -gW +cW zk aa aV @@ -9118,7 +9522,7 @@ mN aV aV aV -aa +LV aa aa aa @@ -9148,8 +9552,8 @@ kS kS kS kS -aa -aa +kS +kS aa aa aa @@ -9196,7 +9600,7 @@ aa aa aa aV -bd +do be bd bd @@ -9217,7 +9621,7 @@ aV aV aV aV -aV +mR aV aV aV @@ -9231,10 +9635,10 @@ aV aV eu eu +cW gW gW -gW -gW +cW eu eu eu @@ -9245,7 +9649,7 @@ zk iu zk gW -gW +BA eu bk bk @@ -9277,6 +9681,8 @@ lc lc lc lc +lc +lc kS aa aa @@ -9291,8 +9697,6 @@ aa aa aa aa -aa -aa "} (53,1,1) = {" aa @@ -9326,31 +9730,31 @@ ab ab ab aV -bd -bs -bd -bd -bd +JC +dv +YL +YL +YL aV bd bd aV do -bd -bd -bd +hm +hm +hm dN aV -bb +Ay +gG +gG +gG +gG +gG ag -ag -ag -ag -ag -ag -ag -ag -dy +gG +gG +Ki eu hV gW @@ -9358,7 +9762,7 @@ gJ gJ gJ eu -hW +cW gW gW gW @@ -9367,9 +9771,9 @@ gW gW gW gW -hW +cW eu -gW +eJ gW zk iu @@ -9407,9 +9811,9 @@ lc lc lc lc +lc +lc kS -kS -aa aa aa aa @@ -9480,7 +9884,7 @@ ag ag ag ag -bj +Iw eu hX gl @@ -9488,7 +9892,7 @@ gW gW gW eu -gW +cW gW zk zk @@ -9497,7 +9901,7 @@ zk zk zk gW -gW +cW eu gW gW @@ -9520,7 +9924,7 @@ aa aa kS kS -lc +eA lc lc lc @@ -9538,7 +9942,7 @@ kS lc lc lc -kS +lc kS aa aa @@ -9582,7 +9986,7 @@ aa aa ab ab -ag +tE ag ag ag @@ -9612,13 +10016,13 @@ eu ag ew eu -gW +cW gW gW gW gW eu -gW +cW gW zk iu @@ -9627,7 +10031,7 @@ iu iu zk gW -gW +cW eu gW gW @@ -9650,7 +10054,7 @@ aa aa kS kW -lc +eA lc kS kS @@ -9740,15 +10144,15 @@ gW gW eu ag -ag +gG eu -gW +cW gW hh hh hH eu -gW +cW gW zk zk @@ -9757,7 +10161,7 @@ zk zk zk gW -gW +cW eu gW gW @@ -9780,11 +10184,11 @@ aa aa kS kX -lc +eA lc mZ -lc -lc +eA +eA nz kS kS @@ -9863,9 +10267,9 @@ ac ac ac eu -gW -gW -gW +uF +uF +uF fq fM eu @@ -9878,7 +10282,7 @@ hi hy eu eu -hW +cW gW gW gW @@ -9887,9 +10291,9 @@ gW gW gW gW -hW +cW eu -gW +BA gW zk iu @@ -9910,11 +10314,11 @@ aa aa kS kX -lc +eA lc kS -lc -lc +eA +eA nz kS lv @@ -9993,24 +10397,24 @@ aQ ac ec eu -gW +uF eS -gW +uF gW fN eu ag -ag +gG eu +cW gW -gW -gW -gW -gW +cW +cW +cW eu eu eu -gW +BA gW gW gW @@ -10040,11 +10444,11 @@ aa aa kS kS -lc +eA lc kS -lc -lc +eA +eA lr kS lv @@ -10103,13 +10507,13 @@ aa ab ag ac -ai +jW aG ac -ai +jW aG ac -ai +jW aG ac ai @@ -10123,9 +10527,9 @@ aG ad ec eu -gW -gW -gW +uF +uF +uF fq fO eu @@ -10158,10 +10562,10 @@ gW gW kj kq -gW -gW +cW +cW kB -gW +cW iR eu aa @@ -10170,11 +10574,11 @@ aa aa kT kS -lc +eA lc kS -lc -lc +eA +eA lr kS lv @@ -10234,22 +10638,22 @@ ab ag ac aH -ai +jW ac aH -ai +jW ac aH -ai +jW ac ai ai ac aH -ai +jW ac aH -ai +jW ad ec eu @@ -10264,9 +10668,9 @@ gp eu ir gW -gW -gW -gW +cW +cW +cW eu eu eu @@ -10287,11 +10691,11 @@ gW gW gW kj -iQ -gW -gW -gW -gW +iY +cW +cW +cW +cW iM eu aa @@ -10300,12 +10704,12 @@ aa aa kU kS -lc +eA lc kS -lc -lc -lc +eA +eA +eA kS lv lA @@ -10364,22 +10768,22 @@ ab aR ac ac -bt +pt ac ac -bt +pt ac ac -bt +pt ac ai ai ac ac -bt +pt ac ac -bt +pt ac ec eu @@ -10400,12 +10804,12 @@ eu eu eu ip -gW -gW -gW -gW -gW -gW +cW +cW +jk +jk +jk +jk eu iu zk @@ -10419,10 +10823,10 @@ gW kj hk kr -gW -eJ -gW -gW +cW +JL +cW +cW eu aa aa @@ -10430,7 +10834,7 @@ aa aa kV kS -lc +eA lc kS mk @@ -10522,7 +10926,7 @@ gW fV gW gW -gW +YQ gW gW gW @@ -10530,9 +10934,9 @@ gW gW eu iq -gW -gW -gW +cW +cW +jk iT jd jk @@ -10548,11 +10952,11 @@ gW gW kj jg -eW -gW -gW -gW -gW +it +cW +cW +cW +cW eu aa aa @@ -10560,13 +10964,13 @@ TP aa kS kS -lc +eA lc kS lc lc lc -lh +dz lw ns lu @@ -10576,8 +10980,8 @@ lu lu nf lw -lc -lc +eA +eA lc mm kS @@ -10621,6 +11025,7 @@ aa aa aa ad +cb ai ai ai @@ -10633,10 +11038,9 @@ ai ai ai ai +cb ai -ai -ai -ai +cb ai ai ai @@ -10651,7 +11055,7 @@ gW gW gW gW -gW +eJ gW gW gW @@ -10659,12 +11063,12 @@ gW gW gW eu -gW -gW -gW -gW +cW +cW +cW +jk iU -eW +we mQ eu iu @@ -10681,8 +11085,8 @@ gw gQ gQ kC -gW -gW +cW +cW eu aa aa @@ -10690,13 +11094,13 @@ aa aa aa kS -lc +eA lc kS lc lc lc -lh +dz lw nm lc @@ -10706,10 +11110,10 @@ lc lc ng lw +eA +eA lc -lc -lc -la +Pm kS aa aa @@ -10751,24 +11155,24 @@ aa aa aa ad +ly ai ai -aI -aI +cb +cb +cb ai ai ai ai -aI -aI -aI -aI -aI ai ai ai -aI -aI +ly +ly +ly +ai +ai ai ad ec @@ -10782,7 +11186,7 @@ gW gW gW gW -gW +YQ gW gW gW @@ -10790,12 +11194,12 @@ gW gW eu mU -gW -gW -gW +cW +cW +jk iV iW -gW +jk eu eu eu @@ -10820,13 +11224,13 @@ bk bk aa kS -lc +eA lc kS lc lc lc -lh +dz lw nn lc @@ -10837,7 +11241,7 @@ lc nl lw mg -lc +eA lc mo kS @@ -10881,24 +11285,24 @@ aa aa aa ad +xn ai ai -aF -aF +ly +ly +ly ai ai -ai -bJ cb -co -aF -aF -aF +cb ai ai +zo +ly +ly +ly +ai ai -aF -aF ai ad ec @@ -10920,26 +11324,26 @@ gW gW eu is -gW -gW -gW +cW +cW +jk iW -eW -gW +we +jk eu iu iu eu -jR -jR -jR -jR -jR -jR -jR +jS +jS +jS +jS +jS +jS +jS eu -iQ -gW +iY +cW eV gW gW @@ -10950,13 +11354,13 @@ zk eu aa kS -lc +eA lc kS lc lc lc -lh +dz lw nm lc @@ -10967,7 +11371,7 @@ lc ng lw mg -lc +eA mW mo kS @@ -11013,22 +11417,22 @@ aa ad ai ai -aF -aF +zo +ly +ly +ly ai ai -ai -bJ -cc -aF -aF -aF -aF +ly +ly +Tu ai ai +xn +xn +BJ +ai ai -dC -aF ai ad ec @@ -11037,11 +11441,11 @@ gW gW dw fw -gW +BA gW fw gs -gW +jk gN gN hj @@ -11080,13 +11484,13 @@ kP eu aa kS -lc +uH lc kS ll lc lc -lh +dz lw nn lc @@ -11097,9 +11501,9 @@ lc nl lw mg +eA lc -lc -lc +eA kS aa aa @@ -11141,17 +11545,17 @@ aa aa aa ad +cb +cc +ai +xn +xn ai ai ai -ai -ai -ai -ai -ai -ai -ai -ai +ly +ly +Tu ai ai ai @@ -11171,43 +11575,43 @@ gW gW eu gt -gW +jk gO -gW -hk +jk +qZ fv -gW +YQ gW eu eu eu -gW -gW -gW -gW -gW +cW +cW +Vy +cW +cW fv -jB -jB +ep +ep jN gW -jB +ep gW -jB -gW -jB +ep gW +ep +BA gd kv -iQ +iY eV -gW +eJ gW eu zk zk zk -zk +eu zk kS kS @@ -11216,7 +11620,7 @@ kS lc lc lc -lh +dz lw nm lK @@ -11227,9 +11631,9 @@ lK ng lw mg +eA lc -lc -lc +eA kS kS aa @@ -11271,6 +11675,7 @@ aa aa aa ad +ly ai ai ai @@ -11278,8 +11683,7 @@ ai ai ai ai -ai -ai +xn ai ai ai @@ -11301,19 +11705,19 @@ gW gW gf gu -gW -gW +jk +jk gZ hl fv gW gW eu -it +jS eV gW gW -gW +YQ gW gW fw @@ -11337,7 +11741,7 @@ kK gW gW gW -kK +eu gW kY lc @@ -11346,7 +11750,7 @@ le lc lc lc -lh +dz lw np lc @@ -11356,10 +11760,10 @@ ne lc ne lw +eA +eA lc -lc -lc -lc +eA mt kS kS @@ -11401,6 +11805,7 @@ aa aa aa ad +xn ai ai ai @@ -11420,26 +11825,25 @@ ai ai ai ai -ai -aK +co gW gW -eV +hW gW gW gW gW fv iW -gG -KX -gW +jk +oA +jk hl fv gW gW dY -it +jS dY gW gW @@ -11454,7 +11858,7 @@ gW gW KX gW -gW +eJ gW gW gW @@ -11467,7 +11871,7 @@ eu gW eJ gW -zk +eu zk kS lc @@ -11476,7 +11880,7 @@ lf lc lc lc -lh +dz lw lc lc @@ -11489,7 +11893,7 @@ lw lq lj lc -lc +eA mu mw kS @@ -11535,7 +11939,7 @@ aj ai ai ai -ai +aI aI aI aI @@ -11547,7 +11951,7 @@ ai aI aI aI -ai +aI ai ai ai @@ -11560,19 +11964,19 @@ gW gW gW fw -gw -gW -gW +Rx +jk +jk gZ hl fv gW gW eu -it +jS eV gW -gW +YQ gW gW gW @@ -11597,7 +12001,7 @@ kK gW gW gW -kK +eu gW kY lc @@ -11606,7 +12010,7 @@ lg lc lc lc -lh +dz lw no lc @@ -11616,10 +12020,10 @@ nc lc nc lw +eA +eA lc -lc -lc -lc +eA mv kS kS @@ -11665,21 +12069,21 @@ ac ac aK bt -aK -aW -aW -aW +Di +Di +Di +Di ac aK cB aK ac -aW -aW -aW -aK +Di +Di +Di +Di bt -aK +co ac ac eu @@ -11691,9 +12095,9 @@ gW gW eu gx -gW +jk gP -gW +jk ho fv gW @@ -11701,33 +12105,33 @@ gW eu eu eu -gW -gW -gW -gW -gW +cW +Vy +cW +cW +cW fv -jh -jh +JY +JY jO gW jC gW -jh +JY gW -jh +JY gW gh gr -iQ +iY eV -gW +eJ gW eu zk zk zk -zk +eu zk kS kS @@ -11736,7 +12140,7 @@ kS lc lc lc -lh +dz lw nd lK @@ -11747,9 +12151,9 @@ lK nj lw mg +eA lc -lc -lc +eA kS kS aa @@ -11791,26 +12195,26 @@ aa aa aa ac -al -ai -ai -ai -aW -ai -ai -ai +TN +iQ +iQ +iQ +zO +zO +zO +zO ac ai ai ai ac -ai -ai -ai -aW -ai -ai -ai +zO +zO +zO +zO +iQ +iQ +iQ al eu eH @@ -11821,9 +12225,9 @@ gW gW gf gy -gW -gQ -gQ +jk +FK +FK lM fw gW @@ -11832,7 +12236,7 @@ eu iu eu eu -iQ +iY hk jg gw @@ -11860,13 +12264,13 @@ kQ eu aa kS -lc +eA lc kS ll lc lc -lh +dz lw nq lc @@ -11877,7 +12281,7 @@ lc nk lw mg -lc +eA lc mp kS @@ -11922,26 +12326,26 @@ aa aa ac am -ai -ai -ai -ai -ai -ai +iQ +iQ +bJ +zO +zO +zO bK ac ai ai ai ac -bK -ai -ai -ai -ai -ai -ai -am +ok +zO +zO +zO +iQ +iQ +iQ +YG eu eI eJ @@ -11961,11 +12365,11 @@ gW eu zk eu -gW -gW +cW +cW iY jh -hl +fg eu iu iu @@ -11978,8 +12382,8 @@ jS jS jS eu -iQ -gW +iY +cW eV gW gW @@ -11990,13 +12394,13 @@ zk eu aa kS -lc +eA lc kS lm lc lc -lh +dz lw nd lc @@ -12007,7 +12411,7 @@ lc nj lw mg -lc +eA lc mq kS @@ -12052,26 +12456,26 @@ aa aa ac bg -ay +Pd aL -ai -ai -ai -ai -aF +iQ +zO +zO +zO +qR aK ai aW ai aK -aF -ai -ai -ai -ai -aL +Hl +zO +zO +CR +iQ +jz ay -bg +xW eu gW gW @@ -12083,7 +12487,7 @@ gW gW gW gW -gW +YQ gW gW gW @@ -12091,11 +12495,11 @@ gW dY gW dY -gW -gW -eJ -gW -hl +cW +cW +JL +cW +fg eu eu eu @@ -12120,13 +12524,13 @@ bk bk aa kS -lc +eA lc kS ll lc lc -lh +dz lw nq lc @@ -12137,7 +12541,7 @@ lc nk lw mg -lc +eA lc mh kS @@ -12182,9 +12586,9 @@ aa aa ac ao -az -az -az +wj +wj +wj az az az @@ -12198,9 +12602,9 @@ az az az az -az -az -az +wj +wj +wj el eu eK @@ -12210,7 +12614,7 @@ fy gW gW gW -gW +YQ gW gW gW @@ -12223,13 +12627,13 @@ iv eu iM iR -gW -gW +cW +cW jq eu iu zk -gW +cW gW gW gW @@ -12239,10 +12643,10 @@ gW gW gW kj -iQ -gW -gW -gW +iY +cW +cW +cW eu aa aa @@ -12250,13 +12654,13 @@ aa aa aa kS -lc +eA lc kS ln lc lc -lh +dz lw nd lc @@ -12266,8 +12670,8 @@ lc lc nj lw -lc -lc +eA +eA lc mr kS @@ -12311,11 +12715,11 @@ aa aa aa ac -ap -ai -ai -ai -ai +GF +iQ +iQ +iQ +iQ ac me ac @@ -12327,10 +12731,10 @@ ac ac me ac -ai -ai -ai -ai +iQ +iQ +iQ +iQ ap eu eL @@ -12340,12 +12744,12 @@ fU gW gW fW +YQ gW gW gW gW -gW -gW +eJ gW gW eu @@ -12360,19 +12764,19 @@ eu iu zk GJ -gW -gW -gW -gW -gW -gW +eJ +YQ +YQ +YQ +YQ +YQ gW gW kj hk kE -eJ -gW +JL +cW eu aa aa @@ -12380,13 +12784,13 @@ aa aa kS kS -lc +eA lc kS lo lc lc -lh +dz lw nr lz @@ -12396,8 +12800,8 @@ lz lz nf lw -lc -lc +eA +eA lc ms kS @@ -12442,9 +12846,9 @@ aa aa ac aq -ai -ai -ai +iQ +iQ +iQ aY ac bu @@ -12458,10 +12862,10 @@ bL bu ac dE -ai -ai -ai -aq +iQ +iQ +iQ +Dv eu eu gW @@ -12473,10 +12877,10 @@ aR eY eY eY -fT +eY eY eu -dY +tt eu eu bk @@ -12497,12 +12901,12 @@ gW gW gW gW -gW +eJ kj jg -eW -gW -gW +it +cW +cW eu aa aa @@ -12510,7 +12914,7 @@ aa aa kT kS -lc +eA lc kS kS @@ -12571,33 +12975,33 @@ aa aa aa ac -ar -ai -ai -ai -ai +BG +iQ +iQ +iQ +iQ ma -ai -ai +PR +PR ac cr ai cr ac -ai -ai +PR +PR ma -ai -ai -ai -ai +iQ +iQ +iQ +iQ ar eu eM gW gW fA -gW +cW eu ag eY @@ -12606,8 +13010,8 @@ fm fm eY hA -gW -gW +cW +cW eu aa aa @@ -12619,7 +13023,7 @@ aa eu iu zk -gW +cW gW gW gW @@ -12640,7 +13044,7 @@ aa aa kU kS -lc +eA lc lc lc @@ -12701,10 +13105,10 @@ aa aa aa ac -as +id aA -aM -aM +yS +yS aZ ac bw @@ -12717,10 +13121,10 @@ ac bM bw ac -aZ +Bk aM aM -aA +yx as eu cT @@ -12735,9 +13139,9 @@ gH fm fm eY -gW +cW hJ -gW +cW eu aa aa @@ -12770,7 +13174,7 @@ aa aa kV kS -lc +eA lc lh la @@ -12879,15 +13283,15 @@ aa aa aa zk -gW +cW zk aa aa aa zk -gW +cW zk -gW +cW zk aa aa @@ -12900,7 +13304,7 @@ aa aa kS kS -lc +eA lc lh la @@ -13030,7 +13434,7 @@ aa aa kS kZ -lc +eA lc lh la @@ -13104,7 +13508,7 @@ ai ai ai ai -ai +cc ai ai ai @@ -13159,8 +13563,8 @@ aa aa aa kS -la -lc +Pm +eA lc lc lc @@ -13224,7 +13628,7 @@ ac av ai ai -ai +cc ai ai ai @@ -13290,7 +13694,7 @@ aa aa kS lb -lc +eA lc lc lc @@ -13382,8 +13786,8 @@ ag ag gB eY -fT -fT +fm +fm eY aa aa @@ -13420,7 +13824,7 @@ aa aa kS kS -lc +eA lc lc lc @@ -13438,7 +13842,7 @@ kS lc lc lc -kS +lc kS aa aa @@ -13567,9 +13971,9 @@ lc lc lc lc +lc +lc kS -kS -aa aa aa aa @@ -13636,17 +14040,17 @@ ew ag eY fj -fm +dC eY -gj -gj +vW +vW ia eY fm fm eY -gj -gj +vW +vW hR hY eY @@ -13697,6 +14101,8 @@ lc lc lc lc +lc +lc kS aa aa @@ -13711,8 +14117,6 @@ aa aa aa aa -aa -aa "} (87,1,1) = {" aa @@ -13766,18 +14170,18 @@ ex ag eY fk -fm +dC eY +dC +dC +dC +Ph fm fm -fm -fT -fm -fm -fT -fm -fm -fm +Ph +dC +dC +dC hZ eY aa @@ -13828,8 +14232,8 @@ kS kS kS kS -aa -aa +kS +kS aa aa aa @@ -13881,7 +14285,7 @@ ag ac ad ad -ad +ai ad ad ac @@ -13892,11 +14296,11 @@ mE ai mI ac -bb +Ay ag eY fl -fm +dC eY fj fZ @@ -13950,7 +14354,7 @@ aa kS kS lF -lc +eA lF kS lZ @@ -14010,9 +14414,9 @@ ag ag ab aa -aa -aa -aa +ad +ai +ad aa ab ag @@ -14022,11 +14426,11 @@ ac dQ ac ac -ag +gG ag eY eY -fT +Ph eY eY eY @@ -14035,8 +14439,8 @@ eY fm fm eY -fm -fm +dC +dC hS ia hq @@ -14079,13 +14483,13 @@ aa aa aa kS -lc -lc +eA +eA lF kS -lc -lc -lc +eA +eA +eA kS aa aa @@ -14141,7 +14545,7 @@ ag ab aS aS -aS +ag aS aS ab @@ -14165,10 +14569,10 @@ eY fm fm eY -fm +dC gH -fH -ib +IP +KQ hq aa aa @@ -14209,13 +14613,13 @@ aa aa aa kS -lc -lc +eA +eA lF kS lU -lc -lc +eA +eA kS aa aa @@ -14294,11 +14698,11 @@ fm fT fm fm -fT -fm -fm -fH -fm +Ph +dC +dC +IP +dC hq aa aa @@ -14339,12 +14743,12 @@ aa aa aa kS -lc +eA lN -lc -lc -lc -lc +eA +eA +eA +eA kS kS aa @@ -14401,19 +14805,19 @@ ag ag ag ag +TV ag ag ag ag ag -ag -ag +tE +ab +ab ab ab ab ab -ag -ag eY fm fm @@ -14425,10 +14829,10 @@ eY fm fm eY -fm -fm -fm -fm +dC +dC +dC +dC hq aa aa @@ -14542,7 +14946,7 @@ ab aa aa ab -ag +gG ag eY eY @@ -14672,20 +15076,20 @@ aa aa aa ab -ag +gG ag eY -fm -fm +dC +dC eU ga fH -ib -fm -fm -fm -fm -fm +Nd +PY +PY +PY +PY +PY eY aa aa @@ -14802,20 +15206,20 @@ bk bk bk ab -ag +gG ag eY -fm -fH +dC +IP fF ga fH -ib -fm +Nd +PY ib ib ib -fm +PY eY aa aa @@ -14932,20 +15336,20 @@ bk bk bk ab -ag +gG ag eY -fm +dC gH -fH +IP TG -fm -fm -fm +PY +PY +PY ib ib ib -fm +PY eY aa aa @@ -15062,20 +15466,20 @@ aa aa aa ab -ag +gG ag eY -fm -fH +dC +IP fh ga fH -ib -fm +Nd +PY ib ib ib -fm +PY eY aa aa @@ -15192,20 +15596,20 @@ aa aa aa aS -ag +gG ag eY -fm -fm +dC +dC eU ga fH -ib -fm -fm -fm -fm -fm +Nd +PY +PY +PY +PY +PY eY aa aa @@ -15322,10 +15726,10 @@ aa aa aa aS -ag +gG ag eY -fm +dC fL fF fF @@ -15452,16 +15856,16 @@ aa aa aa aS -ag +gG ag eY -fm +dC fJ -eN -eN -eN -eN -eN +db +db +db +db +db eY fm fm @@ -15582,23 +15986,23 @@ aa aa aa aS -ag +gG ag eY -fm +dC fK -eN -eN -eN -eN -eN +db +db +db +db +db fT fm -fm +EZ gj gj gj -fm +EZ eY aa aa @@ -15712,7 +16116,7 @@ aa aa aa ab -ag +gG ag eY eY @@ -15724,11 +16128,11 @@ eY eY eY fm -gH +PI fH fH fH -ib +Nd eY aa aa @@ -15854,11 +16258,11 @@ ag ag aR fm -gH +PI fH fH fH -ib +Nd eY aa aa @@ -15974,21 +16378,21 @@ aa aa ab ex -bb -ag -ag -ag +Ay +gG +gG +gG gb -ag -aE +gG +Fs gI eY fm -fm +EZ eN eN eN -fm +EZ eY aa aa diff --git a/_maps/RandomZLevels/away_mission/GS13_beach.dmm b/_maps/RandomZLevels/away_mission/GS13_beach.dmm index d439270f6f..c3e2151679 100644 --- a/_maps/RandomZLevels/away_mission/GS13_beach.dmm +++ b/_maps/RandomZLevels/away_mission/GS13_beach.dmm @@ -1,17 +1,17 @@ -"ab" = (/obj/effect/turf_decal/sand,/obj/structure/table,/obj/item/reagent_containers/rag/towel,/obj/item/reagent_containers/rag/towel{pixel_y = 4},/obj/item/reagent_containers/rag/towel{pixel_y = 8},/turf/open/floor/plating/beach/sand,/area/space) -"ac" = (/obj/structure/mirror{pixel_y = 28},/turf/open/floor/mineral/basaltstone_floor,/area/ctf) +"ab" = (/obj/effect/turf_decal/sand,/obj/structure/table,/obj/item/reagent_containers/rag/towel,/obj/item/reagent_containers/rag/towel{pixel_y = 4},/obj/item/reagent_containers/rag/towel{pixel_y = 8},/turf/open/floor/plating/beach/sand,/area/ctf) +"ac" = (/obj/structure/mirror{pixel_y = 28},/obj/effect/turf_decal/sand,/turf/open/floor/mineral/basaltstone_floor,/area/ctf) "ad" = (/turf/open/floor/plating/beach/coastline_b{dir = 1},/area/ctf) "at" = (/obj/structure/railing{dir = 1},/turf/open/floor/plaswood,/area/ctf) "aJ" = (/obj/structure/flora/ausbushes/stalkybush,/turf/open/floor/plating/beach/coastline_b{dir = 4},/area/ctf) -"aK" = (/obj/structure/chair/bench/left{dir = 4},/obj/machinery/light{dir = 1; color = "#ffa500"},/turf/open/floor/plaswood,/area/space) -"bk" = (/obj/structure/table/wood,/obj/item/kitchen/knife/butcher,/obj/item/reagent_containers/food/snacks/fishfry{pixel_y = 12; pixel_x = -3},/obj/machinery/light/small{dir = 8},/turf/open/floor/wood/wood_large,/area/ctf) +"aK" = (/obj/structure/chair/bench/left{dir = 4},/obj/machinery/light{dir = 1; color = "#ffa500"},/turf/open/floor/plaswood,/area/xenoarch/caloriteresearch_powered) +"bk" = (/obj/structure/table/wood,/obj/item/kitchen/knife/butcher,/obj/item/reagent_containers/food/snacks/fishfry{pixel_y = 12; pixel_x = -3},/obj/machinery/light/small{dir = 8},/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) "bv" = (/turf/open/floor/plating/beach/coastline_b{dir = 9},/area/ctf) "bL" = (/obj/structure/closet/secure_closet/personal/cabinet,/obj/item/clothing/suit/jacket/letterman_red,/turf/open/floor/wood,/area/ctf) "bQ" = (/turf/open/floor/plating/beach/coastline_t{dir = 10},/area/ctf) "bR" = (/obj/structure/closet/secure_closet/personal/cabinet,/obj/item/clothing/neck/necklace/dope,/turf/open/floor/wood,/area/ctf) "bY" = (/turf/open/floor/plating/beach/coastline_t/sandwater_inner{dir = 8},/area/ctf) "cl" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/drinks/bottle/champagne,/turf/open/floor/wood,/area/ctf) -"cC" = (/obj/structure/rack,/obj/item/bdsm_whip/ridingcrop/fattening,/turf/open/floor/wood/wood_large,/area/ctf) +"cC" = (/obj/structure/rack,/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) "cZ" = (/obj/effect/turf_decal/sand,/obj/effect/turf_decal/stripes/asteroid/line{dir = 10},/turf/open/floor/plating/beach/sand,/area/ctf) "dw" = (/obj/structure/table,/obj/item/storage/box/donkpockets,/turf/open/floor/wood,/area/ctf) "dz" = (/obj/item/reagent_containers/food/drinks/soda_cans/cola{pixel_x = -8; pixel_y = -4},/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{pixel_x = 15},/turf/open/floor/plating/beach/sand,/area/ctf) @@ -23,20 +23,21 @@ "er" = (/obj/machinery/hydroponics/constructable,/turf/open/floor/wood,/area/ctf) "et" = (/obj/effect/overlay/coconut,/turf/open/floor/plating/beach/sand,/area/ctf) "eA" = (/obj/structure/railing{dir = 1},/obj/structure/flora/ausbushes/stalkybush,/turf/open/floor/plating/beach/coastline_b,/area/ctf) -"eC" = (/obj/machinery/vending/hydronutrients,/turf/open/floor/wood,/area/ctf) +"eC" = (/obj/machinery/vending/hydronutrients{fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/wood,/area/ctf) "eE" = (/obj/item/reagent_containers/food/drinks/bottle/orangejuice{pixel_x = -6},/obj/item/reagent_containers/food/drinks/bottle/pineapplejuice{pixel_x = 6},/turf/open/floor/carpet/orange,/area/ctf) "eN" = (/obj/item/flashlight/flare/torch,/turf/open/floor/plating/beach/sand,/area/ctf) -"eO" = (/obj/machinery/gateway{dir = 1},/obj/effect/turf_decal/sand,/obj/effect/turf_decal/stripes/asteroid/line{dir = 1},/turf/open/floor/plating/beach/sand,/area/ctf) +"eO" = (/turf/open/floor/plaswood,/area/ctf) "eU" = (/obj/structure/table/wood,/obj/item/seeds/ambrosia,/obj/item/seeds/tower,/obj/item/seeds/ambrosia/gaia,/obj/item/seeds/cannabis,/obj/item/seeds/cannabis/white,/turf/open/floor/wood,/area/ctf) "fa" = (/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{pixel_x = -12},/turf/open/floor/plating/beach/sand,/area/ctf) "fd" = (/obj/item/toy/syndicateballoon,/turf/open/floor/plating/beach/sand,/area/ctf) -"fs" = (/obj/machinery/iv_drip/feeding_tube,/turf/open/floor/wood/wood_large,/area/ctf) +"fs" = (/obj/machinery/iv_drip/feeding_tube,/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) "fB" = (/obj/structure/table/wood,/turf/open/floor/wood,/area/ctf) "fE" = (/turf/open/floor/wood/damturf/broken2,/area/ctf) -"fH" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/wood{id_tag = "beachbigsauna"; name = "Large Sauna"},/turf/open/floor/wood,/area/space) -"fJ" = (/obj/structure/mirror{pixel_x = -28},/obj/effect/turf_decal/sand,/obj/structure/sink{pixel_y = 32},/turf/open/floor/plasteel/white,/area/ctf) +"fH" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/wood{id_tag = "beachbigsauna"; name = "Large Sauna"},/turf/open/floor/wood,/area/ctf) +"fJ" = (/obj/structure/mirror{pixel_x = -28},/obj/effect/turf_decal/sand,/obj/structure/sink{pixel_y = 32},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/ctf) "fK" = (/obj/structure/reagent_dispensers/beerkeg,/turf/open/floor/plating/beach/sand,/area/ctf) "fW" = (/obj/structure/closet/secure_closet/personal/cabinet,/obj/item/clothing/suit/jacket/letterman,/turf/open/floor/wood,/area/ctf) +"gd" = (/obj/machinery/vr_sleeper{dir = 1},/turf/open/floor/plaswood,/area/ctf) "gm" = (/obj/structure/flora/rock{desc = "A volcanic rock."; name = "coastal rock"},/turf/open/floor/plating/beach/water{desc = "What's the difference?"; name = "coastline water"},/area/ctf) "gs" = (/obj/structure/flora/rock{desc = "A volcanic rock."; name = "coastal rock"},/turf/open/indestructible/binary{density = 1; desc = "I can't move through this."; icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "deep ocean water"},/area/ctf) "gx" = (/obj/effect/overlay/palmtree_r,/obj/effect/overlay/coconut,/turf/open/floor/plating/beach/sand,/area/ctf) @@ -44,7 +45,7 @@ "gI" = (/obj/structure/chair/comfy/plywood,/turf/open/floor/plating/beach/sand,/area/ctf) "gJ" = (/obj/structure/table,/obj/item/reagent_containers/glass/beaker{pixel_x = 5},/turf/open/floor/wood,/area/ctf) "gQ" = (/turf/open/floor/plating/beach/coastline_t,/area/ctf) -"hd" = (/obj/structure/chair/bench/left{dir = 4},/turf/open/floor/plaswood,/area/space) +"hd" = (/obj/structure/chair/bench/left{dir = 4},/turf/open/floor/plaswood,/area/xenoarch/caloriteresearch_powered) "hp" = (/obj/effect/overlay/palmtree_l,/turf/open/floor/plating/beach/sand,/area/ctf) "hW" = (/obj/structure/rack/shelf,/obj/item/mop/advanced,/obj/item/mop/advanced,/obj/item/storage/bag/trash/bluespace,/obj/item/storage/bag/trash/bluespace,/turf/open/floor/wood,/area/ctf) "ii" = (/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{pixel_x = -9; pixel_y = -7},/turf/open/floor/plating/beach/sand,/area/ctf) @@ -52,50 +53,53 @@ "ip" = (/obj/structure/flora/ausbushes/fullgrass,/turf/open/indestructible/binary{density = 1; desc = "I can't move through this."; icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "deep ocean water"},/area/ctf) "ir" = (/obj/structure{desc = "Bar and beach south, dorms east."; icon = 'icons/obj/stationobjs.dmi'; icon_state = "signpost"; name = "directions signpost"},/turf/open/floor/plating/beach/sand,/area/ctf) "ix" = (/turf/open/floor/wood/damturf/broken3,/area/ctf) -"iL" = (/obj/effect/turf_decal/sand,/obj/structure/table,/obj/item/reagent_containers/rag/towel,/obj/item/reagent_containers/rag/towel{pixel_y = 4},/obj/item/reagent_containers/rag/towel{pixel_y = 4},/obj/item/reagent_containers/rag/towel{pixel_y = 8},/turf/open/floor/plating/beach/sand,/area/space) +"iL" = (/obj/effect/turf_decal/sand,/obj/structure/table,/obj/item/reagent_containers/rag/towel,/obj/item/reagent_containers/rag/towel{pixel_y = 4},/obj/item/reagent_containers/rag/towel{pixel_y = 4},/obj/item/reagent_containers/rag/towel{pixel_y = 8},/turf/open/floor/plating/beach/sand,/area/ctf) "iR" = (/turf/closed/wall/mineral/wood,/area/ctf) "iX" = (/turf/open/floor/carpet/orange,/area/ctf) "ja" = (/obj/structure/railing{dir = 4},/obj/structure/flora/ausbushes/fullgrass,/turf/open/floor/plating/beach/coastline_b{dir = 8},/area/ctf) +"jb" = (/obj/structure/toilet{pixel_y = 8},/obj/effect/turf_decal/sand,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/ctf) "jf" = (/obj/structure/railing{dir = 4},/turf/open/floor/wood,/area/ctf) "jr" = (/turf/open/floor/plating/beach/coastline_t{dir = 8},/area/ctf) "ju" = (/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind,/turf/open/floor/plating/beach/sand,/area/ctf) "jA" = (/turf/open/floor/plating/beach/coastline_t{dir = 5},/area/ctf) -"jM" = (/obj/machinery/button/door{id = "changlinhut1"; name = "changing room lock"; normaldoorcontrol = 1; pixel_x = -24; specialfunctions = 4},/turf/open/floor/mineral/basaltstone_floor,/area/ctf) +"jM" = (/obj/machinery/button/door{id = "changlinhut1"; name = "changing room lock"; normaldoorcontrol = 1; pixel_x = -24; specialfunctions = 4},/obj/effect/turf_decal/sand,/turf/open/floor/mineral/basaltstone_floor,/area/ctf) +"ki" = (/obj/machinery/vr_sleeper,/turf/open/floor/plaswood,/area/ctf) "kj" = (/obj/structure/sign/poster/contraband/corn_oil,/turf/closed/wall/mineral/sandstone,/area/ctf) -"kr" = (/obj/machinery/jukebox/disco/indestructible,/turf/open/floor/light/colour_cycle,/area/ctf) +"kr" = (/obj/effect/turf_decal/sand,/obj/machinery/gateway{dir = 1},/turf/open/floor/plating/beach/sand,/area/ctf) "kI" = (/obj/machinery/button/door{id = "toilet2"; name = "restroom lock"; normaldoorcontrol = 1; pixel_x = -24; specialfunctions = 4},/obj/effect/turf_decal/sand,/turf/open/floor/plasteel/white,/area/ctf) "kK" = (/obj/structure/closet/secure_closet/bar,/obj/item/storage/box/drinkingglasses,/obj/item/reagent_containers/food/drinks/shaker,/turf/open/floor/wood,/area/ctf) -"kR" = (/obj/structure/mirror{pixel_x = 28},/obj/effect/turf_decal/sand,/obj/structure/sink{pixel_y = 32},/turf/open/floor/plasteel/white,/area/ctf) -"kT" = (/obj/structure/sauna_oven,/obj/machinery/light{dir = 1; color = "#ffa500"},/turf/open/floor/plaswood,/area/space) +"kR" = (/obj/structure/mirror{pixel_x = 28},/obj/effect/turf_decal/sand,/obj/structure/sink{pixel_y = 32},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/ctf) +"kT" = (/obj/structure/sauna_oven,/obj/machinery/light{dir = 1; color = "#ffa500"},/turf/open/floor/plaswood,/area/xenoarch/caloriteresearch_powered) "kV" = (/obj/machinery/button/door{id = "theloveshack4"; name = "door lock"; normaldoorcontrol = 1; pixel_x = 24; specialfunctions = 4},/obj/structure/bed/double,/obj/item/bedsheet/double_blue,/turf/open/floor/wood,/area/ctf) "la" = (/obj/item/toy/sword/cx,/obj/item/toy/sword,/obj/item/toy/katana,/obj/item/toy/foamblade,/turf/open/floor/plating/beach/sand,/area/ctf) "ld" = (/obj/machinery/deepfryer,/turf/open/floor/wood,/area/ctf) "lh" = (/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{pixel_x = -12},/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{pixel_x = 13},/turf/open/floor/plating/beach/sand,/area/ctf) "ln" = (/obj/structure/flora/ausbushes/fullgrass,/turf/open/floor/plating/beach/coastline_b{dir = 4},/area/ctf) "lq" = (/obj/structure/flora/ausbushes/stalkybush,/turf/open/floor/plating/beach/coastline_b,/area/ctf) -"lP" = (/obj/structure/table/wood,/obj/item/gun/energy/kinetic_accelerator/crossbow/feeder,/turf/open/floor/wood/wood_large,/area/ctf) +"lP" = (/obj/structure/table/wood,/obj/item/gun/energy/kinetic_accelerator/crossbow/feeder,/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) "lY" = (/obj/structure/flora/ausbushes/stalkybush,/turf/open/floor/plating/beach/coastline_b{dir = 10},/area/ctf) "mm" = (/obj/item/reagent_containers/food/drinks/bottle/wine,/obj/item/reagent_containers/food/drinks/bottle/rum,/obj/structure/table/wood,/turf/open/floor/wood,/area/ctf) "mp" = (/obj/item/toy/plush/random,/turf/open/floor/plating/beach/sand,/area/ctf) "mu" = (/obj/structure/flora/ausbushes/brflowers,/turf/open/floor/grass,/area/ctf) "mv" = (/obj/structure/flora/rock/pile,/turf/open/floor/plating/beach/water,/area/ctf) -"mF" = (/turf/closed/indestructible/wood,/area/space) +"mz" = (/obj/effect/turf_decal/sand,/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/machinery/shower{dir = 8},/turf/open/floor/plasteel/white,/area/ctf) +"mF" = (/obj/effect/turf_decal/sand,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/machinery/shower{pixel_y = 19},/turf/open/floor/plating/beach/sand,/area/ctf) "mL" = (/obj/structure/flora/ausbushes/fullgrass,/turf/open/floor/grass,/area/ctf) -"no" = (/obj/item/toy/plush/random,/turf/open/floor/plating/beach/coastline_t{dir = 8},/area/ctf) -"np" = (/obj/machinery/vending/dinnerware,/turf/open/floor/wood,/area/ctf) +"no" = (/obj/item/toy/fluff/bone_poly,/turf/open/floor/plating/beach/sand,/area/ctf) +"np" = (/obj/machinery/vending/dinnerware{fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/wood,/area/ctf) "nr" = (/obj/structure/sink/kitchen{desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink"; pixel_y = 28},/turf/open/floor/wood,/area/ctf) "ny" = (/turf/open/floor/plating/beach/sand,/area/ctf) "nA" = (/obj/machinery/button/door{id = "toilet1"; name = "restroom lock"; normaldoorcontrol = 1; pixel_x = 24; specialfunctions = 4},/obj/effect/turf_decal/sand,/turf/open/floor/plasteel/white,/area/ctf) -"nK" = (/obj/machinery/door/airlock/wood{id_tag = "oldshack"; name = "Decrepit Shack"},/turf/open/floor/wood/wood_large,/area/ctf) -"oa" = (/obj/machinery/shower{dir = 8},/obj/effect/turf_decal/sand,/turf/open/floor/plasteel/white,/area/ctf) +"nK" = (/obj/machinery/door/airlock/wood{id_tag = "oldshack"; name = "Decrepit Shack"},/obj/structure/barricade/wooden,/turf/open/floor/wood/wood_large,/area/ctf) +"oa" = (/obj/machinery/shower{dir = 8},/obj/effect/turf_decal/sand,/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/ctf) "oo" = (/obj/structure/flora/ausbushes/stalkybush,/turf/open/floor/plating/beach/coastline_b{dir = 8},/area/ctf) "os" = (/obj/machinery/door/airlock/sandstone{id_tag = "theloveshack2"; name = "Beach Hut"},/turf/open/floor/wood,/area/ctf) "ou" = (/obj/effect/turf_decal/stripes/white/full,/obj/item/toy/beach_ball,/turf/open/floor/plating/beach/sand,/area/ctf) -"ov" = (/obj/effect/turf_decal/sand,/obj/machinery/vending/snack/random,/turf/open/floor/plating/beach/sand,/area/ctf) +"ov" = (/obj/effect/turf_decal/sand,/obj/machinery/vending/snack/random{fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/plating/beach/sand,/area/ctf) "ox" = (/obj/effect/turf_decal/sand,/obj/effect/turf_decal/stripes/asteroid/line{dir = 9},/turf/open/floor/plating/beach/sand,/area/ctf) "oG" = (/obj/effect/turf_decal/stripes/white/corner,/obj/effect/turf_decal/stripes/white/line{dir = 4},/turf/open/floor/plating/beach/sand,/area/ctf) "oR" = (/obj/structure/table/wood,/obj/item/storage/box/drinkingglasses,/turf/open/floor/wood,/area/ctf) -"pd" = (/obj/structure/table/wood,/obj/item/reagent_containers/glass/beaker/lipoifier{pixel_x = -8},/obj/item/reagent_containers/glass/beaker/waterbottle,/turf/open/floor/wood/wood_large,/area/ctf) +"pd" = (/obj/structure/table/wood,/obj/item/reagent_containers/glass/beaker/lipoifier{pixel_x = -8},/obj/item/reagent_containers/glass/beaker/waterbottle,/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) "pP" = (/obj/machinery/button/door{id = "theloveshack5"; name = "door lock"; normaldoorcontrol = 1; pixel_x = 24; specialfunctions = 4},/obj/structure/bed/double,/obj/item/bedsheet/black/double,/turf/open/floor/wood,/area/ctf) "pS" = (/obj/effect/turf_decal/sand,/obj/machinery/jukebox,/turf/open/floor/plating/beach/sand,/area/ctf) "qc" = (/obj/structure/flora/ausbushes/reedbush,/turf/open/floor/plating/beach/coastline_b{dir = 8},/area/ctf) @@ -106,27 +110,28 @@ "qQ" = (/obj/structure/railing{dir = 1},/obj/structure/flora/ausbushes/fullgrass,/turf/open/floor/plating/beach/coastline_b,/area/ctf) "qU" = (/obj/structure/flora/rock{desc = "A volcanic rock."; name = "coastal rock"},/turf/open/floor/plating/beach/water,/area/ctf) "rf" = (/obj/effect/turf_decal/stripes/white/full,/turf/open/floor/plating/beach/sand,/area/ctf) -"rh" = (/obj/effect/turf_decal/sand,/obj/machinery/vending/mealdor,/turf/open/floor/plating/beach/sand,/area/ctf) +"rh" = (/obj/effect/turf_decal/sand,/obj/machinery/vending/mealdor{fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/plating/beach/sand,/area/ctf) "rp" = (/obj/structure/table/wood,/obj/item/storage/fancy/donut_box,/turf/open/floor/wood,/area/ctf) "rz" = (/obj/effect/turf_decal/sand{density = 1},/obj/effect/decal/fakelattice,/turf/open/floor/pod/light{density = 1},/area/ctf) -"rY" = (/obj/machinery/light/small{dir = 1},/turf/open/floor/wood/wood_large,/area/ctf) +"rK" = (/obj/structure/closet/athletic_mixed{anchored = 1},/obj/effect/turf_decal/sand,/turf/open/floor/plating/beach/sand,/area/ctf) +"rY" = (/obj/machinery/light/small{dir = 1},/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) "rZ" = (/obj/structure/table/wood,/obj/item/clothing/glasses/sunglasses,/obj/item/reagent_containers/food/drinks/beer,/obj/item/reagent_containers/food/drinks/beer,/turf/open/floor/wood,/area/ctf) "sb" = (/turf/open/floor/wood/damturf/broken1,/area/ctf) "se" = (/turf/open/floor/light/colour_cycle,/area/ctf) -"sE" = (/obj/machinery/button/door{id = "beachbigsauna"; name = "Large Sauna Lock"; normaldoorcontrol = 1; specialfunctions = 4; pixel_y = -24},/turf/open/floor/wood,/area/space) +"sE" = (/obj/machinery/button/door{id = "beachbigsauna"; name = "Large Sauna Lock"; normaldoorcontrol = 1; specialfunctions = 4; pixel_y = -24},/turf/open/floor/wood,/area/xenoarch/caloriteresearch_powered) "sI" = (/obj/item/storage/bag/tray,/obj/item/reagent_containers/food/snacks/burger/mcguffin,/obj/item/reagent_containers/food/snacks/burger/chicken,/obj/item/reagent_containers/food/snacks/burger/cheese,/turf/open/floor/carpet/orange,/area/ctf) "tt" = (/obj/effect/turf_decal/sand,/obj/effect/turf_decal/stripes/asteroid/line{dir = 8},/turf/open/floor/plating/beach/sand,/area/ctf) "tw" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/drinks/ale,/turf/open/floor/wood,/area/ctf) -"tH" = (/obj/structure/table/wood,/obj/structure/sink{pixel_y = 32},/obj/item/stack/sheet/mineral/wood/fifty,/obj/item/stack/sheet/mineral/wood/fifty,/obj/item/reagent_containers/glass/bucket,/turf/open/floor/plaswood,/area/space) -"tI" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/wood{id_tag = "beachsmallsauna"; name = "Small Sauna"},/turf/open/floor/wood,/area/space) +"tH" = (/obj/structure/table/wood,/obj/structure/sink{pixel_y = 32},/obj/item/stack/sheet/mineral/wood/fifty,/obj/item/stack/sheet/mineral/wood/fifty,/obj/item/stack/sheet/mineral/wood/fifty,/obj/item/reagent_containers/glass/bucket,/obj/item/reagent_containers/glass/bucket,/turf/open/floor/plaswood,/area/xenoarch/caloriteresearch_powered) +"tI" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/wood{id_tag = "beachsmallsauna"; name = "Small Sauna"},/turf/open/floor/wood,/area/ctf) "tK" = (/obj/structure/railing{dir = 8},/obj/structure/railing{dir = 1},/obj/structure/barricade/wooden,/turf/open/floor/plating/beach/coastline_b{dir = 9},/area/ctf) "tN" = (/obj/structure/window/reinforced{dir = 4},/obj/effect/mob_spawn/human/beach/alive/lifeguard,/turf/open/floor/wood,/area/ctf) "tP" = (/obj/structure/railing{dir = 8},/turf/open/floor/plating/beach/coastline_b{dir = 4},/area/ctf) -"tZ" = (/obj/structure/sauna_oven,/turf/open/floor/plaswood,/area/space) +"tZ" = (/obj/structure/sauna_oven,/turf/open/floor/plaswood,/area/xenoarch/caloriteresearch_powered) "ub" = (/turf/open/floor/plating/beach/coastline_b{dir = 4},/area/ctf) -"ui" = (/obj/structure/window{dir = 4},/obj/structure/fans/tiny/invisible,/turf/open/water/jungle,/area/space) +"ui" = (/obj/structure/window{dir = 4},/obj/structure/fans/tiny/invisible,/turf/open/water/jungle,/area/xenoarch/caloriteresearch_powered) "un" = (/turf/open/floor/plating/beach/coastline_t/sandwater_inner{dir = 1},/area/ctf) -"ur" = (/obj/effect/turf_decal/sand,/turf/open/floor/plasteel/white,/area/ctf) +"ur" = (/obj/effect/turf_decal/sand,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/machinery/shower{dir = 4},/turf/open/floor/plasteel/white,/area/ctf) "uv" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,/turf/open/floor/wood,/area/ctf) "uw" = (/obj/effect/turf_decal/sand,/obj/structure/table/wood,/obj/item/toy/poolnoodle/red,/obj/item/toy/poolnoodle/yellow,/obj/item/toy/poolnoodle/blue,/obj/item/reagent_containers/rag/towel/random,/obj/item/reagent_containers/rag/towel/random,/obj/item/reagent_containers/rag/towel/random,/turf/open/floor/plating/beach/sand,/area/ctf) "ux" = (/obj/structure/barricade/wooden,/turf/open/floor/wood,/area/ctf) @@ -134,60 +139,65 @@ "uH" = (/obj/effect/overlay/palmtree_r,/turf/open/floor/plating/beach/sand,/area/ctf) "uU" = (/obj/effect/turf_decal/sand,/obj/effect/turf_decal/sand,/turf/open/floor/plating/beach/sand,/area/ctf) "va" = (/obj/structure/flora/ausbushes/fullgrass,/turf/open/floor/plating/beach/coastline_b{dir = 8},/area/ctf) -"vb" = (/turf/open/floor/wood/wood_large,/area/ctf) -"vm" = (/obj/machinery/vending/boozeomat,/turf/open/floor/wood,/area/ctf) -"vn" = (/obj/effect/turf_decal/sand,/obj/machinery/portable_atmospherics/canister/water_vapor,/turf/open/floor/plating/beach/sand,/area/space) +"vb" = (/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) +"vm" = (/obj/machinery/vending/boozeomat{fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/wood,/area/ctf) +"vn" = (/obj/effect/turf_decal/sand,/obj/effect/turf_decal/box,/obj/machinery/space_heater,/turf/open/floor/plating/beach/sand,/area/ctf) "vp" = (/obj/item/toy/beach_ball,/turf/open/floor/plating/beach/sand,/area/ctf) -"vs" = (/obj/machinery/vending/autodrobe/all_access,/turf/open/floor/plating/beach/sand,/area/ctf) +"vs" = (/obj/machinery/vending/autodrobe/all_access{fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/plating/beach/sand,/area/ctf) "vv" = (/turf/closed/indestructible/wood,/area/ctf) -"vw" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/burger/fish,/turf/open/floor/wood/wood_large,/area/ctf) -"vz" = (/turf/open/floor/plating/beach/sand,/area/space) +"vw" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/burger/fish,/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) +"vz" = (/obj/machinery/autolathe,/obj/item/stack/sheet/glass/fifty,/obj/item/stack/sheet/metal/fifty,/turf/open/floor/plating/beach/sand,/area/ctf) "vC" = (/obj/structure/railing,/turf/open/floor/wood,/area/ctf) "vE" = (/obj/structure/chair/wood,/turf/open/floor/wood,/area/ctf) -"vK" = (/obj/machinery/button/door{pixel_y = 22; id = "oldshack_prison"},/turf/open/floor/wood/wood_large,/area/ctf) +"vK" = (/obj/machinery/button/door{pixel_y = 22; id = "oldshack_prison"},/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) "vR" = (/obj/machinery/door/airlock/sandstone{id_tag = "toilet2"; name = "restroom stall"},/obj/effect/turf_decal/sand,/turf/open/floor/plasteel/white,/area/ctf) -"vX" = (/obj/structure/closet/secure_closet/personal/cabinet,/obj/item/hatchet/bone,/turf/open/floor/wood/wood_large,/area/ctf) +"vX" = (/obj/structure/closet/secure_closet/personal/cabinet,/obj/item/hatchet/bone,/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) "wo" = (/obj/machinery/computer/security/telescreen/entertainment{pixel_y = 32},/turf/open/floor/wood,/area/ctf) "wz" = (/obj/structure/flora/ausbushes/leafybush,/turf/open/floor/plating/beach/coastline_b{dir = 1},/area/ctf) "wC" = (/obj/effect/overlay/palmtree_l{pixel_y = 25},/obj/effect/overlay/coconut{pixel_x = -7; pixel_y = 7},/turf/open/floor/plating/beach/sand,/area/ctf) +"wS" = (/obj/machinery/vending/cigarette{default_price = 0; extra_price = 0; fair_market_price = 0},/turf/open/floor/wood,/area/ctf) "wW" = (/obj/structure/flora/ausbushes/reedbush,/turf/open/indestructible/binary{density = 1; desc = "I can't move through this."; icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "deep ocean water"},/area/ctf) "xq" = (/obj/structure/table/wood,/obj/machinery/chem_dispenser/drinks/fullupgrade{dir = 8},/turf/open/floor/wood,/area/ctf) "xw" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/item/bikehorn/airhorn,/obj/structure/table/wood,/obj/item/storage/firstaid,/obj/item/storage/firstaid/brute,/turf/open/floor/wood,/area/ctf) +"xF" = (/obj/item/toy/plush/random,/turf/open/floor/plating/beach/coastline_t/sandwater_inner{dir = 4},/area/ctf) "xJ" = (/obj/effect/turf_decal/sand,/obj/effect/turf_decal/stripes/asteroid/line{dir = 5},/turf/open/floor/plating/beach/sand,/area/ctf) -"xP" = (/obj/structure/closet/wardrobe/mixed,/turf/open/floor/mineral/basaltstone_floor,/area/ctf) -"yc" = (/obj/structure/chair/bench/left{dir = 8},/turf/open/floor/plaswood,/area/space) +"xP" = (/obj/structure/closet/wardrobe/mixed,/obj/effect/turf_decal/sand,/turf/open/floor/mineral/basaltstone_floor,/area/ctf) +"yc" = (/obj/structure/chair/bench/left{dir = 8},/turf/open/floor/plaswood,/area/xenoarch/caloriteresearch_powered) "yg" = (/obj/item/trash/chips{pixel_x = -18; pixel_y = 7},/turf/open/floor/plating/beach/sand,/area/ctf) "yk" = (/turf/open/floor/plating/beach/coastline_t{dir = 6},/area/ctf) "yy" = (/turf/open/floor/plating/beach/coastline_t{dir = 1},/area/ctf) +"yC" = (/obj/item/toy/plush/random,/turf/open/floor/plating/beach/coastline_t/sandwater_inner{dir = 1},/area/ctf) "yH" = (/obj/structure/table,/obj/item/kitchen/rollingpin,/turf/open/floor/wood,/area/ctf) -"yJ" = (/obj/effect/turf_decal/sand,/obj/machinery/vending/cigarette,/turf/open/floor/plating/beach/sand,/area/ctf) +"yJ" = (/obj/effect/turf_decal/sand,/obj/machinery/vending/cigarette{fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/plating/beach/sand,/area/ctf) "yP" = (/obj/structure/flora/ausbushes/reedbush,/turf/open/floor/plating/beach/water,/area/ctf) "zg" = (/turf/open/floor/wood,/area/ctf) "zh" = (/obj/effect/overlay/palmtree_l,/turf/open/floor/plating/beach/coastline_t{dir = 4},/area/ctf) -"zD" = (/obj/structure/window{dir = 8},/obj/structure/fans/tiny/invisible,/turf/open/water/jungle,/area/space) +"zD" = (/obj/structure/window{dir = 8},/obj/structure/fans/tiny/invisible,/turf/open/water/jungle,/area/xenoarch/caloriteresearch_powered) "zG" = (/obj/structure/flora/ausbushes/fullgrass,/turf/open/floor/plating/beach/coastline_b{dir = 1},/area/ctf) "zH" = (/obj/effect/turf_decal/stripes/white/line{dir = 4},/turf/open/floor/plating/beach/sand,/area/ctf) -"Aj" = (/obj/machinery/portable_atmospherics/canister/water_vapor,/obj/structure/sink{pixel_y = 32},/turf/open/floor/plaswood,/area/space) +"Aj" = (/obj/machinery/portable_atmospherics/canister/water_vapor,/obj/structure/sink{pixel_y = 32},/obj/machinery/portable_atmospherics/canister/water_vapor,/turf/open/floor/plaswood,/area/xenoarch/caloriteresearch_powered) "As" = (/obj/effect/overlay/palmtree_r{desc = "How did you get here?"; icon_state = "palm2"; name = "\proper island palm tree"},/turf/open/floor/plating/beach/sand,/area/ctf) -"AC" = (/obj/effect/turf_decal/stripes/white/corner,/turf/open/floor/plating/beach/sand,/area/ctf) +"AC" = (/obj/effect/turf_decal/stripes/white/corner,/obj/item/toy/fluff/frisbee_poly,/turf/open/floor/plating/beach/sand,/area/ctf) "AH" = (/obj/effect/overlay/palmtree_l,/obj/effect/overlay/coconut,/turf/open/floor/plating/beach/sand,/area/ctf) -"BM" = (/obj/item/gun/energy/fatoray,/turf/closed/mineral,/area/ctf) +"BM" = (/obj/item/melee/curator_whip/fattening,/turf/closed/mineral,/area/ctf) "BP" = (/obj/machinery/door/airlock/sandstone{id_tag = "theloveshack4"; name = "Beach Hut"},/turf/open/floor/wood,/area/ctf) +"Ce" = (/turf/closed/indestructible/wood,/area/xenoarch/caloriteresearch_powered) "Ch" = (/obj/machinery/button/door{id = "theloveshack1"; name = "door lock"; normaldoorcontrol = 1; pixel_x = 24; specialfunctions = 4},/obj/item/bedsheet/double_gato,/obj/structure/bed/double,/turf/open/floor/wood,/area/ctf) "Cq" = (/obj/structure/sign/poster/official/gato_logo,/turf/closed/wall/mineral/sandstone,/area/ctf) "CA" = (/obj/structure/flora/ausbushes/leafybush,/turf/open/floor/plating/beach/coastline_b{dir = 4},/area/ctf) +"CP" = (/obj/item/gun/magic/wand/food,/turf/open/floor/plating/beach/sand,/area/ctf) "CS" = (/obj/effect/turf_decal/sand,/obj/effect/turf_decal/stripes/asteroid/line{dir = 4},/turf/open/floor/plating/beach/sand,/area/ctf) -"Db" = (/obj/structure/bed/dogbed,/obj/item/clothing/neck/petcollar/locked/calorite{pixel_x = -6; pixel_y = -8},/obj/machinery/light/small{dir = 1},/turf/open/floor/wood/damturf/broken3,/area/ctf) +"Db" = (/obj/structure/bed/dogbed,/obj/item/clothing/neck/petcollar/locked/calorite{pixel_x = -6; pixel_y = -8},/obj/machinery/light/small{dir = 1},/turf/open/floor/wood/damturf/broken3,/area/xenoarch/caloriteresearch_powered) "Du" = (/obj/structure/flora/ausbushes/stalkybush,/turf/open/floor/plating/beach/water,/area/ctf) "Dw" = (/obj/structure/closet/secure_closet/personal/cabinet,/obj/item/clothing/glasses/heat,/turf/open/floor/wood,/area/ctf) "DN" = (/obj/item/reagent_containers/food/drinks/beer/light{pixel_x = -14; pixel_y = 15},/turf/open/floor/plating/beach/sand,/area/ctf) -"DT" = (/obj/structure/mineral_door/wood{name = "bar"},/turf/open/floor/wood,/area/ctf) +"DT" = (/obj/structure/mineral_door/sandstone,/turf/open/floor/wood,/area/ctf) "DU" = (/obj/structure/table,/obj/item/reagent_containers/food/drinks/soda_cans/sodawater,/obj/item/reagent_containers/food/drinks/soda_cans/shamblers,/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,/obj/item/reagent_containers/food/drinks/soda_cans/air,/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter,/obj/item/reagent_containers/food/drinks/soda_cans/tonic,/obj/item/reagent_containers/spray/spraytan,/turf/open/floor/plating/beach/sand,/area/ctf) "Ea" = (/obj/structure/flora/ausbushes/reedbush,/turf/open/floor/plating/beach/water{desc = "What's the difference?"; name = "coastline water"},/area/ctf) "Eb" = (/obj/effect/turf_decal/sand,/turf/open/floor/plating/beach/sand,/area/ctf) "Eo" = (/obj/machinery/door/airlock/sandstone{id_tag = "toilet1"; name = "restroom stall"},/obj/effect/turf_decal/sand,/turf/open/floor/plasteel/white,/area/ctf) "Eq" = (/obj/item/reagent_containers/food/drinks/soda_cans/cola{pixel_x = -5},/turf/open/floor/plating/beach/sand,/area/ctf) -"Es" = (/turf/open/floor/wood,/area/space) +"Es" = (/turf/open/floor/wood,/area/xenoarch/caloriteresearch_powered) "ED" = (/mob/living/simple_animal/parrot,/turf/open/floor/plating/beach/sand,/area/ctf) "EE" = (/obj/effect/turf_decal/sand,/obj/effect/turf_decal/stripes/asteroid/line,/turf/open/floor/plating/beach/sand,/area/ctf) "EL" = (/obj/effect/turf_decal/sand,/obj/effect/turf_decal/stripes/asteroid/line{dir = 1},/turf/open/floor/plating/beach/sand,/area/ctf) @@ -196,10 +206,10 @@ "ER" = (/obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow,/turf/open/floor/wood,/area/ctf) "FF" = (/obj/item/stack/sheet/plastic/fifty,/obj/item/stack/sheet/plastic/fifty,/obj/machinery/autolathe/toy,/turf/open/floor/plating/beach/sand,/area/ctf) "FH" = (/obj/item/clothing/glasses/heat,/turf/open/floor/plating/beach/sand,/area/ctf) -"FQ" = (/obj/structure/rack/shelf,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/turf/open/floor/wood/wood_large,/area/ctf) +"FQ" = (/obj/structure/rack/shelf,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) "Gg" = (/obj/structure/table,/turf/open/floor/wood,/area/ctf) -"Gk" = (/obj/machinery/button/door{pixel_y = -22; id = "oldshack"},/obj/item/kirbyplants/dead,/turf/open/floor/wood/wood_large,/area/ctf) -"Gt" = (/obj/structure/closet/crate/critter,/turf/open/floor/wood/wood_large,/area/ctf) +"Gk" = (/obj/machinery/button/door{pixel_y = -22; id = "oldshack"},/obj/item/kirbyplants/dead,/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) +"Gt" = (/obj/structure/closet/crate/critter,/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) "GI" = (/mob/living/simple_animal/crab/kreb,/turf/open/floor/plating/beach/sand,/area/ctf) "GM" = (/obj/structure/table/wood,/obj/item/ashtray,/turf/open/floor/wood,/area/ctf) "GP" = (/obj/structure/weightmachine/stacklifter,/obj/effect/turf_decal/sand,/turf/open/floor/plating/beach/sand,/area/ctf) @@ -211,18 +221,18 @@ "HF" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/turf/open/floor/wood,/area/ctf) "HR" = (/obj/structure/sign/poster/contraband/red_rum,/turf/closed/wall/mineral/sandstone,/area/ctf) "HV" = (/obj/item/clothing/head/collectable/paper{desc = "What looks like an ordinary paper hat is actually a rare and valuable collector's edition paper hat. Keep away from fire, Curators, and ocean waves."},/turf/open/floor/plating/beach/water,/area/ctf) -"Ii" = (/obj/structure/chair/bench/left{dir = 8},/obj/machinery/button/door{id = "beachsmallsauna"; name = "Small Sauna Lock"; normaldoorcontrol = 1; specialfunctions = 4; pixel_y = -24},/turf/open/floor/plaswood,/area/space) +"Ii" = (/obj/structure/chair/bench/left{dir = 8},/obj/machinery/button/door{id = "beachsmallsauna"; name = "Small Sauna Lock"; normaldoorcontrol = 1; specialfunctions = 4; pixel_y = -24},/turf/open/floor/plaswood,/area/xenoarch/caloriteresearch_powered) "Im" = (/turf/open/floor/plating/beach/coastline_b{dir = 8},/area/ctf) "Ip" = (/obj/structure/sign/poster/contraband/syndicate_recruitment{pixel_x = -28},/turf/open/floor/plating/beach/sand,/area/ctf) "Iu" = (/obj/structure/flora/ausbushes/stalkybush,/turf/open/indestructible/binary{density = 1; desc = "I can't move through this."; icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "deep ocean water"},/area/ctf) -"Iv" = (/obj/effect/turf_decal/sand,/turf/open/floor/plating/beach/sand,/area/space) +"Iv" = (/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/structure/closet/crate{anchored = 1},/obj/effect/turf_decal/sand,/obj/item/reagent_containers/rag/towel/random,/obj/item/reagent_containers/rag/towel,/obj/item/clothing/under/color/grey,/turf/open/floor/plating/beach/sand,/area/ctf) "ID" = (/obj/structure/flora/ausbushes/ppflowers,/turf/open/floor/grass,/area/ctf) "IO" = (/obj/structure/railing{dir = 4},/turf/open/floor/plating/beach/coastline_b{dir = 8},/area/ctf) "IS" = (/obj/structure/flora/ausbushes/stalkybush{desc = "It can't be smoked."; name = "sea weed"},/turf/open/indestructible/binary{density = 1; desc = "I can't move through this."; icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "deep ocean water"},/area/ctf) "Ja" = (/obj/structure/weightmachine/weightlifter,/obj/effect/turf_decal/sand,/turf/open/floor/plating/beach/sand,/area/ctf) -"Ji" = (/obj/structure/dresser,/turf/open/floor/wood/wood_large,/area/ctf) +"Ji" = (/obj/structure/dresser,/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) "Jp" = (/turf/open/floor/plating/beach/coastline_b,/area/ctf) -"Jq" = (/obj/machinery/vending/clothing,/turf/open/floor/plating/beach/sand,/area/ctf) +"Jq" = (/obj/machinery/vending/clothing{fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/plating/beach/sand,/area/ctf) "Js" = (/obj/effect/turf_decal/stripes/white/line,/turf/open/floor/plating/beach/sand,/area/ctf) "Jv" = (/obj/machinery/seed_extractor,/turf/open/floor/wood,/area/ctf) "JB" = (/obj/effect/turf_decal/stripes/white/line{dir = 8},/turf/open/floor/plating/beach/sand,/area/ctf) @@ -234,20 +244,22 @@ "JZ" = (/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{pixel_x = -17; pixel_y = 17},/turf/open/floor/plating/beach/sand,/area/ctf) "Kh" = (/turf/open/floor/plating/beach/coastline_t/sandwater_inner,/area/ctf) "Ku" = (/obj/machinery/button/door{id = "loveshack"; name = "love shack lock"; normaldoorcontrol = 1; pixel_x = 24; specialfunctions = 4},/obj/structure/bed/double,/obj/item/bedsheet/double_red,/turf/open/floor/wood,/area/ctf) +"Kv" = (/mob/living/simple_animal/bot/secbot/grievous/toy,/turf/open/floor/plating/beach/sand,/area/ctf) "Kw" = (/obj/machinery/door/airlock/sandstone{id_tag = "theloveshack3"; name = "Beach Hut"},/turf/open/floor/wood,/area/ctf) "KE" = (/turf/open/floor/wood/damturf/broken4,/area/ctf) -"KG" = (/obj/structure/table/wood,/obj/machinery/microwave{pixel_y = 6},/turf/open/floor/wood/wood_large,/area/ctf) +"KG" = (/obj/structure/table/wood,/obj/machinery/microwave{pixel_y = 6},/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) "KH" = (/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/turf/open/floor/plating/beach/sand,/area/ctf) -"KQ" = (/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/structure/closet/crate,/obj/effect/turf_decal/sand,/obj/item/reagent_containers/rag/towel/random,/turf/open/floor/plating/beach/sand,/area/ctf) +"KQ" = (/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/effect/turf_decal/sand,/obj/item/reagent_containers/rag/towel/random,/obj/item/reagent_containers/rag/towel,/obj/item/clothing/under/color/grey,/obj/structure/closet/crate{anchored = 1},/turf/open/floor/plating/beach/sand,/area/ctf) "Lf" = (/obj/item/toy/minimeteor,/turf/open/floor/plating/beach/sand,/area/ctf) "Lj" = (/obj/item/melee/skateboard{color = "#6666ff"; desc = "Yes, surf boards have wheels. Stop laughing."; name = "surf board"; pixel_x = -15; pixel_y = 1},/turf/open/floor/plating/beach/water,/area/ctf) "Lv" = (/obj/machinery/processor,/turf/open/floor/wood,/area/ctf) "Lw" = (/obj/structure/closet/secure_closet/freezer/kitchen{req_access = list(25)},/obj/item/storage/fancy/egg_box,/obj/item/reagent_containers/food/condiment/milk,/obj/item/reagent_containers/food/condiment/milk,/obj/item/reagent_containers/food/condiment/flour,/obj/item/reagent_containers/food/condiment/flour,/obj/item/reagent_containers/food/condiment/mayonnaise,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/condiment/enzyme,/obj/item/reagent_containers/food/condiment/enzyme{layer = 5},/turf/open/floor/wood,/area/ctf) -"LQ" = (/obj/item/toy/plush/random,/turf/open/floor/plating/beach/coastline_t/sandwater_inner{dir = 8},/area/ctf) +"LQ" = (/obj/item/toy/fluff/frisbee_poly,/turf/open/floor/plating/beach/sand,/area/ctf) "LX" = (/obj/structure/railing{dir = 4},/obj/structure/flora/ausbushes/stalkybush,/turf/open/floor/plating/beach/coastline_b{dir = 8},/area/ctf) -"LZ" = (/obj/effect/turf_decal/sand,/obj/structure/closet/secure_closet/personal,/obj/item/reagent_containers/rag/towel,/turf/open/floor/plating/beach/sand,/area/space) -"Mk" = (/obj/machinery/button/door{id = "changlinhut2"; name = "changing room lock"; normaldoorcontrol = 1; pixel_x = 24; specialfunctions = 4},/turf/open/floor/mineral/basaltstone_floor,/area/ctf) +"LZ" = (/obj/effect/turf_decal/sand,/obj/structure/closet/secure_closet/personal,/obj/item/reagent_containers/rag/towel,/obj/item/reagent_containers/rag/towel,/turf/open/floor/plating/beach/sand,/area/ctf) +"Mk" = (/obj/machinery/button/door{id = "changlinhut2"; name = "changing room lock"; normaldoorcontrol = 1; pixel_x = 24; specialfunctions = 4},/obj/effect/turf_decal/sand,/turf/open/floor/mineral/basaltstone_floor,/area/ctf) "Mo" = (/turf/open/floor/plating/beach/water,/area/ctf) +"MG" = (/obj/item/clothing/mask/facehugger/toy,/turf/open/floor/plating/beach/sand,/area/ctf) "MO" = (/turf/closed/indestructible/rock,/area/ctf) "MV" = (/turf/open/floor/wood/damturf/broken6,/area/ctf) "MW" = (/obj/effect/overlay/palmtree_r,/turf/open/floor/plating/beach/coastline_t{dir = 1},/area/ctf) @@ -258,21 +270,21 @@ "Nz" = (/obj/structure/railing{dir = 1},/turf/open/floor/plating/beach/coastline_b,/area/ctf) "NO" = (/obj/structure/sign/barsign{pixel_y = 32},/obj/effect/turf_decal/sand,/turf/open/floor/plating/beach/sand,/area/ctf) "NX" = (/turf/open/floor/plating/beach/coastline_t/sandwater_inner{dir = 4},/area/ctf) -"NY" = (/obj/machinery/door/airlock/sandstone{id_tag = "changlinhut1"; name = "changing room"},/turf/open/floor/mineral/basaltstone_floor,/area/ctf) +"NY" = (/obj/machinery/door/airlock/sandstone{id_tag = "changlinhut1"; name = "changing room"},/obj/effect/turf_decal/sand,/turf/open/floor/mineral/basaltstone_floor,/area/ctf) "Ol" = (/obj/effect/overlay/coconut{pixel_x = 17; pixel_y = 7},/turf/open/floor/plating/beach/sand,/area/ctf) -"On" = (/obj/machinery/door/airlock/wood/glass{id_tag = "oldshack_prison"; name = "Tight Cell"},/turf/open/floor/wood,/area/ctf) +"On" = (/obj/machinery/door/airlock/wood/glass{id_tag = "oldshack_prison"; name = "Tight Cell"},/turf/open/floor/wood,/area/xenoarch/caloriteresearch_powered) "Or" = (/turf/closed/indestructible/sandstone,/area/ctf) "Pe" = (/obj/machinery/computer/security/telescreen/entertainment{pixel_y = -32},/turf/open/floor/wood,/area/ctf) "PK" = (/obj/structure/flora/ausbushes/reedbush,/turf/open/floor/plating/beach/coastline_b{dir = 4},/area/ctf) -"Qi" = (/obj/structure/chair/bench{dir = 4},/turf/open/floor/plaswood,/area/space) +"Qi" = (/obj/structure/chair/bench{dir = 4},/turf/open/floor/plaswood,/area/xenoarch/caloriteresearch_powered) "Qr" = (/obj/effect/overlay/palmtree_l,/turf/open/floor/plating/beach/coastline_t/sandwater_inner{dir = 1},/area/ctf) "QC" = (/obj/item/reagent_containers/food/drinks/soda_cans/starkist{pixel_x = -12; pixel_y = 3},/turf/open/floor/plating/beach/sand,/area/ctf) -"QQ" = (/obj/structure/closet/athletic_mixed,/obj/effect/turf_decal/sand,/turf/open/floor/plating/beach/sand,/area/ctf) +"QQ" = (/obj/effect/turf_decal/sand,/obj/structure/closet/athletic_mixed{anchored = 1},/turf/open/floor/plating/beach/sand,/area/ctf) "QS" = (/turf/open/indestructible/binary{density = 1; desc = "I can't move through this."; icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "deep ocean water"},/area/ctf) -"QT" = (/obj/machinery/shower{dir = 4},/obj/effect/turf_decal/sand,/turf/open/floor/plasteel/white,/area/ctf) +"QT" = (/obj/machinery/shower{dir = 4},/obj/effect/turf_decal/sand,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/ctf) "QV" = (/obj/structure/sign/poster/contraband/chefpropaganda,/turf/closed/wall/mineral/sandstone,/area/ctf) "QX" = (/obj/effect/mob_spawn/human/bartender/alive,/turf/open/floor/wood,/area/ctf) -"Rh" = (/obj/structure/bed/double,/obj/item/bedsheet/cult/double,/turf/open/floor/wood/wood_large,/area/ctf) +"Rh" = (/obj/structure/bed/double,/obj/item/bedsheet/cult/double,/turf/open/floor/wood/wood_large,/area/xenoarch/caloriteresearch_powered) "Rq" = (/turf/open/floor/plating/beach/coastline_t{dir = 4},/area/ctf) "Ry" = (/mob/living/simple_animal/hostile/shark/kawaii,/turf/open/floor/plating/beach/water{desc = "What's the difference?"; name = "coastline water"},/area/ctf) "RC" = (/obj/structure/flora/ausbushes/sunnybush,/turf/open/floor/plating/beach/sand,/area/ctf) @@ -288,7 +300,7 @@ "Tm" = (/obj/structure/table,/obj/item/reagent_containers/food/drinks/beer,/obj/item/reagent_containers/food/drinks/beer,/obj/item/reagent_containers/food/drinks/beer,/obj/item/reagent_containers/food/drinks/beer,/obj/item/reagent_containers/food/drinks/beer,/obj/item/reagent_containers/food/drinks/beer,/turf/open/floor/plating/beach/sand,/area/ctf) "Tp" = (/obj/machinery/door/airlock/sandstone{id_tag = "theloveshack1"; name = "Beach Hut"},/turf/open/floor/wood,/area/ctf) "Tr" = (/turf/open/floor/plating/beach/coastline_b{dir = 5},/area/ctf) -"Tt" = (/obj/structure/toilet{pixel_y = 8},/obj/effect/turf_decal/sand,/turf/open/floor/plasteel/white,/area/ctf) +"Tt" = (/obj/structure/toilet{pixel_y = 8},/obj/effect/turf_decal/sand,/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/ctf) "Tz" = (/obj/structure/flora/rock/pile,/turf/open/floor/plating/beach/water{desc = "What's the difference?"; name = "coastline water"},/area/ctf) "TB" = (/turf/open/floor/plasteel/stairs/old,/area/ctf) "TR" = (/turf/open/floor/plating/beach/coastline_t{dir = 9},/area/ctf) @@ -305,9 +317,10 @@ "VZ" = (/obj/machinery/door/airlock/sandstone{id_tag = "loveshack"; name = "Beach Hut"},/turf/open/floor/wood,/area/ctf) "Wa" = (/obj/structure/closet/secure_closet/personal/cabinet,/obj/item/clothing/suit/jacket/letterman_syndie,/turf/open/floor/wood,/area/ctf) "We" = (/obj/structure/flora/ausbushes/reedbush,/turf/open/floor/plating/beach/coastline_b,/area/ctf) -"Wf" = (/obj/effect/turf_decal/sand,/obj/machinery/vending/gato,/turf/open/floor/plating/beach/sand,/area/ctf) +"Wf" = (/obj/effect/turf_decal/sand,/obj/machinery/vending/gato{fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/plating/beach/sand,/area/ctf) "Wg" = (/obj/structure/closet/crate/wooden,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/turf/open/floor/wood,/area/ctf) -"Wz" = (/obj/machinery/door/airlock/sandstone{id_tag = "changlinhut2"; name = "changing room"},/turf/open/floor/mineral/basaltstone_floor,/area/ctf) +"Wu" = (/obj/item/toy/plush/random,/turf/open/floor/plating/beach/coastline_t{dir = 9},/area/ctf) +"Wz" = (/obj/machinery/door/airlock/sandstone{id_tag = "changlinhut2"; name = "changing room"},/obj/effect/turf_decal/sand,/turf/open/floor/mineral/basaltstone_floor,/area/ctf) "WB" = (/obj/machinery/smartfridge/drying_rack,/turf/open/floor/wood,/area/ctf) "WF" = (/obj/structure/flora/ausbushes/stalkybush{desc = "It can't be smoked."; name = "sea weed"},/turf/open/floor/plating/beach/coastline_b{dir = 8},/area/ctf) "WM" = (/obj/structure/flora/ausbushes/grassybush,/turf/open/floor/plating/beach/coastline_b{dir = 4},/area/ctf) @@ -315,26 +328,29 @@ "WU" = (/obj/item/toy/plush/random,/turf/open/floor/plating/beach/coastline_t{dir = 10},/area/ctf) "Xc" = (/obj/structure/flora/ausbushes/leafybush,/turf/open/floor/plating/beach/coastline_b,/area/ctf) "Xj" = (/obj/machinery/food_cart,/turf/open/floor/wood,/area/ctf) +"Xu" = (/obj/item/toy/plush/random,/turf/open/floor/plating/beach/coastline_t,/area/ctf) "Xw" = (/obj/structure/chair/comfy/plywood{dir = 4},/turf/open/floor/plating/beach/sand,/area/ctf) "Xz" = (/obj/structure/railing{dir = 8},/obj/structure/flora/ausbushes/stalkybush,/turf/open/floor/plating/beach/coastline_b{dir = 4},/area/ctf) "XB" = (/obj/effect/turf_decal/sand,/obj/structure/chair/stool,/turf/open/floor/plating/beach/sand,/area/ctf) "XK" = (/obj/structure/closet/crate/wooden{desc = "Now this is what island exploration is all about."; name = "Treasure Chest"},/obj/item/clothing/head/pirate,/obj/item/clothing/glasses/eyepatch,/obj/item/clothing/suit/pirate,/obj/item/melee/sabre{desc = "This isn't real however it can trick someone into thinking you have something real.."; force = 0; name = "foam pirate's sabre"; throwforce = 0},/obj/item/melee/sabre{desc = "This isn't real however it can trick someone into thinking you have something real.."; force = 0; name = "foam pirate's sabre"; throwforce = 0},/turf/open/floor/plating/beach/sand,/area/ctf) "XR" = (/obj/structure/flora/ausbushes/stalkybush{desc = "It can't be smoked."; name = "sea weed"},/turf/open/floor/plating/beach/coastline_b{dir = 1},/area/ctf) "Ym" = (/obj/structure/sign/poster/ripped{pixel_x = 32},/turf/open/floor/plating/beach/sand,/area/ctf) -"Yq" = (/obj/effect/turf_decal/sand,/obj/machinery/vending/kink,/turf/open/floor/plating/beach/sand,/area/ctf) +"Yq" = (/obj/effect/turf_decal/sand,/obj/machinery/vending/kink{fair_market_price = 0; extra_price = 0; default_price = 0},/turf/open/floor/plating/beach/sand,/area/ctf) "Yu" = (/obj/effect/overlay/palmtree_l,/turf/open/floor/plating/beach/coastline_t/sandwater_inner{dir = 4},/area/ctf) +"Yy" = (/obj/item/toy/plush/gs13/amogus,/turf/open/floor/plating/beach/sand,/area/ctf) "YP" = (/obj/item/reagent_containers/food/drinks/soda_cans/cola{pixel_x = -8; pixel_y = -4},/turf/open/floor/plating/beach/sand,/area/ctf) "YR" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/megaphone,/turf/open/floor/wood,/area/ctf) "YS" = (/obj/machinery/grill/unwrenched,/obj/item/reagent_containers/food/snacks/sausage,/turf/open/floor/plating/beach/sand,/area/ctf) "YX" = (/obj/item/reagent_containers/food/snacks/meat/slab/goliath,/obj/item/reagent_containers/food/snacks/meat/slab/xeno,/obj/item/reagent_containers/food/snacks/meat/slab/spider,/obj/item/reagent_containers/food/snacks/meat/slab/killertomato,/obj/item/reagent_containers/food/snacks/meat/slab/bear,/obj/structure/closet/secure_closet/freezer/kitchen,/obj/item/storage/fancy/donut_box,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/turf/open/floor/wood,/area/ctf) "YY" = (/obj/structure/chair/stool,/obj/effect/turf_decal/sand,/turf/open/floor/plating/beach/sand,/area/ctf) +"Zd" = (/obj/decal/stencil/left/v,/obj/decal/stencil/left/r{pixel_x = 8},/turf/closed/indestructible/wood,/area/ctf) "Ze" = (/obj/structure/railing{dir = 4},/obj/structure/railing{dir = 1},/obj/structure/barricade/wooden,/turf/open/floor/plating/beach/coastline_b{dir = 5},/area/ctf) "Zn" = (/obj/item/book/granter/spell/fattening,/turf/open/floor/plating/beach/sand,/area/ctf) "Zx" = (/obj/item/toy/plush/gs13/rose,/turf/open/floor/plating/beach/sand,/area/ctf) "ZB" = (/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime{pixel_x = -12; pixel_y = 14},/turf/open/floor/plating/beach/sand,/area/ctf) -"ZC" = (/obj/structure/dresser{density = 0; pixel_y = 18},/turf/open/floor/mineral/basaltstone_floor,/area/ctf) +"ZC" = (/obj/structure/dresser{density = 0; pixel_y = 18},/obj/effect/turf_decal/sand,/turf/open/floor/mineral/basaltstone_floor,/area/ctf) "ZM" = (/obj/structure/flora/ausbushes/fullgrass,/turf/open/floor/plating/beach/water{desc = "What's the difference?"; name = "coastline water"},/area/ctf) -"ZZ" = (/obj/effect/turf_decal/sand,/obj/machinery/shower{pixel_y = 19},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plating/beach/sand,/area/space) +"ZZ" = (/obj/effect/turf_decal/sand,/obj/machinery/shower{pixel_y = 19},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plating/beach/sand,/area/ctf) (1,1,1) = {" OrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOr @@ -352,8 +368,8 @@ OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQS OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSipQSQSQSQSwWQSQSIuQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSwWIuipipIuwWQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSMoadadadadadMoQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSgsadXRadQSQSQSQSQSQSQSQSISQSQSQSQSISQSQSgsQSgsQSQSQSQSISQSQSQSQSQSQSISQSQSQSQSQSgsQSISQSgsQSQSQSQSQSQSQSQSQSISISQSQSQSQSQSQSQSQSgsISQSQSQSQSQSQSQSQSQSgsQSQSQSISQSQSQSISQSQSISQSQSQSQSQSQSQSQSISQSgsipvvvvvvJXJXJXJXvvvvvvQSQSQSQSQSgsQSQSQSQSQSISQSQSQSQSQSISQSgsQSImTRyyyyyyjAubQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSImTRyyjAubJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGdBJGoovvDbvvvwpdlPKGrYRhvvlnJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjrnyXKAsRqubQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSWFjrZxRqubJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGZMqcvvOnvvbkvbvbvbvbJivvPKJGEaJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjrnyOlnyRqubQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSImTRyyjAubJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGdBJGoovvDbCevwpdlPKGrYRhvvlnJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjrnyXKAsRqubQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSWFjrZxRqubJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGZMqcvvOnCebkvbvbvbvbJivvPKJGEaJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjrnyOlnyRqubQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSImbQgQykubJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGdBImvvvbvKvbvbvbvbvbvXvvaJJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjrEDnynyRqubQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJpJpJpJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGEaJGJGImvvGtvbcCFQfsvbvbGkvvlnZMJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImbQgQgQgQykubQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSISJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGvavvvvvvvvvvvvvvnKvvvvubdBJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoJpJpJpJpJpMoQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr @@ -387,31 +403,31 @@ OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJG OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoVCTRNXnynynyhpnynyeNnyeNnyetnynynynynynynynynynynynyhpnynynynynynyXwnynyunyyjAubMoMoMoMoMoMoMoMoMoVCTRyyNXnyRCnynynynynyRCnyunjASgadMoMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoImTRNXnynynynynynyeNYSfKNyeNnynynynynynyhpnynynynynynynynynynynynynynyJZnyXwnyRqSgMoMoMoMoLjMoMoMoImTRNXnynynynynynynynynynynynyunyyjASgMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoImjrnynynyhpnyetnynyeNnyeNnynynyhpnynynynynynynynynynynynynynynynynynyFHnynyDNunjAubMoMoMoMoMoMoMoVCjrhpqtnynynynynynynynynynynyqthpunjASgMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoImjrnynynynynynynynynyetnynynynyRCnynynynynynyoxeOxJnynynynyRCnynynyhpnynynyXwnyRqSgadadadadadadVCTRNXnynynynynynynynynyNlnynynynynynyunjASgadMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoImjrnynyRCnyhpnynynynynynyhpnynynyRCnynynynynyttEbCSnynynynynynynynynyetnynynyZBunyyyyyyyyyyyyyyyyNXnynynynynynynynynynynynynynynynynynyunyyjASgMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoImjrnynynynynynynynynyetnynynynyRCnynynynynynyoxELxJnynynynyRCnynynyhpnynynyXwnyRqSgadadadadadadVCTRNXnynynynynynynynynyNlnynynynynynyunjASgadMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoImjrnynyRCnyhpnynynynynynyhpnynynyRCnynynynynyttkrCSnynynynynynynynynyetnynynyZBunyyyyyyyyyyyyyyyyNXnynynynynynynynynynynynynynynynynynyunyyjASgMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoImbQbYnynynynynyethpnynynynynyhpnynynynynynynycZEEWRnynynySASASASAQTnynyoaSASASASAnyhpnynynySASASASASAnynySASASASASAhpnySASASASASAnynynynynyunjASgMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoTrbQbYnynyvzvzvzmFmFmFmFmFmFmFmFmFnyuHnynynynyEbnynynynySAZCacSAQTnynyoaSAZCacSAnynynynynySAqCzgwoSAnynySAqCzgwoSAnynySAqCzgwoSAnynynynynynyunjAubMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSISJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoTrbQbYnymFmFmFmFuiaKtHtZAjaKzDmFnyoxELxJnynyEbnynynynySAxPMkSAQTnynyoaSAjMxPSAnynynynynySAfWzgChSAnynySAbRzgUzSAnynySAbLzgNnSAnynynynynynynyRqubDuMoJGJGJGJGJGEaJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoTrjrnymFtHkTmFuiQiEsEsEsQizDmFnyttNxCSEbEbEbnynynynySASAWzSAQTnynyoaSANYSASAnynynynynySAmmzgzgSAnynySAmmzgzgSAnygxSAmmzgzgSAnynynynynynynyRqlYadwzadzGadeoadJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGgsQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoImjrnymFEshdmFuiQiEsEsEsQizDmFnycZEEWRnynyEbirnynynynyJqEbnynynynynynyEbvsnynynynynynySASATpSASAnynySASAosSASAnynySASAKwSASAnynynynynyuxVeVeVeVeuxVeVeVeVeuxWMJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoImbQbYmFEsIimFuiycEsEssEyczDmFnynynynynynyEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbnynynynyzgzgzgzgzgzgzgzgzgzgzgjfPKJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoMoTrjrmFtImFmFmFmFmFfHmFmFmFmFnynynyhpetnyEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbwCnynynyzgzgzgzgzgzgzgzgzgzgzgjflnJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoMoMoMoImjrZZIviLLZLZLZabIvZZvnvnvnnySASASASAnyEbnySASASASAnyuwKQQQKQQQKQQQKQQQKQQQKQQQJDnySASAVZSASAnynySASABPSASAnynySASAGUSASAnynynynynyuxvCvCvCvCuxvCvCvCvCuxCAJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoMoMoMoImjrIvIvIvIvIvIvIvIvIvIvIvIvnySATtkRSAnyEbnySAfJTtSAnynynynynynynynynynynynynynynynySAclzgzgSAnynySAmmzgzgSAnyygSAmmzgzgSAnynynynynyunjAbvJpXcWeJpJplqWeJpJGEaJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoMoMoMoVCjrnynynynynynyEbEbnyuHnynynySAurnASAnyEbnySAkIurSAnynynynynynynynynynynynynynynynySAUezgKuSAnynySAWazgkVSAnyYmSADwzgpPSAnynynynynyKhykubyPMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGISQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoMoMoImTRNXnynynynynynyEbEbnynynynynySASAEoSAnyEbnySAvRSASAnynynynyuHnynynynynynynynynynynySAHizgPeSAnynySAHizgPeSAIpikSAHizgPeSAnynynyKhgQykbvMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGISQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoMoMoImjrnynynynynynynyEbEbnynynynynynynyEbnynyEbnynyEbnynynynynynynynynynynyhpnynynynynynySASASASASAnynySASASASASAnynySASASASASAnynyKhykbvJpMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSISJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGadadadadadJGMoMoMoMoMoMoImbQbYnynyRCnynynyEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbnynynynynynynynynynynynynynynynynynynynynynynynynynynynynynynynynynynyRqbvMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImTRMWMWMWjASgMoMoMoMoMoMoMoTrbQbYnynynynynyEbEbEbEbEbEbEbWfovRKEbRKyJRKEbRKrhYqEbEbnynynynynynynynynynynygxnynynynynyuHnynynynynynynynynynynynynynynynyKhykubMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGVCjrFFVMfdunjAubMoMoMoMoMoMoMoTrjrnynynynynynynynynynyEbSASAHRSASACqSASASAQVSASASAEbnynyRCnyetnynynynynynynynynynynynynyetnynynynynynynynynynynynyhpnynyRqbvMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSgsJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImTRNXnynynyVMRqubMoMoMoMoMoMoMoImjrRCnynynynyAHnynynynyEbSAkKQXQXrZvmSAnpRXyHhWLwSAEbnynynynynynynyhpnynynynynynynynynynynynynynynynynynynynynynynynynynyRqubMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjrVMLflanynyRqubMoMoMoMoMoMoadVCjrnynynynynynynynynynyEbSHkKzgzgzgxqkjzgzgzgzgLvSAEbnyEbEbEbEbEbnynynyACJsJsJsJsJsJsJsJsJsJsJsdZuHetnynynyhpnyRCnynynynyRqubMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGISQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImnonynynynynyRqSgadadadadadVCTRyyNXnynyuUEbuUEbuUnynynyEbSAzgzgzgzgSWSAzgTWgJzgYXSAEbEbEbGPEbGPEbnynynyzHnynynynynyrfnynynynynyJBnynynynynynynynynynynynyRqubMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGISQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSISJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImWULQnynyLfnyatatatatatatatatatnynynynyEbseseseEbnynynyEbDTzgzgzgzgzgnrzgldgJzgzgDTEbEbEbEbEbEbEbnyhpnyzHnynynynynyrfnynynynynyJBnynyRCnynynynyqtnynynynyRqubMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGTrnonympVMnygFgFgFgFgFgFgFgFgFnynynynyuUsekrseuUEbEbEbEbSAtwtwGMfBdOSAzgdwGgzgHFSAEbEbEbJaEbJaEbRCnynyzHnynynynynyounynynynynyJBnynynynynynynynynyvpnynyRqubMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjrmpKhgQgQykbvJpJpJpJpJpTrjruHnynynyEbseseseEbnynynyEbEbXBXBXBXBXBEMzgzgzgzgHFSAEbnyEbEbEbEbEbnynynyzHnynynynynyrfnynynynynyJBnynyuHnynynynynynynynynyRqubMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoTrbQbYnynynynynyvvvvvvvvvvvvvvvvvvnyuHnynynynyEbnynynynySAZCacSAQTnynyoaSAZCacSAnynynynynySAqCzgwoSAnynySAqCzgwoSAnynySAqCzgwoSAnynynynynynyunjAubMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSISJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoTrbQbYnyvvvvvvvvuiaKtHtZAjaKzDvvnyoxELxJnynyEbnynynynySAxPMkSAQTnynyoaSAjMxPSAnynynynynySAfWzgChSAnynySAbRzgUzSAnynySAbLzgNnSAnynynynynynynyRqubDuMoJGJGJGJGJGEaJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoTrjrnyvvtHkTvvuiQiEsEsEsQizDvvnyttNxCSEbEbEbnynynynySASAWzSAQTnynyoaSANYSASAnynynynynySAmmzgzgSAnynySAmmzgzgSAnygxSAmmzgzgSAnynynynynynynyRqlYadwzadzGadeoadJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGgsQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoImjrnyvvEshdvvuiQiEsEsEsQizDvvnycZEEWRnynyEbirnynynyvsJqEbnynynynynynyEbvsJqnynynynynySASATpSASAnynySASAosSASAnynySASAKwSASAnynynynynyuxVeVeVeVeuxVeVeVeVeuxWMJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoImbQbYvvEsIivvuiycEsEssEyczDvvnynynynynynyEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbnynynynyzgzgzgzgzgzgzgzgzgzgzgjfPKJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoMoTrjrvvtIvvvvvvvvvvfHvvvvvvvvnynynyhpetnyEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbwCnynynyzgzgzgzgzgzgzgzgzgzgzgjflnJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoMoMoMoImjrZZEbiLLZLZLZabEbZZmFvnvnnySASASASAnyEbnySASASASAnyuwIvrKKQQQKQQQKQQQKQQQKQQQJDnySASAVZSASAnynySASABPSASAnynySASAGUSASAnynynynynyuxvCvCvCvCuxvCvCvCvCuxCAJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoMoMoMoImjrEbEbEbEbEbEbEbEbEbEbEbEbnySAjbkRSAnyEbnySAfJTtSAnynynynynynynynynynynynynynynynySAclzgzgSAnynySAmmzgzgSAnyygSAmmzgzgSAnynynynynyunjAbvJpXcWeJpJplqWeJpJGEaJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoMoMoMoVCjrvvuxuxuxuxZdEbEbnyuHnynynySAurnASAnyEbnySAkImzSAnynynynynynynynynynynynynynynynySAUezgKuSAnynySAWazgkVSAnyYmSADwzgpPSAnynynynynyKhykubyPMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGISQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoMoMoImTRNXzgkikikikizgEbEbnynynynynySASAEoSAnyEbnySAvRSASAnynynynyuHnynynynynynynynynynynySAHizgPeSAnynySAHizgPeSAIpikSAHizgPeSAnynynyKhgQykbvMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGISQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoMoMoImjrnyzgeOeOeOeOzgEbEbnynynynynynynyEbnynyEbnynyEbnynynynynynynynynynynyhpnynynynynynySASASASASAnynySASASASASAnynySASASASASAnynyKhykbvJpMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSISJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGadadadadadJGMoMoMoMoMoMoImbQbYzggdgdgdgdzgEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbnynynynynynynynynynynynynynynynynynynynynynynynynynynynynynynynynynynyRqbvMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImWuMWMWMWjASgMoMoMoMoMoMoMoTrbQvvuxuxuxuxvvEbEbEbEbEbEbEbWfovRKEbRKyJRKEbRKrhYqEbEbnynynynynynynynynynynygxnynynynynyuHnynynynynynynynynynynynynynynynyKhykubMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGVCjrFFvzfdyCjAubMoMoMoMoMoMoMoTrjrnynynynynynynynynynyEbSASAHRSASACqSASASAQVSASASAEbnynyRCnyetnynynynynynynynynynynynynyetnynynynynynynynynynynynyhpnynyRqbvMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSgsJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImTRxFnyLQnyYyRqubMoMoMoMoMoMoMoImjrRCnynynynyAHnynynynyEbSAkKQXQXrZvmSAnpRXyHhWLwSAEbnynynynynynynyhpnynynynynynynynynynynynynynynynynynynynynynynynynynyRqubMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjrVMLflanonyRqubMoMoMoMoMoMoadVCjrnynynynynynynynynynyEbSHkKzgzgzgxqkjzgzgzgzgLvSAEbnyEbEbEbEbEbnynynyACJsJsJsJsJsJsJsJsJsJsJsdZuHetnynynyhpnyRCnynynynyRqubMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGISQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjrmpMGnynympRqSgadadadadadVCTRyyNXnynyuUEbuUEbuUnynynyEbSAzgzgzgzgSWSAzgTWgJzgYXSAEbEbEbGPEbGPEbnynynyzHnynynynynyrfnynynynynyJBnynynynynynynynynynynynyRqubMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGISQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSISJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImbQbYKvmpLfnyatatatatatatatatatnynynynyEbseseseEbnynynyEbDTzgzgzgzgzgnrzgldgJzgzgDTEbEbEbEbEbEbEbnyhpnyzHnynynynynyrfnynynynynyJBnynyRCnynynynyqtnynynynyRqubMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGTrjrmpnyVMnygFgFgFgFgFgFgFgFgFnynynynyuUseseseuUEbEbEbEbSAtwtwGMfBdOSAzgdwGgzgHFSAEbEbEbJaEbJaEbRCnynyzHnynynynynyounynynynynyJBnynynynynynynynynyvpnynyRqubMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjrmpKhgQXuykbvJpJpJpJpJpTrjruHnynynyEbseseseEbnynynyEbEbXBXBXBXBXBEMzgzgzgzgHFSAEbnyEbEbEbEbEbnynynyzHnynynynynyrfnynynynynyJBnynyuHnynynynynynynynynyRqubMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjrVMRqbvJpJpMoMoMoMoMoMoImjrnynynynyuUEbuUEbuUnynynyEbEbEbEbEbEbEbrpzgzgzgzgXjSAEbnynynynynynynyqtnyoGJsJsJsJsJsrfJsJsJsJsJsJBnynynynynynynynynynynyKhykubMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImbQgQykubJGJGMoMoMoMoMoMoImjrnynyqtnynynynynyRCnynynyEbSAEbEbEbEbEbSAuvoRGMfBSASAEbnynyTmUvnyuHnynynynynynynynynynynynynynynynynynynynynynyRCnyhpnyKhykbvMoMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImWUgQykubJGJGMoMoMoMoMoMoImjrnynyqtnynynynynyRCnynynyEbSAEbEbEbEbEbSAuvoRGMfBSASAEbnynyTmUvnyuHnynynynynynynynynynynynynynynynynynynynynynyRCnyhpnyKhykbvMoMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJpJpJpJGJGJGMoMoMoMoMoMoImbQbYnynynynyhpetnynynynynyEbpSEbEbEbEbEbEbYYYYYYYYNOEbEbnynyUYDUnynyetnynynynynyuHnyqtnynynynynynynynynynynynynynynyetKhykbvMoMoMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoMoMoMoTrbQbYvpnynynynynynynynynyEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbnynynynynynynynygIdzgInyKhgQgQbYqogQgQbYnygIfagIEqgITeqtnynyKhykbvMoMoMoMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGgsQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoMoMoMoMoTrbQgQbYnynynynyxwuCnynynynynynynynynynynynynynynynynynynyxwuCnynynynynynynyKhykbvTrbQykbvTrbQbYnynynynynynynynyKhykbvMoMoMoMoMoMoMoMoMoMoMoMoJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr @@ -427,7 +443,7 @@ OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSISJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJG OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoMoJGJGHbHbJGJGMoMoMoMoHbHbHbMoJGJGJGHbHbJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbJGJGJGJGJGgmJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbHbHbJGJGJGJGHbJGHbHbHbJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbHbJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbHbJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbnyHbJGJGJGJGJGJGJGHbJGJGJGJGJGJGJGJGJGJGJGgmJGJGHbHbHbJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbHbnyHbJGJGJGJGJGJGJGJGJGJGJGHbHbHbJGJGJGJGJGJGJGJGHbnyHbJGJGJGJGJGJGJGJGJGJGISQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbHbnyHbJGJGJGJGJGJGJGJGJGJGJGHbHbHbJGJGJGJGJGJGJGJGHbCPHbJGJGJGJGJGJGJGJGJGJGISQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbHbJGJGJGJGHbnyHbHbJGJGJGJGJGJGJGJGJGJGJGJGHbHbJGJGJGJGJGJGJGJGHbHbHbJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSgsJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGTzJGJGJGHbHbJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbHbHbJGJGJGJGHbnyHbJGJGJGJGJGJGJGJGJGJGJGJGJGHbHbJGJGJGJGJGJGJGJGHbHbJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbJGJGJGJGHbJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbHbHbJGJGJGJGHbHbHbHbJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr @@ -439,7 +455,7 @@ OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJG OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGTzJGJGHbHbJGJGJGHbHbJGJGJGJGJGJGJGJGJGJGJGVCTRyyyyyyyyjASgadadadJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGTzTzJGJGJGJGHbHbHbHbJGJGJGJGJGJGJGJGJGHbHbJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGgmJGJGJGJGJGImTRYuXBXBXBhpunyyyyyyjAubJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbnynyHbHbJGJGJGHbJGJGJGHbHbHbJGJGJGJGJGJGJGHbJGJGJGJGJGJGJGJGJGJGJGJGJGJGgsQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSISJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGTzJGJGJGJGJGJGJGJGJGJGJGImjriRGMGMUpiRnynynyKhykubJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbHbHbHbHbJGJGJGJGJGJGHbHbHbHbJGJGJGJGJGHbHbHbHbJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr -OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjreCzgzgzgzgEbnyhpRqbvJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbHbHbJGJGJGHbHbHbHbJGJGJGJGJGJGHbKHZnHbJGJGJGJGJGHbnynyHbHbJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr +OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjreCzgzgzgwSEbnyhpRqbvJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbHbHbJGJGJGHbHbHbHbJGJGJGJGJGJGHbKHZnHbJGJGJGJGJGHbnynyHbHbJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjrzgERzgzgzgEbRCKhykubJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbHbJGJGJGJGJGJGJGJGgmJGJGJGHbHbHnHbHbJGJGJGgmJGHbnynyHbJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjrWBererJveUEbKhykbvJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbHbHbHbJGJGJGJGJGJGHbHbHbHbJGJGJGJGJGJGJGJGJGJGJGJGJGQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr OrOrQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGImjriRuxuxuxiRKhykbvJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGHbHbHbJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGISQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSQSOrOr diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index f843814441..1271d8d2c5 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -7240,7 +7240,6 @@ "fho" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/white,/area/medical/medbay/central) "fls" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/grass,/area/security/courtroom) "fmC" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/landmark/start/prisoner,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/button/door{id = "permacells4"; name = "Privacy Shutters"; pixel_y = 25},/turf/open/floor/plasteel/dark,/area/security/prison/cells) -"fmH" = (/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "frp" = (/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/crew_quarters/fitness/sauna) "ftF" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/grunge{name = "Permanent Cell 5"; wiretypepath = /datum/wires/airlock/security},/turf/open/floor/plasteel/dark,/area/security/prison/cells) "fwq" = (/obj/effect/turf_decal/loading_area{icon_state = "steel_decals_central7"},/turf/open/floor/plasteel,/area/security/prison) @@ -7281,7 +7280,6 @@ "guH" = (/obj/effect/spawner/structure/window/reinforced,/obj/structure/cable{icon_state = "2-4"},/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plating,/area/security/prison/cells) "gwd" = (/obj/machinery/iv_drip/feeding_tube,/turf/open/floor/plating,/area/maintenance/port/aft) "gwA" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/obj/machinery/light,/turf/open/floor/plasteel/white/corner{dir = 8},/area/hallway/primary/starboard) -"gxy" = (/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 8; icon_state = "steel_decals9"},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "gye" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light/small,/turf/open/floor/plasteel/dark,/area/security/prison/cells) "gyv" = (/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/machinery/light{light_color = "#d1dfff"},/turf/open/floor/plasteel,/area/security/prison) "gzJ" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/cafeteria,/area/security/prison/upper) @@ -7374,7 +7372,6 @@ "jle" = (/obj/effect/turf_decal/bot,/obj/vehicle/ridden/grocery_cart{dir = 4},/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) "jmf" = (/turf/open/floor/plasteel/dark/corner{dir = 4},/area/crew_quarters/fitness/sauna) "jou" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock/maintenance{name = "Fitness Maintenance"; req_access_txt = "12"},/turf/open/floor/plasteel,/area/maintenance/fore/secondary) -"jqf" = (/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/hallway/primary/central) "jts" = (/turf/open/floor/wood,/area/maintenance/port/fore) "jtt" = (/obj/effect/decal/cleanable/dirt,/obj/item/reagent_containers/food/drinks/bigbottle/spaceup,/turf/open/floor/plasteel/grimy,/area/maintenance/starboard/aft) "jtZ" = (/obj/structure/closet/secure_closet/personal,/turf/open/floor/plasteel/dark/side{dir = 10},/area/crew_quarters/fitness/sauna) @@ -7484,7 +7481,6 @@ "mKV" = (/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel/showroomfloor,/area/security/brig) "mMe" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk,/obj/effect/turf_decal/stripes/line{dir = 5},/turf/open/floor/plasteel,/area/security/office) "mMv" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/stripes/line{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/security/prison/cells) -"mMX" = (/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/hallway/primary/central) "mOM" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/camera{c_tag = "Prison Cell Block Central"; dir = 1; network = list("ss13","prison")},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/prison/cells) "mQC" = (/obj/machinery/light{dir = 8},/obj/effect/turf_decal/stripes/corner{dir = 1},/obj/effect/turf_decal/loading_area{icon_state = "steel_decals_central7"},/turf/open/floor/plasteel,/area/security/processing) "mQD" = (/obj/structure/closet/crate/trashcart,/obj/effect/spawner/lootdrop/prison_contraband,/obj/item/trash/chips,/obj/item/trash/candy,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating,/area/security/prison/upper) @@ -7571,7 +7567,6 @@ "pSh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/closed/wall/r_wall,/area/security/execution/transfer) "pSx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/closed/wall/r_wall,/area/security/execution/transfer) "pTZ" = (/obj/effect/turf_decal/tile/green,/obj/effect/turf_decal/tile/green{dir = 4},/turf/open/floor/plasteel,/area/security/prison/upper) -"pUc" = (/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "pVv" = (/obj/structure/chair/sofa{dir = 8},/turf/open/floor/carpet,/area/hallway/secondary/exit) "pYb" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/sauna) "pYc" = (/obj/machinery/computer/piratepad_control/civilian{dir = 1},/turf/open/floor/plasteel,/area/cargo/office) @@ -7665,7 +7660,6 @@ "tbq" = (/obj/machinery/door/airlock{dir = 4; id_tag = "MaintDormShower"; name = "Maint Dorm"},/turf/open/floor/wood{icon_state = "wood-broken5"},/area/maintenance/port/fore) "tdx" = (/obj/structure/table,/obj/item/folder/white,/obj/item/clothing/neck/stethoscope,/obj/machinery/vending/wallmed{pixel_y = 28},/obj/machinery/light/small{dir = 8},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/central) "tey" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/catwalk_floor,/area/maintenance/port/fore) -"the" = (/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 8; icon_state = "steel_decals9"},/turf/open/floor/plasteel,/area/hallway/primary/central) "thx" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/camera{c_tag = "Permabrig North"; dir = 4; network = list("ss13","prison")},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/trunk{dir = 4},/obj/structure/disposaloutlet{dir = 4; name = "Prisoner Delivery"},/obj/effect/turf_decal/delivery,/obj/structure/window/reinforced,/turf/open/floor/plasteel/dark,/area/security/prison/upper) "tio" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/machinery/light{dir = 1; light_color = "#d1dfff"},/turf/open/floor/plasteel,/area/hallway/primary/fore) "tjj" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/preopen{id = "executionfireblast"},/obj/machinery/door/firedoor,/obj/structure/cable{icon_state = "0-4"},/obj/machinery/atmospherics/pipe/simple,/turf/open/floor/plating,/area/security/execution/transfer) @@ -7950,7 +7944,7 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaa byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUayWaxBaIraIlaImaIlaInbkuaLfbkuaLqaLvbkvbkwaxYaCFbkxazcbkybkzbkAbkBbkCbkDbkEbkFbkGbkHawEaMaaMbaKkaKkaKkaKkaKkaMNaMaawEaxZayaaIEaIFaIGaFGaIHayaaqsapyayqaIIjXjdDdayorCWaIJaIKayqbkIbkJaHFaIMaINaIOaIPbkKbkLaISaIQbkMbkNaITaOuaIVaIWazFbaubbpbkObbcbbcbbcbbcaOvazFaYlbbVaIPbaEaJdaYpaYqaYXaZSaZVbbbaJdaNraNrbbRaOcaKuaJkaJlaJiaJmaHSaHSbbXaHTaHSaHSaHSaJoaJpaHTsGRaFbaJqaJraJsaJtaJuaJvaFbaJwaJxaJyaJzaJAaJBaJCaJDaIhaFfaJEaDYaGNaJFaGPaaaatJaaaaaaatJaaaaMzaMzaMzaMzaMzaaaatJaaaaaaiWgaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRFatJbhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUayWaxBaJGaJHaJIaJHaJJaJHaJHaJHaJKaLObkPbkQaxYaJMaxYazcaJNaJOaJNaBnaBnaBnaBnaJNaJPaJQawEawEaMPaNjaNjaNkaNjaNjaNlawEawEaJXayaaJYayaaJZaKaaKbayaarjaoJayqayqayqaAQaKcaAQayqayqayqbkRbkSbkTaKdaIPaIPaIPaIPaIPaKebkUbkVbkWaITaWGaIVaKgazFazFazFazFazFazFazFazFaKqazFaITaPMaTSbcfaJdbcWaELaPLbdxbdHbdZaJdaDzaNsaNsaNsaOyaKvaKwaJiaKxaKyaKzaKAaKBaKCaKDaKEaKFaKGaHTsGRaFbaKHaOMaOMaONaOMaKKaFbaKLaKMaKNaKOaKPaKQaKRaCwaCwaKSaFgaDYaIiaIjaGPaaaatJavJaQgaQgaQgaMybkYaNJaNLaMzaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauSaKTaxBaKUaKVaKWaKXaKYaKZhgAaLaaLbaxBaIraNXaNYaNYaNYaOaaNYbkZaNYaNYaNYaNYaNYaNYblaaObblbblcbldaNYaNYaNYaNYaNYbleaNYblfblgblhaLraLmaLsaLmaLtaMWaLuaOeaLwaLRaEEaIRaIRaIRaLNaLPaLPbljaLPaLPaIPaIPaIPaNfaIPaIPaIPaLPaLPblkaLHaLIaLJaLKaPJbcXaNKbllaLPblmblnbloaXUaYkbeMaZMaZMblpaJdaTTaJdbkrbgoaJdaJdaJdaJiaQGaRnaMdaKuaMeaMfaJiblqaMhaMhaMiaMjaMkaMlaMmaMnaMoaHTsGRaFbaGzblraOMaONaMpozRaFbaMsaMtaCwaMublsaKRaKRaCwaMvaMwaMxaDYaCwaCwaCwuzBuzBuzBaQkaQlbltaMybluaQjaOXaMzaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaaaaaaaaaaaaaaaaaaaaaaayUaRNayUayUayUayUayUayUaRNayUaaamJZaBdaMAaKUaMBaMCaMDaMEaMFaweaMGaLbaMHaIkaLdaMIaMJaMLaMKaMLaMMaLeaLeaLeaLeaLeaLeaLeaLiaLdaLeblvaLeaLeaPKaPOaMQaMRaMQaMRaMSaMQaMTaMQaMUaMQaMVaOnaMXaMYaMZmMXthejqfaIPaIPaIPaIPaIPotMthejqfaLAaLBaNcaLDaNeaLFaLGmMXthevtIaIPaNhaIPaIPaIPmMXthejqfaIPaNiaIPaIPaIPaWIaIPaIPaIPblwaJdblxblyaKsblzaPQaWKaQFaJiaJiaJiaJiaYuaNwaJiaJiaJiaJiaHSaNzaHSaHSaHSaNAaNBaNAaHTsGRaFbaFbaFbblAblBaFbaFbaFbaFbaFbaFbaFbaCwaCwaNFaCwaFfaFfaFgaDYaNGaNHaCwbrZaSZaRkazRkOhpVvaMyaQmaQjaOXaMzatJatJatJatJmoyaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaaaaaaaaaaaaaaaaaaaaaaayUaRNayUayUayUayUayUayUaRNayUaaamJZaBdaMAaKUaMBaMCaMDaMEaMFaweaMGaLbaMHaIkaLdaMIaMJaMLaMKaMLaMMaLeaLeaLeaLeaLeaLeaLeaLiaLdaLeblvaLeaLeaPKaPOaMQaMRaMQaMRaMSaMQaMTaMQaMUaMQaMVaOnaMXaMYaMZaIPaIPaIPaIPaIPaIPaIPaIPotMaIPaIPaLAaLBaNcaLDaNeaLFaLGaIPaIPvtIaIPaNhaIPaIPaIPaIPaIPaIPaIPaNiaIPaIPaIPaWIaIPaIPaIPblwaJdblxblyaKsblzaPQaWKaQFaJiaJiaJiaJiaYuaNwaJiaJiaJiaJiaHSaNzaHSaHSaHSaNAaNBaNAaHTsGRaFbaFbaFbblAblBaFbaFbaFbaFbaFbaFbaFbaCwaCwaNFaCwaFfaFfaFgaDYaNGaNHaCwbrZaSZaRkazRkOhpVvaMyaQmaQjaOXaMzatJatJatJatJmoyaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraGRaNMatJatJatJatJauSaAaauSayUaRJayUaNNaNOaNPaNQayUaRJayUayUauSayWaxBaKUaNRaNSaMDaMEaMFaweaNTaLbaxBaPmaPnaPvblCaPwaPwaPwaPxaPyaQCaNVaNZaPwaPwaPwaQEblDaPwblEblFblFblGaSyaQIaOgaOfaOgaOhaOiaOjaOlaOkaQMaRPaWUaOoaOpaIPaOqaOqaOqaOraOqaOqaOqaOqaOsaOqaOqaNbaNaaNgaLEaOtaLCaNdaOqaOqaPPaOqaOqaOqaOqaOqaOqaOqaOqaIPaIPaIPbfQbfQaRfbfQbfQbfQblHaJdblIblJblKblLaJhaLQaLQbeLblMblNaOAaOBaODaWFaOEblOaJiaOFaOGuNxaOIaKmaOHaOJaOKaHTsGRaFbaOLaOLaOMaONaOOaOOaOPaFbaOQaORaOSaCwaFfaFfbpJaFfaFflbTaDYaCwaOWaCwaQnbamipqazRbcjaSWaMyaSXaOZaSYaMzaMzaMzaMzaMzaMzaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRFatJbhrbanaaaaaaaaaaaaaaaaweawfaweayUaXfayUayWaxBaxBayXayUaXfayUaPcaPdaPeaxBaKUaPfaPgaKXaPhaKZaweaPiaLbaLOblPblQmgyaPkaPlaPlaPlaPlaPlaPlaQHaQLaPlaPoaPlaPlaPlaPpaPqaPraPqaPsaPtaPuaYMaLeaRObeuaRZbexblRaPzaScaPAaPAaPMaRgaRmaILaILaILaILaILaILaILaILaPCaPDaPEaPFaPEaPEaPEaPGaPEaPHaPEaPIaPCaILaILaILaILaILaILaILaILaPMaTSaUTaJdaJdaJdblSbeNbeNblSaJdaMOblTaRsblUblVblWblVaJiaSBblXblYaNmaNnaPRaRpblZbmaaOHaPSaPTaPTaPTaPTaPUaVtaHTaHUaFbaPVaMpaOMaONaMpaMpaPWaFbaPXaPYaPZaCwaFfrFuaQaaQbaQbaQcaQdaQeaQfaCwqqnbfTbmbbmcbmdaPbaMyaUsaVCbmeaXcaRkaRkaXdaRkbmfaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyKbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyKbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaQoaaaaaaaaaaxwaxyaxzayTaQpbkuaQqaPeaxBaxBaQraQqbkuaQpaPeaxBaxBaxBaQsaQtaQuaQvaQwaQxbmgaQyaQzaLObmhbmiaPjaQBaPluQvbpMlqGfNxaPlsswaThaTmnVktRyaUfaUCaPpaQNaQOaQPaPsnbdaPuaPuaQRaPuaPuaPAaPAaQSaQTaPAaPAaPAaQUbjWbbeaILaaaaaaaaaaaaaaaaaaaaauKSaKnaQVaQWaQXaQYaQZaRaaRbaRcaRdaReuKSaaaaaaaaaaaaaaaaaaaaaaILaVNaIPbjXaJdbmjaRjbmkaTUaNpbmlaWHbmmbmnbdaaSaaSaaSabmoaJiaSBaRoaRqaRuaRraRtaStaSEbmaaOHaRvaVsbmpbmpbmqaRxaOHaHTaRyaFbaRzooZbmraONaRAaRAaRBaFbaFbaRCaFbaCwaRDaGNaOTaREaREaOUaOVaCwaCwaCwaYNbmsbmtbbkaZNbnSaMyaRGaRHaMzaMzaMzaMzaMzaMzaRIaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG @@ -7962,8 +7956,8 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaR byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUayUayUayWayXaYPaTcaYRaXkaXkaXkaXkaYTaUuaTcaYUaYVaVLaPliXAhzAaYZaYZlbnspQmidqnBlyOfBlbqxbfAhcSaPlaZhaZicGrhIGcGraZlaZmaZnaWdaZoaZpaZpaZqaZraZsaZtaWdbbYaLzbomaZvaZvaZvaZvaZvaZvaZwaZxaZvaXXaXZaZzaZAaZAbeDaZAaZAaZCaYbaYeaZDaZEaZFaZDaZDaZDaZDaZDaZDbonaIPbjXaJdboobopbgUboqborbosbotboubovbowboxaJdbfubfuboybozboAaZTaZTaZTaZTboBbozboyaZUaRwboCaZWaZWaZXaZYaYsaHTaZZroPbabaFbbacbafbaeaNDaNCbafaUkaNDboDaCwbahoHHbaiaREaREbaiqMSbajaCwbakbalboEbohboFboGboHbfWaQhaQibmUaMzaMzaMzaMzaMzaMzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUbmVayWayXjleaTcaVFaUwboJbapaUwbaqaUwaTcbarbasbataPlfrpbpgbpfboLbpfbpfbpfbpflcjeZweZwhrcbfMaPlaZhaZibaxbayaZjbazaZmaZnaWdbaAaZpaZpaZGbaBaZpbaDbbxbbVaIPbbZaZvbaFbaGbaHbaIbaJbcebaLbaMbaNbaOaZAaZAbaPbaQbaPaZAaZAbaRbaSbaCbaTbaUbaXbaYbbzbaVboMaZDbnYaIPbjXaJdaJdblSblSaJdaJdaJdblSblSblSaJdboNaJdboOboPboyboQboRboRboRboRboRboRboSboyboTbbgbbgboTboUboVboWboTaHTaZZbaababaFbaFbaFbbbhaFbbbhaFbbbhaFbaFbaCwaCwbbibbibbibbibbibbiaCwaCwbbjaQjboXboYboZbpabpbbpcaQhaQibpdbpGaRkaRkaRkaRkbpIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraGRauSauSayUayUayUayUauSayUayUayUayUayUayUayUayUauSauSmJZayWjuXaweaTcaTdaTcaTcaTcaTcaTeaTcaTcbbmbbnbboaPlsyvoDnlAqhfQxWoxWoxWonVjqMfaUEhPxxenkBcaPlbbtaZinkZbbubbvbbwaZmaZnbphaZsbbybaZbbabbAaZpbpibbCbbVaIPbbZbbDbbEbaJbbFbbGbbGbbHbbIbbJbaNbbKaZAaZAbaPbbLbaPaZAaZAbbMbaSbbBcnlcmeaXWbbSaYabaWbbOaZDbnYbbUaIPaLPbembembembecbpkbehbembembembeibembembembembeobembembembembembembembembplbembembembembembembembcabepbccbcdbaabesbembplbembembembembembembekbeobfObembembembembembembbWbpmbpcaQjbpnbpoaYKbfHaYKbppaYLaQiaOXaMzaMzaMzaMzaMzaRIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRFatJbhrbanauScsHndAbpqayUawiawhawiawiawiawiawiawiawiawiawhawibprbpsaxDbcmbcnbcobcpbcpbcpbcqbcrbcsaPjbctbcubcvaPlaPlduzaPluYcaPlrzmaPlaPlaPlkhQlQXbdybptaPlaZhaZinkZbcAbcBbcCbcDbcEbcFbcGbcGbcGbcHbcIaZsbcJaWdaQUaNhbbZbcKbcLbaJbcMbcNbcObcPbcQbcRbaNbcSbaPaZAbcTbcUbcTaZAbaPaZCbaSbbPcnlcmeaXWbdVaYabaWbpuaZDbpvaIPaIPaIPfmHgxypUcbaabpwbpxbaabaabaabaabcYbaafmHgxypUcbaabcZaYzaYzaYzbvTaYzaYzbpyaYzbpzfmHgxypUcbaabdbbdcbddbdebdfbdfbdfbdgbdibdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdhbdibpAbdkbdkbdlbpBbpCaXaaXabpDbpEbpFbpdbpGaRkaRkbpHaRkbpIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaayUjzlaKXaKXbpKbdqaxAaXbaxAazaaxBaxBbdqaxAaXbaxAazaaxBaxBaxBbdrbdsbdrbdrbdrbdrbdtbduaPjaPjaPjbdvaVLaPlaUDbfRaTiaPlaUDbfRbpNaPlaPlaPlaPlbdAbdBaPlaZhaZibdCbdDbdEbdFaZmbdzaWdaWdaWdaWdaWdaWdaWdbdGaWdbfPaIPbbZbcKbdIbaJbcMbdJbdKbcPbcQaBrbaNbdLbdMaZAbdNbdObdPaZAbdQbdRbaSaBtbbTbcVbdWbdXbpRbaWbdSaZDbnYbeaaIPbedbgBbgBbgBbpSbpTbpUbgBbgBbgBbpVbefbeebuybgDbgBbgBbgBbgBbgBbpXbqbgwAbgBbpZbqabqbbqcbgBbgDbqdbqebenbqfbqgbeqbeqbeqbaabpZbgDbqhbgBpwPbaafmHgxypUcbaaroPbaafmHgxypUcbaaaDLbqibqjbevbqkbfUbqlbqlbqlbqlbqmbqnbqoaMzaMzaMzaMzaMzaMzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRFatJbhrbanauScsHndAbpqayUawiawhawiawiawiawiawiawiawiawiawhawibprbpsaxDbcmbcnbcobcpbcpbcpbcqbcrbcsaPjbctbcubcvaPlaPlduzaPluYcaPlrzmaPlaPlaPlkhQlQXbdybptaPlaZhaZinkZbcAbcBbcCbcDbcEbcFbcGbcGbcGbcHbcIaZsbcJaWdaQUaNhbbZbcKbcLbaJbcMbcNbcObcPbcQbcRbaNbcSbaPaZAbcTbcUbcTaZAbaPaZCbaSbbPcnlcmeaXWbdVaYabaWbpuaZDbpvaIPaIPaIPbaabaabaabaabpwbpxbaabaabaabaabcYbaabaabaabaabaabcZaYzaYzaYzbvTaYzaYzbpyaYzbpzbaabaabaabaabdbbdcbddbdebdfbdfbdfbdgbdibdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdfbdhbdibpAbdkbdkbdlbpBbpCaXaaXabpDbpEbpFbpdbpGaRkaRkbpHaRkbpIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaayUjzlaKXaKXbpKbdqaxAaXbaxAazaaxBaxBbdqaxAaXbaxAazaaxBaxBaxBbdrbdsbdrbdrbdrbdrbdtbduaPjaPjaPjbdvaVLaPlaUDbfRaTiaPlaUDbfRbpNaPlaPlaPlaPlbdAbdBaPlaZhaZibdCbdDbdEbdFaZmbdzaWdaWdaWdaWdaWdaWdaWdbdGaWdbfPaIPbbZbcKbdIbaJbcMbdJbdKbcPbcQaBrbaNbdLbdMaZAbdNbdObdPaZAbdQbdRbaSaBtbbTbcVbdWbdXbpRbaWbdSaZDbnYbeaaIPbedbgBbgBbgBbpSbpTbpUbgBbgBbgBbpVbefbeebuybgDbgBbgBbgBbgBbgBbpXbqbgwAbgBbpZbqabqbbqcbgBbgDbqdbqebenbqfbqgbeqbeqbeqbaabpZbgDbqhbgBpwPbaabaabaabaabaaroPbaabaabaabaabaaaDLbqibqjbevbqkbfUbqlbqlbqlbqlbqmbqnbqoaMzaMzaMzaMzaMzaMzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRFatJaaebanauShUbaKXbqpayUbqqayUbqrayUayWaxBaxBayXayUbqsayUayYbezbeAbeAbdrbeBbeCbqtbeEbeFbdtbeGbeHbeIbeIbeJbeKaPlfKXbfRbfRaPlfKXbfRbfRaPlbqzbqAbeObePbeQbeObeRaZibeSbeTaZjbqBaZmaPjbeVbeWbeXbeXbeXbeXbeYbeZbeVbqCaIPbbZaZvbaJbfbbfcbfdbfebffbcQbfgbfhaXYbfibfjbfkbfkbfkbflbfmaYdbfnaCRbdUbdYwQebqDbpRbaWbfpaZDbnYaIPbjXbfvbfvbfvbfvbfvbfvbfvbfwbfxbfxbFWbqEbqFbfwberberberberberbfBbfBbIzbfBbfBbxwbxwbfCbrAbsScPPbsSbqHbfGbqIbqJbfJbfJbfJbfKbfLbfLbfLbfLbfLbqKbqLbqLbqLbqMbqLbqNbqObqLbqLbqPbfSbfSbfSbfSbqQbmtbqRbqSbqSbqRydtbqTbqTaMzatJatJatJatJmoyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhrbclauSauSayUayUbqUayUaAbaRJayUaAcaAdbfXbfYayUaRJaAbayUauSaAaauSbdrbfZbgabgabgabgbbgcbgdbgebcnbqVbqWbggaPlbpObgjwixaPlbpObgjwixaPlbgkbglqGPbgnqGPqGPbrbbgpbgqaZkbgrbgsaZmbeUbgtbgubeVbgvbgwbgxbgyaPNbgAbrcbgCbrdaZvbgEaZvbgFbgGbgHbgIaXNaXObrebfrbbQbdTbfqbfsaCUaFAaFBbrfbrgbftaZBbrhbricnmbrjbaWbgNaZDbnYaIPbrkbfvbrlbrmbrnbrobrpbfvbrqbrrbrrbrubrsbrtoosbfDbrvbrwbrxberbfEbfFbrybpWbfBbsNbrBbrCbrAbrDbrEmBkbqHbrFbrGbrHbrIbrJbrKbrLbrMbrNbrObrPbfLbrQbrRbrQbfLbrSbrTbrSbfSkUVbrVbrUbfSbrWbrXbfSbrYbmtbrZbsabsbaSZaMyaMzaMzaMzaaaaaaatJaaaiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadayUbscayUayUayUayUayUayUbsdayUaadaadaadaaabdrbsebdrbsfbgabsgbshbdraRTbsiaPjbsjbskbsmbsmbsmbsmbsmbsmbsmbsmbsmbsobspbsqbsqbsqbsqbsqaZmaZmbsraZiaZmaZmbeVbssbstbsubsvbswbsxjdjbsybszbqCaIPbsAaZvbsBaZvaZvaZvaZvbgIbcQbsCaZvbsDaAxaAxaAyaHcaAzaAxaAxaZDaZDaZDbbNbpjiWlbgQbpRbaWbsEaZDbnYaIPbjXbfvbsFbsGbsHbsHbsIbsJbrtbsKbrtbrtbrsbrtbrtbfDuHibxxbsMberbsQbsObsPbPBwytiJKtmtvQxbrAbsSgFObxjbqHbsUbqIbsVbsWbsXbsYbsZbtabtbbtcbtdbtebtfbtgbthbfLbtibtjbtkbfSbgRbgSbgRbtlbgRbgRbfSbrYbmtaMyaMyaMyaMyaMyaaaatJaaeaaaaaaatJaaaiWgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG @@ -7979,7 +7973,7 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaabGIbGJbGIbGKbGLbGKbGKbGKbGKbGKbGKbGMbvdbDRbFsbGNbeVbGObGPbGQbGRbswbGTbGSpYcbGUbBdbBebylaKebGVbBfbwRbGWbGXbGYbGZbHabwRaTBaTBaTBaTBbHbbHcbHdaTBaTBaTBaTBbBrbHebHfbHgbHhbFNbFObFPbBrbHiaIPaxxbqGbHjbHkbHlbHmbHnbqGvnpbrtbHpbLvbHrbHsbHtbHuhoZbHvbqGbrtbHwbEObHxbDlbHybHzbHAbHBbHCbHDbHDbHEbHFbHGbHHbHIbHJbHKbHLbHMbHLbHLbHNbHLbHLbHObHPbHLbHLbHQbHRbHSbHTbHUbHVbHWbHXbHYbHZbGwbIabGybGzbIbbGzbGBbIcbCfriRbAJbIdbIebIfbwtaaaaaaaaaaaaatJaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJatJbhratJbhrbhratJbhraaaaaaaaaaaaaaaaaaaaabzgbwybwybwybsqbIhbIhbIhbIhbIhbIibvdbvdbDRbFsbIjbIkbIkbIlbImbInbIobIpbIpbIpbIobIobIqbIraRmaTBaTBbwRbwRbwRbwRbwRbIsbwRbItbIubIvaTBbIwbIxbIyaTBbIBbIAbIBbBrbBrbBrbBrbBrbBrbBrbBrbBrbICaTSaRmbIDbIEbrsbIGbIHbIIbqGbIJbrtbsLbrtbILgNrbINbIObIPgNrbILbrtbHwbEObIQbIRbISbITbIUbIVbIWbITbITbIXbIYbIZbJabJbbJbbJbbJbbJcbJbbJbbJbbJdbJdbJebJfbJgbJgbCabJhbCbbHTbJibJjbJkbJlbJmbJnbCfbJobJpbJqbJrbJqbJsbJtbCfriRbAJbJubIebJvbwtaadaaaaaaaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaFcbJwbJxbJyaFcbJzbJAbvdbJBbJCbJCbJDbJEbJFbJGbJHbIpbJIbJJbJKbJLbIobJMbylaIPaLPblobJNbJOaLPbljbJPbJQbJRbJSbJSbJSbJTbJUbJVbJWbJXaLPaLPaLPaLPbJOaLPbljaNKaLPaLPbJNaLPbJYaIPbjXbIDbJZbKabKbbKcbKdbqGbKebrtbPGbrtbILbIMbKgbKhbKibIMbILbrtbKjbEObDlbKkbKlbKmbKnbKobKpbKqbKrbAhbAhbKsbKtbJbbKubKvbKwbKxbKybKzbJbbKAbKBbKCbKDbKEbJgbCabJhbKFbKGbKHbKIbKJbKKbKLbKMbCfbKNbKObKPbKQbKPbKObKRbCfriRbAJbKSbKTbKUbwtaadaadaadaadaadatJatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyKbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaFcbKVbKWbKXaFcaFcaFcbKYbKZbKZaFcaFcbLabLbbLcbLdbLebLfbLgbLhbLibIobxbbLjaIPmMXthejqfaIPaIPbLkaIPbylaIPmMXthejqfaIPbLlbLmbLnaIPmMXthejqfaIPaIPaIPaLzaIPaIPmMXthejqfbJYbLobjXbqGbLpbLqbLrbLsbLtbqGbLubrtmIMbLvbqGbLwbLxbLybLxbLzbqGbrtbHwbEObEObEObEObEObAhbAhbAhbAhbAhbAhbLAwHdbLCbJbbLDbLEbLFbLGbLHbLIbJbbLJbLKbLLbLMbLNbJgbCabLObLPbLQbLRbLSbLSbLTbLUbLVbCfbLWbLXbLYbLZbLYbMabLWbCfriRbAJbMbbIebMcbwtaadaaaaaaaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaFcbKVbKWbKXaFcaFcaFcbKYbKZbKZaFcaFcbLabLbbLcbLdbLebLfbLgbLhbLibIobxbbLjaIPaIPaIPaIPaIPaIPbLkaIPbylaIPaIPaIPaIPaIPbLlbLmbLnaIPaIPaIPaIPaIPaIPaIPaLzaIPaIPaIPaIPaIPbJYbLobjXbqGbLpbLqbLrbLsbLtbqGbLubrtmIMbLvbqGbLwbLxbLybLxbLzbqGbrtbHwbEObEObEObEObEObAhbAhbAhbAhbAhbAhbLAwHdbLCbJbbLDbLEbLFbLGbLHbLIbJbbLJbLKbLLbLMbLNbJgbCabLObLPbLQbLRbLSbLSbLTbLUbLVbCfbLWbLXbLYbLZbLYbMabLWbCfriRbAJbMbbIebMcbwtaadaaaaaaaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraaaaaaaaaaaabhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaFcaFcbMdaFcaFcbMebMfbMgbMhbMibMjbMkbMlbMmbMnbMobMpbMqbMrbMsbMtbIobMubMvbMwaKlbMwbMxbMwbMwbMybMwbMzbfQbMAbMBbfQbMCbMDbMEbMFbMGbMHbMIbMJbMJbMKbMJbMLbMMbMJbMNbMObMPbMQbfQbMRbqGbMSbMTbMUbqGbqGbqGbFWbMVbFWbqGbqGbqGbqGbqGbqGbqGbqGbrtbrtbMWbMXbMYbMZbNabNbbNcbNdbNebNfbNbbNgbNhbNibJbbKubNjbNkbNlbNmbNnbJbbNobNpbNqbNrbNsbJgbCabNtbNubGvbNvbNwbNxbNybNzbNAbCfbNBbNCbNDbNEbNDbNCbNFbCfbNGbNHbNIbIebIfbwtaaaaaaaaaaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeDWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaabhratJbhrbhratJbhratJbNJbhrbhrbhrbNJatJatJatJatJatJatJbMkaZybMgbNKbNLbNMbNNbNObNPbNQbNRbNSbNTbNUbNVaTRbIobNWbNXbNYbNZbIobOabObaITaITaITaITbOcbOcbOcbOcbOcbOcbOcbOcbOcbOcbOdaHpbOebOfbOfbOfbOfbOfbOgbOfbOfbOfbOfbOhbOibOhaIUaKfbOjbFYbOkbOlbFYbOnbOobOpbOqbrtbOrbyBbOsbOtbOubOvbOwbOxbyBbutbrtbrtbrtbrtbrtbBFbOybOzbOAbOzbOBbNbbOCwHdbODbODbODbODbODbODbODbODbODbOEbOEbOEbOEbOEbOEbOFbOGbOHbGvbGvbGvbGvbGvbGvbGvbCfbCfbCfbCfbCfbCfbCfbCfbCfriRbAJbOIbOJbwtbwtaadatJaaeaaeaaeaaeaaeaaeaaeaaeaaeaadaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiWgatJatJaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabOKbOLbOMbONbOObOPbOQbORbOSbOTbOUbOVbOWbOXbOYbOZbPabPabPabPabPabPbbPcbObaaaaaaaadaaabOcbPdbPebPfbPgbPhbPibPjbPkbOcbPlbPmbPnbOfbPobPpbPqbPrbPsbPtbPubPvbPwbPxbPybOhbOhbOhbOhbFYbPzbPAxghbPCbPDbPEbPFbEBbPHbPIbEBbEBbEBbPJbrtbPKbPLbPMbPNbPNbPObPPbPQbPRbOybPSbPTbPUbPVbNbbOCwHdbODbPWbPWbPWbPXbPWbPWhLRbODbPYbPYbPZbPYbPYbOEbQabQbbQcbQdbQebQfbQgbQhbQibQjbQkbQlbQmbQnbQobQpbQqbQrbQrbQsbQtbQebQebwtaadaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index f35f9b8b34..5a177dfdb5 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -303,7 +303,7 @@ /area/solars/port) "aaN" = ( /obj/structure/chair/stool, -/turf/open/floor/plasteel, +/turf/open/floor/padded, /area/security/brig) "aaO" = ( /obj/structure/lattice/catwalk, @@ -396,10 +396,11 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aba" = ( -/obj/machinery/door/airlock/external{ - name = "Arrival Shuttle Airlock" - }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + name = "Arrival Shuttle Airlock"; + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "abb" = ( @@ -1345,7 +1346,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ name = "Fore Maintenance"; - req_one_access_txt = "12;46" + req_one_access_txt = "12;46"; + dir = 8 }, /turf/open/floor/plating, /area/maintenance/fore) @@ -1613,7 +1615,7 @@ /obj/structure/table, /obj/item/modular_computer/laptop/preset/civilian, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel, +/turf/open/floor/padded, /area/security/brig) "aec" = ( /turf/closed/wall/r_wall, @@ -1910,10 +1912,6 @@ /area/security/brig) "aeN" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Router"; - req_one_access_txt = "1" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -1923,6 +1921,11 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/security/glass{ + name = "Security Router"; + req_one_access_txt = "1"; + dir = 4 + }, /turf/open/floor/plasteel, /area/security/brig) "aeO" = ( @@ -1996,7 +1999,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ name = "Construction Area"; - req_access_txt = "12" + req_access_txt = "12"; + dir = 4 }, /turf/open/floor/plasteel, /area/construction) @@ -2672,7 +2676,8 @@ }, /obj/machinery/door/airlock/maintenance{ name = "Fore Maintenance"; - req_one_access_txt = "12;46" + req_one_access_txt = "12;46"; + dir = 4 }, /turf/open/floor/plating, /area/maintenance/fore) @@ -2865,7 +2870,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/door/airlock/external/glass{ +/obj/machinery/door/airlock/external{ + dir = 4; name = "Labor Camp Shuttle Airlock" }, /turf/open/floor/plasteel, @@ -2887,6 +2893,10 @@ /obj/structure/table, /obj/effect/turf_decal/tile/blue, /obj/item/storage/fancy/donut_box, +/obj/machinery/light{ + dir = 4; + light_color = "#e8eaff" + }, /turf/open/floor/plasteel, /area/commons/lounge) "ahj" = ( @@ -2909,6 +2919,7 @@ dir = 8 }, /obj/machinery/door/airlock/external{ + dir = 4; name = "Labor Camp Shuttle Airlock" }, /turf/open/floor/plasteel, @@ -2969,6 +2980,10 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, /turf/open/floor/plasteel, /area/commons/lounge) "ahu" = ( @@ -3016,6 +3031,11 @@ /obj/machinery/door/window/eastleft{ name = "Bathroom Stall" }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) "ahC" = ( @@ -3273,9 +3293,6 @@ /turf/open/floor/plasteel, /area/commons/storage/tools) "aij" = ( -/obj/structure/chair{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, @@ -3294,16 +3311,15 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "ail" = ( -/obj/machinery/light{ - dir = 4; - light_color = "#e8eaff" - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/plasteel, /area/commons/lounge) "aim" = ( @@ -3446,13 +3462,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - name = "Starboard Bow Maintenance"; - req_one_access_txt = "12;25;26;28;35;46" - }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/maintenance{ + name = "Starboard Bow Maintenance"; + req_one_access_txt = "12;25;26;28;35;46"; + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aiG" = ( @@ -3579,6 +3596,11 @@ name = "Bathroom Stall" }, /obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) "aiZ" = ( @@ -3937,6 +3959,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/commons/fitness) "ajR" = ( @@ -4098,11 +4124,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ name = "Starboard Bow Solar Exterior Airlock"; - req_access_txt = "10;13" + req_access_txt = "10;13"; + dir = 8 }, -/obj/machinery/door/firedoor, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "akk" = ( @@ -4246,7 +4273,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ name = "Secondary Construction Area"; - req_access_txt = "12" + req_access_txt = "12"; + dir = 8 }, /turf/open/floor/plating, /area/construction/secondary) @@ -4262,10 +4290,13 @@ /turf/open/floor/plasteel, /area/security/warden) "akz" = ( -/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + dir = 8 + }, /turf/open/floor/plasteel, /area/router/service) "akA" = ( @@ -4587,7 +4618,8 @@ }, /obj/machinery/door/airlock/external/glass{ name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2" + req_access_txt = "2"; + dir = 4 }, /turf/open/floor/plasteel, /area/security/processing) @@ -4601,9 +4633,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/door/airlock/external{ +/obj/machinery/door/airlock/external/glass{ name = "Labor Camp Shuttle Airlock"; - req_access_txt = "2" + req_access_txt = "2"; + dir = 4 }, /turf/open/floor/plasteel, /area/security/processing) @@ -4711,7 +4744,12 @@ /turf/open/floor/plasteel/dark, /area/hallway/secondary/service) "alI" = ( -/obj/structure/weightmachine/stacklifter, +/obj/machinery/treadmill, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/commons/fitness) "alJ" = ( @@ -4725,6 +4763,11 @@ /area/commons/lounge) "alL" = ( /obj/structure/weightmachine/weightlifter, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/commons/fitness) "alM" = ( @@ -4973,7 +5016,8 @@ }, /obj/machinery/door/airlock/maintenance{ name = "Fore Maintenance"; - req_one_access_txt = "12;46" + req_one_access_txt = "12;46"; + dir = 4 }, /turf/open/floor/plating, /area/maintenance/fore) @@ -4991,7 +5035,8 @@ }, /obj/machinery/door/airlock/maintenance{ name = "Starboard Bow Maintenance"; - req_one_access_txt = "12;25;26;28;35;46" + req_one_access_txt = "12;25;26;28;35;46"; + dir = 8 }, /turf/open/floor/plating, /area/maintenance/starboard/fore) @@ -5892,6 +5937,10 @@ /obj/machinery/shower{ dir = 1 }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) "aos" = ( @@ -6006,11 +6055,20 @@ pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, +/obj/item/book/manual/gato_spacelaw, /turf/open/floor/plasteel, /area/security/prison) "aoC" = ( /obj/structure/window/reinforced, /obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "steel_decals9" + }, +/obj/effect/turf_decal/loading_area{ + dir = 2; + icon_state = "steel_decals9" + }, /turf/open/floor/plasteel, /area/commons/fitness) "aoD" = ( @@ -6057,6 +6115,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/maintenance/solars/port) "aoI" = ( @@ -6281,7 +6340,7 @@ dir = 5 }, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, +/turf/open/floor/padded, /area/security/brig) "apd" = ( /obj/machinery/door/firedoor, @@ -6385,7 +6444,8 @@ /obj/effect/turf_decal/delivery, /obj/machinery/door/airlock/security{ name = "Security EVA Prep Room"; - req_access_txt = "2" + req_access_txt = "2"; + dir = 4 }, /turf/open/floor/plasteel, /area/security/processing) @@ -6558,11 +6618,12 @@ /turf/open/floor/wood, /area/commons/fitness) "apQ" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, /obj/machinery/door/airlock/security/glass{ name = "Solitary Confinement"; - req_one_access_txt = "2" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + req_one_access_txt = "2"; dir = 4 }, /turf/open/floor/plasteel, @@ -6629,12 +6690,13 @@ /area/maintenance/port/fore) "apZ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Fitness Toilets" - }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock{ + name = "Fitness Toilets"; + dir = 4 + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/restrooms) "aqa" = ( @@ -6989,6 +7051,11 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/white, /area/commons/fitness/cogpool) "aqT" = ( @@ -7010,13 +7077,14 @@ /area/commons/fitness/cogpool) "aqV" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Purple Dorms Maintenance"; - req_access_txt = "12" - }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/maintenance{ + name = "Purple Dorms Maintenance"; + req_access_txt = "12"; + dir = 8 + }, /turf/open/floor/plating, /area/commons/dorms/purple) "aqW" = ( @@ -7076,6 +7144,10 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 6 }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/commons/fitness) "arb" = ( @@ -7110,6 +7182,10 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/commons/fitness) "are" = ( @@ -7329,7 +7405,8 @@ }, /obj/machinery/door/airlock/maintenance{ name = "Blue Dorms Maintenance"; - req_one_access_txt = "12;46" + req_one_access_txt = "12;46"; + dir = 8 }, /turf/open/floor/plating, /area/commons/dorms/blue) @@ -7411,6 +7488,11 @@ dir = 4; light_color = "#e8eaff" }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/white, /area/commons/fitness/cogpool) "arO" = ( @@ -7587,13 +7669,14 @@ /area/maintenance/starboard/fore) "ase" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Purple Dorms" - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/public/glass{ + name = "Purple Dorms"; + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/dorms/purple) "asf" = ( @@ -7601,13 +7684,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/public/glass{ - name = "Blue Dorms" - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/public/glass{ + name = "Blue Dorms"; + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/dorms/blue) "asg" = ( @@ -7794,6 +7878,11 @@ dir = 8; pixel_x = 23 }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/white, /area/commons/fitness/cogpool) "asy" = ( @@ -7873,7 +7962,8 @@ }, /obj/effect/turf_decal/delivery, /obj/machinery/door/airlock/security{ - name = "Labor Camp Arrivals" + name = "Labor Camp Arrivals"; + dir = 4 }, /turf/open/floor/plasteel, /area/security/processing) @@ -7939,6 +8029,11 @@ /obj/machinery/light_switch{ pixel_x = 24 }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/white, /area/commons/fitness/cogpool) "asN" = ( @@ -8111,7 +8206,9 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/external, +/obj/machinery/door/airlock/external{ + dir = 8 + }, /turf/open/floor/plasteel, /area/router/service) "atj" = ( @@ -8373,7 +8470,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ name = "Bar Backroom"; - req_access_txt = "25" + req_access_txt = "25"; + dir = 4 }, /turf/open/floor/plasteel/grimy, /area/service/bar) @@ -8708,7 +8806,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/padded, /area/security/brig) "auF" = ( /obj/structure/table/wood, @@ -8732,7 +8830,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/padded, /area/security/brig) "auJ" = ( /obj/structure/bed, @@ -8956,13 +9054,14 @@ /area/commons/storage/tools) "avi" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance/abandoned{ - name = "Port Bow Maintainance"; - req_one_access_txt = "13" - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance/abandoned{ + name = "Port Bow Maintainance"; + req_one_access_txt = "13"; + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port/fore) "avj" = ( @@ -9249,6 +9348,11 @@ c_tag = "Laundry Room" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/cafeteria, /area/service/barbershop) "avP" = ( @@ -9275,10 +9379,20 @@ dir = 1; light_color = "#ffc1c1" }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/cafeteria, /area/service/barbershop) "avS" = ( /obj/machinery/washing_machine, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/cafeteria, /area/service/barbershop) "avT" = ( @@ -9290,14 +9404,15 @@ /turf/open/floor/plasteel, /area/service/bar) "avU" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Pool Maintenance"; - req_one_access_txt = "12" - }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/maintenance{ + name = "Pool Maintenance"; + req_one_access_txt = "12"; + dir = 8 + }, /turf/open/floor/plating, /area/commons/fitness/cogpool) "avV" = ( @@ -9324,6 +9439,16 @@ "avX" = ( /obj/structure/table, /obj/structure/bedsheetbin, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/cafeteria, /area/service/barbershop) "avY" = ( @@ -9575,11 +9700,12 @@ /area/service/hydroponics/lobby) "awy" = ( /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, /obj/machinery/door/airlock/maintenance{ name = "Laundry Room Maintenance"; - req_one_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + req_one_access_txt = "12"; dir = 8 }, /turf/open/floor/plating, @@ -9627,6 +9753,11 @@ dir = 4; pixel_x = 11 }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/cafeteria, /area/service/barbershop) "awG" = ( @@ -10019,10 +10150,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, @@ -10036,6 +10163,11 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/machinery/door/airlock/public/glass{ + dir = 4; + name = "Hydroponics"; + req_access_txt = "35" + }, /turf/open/floor/plasteel, /area/service/hydroponics) "axs" = ( @@ -10159,14 +10291,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock{ - name = "Hydroponics Storage"; - req_access_txt = "35" - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock{ + name = "Hydroponics Storage"; + req_access_txt = "35"; + dir = 8 + }, /turf/open/floor/plasteel, /area/service/hydroponics/lobby) "axE" = ( @@ -10274,6 +10407,11 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/commons/fitness) "axP" = ( @@ -10455,6 +10593,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/commons/fitness) "ayj" = ( @@ -10515,6 +10658,11 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/commons/fitness) "ayt" = ( @@ -10527,6 +10675,11 @@ dir = 8; pixel_x = 24 }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/cafeteria, /area/service/barbershop) "ayu" = ( @@ -11129,6 +11282,11 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/cafeteria, /area/service/barbershop) "azD" = ( @@ -11203,15 +11361,15 @@ name = "Boxing Ring" }, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/fitness) "azL" = ( @@ -11445,25 +11603,26 @@ dir = 1; layer = 2.9 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel, /area/commons/fitness) "aAm" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, /obj/machinery/door/airlock/freezer{ name = "Kitchen Coldroom"; - req_access_txt = "28" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + req_access_txt = "28"; dir = 4 }, /turf/open/floor/plasteel/freezer, @@ -11541,11 +11700,12 @@ /turf/open/floor/plasteel, /area/security/brig) "aAw" = ( +/obj/structure/fans/tiny, /obj/machinery/door/poddoor{ id = "chapelgun"; - name = "Chapel Launcher Door" + name = "Chapel Launcher Door"; + dir = 8 }, -/obj/structure/fans/tiny, /turf/open/floor/plating, /area/service/chapel/main) "aAx" = ( @@ -11561,6 +11721,11 @@ /obj/item/kirbyplants{ icon_state = "plant-14" }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/white, /area/commons/fitness/cogpool) "aAz" = ( @@ -11690,10 +11855,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/public/glass{ - name = "Hydroponics"; - req_access_txt = "35" - }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, @@ -11707,6 +11868,11 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, +/obj/machinery/door/airlock/public/glass{ + dir = 4; + name = "Hydroponics"; + req_access_txt = "35" + }, /turf/open/floor/plasteel, /area/service/hydroponics) "aAN" = ( @@ -12670,8 +12836,9 @@ /obj/structure/table, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/item/book/manual/wiki/security_space_law, /obj/item/paper/guides/cogstation/letter_sec, +/obj/item/book/manual/gato_spacelaw, +/obj/item/book/manual/gato_spacelaw, /turf/open/floor/carpet/red, /area/security/brig) "aCM" = ( @@ -12694,23 +12861,24 @@ /turf/open/floor/plasteel, /area/service/bar) "aCO" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/structure/window/reinforced{ + dir = 4; + layer = 2.9 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel, /area/commons/fitness) "aCP" = ( @@ -12912,22 +13080,12 @@ /turf/open/floor/plating, /area/maintenance/central) "aDh" = ( -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/public/glass{ - name = "Port Bow Primary Hallway" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "steel_decals9" }, /turf/open/floor/plasteel, -/area/service/bar) +/area/commons/fitness) "aDi" = ( /obj/structure/closet/secure_closet/evidence, /obj/effect/turf_decal/tile/red{ @@ -13016,9 +13174,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/public/glass{ - name = "Civilian Wing Hallway" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -13026,6 +13181,10 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/public/glass{ + name = "Civilian Wing Hallway"; + dir = 8 + }, /turf/open/floor/plasteel, /area/service/bar) "aDs" = ( @@ -13349,10 +13508,6 @@ /area/space/nearstation) "aEc" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -13369,6 +13524,11 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/door/airlock/security/glass{ + name = "Security Office"; + req_access_txt = "63"; + dir = 4 + }, /turf/open/floor/plasteel, /area/security/brig) "aEd" = ( @@ -14988,9 +15148,8 @@ /turf/open/floor/plasteel, /area/tcommsat/computer) "aHk" = ( -/obj/structure/chair{ - dir = 4 - }, +/obj/effect/turf_decal/bot, +/obj/machinery/vending/mealdor, /turf/open/floor/plasteel, /area/hallway/primary/port/fore) "aHl" = ( @@ -15532,10 +15691,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/port/fore) "aIv" = ( -/obj/machinery/cryopod{ - dir = 8 +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" }, -/turf/open/floor/circuit/green, +/obj/machinery/cryopod/tele, +/turf/open/floor/plasteel/dark, /area/commons/cryopod) "aIw" = ( /obj/machinery/firealarm{ @@ -16334,14 +16495,12 @@ /turf/open/floor/plating/asteroid, /area/service/hydroponics/garden) "aJW" = ( -/obj/machinery/cryopod{ - dir = 8 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -26 }, -/turf/open/floor/circuit/green, +/obj/machinery/cryopod/tele, +/turf/open/floor/plasteel/dark, /area/commons/cryopod) "aJX" = ( /obj/machinery/light{ @@ -16634,6 +16793,9 @@ pixel_y = -3; req_access_txt = "19" }, +/obj/item/book/manual/gato_spacelaw{ + pixel_x = 8 + }, /turf/open/floor/carpet/royalblue, /area/command/bridge) "aKB" = ( @@ -17998,10 +18160,9 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai) "aNp" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/vending/cola/random, -/turf/open/floor/plasteel, -/area/hallway/primary/port/fore) +/obj/machinery/cryopod/tele, +/turf/open/floor/plasteel/dark, +/area/commons/cryopod) "aNq" = ( /obj/machinery/door/window/northright{ name = "Chapel Office"; @@ -18108,16 +18269,9 @@ /turf/open/floor/plating, /area/security/office) "aNB" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Port Bow Primary Hallway" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/service/bar) +/obj/structure/grille, +/turf/open/floor/plating, +/area/space) "aNC" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -18568,16 +18722,10 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "aOz" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Port Bow Hall"; - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port/fore) +/obj/structure/lattice, +/obj/structure/grille, +/turf/open/floor/plating, +/area/space/nearstation) "aOA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18597,13 +18745,14 @@ /turf/open/floor/plating/airless, /area/commons/fitness/cogpool) "aOD" = ( -/obj/machinery/door/airlock{ - name = "Catering"; - req_one_access_txt = "25;28" - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock{ + name = "Catering"; + req_one_access_txt = "25;28"; + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/service/bar) "aOE" = ( @@ -18721,11 +18870,13 @@ /turf/closed/wall/r_wall, /area/commons/fitness/cogpool) "aOU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 +/obj/effect/turf_decal/loading_area{ + dir = 5; + icon_state = "steel_panel"; + name = "steel pannel" }, -/turf/closed/wall/r_wall/rust, -/area/commons/fitness/cogpool) +/turf/open/floor/plasteel, +/area/commons/fitness) "aOV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -19480,7 +19631,10 @@ /area/security/brig) "aQF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/circuit/green, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, /area/commons/cryopod) "aQG" = ( /obj/structure/closet/emcloset, @@ -19631,16 +19785,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock{ - name = "Service Hallway"; - req_one_access_txt = "25;26;28;35" - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock{ + name = "Service Hallway"; + req_one_access_txt = "25;26;28;35"; + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/service) "aRa" = ( @@ -19859,16 +20014,15 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload_foyer) "aRz" = ( -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/plasteel, /area/commons/lounge) "aRA" = ( @@ -20311,10 +20465,6 @@ /turf/open/floor/plasteel, /area/engineering/secure_construction) "aSB" = ( -/obj/machinery/door/airlock/command{ - name = "Bridge"; - req_access_txt = "19" - }, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -20322,6 +20472,11 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/command{ + name = "Bridge"; + req_access_txt = "19"; + dir = 4 + }, /turf/open/floor/plasteel, /area/command/bridge) "aSC" = ( @@ -20380,10 +20535,6 @@ /area/hallway/secondary/civilian) "aSJ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" - }, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -20391,6 +20542,11 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/door/airlock/security/glass{ + name = "Security Office"; + req_access_txt = "63"; + dir = 4 + }, /turf/open/floor/plasteel, /area/security/office) "aSK" = ( @@ -20545,6 +20701,9 @@ c_tag = "Central Hall - Starboard"; pixel_x = 22 }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aTc" = ( @@ -20707,10 +20866,6 @@ /area/security/detectives_office) "aTu" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge Access"; - req_access_txt = "19" - }, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -20718,6 +20873,11 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge Access"; + req_access_txt = "19"; + dir = 4 + }, /turf/open/floor/plasteel, /area/command/bridge) "aTv" = ( @@ -20871,9 +21031,6 @@ /turf/open/floor/plasteel, /area/router/public) "aTL" = ( -/obj/machinery/cryopod{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Cryogenics"; dir = 4 @@ -20881,7 +21038,11 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 6 }, -/turf/open/floor/circuit/green, +/obj/machinery/computer/cryopod{ + pixel_y = 28 + }, +/obj/structure/rack/shelf, +/turf/open/floor/plasteel, /area/commons/cryopod) "aTM" = ( /turf/closed/wall/r_wall, @@ -21403,10 +21564,13 @@ /area/maintenance/port/central) "aUZ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/science/mixing) "aVa" = ( @@ -21460,13 +21624,13 @@ /turf/open/floor/engine, /area/engineering/teg) "aVg" = ( -/obj/machinery/computer/cryopod{ - pixel_y = 28 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, -/turf/open/floor/circuit/green, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, /area/commons/cryopod) "aVh" = ( /obj/effect/turf_decal/bot, @@ -21478,11 +21642,11 @@ /turf/open/floor/plasteel, /area/router/public) "aVj" = ( -/obj/machinery/vending/cola/random, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/vending/gato, /turf/open/floor/plasteel/dark/side, /area/security/courtroom) "aVk" = ( @@ -21628,19 +21792,8 @@ /turf/open/floor/carpet/red, /area/security/brig) "aVA" = ( -/obj/machinery/cryopod{ - dir = 4 - }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23 - }, -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/circuit/green, +/turf/open/floor/plasteel, /area/commons/cryopod) "aVB" = ( /obj/machinery/light_switch{ @@ -21928,20 +22081,11 @@ }, /area/service/lawoffice) "aWi" = ( -/obj/machinery/cryopod{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - areastring = "/area/maintenance/disposal"; - dir = 8; - name = "Cryogenics APC"; - pixel_x = -25 - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/circuit/green, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, /area/commons/cryopod) "aWj" = ( /obj/structure/lattice/catwalk, @@ -21978,7 +22122,14 @@ /area/security/detectives_office) "aWo" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/closed/wall/r_wall, +/obj/machinery/door/airlock/public/glass{ + name = "Cryogenics" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, /area/commons/cryopod) "aWp" = ( /obj/effect/turf_decal/tile/yellow{ @@ -22430,6 +22581,7 @@ /obj/machinery/door/airlock/external{ name = "Port Docking Bay" }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/hallway/primary/central) "aXm" = ( @@ -22876,10 +23028,6 @@ /area/maintenance/department/security) "aYr" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "1" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -22889,6 +23037,11 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/maintenance{ + name = "Security Maintenance"; + req_access_txt = "12"; + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/department/security) "aYs" = ( @@ -23062,13 +23215,14 @@ /area/security/courtroom) "aYK" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Civilian Wing Hallway" - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, +/obj/machinery/door/airlock/public/glass{ + name = "Civilian Wing Hallway"; + dir = 8 + }, /turf/open/floor/plasteel, /area/service/bar) "aYL" = ( @@ -23177,6 +23331,7 @@ dir = 1; name = "north facing firelock" }, +/obj/item/book/manual/gato_spacelaw, /turf/open/floor/plasteel/dark, /area/security/checkpoint/customs) "aYY" = ( @@ -23223,13 +23378,14 @@ /area/engineering/teg) "aZd" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "E.V.A. Maintenance"; - req_access_txt = "18" - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/command{ + name = "E.V.A. Maintenance"; + req_access_txt = "18"; + dir = 4 + }, /turf/open/floor/plating, /area/ai_monitored/command/storage/eva) "aZe" = ( @@ -23707,7 +23863,6 @@ light_color = "#e8eaff" }, /obj/item/storage/box/deputy, -/obj/item/paper/guides/cogstation/letter_hos, /turf/open/floor/plasteel/grimy, /area/command/heads_quarters/hos) "aZU" = ( @@ -23960,8 +24115,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/item/book/manual/wiki/security_space_law, /obj/structure/window/reinforced/spawner/north, +/obj/item/book/manual/gato_spacelaw, /turf/open/floor/plasteel/dark, /area/service/lawoffice) "baA" = ( @@ -24214,15 +24369,16 @@ /obj/machinery/door/airlock/external{ name = "Port Docking Bay" }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/hallway/primary/central) "bba" = ( /obj/effect/landmark/start/assistant, -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/circuit/green, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, /area/commons/cryopod) "bbb" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden{ @@ -24322,8 +24478,9 @@ /area/hallway/primary/central) "bbo" = ( /obj/structure/closet/crate, -/obj/item/book/manual/wiki/security_space_law, -/obj/item/book/manual/wiki/security_space_law, +/obj/item/book/manual/gato_spacelaw, +/obj/item/book/manual/gato_spacelaw, +/obj/item/book/manual/gato_spacelaw, /turf/open/floor/plasteel/dark, /area/service/lawoffice) "bbp" = ( @@ -24332,6 +24489,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/obj/item/book/manual/gato_spacelaw, /turf/open/floor/carpet, /area/security/courtroom) "bbq" = ( @@ -24515,16 +24673,17 @@ /area/space/nearstation) "bbP" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "HoP Office Maintenance"; - req_access_txt = "57" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance{ + name = "HoP Office Maintenance"; + req_access_txt = "57"; + dir = 4 + }, /turf/open/floor/plating, /area/security/checkpoint/customs) "bbQ" = ( @@ -24891,15 +25050,9 @@ /turf/open/floor/plasteel/dark, /area/security/checkpoint/customs) "bcK" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/public/glass{ - name = "Cryogenics" - }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/circuit/green, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/commons/cryopod) "bcL" = ( /obj/structure/cable{ @@ -24965,16 +25118,17 @@ /area/hallway/primary/aft) "bcU" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Jury Room Maintainance"; - req_one_access_txt = "12" - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/maintenance{ + name = "Jury Room Maintainance"; + req_one_access_txt = "12"; + dir = 8 + }, /turf/open/floor/plating, /area/security/courtroom/jury) "bcV" = ( @@ -25396,14 +25550,15 @@ /turf/open/floor/engine, /area/engineering/teg) "bdQ" = ( -/obj/machinery/door/airlock/command{ - name = "Bridge"; - req_access_txt = "19" - }, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/command{ + name = "Bridge"; + req_access_txt = "19"; + dir = 4 + }, /turf/open/floor/plasteel, /area/command/bridge) "bdR" = ( @@ -25500,10 +25655,12 @@ /area/science/mixing) "bee" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/door/airlock/external{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/mixing) "bef" = ( @@ -25688,11 +25845,12 @@ dir = 1 }, /obj/structure/fans/tiny, -/obj/structure/plasticflaps, /obj/machinery/door/poddoor{ id = "starboardbelthell_in"; - name = "Belt Hell" + name = "Belt Hell"; + dir = 8 }, +/obj/structure/plasticflaps, /turf/open/floor/plating, /area/maintenance/disposal) "beF" = ( @@ -26094,10 +26252,6 @@ /area/service/chapel/office) "bfA" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge Access"; - req_access_txt = "19" - }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, @@ -26105,17 +26259,23 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge Access"; + req_access_txt = "19"; + dir = 4 + }, /turf/open/floor/plasteel, /area/command/bridge) "bfB" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Chapel Morgue"; - req_access_txt = "22;27" - }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock{ + name = "Chapel Morgue"; + req_access_txt = "22;27"; + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/service/chapel/office) "bfC" = ( @@ -26649,7 +26809,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ name = "Port Central Maintenance"; - req_one_access_txt = "12" + req_one_access_txt = "12"; + dir = 4 }, /turf/open/floor/plating, /area/hallway/primary/central) @@ -26720,16 +26881,17 @@ /area/engineering/atmos) "bgN" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Port Central Maintenance"; - req_one_access_txt = "12" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance{ + name = "Port Central Maintenance"; + req_one_access_txt = "12"; + dir = 4 + }, /turf/open/floor/plating, /area/hallway/primary/central) "bgO" = ( @@ -27004,7 +27166,7 @@ "bhx" = ( /obj/machinery/vending/coffee, /obj/structure/window/reinforced/spawner/east, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "bhy" = ( /obj/structure/plasticflaps, @@ -27056,11 +27218,12 @@ /area/maintenance/department/chapel) "bhD" = ( /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + dir = 4 + }, /obj/machinery/door/airlock/maintenance{ name = "Chapel Air Hookup"; - req_one_access_txt = "12;22" - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + req_one_access_txt = "12;22"; dir = 4 }, /turf/open/floor/plating, @@ -27496,16 +27659,12 @@ /turf/open/floor/plasteel, /area/cargo/office) "biA" = ( -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/purple, /area/command/heads_quarters/rd) "biB" = ( /obj/structure/table/wood, /obj/machinery/computer/security/telescreen/rd, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/plasteel/dark, /area/command/heads_quarters/rd) "biC" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ @@ -27562,9 +27721,7 @@ c_tag = "Research Director's Office - Starboard"; network = list("ss13","rd") }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/plasteel/dark, /area/command/heads_quarters/rd) "biH" = ( /obj/structure/cable{ @@ -27786,16 +27943,17 @@ /area/hallway/primary/central) "bjh" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "E.V.A. Maintenance"; - req_one_access_txt = "12" - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/maintenance{ + name = "E.V.A. Maintenance"; + req_one_access_txt = "12"; + dir = 8 + }, /turf/open/floor/plating, /area/hallway/primary/central) "bji" = ( @@ -28397,9 +28555,7 @@ dir = 4 }, /obj/effect/landmark/start/research_director, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/purple, /area/command/heads_quarters/rd) "bkz" = ( /obj/effect/turf_decal/tile/green{ @@ -28692,10 +28848,6 @@ /area/cargo/storage) "blf" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Head of Personnel's Office"; - req_access_txt = "57" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -28706,6 +28858,11 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/command{ + name = "Head of Personnel's Office"; + req_access_txt = "57"; + dir = 8 + }, /turf/open/floor/plasteel, /area/command/heads_quarters/hop) "blg" = ( @@ -28729,6 +28886,7 @@ name = "Cargo Freighter Dock"; req_access_txt = "31" }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/cargo/storage) "bli" = ( @@ -28830,13 +28988,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bls" = ( @@ -28986,10 +29144,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "blG" = ( -/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior{ + dir = 4 + }, /turf/open/floor/engine, /area/science/mixing) "blH" = ( @@ -29002,10 +29162,12 @@ /turf/open/floor/plasteel, /area/science/mixing) "blI" = ( -/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior{ + dir = 4 + }, /turf/open/floor/engine, /area/science/mixing) "blJ" = ( @@ -29213,9 +29375,7 @@ dir = 8 }, /obj/effect/landmark/start/research_director, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/purple, /area/command/heads_quarters/rd) "bme" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -29248,9 +29408,6 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/structure/cable{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{ dir = 4 }, @@ -29832,11 +29989,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 4 + }, /obj/machinery/door/poddoor{ id = "DeliveryDoor"; - name = "Delivery Door" - }, -/obj/effect/turf_decal/caution/stand_clear{ + name = "Delivery Door"; dir = 4 }, /turf/open/floor/plasteel, @@ -31323,7 +31481,7 @@ /area/maintenance/disposal) "bqv" = ( /obj/structure/window/reinforced/spawner/east, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "bqw" = ( /obj/effect/turf_decal/delivery, @@ -31387,10 +31545,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/public/glass{ - name = "Library Access" - }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/airlock/public/glass{ + name = "Library Access"; + dir = 4 + }, /turf/open/floor/plasteel, /area/service/library) "bqC" = ( @@ -31418,16 +31577,17 @@ /area/hallway/primary/aft) "bqF" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "E.V.A. Maintenance"; - req_one_access_txt = "12" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, +/obj/machinery/door/airlock/maintenance{ + name = "E.V.A. Maintenance"; + req_one_access_txt = "12"; + dir = 8 + }, /turf/open/floor/plating, /area/hallway/primary/central) "bqG" = ( @@ -31562,7 +31722,8 @@ /turf/open/floor/plating, /area/maintenance/department/eva) "bqX" = ( -/turf/closed/wall/mineral/titanium/nosmooth, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/ai_monitored/turret_protected/ai_upload_foyer) "bqY" = ( /obj/structure/sign/directions/medical{ @@ -31678,13 +31839,14 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - name = "Central Starboard Maintenance"; - req_access_txt = "12" - }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/maintenance{ + name = "Central Starboard Maintenance"; + req_access_txt = "12"; + dir = 8 + }, /turf/open/floor/plating, /area/hallway/secondary/civilian) "brk" = ( @@ -31692,7 +31854,7 @@ dir = 1 }, /obj/machinery/vending/cola/random, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "brl" = ( /obj/structure/table/reinforced, @@ -32011,10 +32173,6 @@ /area/cargo/office) "brR" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Construction Area"; - req_access_txt = "31" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -32023,6 +32181,11 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/maintenance{ + name = "Construction Area"; + req_access_txt = "31"; + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/sorting) "brS" = ( @@ -32066,11 +32229,12 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + dir = 4 + }, /obj/machinery/door/airlock{ name = "Chapel Maintenance"; - req_one_access_txt = "12;22;26;27;50" - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + req_one_access_txt = "12;22;26;27;50"; dir = 4 }, /turf/open/floor/plasteel, @@ -32102,14 +32266,14 @@ /obj/item/kirbyplants{ icon_state = "plant-02" }, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "bsa" = ( /obj/structure/table/glass, /obj/item/scalpel, /obj/item/storage/box/cups, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "bsb" = ( /obj/structure/disposalpipe/segment{ @@ -32260,7 +32424,7 @@ /turf/closed/wall, /area/commons/storage/tools) "bsp" = ( -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "bsq" = ( /obj/structure/table, @@ -32621,7 +32785,7 @@ /area/cargo/miningoffice) "btf" = ( /obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "btg" = ( /obj/structure/disposalpipe/segment{ @@ -32633,15 +32797,13 @@ /turf/open/floor/plating, /area/maintenance/department/chapel) "bth" = ( -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/blue, /area/medical/medbay/lobby) "bti" = ( /obj/machinery/door/window/eastleft{ name = "Waiting Room" }, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "btj" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, @@ -32921,7 +33083,7 @@ dir = 8 }, /obj/effect/landmark/start/assistant, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "btV" = ( /obj/structure/sign/warning/securearea, @@ -32944,7 +33106,7 @@ /obj/machinery/door/window/eastright{ name = "Waiting Room" }, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "btZ" = ( /obj/structure/plasticflaps, @@ -33087,8 +33249,9 @@ /turf/open/floor/plating, /area/router) "but" = ( -/turf/closed/wall/mineral/titanium/nosmooth, -/area/hallway/primary/central) +/obj/structure/lattice, +/turf/closed/wall, +/area/space/nearstation) "buu" = ( /obj/structure/table, /turf/open/floor/plating, @@ -33146,16 +33309,16 @@ /area/cargo/sorting) "buA" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/blue, /area/medical/medbay/lobby) "buB" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/structure/fans/tiny, /obj/machinery/door/airlock/external{ - name = "Ferry Docking Bay" + name = "Ferry Docking Bay"; + dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -33500,13 +33663,14 @@ /area/security/checkpoint) "bvq" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Kitchen"; - req_access_txt = "28" - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock{ + name = "Kitchen"; + req_access_txt = "28"; + dir = 4 + }, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) "bvr" = ( @@ -34308,11 +34472,12 @@ /area/cargo/warehouse) "bxf" = ( /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + dir = 4 + }, /obj/machinery/door/airlock/external{ name = "EVA Router"; - req_access_txt = "19" - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + req_access_txt = "19"; dir = 4 }, /turf/open/floor/plasteel, @@ -34694,7 +34859,8 @@ }, /obj/machinery/door/airlock/external{ name = "Central Starboard Exterior Access"; - req_access_txt = "13" + req_access_txt = "13"; + dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/central) @@ -35201,7 +35367,8 @@ }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ - name = "Ferry Docking Bay" + name = "Ferry Docking Bay"; + dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -35652,11 +35819,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, /obj/machinery/door/airlock/external{ name = "Central Starboard Exterior Access"; - req_access_txt = "13" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + req_access_txt = "13"; dir = 4 }, /turf/open/floor/plating, @@ -35863,9 +36031,7 @@ "bAw" = ( /obj/item/paper/fluff/bee_objectives, /obj/item/toy/plush/beeplushie, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/plasteel/dark, /area/command/heads_quarters/rd) "bAx" = ( /obj/machinery/conveyor{ @@ -36552,11 +36718,13 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bBX" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/external{ name = "Routing Depot"; - req_one_access_txt = "10;31" + req_one_access_txt = "10;31"; + dir = 8 }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/router) "bBY" = ( @@ -36564,13 +36732,14 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/external{ - name = "EVA Router"; - req_access_txt = "19" - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/external{ + name = "EVA Router"; + req_access_txt = "19"; + dir = 4 + }, /turf/open/floor/plasteel, /area/router/eva) "bBZ" = ( @@ -36586,7 +36755,8 @@ }, /obj/machinery/door/poddoor{ id = "RDServer"; - name = "RD Server Lockup" + name = "RD Server Lockup"; + dir = 8 }, /turf/open/floor/plasteel, /area/science/server/compcore) @@ -37353,23 +37523,18 @@ /turf/open/floor/plasteel/white, /area/science/mixing) "bDN" = ( -/obj/machinery/vending/cola/random, +/obj/machinery/vending/gato, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/primary/central) "bDO" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "steel_decals9" + }, /turf/open/floor/plasteel, /area/commons/fitness) "bDP" = ( @@ -37573,10 +37738,6 @@ /area/medical/medbay/central) "bEm" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Head of Personnel's Office"; - req_access_txt = "57" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -37586,6 +37747,11 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/command{ + name = "Head of Personnel's Office"; + req_access_txt = "57"; + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/hop) "bEn" = ( @@ -37954,16 +38120,6 @@ /turf/open/floor/wood, /area/commons/fitness) "bEU" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 6 }, @@ -38351,32 +38507,27 @@ /turf/open/floor/plasteel, /area/commons/fitness) "bFL" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "steel_decals9" }, /turf/open/floor/plasteel, /area/commons/fitness) "bFM" = ( /obj/structure/window/reinforced{ - dir = 4 + dir = 4; + layer = 2.9 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/plasteel, /area/commons/fitness) "bFN" = ( @@ -38393,39 +38544,34 @@ /turf/open/floor/wood, /area/commons/fitness) "bFO" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, +/obj/effect/turf_decal/loading_area{ + dir = 2; + icon_state = "steel_decals9" + }, /turf/open/floor/plasteel, /area/commons/fitness) "bFP" = ( /obj/structure/window/reinforced{ - dir = 4 + dir = 4; + layer = 2.9 }, /obj/machinery/light{ dir = 4; light_color = "#e8eaff" }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel, /area/commons/fitness) "bFQ" = ( @@ -38451,9 +38597,6 @@ /turf/open/floor/wood, /area/commons/fitness) "bFT" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/structure/window/reinforced, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -38465,6 +38608,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/door/window/westleft{ + name = "Boxing Ring" + }, /turf/open/floor/plasteel, /area/commons/fitness) "bFU" = ( @@ -38502,16 +38648,16 @@ dir = 4 }, /obj/structure/window/reinforced, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/plasteel, /area/commons/fitness) "bFX" = ( @@ -39378,7 +39524,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ name = "Port Bow Maintenance"; - req_access_txt = "12" + req_access_txt = "12"; + dir = 4 }, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -39596,11 +39743,12 @@ /area/medical/chemistry) "bIu" = ( /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, /obj/machinery/door/airlock/medical{ name = "Morgue"; - req_access_txt = "5;6" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + req_access_txt = "5;6"; dir = 4 }, /turf/open/floor/plasteel/showroomfloor, @@ -39626,13 +39774,14 @@ /area/space/nearstation) "bIy" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/external{ - name = "External Solar Access"; - req_access_txt = "10;13" - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/external{ + name = "External Solar Access"; + req_access_txt = "10;13"; + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "bIz" = ( @@ -39954,12 +40103,13 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bJf" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Chemistry Maintenance"; - req_access_txt = "5; 33" - }, /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance{ + name = "Chemistry Maintenance"; + req_access_txt = "5; 33"; + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/chemistry) "bJg" = ( @@ -40096,8 +40246,10 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, -/obj/machinery/door/airlock/public/glass, /obj/effect/turf_decal/delivery, +/obj/machinery/door/airlock/public/glass{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bJz" = ( @@ -40114,14 +40266,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/research{ - name = "Circuitry Lab"; - req_access_txt = "47" - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/research{ + name = "Circuitry Lab"; + req_access_txt = "47"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/circuit) "bJB" = ( @@ -40218,9 +40371,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 5 }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/blue, /area/medical/medbay/lobby) "bJL" = ( /obj/machinery/dna_scannernew, @@ -40436,10 +40587,6 @@ /area/cargo/warehouse) "bKk" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical{ - name = "Morgue Maintenance"; - req_access_txt = "6" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -40449,6 +40596,11 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/medical{ + name = "Morgue Maintenance"; + req_access_txt = "6"; + dir = 4 + }, /turf/open/floor/plasteel/showroomfloor, /area/medical/morgue) "bKl" = ( @@ -40555,9 +40707,6 @@ /area/engineering/engine_smes) "bKw" = ( /obj/structure/window/reinforced/spawner/west, -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_y = -32 - }, /turf/open/floor/wood, /area/service/library) "bKx" = ( @@ -40602,9 +40751,11 @@ /turf/closed/wall, /area/medical/genetics) "bKD" = ( +/obj/structure/fans/tiny, /obj/machinery/door/airlock/external/glass{ name = "Mining Dock Ferry"; - req_access_txt = "48" + req_access_txt = "48"; + dir = 8 }, /turf/open/floor/plasteel, /area/cargo/miningoffice) @@ -40715,14 +40866,15 @@ /area/service/library) "bKS" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Genetics Lab"; - req_access_txt = "9" - }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/door/airlock/medical/glass{ + name = "Genetics Lab"; + req_access_txt = "9"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "bKT" = ( @@ -40968,14 +41120,15 @@ /area/command/heads_quarters/hos) "bLq" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Genetics Lab"; - req_access_txt = "9" - }, /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/machinery/door/airlock/medical/glass{ + name = "Genetics Lab"; + req_access_txt = "9"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "bLr" = ( @@ -41269,14 +41422,9 @@ /turf/open/floor/plasteel/cafeteria, /area/medical/medbay/central) "bLX" = ( -/obj/item/kirbyplants{ - icon_state = "plant-02" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) +/obj/structure/lattice, +/turf/closed/wall, +/area/space) "bLY" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, @@ -42506,10 +42654,6 @@ /area/space/nearstation) "bOx" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Power Monitoring"; - req_access_txt = "10" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -42522,6 +42666,11 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/engineering/glass{ + name = "Power Monitoring"; + req_access_txt = "10"; + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/engine_smes) "bOy" = ( @@ -43025,16 +43174,17 @@ /area/hallway/secondary/exit/departure_lounge) "bPE" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Aft Maintenance"; - req_access_txt = "12" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/maintenance{ + name = "Aft Maintenance"; + req_access_txt = "12"; + dir = 4 + }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "bPF" = ( @@ -43124,16 +43274,17 @@ /area/maintenance/aft) "bPO" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Starboard Quarter Maintenance"; - req_one_access_txt = "12;48" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/maintenance{ + name = "Starboard Quarter Maintenance"; + req_one_access_txt = "12;48"; + dir = 4 + }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "bPP" = ( @@ -43175,16 +43326,17 @@ /area/medical/morgue) "bPT" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Aft Maintenance"; - req_access_txt = "12" - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/maintenance{ + name = "Aft Maintenance"; + req_access_txt = "12"; + dir = 4 + }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "bPU" = ( @@ -43554,6 +43706,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/effect/decal/big_gato, /turf/open/floor/plasteel, /area/hallway/primary/central) "bQJ" = ( @@ -44049,7 +44202,7 @@ name = "Station Intercom (Common)"; pixel_y = 29 }, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "bRI" = ( /turf/closed/wall/r_wall, @@ -44064,7 +44217,7 @@ c_tag = "Medbay - Waiting Room"; network = list("ss13","rd") }, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "bRK" = ( /obj/machinery/light/small{ @@ -44120,11 +44273,12 @@ /area/cargo/storage) "bRP" = ( /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, /obj/machinery/door/airlock/command{ name = "E.V.A. Storage"; - req_access_txt = "18" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + req_access_txt = "18"; dir = 8 }, /turf/open/floor/plasteel, @@ -44330,12 +44484,13 @@ dir = 4 }, /obj/effect/turf_decal/delivery, -/obj/machinery/door/airlock/public/glass{ - name = "AI Access" - }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, +/obj/machinery/door/airlock/public/glass{ + name = "AI Access"; + dir = 8 + }, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload_foyer) "bSl" = ( @@ -44416,13 +44571,13 @@ /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload_foyer) "bSs" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload_foyer) "bSt" = ( /obj/machinery/light{ @@ -44431,7 +44586,7 @@ /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload_foyer) "bSu" = ( /obj/structure/disposalpipe/segment, @@ -44630,12 +44785,13 @@ dir = 8 }, /obj/effect/turf_decal/delivery, -/obj/machinery/door/airlock/public/glass{ - name = "AI Access" - }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, +/obj/machinery/door/airlock/public/glass{ + name = "AI Access"; + dir = 8 + }, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload_foyer) "bSP" = ( @@ -44937,7 +45093,6 @@ /turf/open/floor/plating, /area/cargo/warehouse) "bTy" = ( -/obj/item/kirbyplants, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 9 }, @@ -44972,9 +45127,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 10 }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/blue, /area/medical/medbay/lobby) "bTC" = ( /obj/effect/landmark/event_spawn, @@ -45155,8 +45308,10 @@ /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload_foyer) "bTY" = ( -/turf/open/floor/mineral/titanium/blue, -/area/hallway/primary/central) +/obj/effect/turf_decal/bot, +/obj/machinery/vending/gato, +/turf/open/floor/plasteel, +/area/hallway/primary/port/fore) "bTZ" = ( /obj/structure/disposalpipe/segment, /obj/structure/lattice, @@ -45533,16 +45688,17 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/obj/machinery/door/airlock/engineering{ - name = "Primary Tool Storage"; - req_access_txt = "11" - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/engineering{ + name = "Primary Tool Storage"; + req_access_txt = "11"; + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/storage/primary) "bUO" = ( @@ -45984,16 +46140,17 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/engineering{ - name = "AI SMES Access"; - req_one_access_txt = "10;24" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/engineering{ + name = "AI SMES Access"; + req_one_access_txt = "10;24"; + dir = 4 + }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai_upload_foyer) "bVD" = ( @@ -46181,14 +46338,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock{ + name = "Law Office"; + req_access_txt = "38"; + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/service/lawoffice) "bVV" = ( @@ -46353,27 +46511,29 @@ /area/service/lawoffice) "bWl" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Toxins Storage"; - req_access_txt = "7;8" - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance{ + name = "Toxins Storage"; + req_access_txt = "7;8"; + dir = 4 + }, /turf/open/floor/plating, /area/science/mixing) "bWm" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "AI SMES Access"; - req_one_access_txt = "10;24" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/engineering{ + name = "AI SMES Access"; + req_one_access_txt = "10;24"; + dir = 4 + }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai_upload_foyer) "bWn" = ( @@ -46765,11 +46925,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, /obj/machinery/door/airlock/research/glass{ name = "Research Sector"; - req_one_access_txt = "29;47" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + req_one_access_txt = "29;47"; dir = 4 }, /turf/open/floor/plasteel, @@ -46864,13 +47025,14 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/research/glass{ - name = "Research Sector"; - req_one_access_txt = "29;47" - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/research/glass{ + name = "Research Sector"; + req_one_access_txt = "29;47"; + dir = 4 + }, /turf/open/floor/plasteel, /area/science/research) "bXb" = ( @@ -47405,11 +47567,12 @@ /turf/open/floor/plating, /area/router) "bYg" = ( +/obj/structure/fans/tiny, /obj/machinery/door/poddoor{ id = "toxinsdriver"; - name = "toxins launcher bay door" + name = "toxins launcher bay door"; + dir = 4 }, -/obj/structure/fans/tiny, /turf/open/floor/plating, /area/science/mixing) "bYh" = ( @@ -47500,14 +47663,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/research/glass{ - name = "Toxins Lab Access"; - req_access_txt = "7;8" - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/research/glass{ + name = "Toxins Lab Access"; + req_access_txt = "7;8"; + dir = 4 + }, /turf/open/floor/plasteel, /area/science/mixing) "bYt" = ( @@ -48037,7 +48201,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ name = "Fire Suppression Storage"; - req_access_txt = "12" + req_access_txt = "12"; + dir = 4 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -48337,7 +48502,9 @@ }, /area/engineering/atmos) "cam" = ( -/obj/machinery/door/poddoor/incinerator_atmos_main, +/obj/machinery/door/poddoor/incinerator_atmos_main{ + dir = 4 + }, /turf/open/floor/engine/vacuum, /area/engineering/atmos) "can" = ( @@ -48373,7 +48540,6 @@ /turf/open/floor/engine/vacuum, /area/engineering/atmos) "caq" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/cable{ icon_state = "4-8" @@ -48381,6 +48547,9 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior{ + dir = 4 + }, /turf/open/floor/engine/vacuum, /area/engineering/atmos) "car" = ( @@ -48388,7 +48557,6 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "cas" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/cable{ icon_state = "4-8" @@ -48396,6 +48564,9 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior{ + dir = 4 + }, /turf/open/floor/engine/vacuum, /area/engineering/atmos) "cat" = ( @@ -48607,8 +48778,10 @@ /area/science/xenobiology) "caW" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass, /obj/effect/turf_decal/delivery, +/obj/machinery/door/airlock/public/glass{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "caX" = ( @@ -48757,7 +48930,8 @@ }, /obj/machinery/door/airlock/maintenance{ name = "Medbay Maintenance"; - req_access_txt = "5" + req_access_txt = "5"; + dir = 8 }, /turf/open/floor/plating, /area/medical/medbay/central) @@ -48952,13 +49126,14 @@ /obj/machinery/atmospherics/pipe/simple/supplymain/visible{ dir = 4 }, -/obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/external{ + dir = 4; + name = "Atmospherics External Airlock"; + req_access_txt = "24" + }, /turf/open/floor/plasteel, /area/engineering/atmos) "cbJ" = ( @@ -49366,10 +49541,6 @@ /obj/effect/turf_decal/tile/brown{ dir = 8 }, -/obj/machinery/door/airlock/mining{ - name = "Mining Office"; - req_one_access_txt = "10;24;48" - }, /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -49377,6 +49548,11 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/mining{ + name = "Mining Office"; + req_access_txt = "48"; + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/miningoffice) "ccw" = ( @@ -49728,7 +49904,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/plasteel, /area/hallway/primary/central) "cdf" = ( /obj/structure/table, @@ -50125,7 +50301,8 @@ }, /obj/machinery/door/airlock/external/glass{ name = "Asteroid Mining Access"; - req_access_txt = "10;24" + req_access_txt = "10;24"; + dir = 4 }, /turf/open/floor/plasteel, /area/cargo/miningoffice) @@ -50220,7 +50397,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "ced" = ( /obj/machinery/computer/med_data{ @@ -50255,7 +50432,7 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "ceh" = ( /obj/structure/cable{ @@ -50285,7 +50462,7 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "cel" = ( /obj/structure/chair/office/light{ @@ -50484,6 +50661,7 @@ /obj/machinery/door/airlock/external{ name = "Ferry Docking Bay" }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/hallway/primary/central) "ceF" = ( @@ -50508,7 +50686,8 @@ /obj/structure/fans/tiny, /obj/machinery/door/poddoor{ id = "trash"; - name = "Disposal Bay Door" + name = "Disposal Bay Door"; + dir = 4 }, /turf/open/floor/plating, /area/maintenance/disposal) @@ -50689,7 +50868,8 @@ }, /obj/machinery/door/airlock/external/glass{ name = "Asteroid Mining Access"; - req_access_txt = "10;24" + req_access_txt = "10;24"; + dir = 4 }, /turf/open/floor/plasteel, /area/cargo/miningoffice) @@ -50807,16 +50987,17 @@ /area/hallway/secondary/exit/departure_lounge) "cfk" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Starboard Quarter Maintenance"; - req_one_access_txt = "12;48" - }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance{ + name = "Starboard Quarter Maintenance"; + req_one_access_txt = "12;48"; + dir = 4 + }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "cfl" = ( @@ -51086,13 +51267,14 @@ /area/engineering/atmos) "cfQ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Library Access" - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/public/glass{ + name = "Library Access"; + dir = 4 + }, /turf/open/floor/plasteel, /area/service/library) "cfR" = ( @@ -51133,14 +51315,15 @@ /turf/open/floor/plasteel, /area/engineering/break_room) "cfV" = ( -/obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/external{ + dir = 4; + name = "Atmospherics External Airlock"; + req_access_txt = "24" + }, /turf/open/floor/plasteel, /area/engineering/atmos) "cfW" = ( @@ -51215,26 +51398,23 @@ /area/commons/storage/primary) "cgd" = ( /obj/structure/fans/tiny, -/obj/structure/plasticflaps, /obj/machinery/conveyor/auto{ dir = 4; id = "disposal" }, /obj/structure/fans/tiny, /obj/machinery/door/poddoor{ - id = "starboardbelthell_out"; - name = "Belt Hell" + id = "starboardbelthell_in"; + name = "Belt Hell"; + dir = 8 }, +/obj/structure/plasticflaps, /turf/open/floor/plating, /area/maintenance/disposal) "cge" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -51245,6 +51425,11 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/external{ + dir = 4; + name = "Atmospherics External Airlock"; + req_access_txt = "24" + }, /turf/open/floor/plasteel, /area/engineering/atmos) "cgf" = ( @@ -52617,11 +52802,12 @@ /area/cargo/miningoffice) "cjc" = ( /obj/structure/fans/tiny, -/obj/structure/plasticflaps, /obj/machinery/door/poddoor{ id = "recycle_out"; - name = "Belt Hell" + name = "Belt Hell"; + dir = 8 }, +/obj/structure/plasticflaps, /turf/open/floor/plating, /area/maintenance/disposal) "cjd" = ( @@ -52873,7 +53059,8 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "E.V.A. Storage"; - req_access_txt = "18" + req_access_txt = "18"; + dir = 8 }, /turf/open/floor/plasteel, /area/ai_monitored/command/storage/eva) @@ -53122,15 +53309,16 @@ }, /area/science/robotics/lab) "ckc" = ( -/obj/machinery/door/airlock/external{ - name = "Escape Pod" - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/door/airlock/external{ + name = "Escape Pod"; + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "ckd" = ( @@ -53210,6 +53398,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "cko" = ( @@ -53414,10 +53603,12 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/external{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/department/eva) "ckJ" = ( @@ -54306,11 +54497,12 @@ /area/hallway/secondary/exit/departure_lounge) "cmA" = ( /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, /obj/machinery/door/airlock{ name = "Bar Backroom"; - req_access_txt = "25" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + req_access_txt = "25"; dir = 4 }, /turf/open/floor/plasteel/grimy, @@ -54350,9 +54542,11 @@ /turf/open/floor/plasteel, /area/engineering/teg/hotloop) "cmF" = ( -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/mineral/titanium/blue, -/area/hallway/primary/central) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/commons/cryopod) "cmG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/disposalpipe/segment{ @@ -54764,15 +54958,16 @@ /area/engineering/teg/coldloop) "cnt" = ( /obj/structure/fans/tiny, -/obj/structure/plasticflaps, /obj/machinery/conveyor/auto{ dir = 8; id = "disposal" }, /obj/machinery/door/poddoor{ - id = "recycle_in"; - name = "Belt Hell" + id = "recycle_out"; + name = "Belt Hell"; + dir = 8 }, +/obj/structure/plasticflaps, /turf/open/floor/plating, /area/maintenance/disposal) "cnu" = ( @@ -55012,7 +55207,9 @@ /turf/open/floor/plasteel, /area/science/mixing) "cnU" = ( -/obj/machinery/door/poddoor/incinerator_toxmix, +/obj/machinery/door/poddoor/incinerator_toxmix{ + dir = 4 + }, /turf/open/floor/engine/vacuum, /area/science/mixing) "cnV" = ( @@ -55103,7 +55300,7 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/medical/medbay/lobby) "coe" = ( /obj/structure/bodycontainer/morgue, @@ -55268,10 +55465,6 @@ /turf/closed/wall, /area/medical/medbay/central) "cow" = ( -/obj/machinery/door/airlock/external/glass{ - name = "Asteroid Mining Access"; - req_one_access_txt = "10;48" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -55284,6 +55477,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass{ + name = "Asteroid Mining Access"; + req_one_access_txt = "10;48"; + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/miningoffice) "cox" = ( @@ -55429,6 +55628,7 @@ dir = 4 }, /obj/machinery/door/airlock/research{ + dir = 4; name = "Robotics Lab"; req_access_txt = "29" }, @@ -55658,6 +55858,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral, +/obj/item/kirbyplants{ + icon_state = "plant-02" + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "cpd" = ( @@ -55877,9 +56080,14 @@ /turf/open/floor/plasteel/white, /area/science/robotics/lab) "cpx" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/mineral/titanium/blue, -/area/hallway/primary/central) +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/vending/cola/random, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/hallway/primary/port/fore) "cpy" = ( /obj/structure/chair{ dir = 1 @@ -55951,10 +56159,12 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/door/airlock/external{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/department/eva) "cpH" = ( @@ -56236,17 +56446,7 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "cqi" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/landmark/event_spawn, +/obj/effect/decal/big_gato, /turf/open/floor/plasteel, /area/commons/fitness) "cqj" = ( @@ -56327,10 +56527,6 @@ /area/engineering/teg/coldloop) "cqq" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "Warehouse"; - req_one_access_txt = "10;24" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -56339,6 +56535,11 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/engineering{ + name = "Warehouse"; + req_one_access_txt = "10;24"; + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/teg/coldloop) "cqr" = ( @@ -56760,10 +56961,6 @@ /turf/open/floor/plasteel, /area/cargo/sorting) "cre" = ( -/obj/machinery/door/airlock/external/glass{ - name = "Asteroid Mining Access"; - req_one_access_txt = "10;48" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -56776,6 +56973,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass{ + name = "Asteroid Mining Access"; + req_one_access_txt = "10;48"; + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/miningoffice) "crf" = ( @@ -56837,7 +57040,8 @@ "crk" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/mineral/titanium/blue, +/obj/effect/decal/medium_gato, +/turf/open/floor/plasteel, /area/hallway/primary/central) "crl" = ( /obj/structure/rack, @@ -57195,7 +57399,8 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Escape Pod" + name = "Escape Pod"; + dir = 4 }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) @@ -57462,10 +57667,6 @@ /area/medical/morgue) "csq" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "Cold Loop"; - req_access_txt = "10" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -57473,6 +57674,11 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/engineering{ + name = "Cold Loop"; + req_access_txt = "10"; + dir = 8 + }, /turf/open/floor/plasteel, /area/engineering/teg/coldloop) "csr" = ( @@ -57584,13 +57790,14 @@ /area/engineering/break_room) "csA" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Visitation" - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/public/glass{ + name = "Visitation"; + dir = 4 + }, /turf/open/floor/plasteel, /area/security/office) "csB" = ( @@ -57634,9 +57841,7 @@ /obj/effect/landmark/start/research_director, /obj/item/bedsheet/rd, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/plasteel/dark, /area/command/heads_quarters/rd) "csG" = ( /obj/machinery/holopad, @@ -57666,9 +57871,7 @@ pixel_x = -6; pixel_y = -32 }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/plasteel/dark, /area/command/heads_quarters/rd) "csJ" = ( /obj/structure/disposalpipe/segment, @@ -57698,9 +57901,7 @@ /area/medical/medbay/lobby) "csL" = ( /obj/effect/landmark/xmastree/rdrod, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/purple, /area/command/heads_quarters/rd) "csM" = ( /obj/effect/turf_decal/bot, @@ -57714,9 +57915,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 5 }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/purple, /area/command/heads_quarters/rd) "csO" = ( /obj/structure/bed/roller, @@ -58061,10 +58260,6 @@ /area/cargo/qm) "ctA" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_one_access_txt = "31;48" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -58077,6 +58272,11 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/mining/glass{ + name = "Cargo Bay"; + req_access_txt = "31"; + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/storage) "ctB" = ( @@ -58356,14 +58556,15 @@ /turf/open/floor/plasteel, /area/medical/medbay/zone2) "cuc" = ( -/obj/machinery/door/airlock/virology/glass{ - name = "Monkey Pen"; - req_access_txt = "39" - }, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/door/airlock/virology/glass{ + name = "Monkey Pen"; + req_access_txt = "39"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "cud" = ( @@ -58386,10 +58587,6 @@ /area/science/xenobiology) "cue" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "8;55" - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -58399,6 +58596,11 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab"; + req_access_txt = "8;55"; + dir = 4 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "cuf" = ( @@ -58891,6 +59093,7 @@ dir = 4 }, /obj/machinery/door/airlock/research{ + dir = 4; name = "Robotics Lab"; req_access_txt = "29" }, @@ -58936,9 +59139,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/purple, /area/command/heads_quarters/rd) "cvf" = ( /turf/open/floor/plasteel/freezer, @@ -59196,10 +59397,6 @@ /turf/open/floor/plasteel, /area/medical/medbay/zone2) "cvG" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Xenobiology Lab Access"; - req_access_txt = "55" - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -59213,6 +59410,11 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/research/glass{ + name = "Xenobiology Lab Access"; + req_access_txt = "55"; + dir = 4 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "cvH" = ( @@ -59225,12 +59427,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/research{ - name = "Toxins Mixing Lab"; - req_access_txt = "7;8" - }, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/heavy, +/obj/machinery/door/airlock/research{ + name = "Toxins Mixing Lab"; + req_access_txt = "7;8"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/mixing) "cvI" = ( @@ -59427,10 +59630,6 @@ /area/medical/medbay/zone2) "cvX" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "8;55" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -59443,16 +59642,17 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab"; + req_access_txt = "8;55"; + dir = 4 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "cvY" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/research/glass{ - name = "Xenobiology Lab Access"; - req_access_txt = "55" - }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -59463,6 +59663,11 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/door/airlock/research/glass{ + name = "Xenobiology Lab Access"; + req_access_txt = "55"; + dir = 4 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "cvZ" = ( @@ -59867,10 +60072,6 @@ /area/commons/storage/primary) "cwS" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "Warehouse"; - req_access_txt = "11" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -59882,6 +60083,11 @@ /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, +/obj/machinery/door/airlock/engineering{ + name = "Warehouse"; + req_access_txt = "11"; + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/storage/primary) "cwT" = ( @@ -59892,7 +60098,7 @@ "cwU" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/plasteel, /area/hallway/primary/central) "cwV" = ( /obj/machinery/light{ @@ -60199,9 +60405,6 @@ /area/cargo/miningoffice) "cxB" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Cargo Office" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -60209,6 +60412,10 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/public/glass{ + name = "Cargo Office"; + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/office) "cxC" = ( @@ -60508,10 +60715,6 @@ /area/maintenance/starboard/aft) "cyh" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Mining Office Maintenance"; - req_one_access_txt = "10;24;48" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -60521,6 +60724,11 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/maintenance{ + dir = 4; + name = "Mining Maintenance"; + req_access_txt = "48" + }, /turf/open/floor/plating, /area/cargo/miningoffice) "cyi" = ( @@ -61073,10 +61281,11 @@ /turf/open/floor/plasteel/dark, /area/science/observatory) "czr" = ( -/obj/machinery/door/airlock/external/glass{ - name = "Shuttle Maintenance Access" - }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass{ + name = "Shuttle Maintenance Access"; + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "czs" = ( @@ -61147,16 +61356,17 @@ /area/hallway/secondary/exit/departure_lounge) "czz" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Gateway Chamber"; - req_access_txt = "62" - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/door/airlock/command/glass{ + name = "Gateway Chamber"; + req_access_txt = "62"; + dir = 4 + }, /turf/open/floor/engine, /area/command/gateway) "czA" = ( @@ -61335,10 +61545,6 @@ /area/maintenance/department/chapel) "czS" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access_txt = "26" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -61347,6 +61553,11 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock{ + name = "Custodial Closet"; + req_access_txt = "26"; + dir = 8 + }, /turf/open/floor/plasteel, /area/service/janitor) "czT" = ( @@ -61742,10 +61953,6 @@ /area/medical/virology) "cAD" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/virology/glass{ - name = "Isolation Room A"; - req_access_txt = "39" - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -61756,6 +61963,11 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/virology/glass{ + name = "Isolation Room A"; + req_access_txt = "39"; + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "cAE" = ( @@ -61776,11 +61988,12 @@ /area/medical/virology) "cAF" = ( /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, /obj/machinery/door/airlock/security{ name = "Detective's Office"; - req_access_txt = "4" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + req_access_txt = "4"; dir = 8 }, /turf/open/floor/plasteel/grimy, @@ -61849,13 +62062,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/security{ - name = "Detective's Office"; - req_access_txt = "4" - }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/security{ + name = "Detective's Office"; + req_access_txt = "4"; + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/security/detectives_office) "cAM" = ( @@ -62206,8 +62420,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/port/fore) "cBv" = ( -/obj/structure/table/glass, /obj/effect/turf_decal/tile/neutral, +/obj/structure/chair{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port/fore) "cBw" = ( @@ -62676,10 +62892,6 @@ /area/maintenance/aft) "cCi" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/virology/glass{ - name = "Monkey Pen"; - req_access_txt = "39" - }, /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -62687,6 +62899,11 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/virology/glass{ + name = "Monkey Pen"; + req_access_txt = "39"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "cCj" = ( @@ -62873,10 +63090,6 @@ /area/medical/virology) "cCz" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/virology/glass{ - name = "Isolation Room B"; - req_access_txt = "39" - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 @@ -62884,6 +63097,11 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/virology/glass{ + name = "Isolation Room B"; + req_access_txt = "39"; + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "cCA" = ( @@ -62998,9 +63216,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/public/glass{ - name = "Library Access" - }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 @@ -63009,6 +63224,10 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/public/glass{ + name = "Library Access"; + dir = 4 + }, /turf/open/floor/plasteel, /area/service/library) "cCL" = ( @@ -63263,16 +63482,10 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/plasteel/dark, /area/command/heads_quarters/rd) "cDk" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance"; - req_access_txt = "12" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -63282,6 +63495,11 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/maintenance{ + name = "Security Maintenance"; + req_access_txt = "12"; + dir = 4 + }, /turf/open/floor/plating, /area/hallway/primary/port/fore) "cDl" = ( @@ -63574,13 +63792,14 @@ /area/command/heads_quarters/cmo) "cDK" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Gateway Chamber"; - req_access_txt = "62" - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/command/glass{ + name = "Gateway Chamber"; + req_access_txt = "62"; + dir = 4 + }, /turf/open/floor/engine, /area/command/gateway) "cDL" = ( @@ -63668,9 +63887,7 @@ /area/hallway/primary/aft) "cDS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/purple, /area/command/heads_quarters/rd) "cDT" = ( /obj/structure/table, @@ -63686,9 +63903,7 @@ "cDU" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/purple, /area/command/heads_quarters/rd) "cDV" = ( /obj/machinery/door/firedoor, @@ -63704,9 +63919,7 @@ /area/command/gateway) "cDW" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/purple, /area/command/heads_quarters/rd) "cDX" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible, @@ -63727,9 +63940,7 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 5 }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/plasteel/dark, /area/command/heads_quarters/rd) "cDZ" = ( /obj/structure/table, @@ -63763,16 +63974,17 @@ /area/command/heads_quarters/cmo) "cEb" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Research Director's Office"; - req_access_txt = "30" - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/command{ + dir = 8; + name = "Research Director's Office"; + req_access_txt = "30" + }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/rd) "cEc" = ( @@ -64186,6 +64398,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/effect/decal/big_gato, /turf/open/floor/plasteel, /area/hallway/primary/aft) "cEI" = ( @@ -64309,13 +64522,14 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Locker Room"; - req_access_txt = "5" - }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Locker Room"; + req_access_txt = "5"; + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cES" = ( @@ -64355,16 +64569,17 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Locker Room"; - req_access_txt = "5" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Locker Room"; + req_access_txt = "5"; + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cEV" = ( @@ -64788,14 +65003,15 @@ /area/medical/medbay/central) "cFH" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Break Room"; - req_access_txt = "5" - }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Break Room"; + req_access_txt = "5"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cFI" = ( @@ -65020,10 +65236,6 @@ /area/router/air) "cGb" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "MedSci Router"; - req_access_txt = "5" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -65034,6 +65246,11 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/medical/glass{ + name = "MedSci Router"; + req_access_txt = "5"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cGc" = ( @@ -65219,13 +65436,14 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/door/airlock/research/glass{ - name = "Xenobiology Lab Access"; - req_access_txt = "55" - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/research/glass{ + name = "Xenobiology Lab Access"; + req_access_txt = "55"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "cGs" = ( @@ -65493,7 +65711,8 @@ }, /obj/machinery/door/airlock/medical{ name = "Morgue"; - req_access_txt = "5;6" + req_access_txt = "5;6"; + dir = 4 }, /turf/open/floor/plasteel/showroomfloor, /area/medical/morgue) @@ -65781,11 +66000,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, /obj/machinery/door/airlock/research{ name = "Experimentation Lab"; - req_access_txt = "47" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + req_access_txt = "47"; dir = 8 }, /turf/open/floor/plasteel/dark, @@ -65858,13 +66078,14 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/research{ - name = "Experimentation Lab"; - req_access_txt = "47" - }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/machinery/door/airlock/research{ + name = "Experimentation Lab"; + req_access_txt = "47"; + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/science/explab) "cHH" = ( @@ -65956,16 +66177,9 @@ /turf/open/floor/plasteel, /area/medical/medbay/central) "cHR" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical{ - name = "Morgue"; - req_one_access_txt = "9;45" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/medical/morgue) +/obj/structure/grille, +/turf/open/floor/plating, +/area/space/nearstation) "cHS" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -66792,13 +67006,15 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "cJn" = ( -/obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + dir = 4; + name = "Atmospherics External Airlock"; + req_access_txt = "24" + }, /turf/open/floor/plasteel, /area/engineering/atmos) "cJo" = ( @@ -67200,12 +67416,13 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery, -/obj/machinery/door/airlock/public/glass{ - name = "Airbridge Router" - }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, +/obj/machinery/door/airlock/public/glass{ + name = "Airbridge Router"; + dir = 8 + }, /turf/open/floor/plasteel, /area/router/air) "cKf" = ( @@ -68554,12 +68771,13 @@ "cNh" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, -/obj/machinery/door/airlock/public/glass{ - name = "Airbridge Router" - }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/machinery/door/airlock/public/glass{ + name = "Airbridge Router"; + dir = 8 + }, /turf/open/floor/plasteel, /area/router/air) "cNi" = ( @@ -68944,9 +69162,7 @@ dir = 8 }, /obj/effect/landmark/event_spawn, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/blue, /area/medical/medbay/lobby) "cOe" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ @@ -69307,7 +69523,6 @@ /turf/open/floor/plasteel, /area/service/janitor/aux) "cOT" = ( -/obj/structure/plasticflaps, /obj/structure/fans/tiny, /obj/machinery/door/poddoor{ id = "research_out"; @@ -69316,7 +69531,6 @@ /turf/open/floor/plating, /area/router/medsci) "cOU" = ( -/obj/structure/plasticflaps, /obj/structure/fans/tiny, /obj/machinery/door/poddoor{ id = "research_in"; @@ -70497,7 +70711,8 @@ }, /obj/machinery/door/poddoor{ id = "MiningConveyorBlastDoor"; - name = "Asteroid Mining Load Door" + name = "Asteroid Mining Load Door"; + dir = 8 }, /turf/open/floor/plating, /area/cargo/miningoffice) @@ -70694,6 +70909,11 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/medical/morgue) +"cRY" = ( +/obj/machinery/vending/mealdor, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "cVq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -70987,6 +71207,26 @@ }, /turf/open/space/basic, /area/space/nearstation) +"kkx" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/vending/gato, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/hallway/primary/port/fore) +"kxO" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/vending/mealdor, +/turf/open/floor/plasteel/dark/side, +/area/security/courtroom) "kzb" = ( /obj/machinery/atmospherics/pipe/manifold/orange/hidden{ dir = 4 @@ -71115,6 +71355,10 @@ }, /turf/open/space/basic, /area/space/nearstation) +"oCf" = ( +/obj/effect/decal/medium_gato, +/turf/open/floor/plasteel, +/area/security/courtroom) "oMB" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -71132,6 +71376,18 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/floor/plasteel, /area/engineering/atmos) +"pLV" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/obj/machinery/cryopod/tele, +/turf/open/floor/plasteel/dark, +/area/commons/cryopod) "pMW" = ( /obj/machinery/airalarm{ dir = 1; @@ -71139,6 +71395,15 @@ }, /turf/open/floor/plasteel, /area/service/hydroponics) +"pOx" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/vending/mealdor, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/hallway/primary/port/fore) "pZq" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 8; @@ -71159,6 +71424,18 @@ /obj/machinery/atmospherics/pipe/simple/supplymain/visible, /turf/open/space/basic, /area/space/nearstation) +"qqO" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/kirbyplants, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"qHK" = ( +/obj/machinery/vending/gato, +/turf/open/floor/wood, +/area/commons/fitness) "qHL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/brown/visible{ @@ -71277,6 +71554,15 @@ }, /turf/closed/wall/r_wall, /area/engineering/atmos) +"tFI" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/commons/cryopod) "tXV" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Pure to Ports" @@ -71341,6 +71627,27 @@ /obj/machinery/atmospherics/pipe/simple/violet/visible, /turf/closed/wall/r_wall, /area/engineering/atmos) +"wmT" = ( +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/white, +/area/commons/fitness/cogpool) +"wyF" = ( +/obj/machinery/power/apc{ + areastring = "/area/maintenance/disposal"; + dir = 8; + name = "Cryogenics APC"; + pixel_x = -25 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/cryopod/tele, +/turf/open/floor/plasteel/dark, +/area/commons/cryopod) "wPS" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/violet/visible{ @@ -71354,6 +71661,10 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"wXs" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/commons/cryopod) "xcO" = ( /obj/effect/turf_decal/tile/green{ dir = 4 @@ -71384,6 +71695,9 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"xJH" = ( +/turf/open/floor/padded, +/area/security/brig) "xKr" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 4 @@ -93566,7 +93880,7 @@ aaa aaa anU aaN -aaS +xJH auE ahy aku @@ -93604,7 +93918,7 @@ aPo aTD aNL aNK -aVj +kxO aNR bao bDk @@ -95145,7 +95459,7 @@ aZM bbp bcN aYJ -aNL +oCf aVJ aYX baF @@ -97470,7 +97784,7 @@ aVS bcR bgF bcR -bLX +bLJ bLY bLY aVd @@ -97737,7 +98051,7 @@ bQx bqj bjj bjj -bjj +qqO aZy bVV bWg @@ -99294,12 +99608,12 @@ aYH bGI bTt bGI -but -but -but -but -but -but +bdg +bdg +bdg +bdg +bdg +bdg bUq bUv bUq @@ -99551,12 +99865,12 @@ cCG cCN coM cpr -cpx -cpx -cpx -cpx -cpx -cpx +bLY +bLY +bLY +bLY +bLY +bLY crV crY crZ @@ -99809,10 +100123,10 @@ bWH bWM bZr cde -cmF +bmL crk -cmF -cmF +bmL +bmL cwU cAT cBA @@ -100012,20 +100326,20 @@ aFM aAe aFC cAW -aHk +aEv aIi aHQ aHQ aHQ aJT aHQ -aHQ -aHQ -aHQ -aOz -aHt -bGI -bGI +pOx +cpx +aHY +aHY +aHY +aHY +aHY bkU aZJ bGI @@ -100065,12 +100379,12 @@ bRy bSA bTw cwW -bTY -bTY -bTY -bTY -bTY -bTY +beJ +beJ +beJ +beJ +beJ +beJ cwX cqY bUE @@ -100270,7 +100584,7 @@ aAj aIk cBf cBv -aIj +kkx aHs aHs aHs @@ -100278,11 +100592,11 @@ aHs aHs aHs aHs -aHt +aHY aNp -aHt -aPb -bGI +pLV +wyF +aHY blm baq bGI @@ -100310,7 +100624,7 @@ aWB aWB bDN cpv -bDN +cRY bGI bdg bdg @@ -100322,12 +100636,12 @@ bRB bGI bTt bGI -but -but -but -but -but -but +bdg +bdg +bdg +bdg +bdg +bdg bUq bUv bUq @@ -100536,10 +100850,10 @@ aaU aaU aaU aHY -aHY -aHY -aHY -aHY +cmF +cmF +tFI +wXs bln bmy aNT @@ -101307,7 +101621,7 @@ aaa aaa aaU aHY -aIv +aNp aIv aJW aHY @@ -104469,7 +104783,7 @@ bHK bIu bJh byQ -cHR +cGU bKC bKY bKY @@ -106166,7 +106480,7 @@ aff ahS ajQ axO -anX +aOU aoC apl ahJ @@ -106185,8 +106499,8 @@ aqS arN asx asM -auN -auN +wmT +wmT arN aAy aGH @@ -106195,7 +106509,7 @@ aMa aEZ aof aOl -aOU +aOT aaU aye aaU @@ -106423,7 +106737,7 @@ aff ahW ajQ ayi -anX +aOU aoC aqh ahJ @@ -106677,10 +106991,10 @@ axe bGc aeO ahz -aiw +qHK ajQ alL -anX +aOU aoC aqi ahJ @@ -106937,15 +107251,15 @@ ahz aiw ara ays -anX +aOU aoC arm ahJ atM aAl bDO -bFL -bFL +anX +aDh bFU ahz aAj @@ -107194,13 +107508,13 @@ ahA aiQ ard alI -anX +aOU aoC aqh ahJ apP aAl -bFL +anX cqi bEU bFV @@ -107458,7 +107772,7 @@ ahJ ahJ aAl bFL -bFL +anX bFO bFU ahz @@ -107719,8 +108033,8 @@ bFP bFM bFW aff -azP -azP +aHk +bTY aGQ aNv cBL @@ -107979,8 +108293,8 @@ aff aka aka aCe -aNB -aDh +aYK +aDr aka aql aql @@ -119781,12 +120095,12 @@ aaa aaa aaa aaa +aOz +aOz +aaU aaa aaa -aaa -aaa -aaa -aaa +aaU aaU ahu amU @@ -119803,12 +120117,12 @@ aov amU ahu aaU +aaU +aaU aaa -aaa -aaa -aaa -aaa -aaa +aaU +aOz +aOz aaa aaa aaa @@ -120038,12 +120352,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +aOz +but +aaU +aaU +aaU +aaU ahu ahu amV @@ -120060,12 +120374,12 @@ amV amV ahu ahu -aaa -aaa -aaa -aaa -aaa -aaa +aaU +aaU +aaU +aaU +but +aOz aaa aaa aaa @@ -120295,12 +120609,12 @@ aaa aaa aaa aaa +aOz +bLX +aaU aaa aaa -aaa -aaa -aaa -aaa +aaU ahu all amV @@ -120317,12 +120631,12 @@ amV amV bsJ ahu +aaU aaa aaa -aaa -aaa -aaa -aaa +aaU +but +aOz aaa aaa aaa @@ -120552,12 +120866,12 @@ aaa aaa aaa aaa +aOz +bLX +aaU aaa aaa -aaa -aaa -aaa -aaa +aaU ahu alm amV @@ -120574,12 +120888,12 @@ amV amV bsK ahu +aaU aaa aaa -aaa -aaa -aaa -aaa +aaU +but +aOz aaa aaa aaa @@ -120809,12 +121123,12 @@ aaa aaa aaa aaa +aOz +bLX +aaU aaa aaa -aaa -aaa -aaa -aaa +aaU ahu aln amV @@ -120831,12 +121145,12 @@ amV amV aln ahu +aaU aaa aaa -aaa -aaa -aaa -aaa +aaU +but +aOz aaa aaa aaa @@ -121066,12 +121380,12 @@ aaa aaa aaa aaa +aOz +bLX +aaU aaa aaa -aaa -aaa -aaa -aaa +aaU ahu aln amV @@ -121088,12 +121402,12 @@ amV amV aln ahu +aaU aaa aaa -aaa -aaa -aaa -aaa +aaU +but +aOz aaa aaa aaa @@ -121323,12 +121637,12 @@ aaa aaa aaa aaa +aOz +bLX +aaU aaa aaa -aaa -aaa -aaa -aaa +aaU ahu alm amV @@ -121345,12 +121659,12 @@ amV amV bsK ahu +aaU aaa aaa -aaa -aaa -aaa -aaa +aaU +but +aOz aaa aaa aaa @@ -121580,12 +121894,12 @@ aaa aaa aaa aaa +aOz +bLX +aaU aaa aaa -aaa -aaa -aaa -aaa +aaU ahu alJ amV @@ -121602,12 +121916,12 @@ amV amV alJ ahu +aaU aaa aaa -aaa -aaa -aaa -aaa +aaU +but +aOz aaa aaa aaa @@ -121837,12 +122151,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +aOz +bLX +aaU +aaU +aaU +aaU ahu ahu amV @@ -121859,12 +122173,12 @@ amV amV ahu ahu -aaa -aaa -aaa -aaa -aaa -aaa +aaU +aaU +aaU +aaU +but +aOz aaa aaa aaa @@ -122094,12 +122408,12 @@ aaa aaa aaa aaa +aOz +aOz +aaU aaa aaa -aaa -aaa -aaa -aaa +aaU aaU ahu amW @@ -122116,12 +122430,12 @@ aoI bsH ahu aaU +aaU aaa aaa -aaa -aaa -aaa -aaa +aaU +aOz +aOz aaa aaa aaa @@ -122613,7 +122927,7 @@ aaa aaa aaa aaa -aaa +aaU aaU aaU aaU @@ -122630,7 +122944,7 @@ ahu aaU aaU aaU -aaa +aaU aaa aaa aaa @@ -122869,9 +123183,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aaU +aaU +aaU aaa aaU aaU @@ -122886,9 +123200,9 @@ aaU aaU aaU aaa -aaa -aaa -aaa +aaU +aaU +aaU aaa aaa aaa @@ -123123,18 +123437,11 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cHR +but +aaU +aaU aaU -aaa aaa aaa aaa @@ -123147,9 +123454,16 @@ aaa aaa aaa aaa +aaU aaa aaa aaa +aaU +aaU +aaU +but +aNB +aaa aaa aaa aaa @@ -123380,16 +123694,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cHR +but +aaU aaU aaa aaa @@ -123404,10 +123711,17 @@ aaa aaa aaa aaa +aaU aaa aaa aaa aaa +aaU +aaU +but +aNB +aaa +aaa aaa aaa aaa @@ -123637,32 +123951,32 @@ aaa aaa aaa aaa +cHR +but +but +but aaa aaa aaa +aaU +aaU +aaU +aaU +aaU +aaU +aaU +aaU +aaU +aaU +aaU +aaU aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +but +but +but +aNB aaa aaa aaa @@ -123894,32 +124208,32 @@ aaa aaa aaa aaa +cHR +cHR +cHR +cHR aaa aaa aaa +aOz +but +but +but +but +but +but +but +but +but +but +aOz aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aNB +aNB +aNB +aNB aaa aaa aaa @@ -124158,18 +124472,18 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aOz +aOz +aOz +aOz +aOz +aOz +aOz +aOz +aOz +aOz +aOz +aOz aaa aaa aaa diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 8e8a53b324..d29ad9dae8 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -3102,6 +3102,7 @@ "afB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -6669,6 +6670,7 @@ /area/security/brig) "alI" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -17304,6 +17306,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, /obj/effect/spawner/lootdrop/grille_or_trash, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -20543,6 +20546,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/spawner/lootdrop/grille_or_trash, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -33282,8 +33286,8 @@ /turf/open/floor/plasteel/dark, /area/science/lab) "bdN" = ( -/obj/structure/girder, /obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/maintenance/starboard) "bdO" = ( @@ -33428,6 +33432,7 @@ "bdW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/grille_or_trash, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -49653,6 +49658,7 @@ "bFk" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -50030,6 +50036,7 @@ /area/maintenance/central) "bFS" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -57946,7 +57953,7 @@ "bSJ" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/grille_or_trash, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/maintenance/starboard/aft) "bSL" = ( @@ -59376,6 +59383,7 @@ "bVk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/grille_or_trash, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -60451,6 +60459,7 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/maintenance/aft) "bWQ" = ( @@ -65972,6 +65981,7 @@ "cgn" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/maintenance/port/aft) "cgo" = ( @@ -70364,6 +70374,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/grille_or_trash, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -73025,6 +73036,7 @@ "csT" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/maintenance/port) "csW" = ( @@ -73285,6 +73297,7 @@ "ctt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/grille_or_trash, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -73915,6 +73928,7 @@ "cuJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/grille_or_trash, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -76560,12 +76574,12 @@ /turf/open/space/basic, /area/space) "cBb" = ( -/obj/effect/spawner/lootdrop/grille_or_trash, /obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, /turf/open/floor/plating{ - icon_state = "platingdmg3" + icon_state = "panelscorched" }, -/area/maintenance/aft) +/area/maintenance/port) "cBc" = ( /obj/structure/sign/poster/contraband/random, /turf/closed/wall, @@ -77413,6 +77427,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /obj/effect/spawner/lootdrop/grille_or_trash, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -78056,6 +78071,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /obj/effect/spawner/lootdrop/grille_or_trash, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -80121,6 +80137,7 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/maintenance/starboard/fore) "cLg" = ( @@ -80207,6 +80224,7 @@ "cLG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/maintenance/starboard) "cLH" = ( @@ -80357,6 +80375,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /obj/effect/spawner/lootdrop/grille_or_trash, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -80481,6 +80500,7 @@ "cMG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -81962,6 +81982,11 @@ icon_state = "wood-broken3" }, /area/commons/vacant_room/office) +"hpE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "hqF" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -83025,6 +83050,11 @@ /obj/item/tank/internals/emergency_oxygen/double, /turf/open/floor/plating, /area/ruin/space/has_grav/powered/dinner_for_two) +"nhe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/maintenance/aft) "njo" = ( /obj/item/beacon, /turf/open/floor/carpet, @@ -83466,6 +83496,11 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/asteroid/airless, /area/space/nearstation) +"pCx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/maintenance/central) "pEm" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -84780,6 +84815,13 @@ }, /turf/open/floor/plating, /area/ruin/space/djstation) +"vYZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/maintenance/starboard/fore) "vZP" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -99518,7 +99560,7 @@ bhU aEw bxq crk -cnL +cBb iwu agp bHg @@ -110571,7 +110613,7 @@ bpy brT cuN btL -aYO +pCx cQb aoq aoP @@ -111114,7 +111156,7 @@ cbA cFC bFa bFa -cBb +bFS bFa aFM fVp @@ -113426,7 +113468,7 @@ bHm bFa cHm bFa -bGG +nhe cdp dMm bFx @@ -117994,7 +118036,7 @@ cEu atW cFp ayt -aoC +vYZ dSG dSG dSG @@ -121061,7 +121103,7 @@ bfq iMq bbx alB -arx +hpE arx alB alB @@ -126220,7 +126262,7 @@ axo cNO azC cOf -ctI +bdN awi auL bbS diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index fdb1a0f31b..f9aae02cab 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1002,6 +1002,7 @@ c_tag = "Prison Cell 3"; network = list("ss13","prison") }, +/obj/structure/bed, /turf/open/floor/plasteel, /area/security/prison) "adu" = ( @@ -1009,6 +1010,7 @@ c_tag = "Prison Cell 2"; network = list("ss13","prison") }, +/obj/structure/bed, /turf/open/floor/plasteel, /area/security/prison) "adv" = ( @@ -1041,6 +1043,7 @@ c_tag = "Prison Cell 1"; network = list("ss13","prison") }, +/obj/structure/bed, /turf/open/floor/plasteel, /area/security/prison) "ady" = ( @@ -2390,7 +2393,7 @@ /obj/machinery/door/airlock/security/glass{ dir = 8; name = "Security E.V.A. Storage"; - req_access_txt = "3" + req_access_txt = "1" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -14214,15 +14217,16 @@ /turf/open/floor/plating, /area/hallway/primary/port) "bdx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/brown{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/brown{ dir = 1 }, /turf/open/floor/plasteel/dark/side{ - dir = 8 + dir = 8; + icon_state = "dark" }, /area/hallway/primary/central) "bdy" = ( @@ -14510,19 +14514,19 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "bfd" = ( -/obj/effect/turf_decal/arrows{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_x = -30 }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/effect/turf_decal/arrows{ + dir = 1 + }, /turf/open/floor/plasteel/dark/corner{ dir = 8 }, @@ -14536,7 +14540,8 @@ }, /obj/effect/turf_decal/tile/brown, /turf/open/floor/plasteel/dark/side{ - dir = 4 + dir = 4; + icon_state = "dark" }, /area/hallway/primary/port) "bfg" = ( @@ -14547,17 +14552,18 @@ /turf/open/floor/plasteel/dark, /area/hallway/primary/port) "bfh" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, /turf/open/floor/plasteel/dark/side{ - dir = 8 + dir = 8; + icon_state = "dark" }, /area/hallway/primary/central) "bfi" = ( @@ -14896,23 +14902,24 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/brown{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 4 + }, /obj/effect/turf_decal/tile/brown{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/effect/turf_decal/tile/brown{ dir = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 4 - }, /turf/open/floor/plasteel/dark/side{ - dir = 8 + dir = 8; + icon_state = "dark" }, /area/hallway/primary/port) "bgV" = ( @@ -14969,7 +14976,8 @@ }, /obj/effect/turf_decal/tile/brown, /turf/open/floor/plasteel/dark/side{ - dir = 4 + dir = 4; + icon_state = "dark" }, /area/hallway/primary/port) "bgZ" = ( @@ -15303,12 +15311,12 @@ /turf/closed/wall, /area/maintenance/port/fore) "biN" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/landmark/start/assistant, /obj/structure/chair, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -15342,10 +15350,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "biR" = ( +/obj/machinery/piratepad/civilian, /obj/effect/turf_decal/tile/brown{ dir = 4 }, -/obj/machinery/piratepad/civilian, /turf/open/floor/plasteel/dark/corner{ dir = 4 }, @@ -15767,10 +15775,10 @@ /turf/open/floor/plasteel/dark/corner, /area/hallway/primary/port) "bku" = ( -/obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/effect/turf_decal/tile/brown, /turf/open/floor/plasteel/dark/side, /area/hallway/primary/port) "bkv" = ( @@ -15779,22 +15787,22 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/effect/turf_decal/tile/brown, /turf/open/floor/plasteel/dark/side, /area/hallway/primary/port) "bkw" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, /obj/structure/medkit_cabinet{ pixel_x = 24 }, /obj/machinery/computer/piratepad_control/civilian{ dir = 8 }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, /turf/open/floor/plasteel/dark/corner{ dir = 8 }, @@ -16684,10 +16692,7 @@ /obj/effect/turf_decal/tile/brown{ dir = 1 }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/side{ +/turf/open/floor/plasteel/dark/corner{ dir = 1 }, /area/hallway/primary/port) @@ -16714,10 +16719,10 @@ dir = 4 }, /obj/effect/turf_decal/tile/brown{ - dir = 1 + dir = 4 }, /obj/effect/turf_decal/tile/brown{ - dir = 4 + dir = 1 }, /turf/open/floor/plasteel/dark/side{ dir = 1 @@ -16727,14 +16732,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -27896,14 +27901,14 @@ /area/science/lab) "ciH" = ( /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, /turf/open/floor/plasteel, /area/science/research) "ciI" = ( @@ -28374,9 +28379,6 @@ /turf/open/floor/carpet, /area/service/bar) "cke" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, @@ -28395,6 +28397,9 @@ /obj/structure/disposalpipe/junction/flip{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel{ dir = 8; icon_state = "floor_trim" @@ -33994,13 +33999,13 @@ /turf/open/floor/plasteel/white, /area/medical/patients_rooms/room_a) "cxh" = ( -/obj/machinery/door/airlock/medical{ - name = "Psychology Office"; - req_access_txt = "71" - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/door/airlock/medical{ + dir = 8; + name = "Psychology Office" + }, /turf/open/floor/plasteel/white, /area/medical/patients_rooms/room_a) "cxi" = ( @@ -34576,18 +34581,15 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, /obj/machinery/light{ dir = 1; pixel_y = 12 }, -/turf/open/floor/plasteel/dark/side{ - dir = 1 +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/corner{ + dir = 4 }, /area/hallway/primary/port) "cyn" = ( @@ -40691,6 +40693,7 @@ dir = 1; icon_state = "steel_decals3" }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/science/research) "cJR" = ( @@ -47244,7 +47247,8 @@ dir = 4 }, /turf/open/floor/plasteel/dark/side{ - dir = 4 + dir = 4; + icon_state = "dark" }, /area/cargo/storage) "dpk" = ( @@ -49266,7 +49270,9 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/corner{ + dir = 1 + }, /area/security/office) "dVP" = ( /obj/structure/cable/white, @@ -50586,14 +50592,15 @@ /turf/open/floor/plasteel/cafeteria, /area/commons/dorms) "eDG" = ( -/obj/machinery/door/poddoor{ - id = "QMLoaddoor"; - name = "Supply Dock Loading Door" - }, /obj/machinery/conveyor{ dir = 8; id = "QMLoad" }, +/obj/machinery/door/poddoor{ + id = "QMLoaddoor"; + name = "Supply Dock Loading Door"; + dir = 8 + }, /turf/open/floor/plating, /area/cargo/storage) "eDP" = ( @@ -51723,7 +51730,8 @@ /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /turf/open/floor/plasteel/dark/side{ - dir = 4 + dir = 4; + icon_state = "dark" }, /area/cargo/storage) "fgO" = ( @@ -51965,7 +51973,7 @@ /obj/structure/table, /obj/item/folder/red, /obj/item/restraints/handcuffs, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "frS" = ( /obj/machinery/holopad, @@ -53554,7 +53562,10 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/corner{ + dir = 4; + icon_state = "darkcorner" + }, /area/security/office) "gmc" = ( /turf/closed/wall, @@ -54375,7 +54386,7 @@ /obj/item/taperecorder{ pixel_x = -4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "gLN" = ( /obj/effect/landmark/event_spawn, @@ -55445,7 +55456,7 @@ pixel_x = -2; pixel_y = 3 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "hrB" = ( /obj/structure/disposalpipe/segment, @@ -55764,7 +55775,9 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, /area/security/office) "hyZ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -56929,7 +56942,9 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, /area/security/office) "icr" = ( /turf/closed/wall, @@ -57221,7 +57236,7 @@ /obj/machinery/computer/card/minor/hos{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "imw" = ( /obj/structure/cable/yellow{ @@ -58320,7 +58335,9 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 8 + }, /area/security/office) "iRr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -60584,7 +60601,7 @@ /obj/structure/table, /obj/item/folder/red, /obj/item/assembly/flash/handheld, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "kfb" = ( /obj/machinery/firealarm{ @@ -60663,15 +60680,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/effect/turf_decal/box/corners{ dir = 4 }, -/turf/open/floor/plasteel/dark/corner{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plasteel/dark/side{ + dir = 4; + icon_state = "dark" + }, /area/cargo/storage) "kgv" = ( /obj/machinery/door/poddoor/shutters/preopen{ @@ -62016,7 +62034,7 @@ /obj/structure/table, /obj/item/restraints/handcuffs, /obj/item/radio/off, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "kPW" = ( /obj/structure/cable/yellow{ @@ -62404,7 +62422,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/corner, /area/security/office) "kYv" = ( /turf/closed/wall, @@ -65367,7 +65385,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "mDc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -65539,7 +65557,8 @@ dir = 4 }, /turf/open/floor/plasteel/dark/side{ - dir = 4 + dir = 4; + icon_state = "dark" }, /area/cargo/storage) "mHn" = ( @@ -66509,7 +66528,7 @@ /obj/item/folder/red, /obj/item/pen, /obj/item/storage/box/donkpockets, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "nmz" = ( /turf/closed/wall/r_wall, @@ -68443,7 +68462,7 @@ pixel_x = -3; pixel_y = 7 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "ooo" = ( /obj/machinery/bluespace_beacon, @@ -68702,7 +68721,9 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, /area/security/office) "owQ" = ( /obj/structure/tank_dispenser, @@ -69936,7 +69957,9 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/corner{ + dir = 8 + }, /area/security/office) "peh" = ( /obj/effect/turf_decal/loading_area{ @@ -72699,7 +72722,9 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, /area/security/office) "qCB" = ( /obj/machinery/microwave{ @@ -73582,15 +73607,16 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, -/turf/open/floor/plasteel/dark/side{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plasteel/dark/side{ + dir = 4; + icon_state = "dark" + }, /area/cargo/storage) "rbw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -74117,7 +74143,9 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, /area/security/office) "rom" = ( /obj/structure/bed/roller, @@ -75244,7 +75272,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side, /area/security/office) "rUE" = ( /obj/effect/spawner/structure/window/reinforced, @@ -76932,7 +76960,7 @@ /obj/structure/table, /obj/item/folder/red, /obj/item/storage/secure/briefcase, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "sRX" = ( /obj/structure/cable/yellow{ @@ -77092,7 +77120,9 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, /area/security/office) "sVW" = ( /obj/machinery/icecream_vat, @@ -77798,7 +77828,7 @@ /obj/machinery/photocopier{ pixel_y = 3 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "tqG" = ( /obj/effect/landmark/event_spawn, @@ -78494,7 +78524,7 @@ "tNG" = ( /obj/structure/table/reinforced, /obj/item/paper, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "tNR" = ( /obj/structure/cable/yellow{ @@ -80468,7 +80498,7 @@ /obj/item/book/manual/gato_spacelaw, /obj/item/book/manual/gato_spacelaw, /obj/item/book/manual/gato_spacelaw, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "uVl" = ( /obj/structure/cable/yellow{ @@ -82061,15 +82091,16 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/effect/turf_decal/box/corners{ dir = 4 }, -/turf/open/floor/plasteel/dark/side{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, +/turf/open/floor/plasteel/dark/side{ + dir = 4; + icon_state = "dark" + }, /area/cargo/storage) "vOi" = ( /obj/structure/toilet{ @@ -82266,14 +82297,15 @@ /turf/open/floor/carpet/royalblue, /area/command/bridge) "vTM" = ( -/obj/machinery/door/poddoor{ - id = "QMLoaddoor2"; - name = "Supply Dock Loading Door" - }, /obj/machinery/conveyor{ dir = 4; id = "QMLoad2" }, +/obj/machinery/door/poddoor{ + id = "QMLoaddoor2"; + name = "Supply Dock Loading Door"; + dir = 8 + }, /turf/open/floor/plating, /area/cargo/storage) "vTY" = ( @@ -83244,7 +83276,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side, /area/security/office) "wtx" = ( /obj/structure/closet/firecloset, @@ -84613,7 +84645,7 @@ /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/syndicatebomb/training, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "wZL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -85569,15 +85601,15 @@ /turf/open/floor/plasteel/white, /area/medical/treatment_center) "xAW" = ( -/obj/effect/turf_decal/loading_area{ - dir = 4; - icon_state = "steel_decals" - }, /obj/effect/turf_decal/loading_area{ dir = 6; icon_state = "steel_decals4" }, /obj/machinery/photocopier, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "steel_decals" + }, /turf/open/floor/plasteel, /area/cargo/office) "xBK" = ( @@ -85999,7 +86031,7 @@ /obj/item/folder/red, /obj/item/storage/fancy/cigarettes, /obj/item/clothing/mask/gas/sechailer, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "xLn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -86972,7 +87004,7 @@ "yfO" = ( /obj/structure/chair/comfy/black, /obj/effect/landmark/start/head_of_security, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/security/office) "yfW" = ( /obj/structure/cable{ diff --git a/_maps/map_files/Mining/Lavaland_Lower.dmm b/_maps/map_files/Mining/Lavaland_Lower.dmm index dec87839b6..0817169087 100644 --- a/_maps/map_files/Mining/Lavaland_Lower.dmm +++ b/_maps/map_files/Mining/Lavaland_Lower.dmm @@ -7704,9 +7704,6 @@ "sv" = ( /turf/open/floor/plasteel, /area/ruin/space/has_grav/powered) -"sw" = ( -/turf/open/floor/plasteel/damturf/platdmg1, -/area/xenoarch/arch) "sx" = ( /obj/structure/fluff/paper, /obj/structure/filingcabinet, @@ -13525,12 +13522,6 @@ }, /turf/open/floor/plasteel, /area/xenoarch/caloriteresearch_powered) -"NE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel/damturf/platdmg1, -/area/xenoarch/arch) "NF" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -15003,10 +14994,6 @@ /obj/effect/turf_decal/stripes, /turf/open/floor/plasteel/dark, /area/xenoarch/caloriteresearch_powered) -"Th" = ( -/obj/structure/trash_pile, -/turf/open/floor/plasteel, -/area/xenoarch/arch) "Ti" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 2; @@ -15848,10 +15835,6 @@ }, /turf/open/floor/plasteel, /area/xenoarch/caloriteresearch_powered) -"Wd" = ( -/obj/machinery/light/small, -/turf/open/floor/plasteel/damturf/platdmg1, -/area/xenoarch/arch) "We" = ( /obj/effect/turf_decal/candy/bluewhite1, /turf/open/candyfloor, @@ -22727,7 +22710,7 @@ bG bG bG bG -sw +bG bG xw uA @@ -22988,7 +22971,7 @@ SN SN YB VG -sw +bG fL aI qI @@ -23245,7 +23228,7 @@ wq wq VM th -Wd +Qx fL Kg qI @@ -23747,7 +23730,7 @@ ab ab ab fL -sw +bG ZR Di aC @@ -23758,7 +23741,7 @@ aC aC aC VM -NE +th bG fV xy @@ -25297,7 +25280,7 @@ aC sY JO aC -Th +aC sY sY th @@ -25803,12 +25786,12 @@ ab ab ab fL +uA bG bG bG bG bG -sw bG bG bG diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index a34bc82688..d419b808d5 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -22141,14 +22141,15 @@ /turf/open/floor/plating, /area/cargo/storage) "aTr" = ( -/obj/machinery/door/poddoor{ - id = "QMLoaddoor"; - name = "supply dock loading door" - }, /obj/machinery/conveyor{ dir = 4; id = "QMLoad" }, +/obj/machinery/door/poddoor{ + id = "QMLoaddoor"; + name = "supply dock loading door"; + dir = 4 + }, /turf/open/floor/plating, /area/cargo/storage) "aTs" = ( @@ -22612,13 +22613,14 @@ /turf/open/floor/plasteel, /area/cargo/storage) "aUy" = ( -/obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/external{ + name = "Supply Dock Airlock"; + req_access_txt = "31"; + dir = 8 + }, /turf/open/floor/plating, /area/cargo/storage) "aUz" = ( @@ -24046,14 +24048,15 @@ /turf/open/floor/plating, /area/cargo/storage) "aXz" = ( -/obj/machinery/door/poddoor{ - id = "QMLoaddoor2"; - name = "supply dock loading door" - }, /obj/machinery/conveyor{ dir = 8; id = "QMLoad2" }, +/obj/machinery/door/poddoor{ + id = "QMLoaddoor2"; + name = "supply dock loading door"; + dir = 4 + }, /turf/open/floor/plating, /area/cargo/storage) "aXA" = ( @@ -27719,13 +27722,15 @@ /turf/open/floor/plasteel, /area/cargo/office) "bfI" = ( -/obj/machinery/door/airlock/external{ - name = "Mining Dock Airlock"; - req_access_txt = "48" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/external{ + name = "Mining Dock Airlock"; + req_access_txt = "48"; + shuttledocked = 1; + dir = 8 + }, /turf/open/floor/plating, /area/cargo/miningdock) "bfK" = ( @@ -61175,11 +61180,13 @@ /turf/open/floor/catwalk_floor, /area/maintenance/department/crew_quarters/dorms) "oPy" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; - req_access_txt = "48" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + req_access_txt = "48"; + shuttledocked = 1; dir = 8 }, /turf/open/floor/plating, @@ -63081,11 +63088,12 @@ /turf/closed/wall/r_wall, /area/commons/lounge) "sQt" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, /obj/machinery/door/airlock/external{ name = "Supply Dock Airlock"; - req_access_txt = "31" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + req_access_txt = "31"; dir = 8 }, /turf/open/floor/plating, diff --git a/_maps/map_files/Snaxi/Snaxi.dmm b/_maps/map_files/Snaxi/Snaxi.dmm index 4618818c0f..d1559e782f 100644 --- a/_maps/map_files/Snaxi/Snaxi.dmm +++ b/_maps/map_files/Snaxi/Snaxi.dmm @@ -17,13 +17,15 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) -"aai" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +"aaj" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/structure/sign/painting/library{ + pixel_y = 32 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, -/area/engineering/main) +/area/maintenance/aft) "aax" = ( /obj/machinery/vending/cola/random, /turf/open/floor/wood, @@ -36,24 +38,33 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel/white, /area/medical/genetics) -"abg" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ - dir = 8 - }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/engineering/atmospherics_engine) "abh" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/wood, /area/commons/dorms) +"abk" = ( +/obj/machinery/light, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/plasteel, +/area/engineering/main) "abq" = ( /obj/machinery/door/firedoor, /obj/machinery/mineral/ore_redemption{ input_dir = 2; output_dir = 1 }, +/obj/machinery/door/window/westleft{ + dir = 2; + name = "Cargo ORM" + }, /turf/open/floor/plasteel, /area/cargo/miningdock) "abF" = ( @@ -65,15 +76,28 @@ /turf/open/floor/plating, /area/maintenance/disposal) "abH" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/item/radio/intercom{ + pixel_y = -26 + }, /turf/open/floor/plating, /area/maintenance/aft/secondary) "abL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/service/hydroponics) +"abR" = ( +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 }, -/turf/closed/wall, -/area/maintenance/starboard) +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "ace" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light/floor, @@ -132,28 +156,65 @@ }, /turf/open/floor/plating, /area/cargo/storage) +"acW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/turf_decal/caution{ + pixel_x = -5 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"adi" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "ads" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, +/obj/item/kirbyplants/photosynthetic, /turf/open/floor/plasteel/white, /area/science/mixing) "aem" = ( /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) +"aeG" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/doorButtons/airlock_controller{ + pixel_y = -24; + pixel_x = -8; + idInterior = "mix_interior_airlock"; + idExterior = "mix_exterior_airlock"; + idSelf = "mix_airlock_controller" + }, +/turf/open/floor/engine, +/area/engineering/atmos) "afc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/door/airlock/external/glass, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /obj/machinery/door/firedoor/border_only{ name = "south facing firelock" }, -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/external/glass, /turf/open/floor/plasteel, /area/commons/dorms) "afd" = ( @@ -209,6 +270,9 @@ }, /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "ags" = ( @@ -240,6 +304,10 @@ }, /turf/open/floor/plasteel/freezer, /area/medical/surgery) +"ahs" = ( +/obj/machinery/holopad, +/turf/open/floor/plasteel, +/area/maintenance/aft) "aht" = ( /obj/structure/table/reinforced, /obj/item/assembly/prox_sensor{ @@ -258,9 +326,16 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel/dark, /area/command/bridge) -"aif" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/turf/open/floor/engine, +"aij" = ( +/obj/machinery/light, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/structure/sign/poster/gato/buildstuff{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, /area/engineering/main) "aio" = ( /obj/structure/cable, @@ -276,6 +351,12 @@ name = "Testing Lab APC"; pixel_x = -29 }, +/obj/structure/showcase/machinery/tv{ + dir = 1; + pixel_x = 2; + pixel_y = 3 + }, +/obj/structure/table/wood, /turf/open/floor/carpet, /area/command/corporate_showroom) "aip" = ( @@ -291,19 +372,21 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"aiT" = ( -/obj/structure/fluff/railing{ - dir = 9 +"aiD" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/openspace/icemoon, -/area/engineering/atmospherics_engine) -"aiZ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "ajb" = ( /obj/structure/cable{ icon_state = "2-4" @@ -314,7 +397,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/circuit, +/turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "ajf" = ( /obj/structure/cable{ @@ -333,7 +416,13 @@ /turf/closed/wall/r_wall, /area/tcommsat/computer) "ajs" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/machinery/gear_painter, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, /turf/open/floor/wood, /area/commons/dorms) "ajC" = ( @@ -385,9 +474,6 @@ /obj/machinery/meter, /turf/open/floor/plating, /area/mine/lobby) -"akz" = ( -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/engineering/atmospherics_engine) "akF" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -402,12 +488,39 @@ }, /turf/open/floor/wood, /area/command/heads_quarters/hop) +"akO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 6 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "akQ" = ( /obj/structure/disposalpipe/segment{ dir = 9 }, /turf/open/floor/wood, /area/command/meeting_room) +"akY" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "alb" = ( /obj/machinery/mineral/equipment_vendor, /obj/effect/turf_decal/stripes/corner{ @@ -415,6 +528,22 @@ }, /turf/open/floor/plasteel, /area/mine/eva) +"alN" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "ame" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -427,12 +556,13 @@ color = "#596479"; dir = 1 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_tiled, /area/command/heads_quarters/captain) "amt" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 }, +/obj/machinery/vending/snack/random, /turf/open/floor/plasteel, /area/maintenance/aft) "amD" = ( @@ -449,38 +579,38 @@ }, /turf/open/floor/plasteel/white, /area/medical/paramedic) -"ang" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +"amW" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/door/firedoor/border_only{ + name = "south facing firelock" }, -/obj/effect/turf_decal/tile/neutral{ +/turf/open/floor/plating, +/area/service/library) +"ang" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/brown{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "Construction Area"; - dir = 4 +/obj/effect/turf_decal/tile/brown{ + dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/fyellow, +/obj/item/clothing/gloves/color/fyellow, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "ano" = ( /obj/structure/closet/secure_closet/personal/cabinet{ pixel_x = -8 }, /turf/open/floor/wood, /area/icemoon/surface/outdoors) -"anw" = ( -/obj/machinery/power/emitter, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 28 - }, -/turf/open/floor/plating, -/area/engineering/storage) "anK" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /obj/effect/turf_decal/tile/brown{ @@ -493,6 +623,9 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/sorting) "anW" = ( @@ -511,6 +644,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) "aop" = ( @@ -518,6 +657,8 @@ codes_txt = "patrol;next_patrol=CHW"; location = "Dorm" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/wood, /area/commons/dorms) "aoG" = ( @@ -527,8 +668,14 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) +"aoU" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Air to Distro" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "aoW" = ( /obj/item/beacon, /turf/open/floor/engine, @@ -544,10 +691,12 @@ dir = 8; name = "west facing firelock" }, -/obj/machinery/door/airlock/mining{ - req_access_txt = "48" +/obj/machinery/door/airlock/external{ + name = "Mining Dock Airlock"; + req_access_txt = "48"; + shuttledocked = 1; + dir = 8 }, -/obj/structure/barricade/wooden, /turf/open/floor/plasteel, /area/maintenance/aft/secondary) "apj" = ( @@ -557,7 +706,8 @@ /obj/item/stock_parts/cell/high/plus, /obj/item/stock_parts/cell/high/plus, /obj/item/stock_parts/cell/high/plus, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel/dark, /area/science/robotics/lab) "apn" = ( /obj/machinery/door/airlock/medical{ @@ -566,6 +716,11 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain"; + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "apo" = ( @@ -577,6 +732,15 @@ "apJ" = ( /turf/open/floor/wood, /area/command/heads_quarters/hop) +"apL" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/corner{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "apO" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/potato, @@ -593,6 +757,9 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/fitness) "apV" = ( @@ -621,6 +788,26 @@ }, /turf/open/floor/plasteel/white, /area/medical/genetics) +"aqo" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"aqs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel{ + dir = 8; + icon_state = "floor_trim" + }, +/area/science/robotics/lab) "aqC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -637,6 +824,7 @@ icon_state = "steel_panel"; name = "steel pannel" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel/showroomfloor, /area/commons/dorms) "arf" = ( @@ -651,18 +839,6 @@ /obj/item/restraints/legcuffs/beartrap, /turf/open/floor/plasteel, /area/service/janitor) -"arn" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/landmark/event_spawn, -/obj/machinery/camera{ - c_tag = "Supermatter South"; - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/main) "arv" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -696,6 +872,12 @@ pixel_y = 2 }, /obj/item/cartridge/signal/toxins, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) "arB" = ( @@ -711,37 +893,11 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, /turf/open/floor/plasteel, /area/commons/fitness) -"arY" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engineering/main) -"asd" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) "asJ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -757,9 +913,21 @@ /turf/open/floor/plating, /area/construction/storage_wing) "asT" = ( -/mob/living/simple_animal/opossum/poppy, -/turf/open/floor/plating, -/area/engineering/main) +/obj/machinery/power/smes/engineering, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "asU" = ( /obj/machinery/vending/autodrobe, /turf/open/floor/plasteel, @@ -791,6 +959,10 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) +"ath" = ( +/obj/structure/sign/warning/electricshock, +/turf/closed/wall/r_wall, +/area/engineering/supermatter) "ato" = ( /obj/machinery/light{ dir = 1 @@ -829,15 +1001,6 @@ dir = 1 }, /area/service/chapel/main) -"auo" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/dark, -/area/engineering/storage/tech) "auq" = ( /obj/structure/cable{ icon_state = "0-2" @@ -881,19 +1044,6 @@ /obj/machinery/rnd/bepis, /turf/open/floor/engine, /area/science/misc_lab) -"auP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "avp" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -923,6 +1073,25 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"avT" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "awa" = ( /turf/open/floor/plasteel, /area/construction/storage_wing) @@ -936,12 +1105,6 @@ }, /turf/open/floor/plating, /area/maintenance/solars/port/fore) -"awR" = ( -/obj/machinery/atmospherics/components/trinary/filter/critical{ - filter_type = "n2" - }, -/turf/open/floor/engine, -/area/engineering/main) "axe" = ( /obj/structure/cable{ icon_state = "4-8" @@ -956,42 +1119,38 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/floor/plasteel, -/area/commons/fitness) -"axo" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) +/turf/open/floor/plasteel, +/area/commons/fitness) "axp" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"axv" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel, +/area/commons/dorms) "axI" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1001,15 +1160,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) -"axM" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "axQ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1018,16 +1168,20 @@ /obj/machinery/recharger{ pixel_y = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "ayo" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/door/airlock/external{ - name = "Escape Airlock" - }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + name = "Escape Airlock"; + dir = 8 + }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "ayv" = ( @@ -1056,13 +1210,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_tiled, /area/command/heads_quarters/captain) "ayT" = ( -/obj/effect/turf_decal/vg_decals/atmos/carbon_dioxide, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/atmospherics/miner/carbon_dioxide, /turf/open/floor/engine/co2, /area/engineering/atmos) "ayX" = ( @@ -1110,6 +1261,10 @@ }, /turf/open/floor/plasteel, /area/science/xenobiology) +"azF" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall, +/area/hallway/secondary/entry) "azG" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -1118,18 +1273,18 @@ /obj/machinery/door/airlock/external/glass, /turf/open/floor/plasteel, /area/hallway/primary/port) -"azH" = ( -/obj/machinery/airalarm{ - pixel_y = 25 - }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "aAq" = ( /obj/machinery/computer/operating, /obj/machinery/light{ dir = 1 }, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 9 + }, +/turf/open/floor/plasteel/white, /area/medical/surgery) "aAt" = ( /obj/machinery/light{ @@ -1148,7 +1303,7 @@ /obj/machinery/newscaster/security_unit{ pixel_y = -32 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/command/heads_quarters/hos) "aAB" = ( /obj/item/target, @@ -1160,7 +1315,7 @@ /area/icemoon/surface/outdoors) "aAH" = ( /obj/machinery/atmospherics/pipe/manifold, -/turf/open/floor/plasteel/dark/telecomms, +/turf/open/floor/circuit/off, /area/science/server) "aAN" = ( /obj/structure/cable{ @@ -1172,13 +1327,6 @@ /obj/machinery/light, /turf/open/floor/plating/asteroid/snow/icemoon, /area/maintenance/solars/port/fore) -"aBj" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 6 - }, -/obj/machinery/meter, -/turf/closed/wall/r_wall, -/area/engineering/supermatter) "aBn" = ( /obj/machinery/firealarm{ pixel_y = 29 @@ -1188,6 +1336,24 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"aBw" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/turf/open/floor/wood, +/area/commons/dorms) +"aBE" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "aBI" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1219,7 +1385,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "aBN" = ( /obj/structure/cable{ @@ -1239,22 +1405,22 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) -"aCi" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "aCo" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 8; + icon_state = "floor_trim" + }, /area/hallway/primary/fore) "aCZ" = ( /obj/structure/chair/office/dark{ dir = 1 }, /obj/effect/landmark/start/librarian, -/turf/open/floor/wood, +/obj/structure/sign/poster/contraband/energy_swords{ + pixel_y = -32 + }, +/turf/open/floor/carpet/green, /area/service/library) "aDl" = ( /turf/open/floor/pod/dark, @@ -1270,11 +1436,19 @@ /turf/open/floor/plasteel/dark/side, /area/hallway/primary/central) "aDy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/turf/open/floor/plasteel, -/area/commons/storage/primary) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "aDL" = ( /obj/machinery/computer/card/minor/cmo{ dir = 4 @@ -1299,12 +1473,20 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) -"aEc" = ( -/obj/machinery/porta_turret/ai{ - dir = 4 +"aDV" = ( +/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ + dir = 1 }, -/turf/open/floor/circuit/off, -/area/ai_monitored/turret_protected/ai) +/obj/machinery/meter, +/turf/open/floor/plasteel, +/area/engineering/atmos) +"aEc" = ( +/obj/structure/table, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/yellow, +/turf/open/floor/plasteel, +/area/engineering/main) "aEp" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1312,9 +1494,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/door/airlock/public/glass{ - name = "Central Access" - }, /obj/machinery/door/firedoor/border_only{ dir = 8; name = "west facing firelock" @@ -1326,6 +1505,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access"; + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aEH" = ( @@ -1342,11 +1525,15 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "aER" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 6 +/obj/structure/cable{ + icon_state = "2-4" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, +/area/engineering/atmos) +"aFl" = ( +/obj/effect/landmark/start/atmospheric_technician, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/turf/open/floor/plasteel, /area/engineering/atmos) "aFq" = ( /obj/effect/spawner/structure/window/reinforced, @@ -1381,6 +1568,13 @@ }, /turf/open/floor/plating, /area/cargo/storage) +"aGu" = ( +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 6 + }, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plasteel, +/area/engineering/atmos) "aGz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment{ @@ -1389,14 +1583,20 @@ /turf/open/floor/plasteel/dark, /area/security/office) "aGE" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/hallway/primary/aft) "aGQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -1410,11 +1610,18 @@ }, /turf/open/floor/plasteel/white, /area/security/brig) -"aHp" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ +"aGY" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/turf/open/floor/plasteel, +/area/commons/storage/primary) +"aHp" = ( +/obj/machinery/atmospherics/pipe/manifold/yellow/visible, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "aHA" = ( @@ -1429,7 +1636,7 @@ pixel_y = -26 }, /mob/living/simple_animal/pet/fox/Renault, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_tiled, /area/command/heads_quarters/captain) "aHI" = ( /obj/machinery/airalarm{ @@ -1538,6 +1745,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"aKU" = ( +/obj/machinery/light{ + dir = 1; + pixel_y = 16 + }, +/obj/structure/table/wood, +/obj/machinery/computer/libraryconsole, +/turf/open/floor/wood, +/area/service/library) "aKW" = ( /obj/machinery/computer/mech_bay_power_console, /obj/structure/cable{ @@ -1554,28 +1770,15 @@ /turf/open/floor/plasteel, /area/security/prison) "aLi" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"aLk" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "aLJ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 10 + dir = 4 }, -/turf/closed/wall/r_wall, +/obj/effect/spawner/structure/window/plasma/reinforced, +/turf/open/floor/plating, /area/engineering/atmos) "aMc" = ( /obj/structure/chair{ @@ -1584,6 +1787,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/box/white, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "aMh" = ( @@ -1597,7 +1801,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "aMY" = ( /obj/structure/cable{ @@ -1606,7 +1810,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "aNx" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ @@ -1664,12 +1868,16 @@ /area/security/courtroom) "aOn" = ( /obj/machinery/telecomms/bus/preset_four, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/end{ + dir = 4 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "aOB" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/pod/dark, /area/maintenance/starboard) "aOJ" = ( @@ -1686,6 +1894,11 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/button/door{ + id = "bridge blast"; + name = "Window Blast Door"; + req_access_txt = "19" + }, /turf/open/floor/plasteel, /area/mine/lobby) "aPe" = ( @@ -1696,7 +1909,11 @@ pixel_x = -24; specialfunctions = 4 }, -/turf/open/floor/carpet/blue, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/turf/open/floor/carpet/royalblack, /area/commons/dorms) "aPi" = ( /obj/structure/cable{ @@ -1721,12 +1938,12 @@ /turf/open/floor/plasteel/white, /area/science/mixing) "aPB" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 }, -/obj/machinery/meter, /turf/open/floor/plasteel, -/area/engineering/atmos) +/area/engineering/main) "aPG" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -1739,9 +1956,17 @@ /turf/open/floor/carpet, /area/service/chapel/main) "aQa" = ( -/obj/structure/closet/crate/secure/loot, -/turf/open/floor/carpet, -/area/mine/lobby) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/door/poddoor/preopen{ + id = "snaxi_mining_shutter"; + name = "blast door seal"; + dir = 4 + }, +/turf/open/floor/plating, +/area/mine/eva) "aQl" = ( /turf/closed/wall/r_wall, /area/security/detectives_office) @@ -1772,11 +1997,12 @@ /turf/open/floor/plating, /area/science/lab) "aQZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) +/turf/open/floor/wood, +/area/commons/dorms) "aRx" = ( /obj/structure/cable{ icon_state = "1-4" @@ -1820,23 +2046,37 @@ /turf/open/floor/plating, /area/engineering/atmos) "aSx" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Crematorium Maintenance"; - req_access_txt = "27" - }, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" }, -/turf/open/floor/plating, -/area/service/chapel/office) -"aTA" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/door/airlock/maintenance{ + name = "Crematorium Maintenance"; + req_access_txt = "27"; dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/turf/open/floor/plating, +/area/service/chapel/office) +"aSC" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + dir = 4; + id = "ceprivacy"; + name = "privacy shutter" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/command/heads_quarters/ce) +"aTA" = ( +/obj/structure/table, +/obj/machinery/cell_charger, /turf/open/floor/plasteel, -/area/engineering/atmos) +/area/engineering/main) "aTH" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/brown, @@ -1865,27 +2105,42 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) "aUD" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/chair/comfy/black{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "aVg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/effect/landmark/event_spawn, +/obj/structure/disposalpipe/sorting/mail{ + dir = 4; + sortType = 6; + sortTypes = list(4, 6) + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/effect/landmark/event_spawn, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 }, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/engineering/lobby) "aVl" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1893,9 +2148,6 @@ /turf/open/floor/plating, /area/maintenance/bar) "aVt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1906,7 +2158,7 @@ dir = 9 }, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/hallway/primary/aft) "aVx" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 @@ -1915,11 +2167,11 @@ /turf/open/floor/wood, /area/maintenance/bar) "aVy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 +/obj/structure/tank_dispenser{ + pixel_x = -1 }, -/obj/machinery/pipedispenser, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engineering/atmos) "aVB" = ( @@ -1933,38 +2185,26 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/light, /obj/structure/disposalpipe/junction/flip{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"aVU" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engineering/main) "aWc" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{ dir = 8 }, -/obj/machinery/air_sensor/atmos/oxygen_tank{ +/obj/machinery/air_sensor/atmos/carbon_tank{ pixel_y = -25 }, -/turf/open/floor/engine/o2, +/turf/open/floor/engine/co2, /area/engineering/atmos) "aWr" = ( /obj/effect/spawner/structure/window/reinforced, @@ -1977,6 +2217,16 @@ }, /turf/open/floor/engine, /area/maintenance/aft/secondary) +"aWx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "aWK" = ( /obj/structure/cable{ icon_state = "1-8" @@ -1986,25 +2236,19 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/ai_monitored/security/armory) -"aWL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/landmark/start/station_engineer, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "aXg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/white, /area/science/mixing) +"aXk" = ( +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/aft) "aXp" = ( /obj/structure/table, /obj/machinery/plantgenes{ @@ -2016,26 +2260,16 @@ /turf/open/floor/plasteel, /area/service/hydroponics) "aXw" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/engineering/main) -"aXz" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ +/obj/structure/chair/sofa/corp{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/engineering/supermatter) +/obj/structure/sign/poster/official/mothhardhats{ + pixel_x = 32 + }, +/turf/open/floor/carpet/orange, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "aXC" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -2059,29 +2293,31 @@ }, /turf/open/floor/wood, /area/security/courtroom) +"aYe" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/r_wall, +/area/command/meeting_room) "aYl" = ( /obj/machinery/atmospherics/pipe/simple{ dir = 4 }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/white/line, /turf/open/floor/plasteel/dark, /area/science/server) "aYw" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, -/area/engineering/break_room) +/area/engineering/lobby) "aYz" = ( /obj/structure/closet/crate/coffin, /turf/open/floor/wood, @@ -2109,21 +2345,26 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) -"aYT" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ +"aYP" = ( +/obj/structure/chair/sofa/left/old{ dir = 8 }, -/obj/machinery/disposal/bin, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) +/turf/open/floor/carpet/green, +/area/service/library) +"aYT" = ( +/obj/machinery/power/emitter/anchored{ + state = 2; + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/catwalk_floor, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "aYZ" = ( /obj/machinery/shieldwallgen, /turf/open/floor/plasteel/dark, @@ -2139,9 +2380,24 @@ /turf/open/floor/plasteel, /area/maintenance/aft/secondary) "aZu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/engine, -/area/engineering/main) +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/structure/chair/office/dark{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/command/heads_quarters/ce) "aZW" = ( /obj/structure/cable{ icon_state = "1-8" @@ -2172,9 +2428,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "baq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown{ dir = 8 }, @@ -2189,32 +2442,13 @@ /turf/open/floor/plasteel/dark, /area/security/office) "baF" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /turf/open/floor/wood, /area/commons/dorms) -"bbg" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -28 - }, -/obj/machinery/meter, -/turf/open/floor/engine, -/area/engineering/main) "bbo" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -2222,10 +2456,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/turf/open/floor/plasteel/dark/side{ - dir = 8; - icon_state = "dark" - }, +/turf/open/floor/plasteel/dark, /area/hallway/primary/central) "bbu" = ( /obj/structure/cable{ @@ -2281,23 +2512,7 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/cargo/sorting) -"bcC" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/main) "bcF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" @@ -2306,14 +2521,11 @@ dir = 8; name = "west facing firelock" }, -/obj/machinery/door/airlock/public/glass{ - name = "Central Access" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/hallway/primary/fore) "bcK" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -2387,22 +2599,15 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"ber" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/mineral/plasma{ - amount = 30 +"bdZ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 }, -/turf/open/floor/plating, -/area/engineering/storage) +/turf/open/floor/plasteel, +/area/commons/storage/primary) "beW" = ( /turf/open/floor/plasteel, /area/maintenance/aft/secondary) -"bfb" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "bfj" = ( /obj/machinery/atmospherics/components/binary/valve, /obj/effect/decal/cleanable/dirt/dust, @@ -2460,9 +2665,9 @@ /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; req_access_txt = "48"; - shuttledocked = 1 + shuttledocked = 1; + dir = 8 }, -/obj/structure/barricade/wooden, /turf/open/floor/plating, /area/maintenance/aft/secondary) "bfZ" = ( @@ -2476,6 +2681,7 @@ }, /obj/effect/landmark/event_spawn, /obj/effect/landmark/start/roboticist, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "bgx" = ( @@ -2490,7 +2696,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 8 + }, /area/hallway/primary/port) "bgE" = ( /obj/structure/window/reinforced{ @@ -2506,30 +2714,31 @@ /obj/structure/sign/painting{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, /turf/open/floor/carpet/royalblue, /area/commons/dorms) "bhj" = ( -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/machinery/door/airlock/engineering/glass{ + dir = 4; + name = "Supermatter Engine"; + req_access_txt = "11" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engineering/supermatter) "bhk" = ( /obj/machinery/light{ dir = 4 }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/maintenance/solars/starboard/fore) -"bhm" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engineering/main) "bid" = ( /obj/machinery/camera{ c_tag = "Virology Module"; @@ -2542,16 +2751,21 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "bif" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ +/obj/effect/turf_decal/vg_decals/atmos/mix, +/turf/open/floor/engine/airless, +/area/engineering/atmos) +"big" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 8 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/engineering/main) -"big" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible, -/obj/machinery/portable_atmospherics/pump, +/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plasteel, /area/engineering/atmos) +"bii" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/white/corner, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "bik" = ( /turf/closed/wall/r_wall, /area/hallway/secondary/exit/departure_lounge) @@ -2565,10 +2779,13 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bjv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/maintenance/disposal) "bjH" = ( @@ -2613,11 +2830,14 @@ /area/command/heads_quarters/cmo) "blp" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 5 +/obj/machinery/door/poddoor/preopen{ + dir = 4; + id = "ceprivacy"; + name = "privacy shutter" }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, /turf/open/floor/plating, /area/command/heads_quarters/ce) @@ -2630,9 +2850,12 @@ /turf/open/floor/wood, /area/service/chapel/office) "blu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" }, /turf/open/floor/plasteel, /area/hallway/primary/fore) @@ -2650,7 +2873,7 @@ name = "Solar Maintenance"; req_access_txt = "10; 13" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) "blX" = ( /obj/item/beacon, @@ -2669,14 +2892,17 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bnc" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=2"; - freq = 1400; - location = "Engineering" +/obj/machinery/light{ + dir = 1 }, -/obj/structure/plasticflaps/opaque, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) +/obj/structure/chair/sofa/corp/corner, +/obj/structure/sign/poster/official/mothdelamination{ + pixel_x = 32 + }, +/turf/open/floor/carpet/orange, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "bof" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -2699,19 +2925,6 @@ /obj/machinery/space_heater, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) -"boz" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/engineering/main) "boE" = ( /obj/machinery/status_display, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -2743,6 +2956,17 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel, /area/hallway/primary/port) +"bpx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, +/area/cargo/storage) "bpC" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2772,7 +2996,10 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 4; + icon_state = "floor_trim" + }, /area/hallway/primary/fore) "bpT" = ( /obj/structure/cable{ @@ -2788,7 +3015,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "bqj" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -2815,10 +3042,27 @@ /turf/closed/wall, /area/cargo/qm) "brF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/wood, /area/service/theater) +"brH" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "bsd" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -2833,29 +3077,63 @@ /obj/item/storage/dice, /turf/open/floor/plasteel, /area/security/prison) -"bsH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 +"bsz" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 }, -/turf/closed/wall, -/area/service/hydroponics) -"bsJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"bsH" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) +/area/service/hydroponics) "bsU" = ( /obj/item/plant_analyzer, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "bsV" = ( -/obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/plating, -/area/engineering/storage) +/obj/structure/table, +/obj/item/storage/box/donkpockets, +/turf/open/floor/plasteel/white, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) +"btg" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "btn" = ( /turf/closed/mineral/random/snow, /area/icemoon/surface/outdoors) @@ -2872,14 +3150,25 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "btx" = ( /obj/structure/chair/sofa{ dir = 1 }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/obj/structure/window/reinforced, /turf/open/floor/wood, /area/hallway/primary/port) +"btE" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "btN" = ( /obj/machinery/vending/wardrobe/chef_wardrobe, /turf/open/floor/plasteel/freezer, @@ -2929,8 +3218,23 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) +"bvp" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"bvq" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/turf/closed/wall/r_wall, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "bvD" = ( /obj/structure/table, /obj/item/clothing/suit/apron/surgical, @@ -2943,18 +3247,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 9 + }, +/turf/open/floor/plasteel/white, /area/medical/surgery) -"bvO" = ( -/obj/structure/closet/crate/solarpanel_small, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "bvP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -2979,7 +3279,7 @@ name = "Robotics Desk"; req_access_txt = "29" }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/science/robotics/lab) "bwq" = ( /obj/machinery/airalarm{ @@ -3021,12 +3321,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bwX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown{ dir = 8 }, @@ -3044,24 +3344,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/machinery/holopad, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/bridge) -"bxp" = ( -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Hot Loop Entrance" - }, -/turf/open/floor/plating, -/area/engineering/atmospherics_engine) "bxF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/bridge) "bxG" = ( /obj/structure/girder/reinforced, @@ -3074,6 +3363,9 @@ /area/medical/paramedic) "bxR" = ( /obj/effect/decal/medium_gato, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, /turf/open/floor/plasteel, /area/cargo/storage) "byi" = ( @@ -3085,6 +3377,21 @@ }, /turf/open/floor/plasteel/dark, /area/command/teleporter) +"byA" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, +/obj/machinery/light, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "byV" = ( /obj/machinery/light{ dir = 8 @@ -3114,6 +3421,21 @@ /obj/item/pickaxe, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"bzp" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "bzy" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -3138,12 +3460,9 @@ /turf/open/floor/plasteel, /area/security/prison) "bzE" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior, -/turf/open/floor/engine/vacuum, -/area/maintenance/aft/secondary) +/obj/structure/chair/stool/bar, +/turf/open/floor/carpet/arcade, +/area/service/library) "bAu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -3152,18 +3471,19 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/command/corporate_showroom) "bAP" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_x = -28 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/aft) "bAQ" = ( @@ -3233,11 +3553,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/hallway/primary/aft) "bCX" = ( /obj/machinery/light{ @@ -3273,25 +3594,13 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "bEB" = ( -/obj/structure/closet/crate/secure/engineering{ - name = "TEG crate" - }, -/obj/item/circuitboard/machine/circulator, -/obj/item/circuitboard/machine/circulator, -/obj/item/circuitboard/machine/generator, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/cable_coil, +/obj/machinery/field/generator, /turf/open/floor/plating, /area/engineering/storage) -"bEX" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/tcomms, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 28 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/storage/tech) +"bET" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/dark/side, +/area/hallway/primary/port) "bFb" = ( /obj/structure/girder/reinforced, /turf/open/floor/plating, @@ -3315,6 +3624,10 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/plasteel, /area/science/mixing) +"bGv" = ( +/obj/item/beacon, +/turf/open/floor/plasteel, +/area/engineering/atmos) "bGw" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; @@ -3353,8 +3666,22 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, /area/science/misc_lab) +"bHA" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "bHI" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) @@ -3366,7 +3693,7 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "bIm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/commons/dorms) "bIt" = ( @@ -3402,6 +3729,19 @@ /obj/effect/turf_decal/tile/brown, /turf/open/floor/plasteel, /area/cargo/storage) +"bJg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "bJy" = ( /obj/machinery/quantumpad{ map_pad_id = "2"; @@ -3415,6 +3755,26 @@ name = "south sector"; pixel_y = 13 }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "bJB" = ( @@ -3445,9 +3805,16 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bKc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/service/hydroponics) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" + }, +/turf/open/floor/plasteel, +/area/cargo/storage) "bKj" = ( /obj/machinery/button/door{ id = "permacell2"; @@ -3459,13 +3826,15 @@ /turf/open/floor/plasteel, /area/security/prison) "bKk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/chair/beanbag/red{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, /turf/open/floor/wood, /area/commons/dorms) "bKm" = ( @@ -3493,6 +3862,17 @@ /obj/item/pen, /turf/open/floor/wood, /area/security/courtroom) +"bLd" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "bLl" = ( /obj/machinery/door/firedoor/border_only{ dir = 8; @@ -3523,17 +3903,25 @@ /turf/open/floor/engine, /area/science/xenobiology) "bLO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 }, -/turf/closed/wall/r_wall, -/area/service/janitor) +/turf/open/floor/wood, +/area/service/bar) "bLR" = ( /obj/item/radio/intercom{ pixel_y = 25 }, /turf/open/floor/wood, /area/security/courtroom) +"bMj" = ( +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) "bMm" = ( /obj/machinery/airalarm{ dir = 8; @@ -3543,20 +3931,22 @@ dir = 8 }, /obj/effect/landmark/start/lawyer, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) "bMJ" = ( /obj/machinery/computer/operating, /obj/item/radio/intercom{ pixel_y = 25 }, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes/white/line{ + dir = 2 + }, +/turf/open/floor/plasteel/white, /area/medical/surgery) "bOM" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible, -/obj/machinery/meter, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/turf/closed/wall/r_wall, +/area/engineering/storage) "bON" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -3640,7 +4030,6 @@ /turf/open/floor/plasteel, /area/maintenance/aft/secondary) "bQs" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -3650,15 +4039,43 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/engineering/lobby) "bQv" = ( -/turf/closed/wall, -/area/engineering/break_room) +/obj/structure/table, +/obj/machinery/power/apc{ + areastring = "/area/engineering/break_room"; + name = "Engineering Foyer APC"; + pixel_y = -24 + }, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/item/storage/belt/utility, +/turf/open/floor/plasteel/dark/corner, +/area/engineering/lobby) "bQx" = ( /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/storage) "bQA" = ( @@ -3675,19 +4092,31 @@ /obj/structure/cable{ icon_state = "0-4" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) +"bQN" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/space_heater, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "bQX" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/closed/wall/r_wall, /area/science/mixing) "bRd" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/public/glass{ + name = "Snow Airlock" }, -/obj/effect/landmark/blobstart, -/turf/open/floor/engine, -/area/maintenance/aft/secondary) +/obj/machinery/door/firedoor/border_only{ + dir = 1; + name = "north facing firelock" + }, +/turf/open/floor/plasteel, +/area/commons/dorms) "bRf" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -3705,6 +4134,9 @@ name = "Station Intercom (General)"; pixel_y = 28 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, /turf/open/floor/plasteel, /area/cargo/storage) "bRJ" = ( @@ -3778,7 +4210,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -3788,10 +4220,14 @@ /obj/structure/sign/poster/official/report_crimes{ pixel_x = -32 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"bTg" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/turf/open/floor/carpet/green, +/area/commons/dorms) "bTn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/airlock{ name = "Theatre Backstage"; req_access_txt = "46" @@ -3810,14 +4246,20 @@ /obj/item/clothing/shoes/winterboots, /obj/item/clothing/shoes/winterboots, /obj/structure/rack/shelf, -/turf/open/floor/plasteel, -/area/commons/dorms) -"bTI" = ( -/obj/effect/turf_decal/vg_decals/atmos/nitrogen, -/obj/machinery/light/small{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/engine/n2, +/turf/open/floor/plasteel/dark, +/area/commons/dorms) +"bTA" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 6 + }, +/turf/closed/wall/r_wall, +/area/engineering/supermatter) +"bTI" = ( +/obj/machinery/atmospherics/miner/oxygen, +/turf/open/floor/engine/o2, /area/engineering/atmos) "bTU" = ( /obj/machinery/light{ @@ -3847,6 +4289,25 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) +"bUs" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/turf/open/floor/plating, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"bUx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/command/heads_quarters/ce) "bUT" = ( /obj/structure/window/reinforced{ dir = 1 @@ -3857,6 +4318,16 @@ /obj/structure/chair/sofa/corp/corner{ dir = 4 }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/wood, /area/hallway/primary/port) "bVd" = ( @@ -3920,6 +4391,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/fore) "bWd" = ( @@ -3951,7 +4424,8 @@ }, /obj/machinery/door/airlock/external{ name = "Solar Maintenance"; - req_access_txt = "10; 13" + req_access_txt = "10; 13"; + dir = 4 }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -3962,17 +4436,12 @@ }, /obj/effect/landmark/start/chaplain, /obj/structure/disposalpipe/segment, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/service/chapel/office) "bWY" = ( -/obj/structure/chair/office/dark, -/mob/living/simple_animal/pet/cat/Runtime{ - desc = "Meow."; - gender = "male"; - name = "Salem" - }, -/turf/open/floor/wood, -/area/service/library) +/obj/structure/closet/secure_closet/personal/cabinet, +/turf/open/floor/carpet/green, +/area/commons/dorms) "bXh" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -4052,15 +4521,15 @@ /turf/open/floor/plasteel/dark, /area/command/teleporter) "bYU" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/structure/cable{ + icon_state = "2-4" }, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) @@ -4091,6 +4560,7 @@ dir = 4 }, /obj/machinery/door/airlock/command{ + dir = 4; name = "Head of Personnel"; req_access_txt = "57" }, @@ -4148,9 +4618,13 @@ /turf/open/floor/plating, /area/icemoon/surface/outdoors) "cax" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 9 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, /turf/open/floor/plasteel, /area/commons/fitness) "caE" = ( @@ -4192,22 +4666,8 @@ /obj/machinery/power/terminal{ dir = 1 }, -/turf/open/floor/circuit/off, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) -"cbF" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" - }, -/obj/machinery/door/airlock/engineering/glass{ - name = "Power Storage"; - req_access_txt = "11" - }, -/turf/open/floor/plating, -/area/engineering/storage) "cbM" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -4229,15 +4689,6 @@ "cca" = ( /turf/open/floor/plating, /area/mine/lobby) -"cch" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) "ccm" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/closet/crate/science, @@ -4263,6 +4714,13 @@ /obj/item/clothing/suit/hooded/wintercoat/security, /turf/open/floor/plasteel, /area/security/warden) +"ccC" = ( +/obj/item/kirbyplants/photosynthetic, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/science/robotics/lab) "ccK" = ( /obj/machinery/teleport/hub, /obj/structure/disposalpipe/segment{ @@ -4313,19 +4771,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "cdk" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "0-2" +/turf/open/floor/plasteel/stairs/right{ + dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/turf/open/floor/engine, -/area/maintenance/aft/secondary) +/area/hallway/primary/port) "cdo" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4340,7 +4789,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_one_access_txt = "20;12" + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "cdz" = ( @@ -4391,6 +4843,12 @@ name = "Room Four"; dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/wood, /area/commons/dorms) "cea" = ( @@ -4412,6 +4870,17 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"ceI" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "ceJ" = ( /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) @@ -4431,6 +4900,16 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"ceR" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/holopad, +/turf/open/floor/plasteel, +/area/command/heads_quarters/ce) "ceX" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -4474,13 +4953,36 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/hallway/primary/port) "cfH" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = 28 }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "cge" = ( @@ -4488,7 +4990,10 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "cgg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) "cgj" = ( @@ -4504,34 +5009,32 @@ /obj/machinery/atmospherics/pipe/simple/supply/visible, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) -"cgQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +"cgC" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4; - name = "east facing firelock" +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" }, -/obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room"; - req_access_txt = "10" - }, -/turf/open/floor/engine, -/area/engineering/main) +/area/cargo/storage) "cha" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /obj/machinery/door/airlock/mining/glass{ name = "Delivery Office"; - req_access_txt = "50" + req_access_txt = "50"; + dir = 8 }, /turf/open/floor/plasteel, /area/maintenance/starboard) @@ -4565,13 +5068,17 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"chY" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/turf/open/floor/plating, +/area/engineering/storage/tech) "cib" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock{ - id_tag = "Dorm6"; - name = "Room Five" +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_one_access_txt = "20;12" }, /turf/open/floor/plasteel, /area/maintenance/aft/secondary) @@ -4601,7 +5108,13 @@ /area/science/lab) "cir" = ( /obj/structure/closet/secure_closet/medical2, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/medical/surgery) "civ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -4641,7 +5154,9 @@ /turf/open/floor/carpet, /area/hallway/secondary/exit/departure_lounge) "cjg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/carpet, /area/service/bar) "cjk" = ( @@ -4673,9 +5188,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/obj/structure/cable{ - icon_state = "1-4" - }, /turf/open/floor/plating, /area/mine/lobby) "cjJ" = ( @@ -4683,12 +5195,13 @@ dir = 1; pixel_y = -22 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/meeting_room) "cjK" = ( /obj/structure/chair/beanbag/red{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/carpet/red, /area/commons/dorms) "cjL" = ( @@ -4760,9 +5273,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/bar{ dir = 1 }, @@ -4770,12 +5280,22 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "ckR" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/wood, /area/service/library) +"clj" = ( +/obj/machinery/holopad, +/turf/open/floor/plasteel/white, +/area/medical/virology) "clI" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4794,17 +5314,26 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "cmp" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone3) +/turf/open/floor/plasteel, +/area/cargo/storage) "cmr" = ( /obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel/white/corner{ dir = 8 }, /area/hallway/primary/fore) +"cmM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/catwalk_floor, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "cmR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -4824,27 +5353,15 @@ /turf/open/floor/plasteel, /area/construction/storage_wing) "cnW" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/effect/landmark/start/station_engineer, /turf/open/floor/plasteel, /area/engineering/main) -"cob" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/plating, -/area/engineering/main) "cog" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/item/radio/intercom{ @@ -4856,14 +5373,49 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/fitness) +"coC" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) +"coD" = ( +/obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "coE" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -4879,10 +5431,15 @@ /obj/item/radio/intercom{ pixel_y = 20 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/storage) "coV" = ( -/obj/machinery/computer/card/minor/ce, /obj/machinery/computer/security/telescreen/ce{ pixel_y = 24 }, @@ -4894,11 +5451,18 @@ pixel_x = 32; pixel_y = 27 }, +/obj/machinery/computer/apc_control, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, /turf/open/floor/plasteel, /area/command/heads_quarters/ce) "coW" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 }, /obj/effect/landmark/start/mime, /obj/structure/disposalpipe/segment, @@ -4908,17 +5472,6 @@ /obj/structure/table/wood/poker, /turf/open/floor/carpet, /area/service/bar) -"cpn" = ( -/obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4; - name = "east facing firelock" - }, -/turf/open/floor/engine, -/area/engineering/main) "cpq" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -4991,8 +5544,21 @@ /area/maintenance/aft/secondary) "cqZ" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) +"cra" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green, +/turf/open/floor/plasteel, +/area/service/hydroponics) "cri" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5046,24 +5612,30 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"csW" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/corner, +/area/engineering/lobby) "ctj" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/bot, /obj/structure/window/reinforced/spawner/north, /turf/open/floor/plasteel, /area/hallway/primary/central) -"ctl" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/plating, -/area/command/heads_quarters/ce) +"cto" = ( +/obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6, +/turf/closed/wall, +/area/service/library) "ctx" = ( /obj/machinery/airalarm{ dir = 1; pixel_y = -22 }, /obj/machinery/vending/wardrobe/cap_wardrobe, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_tiled, /area/command/heads_quarters/captain) "ctI" = ( /obj/structure/cable{ @@ -5080,7 +5652,7 @@ icon_state = "4-8" }, /obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/open/floor/plasteel/dark, @@ -5098,6 +5670,10 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plasteel/white, /area/medical/paramedic) +"cuR" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/r_wall, +/area/security/checkpoint/medical) "cvA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -5139,6 +5715,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, /area/medical/morgue) +"cwr" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/vg_decals/atmos/carbon_dioxide, +/turf/open/floor/engine/co2, +/area/engineering/atmos) "cwU" = ( /obj/structure/cable{ icon_state = "0-4" @@ -5151,6 +5734,16 @@ /area/solars/port/aft) "cxk" = ( /obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/dark, /area/service/hydroponics) "cxw" = ( @@ -5183,11 +5776,11 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "cyB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/arrows/red, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/hallway/primary/aft) "cyO" = ( /obj/effect/spawner/structure/window/reinforced, @@ -5217,7 +5810,7 @@ name = "Detective's Office APC"; pixel_y = -26 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/security/detectives_office) "cyZ" = ( /obj/structure/cable{ @@ -5232,13 +5825,16 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /obj/machinery/holopad, /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/sorting) "czh" = ( @@ -5261,10 +5857,12 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "cAa" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/meter, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "cAe" = ( /obj/machinery/vending/clothing, /turf/open/floor/plasteel/grimy, @@ -5331,7 +5929,7 @@ name = "Solar Maintenance"; req_access_txt = "10; 13" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) "cBo" = ( /obj/machinery/computer/security/telescreen/toxins{ @@ -5343,6 +5941,22 @@ }, /turf/open/floor/plasteel, /area/science/mixing) +"cBp" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engineering/storage/tech) +"cBt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/rack/shelf, +/turf/open/floor/pod/dark, +/area/commons/dorms) "cCe" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -5435,8 +6049,9 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "cEz" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{ - dir = 1 +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 8; + name = "Waste Release" }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -5444,19 +6059,16 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/light, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"cFe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/engine, -/area/engineering/secure_construction) "cFl" = ( /obj/machinery/light{ dir = 4 @@ -5467,7 +6079,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /obj/machinery/light, @@ -5475,26 +6087,25 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "cFG" = ( -/obj/machinery/light, -/obj/structure/table, -/obj/item/clothing/gloves/color/yellow, -/obj/item/clothing/gloves/color/yellow, -/obj/item/clothing/gloves/color/yellow, -/obj/machinery/cell_charger, -/obj/effect/turf_decal/tile/yellow{ +/obj/machinery/camera{ + c_tag = "Engineering Storage"; dir = 4 }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/item/pipe_dispenser, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/item/clothing/glasses/meson/engine, +/turf/open/floor/plasteel, /area/engineering/main) "cFH" = ( /obj/structure/cable{ @@ -5510,21 +6121,27 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) -"cFI" = ( -/obj/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/turf/open/floor/engine, -/area/engineering/atmospherics_engine) "cFT" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/chemistry) +"cFY" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "cGa" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/chair/comfy/brown{ dir = 1 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/heads_quarters/captain) "cGq" = ( /obj/effect/turf_decal/tile/red{ @@ -5575,6 +6192,12 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/solars/port/fore) +"cHO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/service/library) "cHT" = ( /obj/machinery/camera{ c_tag = "Brig Genpop South" @@ -5629,8 +6252,14 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/aft/secondary) +"cJk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/wood, +/area/service/library) "cJs" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5671,7 +6300,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/hallway/primary/port) "cKU" = ( /obj/structure/cable{ @@ -5709,11 +6338,7 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "cLN" = ( -/obj/effect/turf_decal/vg_decals/atmos/oxygen, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/engine/o2, +/turf/open/floor/engine/air, /area/engineering/atmos) "cMf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -5763,15 +6388,17 @@ /turf/open/floor/plasteel/dark, /area/command/teleporter) "cNN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/pod/dark, /area/maintenance/starboard) "cNQ" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + pixel_x = 28 }, /turf/open/floor/plasteel/freezer, /area/mine/lobby) @@ -5786,6 +6413,13 @@ }, /turf/open/floor/plating, /area/command/bridge) +"cOo" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/layer1{ + dir = 1; + name = "atmos waste" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/engineering/atmos) "cOq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -5805,6 +6439,7 @@ /turf/open/floor/plasteel, /area/maintenance/department/electrical) "cOM" = ( +/obj/structure/sign/warning/gato/docking, /turf/closed/wall/r_wall, /area/maintenance/central) "cPh" = ( @@ -5819,6 +6454,10 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/dark, /area/security/office) +"cPE" = ( +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/plasteel, +/area/engineering/atmos) "cPP" = ( /obj/machinery/conveyor{ dir = 4; @@ -5836,18 +6475,31 @@ pixel_y = 28 }, /obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/dark, /area/hallway/primary/aft) "cQA" = ( /turf/closed/wall/r_wall, /area/security/brig) "cRa" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plating, -/area/medical/medbay/zone3) +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "cRd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -5860,19 +6512,13 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"cRf" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Atmos to Gas" +"cRk" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) -"cRm" = ( -/obj/structure/fluff/railing{ - dir = 6 - }, -/turf/open/openspace/icemoon, -/area/engineering/atmospherics_engine) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/turf/open/floor/plasteel/freezer, +/area/commons/dorms) "cRu" = ( /obj/machinery/light/small{ dir = 8 @@ -5880,6 +6526,11 @@ /obj/structure/closet{ name = "Evidence Closet" }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/security/office) "cRA" = ( @@ -5887,6 +6538,28 @@ /obj/item/seeds/ambrosia, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) +"cSc" = ( +/obj/machinery/holopad, +/obj/item/beacon, +/turf/open/floor/carpet, +/area/service/bar) +"cSf" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/white, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "cSx" = ( /obj/structure/cable{ icon_state = "1-2" @@ -5905,13 +6578,14 @@ /turf/open/floor/plasteel, /area/service/hydroponics) "cSF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /obj/structure/disposalpipe/trunk{ dir = 4 }, /obj/machinery/disposal/bin, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /turf/open/floor/wood, /area/commons/dorms) "cSK" = ( @@ -5930,25 +6604,6 @@ /obj/machinery/reagentgrinder, /turf/open/floor/plasteel, /area/service/hydroponics) -"cSU" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 28 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/camera{ - c_tag = "Engineering South"; - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/engineering/main) "cSY" = ( /obj/structure/table/reinforced, /obj/machinery/button/door{ @@ -5961,7 +6616,15 @@ /obj/structure/window/reinforced{ dir = 4 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/medical/medbay/central) "cTa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -5997,7 +6660,7 @@ dir = 8; pixel_x = 24 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/circuit/off, /area/ai_monitored/turret_protected/ai) "cTX" = ( /obj/machinery/button/door{ @@ -6019,10 +6682,8 @@ /turf/open/floor/engine, /area/science/xenobiology) "cVl" = ( -/obj/machinery/cryopod{ - dir = 8 - }, -/turf/open/floor/plasteel, +/obj/machinery/cryopod/tele, +/turf/open/floor/pod/dark, /area/hallway/secondary/exit/departure_lounge) "cVG" = ( /obj/structure/cable{ @@ -6051,6 +6712,18 @@ }, /turf/closed/wall/r_wall, /area/medical/virology) +"cVQ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "cWm" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 24 @@ -6066,11 +6739,13 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"cWy" = ( +/turf/open/floor/plasteel, +/area/science/robotics/lab) "cWL" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor/border_only{ dir = 1; name = "north facing firelock" @@ -6079,6 +6754,8 @@ name = "Bridge"; req_access_txt = "19" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) "cWU" = ( @@ -6111,12 +6788,6 @@ }, /turf/open/floor/plasteel/white, /area/command/heads_quarters/cmo) -"cWW" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 9 - }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/engineering/atmospherics_engine) "cWY" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -6137,11 +6808,15 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cXl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 5 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "cXn" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -6174,7 +6849,7 @@ name = "Showroom Access"; req_access_txt = "19" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/command/corporate_showroom) "cYb" = ( /obj/structure/cable{ @@ -6182,6 +6857,7 @@ }, /obj/effect/spawner/lootdrop/maintenance, /obj/structure/disposalpipe/segment, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/maintenance/disposal) "cYr" = ( @@ -6209,13 +6885,13 @@ icon_state = "0-8" }, /obj/machinery/power/smes, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) "cYK" = ( /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/department/science/xenobiology) "cYN" = ( /obj/structure/rack, @@ -6295,27 +6971,18 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/office) -"dcA" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/port_gen/pacman, -/turf/open/floor/plating, -/area/engineering/storage) "dcF" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/door/airlock/external/glass, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/maintenance/disposal) "dcK" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 @@ -6337,8 +7004,31 @@ pixel_y = 2 }, /obj/item/clothing/mask/cigarette/cigar, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/heads_quarters/captain) +"dcZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/closet/radiation, +/obj/item/clothing/glasses/meson/engine, +/turf/open/floor/plasteel, +/area/engineering/main) +"ddb" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "ddg" = ( /obj/structure/closet/crate, /turf/open/floor/plating, @@ -6360,9 +7050,6 @@ /turf/closed/wall, /area/hallway/secondary/entry) "ddv" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, /obj/machinery/door/airlock/public/glass{ name = "Central Access" }, @@ -6399,7 +7086,15 @@ name = "Robotics Surgery"; req_access_txt = "29" }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "steel_decals10" + }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "steel_decals10" + }, +/turf/open/floor/plasteel/white, /area/science/robotics/lab) "deg" = ( /obj/machinery/camera{ @@ -6413,17 +7108,25 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_y = -31 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"dev" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/engineering/atmos) "deJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -6452,9 +7155,18 @@ /turf/open/floor/plating, /area/maintenance/department/electrical) "dft" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/washing_machine, /turf/open/floor/plasteel/white, /area/commons/dorms) "dfG" = ( @@ -6488,11 +7200,11 @@ dir = 1; network = list("ss13","rd") }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/robotics/lab) "dgh" = ( /obj/structure/table/wood, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/meeting_room) "dgn" = ( /obj/structure/closet/l3closet, @@ -6510,10 +7222,17 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet, +/obj/item/beacon, +/turf/open/floor/plasteel/dark, /area/command/bridge) "dgA" = ( /obj/machinery/telecomms/processor/preset_one, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/end{ + dir = 8 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "dgB" = ( @@ -6523,6 +7242,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) +"dgD" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "dgV" = ( /obj/machinery/vending/wardrobe/curator_wardrobe, /obj/item/radio/intercom{ @@ -6535,6 +7260,9 @@ pixel_y = 20 }, /mob/living/simple_animal/pet/bumbles, +/obj/structure/noticeboard{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/service/hydroponics) "dhe" = ( @@ -6570,29 +7298,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"dhh" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) -"dhs" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "dhz" = ( /obj/machinery/computer/telecomms/monitor, /obj/effect/turf_decal/tile/green{ @@ -6608,13 +7313,13 @@ pixel_x = -32; pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "dil" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/vending/gato, /turf/open/floor/carpet, /area/commons/dorms) @@ -6699,6 +7404,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "djI" = ( @@ -6737,27 +7443,40 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "dkb" = ( -/obj/machinery/door/firedoor/border_only{ - name = "south facing firelock" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" +/obj/structure/cable{ + icon_state = "4-8" }, /obj/machinery/door/airlock/engineering/glass{ - name = "TEG Engine Room"; - req_access_txt = "10" + dir = 4; + name = "Laser Room"; + req_access_txt = "11" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/catwalk_floor, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "dkk" = ( /obj/machinery/door/airlock/wood, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -6769,11 +7488,16 @@ }, /turf/open/floor/wood, /area/maintenance/bar) +"dkt" = ( +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, +/area/hallway/primary/port) "dkA" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/primary/fore) "dkW" = ( @@ -6797,29 +7521,41 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel, /area/medical/medbay/central) +"dls" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/plating, +/area/engineering/storage) "dlS" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/landmark/start/assistant, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plasteel, -/area/commons/storage/primary) -"dlU" = ( -/obj/machinery/light/small{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"dlU" = ( /obj/structure/bed, -/obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/carpet/blue, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/obj/item/bedsheet/brown, +/turf/open/floor/carpet/orange, /area/commons/dorms) "dlZ" = ( /obj/structure/cable{ @@ -6852,12 +7588,8 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "dmB" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/space_heater, -/turf/open/floor/plasteel, -/area/commons/dorms) +/turf/closed/mineral/random/snow, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "dmQ" = ( /obj/machinery/light, /obj/structure/closet/crate/bin, @@ -6870,19 +7602,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) -"dng" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/engine, -/area/engineering/main) "dnz" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -6898,6 +7617,29 @@ dir = 4 }, /area/science/mixing) +"dnC" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"dnJ" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "dnZ" = ( /turf/open/floor/plasteel/dark, /area/science/server) @@ -6915,9 +7657,12 @@ /turf/open/floor/wood, /area/commons/dorms) "don" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/fitness) "dox" = ( @@ -6929,19 +7674,27 @@ dir = 1; network = list("aicore") }, -/turf/open/floor/circuit/off, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "doT" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "1-2" }, -/obj/machinery/power/smes/engineering, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 20 +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/turf/open/floor/plasteel, -/area/engineering/main) +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/item/rcl/pre_loaded, +/obj/item/rcl/pre_loaded, +/obj/item/rcl/pre_loaded, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "dpa" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/effect/turf_decal/tile/green{ @@ -6952,22 +7705,22 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) -"dpb" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer3, -/turf/open/floor/plating, -/area/engineering/atmospherics_engine) "dpz" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external/glass, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/external/glass{ + dir = 4 + }, /turf/open/floor/plating, /area/hallway/primary/aft) +"dpI" = ( +/turf/open/floor/carpet/orange, +/area/service/library) "dqa" = ( /obj/effect/turf_decal/tile/yellow, /turf/open/floor/plasteel/dark, @@ -6981,7 +7734,7 @@ "dqM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/hallway/primary/central) "drg" = ( /obj/effect/turf_decal/tile/red{ @@ -7076,6 +7829,31 @@ }, /turf/open/floor/plasteel, /area/security/office) +"dsB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"dsO" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/closet/firecloset, +/obj/structure/sign/poster/gato/safety{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "dsU" = ( /obj/machinery/chem_master/condimaster{ name = "HoochMaster 2000" @@ -7102,16 +7880,14 @@ }, /turf/open/floor/plating, /area/maintenance/department/electrical) -"dti" = ( -/obj/structure/cable{ - icon_state = "4-8" +"dtm" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/turf/open/floor/plating, -/area/engineering/storage) +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/white/corner, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "dtr" = ( /obj/structure/sink{ pixel_y = 30 @@ -7136,6 +7912,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/command/bridge) +"dtv" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "dtz" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7168,12 +7956,13 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "dtM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, -/area/hallway/primary/aft) +/area/cargo/storage) "dtR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -7197,14 +7986,15 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "dtW" = ( -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/meeting_room) "duB" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 6 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Pure to Mix" }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/turf/open/floor/plasteel, +/area/engineering/atmos) "duC" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple, @@ -7217,22 +8007,20 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "duJ" = ( /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) "dvd" = ( -/obj/structure/window/reinforced{ - dir = 1 +/obj/structure/sign/painting/library{ + pixel_x = 32 }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ +/obj/structure/chair/bench/right{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/white, -/area/maintenance/aft/secondary) +/turf/open/floor/plasteel, +/area/service/library) "dvg" = ( /obj/machinery/light{ dir = 4 @@ -7240,6 +8028,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) +"dvi" = ( +/obj/structure/rack/shelf, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/toy/cards/deck, +/turf/open/floor/wood, +/area/service/library) "dvn" = ( /obj/machinery/camera/motion{ c_tag = "Armory Motion Sensor South"; @@ -7258,6 +8053,15 @@ "dvx" = ( /turf/open/floor/plating, /area/maintenance/starboard) +"dwq" = ( +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 8 + }, +/area/hallway/primary/fore) "dwB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -7275,10 +8079,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/public/glass{ - id_tag = "permahydro"; - name = "Hydroponics Module" - }, /obj/machinery/door/poddoor/preopen{ id = "permacell2"; name = "garden blast door" @@ -7288,6 +8088,11 @@ name = "west facing firelock" }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/public/glass{ + id_tag = "permahydro"; + name = "Hydroponics Module"; + dir = 8 + }, /turf/open/floor/plasteel, /area/security/prison) "dwG" = ( @@ -7306,20 +8111,20 @@ /turf/open/openspace/icemoon, /area/icemoon/surface/outdoors) "dwN" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "dxg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/wood, /area/commons/dorms) "dxj" = ( /obj/structure/closet/emcloset, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_panel"; + name = "steel pannel" + }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "dxr" = ( @@ -7358,6 +8163,26 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) +"dyE" = ( +/obj/structure/table, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high{ + charge = 100; + maxcharge = 15000 + }, +/obj/item/stock_parts/cell/high{ + charge = 100; + maxcharge = 15000; + pixel_x = -5; + pixel_y = 11 + }, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "dzo" = ( /obj/machinery/airalarm{ pixel_y = 28 @@ -7405,29 +8230,33 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "dzF" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/pen/fountain, /obj/machinery/camera{ c_tag = "Chief Engineer's Office"; dir = 8 }, -/obj/machinery/button/door{ - desc = "A remote control-switch for secure storage."; - id = "Secure Storage"; - name = "Engineering Secure Storage"; - pixel_x = 24; - req_access_txt = "11" +/obj/structure/chair/office/dark{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/item/paper/monitorkey, /turf/open/floor/plasteel, /area/command/heads_quarters/ce) "dzR" = ( -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/security/detectives_office) +"dzV" = ( +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "dAg" = ( /obj/effect/landmark/start/bartender, /turf/open/floor/plasteel/grimy, @@ -7436,15 +8265,34 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, /obj/machinery/power/apc{ areastring = "/area/maintenance/aft"; dir = 8; name = "Toxins Launch APC"; pixel_x = -25 }, +/obj/machinery/vending/gato, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/fluff/railing, /turf/open/floor/plasteel, /area/maintenance/aft) "dAi" = ( @@ -7459,7 +8307,7 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "dAt" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 4 }, /obj/effect/turf_decal/tile/yellow{ @@ -7475,9 +8323,17 @@ /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) "dAS" = ( -/obj/structure/reflector/double, -/turf/open/floor/plating, -/area/engineering/storage) +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/vending/cola/random, +/turf/open/floor/plasteel/white, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "dAV" = ( /obj/structure/cable{ icon_state = "1-8" @@ -7504,14 +8360,14 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/fore) "dBk" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -7526,12 +8382,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/aft/secondary) -"dCn" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 6 - }, -/turf/open/floor/engine, -/area/engineering/atmospherics_engine) "dCt" = ( /obj/structure/table/glass, /obj/item/disk/design_disk, @@ -7563,6 +8413,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"dDb" = ( +/obj/effect/turf_decal/caution{ + dir = 8 + }, +/turf/open/floor/engine, +/area/engineering/supermatter) "dDh" = ( /obj/machinery/airalarm{ pixel_y = 32 @@ -7573,9 +8429,17 @@ /turf/open/floor/plasteel, /area/commons/storage/auxiliary) "dDl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output, -/turf/open/floor/engine/airless, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "dDM" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -7607,22 +8471,9 @@ /turf/open/floor/wood, /area/command/meeting_room) "dEw" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Courtroom" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4; - name = "east facing firelock" - }, -/turf/open/floor/wood, -/area/security/courtroom) -"dEH" = ( -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) +/obj/structure/sign/nanotrasen, +/turf/closed/wall, +/area/maintenance/port/fore) "dEK" = ( /obj/structure/chair/comfy/black, /obj/structure/window/reinforced{ @@ -7641,10 +8492,14 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/dark, /area/command/bridge) -"dFs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +"dFd" = ( +/obj/machinery/power/floodlight, +/obj/structure/cable{ + icon_state = "0-8" }, +/turf/open/floor/plasteel, +/area/engineering/atmos) +"dFs" = ( /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -7652,6 +8507,9 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, /area/cargo/sorting) "dGH" = ( @@ -7686,7 +8544,10 @@ /obj/structure/disposalpipe/junction/yjunction{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 8; + icon_state = "floor_trim" + }, /area/hallway/primary/fore) "dHn" = ( /obj/structure/table/wood, @@ -7731,7 +8592,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -7743,14 +8604,19 @@ /obj/structure/disposalpipe/junction/flip{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, /area/commons/fitness) "dIi" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 10 - }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/obj/machinery/atmospherics/pipe/manifold/orange/visible, +/obj/machinery/light, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "dIn" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7800,7 +8666,7 @@ icon_state = "1-8" }, /obj/machinery/door/window/eastright, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/department/science/xenobiology) "dJu" = ( /obj/structure/cable{ @@ -7825,9 +8691,17 @@ /turf/open/floor/plating, /area/maintenance/aft/secondary) "dLb" = ( -/obj/machinery/vending/gato, -/turf/open/floor/plasteel, -/area/maintenance/aft) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/catwalk_floor, +/area/maintenance/aft/secondary) "dLA" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7862,24 +8736,38 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "dMO" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 10 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/engineering/atmos) "dMY" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/open/floor/plasteel, -/area/hallway/primary/aft) +/area/hallway/primary/fore) +"dNu" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/turf_decal/box, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/plasteel, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "dNx" = ( /obj/structure/cable{ icon_state = "1-4" @@ -7897,7 +8785,7 @@ pixel_x = -25; pixel_y = 3 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) "dOg" = ( /obj/structure/window/reinforced{ @@ -7961,8 +8849,16 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/circuit, +/turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) +"dQh" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "O2 to Pure" + }, +/obj/machinery/atmospherics/pipe/simple/green/visible, +/turf/open/floor/plasteel, +/area/engineering/atmos) "dQv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -7970,9 +8866,18 @@ /turf/open/floor/carpet, /area/mine/lobby) "dQy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/service/kitchen) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "dQF" = ( /obj/structure/cable{ icon_state = "4-8" @@ -7996,19 +8901,13 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "dQR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) -"dQT" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 }, -/obj/effect/landmark/blobstart, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/engineering/storage/tech) +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "dQU" = ( /obj/effect/turf_decal/stripes, /obj/machinery/light/small{ @@ -8053,8 +8952,14 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "dRx" = ( -/turf/open/openspace/icemoon, -/area/maintenance/aft/secondary) +/obj/structure/sign/painting/library{ + pixel_x = -32 + }, +/obj/structure/chair/bench/left{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/service/library) "dRF" = ( /obj/structure/table/reinforced, /obj/machinery/recharger{ @@ -8067,30 +8972,34 @@ }, /turf/open/floor/plasteel, /area/security/warden) -"dSv" = ( -/obj/effect/turf_decal/tile/neutral{ +"dRP" = ( +/obj/structure/fluff/railing{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/turf/open/floor/plasteel/stairs/left{ + dir = 8 }, -/obj/machinery/light{ - dir = 4 +/area/hallway/secondary/exit/departure_lounge) +"dSl" = ( +/obj/machinery/atmospherics/pipe/manifold/green/visible, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, -/obj/machinery/requests_console{ - department = "Tool Storage"; - pixel_x = 30 - }, -/obj/item/clothing/gloves/color/yellow, -/turf/open/floor/plasteel, -/area/commons/storage/primary) +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "dSx" = ( -/obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plating, -/area/engineering/storage) +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/rnd/production/protolathe/department/engineering, +/turf/open/floor/plasteel, +/area/engineering/main) "dSB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment{ @@ -8099,11 +9008,35 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "dSS" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/commons/dorms) +"dTz" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/turf/closed/wall, -/area/service/hydroponics) +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "dTP" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -8117,6 +9050,20 @@ /obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel, /area/security/checkpoint/medical) +"dUl" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/table, +/obj/item/storage/box/lights/mixed{ + pixel_y = 8; + pixel_x = -8 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "dUC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -8124,14 +9071,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) -"dUD" = ( -/obj/machinery/airalarm{ - pixel_y = 25 - }, -/obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/rnd, -/turf/open/floor/plasteel/dark, -/area/engineering/storage/tech) "dUE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -8139,7 +9078,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, -/obj/machinery/door/airlock, +/obj/machinery/door/airlock{ + dir = 4 + }, /turf/open/floor/plasteel, /area/mine/lobby) "dUJ" = ( @@ -8158,13 +9099,33 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"dVf" = ( +/obj/structure/bed, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/obj/item/bedsheet/green, +/turf/open/floor/carpet/green, +/area/commons/dorms) +"dVF" = ( +/obj/structure/window/plasma/reinforced{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/power/rad_collector/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "dVK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 4 }, -/turf/closed/wall, -/area/service/janitor) +/turf/open/floor/plasteel, +/area/cargo/storage) "dVZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -8201,7 +9162,11 @@ /area/hallway/primary/central) "dWt" = ( /obj/machinery/vending/snack/random, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/dark, /area/hallway/primary/aft) "dWv" = ( /obj/structure/table/reinforced, @@ -8224,54 +9189,74 @@ /turf/open/floor/circuit/off, /area/ai_monitored/turret_protected/ai) "dWA" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/structure/table, +/obj/item/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = 6 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/item/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/machinery/light{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/effect/turf_decal/tile/brown{ + dir = 8 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 1 }, -/obj/machinery/door/window/northright{ - name = "Engineering Delivery"; - req_access_txt = "10" - }, -/obj/machinery/door/window/northright{ - dir = 4; - name = "Engineering Delivery"; - req_access_txt = "10" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) +/turf/open/floor/plasteel, +/area/commons/storage/primary) "dWC" = ( /turf/open/floor/plating, -/area/engineering/main) +/area/engineering/storage) +"dWF" = ( +/obj/structure/table/wood/poker, +/turf/open/floor/carpet/green, +/area/service/library) "dWJ" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/dark, /area/hallway/primary/aft) "dWK" = ( /obj/machinery/telecomms/processor/preset_three, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/end{ + dir = 8 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "dXr" = ( -/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, +/obj/structure/rack, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, /turf/open/floor/plasteel, /area/engineering/atmos) "dXv" = ( /obj/structure/table/wood, /obj/item/book/manual/gato_spacelaw, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/meeting_room) "dXG" = ( /obj/structure/table/glass, @@ -8310,6 +9295,12 @@ name = "Dormitory"; dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/wood, /area/commons/dorms) "dYy" = ( @@ -8329,10 +9320,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "55" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -8342,6 +9329,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab"; + req_access_txt = "55"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "dYE" = ( @@ -8370,7 +9362,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/science/xenobiology) "dZo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -8443,13 +9435,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/service/chapel/office) -"eaT" = ( -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engineering/storage) "eaW" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -8483,6 +9468,20 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/solars/port/fore) +"ebK" = ( +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) +"ebQ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/maintenance/disposal) "ecK" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/visible, /obj/structure/disposalpipe/segment{ @@ -8491,23 +9490,17 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "edq" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, /area/engineering/atmos) -"edx" = ( -/obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engineering/main) "edD" = ( /obj/item/stack/cable_coil/random, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) +"edO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/stairs/right, +/area/hallway/primary/central) "edR" = ( /turf/open/floor/plating, /area/maintenance/port/fore) @@ -8530,6 +9523,26 @@ dir = 4; pixel_y = 28 }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "eef" = ( @@ -8543,12 +9556,25 @@ /obj/machinery/portable_atmospherics/canister, /turf/open/floor/plasteel, /area/science/mixing) +"eet" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/vg_decals/atmos/air, +/turf/open/floor/engine/air, +/area/engineering/atmos) "eeB" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = -32 }, /turf/open/floor/wood, /area/maintenance/bar) +"efn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ + dir = 10 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "efr" = ( /obj/machinery/light{ dir = 4 @@ -8558,15 +9584,6 @@ }, /turf/open/floor/plasteel, /area/commons/dorms) -"efH" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/turf/open/floor/engine, -/area/engineering/secure_construction) "efR" = ( /obj/structure/cable{ icon_state = "2-8" @@ -8574,12 +9591,15 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "efW" = ( @@ -8587,17 +9607,15 @@ dir = 4 }, /obj/effect/landmark/event_spawn, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/security/courtroom) "egc" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/aft/secondary) +/obj/machinery/space_heater, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "egj" = ( /obj/machinery/button/door{ id = "QMLoaddoor"; @@ -8607,18 +9625,40 @@ pixel_y = -8 }, /obj/effect/turf_decal/tile/brown, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, /turf/open/floor/plasteel, /area/cargo/storage) "egU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/security/courtroom) +"ehh" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high{ + charge = 100; + maxcharge = 15000 + }, +/obj/item/electronics/airlock, +/obj/item/electronics/airalarm, +/obj/item/electronics/apc, +/turf/open/floor/plating, +/area/engineering/storage/tech) "ehk" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/service/hydroponics) +"ehl" = ( +/obj/machinery/airalarm/directional/east, +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engineering/main) "eht" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -8659,7 +9699,10 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "ehU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/open/floor/plasteel/freezer, @@ -8723,7 +9766,8 @@ }, /obj/machinery/door/airlock/external{ name = "Solar Maintenance"; - req_access_txt = "10; 13" + req_access_txt = "10; 13"; + dir = 4 }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -8731,11 +9775,29 @@ /turf/closed/wall/r_wall, /area/security/checkpoint/medical) "eja" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 10 +/obj/machinery/button/door{ + desc = "A remote control-switch for secure storage."; + id = "engibreakroom"; + name = "Engineering Secure Storage"; + req_access_txt = null; + pixel_y = -24; + pixel_x = 5 }, -/turf/open/floor/engine, -/area/engineering/main) +/obj/machinery/button/door{ + id = "engibreak"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4; + pixel_y = -24; + pixel_x = -5 + }, +/obj/structure/chair/sofa/corp/corner{ + dir = 8 + }, +/turf/open/floor/carpet/orange, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "ejo" = ( /obj/structure/fireplace, /turf/open/floor/wood, @@ -8747,6 +9809,9 @@ /obj/structure/disposalpipe/junction/flip{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/fitness) "ejU" = ( @@ -8767,20 +9832,6 @@ }, /turf/open/floor/plasteel/grimy, /area/service/bar) -"ekz" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/portable_atmospherics/canister/toxins, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -35 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/atmospherics_engine) "ekH" = ( /obj/structure/cable{ icon_state = "4-8" @@ -8845,28 +9896,10 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/service) "emc" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/dark, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/techstorage/medical, +/turf/open/floor/plating, /area/engineering/storage/tech) -"emu" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/meter, -/turf/open/floor/engine, -/area/engineering/main) "emB" = ( /obj/structure/closet/wardrobe/chemistry_white, /obj/effect/turf_decal/tile/yellow{ @@ -8878,7 +9911,6 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "emC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/closet/crate, /turf/open/floor/plasteel, /area/cargo/storage) @@ -8961,17 +9993,21 @@ /area/cargo/sorting) "eoh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel{ + icon_state = "floor_trim" }, -/turf/open/floor/plasteel/white, /area/medical/medbay/central) "eoG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, /turf/open/floor/plasteel/grimy, /area/service/bar) "eoI" = ( @@ -8983,17 +10019,12 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "eoJ" = ( -/obj/structure/table, -/obj/item/clothing/head/welding{ - pixel_x = -5; - pixel_y = 3 +/obj/machinery/atmospherics/components/binary/pump{ + name = "Distro to Waste" }, -/obj/item/clothing/head/welding{ - pixel_x = -5; - pixel_y = 3 +/obj/item/radio/intercom{ + pixel_x = -25 }, -/obj/item/multitool, -/obj/item/clothing/glasses/welding, /turf/open/floor/plasteel, /area/engineering/atmos) "eoM" = ( @@ -9006,6 +10037,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/noticeboard{ + pixel_y = 32 + }, /turf/open/floor/plasteel/dark, /area/command/bridge) "eoT" = ( @@ -9070,33 +10104,57 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"eqG" = ( -/obj/structure/cable{ - icon_state = "4-8" +"eqw" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/computer/rdconsole/production{ dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4; - name = "east facing firelock" - }, -/obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room"; - req_access_txt = "10" - }, -/turf/open/floor/engine, +/turf/open/floor/plasteel, /area/engineering/main) +"eqx" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter{ + pixel_x = 5; + pixel_y = -3 + }, +/turf/open/floor/plasteel, +/area/commons/storage/primary) +"eqG" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Storage"; + req_access_txt = "11" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "eqI" = ( /turf/open/floor/wood, /area/security/courtroom) "erc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/hallway/primary/central) "ere" = ( /obj/structure/cable{ @@ -9164,6 +10222,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) +"esd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/turf/open/floor/carpet/red, +/area/commons/dorms) "esI" = ( /obj/structure/sign/warning/nosmoking{ pixel_y = 30 @@ -9246,10 +10313,11 @@ /area/science/mixing) "eus" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 5 + dir = 4 }, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "euv" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -9300,11 +10368,24 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "evm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 9 +/obj/machinery/power/apc{ + areastring = "/area/commons/storage/primary"; + dir = 4; + name = "Primary Tool Storage APC"; + pixel_x = 24; + pixel_y = 1 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "evF" = ( /obj/effect/landmark/start/cook, /turf/open/floor/plasteel/cafeteria, @@ -9345,10 +10426,29 @@ }, /turf/open/floor/plasteel/white, /area/command/heads_quarters/cmo) +"ewq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/holopad, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"ews" = ( +/obj/structure/table/wood/poker, +/obj/item/flashlight/lamp/green, +/turf/open/floor/carpet, +/area/commons/dorms) "eww" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/obj/structure/bookcase/random, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood, +/area/service/library) "ewI" = ( /obj/structure/cable{ icon_state = "4-8" @@ -9367,7 +10467,8 @@ dir = 4; pixel_x = -24 }, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, /area/security/warden) "exl" = ( /obj/structure/table/reinforced, @@ -9399,6 +10500,21 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/dark/side, /area/hallway/primary/central) +"eyh" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "eyn" = ( /obj/structure/cable{ icon_state = "4-8" @@ -9420,6 +10536,9 @@ /obj/structure/chair/sofa/right{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, /turf/open/floor/carpet, /area/service/bar) "eyL" = ( @@ -9441,15 +10560,6 @@ }, /turf/open/floor/plasteel/freezer, /area/security/prison) -"eyS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/engineering/main) "eyY" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -9523,7 +10633,10 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, /area/commons/dorms) "eDa" = ( /obj/effect/spawner/structure/window/reinforced, @@ -9542,7 +10655,6 @@ /area/command/bridge) "eDr" = ( /obj/structure/table, -/obj/item/surgicaldrill, /obj/item/surgical_drapes, /obj/item/razor, /obj/machinery/camera{ @@ -9550,7 +10662,9 @@ network = list("ss13","medbay"); pixel_x = 22 }, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/white/corner, +/turf/open/floor/plasteel/white, /area/medical/surgery) "eDs" = ( /obj/machinery/light/small{ @@ -9561,14 +10675,31 @@ }, /turf/open/floor/plating, /area/construction/storage_wing) -"eDv" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/mine/lobby) -"eEy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +"eDt" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/plating, +/area/engineering/storage/tech) +"eDv" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "snaxi_mining_shutter"; + name = "blast door seal" + }, +/turf/open/floor/plating, +/area/mine/lobby) +"eEi" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/engineering/main) +"eEy" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 }, @@ -9580,6 +10711,9 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, /turf/open/floor/plasteel, /area/cargo/sorting) "eEJ" = ( @@ -9588,13 +10722,13 @@ dir = 4 }, /mob/living/simple_animal/sloth/paperwork, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_whole" + }, /area/cargo/storage) "eEM" = ( -/obj/machinery/airalarm{ - pixel_y = 25 - }, -/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/machinery/vending/engineering, /turf/open/floor/plating, /area/engineering/storage) "eEO" = ( @@ -9618,19 +10752,31 @@ "eEU" = ( /obj/machinery/mech_bay_recharge_port, /obj/structure/cable, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "eFu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/landmark/start/station_engineer, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/engineering/lobby) "eFy" = ( /obj/structure/table/wood, /turf/open/floor/wood, @@ -9648,7 +10794,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) "eFU" = ( /obj/structure/disposalpipe/segment, @@ -9658,27 +10804,69 @@ /obj/machinery/holopad, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) -"eGS" = ( -/obj/structure/window/plasma/reinforced{ - dir = 4 - }, +"eGI" = ( /obj/structure/cable{ - icon_state = "0-8" + icon_state = "1-2" }, -/obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" }, -/obj/machinery/camera{ - c_tag = "Supermatter Interior"; - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"eGS" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Library" }, /obj/machinery/door/firedoor/border_only{ - dir = 4; - name = "east facing firelock" + name = "south facing firelock" }, -/turf/open/floor/engine, -/area/engineering/supermatter) +/obj/machinery/door/firedoor/border_only{ + dir = 1; + name = "north facing firelock" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "steel_decals" + }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "steel_decals" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/maintenance/aft) +"eHe" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/fluff/railing{ + dir = 10 + }, +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, +/turf/open/floor/plasteel, +/area/maintenance/aft) "eHl" = ( /obj/machinery/door/airlock/public/glass{ name = "Snow Airlock" @@ -9688,6 +10876,7 @@ dir = 1; name = "north facing firelock" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/commons/dorms) "eHr" = ( @@ -9703,26 +10892,33 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "eHJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = 29 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) +"eHK" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/figure/syndie, +/turf/open/floor/carpet/green, +/area/service/library) "eII" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/directions/science{ dir = 1 }, -/turf/open/floor/plating, +/turf/closed/wall, /area/hallway/secondary/entry) "eIZ" = ( -/obj/machinery/air_sensor/atmos/toxins_mixing_tank, -/turf/open/floor/engine/airless, -/area/maintenance/aft/secondary) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/commons/dorms) "eJo" = ( /obj/machinery/computer/med_data{ dir = 8 @@ -9739,24 +10935,41 @@ dir = 8; network = list("ss13","medbay") }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel, /area/medical/medbay/central) -"eJT" = ( -/obj/structure/dresser, -/turf/open/floor/carpet, -/area/command/heads_quarters/hop) -"eKi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/radio/intercom{ - pixel_y = 25 +"eJv" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 }, /turf/open/floor/plasteel, -/area/maintenance/aft) +/area/commons/fitness) +"eJT" = ( +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, +/turf/open/floor/wood, +/area/command/heads_quarters/hop) +"eKa" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/port) +"eKi" = ( +/obj/item/stack/marker_beacon{ + anchored = 1; + icon_state = "markerburgundy-on"; + light_color = "#FA644B"; + light_power = 3; + light_range = 2; + name = "landing marker"; + picked_color = "Burgundy" + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors) "eKD" = ( /obj/structure/cable{ icon_state = "4-8" @@ -9770,21 +10983,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "eKE" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 }, /turf/open/floor/wood, /area/commons/dorms) -"eKH" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "eKI" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/engine, @@ -9814,7 +11017,8 @@ /obj/structure/fans/tiny, /obj/machinery/door/poddoor{ id = "oldtoxinsdriver"; - name = "toxins launcher bay door" + name = "toxins launcher bay door"; + dir = 4 }, /turf/open/floor/plating, /area/maintenance/aft) @@ -9833,11 +11037,11 @@ /turf/open/floor/plasteel/freezer, /area/service/kitchen) "eLV" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/turf/open/floor/plating, +/area/engineering/storage/tech) "eMa" = ( /obj/machinery/vending/medical{ pixel_x = -2 @@ -9856,53 +11060,29 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) -"eMi" = ( -/obj/structure/cable{ - icon_state = "1-4" +"eME" = ( +/obj/machinery/suit_storage_unit/ce, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, /turf/open/floor/plasteel, -/area/engineering/main) -"eME" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable, -/obj/machinery/power/apc/highcap/fifteen_k{ - areastring = "/area/engineering/main"; - dir = 8; - name = "Engineering APC"; - pixel_x = -25; - pixel_y = -1 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/closet/radiation, -/obj/machinery/camera{ - c_tag = "Supermatter West"; - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/main) +/area/command/heads_quarters/ce) "eMF" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/rack/shelf, +/obj/item/clothing/shoes/winterboots, +/obj/item/clothing/shoes/winterboots, +/obj/item/clothing/shoes/winterboots, +/turf/open/floor/plating, /area/commons/dorms) "eNf" = ( /obj/structure/closet/secure_closet/quartermaster, @@ -9938,29 +11118,12 @@ }, /turf/open/floor/plasteel/dark, /area/cargo/miningdock) -"eNq" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/structure/tank_dispenser, -/turf/open/floor/plasteel, -/area/engineering/main) -"eND" = ( -/obj/effect/landmark/start/station_engineer, -/turf/open/floor/plating, -/area/engineering/atmospherics_engine) "eNH" = ( /obj/structure/chair/stool, /obj/effect/landmark/start/head_of_personnel, /turf/open/floor/wood, /area/command/heads_quarters/hop) "eNI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ id = "kitchen"; @@ -9989,6 +11152,9 @@ dir = 8; pixel_x = 28 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "eOj" = ( @@ -10025,11 +11191,18 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "eOr" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{ +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/engine/n2o, -/area/engineering/atmos) +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "eOv" = ( /obj/structure/table/glass, /obj/item/stack/cable_coil, @@ -10099,15 +11272,9 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/turf/open/floor/circuit, +/turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "ePY" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -10116,19 +11283,30 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/machinery/modular_computer/console/preset/engineering, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/engineering/lobby) "eQc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/open/floor/wood, -/area/commons/dorms) +/area/service/bar) "eQm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/obj/structure/chair/stool, +/turf/open/floor/plasteel, +/area/engineering/main) "eQo" = ( /obj/structure/table/optable{ name = "Robotics Operating Table" @@ -10139,7 +11317,12 @@ name = "Station Intercom (General)"; pixel_y = 29 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/white/side, /area/science/robotics/lab) "eQw" = ( /obj/structure/sign/directions/command{ @@ -10171,9 +11354,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "eRe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -10185,10 +11365,26 @@ pixel_x = 3; pixel_y = 3 }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, -/area/engineering/break_room) +/area/engineering/lobby) +"eRk" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "eRy" = ( /obj/structure/cable{ icon_state = "4-8" @@ -10197,7 +11393,10 @@ dir = 4 }, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/maintenance/aft) "eRT" = ( /obj/structure/cable, @@ -10227,7 +11426,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "eSn" = ( /obj/machinery/firealarm{ @@ -10251,17 +11450,21 @@ /turf/open/floor/plating, /area/commons/fitness/recreation) "eSK" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 }, -/turf/open/floor/engine, -/area/engineering/secure_construction) +/turf/open/floor/plasteel, +/area/commons/storage/primary) "eSR" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -31 }, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) +"eSY" = ( +/obj/structure/sign/poster/contraband/eat, +/turf/closed/wall, +/area/service/bar) "eTh" = ( /obj/structure/cable{ icon_state = "1-2" @@ -10275,8 +11478,12 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"eTA" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/icemoon/surface/outdoors) "eTZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/components/unary/thermomachine/heater{ dir = 4 }, /turf/open/floor/plasteel, @@ -10329,25 +11536,16 @@ /turf/open/floor/plating, /area/maintenance/solars/port/aft) "eWA" = ( -/obj/structure/window/plasma/reinforced{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 6 - }, -/obj/machinery/light{ +/obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/obj/machinery/door/firedoor/border_only{ - dir = 4; - name = "east facing firelock" +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/turf/open/floor/engine, -/area/engineering/supermatter) +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/rnd/production/circuit_imprinter, +/turf/open/floor/plasteel, +/area/engineering/main) "eWQ" = ( /obj/effect/landmark/observer_start, /obj/structure/disposalpipe/segment, @@ -10389,7 +11587,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "eXy" = ( /obj/structure/cable{ @@ -10401,7 +11599,7 @@ name = "Surgical Center APC"; pixel_y = 23 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/medical/surgery) "eXZ" = ( /obj/structure/disposalpipe/segment, @@ -10420,16 +11618,15 @@ /area/medical/virology) "eYC" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) +/turf/open/floor/catwalk_floor, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "eYQ" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -10442,8 +11639,17 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) +"eYU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/full, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "eZz" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater, /obj/machinery/camera{ @@ -10467,10 +11673,6 @@ /turf/open/floor/plasteel/dark, /area/medical/morgue) "fas" = ( -/obj/machinery/door/airlock/command{ - name = "Head of Personnel"; - req_access_txt = "57" - }, /obj/machinery/door/firedoor/border_only{ dir = 8; name = "west facing firelock" @@ -10478,6 +11680,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/door/airlock/command{ + name = "Head of Personnel"; + req_access_txt = "57"; + dir = 8 + }, /turf/open/floor/plasteel, /area/command/heads_quarters/hop) "faz" = ( @@ -10499,12 +11706,11 @@ /turf/closed/wall, /area/commons/storage/primary) "faO" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ + dir = 9 }, -/obj/machinery/atmospherics/components/binary/valve/digital, /turf/open/floor/plating/snowed/smoothed/icemoon, -/area/engineering/atmos) +/area/icemoon/surface/outdoors) "faX" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -10513,7 +11719,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "fba" = ( /obj/machinery/light/small{ @@ -10529,12 +11735,9 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "fbq" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -10566,15 +11769,6 @@ }, /turf/open/floor/plating, /area/icemoon/surface/outdoors) -"fdp" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/storage/tech) "fdD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -10584,16 +11778,6 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) -"fdE" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Cooling Loop Bypass" - }, -/turf/open/floor/engine, -/area/engineering/main) "fdW" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 @@ -10609,6 +11793,11 @@ /obj/item/radio/intercom{ pixel_y = 25 }, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_panel"; + name = "steel pannel" + }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "feh" = ( @@ -10664,15 +11853,6 @@ }, /turf/open/floor/plasteel/dark, /area/command/teleporter) -"feP" = ( -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/engine, -/area/engineering/supermatter) "ffh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -10683,6 +11863,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) "ffw" = ( @@ -10716,11 +11902,14 @@ /turf/open/floor/plating, /area/maintenance/bar) "ffW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, +/obj/structure/table/wood, +/obj/item/toy/cards/deck, +/turf/open/floor/carpet, +/area/mine/lobby) +"fgc" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating, -/area/engineering/storage) +/area/maintenance/aft/secondary) "fgh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -10764,9 +11953,11 @@ /turf/open/floor/wood, /area/command/heads_quarters/hop) "fhh" = ( -/obj/structure/bookcase{ - name = "Forbidden Knowledge" - }, +/obj/structure/closet/cabinet, +/obj/item/storage/photo_album, +/obj/item/book/codex_gigas, +/obj/item/camera, +/obj/item/storage/fancy/candle_box, /turf/open/floor/wood, /area/service/library) "fhu" = ( @@ -10832,6 +12023,25 @@ }, /turf/open/floor/engine, /area/science/xenobiology) +"fio" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/missingpizza{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "fis" = ( /obj/machinery/computer/operating, /obj/machinery/airalarm{ @@ -10848,18 +12058,6 @@ /obj/item/restraints/handcuffs, /turf/open/floor/plasteel/dark, /area/security/office) -"fjq" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/vending/assist, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 28 - }, -/turf/open/floor/plasteel, -/area/commons/storage/primary) "fjv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/light/small, @@ -10871,23 +12069,19 @@ c_tag = "Captain's Quarters"; dir = 1 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/heads_quarters/captain) -"fjH" = ( -/obj/machinery/airalarm{ - pixel_y = 28 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "fjJ" = ( /obj/structure/closet/secure_closet/medical3, /turf/open/floor/plasteel/white, /area/medical/paramedic) "fjS" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "fke" = ( @@ -10905,7 +12099,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "fks" = ( /obj/machinery/light{ @@ -10922,17 +12116,20 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "fkG" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, -/obj/item/radio/intercom{ - pixel_y = 25 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 }, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "fkN" = ( /obj/vehicle/ridden/atv/snowmobile, /obj/effect/turf_decal/bot, @@ -10993,6 +12190,14 @@ name = "EVA Storage"; req_access_txt = "18" }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "flA" = ( @@ -11039,10 +12244,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, /obj/structure/bed/roller, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone3) "fmf" = ( @@ -11050,7 +12258,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/meeting_room) "fmo" = ( /obj/effect/spawner/structure/window/reinforced, @@ -11065,32 +12273,28 @@ }, /turf/open/floor/plating, /area/command/heads_quarters/captain) -"fmu" = ( -/obj/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 10 - }, -/turf/open/floor/engine, -/area/engineering/atmospherics_engine) "fmB" = ( -/obj/machinery/door/poddoor/incinerator_toxmix, -/turf/open/floor/engine/airless, -/area/maintenance/aft/secondary) -"fmM" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/sign/painting/library{ + pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" +/obj/structure/displaycase/trophy, +/obj/structure/fluff/railing{ + dir = 1 }, -/obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "10" +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain"; + dir = 1 }, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/service/library) +"fmM" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/lobby) "fmS" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -11099,14 +12303,19 @@ /obj/structure/table/reinforced, /turf/open/floor/plasteel/dark, /area/command/bridge) -"fna" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ - dir = 4; - name = "euthanization chamber freezer" +"fmV" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/white, -/area/maintenance/aft/secondary) +/obj/machinery/computer/atmos_control/tank/nitrous_tank, +/turf/open/floor/plasteel, +/area/engineering/atmos) +"fna" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "fnB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/brown, @@ -11177,6 +12386,12 @@ /obj/structure/chair{ dir = 4 }, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "foY" = ( @@ -11184,7 +12399,13 @@ /obj/machinery/vending/wallmed{ pixel_y = -28 }, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 10 + }, +/turf/open/floor/plasteel/white, /area/medical/surgery) "fpm" = ( /obj/structure/cable{ @@ -11204,19 +12425,20 @@ dir = 8; pixel_x = 29 }, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) -"fpT" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/engineering/main) "fqn" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/table/wood, /obj/item/clothing/head/collectable/captain, +/obj/item/toy/talking/AI{ + name = "GATO-brand toy AI"; + pixel_y = 6 + }, +/obj/item/clothing/head/collectable/HoS{ + name = "novelty HoS hat" + }, +/obj/item/toy/gun, /turf/open/floor/carpet, /area/command/corporate_showroom) "fqs" = ( @@ -11253,15 +12475,27 @@ }, /turf/open/floor/wood, /area/maintenance/bar) -"fqV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable{ - icon_state = "1-2" +"fqS" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 8 }, -/turf/open/floor/wood, -/area/commons/dorms) +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/plasteel, +/area/commons/storage/primary) +"fqV" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "fra" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/wood, /area/commons/dorms) "frj" = ( @@ -11277,6 +12511,14 @@ }, /turf/open/floor/wood, /area/command/heads_quarters/hop) +"frp" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "fru" = ( /obj/machinery/firealarm{ dir = 4; @@ -11304,7 +12546,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "fsh" = ( /obj/structure/cable{ @@ -11324,19 +12566,20 @@ /turf/open/floor/glass/reinforced, /area/commons/fitness) "fsV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/light{ dir = 1 }, -/turf/open/floor/plasteel, -/area/engineering/main) -"fsX" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Engineering South" + }, +/obj/machinery/vending/tool, +/turf/open/floor/plasteel, /area/engineering/main) "fti" = ( /obj/structure/disposalpipe/segment{ @@ -11374,27 +12617,34 @@ /turf/open/floor/plasteel/dark, /area/service/chapel/office) "fuB" = ( -/obj/machinery/portable_atmospherics/canister/air, /obj/machinery/camera{ c_tag = "Atmospherics North West"; dir = 4 }, +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Waste to Filter" + }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "fuQ" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/structure/showcase/mecha/ripley, /turf/open/floor/carpet, /area/command/corporate_showroom) "fvn" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/door/airlock/engineering/glass{ + dir = 4; + name = "Supermatter Engine"; + req_access_txt = "11" }, -/obj/machinery/atmospherics/pipe/manifold/green/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 }, /turf/open/floor/engine, -/area/engineering/main) +/area/engineering/supermatter) "fvo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -11402,15 +12652,15 @@ /obj/structure/chair{ dir = 8 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/security/courtroom) "fvs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/chair/comfy/beige{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, /turf/open/floor/carpet, /area/commons/dorms) "fvC" = ( @@ -11475,10 +12725,14 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "fwB" = ( -/obj/effect/landmark/start/station_engineer, -/obj/structure/disposalpipe/segment{ +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/structure/closet/emcloset, /turf/open/floor/plasteel, /area/engineering/main) "fwL" = ( @@ -11492,15 +12746,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/medical/glass{ - id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" - }, /obj/machinery/door/firedoor/border_only{ dir = 8; name = "west facing firelock" }, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "medbay_front_door"; + name = "Medbay"; + req_access_txt = "5"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "fwV" = ( @@ -11513,9 +12768,8 @@ /area/service/bar) "fxD" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/engineering/break_room) +/area/engineering/lobby) "fya" = ( /obj/structure/cable{ icon_state = "4-8" @@ -11529,26 +12783,26 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "fyi" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 4 }, /turf/open/floor/plasteel, -/area/security/checkpoint/supply) +/area/hallway/primary/aft) "fym" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - name = "Cooling to Unfiltered" +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "snaxi_mining_shutter"; + name = "blast door seal"; + dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engineering/main) +/turf/open/floor/plating, +/area/mine/eva) "fyt" = ( /obj/machinery/conveyor_switch/oneway{ dir = 8; @@ -11570,6 +12824,26 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) +"fzc" = ( +/obj/structure/table, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown, +/obj/item/screwdriver{ + pixel_y = 16 + }, +/obj/item/wirecutters, +/obj/item/crowbar, +/obj/item/wrench, +/obj/item/weldingtool, +/obj/item/analyzer, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "fzo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/brown{ @@ -11655,10 +12929,6 @@ /turf/closed/wall/r_wall, /area/maintenance/aft/secondary) "fBN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/button/door{ id = "qm_warehouse"; name = "Warehouse Door Control"; @@ -11677,7 +12947,9 @@ /turf/open/floor/wood, /area/hallway/primary/port) "fBS" = ( -/obj/machinery/holopad, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) "fBZ" = ( @@ -11699,6 +12971,12 @@ }, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) "fCH" = ( @@ -11713,13 +12991,6 @@ /obj/item/paper/pamphlet/gateway, /turf/open/floor/plasteel/dark, /area/command/teleporter) -"fCS" = ( -/obj/structure/window/plasma/reinforced{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/plasteel/dark, -/area/engineering/atmospherics_engine) "fCU" = ( /obj/machinery/conveyor{ dir = 4; @@ -11736,8 +13007,14 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/disposalpipe/junction/flip{ dir = 4 }, /turf/open/floor/plasteel, @@ -11746,12 +13023,11 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 }, -/obj/effect/landmark/blobstart, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/turf/open/floor/wood, +/area/service/library) "fDk" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -11810,6 +13086,15 @@ /obj/machinery/light/small/broken, /turf/open/floor/circuit/off, /area/maintenance/aft/secondary) +"fFc" = ( +/obj/structure/closet/crate{ + name = "Asshole Containment" + }, +/obj/item/banhammer, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/item/trash/fatoray_scrap1, +/turf/open/floor/plating, +/area/icemoon/surface/outdoors) "fGb" = ( /turf/open/floor/plating, /area/maintenance/department/bridge) @@ -11843,11 +13128,12 @@ }, /area/hallway/secondary/exit/departure_lounge) "fHg" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 }, -/turf/closed/wall, -/area/cargo/sorting) +/turf/open/floor/plasteel, +/area/commons/fitness) "fHt" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/delivery, @@ -11882,16 +13168,21 @@ /turf/open/floor/wood, /area/service/bar) "fIp" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/computer/atmos_control/tank/oxygen_tank{ - dir = 8 +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, /turf/open/floor/plasteel, -/area/engineering/atmos) +/area/command/heads_quarters/ce) "fIM" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/table, /obj/item/storage/firstaid/regular, /turf/open/floor/wood, @@ -11906,6 +13197,14 @@ /obj/machinery/light/floor, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"fIV" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/carpet/orange, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "fJm" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -11914,8 +13213,8 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 }, /turf/open/floor/plasteel, /area/commons/fitness) @@ -11938,6 +13237,21 @@ }, /turf/open/floor/plasteel/white, /area/science/misc_lab) +"fJD" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "fJE" = ( /obj/structure/table, /obj/item/book/manual/wiki/medical_cloning{ @@ -11979,6 +13293,7 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "fKq" = ( +/obj/structure/sign/poster/gato/statelaws, /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload_foyer) "fKs" = ( @@ -11991,17 +13306,21 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "fLq" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /obj/machinery/door/airlock/external{ name = "Engineering External Access"; - req_access_txt = "10;13" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + req_access_txt = "10;13"; dir = 4 }, /turf/open/floor/plating/snowed/smoothed/icemoon, @@ -12104,7 +13423,15 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/maintenance/aft/secondary) "fNc" = ( -/turf/closed/wall/r_wall, +/obj/machinery/door/airlock/public/glass{ + name = "Library"; + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8; + name = "west facing firelock" + }, +/turf/open/floor/wood, /area/service/library) "fNn" = ( /obj/structure/cable{ @@ -12118,11 +13445,17 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/solars/port/aft) +"fNo" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/commons/dorms) "fNs" = ( /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) "fNw" = ( /obj/effect/turf_decal/tile/purple{ @@ -12169,11 +13502,14 @@ dir = 8 }, /obj/machinery/disposal/bin, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/security/courtroom) "fOE" = ( -/turf/open/floor/engine/airless, -/area/maintenance/aft/secondary) +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood, +/area/service/library) "fOG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -12185,7 +13521,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "fPc" = ( /turf/open/openspace, @@ -12201,7 +13537,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) "fPt" = ( /obj/structure/cable{ @@ -12210,20 +13546,19 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/command/corporate_showroom) "fPx" = ( /obj/structure/fireplace{ pixel_y = -6 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/heads_quarters/captain) "fPC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/freezer, -/area/commons/dorms) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/commons/fitness) "fPE" = ( /obj/structure/table, /obj/item/multitool, @@ -12275,12 +13610,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"fRe" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "fRf" = ( /obj/machinery/airalarm{ pixel_y = 26 @@ -12295,12 +13624,13 @@ /obj/machinery/door/firedoor/border_only{ name = "south facing firelock" }, -/turf/open/floor/carpet/blue, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/wood, /area/commons/dorms) "fRG" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Port Mix to Engine" +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 10 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -12327,12 +13657,24 @@ icon_state = "4-8" }, /obj/machinery/telecomms/receiver/preset_left, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 5 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "fRZ" = ( /obj/structure/sign/painting{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, /turf/open/floor/carpet/gato, /area/commons/dorms) "fSf" = ( @@ -12344,7 +13686,7 @@ /turf/open/floor/plasteel/white, /area/mine/lobby) "fSl" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 1 }, /turf/open/floor/plasteel, @@ -12375,8 +13717,17 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) +"fSN" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/obj/machinery/airalarm/engine{ + pixel_y = 24 + }, +/turf/open/floor/engine, +/area/engineering/supermatter) "fSP" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/bot, @@ -12386,11 +13737,18 @@ /turf/open/floor/engine, /area/science/misc_lab) "fTt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/cargo/miningdock) +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, +/area/cargo/storage) "fTz" = ( /obj/effect/turf_decal/loading_area{ icon_state = "drain"; @@ -12411,11 +13769,33 @@ }, /turf/open/floor/plasteel/freezer, /area/commons/dorms) -"fTT" = ( -/obj/machinery/door/airlock/command{ - name = "Conference Room"; - req_access_txt = "19" +"fTC" = ( +/obj/structure/cable{ + icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/catwalk_floor, +/area/maintenance/aft/secondary) +"fTS" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/catwalk_floor, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"fTT" = ( /obj/machinery/door/firedoor/border_only{ dir = 8; name = "west facing firelock" @@ -12423,6 +13803,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/command{ + name = "Conference Room"; + req_access_txt = "19"; + dir = 4 + }, /turf/open/floor/wood, /area/command/meeting_room) "fUn" = ( @@ -12436,7 +13821,6 @@ /turf/open/floor/plasteel/dark, /area/command/teleporter) "fUs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light/small{ dir = 8 }, @@ -12444,18 +13828,28 @@ /turf/open/floor/plasteel, /area/cargo/storage) "fUH" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 27 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/keycard_auth{ + pixel_y = -28 + }, +/obj/machinery/modular_computer/console/preset/engineering{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/structure/cable{ + icon_state = "0-8" }, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/command/heads_quarters/ce) "fVd" = ( /obj/machinery/door/airlock/maintenance{ name = "Mining Station Maintenance"; @@ -12471,19 +13865,22 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/zone3) "fVJ" = ( -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = 30 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /obj/structure/cable{ icon_state = "1-2" }, /turf/open/floor/wood, /area/commons/dorms) +"fVM" = ( +/obj/structure/rack, +/obj/item/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/item/multitool, +/obj/item/clothing/glasses/meson, +/turf/open/floor/plating, +/area/engineering/storage/tech) "fVN" = ( /obj/structure/table, /obj/machinery/microwave{ @@ -12492,9 +13889,6 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "fVV" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, /turf/open/floor/wood, /area/service/theater) "fVZ" = ( @@ -12529,14 +13923,25 @@ /area/service/bar) "fWi" = ( /obj/structure/displaycase/labcage, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) +"fWl" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone3) "fWz" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/directions/medical{ dir = 1 }, -/turf/open/floor/plating, +/turf/closed/wall, /area/hallway/secondary/entry) "fWI" = ( /obj/machinery/door/airlock/maintenance, @@ -12550,6 +13955,11 @@ }, /turf/open/floor/plating, /area/maintenance/bar) +"fWN" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "fWQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 5 @@ -12561,7 +13971,9 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "fXF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, /obj/structure/closet/crate, /obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel, @@ -12626,22 +14038,39 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, /turf/open/floor/plasteel, /area/commons/fitness) +"fZg" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/floor/plating, +/area/engineering/atmos) "fZi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, /turf/open/floor/plasteel/cafeteria, /area/service/chapel/office) +"fZj" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, +/turf/open/floor/plating, +/area/engineering/storage/tech) "fZk" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{ dir = 8 }, -/obj/machinery/air_sensor/atmos/toxin_tank{ +/obj/machinery/air_sensor/atmos/nitrogen_tank{ pixel_y = -25 }, -/turf/open/floor/engine/plasma, +/turf/open/floor/engine/n2, /area/engineering/atmos) "fZu" = ( /obj/machinery/door/airlock{ @@ -12654,7 +14083,7 @@ icon_state = "0-8" }, /obj/machinery/power/smes, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "fZO" = ( /obj/effect/spawner/structure/window/reinforced, @@ -12674,9 +14103,13 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "gaw" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, -/turf/closed/wall/r_wall, -/area/command/heads_quarters/ce) +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Pure to Ports" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "gaz" = ( /obj/structure/cable{ icon_state = "1-4" @@ -12684,13 +14117,27 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) +"gbe" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/machinery/vending/wardrobe/engi_wardrobe, +/turf/open/floor/plasteel, +/area/engineering/main) "gbv" = ( /obj/structure/dresser, /obj/structure/sign/painting{ pixel_y = -32 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, /turf/open/floor/carpet/royalblue, /area/commons/dorms) "gbG" = ( @@ -12728,11 +14175,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/department/science/xenobiology) "gcK" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/circuit, +/turf/open/floor/circuit/off, /area/science/server) "gcL" = ( /obj/effect/spawner/structure/window/reinforced, @@ -12743,13 +14190,16 @@ name = "Bathroom"; dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel/freezer, /area/commons/dorms) "gdH" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/open/floor/plasteel/dark, @@ -12758,12 +14208,39 @@ /obj/structure/chair/comfy/brown{ dir = 4 }, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/dark, /area/hallway/primary/aft) +"gdQ" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Freezer Room"; + req_access_txt = "11" + }, +/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "gdR" = ( -/obj/item/beacon, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/structure/rack, +/obj/item/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/item/clothing/gloves/color/yellow, +/obj/item/t_scanner, +/obj/item/multitool, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engineering/storage/tech) "gdX" = ( /obj/effect/turf_decal/bot_white, /obj/structure/cable{ @@ -12784,6 +14261,10 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) +"gdY" = ( +/obj/machinery/holopad, +/turf/open/floor/wood, +/area/hallway/secondary/exit/departure_lounge) "ged" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -12796,6 +14277,15 @@ }, /turf/open/floor/plating, /area/maintenance/aft/secondary) +"gen" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "ger" = ( /obj/structure/table/wood, /obj/item/flashlight/lantern{ @@ -12845,10 +14335,14 @@ /turf/open/floor/wood, /area/command/corporate_showroom) "gfe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "gfh" = ( @@ -12974,6 +14468,12 @@ /obj/machinery/light, /turf/open/floor/wood, /area/service/bar) +"gil" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/robotics/lab) "giw" = ( /obj/structure/cable{ icon_state = "4-8" @@ -12984,6 +14484,13 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"giz" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/obj/machinery/computer/atmos_control/tank/mix_tank, +/turf/open/floor/plasteel, +/area/engineering/atmos) "giB" = ( /obj/machinery/requests_console{ department = "AI"; @@ -12991,7 +14498,7 @@ pixel_x = 30; pixel_y = 30 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "giD" = ( /obj/effect/turf_decal/tile/blue{ @@ -13005,6 +14512,17 @@ "giO" = ( /turf/closed/wall/r_wall, /area/maintenance/starboard) +"giQ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "giX" = ( /obj/structure/cable{ icon_state = "1-8" @@ -13047,7 +14565,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/door/airlock{ name = "Theatre Backstage"; req_access_txt = "46" @@ -13057,29 +14575,34 @@ name = "north facing firelock" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/service/theater) "gjX" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Gas to Filter" +/obj/structure/closet/crate, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/mineral/plasma{ + amount = 30 }, -/obj/machinery/airalarm/engine{ - dir = 4; - pixel_x = -22 - }, -/turf/open/floor/engine, -/area/engineering/supermatter) +/obj/item/gps, +/obj/item/stack/rods/fifty, +/turf/open/floor/plating, +/area/engineering/storage) "gjY" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/aft/secondary) +/obj/effect/turf_decal/stripes/white/line, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "gku" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/closed/wall, -/area/cargo/sorting) +/obj/structure/chair/stool/bar, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, +/turf/open/floor/wood, +/area/service/bar) "gkQ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -13090,6 +14613,9 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, /turf/open/floor/circuit, /area/science/robotics/mechbay) "glf" = ( @@ -13105,7 +14631,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/command/corporate_showroom) "glN" = ( /obj/structure/chair/comfy/black{ @@ -13117,7 +14643,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-2" }, @@ -13133,8 +14658,11 @@ }, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) +"gmE" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/r_wall, +/area/command/heads_quarters/cmo) "gmN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -13201,6 +14729,10 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/structure/fans/tiny, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/tcommsat/server) "gnT" = ( @@ -13234,21 +14766,6 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"goh" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" - }, -/obj/machinery/door/poddoor{ - id = "Secure Storage"; - name = "secure storage" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/engineering/storage) "gok" = ( /obj/machinery/atmospherics/components/binary/valve/on{ dir = 4 @@ -13332,15 +14849,16 @@ /turf/open/floor/plasteel/dark, /area/command/teleporter) "gpA" = ( -/obj/machinery/door/airlock/external{ - name = "Supply Vehicles Airlock"; - req_access_txt = "31" - }, /obj/machinery/door/firedoor/border_only{ dir = 8; name = "west facing firelock" }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + name = "Supply Vehicles Airlock"; + req_access_txt = "31"; + dir = 8 + }, /turf/open/floor/plasteel, /area/maintenance/starboard) "gpQ" = ( @@ -13369,6 +14887,14 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) +"gqy" = ( +/obj/machinery/space_heater, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "gqA" = ( /obj/structure/cable{ icon_state = "4-8" @@ -13382,13 +14908,8 @@ /obj/machinery/computer/secure_data{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/command/heads_quarters/hos) -"gqE" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engineering/atmospherics_engine) "gqR" = ( /obj/structure/cable{ icon_state = "4-8" @@ -13418,7 +14939,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/door/firedoor/border_only{ dir = 1; name = "north facing firelock" @@ -13427,6 +14948,7 @@ name = "Cargo Bay"; req_access_txt = "31" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/cargo/storage) "grw" = ( @@ -13490,6 +15012,12 @@ dir = 4 }, /obj/structure/chair/office/light, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 9 + }, /turf/open/floor/plasteel/dark, /area/science/server) "gtm" = ( @@ -13584,40 +15112,17 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "gvO" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" }, -/turf/open/floor/plasteel, /area/hallway/primary/aft) -"gvR" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "gvU" = ( /obj/machinery/suit_storage_unit/rd, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/white, /area/science/misc_lab) -"gwa" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - name = "Cooling to Unfiltered" - }, -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/open/floor/plating, -/area/engineering/atmospherics_engine) "gwf" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/effect/turf_decal/tile/purple{ @@ -13629,20 +15134,24 @@ /obj/structure/sign/departments/botany, /turf/closed/wall, /area/service/hydroponics) +"gwp" = ( +/obj/structure/table/wood/poker, +/obj/item/storage/fancy/donut_box, +/turf/open/floor/wood, +/area/hallway/primary/port) "gww" = ( /obj/machinery/computer/secure_data, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, /area/security/warden) +"gwL" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engineering/atmos) "gxb" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/engineering/main) +/turf/closed/indestructible/rock/snow/ice, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "gxk" = ( /obj/structure/table, /obj/item/integrated_circuit_printer, @@ -13655,7 +15164,7 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/solars/starboard/fore) "gxD" = ( -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/hallway/primary/central) "gyn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -13663,10 +15172,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel/dark, /area/security/office) "gyI" = ( @@ -13697,12 +15202,13 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/tile/blue, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/white/corner{ dir = 8 }, @@ -13745,6 +15251,21 @@ }, /turf/open/floor/plasteel, /area/science/robotics/mechbay) +"gBt" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "gBu" = ( /obj/structure/cable, /obj/machinery/power/solar{ @@ -13753,6 +15274,10 @@ }, /turf/open/floor/plasteel/solarpanel, /area/solars/starboard/fore) +"gBz" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/r_wall, +/area/hallway/secondary/exit/departure_lounge) "gBV" = ( /obj/structure/cable{ icon_state = "4-8" @@ -13776,19 +15301,23 @@ }, /turf/open/floor/plasteel/grimy, /area/commons/fitness/recreation) -"gCj" = ( -/obj/structure/cable{ - icon_state = "4-8" +"gCn" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" }, -/obj/machinery/power/smes/engineering, -/turf/open/floor/plasteel, -/area/engineering/main) +/obj/machinery/holopad, +/turf/open/floor/wood, +/area/commons/dorms) "gCr" = ( -/turf/closed/wall, -/area/command/heads_quarters/hop) +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, +/area/hallway/primary/aft) "gCx" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ dir = 8; @@ -13821,6 +15350,14 @@ }, /turf/open/floor/plasteel/white, /area/science/misc_lab) +"gDI" = ( +/obj/structure/reflector/single/anchored{ + dir = 9 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "gDN" = ( /obj/structure/cable{ icon_state = "1-2" @@ -13828,30 +15365,35 @@ /turf/open/floor/circuit/off, /area/ai_monitored/turret_protected/ai) "gDP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 }, -/obj/machinery/pipedispenser/disposal/transit_tube, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/turf/open/floor/plating, +/area/engineering/storage/tech) "gDU" = ( /obj/machinery/camera{ c_tag = "Testing Lab East"; network = list("ss13","rd") }, +/obj/item/kirbyplants/photosynthetic, /turf/open/floor/plasteel/white, /area/science/misc_lab) "gDW" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, /obj/effect/turf_decal/tile/brown{ dir = 1 }, /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, /turf/open/floor/plasteel, /area/cargo/storage) "gDZ" = ( @@ -13862,25 +15404,27 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light{ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) -"gEp" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engineering/main) +"gEl" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/r_wall, +/area/medical/medbay/zone3) "gEr" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external/glass, +/obj/machinery/door/airlock/external/glass{ + dir = 4 + }, /turf/open/floor/plating, /area/hallway/primary/aft) "gEA" = ( @@ -13894,18 +15438,23 @@ /turf/open/floor/plasteel, /area/mine/eva) "gFm" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Mining Station Maintenance"; - req_access_txt = "48" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/maintenance{ + name = "Mining Station Maintenance"; + req_access_txt = "48"; + dir = 4 + }, /turf/open/floor/plasteel, /area/mine/eva) +"gFq" = ( +/obj/machinery/air_sensor/atmos/mix_tank, +/turf/open/floor/engine/airless, +/area/engineering/atmos) "gFr" = ( /turf/open/floor/plating, /area/maintenance/disposal) @@ -13931,24 +15480,6 @@ }, /turf/open/floor/plasteel, /area/security/warden) -"gFA" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "gFX" = ( /obj/effect/turf_decal/trimline/red/filled, /obj/machinery/suit_storage_unit/security, @@ -13961,11 +15492,9 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "gGb" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, -/area/engineering/atmos) +/area/engineering/main) "gGg" = ( /obj/structure/cable{ icon_state = "0-4" @@ -13998,23 +15527,39 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/security{ - name = "Armory"; - req_access_txt = "3" - }, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" }, +/obj/machinery/door/airlock/security{ + name = "Armory"; + req_access_txt = "3"; + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/security/warden) "gGj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment{ +/obj/machinery/button/door{ + desc = "A remote control-switch for secure storage."; + id = "Secure Storage"; + name = "Engineering Secure Storage"; + req_access_txt = "11"; + pixel_y = -24 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/turf/open/floor/plasteel, -/area/commons/storage/primary) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "gGk" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -14027,16 +15572,24 @@ /area/maintenance/starboard) "gGo" = ( /obj/machinery/suit_storage_unit/engine, -/turf/open/floor/plasteel, -/area/engineering/main) -"gGs" = ( -/obj/machinery/door/airlock/engineering{ - name = "Port Quarter Solar Access"; - req_access_txt = "10" +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) +"gGs" = ( /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/engineering{ + name = "Port Quarter Solar Access"; + req_access_txt = "10"; + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "gGt" = ( @@ -14052,24 +15605,18 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /obj/structure/disposalpipe/sorting/mail{ dir = 4; sortType = 20 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"gGT" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "gHi" = ( /obj/structure/cable{ icon_state = "1-2" @@ -14099,27 +15646,28 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/fans/tiny, /obj/machinery/door/airlock/external/glass, -/turf/open/floor/carpet, +/turf/open/floor/plasteel, /area/hallway/primary/port) "gHv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_x = -28 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/service/hydroponics) +"gHE" = ( +/turf/open/floor/plasteel, +/area/medical/medbay/central) "gHF" = ( /obj/machinery/light, /obj/machinery/camera{ c_tag = "Bathrooms"; dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 }, /turf/open/floor/plasteel/freezer, /area/commons/dorms) @@ -14138,8 +15686,8 @@ /obj/machinery/airalarm{ pixel_y = 28 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 }, /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -14168,33 +15716,30 @@ /obj/item/beacon, /turf/open/floor/plasteel, /area/mine/eva) -"gIt" = ( +"gIL" = ( /obj/structure/cable{ - icon_state = "2-4" + icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/turf/open/floor/engine, -/area/engineering/main) -"gIX" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 }, /turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) +/area/hallway/primary/fore) "gJi" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/fitness) "gJy" = ( @@ -14249,31 +15794,39 @@ /area/icemoon/surface/outdoors) "gKj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall/r_wall, -/area/maintenance/aft/secondary) +/turf/closed/wall, +/area/service/library) "gKt" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/commons/fitness) "gKE" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - sortType = 6 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"gKK" = ( +/obj/machinery/airalarm/directional/south, +/turf/open/floor/carpet/orange, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "gKN" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Server Room"; @@ -14283,16 +15836,15 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/dark, /area/tcommsat/server) "gLa" = ( -/obj/machinery/suit_storage_unit/atmos, +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 9 + }, /turf/open/floor/plasteel, /area/engineering/atmos) -"gLe" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/turf/closed/wall/r_wall, -/area/engineering/atmospherics_engine) "gLj" = ( /obj/structure/cable{ icon_state = "4-8" @@ -14339,40 +15891,7 @@ }, /turf/open/floor/plasteel/dark, /area/service/hydroponics) -"gLN" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/toxins, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/atmospherics_engine) -"gLS" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/structure/table, -/obj/item/storage/toolbox/electrical{ - pixel_x = 1; - pixel_y = -1 - }, -/obj/item/storage/toolbox/electrical{ - pixel_x = 1; - pixel_y = 6 - }, -/turf/open/floor/plasteel, -/area/commons/storage/primary) "gNg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light{ dir = 1 }, @@ -14381,13 +15900,13 @@ name = "Kitchen"; req_access_txt = "28" }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" }, +/obj/structure/noticeboard{ + pixel_y = 32 + }, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) "gNh" = ( @@ -14403,17 +15922,11 @@ /obj/structure/chair/comfy/black{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/maintenance/department/bridge) -"gNS" = ( -/obj/structure/cable, -/obj/machinery/light, -/obj/machinery/camera{ - c_tag = "Supermatter North"; - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, /turf/open/floor/plasteel/dark, -/area/engineering/supermatter) +/area/maintenance/department/bridge) "gOg" = ( /obj/structure/cable{ icon_state = "0-8" @@ -14428,14 +15941,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_x = -28 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/aft) "gOA" = ( @@ -14471,54 +15983,56 @@ name = "north facing firelock" }, /obj/structure/disposalpipe/segment, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/service/chapel/office) -"gOU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) -"gPu" = ( +"gON" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/effect/turf_decal/stripes/corner{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/turf/open/floor/plasteel, +/area/engineering/main) +"gOU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, /turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) +/area/hallway/primary/fore) +"gOX" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/light, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "gPF" = ( /obj/structure/chair/stool, /obj/structure/light_construct/small, /turf/open/floor/wood, /area/maintenance/bar) -"gPG" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engineering/main) "gPT" = ( /turf/closed/wall/r_wall, /area/ai_monitored/security/armory) "gPU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/carpet, /area/service/bar) "gQa" = ( @@ -14537,7 +16051,8 @@ name = "Medbay"; req_access_txt = "5" }, -/turf/open/floor/plasteel/white, +/obj/item/reagent_containers/glass/bottle/epinephrine, +/turf/open/floor/plasteel, /area/medical/medbay/central) "gQX" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -14553,7 +16068,7 @@ /turf/open/floor/plasteel, /area/commons/dorms) "gQY" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 4 }, /turf/open/floor/plasteel/dark, @@ -14563,9 +16078,6 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, /obj/structure/cable{ icon_state = "1-8" }, @@ -14587,18 +16099,17 @@ c_tag = "Fore Port Solar Control"; dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "gRv" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/white, /area/science/lab) -"gRw" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/main) +"gRK" = ( +/obj/machinery/space_heater, +/obj/structure/fluff/railing, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) "gRP" = ( /obj/machinery/camera{ c_tag = "Hydroponics South"; @@ -14607,14 +16118,9 @@ /turf/open/floor/plasteel, /area/service/hydroponics) "gRS" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/dark, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/techstorage/service, +/turf/open/floor/plating, /area/engineering/storage/tech) "gSc" = ( /obj/item/radio/intercom{ @@ -14625,11 +16131,9 @@ /turf/open/floor/pod/dark, /area/maintenance/starboard) "gSg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/maintenance/aft/secondary) +/obj/machinery/computer/slot_machine, +/turf/open/floor/carpet/arcade, +/area/service/library) "gSn" = ( /obj/machinery/door/airlock{ id_tag = "Dorm4"; @@ -14638,7 +16142,9 @@ /obj/machinery/door/firedoor/border_only{ name = "south facing firelock" }, -/turf/open/floor/carpet/blue, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/wood, /area/commons/dorms) "gSs" = ( /obj/structure/cable{ @@ -14660,7 +16166,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/central) "gTd" = ( /obj/effect/turf_decal/bot_white, @@ -14688,7 +16194,7 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "gUc" = ( /obj/structure/cable{ @@ -14724,6 +16230,8 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "gUs" = ( @@ -14809,7 +16317,10 @@ /obj/effect/turf_decal/arrows/red{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/hallway/primary/central) "gXg" = ( /obj/effect/turf_decal/tile/brown{ @@ -14838,19 +16349,21 @@ /turf/closed/wall/r_wall, /area/command/heads_quarters/hop) "gXG" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/structure/closet/radiation, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/open/floor/engine, +/obj/effect/turf_decal/stripes/corner, +/obj/item/clothing/glasses/meson/engine, +/turf/open/floor/plasteel, /area/engineering/main) "gXT" = ( /obj/structure/cable{ @@ -14864,18 +16377,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"gXZ" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/door/firedoor/border_only{ - dir = 4; - name = "east facing firelock" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" - }, -/turf/open/floor/plating, -/area/engineering/main) "gYh" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -14908,6 +16409,12 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) "gYX" = ( @@ -14915,37 +16422,25 @@ icon_state = "4-8" }, /obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 2 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) -"gYY" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/open/floor/engine, -/area/engineering/main) "gZa" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "Escape Airlock" + name = "Escape Airlock"; + dir = 8 }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "gZf" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 6 - }, -/turf/open/floor/engine, +/obj/structure/trash_pile, +/turf/open/floor/plating, /area/maintenance/aft/secondary) "gZl" = ( /obj/machinery/door/firedoor/border_only{ @@ -14994,21 +16489,19 @@ }, /obj/machinery/door/airlock/maintenance{ name = "Showroom Access"; - req_access_txt = "19" + req_access_txt = "19"; + dir = 4 }, /turf/open/floor/plating, /area/command/corporate_showroom) "gZR" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{ - dir = 1 - }, -/turf/open/floor/engine/airless, -/area/maintenance/aft/secondary) -"gZU" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/structure/chair/sofa/old{ dir = 4 }, +/turf/open/floor/carpet/green, +/area/service/library) +"gZU" = ( +/obj/machinery/light, /obj/machinery/vending/mealdor, /turf/open/floor/carpet, /area/commons/dorms) @@ -15031,6 +16524,7 @@ /area/security/brig) "had" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/item/kirbyplants/photosynthetic, /turf/open/floor/plasteel/white, /area/medical/virology) "has" = ( @@ -15063,15 +16557,36 @@ c_tag = "Library South"; dir = 8 }, -/obj/machinery/newscaster{ - pixel_x = 32 - }, /turf/open/floor/wood, /area/service/library) "haK" = ( /obj/effect/landmark/blobstart, /turf/open/floor/plating, -/area/engineering/main) +/area/engineering/storage) +"hbb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/commons/storage/primary) +"hbi" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "hbA" = ( /turf/open/floor/plasteel/elevatorshaft, /area/mine/eva) @@ -15108,9 +16623,6 @@ /turf/open/floor/wood, /area/command/heads_quarters/captain) "hcW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Dorms Central"; dir = 1 @@ -15131,13 +16643,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/central) "hcY" = ( /turf/closed/wall/r_wall, /area/maintenance/aft/secondary) "hdg" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/plasteel, /area/maintenance/disposal) "hdm" = ( @@ -15152,13 +16664,18 @@ /obj/structure/closet{ name = "Evidence Closet" }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/security/office) "hdS" = ( /obj/machinery/porta_turret/ai{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "hdV" = ( /obj/effect/turf_decal/tile/purple, @@ -15169,13 +16686,15 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "hdX" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, /area/commons/fitness) "heJ" = ( @@ -15184,20 +16703,28 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/white/side, /area/science/robotics/lab) "heN" = ( /obj/item/beacon, /turf/open/floor/plasteel/dark, /area/command/bridge) "heR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/trunk{ dir = 8 }, /obj/machinery/disposal/bin, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) +"heT" = ( +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/turf/closed/wall/r_wall, +/area/engineering/atmos) "heV" = ( /obj/machinery/door/airlock/external{ name = "External Access"; @@ -15253,12 +16780,12 @@ name = "Fitness Room APC"; pixel_y = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-4" }, +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, /turf/open/floor/plasteel, /area/commons/fitness) "hfL" = ( @@ -15288,18 +16815,15 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "hgp" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/dark, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/techstorage/engineering, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/turf/open/floor/plating, /area/engineering/storage/tech) +"hgs" = ( +/turf/open/floor/carpet/green, +/area/service/library) "hgH" = ( /obj/machinery/conveyor{ dir = 9; @@ -15370,20 +16894,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/medical/virology) -"hgY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/pump, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/plasteel, -/area/engineering/main) "hho" = ( /obj/structure/cable{ icon_state = "1-8" @@ -15429,25 +16939,31 @@ /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "hjU" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/atmos) "hkl" = ( /turf/open/floor/plasteel/white, /area/science/xenobiology) "hkP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/structure/table, -/obj/structure/bedsheetbin/color, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -26 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/washing_machine, /turf/open/floor/plasteel/white, /area/commons/dorms) "hkY" = ( @@ -15457,12 +16973,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/aft/secondary) -"hlm" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engineering/main) "hlB" = ( /obj/machinery/door/airlock{ name = "Custodial Closet"; @@ -15508,11 +17018,9 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "hmJ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/carpet, -/area/hallway/primary/port) +/obj/structure/chair, +/turf/open/floor/wood/wood_large, +/area/hallway/primary/central) "hmS" = ( /obj/structure/table/optable, /obj/machinery/camera{ @@ -15535,26 +17043,39 @@ /obj/item/radio/intercom{ pixel_x = -25 }, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) "hni" = ( -/obj/machinery/atmospherics/miner/oxygen, -/turf/open/floor/engine/o2, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "hnq" = ( /obj/machinery/computer/operating, /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/science/robotics/lab) -"hns" = ( -/obj/machinery/light/small{ +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/white/corner{ dir = 8 }, -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/turf/open/floor/plating, -/area/engineering/storage) +/area/science/robotics/lab) "hnt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -15586,6 +17107,11 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"hnJ" = ( +/obj/structure/chair/stool/bar, +/obj/item/trash/popcorn, +/turf/open/floor/carpet/arcade, +/area/service/library) "hnL" = ( /obj/structure/cable{ icon_state = "1-2" @@ -15594,41 +17120,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/command/bridge) -"hnT" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engineering/main) "hog" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "hos" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 }, -/turf/open/floor/wood, -/area/commons/dorms) -"hoz" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "TEG Chamber"; - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/atmospherics_engine) +/turf/open/floor/plasteel, +/area/service/hydroponics) "hoO" = ( /turf/closed/wall, /area/medical/morgue) @@ -15677,7 +17180,7 @@ dir = 1 }, /obj/machinery/disposal/bin, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/security/detectives_office) "hpA" = ( /obj/structure/cable{ @@ -15715,6 +17218,23 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"hqe" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1; + icon_state = "steel_decals_central6" + }, +/turf/open/floor/plasteel, +/area/cargo/storage) +"hqi" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/central) "hqB" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -15722,6 +17242,9 @@ /obj/structure/rack, /obj/effect/turf_decal/bot, /obj/item/clothing/shoes/magboots, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "hqH" = ( @@ -15736,11 +17259,40 @@ /turf/open/floor/plasteel, /area/service/hydroponics) "hrf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/engine/co2, -/area/engineering/atmos) +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"hrP" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "hsc" = ( /obj/machinery/firealarm{ dir = 8; @@ -15748,10 +17300,6 @@ }, /turf/open/floor/plasteel/white, /area/science/misc_lab) -"hsd" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engineering/atmospherics_engine) "hsq" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible, /obj/machinery/light/floor, @@ -15792,6 +17340,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "htS" = ( @@ -15807,8 +17356,18 @@ /area/service/bar) "hus" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/hallway/primary/central) +"huM" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, +/area/hallway/primary/aft) "hvA" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 6 @@ -15839,13 +17398,19 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/item/kirbyplants, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/sign/poster/gato/lovegato{ + pixel_x = 32 + }, /turf/open/floor/plasteel, /area/commons/fitness) "hwh" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/turf/open/floor/plasteel/white, +/obj/structure/rack, +/turf/open/floor/plasteel/dark, /area/science/robotics/lab) "hwr" = ( /obj/machinery/light{ @@ -15864,14 +17429,13 @@ /turf/open/floor/plasteel/white, /area/science/lab) "hwu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering"; + req_access_txt = "10"; + dir = 1 }, /turf/open/floor/plasteel, /area/engineering/main) @@ -15882,7 +17446,7 @@ name = "Security Shutters"; pixel_y = 24 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/meeting_room) "hxt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -15914,13 +17478,13 @@ /turf/closed/wall, /area/ai_monitored/command/storage/eva) "hya" = ( -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/heads_quarters/hop) "hyf" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "hyr" = ( @@ -15932,21 +17496,15 @@ /turf/open/floor/plasteel/freezer, /area/science/xenobiology) "hys" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_y = 29 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/maintenance/department/bridge) -"hyK" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/engineering/main) +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, +/turf/open/floor/carpet/green, +/area/commons/dorms) "hyR" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -15962,7 +17520,7 @@ /obj/item/kirbyplants{ icon_state = "plant-10" }, -/turf/open/floor/carpet, +/turf/open/floor/plasteel/dark, /area/command/bridge) "hzq" = ( /obj/structure/cable, @@ -15973,9 +17531,25 @@ dir = 1; sortType = 26 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/plasteel, /area/commons/fitness) +"hAt" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "hAL" = ( /obj/structure/chair{ dir = 1 @@ -16008,12 +17582,11 @@ /turf/open/floor/plasteel, /area/science/robotics/mechbay) "hBh" = ( -/obj/structure/sign/poster/contraband/lusty_xenomorph{ - pixel_x = -32; - pixel_y = -32 - }, -/turf/open/floor/plating, -/area/maintenance/aft/secondary) +/obj/structure/table/wood, +/obj/item/folder, +/obj/item/pen/fountain, +/turf/open/floor/wood, +/area/service/library) "hBA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -16037,7 +17610,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/department/science/xenobiology) "hCf" = ( /obj/effect/turf_decal/tile/blue{ @@ -16073,12 +17646,11 @@ /turf/open/floor/plasteel, /area/security/prison) "hCL" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/chair/comfy/black{ + dir = 8 }, -/obj/machinery/telecomms/hub/preset, -/turf/open/floor/plasteel/dark/telecomms, -/area/tcommsat/server) +/turf/open/floor/plasteel, +/area/maintenance/aft) "hCN" = ( /obj/structure/cable{ icon_state = "4-8" @@ -16122,11 +17694,20 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/plasteel/checker, +/turf/open/floor/plasteel/dark, /area/science/server) +"hDY" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engineering/storage/tech) +"hEa" = ( +/turf/open/floor/wood/wood_large, +/area/security/courtroom) "hEz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/heads_quarters/captain) "hEI" = ( /obj/effect/turf_decal/tile/blue{ @@ -16150,6 +17731,13 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) +"hFP" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel{ + dir = 8; + icon_state = "floor_whole" + }, +/area/science/robotics/lab) "hGc" = ( /obj/structure/cable{ icon_state = "2-4" @@ -16162,6 +17750,15 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/solars/starboard/aft) +"hGj" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "hGt" = ( /obj/machinery/camera{ c_tag = "Courtroom East"; @@ -16170,12 +17767,13 @@ /obj/item/kirbyplants{ icon_state = "applebush" }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/security/courtroom) "hGL" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/fore) "hGT" = ( @@ -16221,18 +17819,9 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "hHz" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/hallway/primary/central) -"hIt" = ( -/obj/structure/cable, -/obj/machinery/light, -/turf/open/floor/plasteel/dark, -/area/engineering/supermatter) +/obj/structure/sign/poster/gato/lovegato, +/turf/closed/wall/r_wall, +/area/maintenance/aft) "hIL" = ( /obj/structure/table, /obj/structure/extinguisher_cabinet{ @@ -16278,29 +17867,25 @@ /turf/open/floor/plasteel/white, /area/command/heads_quarters/cmo) "hJv" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/camera{ + c_tag = "Tech Storage"; + dir = 1 + }, +/obj/structure/table, +/obj/item/storage/belt/utility, +/obj/item/storage/firstaid/regular, +/obj/effect/turf_decal/tile/brown{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "hJL" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"hJT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Supermatter East"; - dir = 8 - }, -/turf/open/floor/engine, -/area/engineering/main) "hKb" = ( /obj/structure/cable{ icon_state = "2-8" @@ -16315,8 +17900,15 @@ /obj/machinery/light, /turf/open/floor/plasteel, /area/security/office) +"hKE" = ( +/obj/structure/fluff/railing{ + dir = 6 + }, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) "hLa" = ( /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/plasteel, /area/maintenance/starboard) "hLd" = ( @@ -16372,6 +17964,14 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) +"hMJ" = ( +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/turf/open/floor/engine, +/area/engineering/atmos) "hMY" = ( /obj/structure/cable{ icon_state = "1-4" @@ -16384,16 +17984,22 @@ /area/medical/genetics) "hNe" = ( /obj/machinery/telecomms/processor/preset_two, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "hNJ" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/components/binary/pump{ +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "N2 to Airmix"; dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/plasteel, /area/engineering/atmos) "hNL" = ( @@ -16404,6 +18010,23 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/department/electrical) +"hNR" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "hOj" = ( /obj/machinery/door/firedoor/border_only{ name = "south facing firelock" @@ -16414,19 +18037,24 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "hOm" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "MedbayFoyer"; + name = "Medbay"; + req_access_txt = "5"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"hOp" = ( +/obj/structure/sign/warning/gato/docking, +/turf/closed/wall/r_wall, +/area/hallway/secondary/exit/departure_lounge) "hOt" = ( /obj/structure/table/wood, /obj/item/toy/plush/nukeplushie, @@ -16437,13 +18065,6 @@ icon_state = "wood-broken4" }, /area/maintenance/bar) -"hOy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/engineering/main) "hOD" = ( /obj/effect/turf_decal/bot_white, /obj/structure/window/reinforced{ @@ -16488,6 +18109,7 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "hPp" = ( +/obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "hPw" = ( @@ -16508,6 +18130,12 @@ }, /turf/open/floor/plasteel/freezer, /area/medical/surgery) +"hPC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, +/area/hallway/primary/port) "hPZ" = ( /obj/machinery/space_heater, /obj/structure/window/reinforced{ @@ -16516,9 +18144,18 @@ /turf/open/floor/pod/dark, /area/medical/paramedic) "hQb" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 10 + }, +/obj/machinery/meter/atmos/atmos_waste_loop, /turf/open/floor/plasteel, /area/engineering/atmos) +"hQp" = ( +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/turf/open/floor/carpet/green, +/area/service/library) "hQK" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -16581,9 +18218,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/wood, /area/commons/dorms) +"hRN" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/r_wall, +/area/maintenance/department/electrical) "hRQ" = ( /obj/effect/landmark/blobstart, /obj/item/pickaxe, @@ -16592,6 +18233,15 @@ }, /turf/open/floor/plating, /area/maintenance/department/science) +"hRR" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "hSq" = ( /obj/structure/cable{ icon_state = "1-2" @@ -16603,30 +18253,25 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "hSC" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{ dir = 8 }, -/obj/machinery/air_sensor/atmos/nitrous_tank{ +/obj/machinery/air_sensor/atmos/oxygen_tank{ pixel_y = -25 }, -/turf/open/floor/engine/n2o, +/turf/open/floor/engine/o2, /area/engineering/atmos) "hSJ" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/obj/structure/chair/stool, /turf/open/floor/plasteel, -/area/engineering/break_room) -"hSV" = ( -/turf/closed/wall/r_wall, -/area/engineering/atmospherics_engine) +/area/engineering/lobby) "hSY" = ( /obj/structure/cable{ icon_state = "1-8" @@ -16658,7 +18303,11 @@ /area/service/hydroponics) "hTS" = ( /obj/structure/table/wood, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/dark, /area/hallway/primary/aft) "hTU" = ( /obj/structure/cable{ @@ -16702,17 +18351,8 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "hUm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/closet/secure_closet/engineering_personal, /turf/open/floor/plasteel, -/area/engineering/break_room) -"hUp" = ( -/obj/structure/sign/directions/engineering{ - pixel_x = 32; - pixel_y = -40 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) +/area/engineering/lobby) "hUw" = ( /obj/structure/table, /obj/item/storage/firstaid/regular{ @@ -16769,31 +18409,30 @@ name = "south facing firelock" }, /obj/structure/disposalpipe/segment, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/security/courtroom) "hVp" = ( /obj/machinery/door/airlock/atmos{ + dir = 4; name = "Atmospherics"; req_access_txt = "24" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" - }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel, -/area/engineering/secure_construction) +/area/engineering/atmos) "hVy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/door/airlock/atmos{ name = "Atmospherics"; - req_access_txt = "24" + req_access_txt = "24"; + dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/engineering/atmos) "hVA" = ( @@ -16808,12 +18447,14 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "hVT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/sign/warning/nosmoking{ - pixel_x = -32 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/maintenance/aft/secondary) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/white/line, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "hVV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -16943,6 +18584,17 @@ /obj/machinery/recharge_station, /turf/open/floor/plasteel, /area/maintenance/department/electrical) +"hXS" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1; + icon_state = "steel_decals3" + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 10; + icon_state = "steel_decals3" + }, +/turf/open/floor/plasteel, +/area/cargo/storage) "hXZ" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, @@ -16951,10 +18603,14 @@ /turf/closed/wall, /area/mine/eva) "hYd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/structure/reagent_dispensers/foamtank, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, /turf/open/floor/plasteel, -/area/engineering/atmos) +/area/commons/storage/primary) "hYh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -16963,7 +18619,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/hallway/primary/central) "hYN" = ( /obj/machinery/space_heater, @@ -16977,7 +18633,17 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_decals10" + }, +/obj/effect/turf_decal/loading_area{ + dir = 9; + icon_state = "steel_decals10" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, /turf/open/floor/plasteel, /area/maintenance/aft) "hZL" = ( @@ -16987,11 +18653,13 @@ pixel_y = 32 }, /obj/item/multitool, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) "hZN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, /area/hallway/primary/port) "iad" = ( /obj/structure/cable{ @@ -17008,7 +18676,6 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "iaC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/landmark/start/clown, /turf/open/floor/wood, /area/service/theater) @@ -17082,10 +18749,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -17095,19 +18758,23 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/fitness) "idC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/turf_decal/tile/yellow, /turf/open/floor/plasteel, /area/engineering/main) "ied" = ( @@ -17118,11 +18785,22 @@ /turf/open/floor/plasteel, /area/science/storage) "ier" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/obj/structure/table, +/obj/structure/bedsheetbin/color, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/closet/wardrobe/white, -/turf/open/floor/wood, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/white, /area/commons/dorms) "ieJ" = ( /obj/structure/window/reinforced{ @@ -17131,20 +18809,50 @@ /obj/machinery/computer/med_data{ dir = 8 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel, /area/medical/medbay/central) "ifb" = ( /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) +"ifm" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"ifp" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/r_wall, +/area/security/checkpoint/supply) "ifW" = ( /obj/machinery/vending/kink, /turf/open/floor/plasteel, @@ -17171,27 +18879,35 @@ }, /turf/open/floor/plasteel, /area/command/teleporter) -"igp" = ( -/obj/effect/turf_decal/tile/yellow{ +"igg" = ( +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/machinery/camera{ - c_tag = "Engineering East" +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/command/storage/eva) +"igp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "igu" = ( /turf/closed/wall/r_wall, /area/maintenance/solars/starboard/aft) +"igB" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 9 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "igR" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -17240,35 +18956,17 @@ }, /area/hallway/secondary/entry) "iib" = ( -/obj/machinery/door/airlock/research{ - name = "Toxins Storage"; - req_access_txt = "8" - }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/door/airlock/research{ + name = "Toxins Storage"; + req_access_txt = "8"; + dir = 4 + }, /turf/open/floor/plasteel, /area/science/storage) -"iiv" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/door/window/northright{ - name = "Engineering Production"; - req_access_txt = "10" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/main) "iiw" = ( /obj/machinery/light{ dir = 1 @@ -17285,6 +18983,7 @@ /obj/machinery/camera{ c_tag = "Outer Medbay Lobby" }, +/obj/item/kirbyplants/photosynthetic, /turf/open/floor/plasteel, /area/hallway/primary/port) "iiD" = ( @@ -17309,16 +19008,45 @@ }, /turf/open/floor/plasteel/freezer, /area/commons/dorms) -"iiY" = ( -/obj/structure/cable{ - icon_state = "0-2" +"iiN" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "CO2 to Pure" }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/plasteel, -/area/engineering/main) +/area/engineering/atmos) +"iiY" = ( +/obj/structure/table, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/machinery/power/apc/highcap/ten_k{ + pixel_y = -24 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/stack/sheet/plasteel{ + amount = 10; + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/stack/sheet/rglass{ + amount = 30; + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/stack/rods/fifty, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "ijv" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -17340,21 +19068,10 @@ /turf/open/floor/plating, /area/icemoon/surface/outdoors) "ikK" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/engine, -/area/engineering/secure_construction) -"ikV" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/simple/green/visible, +/turf/open/floor/plating, +/area/engineering/atmos) "ikX" = ( /turf/closed/wall/r_wall, /area/command/heads_quarters/cmo) @@ -17371,11 +19088,16 @@ /turf/open/floor/wood, /area/command/heads_quarters/hop) "ilI" = ( -/obj/machinery/atmospherics/components/unary/relief_valve/atmos/atmos_waste{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/engineering/atmos) +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "ims" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -17394,8 +19116,18 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "imw" = ( -/turf/closed/wall/r_wall, -/area/engineering/secure_construction) +/obj/machinery/door/airlock/public/glass{ + name = "Primary Tool Storage"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "imz" = ( /obj/structure/cable{ icon_state = "4-8" @@ -17436,6 +19168,18 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"ind" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "ing" = ( /obj/machinery/airalarm{ dir = 8; @@ -17445,7 +19189,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "inq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -17551,11 +19295,21 @@ name = "Station Intercom (General)"; pixel_y = 24 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/science/server) "ipn" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output, -/turf/open/floor/engine/air, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/turf/open/floor/plating, /area/engineering/atmos) "ipF" = ( /obj/structure/cable{ @@ -17574,18 +19328,39 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "ipS" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/carpet, -/area/service/bar) -"iqi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"ipU" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"iqw" = ( /turf/closed/wall/r_wall, -/area/engineering/storage) +/area/engineering/engine_smes) +"iqB" = ( +/obj/structure/sign/warning/fire, +/turf/closed/wall/r_wall, +/area/engineering/supermatter) "iqP" = ( /turf/closed/wall, /area/maintenance/starboard) @@ -17594,7 +19369,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/security/detectives_office) "irm" = ( /obj/structure/cable{ @@ -17605,10 +19380,13 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) "irn" = ( /obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "irE" = ( @@ -17635,23 +19413,17 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "irR" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/sign/poster/contraband/clown{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, /turf/open/floor/wood, /area/service/theater) -"isc" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/light, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/open/floor/engine, -/area/engineering/main) "isd" = ( /obj/machinery/light{ dir = 1 @@ -17695,7 +19467,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/white/side, /area/science/robotics/lab) "itj" = ( /obj/machinery/light/small{ @@ -17707,11 +19484,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/medical/glass{ - id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -17721,6 +19493,12 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "MedbayFoyer"; + name = "Medbay"; + req_access_txt = "5"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/paramedic) "itB" = ( @@ -17731,6 +19509,7 @@ pixel_y = 6 }, /obj/item/stack/sheet/metal/fifty, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "iuC" = ( @@ -17745,7 +19524,7 @@ dir = 4 }, /obj/effect/landmark/start/head_of_security, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/command/heads_quarters/hos) "ivL" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -17776,16 +19555,18 @@ "ivT" = ( /obj/effect/turf_decal/bot, /obj/effect/landmark/start/cargo_technician, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/turf/open/floor/plasteel{ + icon_state = "floor_whole" + }, /area/cargo/storage) "ivX" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, /area/maintenance/department/science) "iwn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" @@ -17823,6 +19604,7 @@ dir = 1 }, /obj/structure/closet/crate/trashcart, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel, /area/cargo/sorting) "iwA" = ( @@ -17863,15 +19645,10 @@ /turf/open/floor/wood, /area/command/meeting_room) "ixo" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/maintenance/department/bridge) +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes/white/line, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "ixt" = ( /obj/machinery/camera{ c_tag = "Escape Arm Northeast"; @@ -17931,7 +19708,9 @@ dir = 8; pixel_y = 28 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/stairs/left{ + dir = 8 + }, /area/hallway/primary/port) "iye" = ( /turf/closed/wall, @@ -17952,14 +19731,8 @@ dir = 6 }, /obj/effect/landmark/event_spawn, -/turf/open/floor/circuit, -/area/ai_monitored/turret_protected/ai_upload) -"iyy" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, /turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) +/area/ai_monitored/turret_protected/ai_upload) "iyL" = ( /obj/effect/turf_decal/tile/green{ dir = 4 @@ -18030,18 +19803,30 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) -"iAz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +"iAc" = ( +/obj/structure/cable{ + icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, +/turf/open/floor/plasteel, +/area/commons/storage/primary) +"iAz" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/structure/chair/comfy/beige{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/carpet, /area/commons/dorms) +"iBb" = ( +/obj/machinery/vending/games, +/turf/open/floor/wood, +/area/service/library) "iBS" = ( /obj/machinery/light, /obj/machinery/camera{ @@ -18058,6 +19843,21 @@ /obj/machinery/computer/shuttle/snow_taxi, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"iCi" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "iCQ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -18077,13 +19877,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "iCR" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ + dir = 6 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "iCV" = ( /turf/closed/wall/r_wall, /area/science/robotics/lab) @@ -18094,7 +19895,7 @@ pixel_x = -3; pixel_y = 2 }, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) "iDh" = ( /obj/effect/turf_decal/stripes/line{ @@ -18183,11 +19984,10 @@ /turf/open/floor/plasteel/white, /area/science/lab) "iEI" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "iEL" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -18206,10 +20006,31 @@ /obj/item/stack/sheet/plasteel{ amount = 10 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel/dark, /area/science/robotics/lab) "iGa" = ( /obj/effect/turf_decal/arrows/red, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "iGr" = ( @@ -18265,6 +20086,12 @@ /obj/machinery/airalarm{ pixel_y = 23 }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) "iIq" = ( @@ -18307,7 +20134,7 @@ name = "Toxins Lab APC"; pixel_y = 26 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "iIS" = ( /obj/machinery/door/airlock{ @@ -18323,9 +20150,10 @@ /turf/open/floor/plasteel/freezer, /area/commons/dorms) "iIX" = ( -/obj/effect/turf_decal/vg_decals/atmos/mix, -/turf/open/floor/engine/airless, -/area/engineering/atmos) +/turf/closed/wall/r_wall, +/area/engineering/storage{ + name = "Secure Storage" + }) "iJc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/machinery/camera{ @@ -18333,7 +20161,11 @@ network = list("ss13","medbay"); pixel_x = 22 }, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes/white/line{ + dir = 2 + }, +/turf/open/floor/plasteel/white, /area/medical/surgery) "iJx" = ( /obj/structure/sign/directions/evac{ @@ -18348,6 +20180,26 @@ pixel_x = -32; pixel_y = -40 }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "iJF" = ( @@ -18395,7 +20247,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/carpet, +/turf/open/floor/plasteel, /area/hallway/primary/port) "iKn" = ( /obj/structure/cable{ @@ -18416,9 +20268,14 @@ /turf/open/floor/plasteel, /area/maintenance/department/bridge) "iKR" = ( -/obj/machinery/holopad, -/turf/open/floor/carpet, -/area/hallway/secondary/exit/departure_lounge) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/sign/poster/gato/lovegato{ + pixel_x = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "iLj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/effect/turf_decal/tile/purple{ @@ -18442,10 +20299,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plasteel/dark/side{ - dir = 4; - icon_state = "dark" - }, +/turf/open/floor/plasteel/dark, /area/hallway/primary/central) "iMS" = ( /obj/effect/turf_decal/stripes/line{ @@ -18459,11 +20313,13 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "iNd" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/engine, -/area/engineering/atmospherics_engine) +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "iNi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/airlock/command{ @@ -18487,20 +20343,29 @@ /area/tcommsat/computer) "iNE" = ( /obj/machinery/holopad, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, /area/science/robotics/lab) +"iNI" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/turf/open/floor/plasteel/freezer, +/area/commons/dorms) "iNZ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, /area/command/heads_quarters/ce) "iOr" = ( @@ -18514,6 +20379,19 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/hallway/secondary/exit/departure_lounge) +"iOH" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/science/robotics/lab) +"iOM" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall, +/area/commons/dorms) "iOS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -18521,9 +20399,9 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "iPk" = ( -/obj/machinery/light, -/turf/open/floor/plating, -/area/maintenance/aft/secondary) +/obj/structure/sign/warning/gato/docking, +/turf/closed/wall, +/area/maintenance/central) "iPo" = ( /obj/structure/cable{ icon_state = "0-2" @@ -18565,7 +20443,7 @@ dir = 4 }, /obj/item/pen, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/command/heads_quarters/hos) "iPR" = ( /obj/structure/cable{ @@ -18577,6 +20455,21 @@ }, /turf/open/floor/carpet, /area/hallway/secondary/exit/departure_lounge) +"iPS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/turf/open/floor/plasteel/freezer, +/area/commons/dorms) +"iPW" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/engineering/supermatter) "iQl" = ( /obj/structure/table, /obj/item/storage/toolbox/electrical{ @@ -18585,14 +20478,19 @@ }, /turf/open/floor/plating, /area/construction/storage_wing) +"iRd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, +/turf/open/floor/plasteel/freezer, +/area/commons/dorms) "iRm" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/medical{ - name = "Patient Room"; - req_access_txt = "5" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -18602,7 +20500,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plasteel/white, +/obj/machinery/door/airlock/medical{ + name = "Patient Room"; + req_access_txt = "5"; + dir = 4 + }, +/turf/open/floor/plasteel, /area/medical/medbay/central) "iRs" = ( /obj/item/radio/intercom{ @@ -18615,6 +20518,12 @@ /turf/open/floor/carpet/red, /area/commons/dorms) "iRy" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/carpet/royalblue, /area/commons/dorms) "iRM" = ( @@ -18658,8 +20567,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hallway/primary/fore) "iSF" = ( @@ -18700,9 +20607,8 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 }, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -18711,6 +20617,10 @@ /obj/structure/disposalpipe/junction/yjunction{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "iSX" = ( @@ -18756,11 +20666,12 @@ /turf/open/floor/plating, /area/maintenance/department/bridge) "iUx" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/commons/fitness) "iUO" = ( @@ -18789,7 +20700,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "iVA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "iVF" = ( @@ -18804,22 +20719,23 @@ /turf/open/floor/plasteel, /area/science/mixing) "iWN" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/engineering/main) "iWU" = ( @@ -18829,13 +20745,16 @@ /obj/machinery/airalarm{ pixel_y = 25 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "iWV" = ( @@ -18851,7 +20770,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) "iXB" = ( /obj/machinery/chem_dispenser, @@ -18877,7 +20796,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) "iYR" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -18898,7 +20817,7 @@ /obj/structure/chair{ dir = 8 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/security/courtroom) "iZm" = ( /obj/machinery/atmospherics/components/unary/tank/air{ @@ -18919,6 +20838,12 @@ "iZI" = ( /obj/structure/table/wood, /obj/item/ashtray, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/carpet, /area/service/bar) "jad" = ( @@ -18928,13 +20853,9 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/science/xenobiology) "jaG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/plasteel/white, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/turf/open/floor/wood, /area/commons/dorms) "jaJ" = ( /obj/effect/turf_decal/tile/red{ @@ -18962,21 +20883,6 @@ dir = 8 }, /area/science/mixing) -"jbu" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "jbA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -18995,7 +20901,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/disposal) @@ -19008,6 +20914,17 @@ }, /turf/open/floor/plasteel/white, /area/commons/dorms) +"jcJ" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/turf/open/floor/catwalk_floor, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "jcM" = ( /obj/structure/chair/sofa/right{ dir = 4 @@ -19036,25 +20953,16 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "jeb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 }, -/obj/structure/chair/stool/bar, -/turf/open/floor/wood, -/area/service/bar) -"jez" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 10 - }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/engineering/atmospherics_engine) +/turf/open/floor/plating, +/area/engineering/atmos) "jeO" = ( /obj/structure/chair{ dir = 1 @@ -19081,12 +20989,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/medical/virology) -"jfg" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plating, -/area/engineering/storage) "jfu" = ( /obj/structure/cable{ icon_state = "0-2" @@ -19097,17 +20999,40 @@ name = "Aft Hall APC"; pixel_y = 23 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/plasteel, /area/hallway/primary/aft) "jfJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/cargo/qm) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/service/hydroponics) "jfP" = ( /turf/open/floor/plating/asteroid/snow/icemoon, /area/maintenance/aft/secondary) +"jfY" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "jgi" = ( /obj/machinery/blackbox_recorder, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/end{ + dir = 8 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "jgG" = ( @@ -19139,9 +21064,6 @@ /turf/open/floor/plating, /area/security/warden) "jhx" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -19149,8 +21071,17 @@ codes_txt = "patrol;next_patrol=HOP2"; location = "Stbd" }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/hallway/primary/aft) "jhM" = ( /obj/structure/cable{ icon_state = "4-8" @@ -19160,20 +21091,42 @@ }, /obj/machinery/door/airlock/atmos/abandoned{ name = "Atmospherics Maintenance"; - req_access_txt = "12;24" + req_access_txt = "12;24"; + dir = 4 }, /turf/open/floor/plasteel, /area/maintenance/department/electrical) -"jiu" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ +"jig" = ( +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/landmark/start/station_engineer, -/turf/open/floor/plasteel/dark, -/area/engineering/main) +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/chair, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) +"jih" = ( +/obj/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_y = 29 + }, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, +/turf/open/floor/carpet/orange, +/area/commons/dorms) +"jiu" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/plasteel, +/area/engineering/atmos) "jix" = ( /obj/machinery/door/airlock/engineering{ name = "Starboard Quarter Solar Access"; @@ -19205,20 +21158,10 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "jiT" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4; - name = "east facing firelock" - }, -/obj/structure/sign/warning/biohazard, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/stripes/white/line, /turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/area/hallway/primary/central) "jiX" = ( /obj/structure/cable{ icon_state = "2-4" @@ -19260,23 +21203,6 @@ /obj/machinery/rnd/production/techfab/department/security, /turf/open/floor/plasteel/dark, /area/security/office) -"jjE" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/main) -"jkj" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "jkl" = ( /obj/structure/bodycontainer/morgue, /obj/effect/turf_decal/tile/blue{ @@ -19318,7 +21244,15 @@ dir = 8; network = list("ss13","medbay") }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel{ + dir = 8; + icon_state = "floor_whole" + }, /area/medical/surgery) "jkv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ @@ -19376,9 +21310,6 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "jld" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/closet/wardrobe/grey, /obj/machinery/camera{ c_tag = "Dorms West" @@ -19386,26 +21317,14 @@ /turf/open/floor/wood, /area/commons/dorms) "jlo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, -/obj/structure/window/reinforced, -/obj/structure/table/reinforced, -/obj/machinery/button/door{ - id = "xenobioexspec"; - name = "Containment Blast Doors"; - pixel_y = 4; - req_access_txt = "55" - }, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/central) "jlC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, @@ -19419,15 +21338,21 @@ }, /turf/open/floor/plasteel, /area/science/misc_lab) -"jmo" = ( -/obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" +"jlY" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"jmo" = ( +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/fans/tiny, /turf/open/floor/plating, -/area/engineering/secure_construction) +/area/commons/storage/primary) "jmK" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -19459,11 +21384,8 @@ /obj/item/pickaxe/drill, /obj/item/pickaxe/drill, /obj/item/pickaxe/drill, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) @@ -19487,8 +21409,20 @@ /obj/structure/disposalpipe/junction/flip{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/hallway/primary/central) +"jnO" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "jnR" = ( /obj/structure/fluff/railing/corner{ dir = 8 @@ -19496,7 +21430,17 @@ /turf/open/openspace/icemoon, /area/icemoon/surface/outdoors) "jnT" = ( -/turf/open/floor/carpet, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/rack/shelf, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/shoes/winterboots, +/obj/item/clothing/shoes/winterboots, +/obj/item/clothing/shoes/winterboots, +/turf/open/floor/plasteel, /area/hallway/primary/port) "jnW" = ( /obj/machinery/airalarm{ @@ -19519,11 +21463,12 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "jof" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 4 }, -/turf/closed/wall, -/area/service/bar) +/obj/machinery/meter, +/turf/open/floor/plasteel, +/area/engineering/atmos) "jon" = ( /obj/structure/window/reinforced{ dir = 4 @@ -19535,6 +21480,11 @@ /obj/structure/chair/sofa{ dir = 8 }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/wood, /area/hallway/primary/port) "jow" = ( @@ -19549,14 +21499,14 @@ /obj/machinery/power/port_gen/pacman{ anchored = 1 }, -/obj/structure/cable, /obj/structure/sign/warning/electricshock{ pixel_x = 32 }, /turf/open/floor/plating, /area/mine/lobby) "joR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/wood, /area/service/theater) "joS" = ( @@ -19564,23 +21514,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/mine/eva) -"jpl" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "jpn" = ( -/obj/effect/turf_decal/stripes, -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{ - dir = 4 - }, -/turf/open/floor/engine, -/area/maintenance/aft/secondary) +/obj/machinery/computer/arcade/orion_trail, +/turf/open/floor/carpet/arcade, +/area/service/library) "jpp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -19609,20 +21546,25 @@ /turf/open/floor/plasteel/dark, /area/science/server) "jpW" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/tile/brown{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/power/smes/engineering, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/commons/storage/primary) +"jqh" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Service Door"; + req_one_access_txt = "35;28"; + dir = 4 + }, +/turf/open/floor/plasteel, +/area/service/hydroponics) "jqk" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -19638,19 +21580,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/paramedic) -"jqy" = ( -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "jqH" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/firedoor/border_only{ @@ -19667,28 +21596,54 @@ /turf/open/floor/plating, /area/command/heads_quarters/hop) "jqI" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ +/obj/structure/closet/crate/solarpanel_defence, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/obj/machinery/door/window{ dir = 1 }, -/turf/closed/wall/r_wall, -/area/engineering/atmospherics_engine) +/turf/open/floor/plasteel/dark, +/area/engineering/main) +"jrd" = ( +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green, +/turf/open/floor/plasteel, +/area/service/hydroponics) +"jrp" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/holopad, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "jru" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, /area/hallway/primary/port) "jrw" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/courtroom) "jrz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/light{ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "jrB" = ( @@ -19717,14 +21672,11 @@ /obj/machinery/camera{ c_tag = "Conference Room" }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/meeting_room) "jrU" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 5 - }, -/obj/machinery/computer/atmos_control/tank/toxin_tank{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 6 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -19759,21 +21711,11 @@ name = "Station Intercom (General)"; pixel_x = 30 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-2" }, /turf/open/floor/wood, /area/commons/dorms) -"jti" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer3{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/atmospherics_engine) "jtt" = ( /obj/structure/table, /obj/item/integrated_electronics/wirer, @@ -19789,7 +21731,8 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plating, /area/maintenance/department/bridge) "jtY" = ( @@ -19815,6 +21758,21 @@ }, /turf/open/floor/plasteel/chapel, /area/service/chapel/main) +"juW" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/turf/open/floor/catwalk_floor, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "juY" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -30 @@ -19825,14 +21783,9 @@ /turf/closed/wall/r_wall, /area/hallway/primary/fore) "jvj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/hallway/primary/aft) "jvq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/table/wood, @@ -19845,7 +21798,7 @@ pixel_x = -7; pixel_y = 1 }, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) "jvr" = ( /obj/machinery/atmospherics/components/trinary/mixer/airmix{ @@ -19861,17 +21814,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/carpet, /area/hallway/secondary/exit/departure_lounge) -"jwd" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer1, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/yellow/visible/layer3, -/obj/machinery/igniter{ - id = "Incinerator" - }, -/turf/open/floor/engine, -/area/engineering/atmospherics_engine) "jwR" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/closet/bombcloset{ @@ -19883,6 +21825,32 @@ /obj/item/cultivator, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"jxt" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/closet/firecloset, +/turf/open/floor/plasteel, +/area/engineering/main) +"jxy" = ( +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) +"jxG" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/wood/wood_large, +/area/security/courtroom) "jxP" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -19891,14 +21859,15 @@ /turf/open/floor/plating, /area/medical/virology) "jxQ" = ( -/turf/open/floor/plasteel/dark, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "jxY" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 +/obj/structure/bookcase/random, +/obj/machinery/light{ + dir = 8 }, -/turf/open/floor/engine, -/area/maintenance/aft/secondary) +/turf/open/floor/wood, +/area/service/library) "jye" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -19907,16 +21876,19 @@ /turf/open/floor/plating, /area/security/office) "jyf" = ( -/obj/machinery/atmospherics/components/binary/valve/digital/layer3{ - name = "scrubbers valve" +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/turf/open/floor/plating, -/area/engineering/atmospherics_engine) +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/power/port_gen/pacman, +/turf/open/floor/plasteel, +/area/engineering/main) "jyh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/hallway/primary/central) "jyo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -19961,7 +21933,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/hallway/primary/central) "jyO" = ( /obj/effect/turf_decal/tile/neutral{ @@ -19975,9 +21947,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "jyX" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Snow Airlock" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -19985,14 +21954,35 @@ dir = 4; name = "east facing firelock" }, +/obj/machinery/door/airlock/public/glass{ + name = "Snow Airlock"; + dir = 8 + }, /turf/open/floor/plating, /area/hallway/primary/aft) "jzp" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/engine, -/area/engineering/main) +/obj/machinery/door/airlock/engineering{ + name = "Engineering Break Room"; + id_tag = "engibreak" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "jzs" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 4 }, /obj/machinery/icecream_vat, @@ -20004,21 +21994,25 @@ /turf/open/floor/plasteel/grimy, /area/commons/fitness/recreation) "jzE" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room"; + req_access_txt = "11"; + dir = 8 + }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/button/door{ - id = "engsm"; - name = "Radiation Shutters Control"; - pixel_y = 25; - req_access_txt = "10" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 }, -/turf/open/floor/engine, -/area/engineering/main) +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "jzO" = ( /obj/machinery/camera{ c_tag = "Dorms Northeast"; @@ -20028,7 +22022,6 @@ dir = 8; pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-2" }, @@ -20069,13 +22062,18 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/light{ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"jAh" = ( +/obj/machinery/space_heater, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "jAv" = ( /obj/structure/cable{ icon_state = "4-8" @@ -20088,7 +22086,8 @@ }, /obj/machinery/door/airlock/maintenance{ name = "Mixing Lab Maintenance"; - req_access_txt = "47" + req_access_txt = "47"; + dir = 4 }, /turf/open/floor/plating, /area/science/mixing) @@ -20107,7 +22106,7 @@ dir = 1; network = list("ss13") }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/heads_quarters/hop) "jBi" = ( /obj/effect/turf_decal/tile/green{ @@ -20167,17 +22166,21 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/aft/secondary) +"jCe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/chair, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "jCO" = ( /obj/machinery/button/door{ id = "Bath2"; @@ -20200,26 +22203,11 @@ /turf/open/floor/plasteel/freezer, /area/commons/dorms) "jCY" = ( -/obj/effect/turf_decal/tile/yellow{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) -"jDD" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "jDQ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -20229,12 +22217,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/bridge) -"jDU" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "jEf" = ( /obj/structure/chair/comfy/brown{ dir = 8 @@ -20245,19 +22227,6 @@ /obj/structure/bookcase/random/adult, /turf/open/floor/wood, /area/service/library) -"jEi" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -35 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "jEp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -20270,16 +22239,29 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) -"jEJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 +"jEx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/table, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility{ + pixel_x = -8 + }, +/turf/open/floor/plasteel, +/area/engineering/main) +"jEJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) "jFh" = ( @@ -20343,7 +22325,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/door/airlock/public/glass{ name = "Snow Airlock" }, @@ -20353,6 +22335,7 @@ name = "north facing firelock" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "jGw" = ( @@ -20363,7 +22346,7 @@ /turf/open/floor/plasteel/white, /area/science/misc_lab) "jGB" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 8 }, /obj/effect/landmark/xeno_spawn, @@ -20380,7 +22363,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/door/firedoor/border_only{ name = "south facing firelock" }, @@ -20410,12 +22393,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/plasteel/dark, /area/mine/eva) -"jIi" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 5 - }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/engineering/atmospherics_engine) "jIl" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20428,15 +22405,23 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"jID" = ( +/obj/structure/chair/sofa/right/old{ + dir = 8 + }, +/obj/item/toy/figure/ian, +/turf/open/floor/carpet/green, +/area/service/library) "jIM" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/aft) "jIR" = ( @@ -20444,15 +22429,22 @@ dir = 4 }, /obj/machinery/vending/wardrobe/robo_wardrobe, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/dark, /area/science/robotics/lab) "jJf" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 8 }, /obj/structure/chair{ dir = 8 }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "jJk" = ( @@ -20489,10 +22481,6 @@ /turf/open/floor/wood, /area/command/heads_quarters/hop) "jKc" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Gen-Pop Access"; - req_access_txt = "2" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -20500,6 +22488,11 @@ dir = 4; name = "east facing firelock" }, +/obj/machinery/door/airlock/security/glass{ + name = "Gen-Pop Access"; + req_access_txt = "2"; + dir = 8 + }, /turf/open/floor/plasteel, /area/security/prison) "jKo" = ( @@ -20522,8 +22515,8 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "jKJ" = ( -/obj/machinery/atmospherics/miner/carbon_dioxide, -/turf/open/floor/engine/co2, +/obj/machinery/atmospherics/miner/n2o, +/turf/open/floor/engine/n2o, /area/engineering/atmos) "jLe" = ( /obj/structure/window/reinforced{ @@ -20550,18 +22543,19 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "jLA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/light, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) +/obj/structure/table, +/obj/machinery/microwave, +/turf/open/floor/plasteel/white, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "jLG" = ( /obj/structure/cable{ icon_state = "4-8" @@ -20578,11 +22572,14 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"jLJ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/wood, +/area/service/library) "jLK" = ( /obj/structure/sign/departments/restroom{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-2" }, @@ -20606,9 +22603,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/wood, /area/commons/dorms) "jMD" = ( @@ -20636,9 +22632,6 @@ dir = 4; name = "east facing firelock" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/commons/dorms) @@ -20653,7 +22646,8 @@ /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/stripes/line, /obj/machinery/stasis, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/box/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "jNh" = ( /turf/open/floor/plasteel, @@ -20698,31 +22692,42 @@ /turf/open/floor/wood, /area/service/library) "jOe" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/commons/fitness) +"jOi" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "holoprivacy"; + name = "Holodeck Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/hallway/primary/fore) +/area/commons/dorms) "jOC" = ( /obj/machinery/door/morgue{ name = "Private Study"; req_access_txt = "37" }, -/turf/open/floor/plating, +/turf/open/floor/wood, /area/service/library) "jOG" = ( +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "steel_decals" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "steel_decals" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/public/glass{ - name = "Snow Airlock" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" - }, /turf/open/floor/plasteel, -/area/commons/dorms) +/area/service/library) "jOZ" = ( /obj/structure/table/wood/poker, /turf/open/floor/carpet, @@ -20745,15 +22750,21 @@ /turf/open/floor/plasteel/dark, /area/cargo/miningdock) "jPx" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/closet/radiation, +/obj/structure/cable/yellow, +/obj/machinery/power/rad_collector/anchored, /turf/open/floor/engine, -/area/engineering/main) +/area/engineering/supermatter) +"jPH" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Mix to Distro" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "jPO" = ( /turf/closed/wall, /area/hallway/primary/aft) @@ -20791,31 +22802,17 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/effect/turf_decal/stripes/white/line, /turf/open/floor/plasteel, /area/hallway/primary/port) "jQK" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/engine, -/area/maintenance/aft/secondary) +/obj/structure/sign/warning/gato/docking, +/turf/closed/wall, +/area/icemoon/surface/outdoors) "jQL" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/command/glass{ - name = "Chief Medical Officer"; - req_access_txt = "40" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -20825,6 +22822,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/command/glass{ + name = "Chief Medical Officer"; + req_access_txt = "40"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/command/heads_quarters/cmo) "jRr" = ( @@ -20842,21 +22844,7 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) -"jRt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/engine, -/area/engineering/main) "jRw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/sign/departments/custodian{ pixel_y = -32 }, @@ -20869,8 +22857,20 @@ name = "north facing firelock" }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/maintenance/aft/secondary) +"jRD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, +/turf/open/floor/wood, +/area/commons/dorms) +"jRE" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/turf/open/floor/carpet/orange, +/area/commons/dorms) "jSm" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -20879,7 +22879,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/public/glass{ name = "Snow Airlock" }, @@ -20893,15 +22893,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) -"jSQ" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/main) "jTh" = ( /obj/structure/barricade/wooden{ max_integrity = 10; @@ -20922,14 +22913,20 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) -"jTE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +"jTq" = ( +/obj/machinery/atmospherics/pipe/manifold/purple/visible{ dir = 4 }, +/turf/open/floor/plasteel, +/area/engineering/atmos) +"jTE" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/vending/mealdor, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, /area/commons/fitness) "jTV" = ( @@ -20978,28 +22975,22 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "jUV" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/main) +/turf/closed/wall, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "jUZ" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, /area/maintenance/aft/secondary) -"jVd" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 +"jVc" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 }, -/obj/machinery/meter, -/turf/closed/wall/r_wall, -/area/engineering/supermatter) +/turf/open/floor/plating, +/area/engineering/storage/tech) "jVg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -21041,6 +23032,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "jVs" = ( @@ -21079,17 +23071,6 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/icemoon/surface/outdoors) -"jWV" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "jXc" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Office"; @@ -21116,13 +23097,22 @@ /turf/open/floor/engine, /area/maintenance/aft/secondary) "jXp" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, /obj/effect/landmark/start/chief_engineer, /obj/structure/chair/office/light{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/command/heads_quarters/ce) "jXv" = ( @@ -21141,26 +23131,11 @@ }, /turf/open/floor/plasteel/freezer, /area/service/kitchen) -"jXG" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/open/floor/engine, -/area/engineering/main) "jXZ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/cargo/storage) "jYc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -21172,7 +23147,7 @@ }, /obj/machinery/computer/station_alert, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/engineering/lobby) "jYi" = ( /obj/structure/closet/secure_closet/detective, /obj/machinery/firealarm{ @@ -21188,7 +23163,10 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/open/floor/plasteel/white, @@ -21200,12 +23178,9 @@ /obj/structure/table/wood, /obj/item/pen/red, /obj/item/book/manual/gato_spacelaw, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) "jYs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/book/manual/wiki/barman_recipes, /obj/item/reagent_containers/food/drinks/shaker, @@ -21233,34 +23208,35 @@ c_tag = "Auxiliary Bridge North"; dir = 1 }, +/obj/machinery/holopad, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) +"jYv" = ( +/obj/machinery/power/apc{ + areastring = "/area/storage/tech"; + dir = 2; + name = "Tech Storage APC"; + pixel_y = -24 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/light, +/turf/open/floor/plating, +/area/engineering/storage/tech) "jYx" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/structure/chair/sofa/old{ dir = 8 }, -/obj/machinery/washing_machine, -/turf/open/floor/plasteel/white, -/area/commons/dorms) -"jYE" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engineering/main) +/turf/open/floor/carpet/green, +/area/service/library) "jYH" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel, /area/maintenance/starboard) "jZd" = ( /obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "jZg" = ( @@ -21279,15 +23255,6 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) -"jZl" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engineering/atmospherics_engine) "jZG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/chair/pew/right{ @@ -21311,7 +23278,10 @@ /area/science/storage) "jZX" = ( /obj/machinery/vending/cigarette, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/hallway/primary/port) "kan" = ( /obj/structure/cable{ @@ -21321,10 +23291,14 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) "kaq" = ( /mob/living/simple_animal/bot/medbot, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/white, /area/medical/medbay/zone3) "kaz" = ( @@ -21362,15 +23336,13 @@ }, /turf/open/floor/plating, /area/maintenance/aft/secondary) -"kbT" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 +"kbm" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/engineering/main) +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "kcc" = ( /obj/machinery/light{ dir = 4 @@ -21378,7 +23350,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "kcd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 4 }, /turf/open/floor/plasteel, @@ -21415,17 +23387,8 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) -"kcW" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating, -/area/engineering/main) "kda" = ( /obj/item/kirbyplants/random, /turf/open/floor/plasteel, @@ -21462,15 +23425,34 @@ }, /turf/open/floor/wood, /area/maintenance/bar) -"kdW" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Security Lobby" +"kdO" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"kdW" = ( /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" }, -/turf/open/floor/wood, +/obj/machinery/door/airlock/public/glass{ + name = "Security Lobby"; + dir = 4 + }, +/turf/open/floor/wood/wood_large, /area/hallway/primary/central) "kef" = ( /obj/structure/table, @@ -21497,12 +23479,15 @@ /turf/open/floor/plasteel/white, /area/science/lab) "keB" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "keF" = ( /obj/structure/cable{ icon_state = "1-8" @@ -21557,12 +23542,18 @@ }, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) +"kfO" = ( +/turf/open/floor/plasteel/dark/side, +/area/hallway/primary/port) "kfQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 }, -/turf/closed/wall/r_wall, -/area/maintenance/starboard) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/turf/open/floor/carpet/gato, +/area/commons/dorms) "kgd" = ( /obj/structure/cable{ icon_state = "1-2" @@ -21573,8 +23564,16 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 8 + }, /area/hallway/primary/port) +"kgi" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/engineering/supermatter) "kgp" = ( /turf/open/floor/engine/airless, /area/science/mixing) @@ -21596,13 +23595,14 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "kgU" = ( -/obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/door/airlock/external{ + name = "External Airlock"; + req_access_txt = "13"; + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/central) "khk" = ( @@ -21619,19 +23619,15 @@ /area/mine/lobby) "khp" = ( /obj/structure/table, -/obj/item/hemostat, -/obj/item/circular_saw, -/obj/item/scalpel{ - pixel_y = 12 - }, -/obj/item/retractor, -/obj/item/cautery{ - pixel_x = 4 - }, /obj/item/radio/intercom{ pixel_y = 25 }, -/turf/open/floor/plasteel/freezer, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes/white/line{ + dir = 2 + }, +/turf/open/floor/plasteel/white, /area/medical/surgery) "khw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -21645,24 +23641,20 @@ }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/hos) +"kib" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/green/visible, +/turf/open/floor/plating, +/area/engineering/atmos) "kid" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, /turf/open/floor/plasteel, /area/science/robotics/mechbay) -"kiE" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engineering/main) "kiN" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -21676,20 +23668,24 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"kiT" = ( -/obj/effect/turf_decal/tile/yellow{ +"kiO" = ( +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/effect/turf_decal/tile/yellow, -/obj/structure/table, -/obj/item/storage/firstaid/regular, -/obj/item/storage/belt/utility, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -35 - }, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/science/robotics/lab) +"kiT" = ( +/obj/machinery/door/airlock/engineering{ + name = "Tech Storage"; + req_one_access_txt = "23;30" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/plating, +/area/engineering/storage/tech) "kiX" = ( /obj/structure/table/wood/poker, /turf/open/floor/wood, @@ -21720,8 +23716,21 @@ dir = 4; pixel_x = -22 }, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/stripes{ + dir = 1; + icon_state = "warningline" + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white, /area/medical/surgery) +"kjl" = ( +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/engineering/atmos) "kjm" = ( /obj/machinery/door/airlock/security{ name = "Detective's Office"; @@ -21739,8 +23748,12 @@ c_tag = "Aft Starboard Solar Control"; dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) +"kjr" = ( +/obj/structure/sign/warning/gato/docking, +/turf/closed/wall/r_wall, +/area/maintenance/aft/secondary) "kjF" = ( /obj/structure/cable{ icon_state = "0-4" @@ -21759,16 +23772,15 @@ /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "kkd" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/power/terminal{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) +/obj/structure/rack, +/obj/item/clothing/gloves/color/yellow, +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, +/obj/item/ai_module/reset, +/obj/item/aicard, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/plating, +/area/engineering/storage/tech) "kkr" = ( /obj/structure/table/wood, /obj/machinery/recharger{ @@ -21833,11 +23845,17 @@ }, /turf/open/floor/plating, /area/medical/medbay/central) +"kmI" = ( +/obj/structure/sign/warning/nosmoking, +/turf/closed/wall, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "kmN" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "knf" = ( @@ -21858,19 +23876,30 @@ icon_state = "1-2" }, /obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 5 }, /turf/open/floor/plasteel, /area/commons/fitness) +"knJ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/poddoor/preopen{ + id = "engsm"; + name = "radiation shutters" + }, +/obj/item/tank/internals/plasma/full, +/turf/open/floor/plating, +/area/engineering/supermatter) "kov" = ( /obj/machinery/door/firedoor/border_only{ dir = 8; name = "west facing firelock" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/commons/dorms) @@ -21880,12 +23909,9 @@ dir = 4 }, /obj/machinery/disposal/bin, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/service/chapel/office) "koH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Bar North" }, @@ -21893,7 +23919,10 @@ dir = 4 }, /obj/machinery/disposal/bin, -/turf/open/floor/carpet, +/obj/structure/sign/poster/gato/lovegato{ + pixel_y = 32 + }, +/turf/open/floor/wood, /area/service/bar) "koS" = ( /obj/structure/cable{ @@ -21942,7 +23971,7 @@ /obj/machinery/camera{ c_tag = "Law Office" }, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) "kre" = ( /obj/structure/cable{ @@ -21963,10 +23992,12 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, /obj/effect/landmark/start/shaft_miner, /turf/open/floor/plasteel/dark, /area/cargo/miningdock) @@ -21977,9 +24008,6 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/power/apc{ areastring = "/area/hallway/primary/fore"; dir = 1; @@ -21990,8 +24018,26 @@ dir = 4; pixel_y = 40 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"kse" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/catwalk_floor, +/area/maintenance/central) "ksh" = ( /obj/structure/table, /obj/item/stamp/rd{ @@ -22013,6 +24059,9 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) "ksm" = ( @@ -22035,14 +24084,6 @@ }, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) -"ksE" = ( -/obj/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer1, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 5 - }, -/turf/open/floor/engine, -/area/engineering/atmospherics_engine) "ksL" = ( /obj/machinery/light{ dir = 4 @@ -22056,23 +24097,8 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "ktc" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/plasteel, -/area/commons/storage/primary) -"ktf" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/components/trinary/filter/critical{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/engine, /area/engineering/main) "ktg" = ( /obj/structure/cable{ @@ -22138,6 +24164,9 @@ }, /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "ktX" = ( @@ -22189,6 +24218,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/wood, /area/hallway/primary/port) "kuY" = ( @@ -22271,17 +24304,11 @@ /area/security/prison) "kxn" = ( /obj/machinery/libraryscanner, -/turf/open/floor/wood, +/obj/structure/sign/poster/gato/blessthisspess{ + pixel_x = -32 + }, +/turf/open/floor/carpet/green, /area/service/library) -"kxw" = ( -/obj/structure/sink{ - pixel_y = 28 - }, -/obj/structure/mirror{ - pixel_x = -24 - }, -/turf/open/floor/plasteel/freezer, -/area/mine/lobby) "kxA" = ( /obj/structure/cable{ icon_state = "2-4" @@ -22301,6 +24328,14 @@ /obj/structure/bookcase/random, /turf/open/floor/wood, /area/commons/dorms) +"kxD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/carpet/orange, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "kxE" = ( /obj/structure/cable{ icon_state = "1-2" @@ -22309,7 +24344,7 @@ /turf/open/floor/plasteel, /area/commons/fitness) "kye" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 8 }, /turf/open/floor/plasteel, @@ -22322,13 +24357,19 @@ c_tag = "AI Chamber - Fore"; network = list("aicore") }, -/turf/open/floor/circuit/off, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "kyV" = ( /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) "kzg" = ( -/obj/machinery/portable_atmospherics/canister/toxins, +/obj/machinery/power/supermatter_crystal/shard, +/obj/structure/closet/crate/secure/engineering{ + name = "Supermatter Shard Crate" + }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plating, /area/engineering/storage) "kzK" = ( @@ -22339,9 +24380,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/turf/open/floor/wood, +/area/service/library) "kAb" = ( /mob/living/simple_animal/bot/secbot{ arrest_type = 1; @@ -22395,7 +24435,8 @@ dir = 4; pixel_x = 5 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "kAz" = ( /turf/closed/wall, @@ -22420,6 +24461,26 @@ pixel_x = -27 }, /obj/machinery/vending/mealdor, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/maintenance/aft) "kAO" = ( @@ -22431,20 +24492,18 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "kAW" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/airlock/atmos{ name = "Atmospherics"; req_access_txt = "24" }, -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/engineering/lobby) "kBa" = ( /obj/structure/cable{ icon_state = "4-8" @@ -22526,7 +24585,9 @@ "kDc" = ( /obj/effect/turf_decal/bot, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + icon_state = "floor_whole" + }, /area/cargo/storage) "kDe" = ( /obj/structure/cable{ @@ -22552,8 +24613,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/service/chapel/office) +"kDi" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "kDk" = ( /obj/item/target, /obj/structure/window/reinforced, @@ -22563,11 +24628,29 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "kDy" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"kDA" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 + dir = 4 + }, +/obj/machinery/light{ + dir = 1 }, /turf/open/floor/plasteel, -/area/engineering/atmos) +/area/maintenance/aft) "kDK" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor/border_only{ @@ -22579,6 +24662,19 @@ }, /turf/open/floor/plasteel/grimy, /area/service/bar) +"kEg" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/turf/open/floor/plasteel, +/area/engineering/lobby) "kEh" = ( /obj/structure/cable{ icon_state = "2-4" @@ -22590,8 +24686,10 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "kEp" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" }, /turf/open/floor/plasteel, /area/cargo/storage) @@ -22627,21 +24725,6 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/science/mixing) -"kFr" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "kFx" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -22654,6 +24737,15 @@ }, /turf/open/floor/wood, /area/hallway/secondary/exit/departure_lounge) +"kFH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "kFS" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -22677,10 +24769,11 @@ /turf/open/floor/wood, /area/security/courtroom) "kGB" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/turf/open/floor/plating, -/area/engineering/main) +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "kGK" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -22692,6 +24785,12 @@ dir = 4 }, /obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) "kGX" = ( @@ -22707,10 +24806,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/service/chapel/office) "kHG" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 1 }, /obj/structure/disposalpipe/segment, @@ -22726,29 +24825,38 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "kIE" = ( -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/obj/item/flashlight/lamp/green{ + on = 0 + }, +/obj/structure/table/wood/fancy/orange, +/turf/open/floor/carpet/orange, +/area/service/library) "kIU" = ( /turf/closed/wall/r_wall, /area/mine/maintenance) "kIX" = ( -/obj/structure/window/plasma/reinforced{ - dir = 1 +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 }, -/obj/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ - dir = 1 +/obj/structure/rack, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/door/poddoor{ - id = "tegheat"; - name = "TEG Heatshield" +/obj/item/clothing/suit/pirate, +/obj/item/clothing/head/pirate, +/obj/item/clothing/glasses/meson/eyepatch, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/engineering/atmospherics_engine) +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/command/heads_quarters/ce) "kJc" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -22783,7 +24891,6 @@ /obj/machinery/airalarm{ pixel_y = 28 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/machinery/light/small{ dir = 1 }, @@ -22838,11 +24945,13 @@ name = "north facing firelock" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plating, /area/service/janitor) "kLl" = ( /obj/machinery/suit_storage_unit/captain, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/heads_quarters/captain) "kLM" = ( /obj/structure/bodycontainer/morgue, @@ -22861,22 +24970,31 @@ }, /turf/open/floor/wood, /area/maintenance/bar) -"kMf" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ +"kMn" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/engineering/atmospherics_engine) +/obj/effect/turf_decal/stripes/white/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) +"kMO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/cargo/storage) "kMY" = ( /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/carpet, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/wood, /area/service/bar) "kNb" = ( /obj/machinery/shower{ @@ -22886,25 +25004,19 @@ /turf/open/floor/plasteel/freezer, /area/security/prison) "kNi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 5 - }, -/obj/structure/reagent_dispensers/foamtank, /obj/item/radio/intercom{ pixel_x = -25 }, +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "kNj" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/robotics/lab) -"kNm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engineering/main) "kNR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor, @@ -22944,10 +25056,29 @@ }, /turf/open/floor/plasteel, /area/mine/lobby) +"kOg" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/floor/plating, +/area/engineering/atmos) +"kOp" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel{ + dir = 4; + icon_state = "floor_trim" + }, +/area/hallway/primary/fore) "kOC" = ( /obj/structure/chair{ dir = 1 }, +/obj/effect/turf_decal/box/white, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "kOI" = ( @@ -22982,6 +25113,11 @@ }, /turf/open/floor/plating, /area/maintenance/aft/secondary) +"kPk" = ( +/obj/structure/table/wood, +/obj/item/paicard, +/turf/open/floor/carpet/green, +/area/service/library) "kPw" = ( /obj/structure/cable{ icon_state = "4-8" @@ -23002,15 +25138,12 @@ /obj/structure/cable{ icon_state = "0-4" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) "kQe" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "kQs" = ( @@ -23043,8 +25176,11 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/hallway/primary/aft) "kRk" = ( /obj/structure/cable, /turf/open/floor/plating/snowed/smoothed/icemoon, @@ -23072,9 +25208,6 @@ /turf/open/floor/plating, /area/maintenance/disposal) "kSo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -23091,13 +25224,6 @@ /obj/machinery/space_heater, /turf/open/floor/wood, /area/icemoon/surface/outdoors) -"kTo" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/turf/open/floor/engine, -/area/engineering/main) "kTv" = ( /obj/machinery/light, /turf/open/floor/plasteel/white, @@ -23136,6 +25262,19 @@ "kUi" = ( /turf/open/floor/plasteel, /area/maintenance/aft) +"kUn" = ( +/obj/effect/turf_decal/bot, +/obj/item/stack/marker_beacon{ + anchored = 1; + icon_state = "markerburgundy-on"; + light_color = "#FA644B"; + light_power = 3; + light_range = 2; + name = "landing marker"; + picked_color = "Burgundy" + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors) "kUo" = ( /obj/structure/cable{ icon_state = "4-8" @@ -23191,7 +25330,7 @@ department = "Law office"; pixel_x = 32 }, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) "kUP" = ( /obj/structure/cable{ @@ -23200,6 +25339,12 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) "kVc" = ( @@ -23211,18 +25356,24 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "kVC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/wood, /area/commons/dorms) "kVM" = ( -/obj/machinery/light/small{ +/obj/machinery/atmospherics/components/binary/pump, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/engine/airless, -/area/engineering/atmos) +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "kVY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -23239,12 +25390,18 @@ }, /turf/open/floor/plasteel, /area/maintenance/department/electrical) -"kWC" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 +"kWs" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1{ + dir = 4 }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) +"kWC" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, +/turf/open/floor/pod/dark, +/area/maintenance/starboard) "kXk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -23265,7 +25422,7 @@ name = "Solar Maintenance"; req_access_txt = "10; 13" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) "kXN" = ( /obj/structure/cable{ @@ -23285,25 +25442,22 @@ /obj/machinery/keycard_auth{ pixel_y = 40 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, /turf/open/floor/plasteel, /area/cargo/qm) "kXW" = ( -/obj/effect/turf_decal/stripes, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/engine, -/area/maintenance/aft/secondary) +/obj/machinery/computer/arcade/battle, +/turf/open/floor/carpet/arcade, +/area/service/library) "kYa" = ( -/obj/effect/decal/medium_gato, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) +/obj/structure/closet/secure_closet/personal/cabinet, +/turf/open/floor/carpet/orange, +/area/commons/dorms) "kYe" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 4 @@ -23335,6 +25489,14 @@ dir = 4 }, /area/hallway/secondary/exit/departure_lounge) +"kZs" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "kZB" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -23381,6 +25543,7 @@ /area/medical/paramedic) "lah" = ( /obj/machinery/bloodbankgen, +/obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "laQ" = ( @@ -23413,11 +25576,9 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "lbe" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/engine, -/area/engineering/secure_construction) +/obj/machinery/vending/tool, +/turf/open/floor/plating, +/area/engineering/storage/tech) "lbg" = ( /obj/machinery/light{ dir = 4 @@ -23437,18 +25598,26 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/bridge) "lco" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /obj/structure/disposalpipe/sorting/mail{ dir = 1; sortType = 2 }, /turf/open/floor/plasteel, /area/cargo/storage) +"lcs" = ( +/obj/machinery/atmospherics/components/trinary/filter{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "lcv" = ( /obj/structure/bodycontainer/morgue{ dir = 8 @@ -23466,6 +25635,19 @@ }, /turf/open/floor/plating, /area/mine/eva) +"lcX" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/turf_decal/box, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/structure/sign/poster/gato/safety2{ + pixel_x = 32 + }, +/turf/open/floor/plasteel, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "ldf" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -23480,6 +25662,10 @@ pixel_x = 24; pixel_y = -28 }, +/obj/effect/turf_decal/stripes{ + dir = 1; + icon_state = "warningline" + }, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "ldh" = ( @@ -23504,6 +25690,29 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"ldJ" = ( +/obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/item/multitool{ + pixel_x = 4 + }, +/obj/item/multitool{ + pixel_x = 1 + }, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "ldN" = ( /turf/open/floor/carpet, /area/service/bar) @@ -23514,7 +25723,7 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "ldZ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 1 }, /turf/open/floor/plasteel/cafeteria, @@ -23529,10 +25738,6 @@ /turf/closed/wall/r_wall, /area/ai_monitored/command/nuke_storage) "lfa" = ( -/obj/machinery/door/airlock/medical{ - name = "Operating Theatre"; - req_access_txt = "45" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -23542,19 +25747,37 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/machinery/door/airlock/medical{ + name = "Operating Theatre"; + req_access_txt = "45"; + dir = 4 + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/freezer, /area/medical/surgery) "lfC" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "lgj" = ( @@ -23655,7 +25878,10 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, /area/science/robotics/lab) "lhN" = ( /obj/machinery/airalarm{ @@ -23685,6 +25911,10 @@ /turf/open/floor/wood, /area/command/heads_quarters/hop) "lih" = ( +/obj/machinery/door/airlock{ + name = "Restroom"; + dir = 4 + }, /turf/open/floor/plasteel/freezer, /area/mine/lobby) "liO" = ( @@ -23693,17 +25923,44 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"liR" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, +/area/cargo/storage) "ljt" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/icemoon/surface/outdoors) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/commons/dorms) "ljw" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/telecomms/receiver/preset_right, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 9 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"ljy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/wood, +/area/hallway/primary/port) "ljz" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -23718,6 +25975,15 @@ }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/hos) +"ljH" = ( +/obj/structure/table, +/obj/item/analyzer, +/obj/item/healthanalyzer, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engineering/storage/tech) "ljL" = ( /obj/machinery/light{ dir = 4 @@ -23729,15 +25995,14 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "ljO" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, +/turf/open/floor/wood, +/area/service/bar) "ljX" = ( /obj/structure/cable{ icon_state = "1-2" @@ -23754,15 +26019,30 @@ /turf/open/floor/plating, /area/maintenance/bar) "lkj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/cargo/storage) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/turf/open/floor/wood, +/area/commons/dorms) "lku" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) +"lkA" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "lkJ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -23773,21 +26053,24 @@ /obj/structure/railing, /turf/open/floor/plasteel/dark, /area/cargo/miningdock) -"lkL" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/engine, -/area/engineering/secure_construction) "llg" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel, /area/security/warden) "lln" = ( -/obj/structure/closet/firecloset, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/aft/secondary) +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/item/kirbyplants/random, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) "llv" = ( /obj/machinery/button/door{ id = "trash"; @@ -23823,15 +26106,18 @@ dir = 4; network = list("ss13","medbay") }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel, /area/medical/medbay/central) "lmb" = ( /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -23879,14 +26165,11 @@ }, /obj/item/camera, /obj/item/taperecorder, -/turf/open/floor/wood, -/area/service/library) -"lnG" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 +/obj/structure/sign/poster/contraband/lamarr{ + pixel_x = -32 }, -/turf/closed/wall/r_wall, -/area/engineering/supermatter) +/turf/open/floor/carpet/green, +/area/service/library) "lnZ" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -23899,23 +26182,46 @@ /area/medical/medbay/central) "loc" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/department/bridge) "lof" = ( -/obj/structure/closet/emcloset, /obj/machinery/camera{ c_tag = "Dorms South"; dir = 4 }, -/turf/open/floor/wood, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/commons/dorms) +"loi" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/catwalk_floor, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "lon" = ( /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) +"lor" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/turf_decal/box, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/plasteel, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "loz" = ( /obj/structure/chair/sofa/corp/corner{ dir = 1 @@ -23929,6 +26235,12 @@ /obj/machinery/keycard_auth{ pixel_x = -24 }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) "loV" = ( @@ -23960,7 +26272,7 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/ai_monitored/security/armory) "loX" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/machinery/power/emitter, /turf/open/floor/plating, /area/engineering/storage) "loZ" = ( @@ -23990,14 +26302,17 @@ dir = 1; name = "north facing firelock" }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/service/chapel/office) "lpp" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 }, /turf/open/floor/wood, /area/commons/dorms) @@ -24049,6 +26364,13 @@ }, /turf/open/floor/plasteel/grimy, /area/service/bar) +"lqB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "lqV" = ( /obj/structure/cable{ icon_state = "0-8" @@ -24090,7 +26412,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_tiled, /area/command/heads_quarters/captain) "lrV" = ( /obj/structure/cable{ @@ -24117,18 +26439,12 @@ /turf/open/floor/plasteel, /area/science/lab) "lsl" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/machinery/light, +/obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, +/obj/structure/closet/secure_closet/engineering_personal, /turf/open/floor/plasteel, /area/engineering/main) "lsu" = ( @@ -24177,9 +26493,6 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "luh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/machinery/light_switch{ name = "Bar Lights"; @@ -24239,7 +26552,7 @@ }, /area/hallway/secondary/exit/departure_lounge) "lvc" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 1 }, /obj/effect/landmark/xeno_spawn, @@ -24273,12 +26586,19 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/command/heads_quarters/hos) -"lwH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +"lwt" = ( +/obj/machinery/telecomms/broadcaster/preset_right, +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 10 + }, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"lwH" = ( /obj/machinery/computer/security{ dir = 8 }, @@ -24308,7 +26628,13 @@ dir = 4 }, /obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "lxJ" = ( @@ -24342,11 +26668,16 @@ /turf/open/floor/plating, /area/science/xenobiology) "lyD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/structure/chair/sofa/corp{ + dir = 8 }, -/turf/open/floor/plating, -/area/engineering/storage) +/obj/structure/sign/poster/official/mothsupermatter{ + pixel_x = 32 + }, +/turf/open/floor/carpet/orange, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "lyO" = ( /obj/structure/cable{ icon_state = "1-2" @@ -24371,7 +26702,11 @@ /obj/item/healthanalyzer, /obj/item/healthanalyzer, /obj/item/healthanalyzer, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/science/robotics/lab) "lyP" = ( /obj/structure/lattice/catwalk, @@ -24384,6 +26719,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/engine, /area/science/xenobiology) +"lzs" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, +/turf/open/floor/plating, +/area/engineering/storage/tech) "lzz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -24399,12 +26743,6 @@ /turf/open/floor/plasteel, /area/security/checkpoint/medical) "lzT" = ( -/obj/machinery/door/airlock/external{ - glass = 1; - name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -24414,7 +26752,15 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/plasteel/dark, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining External Airlock"; + opacity = 0; + req_access_txt = "54"; + dir = 4 + }, +/turf/open/floor/plating, /area/mine/eva) "lzW" = ( /obj/structure/window/reinforced{ @@ -24427,11 +26773,16 @@ /obj/structure/chair/sofa/right{ dir = 4 }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/wood, /area/hallway/primary/port) "lAc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 }, /obj/structure/sink/kitchen{ pixel_y = 28 @@ -24440,8 +26791,15 @@ dir = 8 }, /obj/machinery/disposal/bin, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) +"lAG" = ( +/obj/effect/turf_decal/caution, +/turf/open/floor/engine, +/area/engineering/atmos) "lAN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, @@ -24454,12 +26812,9 @@ /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) "lAY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel/white, -/area/maintenance/aft/secondary) +/obj/structure/bookcase/random, +/turf/open/floor/wood, +/area/service/library) "lAZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -24517,8 +26872,13 @@ /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "lBY" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, /turf/open/floor/wood, /area/commons/dorms) "lDe" = ( @@ -24539,6 +26899,16 @@ }, /turf/open/floor/plasteel/dark, /area/command/teleporter) +"lDG" = ( +/obj/structure/fluff/railing{ + dir = 1 + }, +/obj/structure/fluff/railing{ + dir = 4 + }, +/obj/machinery/space_heater, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/port) "lEv" = ( /obj/structure/bodycontainer/morgue{ dir = 8 @@ -24560,45 +26930,50 @@ /area/icemoon/surface/outdoors) "lER" = ( /obj/structure/cable{ - icon_state = "0-8" + icon_state = "4-8" }, -/obj/machinery/light{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/power/apc{ - areastring = "/area/commons/storage/primary"; - dir = 4; - name = "Primary Tool Storage APC"; - pixel_x = 24; - pixel_y = 1 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/engineering/main) "lFv" = ( /obj/structure/closet/crate/freezer/surplus_limbs, /obj/item/reagent_containers/glass/beaker/synthflesh, /obj/machinery/light_switch{ pixel_y = -23 }, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/stripes{ + dir = 1; + icon_state = "warningline" + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white, /area/medical/surgery) "lFE" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "lFP" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Snow Airlock" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/door/airlock/public/glass{ + name = "Snow Airlock"; + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "lFS" = ( @@ -24609,17 +26984,21 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/aft/secondary) +"lFU" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/turf/open/floor/plating, +/area/engineering/storage/tech) "lFZ" = ( /turf/open/floor/plasteel, /area/hallway/primary/central) "lGi" = ( -/obj/structure/table, -/obj/item/storage/firstaid/toxin{ - pixel_x = 3; - pixel_y = 3 - }, /obj/machinery/airalarm{ pixel_y = 23 }, @@ -24632,18 +27011,24 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/computer/crew{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/mine/lobby) "lGv" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/fitness) "lGU" = ( @@ -24654,6 +27039,17 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_decals10" + }, +/obj/effect/turf_decal/loading_area{ + dir = 9; + icon_state = "steel_decals10" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/aft) "lHl" = ( @@ -24662,26 +27058,58 @@ /area/maintenance/aft/secondary) "lHo" = ( /obj/machinery/telecomms/bus/preset_three, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/end{ + dir = 8 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"lHt" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/structure/rack/shelf, +/obj/item/rcl/pre_loaded, +/obj/item/airlock_painter, +/obj/item/lightreplacer{ + pixel_y = 7 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "lHP" = ( -/obj/structure/chair/stool, /obj/structure/sign/poster/official/foam_force_ad{ pixel_x = 32 }, /turf/open/floor/plasteel/grimy, /area/commons/fitness/recreation) +"lHV" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "lHW" = ( -/obj/machinery/door/airlock/engineering{ - name = "Telecommunications"; - req_access_txt = "61" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/machinery/door/airlock/engineering{ + name = "Telecommunications"; + req_access_txt = "61"; + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/tcommsat/computer) "lHZ" = ( @@ -24739,20 +27167,6 @@ /obj/item/flashlight/lamp, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) -"lJd" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 28 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/main) "lJe" = ( /obj/machinery/firealarm{ pixel_y = 24 @@ -24766,12 +27180,24 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) -"lKx" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +"lJP" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 1 }, -/turf/open/floor/engine, -/area/engineering/secure_construction) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, +/turf/open/floor/catwalk_floor, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "lKF" = ( /obj/structure/cable{ icon_state = "2-4" @@ -24782,11 +27208,23 @@ /obj/structure/sign/departments/restroom{ pixel_y = 32 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/hallway/primary/port) "lKP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, /turf/open/floor/engine, -/area/engineering/main) +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "lKQ" = ( /obj/structure/chair{ dir = 4 @@ -24796,13 +27234,23 @@ /turf/open/floor/plasteel, /area/mine/lobby) "lLd" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/plating, -/area/engineering/atmos) +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/white, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "lLf" = ( /turf/open/floor/plasteel, /area/mine/eva) @@ -24853,32 +27301,14 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "lNo" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/glasses/meson{ - pixel_y = 4 +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/obj/item/cartridge/atmos, -/obj/item/cartridge/engineering{ - pixel_x = -3; - pixel_y = 2 +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/obj/item/cartridge/engineering{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/cartridge/engineering{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 - }, -/obj/machinery/keycard_auth{ - pixel_y = -28 - }, -/mob/living/simple_animal/parrot/Polly, +/obj/structure/rack, +/obj/item/rcl/pre_loaded, /turf/open/floor/plasteel, /area/command/heads_quarters/ce) "lNt" = ( @@ -24890,7 +27320,7 @@ dir = 4; network = list("mine") }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/mine/lobby) "lNP" = ( /obj/effect/turf_decal/tile/red{ @@ -24916,6 +27346,12 @@ name = "Dormitory"; dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/wood, /area/commons/dorms) "lOt" = ( @@ -24945,14 +27381,20 @@ /area/icemoon/surface/outdoors) "lOL" = ( /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone3) "lOU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/commons/dorms) "lOX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -24991,22 +27433,17 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) -"lPw" = ( -/obj/machinery/vending/wardrobe/engi_wardrobe, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engineering/main) +"lPT" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "lRq" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, -/area/cargo/sorting) +/area/hallway/primary/fore) "lRH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -25019,38 +27456,41 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, +/obj/item/kirbyplants/photosynthetic, /turf/open/floor/plasteel, /area/science/mixing) -"lRR" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "lRV" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/commons/storage/primary) -"lSa" = ( -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) -"lSl" = ( -/obj/structure/sign/poster/official/wtf_is_co2{ - pixel_x = 32 +/obj/machinery/door/firedoor/border_only{ + dir = 8; + name = "west facing firelock" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4; + name = "east facing firelock" }, /turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/area/hallway/primary/fore) +"lSa" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/wood, +/area/service/library) +"lSl" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/bookcase/random, +/turf/open/floor/carpet/orange, +/area/service/library) +"lSv" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "lSz" = ( /obj/structure/cable{ icon_state = "4-8" @@ -25102,6 +27542,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/mine/eva) +"lTM" = ( +/obj/machinery/cryopod/tele, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/pod/dark, +/area/commons/dorms) "lTZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/machinery/quantumpad{ @@ -25145,8 +27592,9 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/service/hydroponics) "lUp" = ( @@ -25158,6 +27606,12 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) +"lUq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engineering/storage/tech) "lUz" = ( /obj/effect/turf_decal/bot, /obj/structure/disposalpipe/trunk{ @@ -25173,22 +27627,27 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" - }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + name = "External Airlock"; + req_access_txt = "13"; + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/aft) "lUI" = ( -/obj/machinery/door/airlock{ - name = "Unisex Restrooms" - }, /obj/machinery/door/firedoor/border_only{ dir = 8; name = "west facing firelock" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/door/airlock{ + name = "Unisex Restrooms"; dir = 4 }, /turf/open/floor/plating, @@ -25236,7 +27695,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "lVh" = ( /obj/structure/table/glass, @@ -25265,27 +27724,18 @@ dir = 1; name = "north facing firelock" }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/service/chapel/office) "lVu" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/sorting/mail{ - sortType = 1 +/obj/structure/disposalpipe/segment{ + dir = 6 }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "lVG" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" @@ -25294,11 +27744,17 @@ dir = 8; name = "west facing firelock" }, -/obj/machinery/door/airlock/public/glass{ - name = "Central Access" +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 }, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/hallway/primary/fore) "lVH" = ( /obj/structure/cable{ icon_state = "0-4" @@ -25349,13 +27805,13 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "lWf" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{ +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{ dir = 8 }, -/obj/machinery/air_sensor/atmos/carbon_tank{ +/obj/machinery/air_sensor/atmos/toxin_tank{ pixel_y = -25 }, -/turf/open/floor/engine/co2, +/turf/open/floor/engine/plasma, /area/engineering/atmos) "lWg" = ( /obj/structure/cable{ @@ -25381,7 +27837,7 @@ pixel_y = -32 }, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/hallway/primary/aft) "lXA" = ( /obj/machinery/light{ dir = 8 @@ -25419,17 +27875,17 @@ /area/medical/medbay/central) "lYe" = ( /obj/machinery/holopad, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/hallway/primary/central) "lYj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, -/area/hallway/primary/fore) +/area/hallway/primary/aft) "lYD" = ( /obj/machinery/light/small, /obj/machinery/telecomms/relay/preset/mining, @@ -25437,7 +27893,11 @@ /area/mine/maintenance) "lYS" = ( /obj/structure/closet/crate, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/dark, /area/hallway/primary/aft) "lZc" = ( /obj/machinery/door/airlock/public/glass{ @@ -25486,27 +27946,18 @@ }, /turf/open/floor/carpet, /area/service/bar) -"lZS" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) +"lZT" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/engineering/storage/tech) "maE" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "maK" = ( @@ -25515,6 +27966,16 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"maN" = ( +/obj/machinery/computer/cryopod{ + dir = 4; + pixel_x = -26 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/commons/dorms) "mbc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/light{ @@ -25545,11 +28006,33 @@ /turf/open/floor/plasteel/freezer, /area/medical/surgery) "mbB" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/obj/structure/chair/bench/left{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/service/library) +"mbI" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ dir = 4 }, -/turf/open/floor/engine, -/area/maintenance/aft/secondary) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "mbY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -25599,29 +28082,44 @@ dir = 8; pixel_x = 24 }, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) +"mdE" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/holopad, +/turf/open/floor/plasteel, +/area/engineering/main) "mdL" = ( /obj/machinery/light, /turf/open/floor/plating/asteroid/snow/icemoon, /area/maintenance/solars/starboard/fore) "meg" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/turf/open/floor/plating, -/area/engineering/atmos) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/lobby) +"meB" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel, +/area/maintenance/aft) "mfA" = ( -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/service/chapel/office) "mfH" = ( -/obj/machinery/telecomms/broadcaster/preset_left, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "mfL" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /obj/machinery/door/airlock/public/glass{ @@ -25635,6 +28133,9 @@ dir = 8; name = "west facing firelock" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/fitness) "mfV" = ( @@ -25680,11 +28181,16 @@ }, /turf/open/floor/plasteel, /area/science/xenobiology) -"mhv" = ( -/turf/open/floor/plating, -/area/engineering/storage) "mhw" = ( /obj/structure/table/optable, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1; + icon_state = "steel_decals9" + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4; + icon_state = "steel_decals9" + }, /turf/open/floor/plasteel/freezer, /area/medical/surgery) "mhL" = ( @@ -25720,31 +28226,50 @@ /turf/open/floor/plasteel, /area/security/brig) "mhU" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 +/obj/machinery/light{ + dir = 1 }, -/turf/closed/wall/r_wall, -/area/engineering/supermatter) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/main) +"mij" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/figure/wizard{ + pixel_y = 6; + pixel_x = 16 + }, +/turf/open/floor/carpet/green, +/area/service/library) "mim" = ( -/obj/machinery/airalarm{ +/obj/machinery/door/airlock/public/glass{ + name = "Snow Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/firedoor/border_only{ dir = 1; - pixel_y = -22 + name = "north facing firelock" }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/washing_machine, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/commons/dorms) "miy" = ( /obj/machinery/airalarm{ dir = 1; pixel_y = -22 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "miE" = ( @@ -25755,7 +28280,11 @@ /obj/effect/turf_decal/arrows/red{ dir = 8 }, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/hallway/primary/aft) "miU" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma{ @@ -25763,13 +28292,37 @@ }, /turf/open/floor/plating, /area/maintenance/department/electrical) -"mjs" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 +"mjo" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + dir = 4; + id = "ceprivacy"; + name = "privacy shutter" }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/command/heads_quarters/ce) +"mjq" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) +"mjs" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/storage) "mjw" = ( @@ -25800,19 +28353,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"mjH" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/closet/radiation, -/obj/machinery/requests_console{ - department = "Engineering"; - departmentType = 4; - name = "Engineering RC"; - pixel_y = 30 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "mjM" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -25848,11 +28388,11 @@ /turf/open/floor/plasteel, /area/service/hydroponics) "mkd" = ( -/obj/structure/closet/secure_closet/hop, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/carpet, +/obj/structure/dresser, +/turf/open/floor/carpet/royalblue, /area/command/heads_quarters/hop) "mkx" = ( /turf/open/floor/plating, @@ -25887,30 +28427,20 @@ }, /turf/closed/wall, /area/service/chapel/office) -"mlb" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1; - name = "Gas to Cooling Loop" +"mkU" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/simple/yellow/visible{ + dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/engine, -/area/engineering/main) +/turf/open/floor/plasteel, +/area/engineering/atmos) "mlc" = ( /obj/machinery/light, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/hallway/primary/central) -"mlY" = ( -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/open/floor/plasteel/dark, -/area/engineering/atmospherics_engine) "mmb" = ( /obj/effect/turf_decal/tile/green{ dir = 1 @@ -25953,7 +28483,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /obj/effect/turf_decal/tile/brown{ @@ -25962,22 +28492,22 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/sorting) "mmX" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/light, -/obj/structure/window/plasma/reinforced{ +/obj/structure/table/wood/fancy/orange, +/obj/structure/table/wood/fancy/orange, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 8 }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/atmospherics_engine) +/obj/item/ashtray, +/turf/open/floor/carpet/orange, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "mmY" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -25988,12 +28518,26 @@ }, /turf/open/floor/plasteel/white, /area/science/misc_lab) +"mnv" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/chair/beanbag{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "mnQ" = ( /obj/machinery/airalarm{ pixel_y = 26 }, /obj/structure/dresser, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/heads_quarters/captain) "mnT" = ( /obj/effect/spawner/structure/window/reinforced, @@ -26012,11 +28556,12 @@ dir = 8; name = "west facing firelock" }, +/obj/structure/fans/tiny, /obj/machinery/door/airlock/mining/glass{ name = "Delivery Office"; - req_access_txt = "50" + req_access_txt = "50"; + dir = 8 }, -/obj/structure/fans/tiny, /turf/open/floor/pod/dark, /area/maintenance/starboard) "moh" = ( @@ -26032,9 +28577,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Dorms East" }, @@ -26048,6 +28590,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/white/line, /turf/open/floor/plasteel, /area/hallway/primary/port) "moM" = ( @@ -26061,25 +28604,17 @@ dir = 1; pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, -/obj/structure/closet/secure_closet/atmospherics, /obj/machinery/camera{ c_tag = "Atmospherics South West"; dir = 1 }, +/obj/structure/closet/firecloset, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engineering/atmos) -"mpW" = ( -/obj/structure/toilet{ - dir = 1; - icon_state = "toilet00" - }, -/turf/open/floor/plasteel/freezer, -/area/mine/lobby) "mpX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/closet/secure_closet/hydroponics, /turf/open/floor/plasteel, /area/service/hydroponics) @@ -26101,6 +28636,16 @@ /area/hallway/primary/central) "mqk" = ( /obj/machinery/light, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "mqp" = ( @@ -26131,12 +28676,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "mqT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/disposalpipe/sorting/mail{ dir = 4; sortType = 3 @@ -26173,23 +28712,25 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) +"mrv" = ( +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "mrC" = ( /turf/open/floor/plasteel/white, /area/medical/medbay/zone3) "mrD" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/camera{ + c_tag = "Supermatter West"; + dir = 1 }, +/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/item/kirbyplants/dead, /turf/open/floor/plasteel, /area/engineering/main) "mrY" = ( @@ -26199,17 +28740,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/white/line, /turf/open/floor/plasteel, /area/hallway/primary/port) -"msb" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/commons/storage/primary) "msi" = ( /obj/machinery/conveyor{ dir = 1; @@ -26253,19 +28786,8 @@ pixel_y = 7 }, /obj/item/pen, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/meeting_room) -"mtx" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible, -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/engine, -/area/engineering/main) "mtD" = ( /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment{ @@ -26281,17 +28803,40 @@ /obj/machinery/vending/security, /turf/open/floor/plasteel/dark, /area/security/office) +"mtL" = ( +/obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/assembly/prox_sensor, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "mtQ" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /turf/open/floor/plating, /area/service/kitchen) "mua" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/purple/visible, +/turf/open/floor/plasteel, /area/engineering/atmos) "muc" = ( /obj/structure/cable{ @@ -26302,6 +28847,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"muy" = ( +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, +/turf/open/floor/plasteel, +/area/maintenance/aft) "muF" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/pod/dark, @@ -26366,10 +28917,8 @@ /turf/open/floor/plasteel, /area/security/checkpoint/medical) "mvT" = ( -/obj/machinery/light, -/obj/structure/reflector/box, -/turf/open/floor/plating, -/area/engineering/storage) +/turf/closed/wall, +/area/engineering/engine_smes) "mwi" = ( /obj/structure/cable{ icon_state = "1-8" @@ -26379,6 +28928,12 @@ }, /turf/open/floor/wood, /area/security/courtroom) +"mwp" = ( +/obj/machinery/atmospherics/components/trinary/filter, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "mwu" = ( /obj/structure/cable{ icon_state = "2-4" @@ -26409,6 +28964,15 @@ /obj/structure/chair/sofa/corp/corner{ dir = 8 }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/wood, /area/hallway/primary/port) "mwJ" = ( @@ -26428,18 +28992,11 @@ /obj/structure/bed, /obj/item/bedsheet/captain, /obj/effect/landmark/start/captain, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/heads_quarters/captain) "mxx" = ( /turf/closed/wall/r_wall, /area/command/heads_quarters/captain) -"mxz" = ( -/obj/machinery/door/poddoor{ - id = "tegvent"; - name = "TEG Vent" - }, -/turf/open/floor/engine, -/area/engineering/atmospherics_engine) "mxT" = ( /obj/machinery/firealarm{ dir = 1; @@ -26455,7 +29012,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_tiled, /area/command/heads_quarters/captain) "mxU" = ( /obj/effect/turf_decal/tile/purple{ @@ -26465,7 +29022,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "myt" = ( /obj/structure/table/wood, @@ -26505,24 +29062,8 @@ dir = 8 }, /area/hallway/primary/fore) -"mzt" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/effect/landmark/start/station_engineer, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "mzu" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -26533,8 +29074,15 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" + }, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/hallway/primary/aft) "mzU" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -26556,8 +29104,23 @@ c_tag = "Escape Arm Southeast"; dir = 1 }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) +"mAt" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, +/turf/open/floor/plating, +/area/engineering/storage/tech) "mBf" = ( /obj/structure/cable{ icon_state = "4-8" @@ -26566,14 +29129,17 @@ dir = 4; sortType = 26 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/fitness) "mBp" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -24 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/mine/lobby) "mBC" = ( /obj/structure/cable{ @@ -26634,12 +29200,34 @@ /obj/item/reagent_containers/glass/beaker/sulphuric, /turf/open/floor/circuit, /area/science/lab) +"mDe" = ( +/obj/structure/bed, +/obj/item/bedsheet/hop, +/obj/effect/landmark/start/head_of_personnel, +/turf/open/floor/carpet/royalblue, +/area/command/heads_quarters/hop) "mDl" = ( -/obj/machinery/light/small{ +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/landmark/start/station_engineer, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 1 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "mDo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ @@ -26666,6 +29254,9 @@ dir = 8 }, /obj/effect/landmark/start/depsec/engineering, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "mDZ" = ( @@ -26676,40 +29267,31 @@ /obj/structure/chair/comfy/black{ dir = 1 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/meeting_room) "mEs" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /turf/open/floor/plasteel, /area/hallway/primary/aft) "mER" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/fluff/railing{ + dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/structure/fluff/railing{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4; - name = "east facing firelock" - }, -/obj/machinery/door/airlock/research{ - name = "Kill Chamber"; - req_access_txt = "55" - }, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/obj/machinery/space_heater, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/port) "mFb" = ( /obj/structure/cable{ icon_state = "0-4" @@ -26726,14 +29308,21 @@ /turf/open/floor/wood, /area/service/chapel/main) "mFc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ +/obj/structure/tank_dispenser, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "mFf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/heads_quarters/captain) "mFk" = ( /obj/structure/cable{ @@ -26771,13 +29360,24 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"mGO" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/plasteel, +/area/engineering/main) +"mGP" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, +/area/hallway/primary/port) "mHo" = ( /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, /obj/structure/tank_dispenser/oxygen, /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/maintenance/department/bridge"; @@ -26792,12 +29392,14 @@ dir = 4 }, /obj/effect/spawner/lootdrop/maintenance, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/maintenance/disposal) "mHV" = ( /obj/structure/chair/beanbag/blue{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/carpet/royalblue, /area/commons/dorms) "mIc" = ( @@ -26842,7 +29444,10 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 8; + icon_state = "floor_trim" + }, /area/hallway/primary/fore) "mIy" = ( /obj/structure/extinguisher_cabinet{ @@ -26854,6 +29459,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/item/kirbyplants/photosynthetic, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "mIB" = ( @@ -26864,23 +29470,26 @@ /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "mIZ" = ( -/obj/structure/table/wood, -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_y = 29 - }, -/turf/open/floor/carpet/blue, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/turf/open/floor/carpet/royalblack, /area/commons/dorms) "mJb" = ( /obj/machinery/telecomms/processor/preset_four, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/end{ + dir = 4 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "mJf" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, /area/commons/fitness) "mJo" = ( @@ -26893,15 +29502,6 @@ /obj/machinery/vending/coffee, /turf/open/floor/wood, /area/hallway/primary/port) -"mJI" = ( -/obj/machinery/vending/tool, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/engineering/main) "mJV" = ( /obj/structure/cable{ icon_state = "4-8" @@ -26910,6 +29510,9 @@ /area/science/mixing) "mJZ" = ( /obj/machinery/light, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, /turf/open/floor/plasteel/freezer, /area/commons/dorms) "mKq" = ( @@ -26918,10 +29521,27 @@ }, /turf/open/floor/wood, /area/maintenance/bar) -"mLw" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +"mKI" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"mLw" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -26 @@ -26932,8 +29552,21 @@ /turf/open/floor/plasteel, /area/commons/fitness) "mLz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/carpet/red, /area/commons/dorms) +"mLG" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "mLK" = ( /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, @@ -26944,10 +29577,6 @@ "mMc" = ( /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) -"mMi" = ( -/obj/structure/closet/emcloset/anchored, -/turf/open/floor/plating, -/area/engineering/main) "mMn" = ( /obj/structure/cable{ icon_state = "0-8" @@ -26960,6 +29589,14 @@ /area/solars/port/aft) "mMU" = ( /obj/machinery/telecomms/server/presets/engineering, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "mMV" = ( @@ -26968,6 +29605,9 @@ /area/icemoon/surface/outdoors) "mMZ" = ( /obj/structure/bookcase/random/religion, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, /turf/open/floor/wood, /area/service/library) "mNa" = ( @@ -27007,8 +29647,15 @@ /turf/open/floor/carpet, /area/mine/lobby) "mNp" = ( +/obj/machinery/camera{ + c_tag = "Atmospherics South East"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/components/binary/pump/on{ +/obj/machinery/computer/atmos_control/tank/air_tank{ dir = 8 }, /turf/open/floor/plasteel, @@ -27018,7 +29665,7 @@ /obj/item/flashlight/lamp/green, /obj/item/pen/fountain/captain, /obj/item/storage/box/matches, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/heads_quarters/captain) "mNB" = ( /obj/effect/turf_decal/tile/neutral{ @@ -27031,14 +29678,13 @@ dir = 1 }, /obj/machinery/disposal/bin, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/commons/fitness) "mNR" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "mOc" = ( @@ -27064,24 +29710,23 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/bridge) "mPH" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering"; + req_access_txt = "10"; + dir = 1 + }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel, -/area/engineering/main) +/area/engineering/lobby) "mPV" = ( /obj/machinery/light{ dir = 4 @@ -27090,17 +29735,10 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "mQc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/engineering/main) "mQw" = ( /obj/effect/turf_decal/stripes/line{ @@ -27114,13 +29752,17 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) +"mQC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/effect/turf_decal/stripes/full, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "mRh" = ( /turf/open/floor/plating, /area/maintenance/bar) "mRr" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -27130,14 +29772,27 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12"; + welded = 1; + dir = 4 + }, /turf/open/floor/plating, /area/hallway/secondary/entry) "mRz" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "mRB" = ( /turf/open/floor/plasteel/freezer, /area/commons/dorms) @@ -27176,9 +29831,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/public/glass{ - name = "Central Access" - }, /obj/machinery/door/firedoor/border_only{ dir = 8; name = "west facing firelock" @@ -27190,6 +29842,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access"; + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "mSy" = ( @@ -27206,9 +29862,6 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/solars/starboard/fore) "mSC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -27252,17 +29905,20 @@ /obj/item/radio/intercom{ pixel_x = 28 }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/security/office) "mTU" = ( -/obj/structure/bed, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 }, -/obj/item/bedsheet/hop, -/obj/effect/landmark/start/head_of_personnel, -/turf/open/floor/carpet, +/obj/structure/closet/secure_closet/hop, +/turf/open/floor/wood, /area/command/heads_quarters/hop) "mTW" = ( /turf/closed/wall/r_wall, @@ -27328,9 +29984,16 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/structure/closet/secure_closet/engineering_personal, +/obj/machinery/vending/assist, +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, /turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) +/area/commons/storage/primary) "mVd" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -27378,25 +30041,15 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "mVA" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 }, /turf/open/floor/plasteel, -/area/cargo/storage) +/area/hallway/primary/aft) "mVC" = ( /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, /area/maintenance/solars/starboard/aft) -"mVE" = ( -/obj/structure/closet/wardrobe/engineering_yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "mVQ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -27408,32 +30061,42 @@ /turf/open/floor/plating, /area/tcommsat/server) "mWc" = ( -/obj/structure/closet/crate/engineering{ - name = "Antimatter Engine Crate" +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/obj/machinery/power/am_control_unit, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_shielding_container, -/obj/item/am_containment, -/obj/item/am_containment, -/turf/open/floor/engine, -/area/engineering/secure_construction) +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "mWm" = ( /obj/structure/disposalpipe/segment{ dir = 6 }, /turf/open/floor/plating, /area/icemoon/surface/outdoors) +"mWH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/power/apc/highcap/fifteen_k{ + pixel_x = -24; + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "mWK" = ( /obj/structure/plasticflaps/opaque, /obj/machinery/navbeacon{ @@ -27470,24 +30133,13 @@ }, /turf/open/floor/plating, /area/tcommsat/server) -"mXt" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) "mYe" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "mYj" = ( @@ -27517,14 +30169,16 @@ dir = 8; pixel_x = 24 }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "mYO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/door/airlock/maintenance{ name = "Genetics Maintenance"; - req_access_txt = "5; 9; 68" - }, -/obj/structure/disposalpipe/segment{ + req_access_txt = "5; 9; 68"; dir = 4 }, /turf/open/floor/plating, @@ -27533,13 +30187,17 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /obj/machinery/door/airlock/mining{ name = "Mining Office"; - req_access_txt = "48" + req_access_txt = "48"; + dir = 4 }, /turf/open/floor/plasteel, /area/cargo/miningdock) @@ -27548,6 +30206,9 @@ icon_state = "1-4" }, /obj/effect/landmark/start/janitor, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, /turf/open/floor/plasteel, /area/service/janitor) "mZh" = ( @@ -27585,32 +30246,39 @@ }, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) +"mZG" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/commons/fitness) "mZR" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 1 }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "nan" = ( -/obj/structure/cable{ - icon_state = "0-8" +/obj/structure/chair/comfy/black{ + dir = 4 }, -/obj/machinery/photocopier, -/obj/machinery/power/apc{ - areastring = "/area/service/library"; - dir = 4; - name = "Library APC"; - pixel_x = 24 - }, -/turf/open/floor/wood, -/area/service/library) +/turf/open/floor/plasteel, +/area/maintenance/aft) "nbl" = ( /obj/structure/cable{ icon_state = "1-2" @@ -27674,19 +30342,21 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, +/obj/effect/decal/medium_gato, /turf/open/floor/plasteel, /area/mine/eva) "nbF" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/sorting) "nbI" = ( @@ -27734,10 +30404,6 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/door/airlock/security{ - name = "Detective's Office"; - req_access_txt = "4" - }, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" @@ -27748,6 +30414,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/security{ + name = "Detective's Office"; + req_access_txt = "4"; + dir = 8 + }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "ncV" = ( @@ -27811,12 +30482,33 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) "ndH" = ( -/obj/machinery/atmospherics/miner/nitrogen, -/turf/open/floor/engine/n2, -/area/engineering/atmos) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/plasteel, +/area/engineering/main) "ndU" = ( /obj/machinery/camera{ c_tag = "Xenobiology Test Chamber"; @@ -27826,7 +30518,6 @@ /turf/open/floor/engine, /area/science/xenobiology) "neq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/suit/hooded/wintercoat, @@ -27855,6 +30546,13 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"nez" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, +/obj/effect/landmark/start/station_engineer, +/turf/open/floor/plasteel, +/area/engineering/main) "neK" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -27863,20 +30561,23 @@ /turf/open/floor/plating, /area/security/courtroom) "neL" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/corner{ + dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"neW" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/medical, -/turf/open/floor/plasteel/dark, -/area/engineering/storage/tech) "nfa" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -27886,57 +30587,44 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "nfk" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering"; + req_access_txt = "10"; + dir = 8 + }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" - }, -/obj/machinery/door/airlock/engineering{ - name = "Engineering"; - req_access_txt = "10" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/main) "nfB" = ( /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "snaxi_mining_shutter"; + name = "blast door seal"; + dir = 4 + }, /turf/open/floor/plating, /area/mine/eva) "nfZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/open/floor/wood, /area/commons/dorms) -"ngl" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/table, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/main) "ngq" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -27953,19 +30641,15 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) -"ngz" = ( -/obj/machinery/rnd/production/circuit_imprinter, -/obj/effect/turf_decal/tile/yellow{ +"ngF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/main) +/turf/open/floor/carpet/gato, +/area/commons/dorms) "ngQ" = ( /obj/structure/cable{ icon_state = "1-8" @@ -28041,6 +30725,12 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, /area/cargo/sorting) "nin" = ( @@ -28054,6 +30744,12 @@ }, /turf/open/floor/plating, /area/maintenance/bar) +"nit" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/engineering/atmos) "niH" = ( /obj/structure/cable{ icon_state = "4-8" @@ -28112,13 +30808,14 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4; sortType = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/aft) "njL" = ( @@ -28156,18 +30853,20 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ dir = 1 }, /obj/structure/disposalpipe/sorting/mail{ dir = 4; sortType = 19 }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, /turf/open/floor/plasteel, /area/hallway/primary/aft) "nkG" = ( /obj/machinery/door/airlock/public/glass{ - name = "Cryogenic Storage" + name = "Cryogenic Storage"; + dir = 8 }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) @@ -28192,11 +30891,28 @@ /turf/open/floor/plasteel, /area/maintenance/department/electrical) "nlP" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 9 - }, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/miner/toxins, +/turf/open/floor/engine/plasma, /area/engineering/atmos) +"nmb" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/white, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "nmi" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -28210,6 +30926,9 @@ /obj/machinery/computer/security{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) "nmz" = ( @@ -28218,17 +30937,24 @@ }, /turf/open/floor/plasteel, /area/security/prison) -"nos" = ( +"nnG" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 }, -/obj/machinery/airalarm{ - pixel_y = 28 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"nof" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/turf/open/floor/plasteel, /area/engineering/main) "noC" = ( /obj/structure/cable{ @@ -28314,23 +31040,46 @@ /turf/open/floor/circuit, /area/science/robotics/mechbay) "npN" = ( -/obj/structure/rack, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/machinery/light{ - dir = 8 +/obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/item/storage/toolbox/emergency{ + pixel_y = 8 + }, +/obj/item/storage/toolbox/emergency{ + pixel_x = 2 }, /turf/open/floor/plasteel, -/area/engineering/atmos) +/area/commons/storage/primary) +"npO" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/structure/sign/poster/gato/lovegato{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) "nqw" = ( /obj/machinery/telecomms/server/presets/security, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "nqT" = ( @@ -28341,8 +31090,10 @@ /turf/open/floor/plating, /area/icemoon/surface/outdoors) "nrk" = ( -/obj/machinery/vending/cigarette, -/turf/open/floor/wood, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, /area/commons/dorms) "nrl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -28351,7 +31102,6 @@ /turf/open/floor/plating, /area/maintenance/aft/secondary) "nrz" = ( -/obj/machinery/space_heater, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -28359,6 +31109,7 @@ layer = 4; pixel_y = 32 }, +/obj/item/kirbyplants/random, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "nrA" = ( @@ -28368,8 +31119,20 @@ /obj/item/kirbyplants{ icon_state = "plant-10" }, -/turf/open/floor/carpet, +/turf/open/floor/plasteel/dark, /area/command/bridge) +"nrC" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Snow Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/firedoor/border_only{ + dir = 1; + name = "north facing firelock" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/commons/dorms) "nrJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -28393,8 +31156,27 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "nrY" = ( -/turf/open/floor/engine/air, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/yellow/visible, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) +"nsS" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, +/turf/open/floor/wood, +/area/commons/dorms) +"ntm" = ( +/obj/structure/chair/sofa/right/old{ + dir = 4 + }, +/turf/open/floor/carpet/green, +/area/service/library) "ntr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -28405,9 +31187,21 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/sorting/mail/flip{ + sortType = 5 + }, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/engineering/lobby) +"ntP" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "ntS" = ( /obj/structure/disposalpipe/junction/flip{ dir = 1 @@ -28422,25 +31216,49 @@ }, /turf/open/floor/wood, /area/hallway/secondary/exit/departure_lounge) +"ntZ" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/vg_decals/atmos/oxygen, +/turf/open/floor/engine/o2, +/area/engineering/atmos) +"nuf" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/commons/dorms) "nvf" = ( /obj/machinery/computer/shuttle/snow_taxi{ dir = 8 }, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel{ + icon_state = "floor_trim" + }, /area/hallway/secondary/exit/departure_lounge) "nvh" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/spawner/structure/window, +/obj/machinery/door/poddoor/preopen{ + id = "engibreakroom"; + name = "privacy shutters" }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/valve/digital/on, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/main) +/turf/open/floor/plating, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "nvj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/blue{ @@ -28479,6 +31297,13 @@ }, /turf/open/floor/plasteel/white, /area/mine/lobby) +"nvZ" = ( +/obj/effect/landmark/start/atmospheric_technician, +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "nwI" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -28519,9 +31344,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/public/glass{ - name = "Security Lobby" - }, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" @@ -28529,7 +31351,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/wood, +/obj/machinery/door/airlock/public/glass{ + name = "Security Lobby"; + dir = 4 + }, +/turf/open/floor/wood/wood_large, /area/hallway/primary/central) "nyg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -28590,15 +31416,27 @@ /turf/open/floor/plating, /area/hallway/primary/aft) "nzD" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 1 }, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) +"nzN" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Port to Filter" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "nzQ" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible, -/turf/closed/wall/r_wall, -/area/maintenance/aft/secondary) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, +/turf/open/floor/wood, +/area/service/library) "nAk" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -28610,28 +31448,15 @@ c_tag = "Bridge Exterior"; dir = 4 }, -/turf/open/floor/plasteel/dark/side{ - dir = 8; - icon_state = "dark" +/obj/item/kirbyplants/photosynthetic, +/obj/structure/fluff/railing{ + dir = 5 }, +/turf/open/floor/plasteel/dark, /area/hallway/primary/central) "nAy" = ( /turf/closed/wall, /area/hallway/primary/central) -"nAT" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" - }, -/obj/machinery/door/airlock/engineering{ - name = "Tech Storage"; - req_access_txt = "23" - }, -/turf/open/floor/plating, -/area/engineering/storage/tech) "nBi" = ( /obj/machinery/airalarm{ pixel_y = 28 @@ -28667,11 +31492,38 @@ /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, /area/maintenance/solars/port/fore) +"nBM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/rack, +/turf/open/floor/pod/dark, +/area/commons/dorms) +"nBO" = ( +/obj/structure/table/glass, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"nCf" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4 + }, +/obj/machinery/light, +/turf/open/floor/engine, +/area/engineering/supermatter) "nCi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, /turf/open/floor/wood, /area/service/theater) "nCo" = ( @@ -28693,14 +31545,21 @@ /turf/open/floor/wood, /area/commons/dorms) "nCz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/engineering/atmos) -"nCD" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Plasma to Pure" + }, +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/turf/open/floor/plasteel, +/area/engineering/atmos) +"nCD" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 10 + }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "nCH" = ( @@ -28716,12 +31575,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/hallway/primary/central) -"nCS" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engineering/supermatter) "nCX" = ( /obj/structure/window/reinforced{ dir = 8 @@ -28733,6 +31586,11 @@ /obj/structure/chair/sofa{ dir = 4 }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/wood, /area/hallway/primary/port) "nDr" = ( @@ -28760,7 +31618,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/mine/lobby) "nDK" = ( /obj/effect/spawner/structure/window/reinforced, @@ -28781,6 +31639,21 @@ /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma, /turf/open/floor/plating, /area/maintenance/department/electrical) +"nEg" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "nEu" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 @@ -28805,7 +31678,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "nFy" = ( /obj/machinery/light{ @@ -28824,24 +31697,8 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/circuit/off, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) -"nFI" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/landmark/start/station_engineer, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/break_room) "nFJ" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, @@ -28854,6 +31711,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/white, /area/mine/lobby) "nGa" = ( @@ -28928,9 +31786,6 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/door/poddoor/shutters{ id = "oldhop" }, @@ -28967,6 +31822,15 @@ "nHQ" = ( /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/underground/explored) +"nHR" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + dir = 2; + id = "ceprivacy"; + name = "privacy shutter" + }, +/turf/open/floor/plating, +/area/command/heads_quarters/ce) "nHS" = ( /obj/machinery/light{ dir = 4; @@ -29029,8 +31893,21 @@ /area/hallway/primary/port) "nIW" = ( /obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/stripes{ + dir = 1; + icon_state = "warningline" + }, /turf/open/floor/plasteel, /area/science/robotics/mechbay) +"nJe" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "nJq" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ dir = 8 @@ -29066,10 +31943,17 @@ }, /turf/open/floor/plating, /area/service/lawoffice) +"nJY" = ( +/obj/structure/sign/poster/contraband/donut_corp, +/turf/closed/wall, +/area/service/bar) "nKd" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 5 }, +/obj/machinery/computer/atmos_control/tank/oxygen_tank{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "nKn" = ( @@ -29101,7 +31985,7 @@ name = "port bay 2"; width = 5 }, -/turf/open/floor/plating/asteroid/snow/icemoon, +/turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "nLp" = ( /obj/machinery/airalarm{ @@ -29118,12 +32002,15 @@ pixel_y = 6 }, /obj/item/stack/sheet/metal/fifty, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "nLA" = ( -/obj/machinery/atmospherics/components/binary/pump, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "nLL" = ( /obj/machinery/door/airlock{ name = "Service Hall"; @@ -29158,6 +32045,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel, /area/maintenance/aft/secondary) +"nMD" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plating, +/area/engineering/storage) "nMF" = ( /obj/machinery/vending/wardrobe/science_wardrobe, /turf/open/floor/plasteel/white, @@ -29174,8 +32067,8 @@ /turf/open/floor/plating, /area/maintenance/disposal) "nNu" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ - dir = 8 +/obj/machinery/atmospherics/components/trinary/filter/atmos/o2{ + dir = 1 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -29196,8 +32089,14 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/department/science/xenobiology) +"nOu" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "nOG" = ( /obj/structure/cable{ icon_state = "4-8" @@ -29205,13 +32104,14 @@ /turf/open/floor/circuit/off, /area/ai_monitored/turret_protected/ai) "nOI" = ( -/obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/door/airlock/external{ + name = "Engineering External Access"; + req_access_txt = "10;13"; + dir = 4 + }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/engineering/atmos) "nOZ" = ( @@ -29234,8 +32134,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "nPo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 }, /turf/open/floor/carpet, /area/service/bar) @@ -29251,12 +32155,62 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"nPH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, +/turf/open/floor/plasteel, +/area/commons/fitness) "nPT" = ( /obj/structure/chair{ dir = 4 }, /turf/open/floor/plasteel/dark, /area/security/office) +"nQu" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"nQx" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/door/airlock/atmos/glass{ + id_tag = "mix_exterior_airlock"; + name = "Mix Chamber Exterior Airlock"; + autoclose = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/doorButtons/access_button{ + pixel_x = 24; + idDoor = "mix_exterior_airlock"; + pixel_y = -5; + idSelf = "mix_airlock_controller" + }, +/obj/effect/mapping_helpers/airlock/locked, +/turf/open/floor/engine, +/area/engineering/atmos) "nQF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -29309,11 +32263,15 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "nSq" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/machinery/computer/station_alert, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/command/heads_quarters/ce) "nSs" = ( /turf/closed/wall, /area/command/corporate_showroom) @@ -29330,17 +32288,21 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /obj/machinery/door/firedoor/border_only{ dir = 8; name = "west facing firelock" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; name = "Medbay"; - req_access_txt = "5" + req_access_txt = "5"; + dir = 8 }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone3) @@ -29404,6 +32366,8 @@ pixel_y = -4; req_access_txt = "28" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) "nTN" = ( @@ -29436,16 +32400,26 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - req_access_txt = "2" - }, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" }, +/obj/machinery/door/airlock/security/glass{ + name = "Prison Wing"; + req_access_txt = "2"; + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/security/brig) +"nUe" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/turf/open/floor/wood, +/area/commons/dorms) "nUH" = ( /obj/machinery/airalarm{ pixel_y = 28 @@ -29455,14 +32429,18 @@ }, /turf/open/floor/plasteel, /area/commons/fitness) +"nUO" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "nUQ" = ( /obj/machinery/door/firedoor/border_only{ dir = 8; name = "west facing firelock" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -29491,16 +32469,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/port) -"nVJ" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, +"nVr" = ( +/obj/machinery/atmospherics/pipe/manifold4w/general/visible, /turf/open/floor/plasteel, -/area/engineering/main) +/area/engineering/atmos) "nWm" = ( /obj/machinery/light/small/built, /turf/open/floor/plating, @@ -29560,19 +32532,8 @@ /obj/structure/chair/stool, /turf/open/floor/plasteel/grimy, /area/commons/fitness/recreation) -"nWZ" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/turf/open/floor/plating, -/area/engineering/storage) "nXa" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -29582,9 +32543,13 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/structure/disposalpipe/junction/flip, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/hallway/primary/aft) "nXb" = ( /obj/structure/cable{ icon_state = "1-2" @@ -29640,18 +32605,19 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel, /area/maintenance/aft) -"nYQ" = ( -/turf/closed/wall, -/area/engineering/secure_construction) -"nZz" = ( -/obj/machinery/shieldgen, +"nYv" = ( +/obj/machinery/space_heater, /turf/open/floor/plating, -/area/engineering/storage) +/area/maintenance/aft/secondary) +"nZt" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/wood, +/area/service/library) "nZZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -29665,19 +32631,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/structure/table, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/metal/fifty, /turf/open/floor/plasteel, -/area/engineering/break_room) -"oak" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/security, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/storage/tech) +/area/engineering/lobby) "oam" = ( /obj/structure/cable{ icon_state = "4-8" @@ -29691,6 +32646,12 @@ "oaE" = ( /turf/closed/wall/r_wall, /area/medical/genetics) +"oaH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, +/turf/closed/wall, +/area/icemoon/surface/outdoors) "oaQ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -29705,10 +32666,8 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "obj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/hallway/primary/aft) "obp" = ( @@ -29724,15 +32683,15 @@ name = "HoS Office"; req_access_txt = "58" }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/command/heads_quarters/hos) "obG" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 }, -/obj/machinery/meter, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "obN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -29765,6 +32724,14 @@ /area/maintenance/aft) "ocs" = ( /obj/machinery/telecomms/server/presets/medical, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "oct" = ( @@ -29789,6 +32756,9 @@ /obj/structure/sign/painting{ pixel_y = -32 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, /turf/open/floor/carpet/gato, /area/commons/dorms) "ocO" = ( @@ -29820,31 +32790,31 @@ /turf/open/floor/plating, /area/maintenance/starboard) "odE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/service/theater) +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/green/visible, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) +"odO" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) "odU" = ( /obj/machinery/newscaster/security_unit{ pixel_x = -28; pixel_y = -28 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) -"oeb" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "oej" = ( /obj/structure/cable{ icon_state = "1-2" @@ -29871,11 +32841,12 @@ /turf/open/floor/wood, /area/service/library) "oeB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) +/turf/open/floor/pod/dark, +/area/maintenance/starboard) "oeE" = ( /obj/structure/cable{ icon_state = "4-8" @@ -29896,7 +32867,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ @@ -29905,6 +32876,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "ofB" = ( @@ -29918,6 +32892,14 @@ dir = 4 }, /area/hallway/secondary/exit/departure_lounge) +"ofO" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/wood, +/area/hallway/primary/port) "ogc" = ( /obj/machinery/vending/boozeomat, /turf/open/floor/wood{ @@ -29952,7 +32934,7 @@ name = "Solar Maintenance"; req_access_txt = "10; 13" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/aft) "ogt" = ( /turf/closed/wall/r_wall, @@ -29967,7 +32949,7 @@ /area/maintenance/disposal) "ogC" = ( /obj/machinery/light, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/command/heads_quarters/hop) "ogE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -29988,7 +32970,11 @@ pixel_x = -24; specialfunctions = 4 }, -/turf/open/floor/carpet/blue, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/turf/open/floor/carpet/orange, /area/commons/dorms) "ohQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -30086,10 +33072,28 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/plasteel/white, /area/science/mixing) +"oko" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "okv" = ( -/obj/machinery/atmospherics/miner/n2o, -/turf/open/floor/engine/n2o, -/area/engineering/atmos) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "okw" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 1 @@ -30109,6 +33113,10 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"olc" = ( +/obj/item/pickaxe/plasteel, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "olf" = ( /obj/structure/cable{ icon_state = "2-4" @@ -30152,17 +33160,19 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side, /area/hallway/primary/port) "omK" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, /obj/effect/turf_decal/tile/yellow, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/engineering/main) "omP" = ( @@ -30180,23 +33190,12 @@ /turf/open/floor/plasteel, /area/mine/eva) "onx" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" - }, -/obj/machinery/door/firedoor/border_only{ - name = "south facing firelock" - }, -/obj/machinery/door/airlock/public/glass{ - name = "Central Access" - }, -/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, -/area/hallway/primary/aft) +/area/engineering/atmos) "onC" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -30223,15 +33222,13 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "oog" = ( -/obj/item/kirbyplants{ - icon_state = "plant-04" - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/item/kirbyplants/photosynthetic, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "oov" = ( @@ -30260,11 +33257,11 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "ooI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/hallway/primary/aft) "ooT" = ( /obj/machinery/atmospherics/components/binary/valve{ @@ -30294,7 +33291,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/medical/surgery) "oqF" = ( /obj/machinery/light/small, @@ -30302,8 +33299,8 @@ /turf/open/floor/carpet, /area/maintenance/aft/secondary) "oqJ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 }, /obj/structure/closet/secure_closet/hydroponics, /obj/item/radio/intercom{ @@ -30312,6 +33309,13 @@ }, /turf/open/floor/plasteel, /area/service/hydroponics) +"oqN" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/vg_decals/atmos/plasma, +/turf/open/floor/engine/plasma, +/area/engineering/atmos) "oqS" = ( /turf/closed/wall/r_wall, /area/security/warden) @@ -30339,10 +33343,13 @@ /turf/open/floor/wood, /area/command/meeting_room) "orF" = ( -/obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/aft/secondary) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/stairs/right, +/area/hallway/primary/port) "orJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -30355,6 +33362,12 @@ /obj/structure/window/reinforced, /turf/open/floor/wood, /area/command/heads_quarters/captain) +"orQ" = ( +/obj/structure/fluff/railing, +/turf/open/floor/plasteel/stairs/right{ + dir = 8 + }, +/area/hallway/secondary/exit/departure_lounge) "orW" = ( /obj/structure/cable{ icon_state = "1-2" @@ -30371,14 +33384,8 @@ }, /turf/open/floor/plasteel, /area/commons/storage/auxiliary) -"ost" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engineering/main) "osy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) "osA" = ( @@ -30387,7 +33394,7 @@ /area/hallway/secondary/exit/departure_lounge) "osE" = ( /obj/structure/closet/secure_closet/captains, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/heads_quarters/captain) "osI" = ( /turf/closed/wall/r_wall, @@ -30396,16 +33403,15 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/airlock/public/glass{ - name = "Snow Airlock" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" - }, -/turf/open/floor/plasteel, +/obj/structure/rack/shelf, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/suit/hooded/wintercoat, +/turf/open/floor/plating, /area/commons/dorms) "ota" = ( /obj/effect/turf_decal/tile/yellow{ @@ -30437,6 +33443,14 @@ /obj/effect/turf_decal/tile/brown, /turf/open/floor/plasteel, /area/cargo/qm) +"otX" = ( +/obj/machinery/door/airlock{ + name = "Service Hall"; + req_one_access_txt = "25;26;35;28"; + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/disposal) "ouB" = ( /obj/structure/cable{ icon_state = "4-8" @@ -30449,22 +33463,38 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"ouT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/science/robotics/lab) "ouW" = ( /obj/machinery/atmospherics/pipe/simple, /obj/machinery/door/airlock/command/glass{ name = "Server Room"; req_access_txt = "30" }, -/turf/open/floor/plasteel/dark, +/obj/structure/fans/tiny, +/turf/open/floor/circuit/off, /area/science/server) "ovd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, /obj/effect/turf_decal/bot, /obj/effect/landmark/start/cargo_technician, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_whole" + }, /area/cargo/storage) "ovj" = ( /obj/structure/cable{ @@ -30475,9 +33505,18 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "ovF" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/wood, +/area/hallway/primary/port) "ovJ" = ( /obj/effect/turf_decal/bot, /obj/machinery/navbeacon{ @@ -30496,41 +33535,29 @@ }, /turf/open/floor/pod/dark, /area/maintenance/starboard) -"owe" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/main) "owg" = ( /obj/machinery/atmospherics/pipe/simple{ dir = 6 }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/white/line, /turf/open/floor/plasteel/dark, /area/science/server) "owE" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/item/pipe_dispenser, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/engineering/lobby) "owQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment{ dir = 10 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, /area/hallway/primary/port) "oxd" = ( /obj/structure/cable{ @@ -30543,7 +33570,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/hallway/primary/central) "oxf" = ( /turf/open/floor/plating, @@ -30570,7 +33597,7 @@ }, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "oyx" = ( /obj/structure/cable{ @@ -30582,7 +33609,10 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/hallway/primary/port) "ozw" = ( /obj/structure/chair{ @@ -30595,10 +33625,6 @@ /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2, /turf/open/floor/plating, /area/maintenance/department/electrical) -"ozX" = ( -/obj/structure/reflector/single, -/turf/open/floor/plating, -/area/engineering/storage) "oAe" = ( /obj/machinery/chem_heater, /obj/structure/disposalpipe/segment, @@ -30623,7 +33649,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/hallway/primary/central) "oBi" = ( /obj/structure/cable{ @@ -30656,12 +33682,22 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "oBs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /turf/closed/wall, /area/cargo/sorting) +"oBy" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "oBz" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -30675,22 +33711,29 @@ }, /turf/open/floor/plating, /area/security/checkpoint/medical) -"oBO" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +"oBB" = ( +/obj/structure/sign/poster/contraband/corn_oil{ + pixel_x = -32 }, -/turf/open/floor/engine, -/area/engineering/main) +/turf/open/floor/plasteel, +/area/service/hydroponics) "oBW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/table, +/obj/item/pipe_dispenser, +/obj/machinery/cell_charger, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/engineering/lobby) "oCb" = ( /obj/machinery/light{ dir = 1 @@ -30699,6 +33742,9 @@ dir = 4 }, /obj/machinery/disposal/bin, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "oCB" = ( @@ -30729,7 +33775,7 @@ /obj/machinery/camera{ c_tag = "Detective's Office" }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/security/detectives_office) "oCP" = ( /obj/structure/cable{ @@ -30769,13 +33815,19 @@ dir = 1; sortType = 28 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/corner{ + dir = 4; + icon_state = "darkcorner" + }, /area/hallway/primary/port) "oEq" = ( /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 10 }, /turf/open/floor/plasteel, @@ -30783,9 +33835,10 @@ "oEw" = ( /obj/structure/table, /obj/item/surgical_drapes, -/obj/item/surgicaldrill, /obj/item/razor, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/white/corner, +/turf/open/floor/plasteel/white, /area/medical/surgery) "oEE" = ( /obj/structure/table/wood, @@ -30800,11 +33853,8 @@ /turf/open/floor/carpet/royalblue, /area/commons/dorms) "oEG" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/turf/open/floor/plasteel, /area/hallway/primary/fore) "oES" = ( /obj/structure/cable{ @@ -30812,20 +33862,39 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"oFq" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +"oFk" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 }, +/obj/effect/turf_decal/bot, +/obj/machinery/disposal/bin, +/turf/open/floor/plasteel, +/area/hallway/primary/central) +"oFq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/wood, /area/commons/dorms) +"oFR" = ( +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "oGn" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /turf/open/floor/plasteel, /area/hallway/primary/aft) "oGp" = ( @@ -30854,11 +33923,12 @@ /turf/open/floor/plasteel/cafeteria, /area/science/xenobiology) "oHn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/space_heater, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 }, -/turf/closed/wall, -/area/hallway/primary/aft) +/turf/open/floor/plasteel, +/area/engineering/atmos) "oHy" = ( /obj/structure/cable{ icon_state = "4-8" @@ -30868,9 +33938,15 @@ }, /turf/open/floor/plasteel, /area/maintenance/aft/secondary) +"oHN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/turf/open/floor/wood, +/area/commons/dorms) "oHR" = ( -/obj/structure/filingcabinet/employment, -/turf/open/floor/plasteel/cult, +/obj/structure/filingcabinet, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) "oHS" = ( /obj/structure/cable{ @@ -30945,9 +34021,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "oJS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown{ dir = 8 }, @@ -30955,6 +34028,7 @@ /obj/effect/turf_decal/tile/brown{ dir = 1 }, +/obj/structure/window/reinforced, /turf/open/floor/plasteel, /area/cargo/sorting) "oJW" = ( @@ -30967,18 +34041,20 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plasteel/white, -/area/science/robotics/lab) -"oKB" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/computer/apc_control, -/obj/structure/cable{ - icon_state = "0-8" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, /turf/open/floor/plasteel, -/area/command/heads_quarters/ce) +/area/science/robotics/lab) +"oKB" = ( +/obj/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 10 + }, +/obj/structure/cable/yellow, +/obj/machinery/power/rad_collector/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "oKD" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -30995,11 +34071,20 @@ /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) "oKT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "oLa" = ( /obj/structure/cable{ icon_state = "4-8" @@ -31012,14 +34097,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/office) -"oLd" = ( -/obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" - }, -/obj/structure/fans/tiny, -/turf/open/floor/engine, -/area/engineering/atmospherics_engine) "oLj" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ @@ -31027,27 +34104,15 @@ freerange = 1; name = "Station Intercom (Command)" }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/meeting_room) -"oLr" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) "oLB" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/disposalpipe/sorting/mail/flip{ dir = 1; sortType = 22 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/commons/fitness) "oLL" = ( @@ -31058,11 +34123,9 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "oMi" = ( @@ -31091,6 +34154,7 @@ /obj/machinery/airalarm{ pixel_y = 28 }, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/maintenance/aft/secondary) "oMF" = ( @@ -31102,7 +34166,7 @@ icon_state = "0-8" }, /obj/machinery/power/smes, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) "oMG" = ( /obj/structure/cable{ @@ -31115,6 +34179,9 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, /turf/open/floor/plasteel, /area/cargo/storage) "oMW" = ( @@ -31142,21 +34209,6 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/plasteel/white, /area/science/misc_lab) -"oNC" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 6 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engineering/main) "oNL" = ( /obj/structure/cable{ icon_state = "1-2" @@ -31174,8 +34226,17 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "oNW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1; + icon_state = "steel_decals3" + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 10; + icon_state = "steel_decals3" }, /turf/open/floor/plasteel, /area/cargo/storage) @@ -31185,13 +34246,17 @@ pixel_y = 29 }, /obj/machinery/rnd/production/circuit_imprinter/department/science, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/dark, /area/science/robotics/lab) "oOE" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/cargo/storage) "oOW" = ( /obj/structure/table, @@ -31221,7 +34286,8 @@ name = "Station Intercom (General)"; pixel_x = -28 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel/dark, /area/science/robotics/lab) "oPm" = ( /obj/machinery/disposal/bin, @@ -31230,16 +34296,14 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "oPn" = ( -/obj/structure/closet/crate/secure/engineering{ - name = "Supermatter Shard Crate" - }, -/obj/machinery/power/supermatter_crystal/shard, -/turf/open/floor/plating, -/area/engineering/storage) +/turf/open/floor/plasteel, +/area/engineering/main) "oPu" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "oPv" = ( /obj/docking_port/stationary/random{ dir = 8; @@ -31255,6 +34319,18 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) +"oPD" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "oPL" = ( /obj/structure/cable{ icon_state = "1-2" @@ -31274,17 +34350,28 @@ "oPT" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "oPU" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/machinery/computer/atmos_control/tank/nitrous_tank{ - dir = 8 +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{ + pixel_y = 4; + pixel_x = -7 + }, +/obj/structure/sign/poster/contraband/starkist{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/white, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "oPX" = ( /obj/structure/cable{ icon_state = "1-8" @@ -31344,24 +34431,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/office) -"oRY" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4; - name = "east facing firelock" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" - }, -/obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room"; - req_access_txt = "10" - }, -/turf/open/floor/engine, -/area/engineering/main) "oRZ" = ( /turf/open/floor/plasteel/dark, /area/medical/morgue) @@ -31372,19 +34441,36 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/bridge) +"oSM" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1; + icon_state = "steel_decals3" + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 10; + icon_state = "steel_decals3" + }, +/turf/open/floor/plasteel, +/area/cargo/storage) "oSQ" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/decal/medium_gato, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/fitness) "oST" = ( @@ -31414,10 +34500,7 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "oUO" = ( -/obj/machinery/door/airlock{ - name = "Restroom" - }, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/wood, /area/mine/lobby) "oVc" = ( /obj/structure/cable{ @@ -31431,6 +34514,21 @@ }, /turf/closed/wall/r_wall, /area/science/mixing) +"oVC" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "oVK" = ( /obj/structure/closet/secure_closet/freezer/cream_pie, /turf/open/floor/wood, @@ -31439,9 +34537,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, /obj/machinery/light{ dir = 1 }, @@ -31454,26 +34549,26 @@ /obj/structure/sign/poster/official/build{ pixel_y = 32 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/hallway/primary/port) "oWm" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ - dir = 6 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/computer/atmos_control/tank/carbon_tank{ - dir = 8 - }, -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" }, /turf/open/floor/plasteel, -/area/engineering/atmos) +/area/engineering/main) "oXd" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output, +/turf/open/floor/engine/n2o, +/area/engineering/atmos) "oXN" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -31482,6 +34577,12 @@ dir = 4 }, /obj/machinery/autolathe, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/storage) "oYi" = ( @@ -31512,7 +34613,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) "pab" = ( /obj/machinery/light/small{ @@ -31521,6 +34622,12 @@ /obj/structure/janitorialcart, /turf/open/floor/plasteel, /area/service/janitor) +"par" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engineering/storage/tech) "pau" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, @@ -31577,7 +34684,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/central) "pbL" = ( /obj/structure/cable{ @@ -31585,15 +34692,18 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) -"pbN" = ( -/obj/structure/cable, -/turf/open/floor/plasteel/dark, -/area/engineering/supermatter) "pbQ" = ( /obj/structure/table, /obj/machinery/reagentgrinder, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) +"pdd" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "pdD" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -31607,11 +34717,6 @@ /obj/machinery/vending/security, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) -"peC" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/service, -/turf/open/floor/plasteel/dark, -/area/engineering/storage/tech) "peI" = ( /obj/structure/table, /obj/item/soap/nanotrasen, @@ -31629,19 +34734,9 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "peV" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/door/window/southleft{ - dir = 4; - name = "Test Chamber"; - req_access_txt = "55" - }, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/obj/structure/sign/warning/gato/docking, +/turf/closed/wall/r_wall, +/area/icemoon/surface/outdoors) "pff" = ( /obj/machinery/vending/medical, /turf/open/floor/plasteel/white, @@ -31654,12 +34749,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "pfN" = ( @@ -31682,7 +34780,6 @@ /turf/open/floor/wood, /area/command/heads_quarters/captain) "pgX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -31707,6 +34804,12 @@ pixel_x = 4; pixel_y = -2 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, /area/cargo/storage) "phc" = ( @@ -31763,22 +34866,9 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "phx" = ( -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" - }, -/turf/open/floor/engine, -/area/engineering/supermatter) +/obj/effect/landmark/blobstart, +/turf/open/floor/plating, +/area/engineering/storage/tech) "phF" = ( /obj/structure/cable{ icon_state = "4-8" @@ -31827,21 +34917,40 @@ name = "Dormitory"; dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/wood, /area/commons/dorms) "piO" = ( /turf/closed/wall, /area/cargo/storage) "piP" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ +/obj/machinery/power/apc/highcap/fifteen_k{ + areastring = "/area/engineering/main"; + name = "Engineering APC"; + pixel_y = -24 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor/plasteel, +/area/engineering/main) +"pjd" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 4 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) -"piS" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plasteel/dark, -/area/hallway/primary/fore) +/obj/machinery/meter/atmos/atmos_waste_loop, +/turf/open/floor/plasteel, +/area/engineering/atmos) "pjg" = ( /obj/machinery/door/firedoor/border_only{ dir = 1; @@ -31863,9 +34972,6 @@ /turf/open/floor/engine, /area/science/misc_lab) "pjJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/plasteel/grimy, /area/service/bar) @@ -31882,27 +34988,18 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "pku" = ( -/obj/effect/turf_decal/tile/yellow{ +/obj/machinery/portable_atmospherics/canister/toxins, +/obj/machinery/light{ dir = 8 }, -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) +/turf/open/floor/plating, +/area/engineering/storage) "pkz" = ( /obj/structure/cable{ icon_state = "1-8" }, /turf/open/floor/circuit/off, /area/ai_monitored/turret_protected/ai) -"pkH" = ( -/obj/structure/fluff/railing{ - dir = 10 - }, -/turf/open/openspace/icemoon, -/area/engineering/atmospherics_engine) "pkL" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -31915,6 +35012,15 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel, /area/maintenance/aft/secondary) +"pkN" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "pkX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -31951,32 +35057,15 @@ /turf/open/floor/plating, /area/maintenance/aft/secondary) "plU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/commons/fitness) "pmw" = ( -/obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" - }, +/obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, /turf/open/floor/plating, -/area/engineering/secure_construction) -"pmx" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) +/area/commons/storage/primary) "pmN" = ( /obj/structure/cable{ icon_state = "0-2" @@ -31992,18 +35081,27 @@ "pmS" = ( /turf/open/floor/plasteel, /area/service/hydroponics) +"pmV" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 10 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "pne" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock{ - name = "Crematorium"; - req_access_txt = "27" - }, /obj/machinery/door/firedoor/border_only{ dir = 8; name = "west facing firelock" }, +/obj/machinery/door/airlock{ + name = "Crematorium"; + req_access_txt = "27"; + dir = 8 + }, /turf/open/floor/plasteel/cafeteria, /area/service/chapel/office) "pno" = ( @@ -32015,10 +35113,15 @@ name = "Security Office"; req_access_txt = "63" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "pnJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/open/floor/plasteel, @@ -32033,28 +35136,30 @@ req_access_txt = "22" }, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/dark, +/turf/open/floor/catwalk_floor, /area/service/chapel/office) "pnU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/command/heads_quarters/ce) -"pnV" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 8 + }, +/obj/effect/turf_decal/stripes/full, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"pod" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, /turf/open/floor/engine, -/area/engineering/main) -"pos" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/turf/closed/wall/r_wall, -/area/engineering/main) +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "poD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -32086,10 +35191,13 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/open/floor/plasteel, @@ -32098,19 +35206,35 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/decal/big_gato, -/turf/open/floor/plasteel, -/area/maintenance/aft) -"ppw" = ( -/obj/structure/cable, -/obj/machinery/suit_storage_unit/ce, -/obj/machinery/power/apc/highcap/five_k{ - areastring = "/area/command/heads_quarters/ce"; - name = "CE Office APC"; - pixel_y = -24 +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "steel_decals5" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 }, /turf/open/floor/plasteel, -/area/command/heads_quarters/ce) +/area/maintenance/aft) +"ppr" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/table, +/obj/item/pipe_dispenser, +/obj/item/pipe_dispenser, +/turf/open/floor/plasteel, +/area/engineering/main) +"ppy" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1, +/obj/effect/spawner/structure/window/plasma/reinforced, +/turf/open/floor/plating, +/area/engineering/atmos) "pqq" = ( /obj/structure/cable{ icon_state = "1-2" @@ -32145,6 +35269,10 @@ /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plasteel, /area/construction/storage_wing) +"prz" = ( +/obj/structure/sign/warning/nosmoking, +/turf/closed/wall, +/area/engineering/engine_smes) "psg" = ( /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ @@ -32153,6 +35281,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, /area/medical/virology) +"psi" = ( +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "psm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -32175,15 +35314,27 @@ /turf/open/floor/carpet, /area/service/chapel/main) "ptl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/holopad, +/turf/open/floor/plasteel/dark/side{ + dir = 1 }, -/obj/machinery/door/airlock{ - id_tag = "Dorm5"; - name = "Room Four" +/area/hallway/primary/port) +"ptt" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" }, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/area/hallway/primary/aft) +"ptG" = ( +/obj/structure/chair/comfy/brown{ + color = "#596479"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/turf/open/floor/carpet, +/area/service/bar) "ptH" = ( /obj/machinery/airalarm{ dir = 4; @@ -32195,6 +35346,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, /turf/open/floor/circuit, /area/science/robotics/mechbay) "puf" = ( @@ -32204,12 +35358,23 @@ /turf/open/openspace/icemoon, /area/icemoon/surface/outdoors) "puj" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/components/binary/pump, /turf/open/floor/plasteel, -/area/engineering/atmos) +/area/commons/storage/primary) +"puy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + dir = 4; + id = "ceprivacy"; + name = "privacy shutter" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/command/heads_quarters/ce) "puz" = ( /obj/structure/table, /obj/item/storage/firstaid/o2, @@ -32230,7 +35395,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -32240,6 +35404,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/storage) "pvc" = ( @@ -32299,14 +35469,15 @@ /turf/open/floor/plasteel/dark, /area/tcommsat/computer) "pvY" = ( -/obj/machinery/door/airlock/research{ - name = "Toxins Launch Room"; - req_access_txt = "7" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research{ + name = "Toxins Launch Room"; + req_access_txt = "7"; + dir = 4 + }, /turf/open/floor/plasteel, /area/science/mixing) "pwh" = ( @@ -32315,8 +35486,26 @@ /area/cargo/storage) "pwp" = ( /obj/effect/landmark/start/janitor, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, /turf/open/floor/plasteel, /area/service/janitor) +"pwy" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "pwE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -32361,6 +35550,12 @@ }, /obj/structure/closet/emcloset, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/storage) "pxP" = ( @@ -32391,23 +35586,16 @@ /turf/open/floor/plating, /area/maintenance/aft/secondary) "pya" = ( -/obj/structure/cable{ - icon_state = "0-8" +/obj/structure/closet/crate/solarpanel_small, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" +/obj/machinery/door/window{ + dir = 1 }, /turf/open/floor/plasteel/dark, -/area/engineering/supermatter) -"pyc" = ( -/obj/structure/closet/firecloset/full{ - anchored = 1 - }, -/turf/open/floor/plating, /area/engineering/main) "pyt" = ( /obj/structure/chair/sofa/right{ @@ -32416,17 +35604,8 @@ /turf/open/floor/glass/reinforced, /area/commons/fitness) "pyL" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/airalarm{ - pixel_y = 28 - }, -/obj/machinery/power/smes/engineering, -/turf/open/floor/plasteel, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/engineering/main) "pzj" = ( /obj/effect/turf_decal/tile/brown, @@ -32458,9 +35637,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/public/glass{ - name = "Snow Airlock" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -32470,14 +35646,25 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/door/airlock/public/glass{ + name = "Snow Airlock"; + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"pAk" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/turf/open/floor/plating, +/area/engineering/atmos) "pAl" = ( /obj/machinery/light, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) "pAn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/door/airlock{ name = "Bar"; req_access_txt = "25" @@ -32487,6 +35674,7 @@ name = "north facing firelock" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/service/bar) "pAy" = ( @@ -32496,16 +35684,15 @@ /turf/open/floor/plating, /area/maintenance/disposal) "pAB" = ( -/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ - dir = 4 +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ + dir = 8 }, -/obj/machinery/meter, /turf/open/floor/plasteel, /area/engineering/atmos) "pAL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/hallway/primary/central) "pBp" = ( /obj/effect/turf_decal/tile/red, @@ -32539,6 +35726,12 @@ /turf/open/floor/plasteel/dark, /area/mine/maintenance) "pBN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/carpet/gato, /area/commons/dorms) "pCt" = ( @@ -32548,6 +35741,12 @@ }, /turf/open/floor/plating, /area/maintenance/department/electrical) +"pCK" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "pCW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, @@ -32651,25 +35850,38 @@ /turf/open/floor/plasteel, /area/maintenance/aft/secondary) "pFI" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" - }, -/obj/machinery/door/firedoor/border_only{ - name = "south facing firelock" - }, -/obj/machinery/door/airlock/public/glass{ - name = "Central Access" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) +/obj/machinery/atmospherics/components/trinary/filter, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "pFM" = ( -/obj/machinery/portable_atmospherics/scrubber/huge, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, +/obj/structure/bookcase/random, +/turf/open/floor/carpet/orange, +/area/service/library) "pFN" = ( /turf/open/floor/glass/reinforced, /area/commons/fitness) +"pFX" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + dir = 4; + id = "ceprivacy"; + name = "privacy shutter" + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/command/heads_quarters/ce) "pGe" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -32687,18 +35899,17 @@ /obj/structure/closet{ name = "Evidence Closet" }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/security/office) "pGs" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "packageSort2" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/open/floor/plating, -/area/cargo/sorting) +/obj/structure/girder, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "pGu" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -32713,6 +35924,20 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/maintenance/aft/secondary) +"pGz" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/catwalk_floor, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "pGD" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -32729,6 +35954,9 @@ }, /turf/open/floor/plasteel/grimy, /area/commons/fitness/recreation) +"pGQ" = ( +/turf/closed/wall, +/area/engineering/lobby) "pHa" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -32758,7 +35986,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/central) "pHC" = ( /obj/machinery/rnd/server, @@ -32793,6 +36021,12 @@ }, /turf/open/floor/plasteel/white, /area/medical/genetics) +"pHZ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/turf/open/floor/wood, +/area/service/bar) "pIj" = ( /obj/machinery/requests_console{ department = "Genetics"; @@ -32828,24 +36062,39 @@ /obj/item/stack/sheet/mineral/wood, /turf/open/floor/carpet/royalblue, /area/commons/dorms) -"pJf" = ( +"pJp" = ( +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "engsm"; + name = "Radiation Shutters Control"; + pixel_x = 24; + req_access_txt = "10" + }, /turf/open/floor/engine, -/area/engineering/atmospherics_engine) +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "pJE" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel, /area/hallway/primary/fore) "pJQ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 1 }, /obj/machinery/light, -/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/hallway/primary/aft) "pJR" = ( /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + icon_state = "floor_whole" + }, /area/cargo/storage) "pKo" = ( /obj/structure/cable{ @@ -32857,9 +36106,16 @@ /turf/open/floor/plasteel, /area/commons/storage/auxiliary) "pLc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall/r_wall, -/area/engineering/secure_construction) +/obj/machinery/door/airlock/public/glass{ + name = "Primary Tool Storage" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "pLm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/blue, @@ -32884,6 +36140,11 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) +"pLI" = ( +/turf/open/floor/catwalk_floor, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "pLK" = ( /obj/machinery/door/airlock/public/glass{ name = "Snow Airlock" @@ -32896,20 +36157,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) -"pLQ" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer3{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/engineering/atmospherics_engine) "pMj" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, /turf/open/floor/wood, /area/commons/dorms) "pMm" = ( @@ -32936,7 +36193,7 @@ /turf/open/floor/carpet, /area/command/corporate_showroom) "pOn" = ( -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/hallway/primary/central) "pOA" = ( /obj/structure/extinguisher_cabinet{ @@ -32944,18 +36201,6 @@ }, /turf/open/floor/wood, /area/service/bar) -"pOD" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "pOF" = ( /obj/structure/cable{ icon_state = "1-2" @@ -32963,15 +36208,18 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/light{ dir = 4 }, /obj/structure/disposalpipe/junction/flip{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, /turf/open/floor/plasteel, /area/commons/fitness) "pOI" = ( @@ -33076,20 +36324,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/security/courtroom) -"pQI" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "pRR" = ( /obj/structure/cable{ icon_state = "1-2" @@ -33119,10 +36355,11 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "pSy" = ( +/obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ + dir = 4; name = "Holodeck Door" }, -/obj/machinery/door/firedoor, /turf/open/floor/wood, /area/commons/dorms) "pSL" = ( @@ -33132,9 +36369,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/reagent_dispensers/watertank, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/hallway/primary/aft) "pSX" = ( /turf/open/floor/plasteel/cafeteria, /area/service/chapel/office) @@ -33179,6 +36415,23 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/commons/dorms) +"pTv" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "pTB" = ( /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -33197,13 +36450,13 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/structure/fans/tiny, /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; req_access_txt = "48"; - shuttledocked = 1 + shuttledocked = 1; + dir = 8 }, -/obj/structure/fans/tiny, -/obj/structure/barricade/wooden/snowed, /turf/open/floor/plating, /area/maintenance/aft/secondary) "pUa" = ( @@ -33227,6 +36480,12 @@ /obj/machinery/light_switch{ pixel_y = -23 }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) "pVu" = ( @@ -33238,6 +36497,10 @@ name = "Station Intercom (General)"; pixel_x = -28 }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 + }, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) "pWg" = ( @@ -33261,31 +36524,14 @@ }, /turf/open/floor/carpet, /area/service/chapel/main) -"pWx" = ( -/turf/closed/indestructible/rock/glacierrock/blue, -/area/engineering/secure_construction) -"pWB" = ( -/obj/machinery/door/firedoor/border_only{ - name = "south facing firelock" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" - }, -/obj/machinery/door/airlock/engineering/glass{ - name = "TEG Engine Room"; - req_access_txt = "10" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "pWI" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /turf/open/floor/wood, /area/commons/dorms) "pWU" = ( @@ -33318,12 +36564,11 @@ /turf/open/floor/plasteel, /area/mine/eva) "pXa" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, /turf/open/floor/plating, -/area/engineering/main) +/area/engineering/storage/tech) "pXc" = ( /obj/machinery/light{ dir = 1 @@ -33331,6 +36576,7 @@ /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, /obj/item/storage/toolbox/emergency, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel, /area/hallway/primary/fore) "pXe" = ( @@ -33361,40 +36607,47 @@ /area/maintenance/department/electrical) "pXC" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plating, /area/maintenance/disposal) "pXS" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/machinery/holopad, /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/plasteel, -/area/command/heads_quarters/ce) -"pYC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, /turf/open/floor/plasteel, -/area/engineering/atmos) -"pYW" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/area/command/heads_quarters/ce) +"pXV" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 }, /turf/open/floor/engine, -/area/engineering/main) +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"pYC" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Mix to Waste" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "pZv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -33402,15 +36655,15 @@ /turf/closed/wall/r_wall, /area/medical/genetics) "pZD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, /obj/structure/closet/secure_closet/atmospherics, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 }, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 5 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "pZF" = ( @@ -33429,19 +36682,27 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) -"pZY" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +"pZW" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, /turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/area/hallway/primary/fore) +"pZY" = ( +/obj/machinery/power/apc{ + areastring = "/area/service/library"; + dir = 4; + name = "Library APC"; + pixel_x = 24 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/wood, +/area/service/library) "qae" = ( /obj/machinery/door/airlock{ id_tag = "Dorm2"; @@ -33450,7 +36711,9 @@ /obj/machinery/door/firedoor/border_only{ name = "south facing firelock" }, -/turf/open/floor/carpet/blue, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/wood, /area/commons/dorms) "qag" = ( /obj/structure/cable{ @@ -33466,10 +36729,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3, /turf/open/floor/wood, /area/commons/dorms) "qaj" = ( @@ -33485,11 +36748,8 @@ }, /obj/vehicle/ridden/atv/snowmobile, /obj/item/key, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) @@ -33497,6 +36757,11 @@ /obj/item/beacon, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"qaL" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/turf/open/floor/wood, +/area/service/library) "qaM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -33505,7 +36770,6 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "qaQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-2" }, @@ -33516,6 +36780,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/wood, /area/hallway/primary/port) "qbp" = ( @@ -33524,28 +36792,36 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) +"qbC" = ( +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, +/area/hallway/primary/port) "qbG" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_x = 30 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/plasteel/freezer, /area/commons/dorms) -"qbK" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "qcx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 + dir = 4 }, -/obj/structure/closet/firecloset, +/obj/structure/table, +/obj/item/clothing/glasses/welding, +/obj/item/multitool, +/obj/item/clothing/head/welding{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/clothing/head/welding{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/pipe_dispenser, +/obj/item/pipe_dispenser, /turf/open/floor/plasteel, /area/engineering/atmos) "qcH" = ( @@ -33559,10 +36835,6 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "qcI" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Gen-Pop Access"; - req_access_txt = "2" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -33574,6 +36846,11 @@ dir = 8; name = "west facing firelock" }, +/obj/machinery/door/airlock/security/glass{ + name = "Gen-Pop Access"; + req_access_txt = "2"; + dir = 8 + }, /turf/open/floor/plasteel, /area/security/prison) "qdm" = ( @@ -33584,7 +36861,6 @@ /turf/open/floor/plasteel/dark, /area/service/hydroponics) "qdp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -33614,12 +36890,19 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"qdx" = ( +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/wood, +/area/hallway/primary/port) "qdy" = ( /obj/structure/disposalpipe/trunk{ dir = 4 }, /obj/machinery/disposal/bin, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/robotics/lab) "qdK" = ( /obj/structure/cable{ @@ -33648,11 +36931,8 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "qeA" = ( -/obj/effect/turf_decal/vg_decals/atmos/nitrous_oxide, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/engine/n2o, +/obj/machinery/atmospherics/miner/nitrogen, +/turf/open/floor/engine/n2, /area/engineering/atmos) "qeM" = ( /obj/effect/turf_decal/tile/red{ @@ -33675,7 +36955,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/command/heads_quarters/hop) "qfc" = ( /obj/structure/cable{ @@ -33684,23 +36964,30 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/door/airlock/security{ - name = "Brig"; - req_access_txt = "63; 42" - }, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" }, +/obj/machinery/door/airlock/security{ + name = "Brig"; + req_access_txt = "63; 42"; + dir = 4 + }, /turf/open/floor/wood, /area/security/brig) "qfg" = ( -/obj/machinery/atmospherics/pipe/manifold4w/yellow/visible, -/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ - dir = 8 - }, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output, +/turf/open/floor/engine/airless, /area/engineering/atmos) +"qfl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel{ + dir = 4; + icon_state = "floor_trim" + }, +/area/hallway/secondary/exit/departure_lounge) "qfK" = ( /obj/structure/cable{ icon_state = "2-4" @@ -33716,12 +37003,22 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"qfX" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, +"qfQ" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/main) +"qfX" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/fore) "qfZ" = ( @@ -33739,8 +37036,26 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "qgh" = ( -/turf/closed/wall/r_wall, -/area/engineering/storage) +/obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/command/heads_quarters/ce"; + name = "CE Office APC"; + pixel_y = -24 + }, +/obj/structure/closet/secure_closet/engineering_chief, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/light, +/obj/item/holosign_creator/atmos, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/command/heads_quarters/ce) "qgk" = ( /turf/open/floor/carpet, /area/mine/lobby) @@ -33767,17 +37082,33 @@ /turf/open/floor/wood, /area/maintenance/bar) "qgX" = ( -/obj/effect/turf_decal/tile/yellow{ +/obj/structure/rack, +/obj/effect/spawner/lootdrop/techstorage/tcomms, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engineering/storage/tech) +"qhi" = ( +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/engineering/storage/tech) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "qhB" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible, -/turf/open/floor/plasteel, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 5 + }, +/turf/open/floor/plating, /area/engineering/atmos) "qhO" = ( /obj/structure/table/reinforced, @@ -33792,12 +37123,31 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/medical/medbay/central) "qid" = ( -/obj/structure/chair/office/dark, -/turf/open/floor/wood, -/area/service/library) +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel{ + icon_state = "floor_trim" + }, +/area/hallway/secondary/exit/departure_lounge) "qii" = ( /obj/item/clothing/glasses/hud/health, /obj/structure/closet/secure_closet/medical3, @@ -33843,12 +37193,12 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, /turf/open/floor/plasteel, /area/commons/fitness) "qkr" = ( @@ -33856,29 +37206,49 @@ /turf/open/floor/plasteel, /area/science/misc_lab) "qkx" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/plasteel, -/area/engineering/main) +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/plasteel/white, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "qkH" = ( /obj/structure/fans/tiny, /obj/structure/mineral_door/woodrustic, /turf/open/floor/wood, /area/icemoon/surface/outdoors) -"qkO" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1; - name = "Gas to Cooling Loop" +"qlg" = ( +/obj/structure/table/wood/poker, +/obj/item/pen/red, +/turf/open/floor/carpet/green, +/area/service/library) +"qli" = ( +/obj/structure/table/wood/poker, +/obj/item/clothing/mask/cigarette/cigar{ + pixel_x = 6 }, -/turf/open/floor/plating, -/area/engineering/atmospherics_engine) +/turf/open/floor/wood, +/area/hallway/primary/port) +"qlo" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "qlt" = ( /turf/closed/wall/r_wall, /area/security/office) "qlu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) "qma" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ @@ -33886,6 +37256,12 @@ }, /turf/open/floor/engine, /area/science/misc_lab) +"qmh" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/holopad, +/turf/open/floor/plasteel, +/area/service/hydroponics) "qmi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel, @@ -33904,19 +37280,6 @@ /obj/item/gavelhammer, /turf/open/floor/wood, /area/security/courtroom) -"qmw" = ( -/obj/machinery/button/door{ - id = "tegheat"; - name = "TEG Heatshield"; - pixel_y = 25 - }, -/obj/machinery/button/ignition{ - id = "Incinerator"; - pixel_x = -1; - pixel_y = 35 - }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "qmD" = ( /obj/machinery/vending/dinnerware{ contraband = list(/obj/item/kitchen/rollingpin=2,/obj/item/kitchen/knife/butcher=2,/obj/item/reagent_containers/food/condiment/flour=4) @@ -33959,13 +37322,6 @@ /obj/item/toy/plush/beeplushie, /turf/open/floor/plasteel, /area/security/prison) -"qnH" = ( -/obj/machinery/power/emitter, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/plating, -/area/engineering/storage) "qog" = ( /obj/structure/chair{ dir = 8 @@ -33973,7 +37329,15 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel{ + dir = 8; + icon_state = "floor_whole" + }, /area/medical/surgery) "qop" = ( /obj/structure/tank_dispenser, @@ -33993,25 +37357,16 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/department/electrical) -"qoG" = ( -/obj/structure/cable{ - icon_state = "4-8" +"qoZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{ + dir = 8 }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/main) +/turf/open/floor/engine/co2, +/area/engineering/atmos) "qpm" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/medical/glass{ - id_tag = "GeneticsDoor"; - name = "Genetics"; - req_access_txt = "5; 68" - }, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, @@ -34024,6 +37379,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "GeneticsDoor"; + name = "Genetics"; + req_access_txt = "5; 68"; + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/genetics) "qpr" = ( @@ -34049,24 +37410,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"qqo" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +"qpV" = ( +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/turf/open/floor/plasteel, +/area/science/robotics/lab) +"qqa" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) "qqs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -34084,17 +37439,28 @@ /obj/item/reagent_containers/rag, /turf/open/floor/wood, /area/maintenance/bar) -"qqQ" = ( -/obj/machinery/field/generator, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 20 - }, +"qqS" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/simple/yellow/visible, /turf/open/floor/plating, -/area/engineering/storage) +/area/engineering/atmos) +"qqT" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "qqV" = ( /obj/machinery/space_heater, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, /area/commons/dorms) "qqZ" = ( /obj/structure/cable{ @@ -34110,6 +37476,12 @@ /area/hallway/primary/central) "qrj" = ( /obj/machinery/telecomms/bus/preset_two, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/end{ + dir = 4 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "qrl" = ( @@ -34151,21 +37523,42 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/turf/open/floor/carpet, +/turf/open/floor/plasteel, /area/hallway/primary/port) "qsf" = ( -/obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"qsv" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/plasteel, +/area/engineering/lobby) "qsy" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/effect/turf_decal/stripes/white/line{ + dir = 9; + icon_state = "steel_decals3" + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8; + icon_state = "steel_decals3" + }, /turf/open/floor/plasteel, /area/cargo/storage) "qsF" = ( @@ -34205,11 +37598,22 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "qtn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ dir = 4 }, -/turf/closed/wall, -/area/service/janitor) +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/cargo/storage) "qto" = ( /obj/structure/cable{ icon_state = "4-8" @@ -34230,16 +37634,9 @@ /turf/open/floor/plasteel/dark, /area/command/teleporter) "qtB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/vending/tool, -/turf/open/floor/plasteel, -/area/commons/storage/primary) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/engine, +/area/engineering/supermatter) "qtW" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -34252,20 +37649,22 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "quj" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable{ + icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/engineering/lobby) "qus" = ( /obj/structure/closet/firecloset/full{ anchored = 1 @@ -34277,15 +37676,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, /area/engineering/atmos) -"qvQ" = ( -/obj/machinery/vending/engivend, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 +"qvD" = ( +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/engineering/main) +/turf/open/floor/plating, +/area/engineering/storage/tech) "qwy" = ( /obj/machinery/airalarm{ dir = 1; @@ -34306,12 +37702,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone3) -"qwI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/commons/storage/primary) "qwM" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -34345,9 +37735,6 @@ /area/command/bridge) "qyt" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable{ icon_state = "0-2" }, @@ -34380,13 +37767,18 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/power/apc{ areastring = "/area/service/theater"; dir = 1; name = "Theatre APC"; pixel_y = 23 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, /turf/open/floor/wood, /area/service/theater) "qyV" = ( @@ -34406,6 +37798,7 @@ /area/maintenance/aft/secondary) "qza" = ( /obj/effect/landmark/start/cargo_technician, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/pod/dark, /area/maintenance/starboard) "qzc" = ( @@ -34436,9 +37829,6 @@ dir = 4; name = "east facing firelock" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -34462,7 +37852,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/circuit/off, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "qAd" = ( /obj/structure/cable{ @@ -34478,9 +37868,17 @@ /turf/open/floor/plating, /area/maintenance/department/electrical) "qAi" = ( -/obj/machinery/atmospherics/components/binary/pump/on, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engineering/atmos) +"qAy" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/engineering/supermatter) "qAz" = ( /obj/structure/cable{ icon_state = "1-2" @@ -34539,6 +37937,14 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) +"qBz" = ( +/obj/structure/table/wood, +/obj/item/ashtray, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/service/bar) "qBH" = ( /obj/structure/cable{ icon_state = "0-8" @@ -34547,7 +37953,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "qBN" = ( /obj/machinery/light, @@ -34558,9 +37964,6 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, /obj/structure/closet/wardrobe/mixed, /turf/open/floor/wood, /area/commons/dorms) @@ -34612,14 +38015,18 @@ /obj/structure/cable{ icon_state = "0-4" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "qDM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 4 }, -/turf/closed/wall/r_wall, -/area/maintenance/department/bridge) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" + }, +/turf/open/floor/wood, +/area/commons/dorms) "qDR" = ( /obj/structure/cable{ icon_state = "4-8" @@ -34652,21 +38059,24 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 1 }, /obj/structure/disposalpipe/sorting/mail{ dir = 4; sortType = 18 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "qEx" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 10 +/obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{ + dir = 1; + on = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/atmos) "qEL" = ( /obj/structure/disposalpipe/segment{ @@ -34685,15 +38095,22 @@ dir = 8; name = "west facing firelock" }, -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay"; - req_access_txt = "31" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/mining/glass{ + name = "Cargo Bay"; + req_access_txt = "31"; + dir = 8 + }, /turf/open/floor/plasteel, /area/cargo/storage) +"qFf" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/engine, +/area/engineering/supermatter) "qFg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 @@ -34744,9 +38161,6 @@ /turf/open/floor/plasteel/grimy, /area/service/chapel/main) "qFT" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -34765,8 +38179,16 @@ /obj/machinery/camera{ c_tag = "Corporate Showroom" }, +/obj/structure/showcase/mecha/marauder, /turf/open/floor/carpet, /area/command/corporate_showroom) +"qGu" = ( +/obj/machinery/atmospherics/pipe/manifold/yellow/visible{ + dir = 8 + }, +/obj/machinery/meter, +/turf/open/floor/plasteel, +/area/engineering/atmos) "qGK" = ( /obj/structure/cable{ icon_state = "1-8" @@ -34803,6 +38225,7 @@ }, /obj/effect/turf_decal/tile/green, /obj/machinery/vending/snack/random, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel, /area/commons/fitness) "qHe" = ( @@ -34822,12 +38245,13 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "qHH" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4 +/obj/structure/chair/sofa/corp/right{ + dir = 1 }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/engine, -/area/engineering/main) +/turf/open/floor/carpet/orange, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "qIb" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/britcup{ @@ -34838,7 +38262,7 @@ name = "Medbay"; req_access_txt = "5" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "qIg" = ( /turf/open/floor/engine{ @@ -34853,14 +38277,14 @@ /turf/open/floor/plasteel, /area/maintenance/starboard) "qIy" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 }, -/obj/structure/chair{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) +/turf/open/floor/wood, +/area/commons/dorms) "qIE" = ( /obj/structure/window/reinforced{ dir = 1 @@ -34874,12 +38298,10 @@ /obj/machinery/sleeper{ dir = 4 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/box/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "qIU" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Snow Airlock" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -34890,6 +38312,10 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/airlock/public/glass{ + name = "Snow Airlock"; + dir = 8 + }, /turf/open/floor/plating, /area/hallway/primary/aft) "qJi" = ( @@ -34904,10 +38330,13 @@ /turf/open/floor/wood, /area/hallway/secondary/exit/departure_lounge) "qJo" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 1 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 10 }, /turf/open/floor/plasteel, @@ -34961,11 +38390,6 @@ }, /turf/open/floor/plasteel/dark, /area/tcommsat/computer) -"qKp" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/plating, -/area/engineering/main) "qKw" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -34983,18 +38407,28 @@ dir = 1; pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/service/hydroponics) "qKy" = ( -/obj/machinery/door/airlock/maintenance, -/turf/open/floor/plating, -/area/maintenance/aft/secondary) +/obj/structure/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/wood, +/area/service/library) +"qKE" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/vg_decals/atmos/nitrous_oxide, +/turf/open/floor/engine/n2o, +/area/engineering/atmos) "qKM" = ( /obj/structure/table, /obj/item/ai_module/core/full/custom, @@ -35023,12 +38457,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, /area/commons/fitness) "qLV" = ( @@ -35049,19 +38486,12 @@ }, /area/hallway/secondary/entry) "qMm" = ( -/obj/machinery/atmospherics/miner/toxins, -/turf/open/floor/engine/plasma, -/area/engineering/atmos) -"qMB" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/obj/machinery/camera{ - c_tag = "TEG East"; - dir = 8 - }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "qMI" = ( /obj/effect/landmark/start/cargo_technician, /obj/structure/disposalpipe/segment{ @@ -35120,6 +38550,11 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) +"qNW" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel, +/area/engineering/atmos) "qOa" = ( /obj/machinery/door/airlock/atmos/abandoned{ name = "Atmospherics Maintenance"; @@ -35134,10 +38569,14 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "qOu" = ( @@ -35163,8 +38602,14 @@ pixel_y = 36 }, /obj/machinery/computer/med_data/laptop, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/security/detectives_office) +"qOG" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/engine/airless, +/area/engineering/atmos) "qOS" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on, /turf/open/floor/plating/snowed/smoothed/icemoon, @@ -35172,9 +38617,40 @@ "qPj" = ( /turf/open/floor/plasteel/dark, /area/security/office) +"qPk" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark/corner{ + dir = 1 + }, +/area/hallway/primary/port) "qPD" = ( /turf/closed/wall/r_wall, /area/command/heads_quarters/rd) +"qQd" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/chair/beanbag, +/turf/open/floor/plasteel/white, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) +"qQt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/item/beacon, +/turf/open/floor/carpet, +/area/commons/dorms) "qQO" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -35183,9 +38659,16 @@ /turf/open/floor/plasteel, /area/cargo/storage) "qRu" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, +/obj/machinery/atmospherics/components/binary/pump{ + name = "N2O to Pure" + }, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel, /area/engineering/atmos) "qRH" = ( /turf/open/floor/plasteel/white, @@ -35193,7 +38676,9 @@ "qSc" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, -/area/engineering/main) +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "qSi" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -35239,6 +38724,19 @@ }, /turf/open/floor/plasteel/white/side, /area/hallway/primary/port) +"qTw" = ( +/obj/machinery/light, +/obj/item/stack/marker_beacon{ + anchored = 1; + icon_state = "markerburgundy-on"; + light_color = "#FA644B"; + light_power = 3; + light_range = 2; + name = "landing marker"; + picked_color = "Burgundy" + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/hallway/secondary/exit/departure_lounge) "qTE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -35253,13 +38751,11 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "qTN" = ( -/obj/machinery/cryopod{ - dir = 8 +/obj/machinery/cryopod/tele, +/obj/machinery/light{ + dir = 4 }, -/obj/machinery/computer/cryopod{ - pixel_x = 32 - }, -/turf/open/floor/plasteel, +/turf/open/floor/pod/dark, /area/hallway/secondary/exit/departure_lounge) "qTQ" = ( /obj/structure/frame/machine, @@ -35282,8 +38778,14 @@ /turf/open/floor/plasteel/freezer, /area/service/kitchen) "qUo" = ( -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) +/obj/machinery/power/emitter/anchored{ + state = 2 + }, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "qUw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -35322,7 +38824,10 @@ dir = 1; icon_state = "warningline" }, -/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 8; + pixel_x = -8 + }, /turf/open/floor/plasteel, /area/mine/eva) "qVe" = ( @@ -35341,7 +38846,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/public/glass{ name = "Central Access" }, @@ -35353,29 +38857,35 @@ name = "north facing firelock" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"qVP" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/turf/open/floor/plasteel/dark, -/area/engineering/supermatter) "qVU" = ( /obj/machinery/door/morgue{ name = "Confession Booth" }, /turf/open/floor/plasteel/grimy, /area/service/chapel/main) +"qVX" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/r_wall, +/area/maintenance/aft) "qWa" = ( /obj/machinery/vending/cola/random, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/dark, /area/hallway/primary/aft) "qWb" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "qWd" = ( @@ -35388,9 +38898,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "qWk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/disposalpipe/junction/flip{ dir = 8 }, @@ -35401,7 +38908,9 @@ dir = 1 }, /turf/closed/wall/r_wall, -/area/engineering/main) +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "qWy" = ( /obj/machinery/iv_drip, /obj/effect/turf_decal/tile/blue{ @@ -35457,34 +38966,39 @@ /obj/structure/table, /obj/item/clothing/neck/stethoscope, /obj/item/folder/white, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel, /area/medical/medbay/central) +"qXI" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "qXW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/security/courtroom) -"qYe" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, -/area/engineering/main) "qYj" = ( /obj/machinery/vending/wardrobe/medi_wardrobe, /turf/open/floor/plasteel/white, @@ -35506,11 +39020,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /obj/machinery/door/airlock/research{ name = "Mech Bay"; - req_access_txt = "29" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + req_access_txt = "29"; dir = 4 }, /turf/open/floor/plasteel, @@ -35536,7 +39051,7 @@ /turf/open/floor/wood, /area/maintenance/bar) "qZu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -35552,6 +39067,10 @@ /obj/effect/landmark/secequipment, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"qZE" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/r_wall, +/area/medical/medbay/zone2) "qZM" = ( /turf/open/floor/plasteel/dark, /area/cargo/miningdock) @@ -35611,12 +39130,18 @@ /obj/machinery/holopad, /turf/open/floor/wood, /area/command/heads_quarters/hop) +"rcw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/turf/open/floor/wood, +/area/service/bar) "rcz" = ( /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/disposal/bin, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) "rcE" = ( /obj/effect/turf_decal/tile/yellow{ @@ -35634,21 +39159,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"rcO" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 10 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/main) "rcP" = ( /obj/machinery/camera{ c_tag = "Server Room"; @@ -35657,6 +39167,13 @@ }, /turf/open/floor/plasteel/dark, /area/science/server) +"rdq" = ( +/obj/machinery/door/poddoor{ + id = "Secure Storage"; + name = "secure storage" + }, +/turf/open/floor/plating, +/area/engineering/storage) "rdE" = ( /obj/structure/cable{ icon_state = "1-2" @@ -35686,7 +39203,7 @@ dir = 8 }, /obj/effect/landmark/start/lawyer, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) "reF" = ( /obj/machinery/vending/autodrobe, @@ -35696,6 +39213,9 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "rfo" = ( @@ -35732,6 +39252,17 @@ }, /turf/open/floor/wood, /area/maintenance/bar) +"rfM" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Freezer Room"; + req_access_txt = "11" + }, +/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "rfN" = ( /obj/machinery/conveyor{ id = "QMLoad" @@ -35757,7 +39288,7 @@ dir = 8; pixel_x = 24 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/circuit/off, /area/ai_monitored/turret_protected/ai) "rhl" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -35812,11 +39343,20 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/plasteel, /area/science/mixing) +"riK" = ( +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "riL" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/tile/bar{ dir = 1 }, @@ -35825,6 +39365,10 @@ /obj/structure/sign/poster/official/high_class_martini{ pixel_x = -32 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "riX" = ( @@ -35845,7 +39389,7 @@ pixel_y = 4 }, /obj/item/pen/fourcolor, -/turf/open/floor/wood, +/turf/open/floor/carpet/green, /area/service/library) "rjj" = ( /turf/open/openspace/icemoon, @@ -35881,6 +39425,12 @@ dir = 4 }, /obj/structure/tank_dispenser/oxygen, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "rjT" = ( @@ -35904,25 +39454,14 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) -"rke" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Gas to Chamber" - }, -/turf/open/floor/engine, -/area/engineering/supermatter) "rkk" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/vehicle/ridden/atv/snowmobile, -/obj/item/key, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/command/storage/eva) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/engineering/main) "rkG" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/research/glass{ @@ -35942,23 +39481,49 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "rkZ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/fitness) +"rlb" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" + }, +/turf/open/floor/wood, +/area/commons/dorms) +"rli" = ( +/obj/machinery/telecomms/broadcaster/preset_left, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 6 + }, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) "rlj" = ( /obj/structure/table, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/mask/surgical, /obj/item/clothing/suit/apron/surgical, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/medical/surgery) "rlm" = ( /obj/machinery/shower{ @@ -35978,6 +39543,15 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"rmk" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "rmH" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/blood, @@ -36013,17 +39587,25 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, /area/mine/lobby) -"rmI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +"rmN" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 }, /turf/open/floor/plasteel, -/area/engineering/main) +/area/hallway/primary/fore) "rmZ" = ( -/obj/machinery/telecomms/broadcaster/preset_right, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "rnm" = ( @@ -36043,7 +39625,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/command/glass{ name = "Bridge"; req_access_txt = "19" @@ -36052,6 +39633,8 @@ name = "south facing firelock" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) "rnG" = ( @@ -36090,15 +39673,13 @@ /turf/open/floor/plasteel/white, /area/command/heads_quarters/cmo) "rox" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, -/area/engineering/main) +/area/hallway/primary/aft) "roI" = ( /obj/structure/cable{ icon_state = "1-8" @@ -36111,24 +39692,34 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/landmark/event_spawn, /turf/open/floor/wood, /area/command/corporate_showroom) "roL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/landmark/start/station_engineer, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 6 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 }, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/engineering/lobby) "roM" = ( -/obj/structure/cable{ - icon_state = "0-8" +/obj/structure/reflector/single/anchored{ + dir = 6 }, -/turf/open/floor/engine, -/area/engineering/atmospherics_engine) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "roN" = ( /obj/structure/bodycontainer/morgue{ dir = 8 @@ -36169,6 +39760,35 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/cafeteria, /area/science/xenobiology) +"rpq" = ( +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/item/clothing/head/cone{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/clothing/head/cone{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/clothing/head/cone{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/clothing/head/cone{ + pixel_x = 6; + pixel_y = -6 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "rpG" = ( /obj/effect/turf_decal/bot, /turf/open/floor/plating/asteroid/snow/icemoon, @@ -36198,7 +39818,15 @@ dir = 8; pixel_x = 24 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel{ + dir = 8; + icon_state = "floor_whole" + }, /area/medical/surgery) "rqi" = ( /obj/effect/turf_decal/tile/red, @@ -36209,7 +39837,6 @@ }, /area/hallway/primary/fore) "rqm" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-4" }, @@ -36271,6 +39898,11 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) +"rsr" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/engineering/atmos) "rsK" = ( /obj/structure/cable{ icon_state = "0-2" @@ -36312,19 +39944,19 @@ /turf/open/floor/plating, /area/icemoon/surface/outdoors) "rtm" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/plating, /area/maintenance/disposal) "rtp" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Courtroom"; - req_access_txt = "42" - }, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" }, -/turf/open/floor/wood, +/obj/machinery/door/airlock/public/glass{ + name = "Courtroom"; + dir = 4 + }, +/turf/open/floor/wood/wood_large, /area/security/courtroom) "rtz" = ( /obj/structure/cable{ @@ -36352,6 +39984,9 @@ /obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ dir = 1 }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "rtP" = ( @@ -36361,7 +39996,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/department/science/xenobiology) "rtS" = ( /obj/structure/table, @@ -36380,7 +40015,10 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plasteel, /area/science/robotics/lab) "ruh" = ( /obj/structure/disposalpipe/segment{ @@ -36419,23 +40057,41 @@ /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; name = "Medbay"; - req_access_txt = "5" + req_access_txt = "5"; + dir = 4 }, /turf/open/floor/plasteel/white, /area/medical/paramedic) "ruY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/plasteel{ + icon_state = "floor_whole" + }, /area/cargo/storage) "rvc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 6 }, /turf/open/floor/plasteel, /area/commons/fitness) +"rvl" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "rwm" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, /obj/structure/chair/stool, /obj/structure/disposalpipe/segment{ dir = 5 @@ -36453,19 +40109,54 @@ }, /turf/open/floor/plasteel, /area/mine/lobby) +"rwF" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, +/area/maintenance/aft) "rwQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/engineering/break_room) +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 9 + }, +/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "rxb" = ( /turf/open/floor/plating, /area/icemoon/surface/outdoors) +"rxl" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/sign/poster/gato/lovegato{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "rxJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /obj/structure/closet/crate/wooden/toy, /obj/item/megaphone/clown, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/wood, /area/service/theater) "ryo" = ( @@ -36480,6 +40171,7 @@ /obj/item/gps/mining, /obj/item/gps/mining, /obj/item/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plasteel, /area/mine/eva) "ryS" = ( @@ -36522,20 +40214,19 @@ }, /turf/open/floor/wood, /area/commons/dorms) -"rAG" = ( -/obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" - }, -/turf/open/floor/engine, -/area/engineering/atmospherics_engine) "rAJ" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/medical/medbay/central) "rAL" = ( /obj/structure/table, @@ -36563,7 +40254,7 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "rBd" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -36572,16 +40263,18 @@ /turf/open/floor/plating, /area/maintenance/department/bridge) "rBp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "rBO" = ( /obj/structure/chair/comfy/brown{ dir = 8 }, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/dark, /area/hallway/primary/aft) "rBT" = ( /obj/structure/cable, @@ -36598,7 +40291,12 @@ }, /obj/structure/window/reinforced, /obj/item/storage/firstaid/regular, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel, /area/medical/medbay/central) "rCf" = ( /obj/structure/chair/office/dark{ @@ -36607,6 +40305,15 @@ /obj/effect/landmark/start/cargo_technician, /turf/open/floor/plasteel, /area/cargo/storage) +"rCp" = ( +/obj/machinery/atmospherics/components/binary/pump/on, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "rCB" = ( /obj/machinery/computer/scan_consolenew, /obj/effect/turf_decal/tile/purple{ @@ -36672,6 +40379,9 @@ dir = 4 }, /obj/effect/landmark/blobstart, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "rEh" = ( @@ -36682,6 +40392,26 @@ /obj/machinery/computer/shuttle/snow_taxi{ dir = 8 }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "rEw" = ( @@ -36698,21 +40428,41 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"rEG" = ( -/obj/structure/cable{ - icon_state = "1-2" +"rEK" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/light{ - dir = 4 +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/fluff/railing{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/maintenance/aft) +"rEP" = ( +/obj/machinery/portable_atmospherics/scrubber/huge, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) "rES" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -36720,9 +40470,6 @@ /turf/open/floor/engine, /area/science/xenobiology) "rFl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/closet/wardrobe/green, /turf/open/floor/wood, /area/commons/dorms) @@ -36740,16 +40487,19 @@ /area/construction/storage_wing) "rFP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/medical/medbay/central) "rGe" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /turf/open/floor/wood, /area/service/bar) "rGj" = ( @@ -36761,7 +40511,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_whole" + }, /area/cargo/storage) "rGn" = ( /turf/closed/wall, @@ -36771,11 +40524,29 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/underground/explored) "rGD" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 }, /turf/open/floor/plasteel, -/area/hallway/primary/aft) +/area/hallway/primary/fore) +"rGW" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/engineering/storage/tech) +"rHo" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "rHr" = ( /obj/machinery/status_display, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -36806,53 +40577,20 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) -"rJb" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/power/apc/highcap/fifteen_k{ - areastring = "/area/engineering/storage"; - dir = 1; - name = "Engineering Secure Storage APC"; - pixel_y = 23 - }, -/turf/open/floor/plating, -/area/engineering/storage) "rJi" = ( /obj/structure/chair{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel{ + dir = 8; + icon_state = "floor_whole" + }, /area/medical/surgery) -"rJB" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/orange/visible, -/turf/open/floor/engine, -/area/engineering/main) -"rJF" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/main) -"rJI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/main) "rJY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -36878,7 +40616,14 @@ }, /area/hallway/secondary/exit/departure_lounge) "rKs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1; + icon_state = "steel_decals_central6" + }, /turf/open/floor/plasteel, /area/cargo/storage) "rKC" = ( @@ -36907,9 +40652,6 @@ /turf/open/floor/plasteel/white/side, /area/hallway/primary/port) "rKF" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/engineering/main) @@ -36942,10 +40684,23 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) +"rME" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/central) "rMJ" = ( /obj/structure/sign/painting{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, /turf/open/floor/carpet/red, /area/commons/dorms) "rNh" = ( @@ -36980,9 +40735,6 @@ /turf/open/floor/wood, /area/security/courtroom) "rNY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/conveyor{ dir = 1; id = "packageSort2" @@ -37019,39 +40771,56 @@ /turf/open/floor/plasteel, /area/maintenance/aft/secondary) "rOg" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/obj/structure/chair/beanbag/gato, +/turf/open/floor/carpet/orange, +/area/service/library) "rOD" = ( /obj/effect/turf_decal/tile/green{ dir = 8 }, /turf/open/floor/plasteel/dark, /area/command/bridge) +"rOM" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "rOP" = ( /obj/effect/turf_decal/bot_white/left, /turf/open/floor/plasteel/dark, /area/command/teleporter) -"rOR" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall/r_wall, -/area/engineering/secure_construction) "rPc" = ( -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, /obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/dark, /area/service/hydroponics) +"rQg" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "rQo" = ( /obj/structure/sign/warning/vacuum/external{ pixel_x = 32 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "rQv" = ( /obj/structure/cable{ @@ -37062,6 +40831,12 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/solars/starboard/fore) +"rQR" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/carpet/royalblack, +/area/commons/dorms) "rQY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -37070,6 +40845,22 @@ dir = 4 }, /area/science/mixing) +"rQZ" = ( +/obj/machinery/door/airlock/atmos/glass{ + autoclose = 0; + name = "Mix Chamber Interior Airlock"; + id_tag = "mix_interior_airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/doorButtons/access_button{ + pixel_x = 24; + idDoor = "mix_interior_airlock"; + idSelf = "mix_airlock_controller" + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/structure/fans/tiny, +/turf/open/floor/engine, +/area/engineering/atmos) "rRC" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -37113,24 +40904,14 @@ dir = 1; network = list("ss13","rd") }, -/turf/open/floor/plasteel/checker, -/area/command/heads_quarters/rd) -"rSj" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/engine, -/area/engineering/main) +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/checker, +/area/command/heads_quarters/rd) "rSt" = ( /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -37156,18 +40937,22 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay"; - req_access_txt = "31" - }, -/obj/structure/disposalpipe/segment{ + req_access_txt = "31"; dir = 4 }, /turf/open/floor/plasteel, @@ -37203,10 +40988,6 @@ /turf/open/floor/circuit, /area/science/lab) "rTL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -37226,10 +41007,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/research{ - name = "Xenobiology Lab"; - req_access_txt = "55" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -37239,8 +41016,46 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab"; + req_access_txt = "55"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"rUw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/plasteel, +/area/engineering/main) +"rUO" = ( +/obj/structure/table/wood/poker, +/obj/item/dice{ + pixel_y = 4; + pixel_x = 9 + }, +/turf/open/floor/carpet/green, +/area/service/library) +"rUR" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "rVk" = ( /turf/open/openspace/icemoon, /area/engineering/atmos) @@ -37253,6 +41068,13 @@ }, /turf/open/floor/plating, /area/icemoon/surface/outdoors) +"rVA" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/cargo/storage) "rVR" = ( /obj/structure/cable{ icon_state = "1-8" @@ -37273,23 +41095,33 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "rVW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/engineering/storage) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "rWa" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - areastring = "/area/engineering/storage/tech"; - dir = 1; - name = "Tech Storage APC"; - pixel_y = 23 - }, /obj/structure/rack, -/obj/effect/spawner/lootdrop/techstorage/engineering, -/turf/open/floor/plasteel/dark, +/obj/effect/spawner/lootdrop/techstorage/rnd, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/plating, /area/engineering/storage/tech) +"rWd" = ( +/obj/structure/sign/poster/gato/lovegato{ + pixel_x = 32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "rWL" = ( /obj/machinery/door/airlock/external{ name = "Engineering External Access"; @@ -37332,7 +41164,7 @@ /turf/closed/wall, /area/science/robotics/lab) "rXA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/closed/wall, /area/maintenance/disposal) "rXE" = ( @@ -37352,7 +41184,7 @@ /obj/item/radio/intercom{ pixel_x = 25 }, -/turf/open/floor/wood, +/turf/open/floor/carpet/green, /area/service/library) "rXT" = ( /obj/machinery/firealarm{ @@ -37370,9 +41202,16 @@ /turf/open/floor/plasteel, /area/cargo/qm) "rYe" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "rYw" = ( /obj/structure/cable{ icon_state = "4-8" @@ -37387,15 +41226,9 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "rYF" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/camera{ c_tag = "Engineering Access" }, @@ -37403,11 +41236,10 @@ name = "Station Intercom (General)"; pixel_y = 20 }, -/obj/structure/reagent_dispensers/fueltank/high, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, -/area/engineering/break_room) +/area/engineering/lobby) "rZp" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/plating/snowed/smoothed/icemoon, @@ -37447,8 +41279,10 @@ /turf/open/floor/plasteel, /area/maintenance/aft/secondary) "saz" = ( -/obj/machinery/firealarm{ - pixel_y = 24 +/obj/structure/table, +/obj/item/book/manual/gato_spacelaw, +/obj/structure/sign/painting/library{ + pixel_y = 32 }, /turf/open/floor/plasteel, /area/maintenance/aft) @@ -37480,18 +41314,23 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/mine/lobby) -"sbx" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/plasteel, -/area/engineering/break_room) "sbB" = ( /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "sbF" = ( /obj/structure/chair/sofa, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/open/floor/wood, /area/hallway/primary/port) "sbI" = ( @@ -37519,8 +41358,22 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain"; + dir = 1 + }, +/turf/open/floor/plasteel, /area/medical/medbay/central) +"scl" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/turf/open/floor/carpet/red, +/area/commons/dorms) "scm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -37533,10 +41386,6 @@ }, /turf/open/floor/plasteel, /area/security/warden) -"scB" = ( -/obj/machinery/power/emitter, -/turf/open/floor/plating, -/area/engineering/storage) "scC" = ( /obj/machinery/rnd/production/techfab/department/service, /turf/open/floor/plating, @@ -37545,12 +41394,12 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/hallway/primary/port) "seE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -37567,10 +41416,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/command{ - name = "Captain's Office"; - req_access_txt = "20" - }, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" @@ -37578,13 +41423,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/command{ + name = "Captain's Office"; + req_access_txt = "20"; + dir = 8 + }, /turf/open/floor/wood, /area/command/heads_quarters/captain) "seL" = ( /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/circuit, +/turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "seM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -37603,13 +41453,14 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "sfn" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Library" - }, /obj/machinery/door/firedoor/border_only{ dir = 8; name = "west facing firelock" }, +/obj/machinery/door/airlock/public/glass{ + name = "Library"; + dir = 4 + }, /turf/open/floor/wood, /area/service/library) "sfp" = ( @@ -37625,13 +41476,13 @@ /turf/open/floor/plasteel/dark, /area/command/teleporter) "sfC" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8 +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "O2 to Airmix" }, -/obj/machinery/camera{ - c_tag = "Atmospherics South East"; - dir = 8 +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/light{ + dir = 4 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -37640,8 +41491,13 @@ /turf/open/floor/plasteel, /area/maintenance/aft) "sfX" = ( -/turf/open/floor/plating, -/area/engineering/atmospherics_engine) +/obj/structure/reflector/box/anchored{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "sgg" = ( /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment, @@ -37664,7 +41520,7 @@ dir = 8; network = list("aicore") }, -/turf/open/floor/circuit/off, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "sgx" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, @@ -37695,21 +41551,30 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) +"shd" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 6 + }, +/turf/open/floor/plating, +/area/engineering/atmos) "shr" = ( /obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, /obj/item/radio/intercom{ pixel_x = -30 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/security/detectives_office) "shy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/closet/secure_closet/freezer/kitchen, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = 28 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, /turf/open/floor/plasteel/freezer, /area/service/kitchen) "shB" = ( @@ -37725,7 +41590,12 @@ /turf/open/floor/plating, /area/maintenance/aft/secondary) "shH" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/wood, /area/service/theater) "sif" = ( @@ -37741,7 +41611,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 1 }, /turf/open/floor/plasteel, @@ -37766,10 +41636,19 @@ icon_state = "1-4" }, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "sjj" = ( /obj/machinery/suit_storage_unit/rd, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) "sjr" = ( @@ -37806,7 +41685,9 @@ dir = 4 }, /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external/glass, +/obj/machinery/door/airlock/external/glass{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "sjM" = ( @@ -37832,17 +41713,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_tiled, /area/command/heads_quarters/captain) "skg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/landmark/event_spawn, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/fore) "skm" = ( @@ -37891,11 +41767,16 @@ /obj/machinery/firealarm{ pixel_y = 24 }, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_panel"; + name = "steel pannel" + }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "sli" = ( /obj/structure/chair/office/light, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "smh" = ( /obj/structure/cable{ @@ -37904,6 +41785,9 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, /turf/open/floor/wood, /area/commons/dorms) "smj" = ( @@ -37929,13 +41813,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge"; - req_access_txt = "19" - }, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" @@ -37943,6 +41820,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/door/airlock/command/glass{ + name = "Bridge"; + req_access_txt = "19"; + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) "smy" = ( @@ -37998,17 +41886,36 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/solars/port/fore) "snA" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/visible{ +/obj/machinery/power/terminal{ dir = 1 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "snB" = ( /turf/closed/wall/r_wall, /area/medical/surgery) "snE" = ( /obj/machinery/computer/rdconsole/robotics, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/dark, /area/science/robotics/lab) "snM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -38051,6 +41958,12 @@ dir = 4; pixel_x = -24 }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) "soS" = ( @@ -38063,7 +41976,7 @@ dir = 1; name = "north facing firelock" }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/service/chapel/office) "spj" = ( /obj/structure/disposalpipe/segment{ @@ -38090,7 +42003,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "spD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -38101,7 +42014,7 @@ codes_txt = "patrol;next_patrol=AIE"; location = "AftH" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/hallway/primary/central) "spK" = ( /obj/structure/cable{ @@ -38111,10 +42024,30 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/carpet, +/obj/machinery/holopad, +/turf/open/floor/plasteel/dark, /area/command/bridge) "sqm" = ( -/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/maintenance/aft) "sqK" = ( @@ -38132,17 +42065,22 @@ /obj/item/bedsheet/brown, /turf/open/floor/carpet, /area/mine/lobby) -"ssz" = ( -/obj/machinery/computer/atmos_control/tank/air_tank, -/obj/machinery/light/small{ - dir = 1 +"sse" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/camera{ - c_tag = "Atmospherics North East" +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 4 }, /turf/open/floor/plasteel, -/area/engineering/atmos) +/area/commons/storage/primary) +"ssz" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "ssF" = ( /obj/structure/cable{ icon_state = "4-8" @@ -38172,19 +42110,35 @@ }, /turf/open/floor/wood, /area/command/bridge) +"stp" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "stF" = ( +/obj/structure/fans/tiny, /obj/machinery/door/airlock/external{ name = "Escape Pod Four"; - shuttledocked = 1 + shuttledocked = 1; + dir = 4 }, -/obj/structure/fans/tiny, /turf/open/floor/plating, /area/maintenance/central) "stN" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/effect/decal/medium_gato, /turf/open/floor/plasteel, /area/mine/lobby) +"sud" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "suf" = ( /obj/structure/cable{ icon_state = "4-8" @@ -38192,15 +42146,15 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/fore) @@ -38213,7 +42167,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/white, +/turf/open/floor/plating, /area/maintenance/aft/secondary) "sum" = ( /obj/effect/turf_decal/tile/blue{ @@ -38223,14 +42177,35 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel/dark/side{ - dir = 10; - icon_state = "dark" - }, +/obj/item/kirbyplants/photosynthetic, +/turf/open/floor/plasteel/dark, /area/hallway/primary/central) "sut" = ( -/turf/open/floor/engine, -/area/engineering/secure_construction) +/obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/item/stack/cable_coil{ + pixel_x = -4 + }, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = 7 + }, +/obj/item/stack/cable_coil{ + pixel_x = 8; + pixel_y = -1 + }, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "suv" = ( /obj/machinery/light{ dir = 8 @@ -38239,7 +42214,7 @@ /area/hallway/secondary/exit/departure_lounge) "suw" = ( /obj/effect/landmark/start/medical_doctor, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "suF" = ( /obj/effect/spawner/structure/window/reinforced, @@ -38274,16 +42249,17 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/medical{ - name = "Medbay Break Room"; - req_access_txt = "5" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/medical{ + name = "Medbay Break Room"; + req_access_txt = "5"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "sxw" = ( @@ -38335,8 +42311,16 @@ pixel_x = 3 }, /obj/item/storage/belt/utility, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel/dark, /area/science/robotics/lab) +"sxI" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 6 + }, +/obj/machinery/meter, +/turf/open/floor/plasteel, +/area/engineering/atmos) "syh" = ( /obj/structure/cable{ icon_state = "1-2" @@ -38355,20 +42339,19 @@ }, /area/maintenance/bar) "syw" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 }, -/obj/structure/closet/crate, -/obj/item/stack/sheet/mineral/plasma{ - amount = 30 +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/machinery/camera{ - c_tag = "Engineering Secure Storage" +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/turf/open/floor/plating, -/area/engineering/storage) +/turf/open/floor/plasteel/white, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "syI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -38387,21 +42370,8 @@ /obj/item/radio/intercom{ pixel_y = 25 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/security/courtroom) -"syL" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/window/plasma/reinforced{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/toxins, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/atmospherics_engine) "syQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -38417,7 +42387,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/command/heads_quarters/hos) "syZ" = ( /obj/structure/disposalpipe/segment{ @@ -38452,6 +42422,15 @@ }, /turf/open/floor/plating, /area/maintenance/department/bridge) +"szv" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, +/turf/open/floor/wood, +/area/commons/dorms) "szQ" = ( /turf/closed/wall/r_wall, /area/security/prison) @@ -38459,16 +42438,19 @@ /obj/structure/chair/stool{ pixel_y = 8 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) "sAI" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/open/floor/plasteel, @@ -38492,19 +42474,15 @@ /turf/open/floor/plasteel/dark, /area/command/heads_quarters/hos) "sAV" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/effect/turf_decal/tile/green, /turf/open/floor/plasteel, /area/service/hydroponics) -"sBe" = ( -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "sBg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38559,31 +42537,30 @@ /turf/open/floor/plasteel, /area/maintenance/aft/secondary) "sCj" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" + }, /turf/open/floor/plasteel, /area/maintenance/starboard) "sCk" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/wood, /area/commons/dorms) "sCt" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 5 }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/plating, -/area/command/heads_quarters/ce) +/turf/open/floor/plasteel, +/area/engineering/atmos) "sCT" = ( /obj/structure/table, /obj/machinery/smartfridge/disks{ @@ -38591,6 +42568,20 @@ }, /turf/open/floor/plasteel, /area/service/hydroponics) +"sDd" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/engineering_hacking{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/book/manual/wiki/engineering_construction{ + pixel_y = 3 + }, +/obj/item/book/manual/wiki/engineering_guide{ + pixel_x = -4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "sDl" = ( /turf/open/floor/plasteel/white, /area/medical/chemistry) @@ -38625,7 +42616,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/open/floor/plasteel/dark, @@ -38660,7 +42651,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/circuit/off, /area/science/server) "sFm" = ( /obj/machinery/power/apc{ @@ -38685,11 +42676,16 @@ /obj/structure/chair/stool, /turf/open/floor/plasteel, /area/maintenance/aft/secondary) +"sFE" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/r_wall, +/area/ai_monitored/command/nuke_storage) "sFX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) "sGd" = ( @@ -38739,6 +42735,10 @@ }, /turf/open/floor/wood, /area/security/courtroom) +"sHC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "sHN" = ( /turf/closed/wall, /area/service/library) @@ -38769,18 +42769,21 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/hallway/secondary/exit/departure_lounge) +"sIb" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel{ + dir = 4; + icon_state = "floor_whole" + }, +/area/science/robotics/lab) "sIe" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "snaxi_mining_shutter"; + name = "blast door seal" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engineering/main) +/turf/open/floor/plating, +/area/mine/eva) "sIg" = ( /obj/machinery/button/door{ id = "xenobio1"; @@ -38798,6 +42801,32 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/aft/secondary) +"sIv" = ( +/obj/structure/table, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/item/flashlight{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/flashlight{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/t_scanner{ + pixel_y = 11; + pixel_x = -6 + }, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "sIy" = ( /obj/machinery/camera{ c_tag = "Cargo Office"; @@ -38808,15 +42837,27 @@ /turf/open/floor/plasteel, /area/cargo/storage) "sIz" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/command/heads_quarters/ce) +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "sII" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/turf/closed/wall, -/area/cargo/sorting) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "sIL" = ( /obj/effect/turf_decal/bot_white, /obj/structure/window/reinforced{ @@ -38853,14 +42894,10 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "sJT" = ( -/obj/structure/closet/secure_closet/engineering_electrical, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/engineering/main) +/turf/closed/wall/r_wall, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "sKh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -38868,20 +42905,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/door/airlock/atmos/abandoned{ name = "Atmospherics Maintenance"; - req_access_txt = "12;24" - }, -/obj/structure/disposalpipe/segment{ + req_access_txt = "12;24"; dir = 4 }, /turf/open/floor/plasteel, /area/maintenance/department/electrical) -"sKi" = ( -/obj/machinery/field/generator, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/engineering/storage) "sKn" = ( /obj/machinery/light{ dir = 8 @@ -38895,12 +42928,14 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/solars/port/fore) "sLl" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/engine, -/area/engineering/main) +/turf/open/floor/plasteel, +/area/command/heads_quarters/ce) "sLm" = ( /turf/closed/wall/r_wall, /area/maintenance/solars/port/aft) @@ -38908,9 +42943,21 @@ /obj/structure/cable, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/solars/starboard/fore) +"sLy" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "sLB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/security/courtroom) "sLD" = ( /obj/structure/disposalpipe/segment{ @@ -38936,6 +42983,14 @@ /area/hallway/primary/port) "sLP" = ( /obj/machinery/telecomms/server/presets/common, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "sLQ" = ( @@ -38958,19 +43013,37 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) +"sLV" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "sLY" = ( /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, /turf/open/floor/plasteel/freezer, /area/service/kitchen) "sMe" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 }, /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) @@ -39004,6 +43077,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/item/kirbyplants/photosynthetic, /turf/open/floor/plasteel, /area/hallway/primary/port) "sMT" = ( @@ -39021,8 +43095,27 @@ /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/suit/hooded/wintercoat, /obj/structure/rack/shelf, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/commons/dorms) +"sNj" = ( +/obj/structure/table/wood/poker, +/obj/item/flashlight/lamp{ + pixel_x = -5; + pixel_y = 12 + }, +/turf/open/floor/carpet/green, +/area/service/library) +"sNl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "sNB" = ( /obj/structure/cable{ icon_state = "4-8" @@ -39060,10 +43153,7 @@ /area/maintenance/bar) "sOj" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 1 }, /obj/structure/cable{ @@ -39075,9 +43165,21 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/landmark/event_spawn, +/obj/structure/showcase/machinery/implanter{ + layer = 2.7; + pixel_y = 4 + }, /turf/open/floor/carpet, /area/command/corporate_showroom) +"sOs" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/cargo/storage) "sOx" = ( /obj/structure/cable{ icon_state = "1-2" @@ -39113,12 +43215,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/machinery/door/airlock/public/glass{ - name = "Dormitory" - }, /obj/machinery/door/firedoor/border_only{ dir = 8; name = "west facing firelock" @@ -39127,6 +43226,13 @@ dir = 4; name = "east facing firelock" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Dormitory"; + dir = 4 + }, /turf/open/floor/wood, /area/commons/fitness) "sPg" = ( @@ -39166,16 +43272,19 @@ /obj/structure/table, /obj/item/folder/white, /obj/item/pen, -/turf/open/floor/plasteel/dark, +/turf/open/floor/circuit/off, /area/science/server) "sPL" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/command, /obj/effect/landmark/blobstart, +/obj/machinery/light/small, /turf/open/floor/plating, /area/engineering/storage/tech) +"sPN" = ( +/turf/open/floor/plasteel/stairs, +/area/maintenance/aft) "sPU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/public/glass{ name = "Hydroponics"; req_access_txt = "35" @@ -39184,12 +43293,13 @@ name = "south facing firelock" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/service/hydroponics) "sQg" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, +/turf/closed/wall/r_wall, /area/engineering/atmos) "sQs" = ( /obj/docking_port/stationary{ @@ -39207,10 +43317,11 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/plasteel/dark/side{ - dir = 4; - icon_state = "dark" +/obj/item/kirbyplants/photosynthetic, +/obj/structure/fluff/railing{ + dir = 9 }, +/turf/open/floor/plasteel/dark, /area/hallway/primary/central) "sQG" = ( /obj/structure/cable{ @@ -39225,6 +43336,12 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/medical) +"sQY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/turf/open/floor/plating, +/area/engineering/storage/tech) "sRd" = ( /obj/machinery/vending/coffee, /obj/item/radio/intercom{ @@ -39233,10 +43350,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "sRi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -39252,10 +43365,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12"; + welded = 1; + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/aft/secondary) "sRT" = ( @@ -39269,9 +43386,6 @@ /obj/machinery/power/port_gen/pacman{ anchored = 1 }, -/obj/structure/cable{ - icon_state = "0-2" - }, /turf/open/floor/plating, /area/mine/lobby) "sSj" = ( @@ -39284,8 +43398,21 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/wood, /area/hallway/primary/port) +"sSy" = ( +/obj/structure/reflector/single/anchored{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "sSA" = ( /obj/structure/reagent_dispensers/fueltank, /obj/item/radio/intercom{ @@ -39299,7 +43426,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/disposal) @@ -39313,11 +43440,29 @@ /turf/closed/wall/r_wall, /area/service/janitor) "sSS" = ( -/obj/structure/fluff/railing{ - dir = 5 +/obj/machinery/light, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/turf/open/openspace/icemoon, -/area/engineering/atmospherics_engine) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "sSY" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -39335,11 +43480,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/medical/surgery) "sTo" = ( -/obj/structure/table, -/turf/open/floor/carpet, +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/wood, /area/mine/lobby) "sTA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -39347,6 +43492,13 @@ }, /turf/open/floor/plasteel/freezer, /area/medical/surgery) +"sUf" = ( +/obj/machinery/cryopod/tele, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/pod/dark, +/area/commons/dorms) "sUg" = ( /obj/machinery/camera{ c_tag = "Testing Chamber"; @@ -39371,12 +43523,28 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) +"sVo" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/commons/dorms) "sVy" = ( -/obj/machinery/computer/station_alert, +/obj/machinery/computer/card/minor/ce, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, /turf/open/floor/plasteel, /area/command/heads_quarters/ce) "sVz" = ( /obj/structure/table, +/obj/item/ashtray, /turf/open/floor/plasteel, /area/hallway/primary/fore) "sVH" = ( @@ -39386,11 +43554,13 @@ /turf/open/floor/plating, /area/cargo/storage) "sVX" = ( -/obj/structure/loot_pile/maint, -/turf/open/floor/plating, -/area/maintenance/aft/secondary) +/obj/item/trash/can{ + pixel_x = -3; + pixel_y = -9 + }, +/turf/open/floor/carpet/green, +/area/service/library) "sWf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-2" }, @@ -39407,7 +43577,13 @@ /obj/machinery/computer/crew{ dir = 4 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel, /area/medical/medbay/central) "sWQ" = ( /obj/structure/window/reinforced{ @@ -39438,11 +43614,13 @@ /turf/open/floor/plasteel, /area/security/office) "sXs" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1 +/obj/structure/cable{ + icon_state = "0-2" }, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/turf/open/floor/catwalk_floor, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "sXE" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -39461,9 +43639,6 @@ }, /area/hallway/secondary/exit/departure_lounge) "sXS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -39473,28 +43648,25 @@ /obj/machinery/camera{ c_tag = "Auxiliary Bridge South" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) "sXZ" = ( /obj/structure/table, -/obj/item/cautery{ - pixel_x = 4 - }, -/obj/item/retractor, -/obj/item/scalpel{ - pixel_y = 12 - }, -/obj/item/circular_saw, -/obj/item/hemostat, /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plasteel/freezer, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, /area/medical/surgery) -"sYc" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/closed/wall/r_wall, -/area/engineering/main) "sYu" = ( /obj/structure/cable{ icon_state = "4-8" @@ -39510,10 +43682,6 @@ }, /turf/open/floor/wood, /area/hallway/secondary/exit/departure_lounge) -"sYx" = ( -/obj/effect/landmark/blobstart, -/turf/open/floor/plating, -/area/engineering/storage) "sYG" = ( /obj/structure/bodycontainer/morgue{ dir = 8 @@ -39522,19 +43690,19 @@ /turf/open/floor/plasteel/dark, /area/medical/morgue) "sYL" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, /turf/open/floor/plasteel, @@ -39567,6 +43735,21 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) +"sYX" = ( +/obj/structure/sign/painting/library{ + pixel_x = -32 + }, +/obj/structure/displaycase/trophy, +/obj/structure/fluff/railing{ + dir = 1 + }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain"; + dir = 1 + }, +/turf/open/floor/plasteel, +/area/service/library) "sZs" = ( /obj/structure/cable{ icon_state = "1-2" @@ -39574,10 +43757,12 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" + }, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "sZy" = ( @@ -39606,11 +43791,8 @@ /obj/effect/turf_decal/bot, /obj/vehicle/ridden/atv/snowmobile, /obj/item/key, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) @@ -39658,6 +43840,12 @@ /obj/item/clothing/glasses/hud/health, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) +"tbN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/turf/open/floor/wood, +/area/service/bar) "tbQ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -39680,17 +43868,6 @@ /obj/machinery/light, /turf/open/floor/plating, /area/maintenance/department/electrical) -"tce" = ( -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber"; - req_access_txt = "10" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engineering/main) "tcH" = ( /obj/structure/sign/departments/restroom{ pixel_x = 32; @@ -39698,6 +43875,18 @@ }, /turf/open/floor/plasteel/grimy, /area/commons/fitness/recreation) +"tcN" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "tcT" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -39716,8 +43905,26 @@ /obj/machinery/power/terminal{ dir = 1 }, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/end{ + dir = 8 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"tdg" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "tdM" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -39729,21 +43936,6 @@ /obj/item/target/alien/anchored, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) -"tem" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engineering/main) -"teW" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer3{ - dir = 6 - }, -/turf/open/floor/engine, -/area/engineering/atmospherics_engine) "tfa" = ( /obj/structure/cable{ icon_state = "4-8" @@ -39804,14 +43996,14 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "tgB" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 9 }, /turf/open/floor/plasteel, -/area/hallway/primary/aft) +/area/engineering/lobby) "tgK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -39822,6 +44014,8 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/white/line, /turf/open/floor/plasteel/dark, /area/science/server) "thi" = ( @@ -39849,18 +44043,22 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, /turf/open/floor/wood, /area/service/theater) -"tiD" = ( -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 +"tiy" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/item/flashlight/lamp/green{ + pixel_y = 10 }, -/obj/structure/closet/secure_closet/engineering_chief, -/turf/open/floor/plasteel, -/area/command/heads_quarters/ce) +/turf/open/floor/wood, +/area/service/library) "tiW" = ( /obj/machinery/computer/card{ dir = 4; @@ -39939,7 +44137,7 @@ dir = 4; pixel_x = -23 }, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/mine/lobby) "tkZ" = ( /obj/structure/cable{ @@ -39951,7 +44149,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, @@ -39960,6 +44157,10 @@ }, /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) "tlp" = ( @@ -39984,13 +44185,6 @@ "tlq" = ( /turf/closed/wall, /area/ai_monitored/turret_protected/ai) -"tmd" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/atmospherics_engine) "tmh" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -40011,21 +44205,29 @@ c_tag = "Cargo Bay North" }, /obj/machinery/vending/wardrobe/cargo_wardrobe, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/storage) +"tmQ" = ( +/obj/effect/landmark/start/station_engineer, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "tmZ" = ( /obj/item/reagent_containers/food/snacks/spidereggsham, /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/service/library) -"tnm" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin, -/turf/open/floor/plating, -/area/engineering/main) "tnp" = ( /obj/structure/cable{ icon_state = "1-8" @@ -40041,6 +44243,18 @@ }, /turf/open/floor/engine, /area/maintenance/aft/secondary) +"tnt" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "tnH" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -40048,6 +44262,10 @@ /obj/machinery/disposal/bin, /turf/open/floor/plating, /area/construction/storage_wing) +"tnK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark/corner, +/area/hallway/primary/port) "toc" = ( /obj/structure/cable{ icon_state = "1-8" @@ -40064,7 +44282,10 @@ /obj/effect/turf_decal/arrows/red{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/hallway/primary/central) "toH" = ( /obj/effect/turf_decal/tile/red{ @@ -40101,7 +44322,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_tiled, /area/command/heads_quarters/captain) "tpp" = ( /obj/machinery/door/airlock/medical/glass{ @@ -40116,16 +44337,23 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "tpu" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/decal/big_gato, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/hallway/primary/aft) "tpw" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, @@ -40137,40 +44365,25 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/central) "tpV" = ( /obj/structure/chair/comfy/brown{ color = "#596479"; dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, /turf/open/floor/carpet, /area/service/bar) -"tqc" = ( -/obj/machinery/computer/rdconsole/production{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/main) -"tqh" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/turf/open/floor/plasteel, -/area/command/heads_quarters/ce) "tqq" = ( -/obj/machinery/air_sensor/atmos/mix_tank, -/turf/open/floor/engine/airless, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/engineering/atmos) "tqv" = ( /obj/structure/cable{ @@ -40231,10 +44444,6 @@ /turf/open/floor/plasteel, /area/maintenance/aft/secondary) "tru" = ( -/obj/machinery/door/airlock/medical{ - name = "Medbay Break Room"; - req_access_txt = "5" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -40244,6 +44453,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/medical{ + name = "Medbay Break Room"; + req_access_txt = "5"; + dir = 4 + }, /turf/open/floor/plating, /area/medical/medbay/central) "trF" = ( @@ -40286,6 +44500,20 @@ /obj/machinery/light/floor, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"tsp" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "Engineering Foyer APC"; + pixel_y = 24 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/chair/sofa/corp/right, +/turf/open/floor/carpet/orange, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "tsv" = ( /obj/structure/cable{ icon_state = "2-8" @@ -40323,12 +44551,36 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/service/kitchen) +"ttf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/obj/structure/table, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson{ + pixel_y = 5 + }, +/obj/item/clothing/glasses/meson{ + pixel_y = 10 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "ttj" = ( /obj/structure/cable{ icon_state = "4-8" }, /turf/open/floor/plating, /area/maintenance/bar) +"ttS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/turf/open/floor/wood, +/area/service/bar) "tui" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 @@ -40357,7 +44609,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_tiled, /area/command/heads_quarters/captain) "tuG" = ( /turf/closed/wall/r_wall, @@ -40370,8 +44622,9 @@ dir = 4 }, /obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" + name = "External Airlock"; + req_access_txt = "13"; + dir = 8 }, /turf/open/floor/plating, /area/maintenance/aft) @@ -40395,7 +44648,7 @@ /area/medical/chemistry) "tvv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/bridge) "tvx" = ( /obj/structure/disposalpipe/segment, @@ -40468,13 +44721,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) -"twA" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/engineering/storage) "twC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -40492,6 +44738,29 @@ /obj/machinery/processor, /turf/open/floor/plasteel/freezer, /area/service/kitchen) +"txc" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "txk" = ( /obj/structure/chair{ dir = 8 @@ -40524,8 +44793,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/turf/open/floor/circuit, +/turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) +"txO" = ( +/obj/structure/sign/warning/securearea, +/turf/closed/wall/r_wall, +/area/engineering/supermatter) "tyy" = ( /turf/closed/wall/r_wall, /area/medical/chemistry) @@ -40582,7 +44855,6 @@ name = "Entry Hall APC"; pixel_x = 24 }, -/obj/effect/turf_decal/tile/purple, /obj/machinery/vending/clothing, /turf/open/floor/plasteel, /area/hallway/secondary/entry) @@ -40592,40 +44864,23 @@ dir = 8 }, /obj/effect/landmark/start/detective, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/security/detectives_office) -"tCc" = ( -/obj/machinery/airalarm{ - pixel_y = 25 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/machinery/camera{ - c_tag = "Primary Tool Storage" - }, -/turf/open/floor/plasteel, -/area/commons/storage/primary) +"tBx" = ( +/obj/structure/sign/poster/gato/science, +/turf/closed/wall/r_wall, +/area/science/lab) "tCg" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/dark, /area/command/bridge) "tCw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, -/area/commons/fitness) +/obj/structure/chair/stool/bar, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, +/turf/open/floor/wood, +/area/service/bar) "tCz" = ( /obj/machinery/status_display/supply{ pixel_x = 32 @@ -40634,6 +44889,22 @@ /obj/machinery/rnd/production/techfab/department/cargo, /turf/open/floor/plasteel, /area/cargo/storage) +"tCE" = ( +/obj/machinery/atmospherics/components/binary/pump, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "tDq" = ( /obj/structure/cable{ icon_state = "1-2" @@ -40722,11 +44993,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /obj/machinery/door/airlock/maintenance{ name = "Morgue Maintenance"; - req_access_txt = "6" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + req_access_txt = "6"; dir = 4 }, /turf/open/floor/plating, @@ -40752,6 +45024,12 @@ }, /turf/open/floor/plating, /area/security/brig) +"tFr" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone3) "tFs" = ( /obj/structure/window/reinforced{ dir = 8 @@ -40769,19 +45047,10 @@ /obj/effect/spawner/lootdrop/aimodule_harmful, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) -"tFF" = ( -/obj/machinery/camera{ - c_tag = "Tech Storage"; - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/storage/tech) +"tFI" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) "tFJ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -40792,16 +45061,18 @@ }, /turf/open/floor/plating, /area/security/checkpoint/medical) +"tFT" = ( +/obj/structure/sign/warning/nosmoking, +/turf/closed/wall/r_wall, +/area/engineering/atmos) "tFW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, /obj/structure/table, /obj/item/storage/belt/utility, /obj/item/storage/belt/utility, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, /turf/open/floor/plasteel, /area/engineering/atmos) "tFY" = ( @@ -40849,14 +45120,17 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) -"tHu" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, +"tGS" = ( +/obj/machinery/atmospherics/pipe/manifold4w/general/visible, /turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"tHu" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, /area/engineering/main) "tHJ" = ( /obj/effect/spawner/structure/window/reinforced, @@ -40901,8 +45175,16 @@ pixel_y = 30; receive_ore_updates = 1 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel/dark, /area/science/robotics/lab) +"tIx" = ( +/obj/structure/bookcase/random, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood, +/area/service/library) "tIE" = ( /obj/structure/cable{ icon_state = "1-4" @@ -40940,7 +45222,7 @@ /obj/machinery/modular_computer/console/preset/research{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/circuit/off, /area/science/server) "tJr" = ( /obj/structure/disposalpipe/segment{ @@ -40951,7 +45233,7 @@ "tJv" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/meeting_room) "tJz" = ( /obj/machinery/light/small{ @@ -40973,8 +45255,11 @@ }, /area/hallway/primary/fore) "tJQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, /turf/open/floor/plasteel, /area/cargo/storage) "tKh" = ( @@ -40987,9 +45272,9 @@ /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; req_access_txt = "48"; - shuttledocked = 1 + shuttledocked = 1; + dir = 8 }, -/obj/structure/barricade/wooden, /turf/open/floor/plating, /area/maintenance/aft/secondary) "tKw" = ( @@ -41016,11 +45301,20 @@ /turf/open/floor/plating, /area/maintenance/bar) "tKQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plasteel/dark, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel, /area/hallway/primary/fore) "tLd" = ( /obj/structure/cable{ @@ -41046,6 +45340,15 @@ dir = 4 }, /obj/machinery/disposal/bin, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/wood, /area/hallway/primary/port) "tLg" = ( @@ -41053,30 +45356,29 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"tLo" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "tLH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/door/airlock/research{ name = "Toxins & Xenobiology Access"; - req_access_txt = "47" + req_access_txt = "47"; + dir = 4 }, /turf/open/floor/plasteel, /area/science/mixing) "tLR" = ( /turf/closed/mineral/random/snow, /area/icemoon/underground/unexplored/rivers) +"tLS" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input, +/obj/machinery/air_sensor/atmos/nitrous_tank{ + pixel_x = 25 + }, +/turf/open/floor/engine/n2o, +/area/engineering/atmos) "tLZ" = ( -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/bridge) "tMc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -41097,24 +45399,19 @@ /turf/open/floor/plasteel, /area/cargo/storage) "tMt" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, /turf/open/floor/plasteel, /area/maintenance/starboard) "tMu" = ( /turf/open/floor/carpet, /area/hallway/secondary/exit/departure_lounge) "tMP" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" - }, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -41124,6 +45421,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "MedbayFoyer"; + name = "Medbay"; + req_access_txt = "5"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "tMY" = ( @@ -41144,6 +45447,14 @@ }, /turf/closed/wall/mineral/wood, /area/icemoon/surface/outdoors) +"tNc" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/carpet/orange, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "tNd" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Two" @@ -41176,22 +45487,17 @@ /turf/open/floor/plasteel, /area/maintenance/aft) "tOV" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/landmark/xeno_spawn, +/obj/machinery/shieldgen, /turf/open/floor/plating, /area/engineering/storage) "tOY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/structure/chair/comfy/beige{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/carpet, /area/commons/dorms) "tPA" = ( @@ -41239,10 +45545,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/plasteel/dark/side{ - dir = 6; - icon_state = "dark" - }, +/obj/item/kirbyplants/photosynthetic, +/turf/open/floor/plasteel/dark, /area/hallway/primary/central) "tQc" = ( /obj/structure/table/wood, @@ -41252,14 +45556,13 @@ }, /turf/open/floor/plating, /area/maintenance/bar) -"tQA" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +"tQl" = ( +/obj/machinery/light{ + dir = 4 }, -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/plasteel, -/area/engineering/main) +/obj/effect/turf_decal/vg_decals/atmos/nitrogen, +/turf/open/floor/engine/n2, +/area/engineering/atmos) "tRr" = ( /obj/structure/fence/corner{ dir = 1 @@ -41271,18 +45574,31 @@ /obj/machinery/meter, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"tRv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/wood, +/area/hallway/primary/port) "tRK" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/commons/fitness) "tSa" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/door/firedoor/border_only{ dir = 1; name = "north facing firelock" @@ -41292,6 +45608,7 @@ req_access_txt = "31" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/cargo/storage) "tSk" = ( @@ -41306,13 +45623,20 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"tTu" = ( +/obj/effect/turf_decal/caution, +/turf/open/floor/plasteel, +/area/engineering/atmos) "tTQ" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/dark, -/area/ai_monitored/command/storage/eva) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" + }, +/turf/open/floor/wood, +/area/commons/dorms) "tUg" = ( /obj/machinery/light{ dir = 4 @@ -41355,14 +45679,15 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/door/airlock/security/glass{ - name = "Brig Control"; - req_access_txt = "3" - }, /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" }, +/obj/machinery/door/airlock/security/glass{ + name = "Brig Control"; + req_access_txt = "3"; + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/security/warden) "tUG" = ( @@ -41401,6 +45726,12 @@ /obj/effect/spawner/lootdrop/bedsheet, /turf/open/floor/carpet, /area/maintenance/aft/secondary) +"tWj" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/table, +/obj/machinery/cell_charger, +/turf/open/floor/plasteel, +/area/engineering/main) "tWn" = ( /obj/structure/cable{ icon_state = "1-2" @@ -41427,8 +45758,8 @@ /obj/item/pickaxe, /obj/item/pickaxe, /obj/item/pickaxe, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) @@ -41439,13 +45770,20 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/wood, /area/commons/dorms) "tYd" = ( /obj/structure/chair{ dir = 8 }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "tYq" = ( @@ -41483,19 +45821,24 @@ /obj/machinery/vending/sustenance, /turf/open/floor/plasteel, /area/security/prison) -"tYS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/engineering/main) -"tZm" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Chapel" +"tYU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, +/turf/open/floor/plasteel{ + dir = 4; + icon_state = "floor_trim" + }, +/area/science/robotics/lab) +"tZm" = ( /obj/machinery/door/firedoor/border_only{ dir = 4; name = "east facing firelock" }, +/obj/machinery/door/airlock/public/glass{ + dir = 4; + name = "Chapel" + }, /turf/open/floor/wood, /area/service/chapel/main) "tZA" = ( @@ -41515,7 +45858,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock{ name = "Kitchen cold room"; req_access_txt = "28" @@ -41525,6 +45867,8 @@ name = "north facing firelock" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/service/kitchen) "tZT" = ( @@ -41602,12 +45946,11 @@ }, /obj/structure/chair/sofa/left, /obj/item/book/manual/gato_spacelaw, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/checkpoint/supply) -"ucu" = ( -/obj/machinery/atmospherics/components/binary/pump/on, -/turf/open/floor/plasteel/dark, -/area/engineering/main) "ucz" = ( /obj/structure/table/glass, /obj/machinery/reagentgrinder{ @@ -41629,6 +45972,12 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"ucD" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/engineering/supermatter) "ucF" = ( /obj/machinery/seed_extractor, /turf/open/floor/plating/asteroid/snow/icemoon, @@ -41642,11 +45991,29 @@ }, /turf/open/floor/wood, /area/security/courtroom) +"ucY" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8; + name = "west facing firelock" + }, +/obj/structure/barricade/wooden, +/obj/machinery/door/airlock/mining{ + req_access_txt = "48"; + dir = 4 + }, +/turf/open/floor/plasteel, +/area/maintenance/aft/secondary) "uda" = ( /obj/item/kirbyplants{ icon_state = "plant-10" }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/hallway/primary/central) "udt" = ( /obj/structure/cable{ @@ -41745,7 +46112,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "ufI" = ( /turf/open/floor/plasteel, @@ -41754,7 +46121,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /obj/effect/turf_decal/tile/neutral{ @@ -41763,8 +46130,22 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/cargo/miningdock) +"ufT" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + name = "south facing firelock" + }, +/turf/open/floor/plasteel, +/area/commons/dorms) "ufV" = ( /obj/machinery/door/airlock/public/glass{ name = "Snow Airlock" @@ -41788,13 +46169,13 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/structure/fans/tiny, /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock"; req_access_txt = "48"; - shuttledocked = 1 + shuttledocked = 1; + dir = 8 }, -/obj/structure/fans/tiny, -/obj/structure/barricade/wooden/snowed, /turf/open/floor/plating, /area/maintenance/aft/secondary) "ugf" = ( @@ -41818,17 +46199,15 @@ /turf/open/floor/plasteel, /area/maintenance/aft) "ugm" = ( +/obj/machinery/door/poddoor{ + id = "Secure Storage"; + name = "secure storage" + }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engineering/main) +/turf/open/floor/plating, +/area/engineering/storage) "ugw" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -41850,23 +46229,37 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "ugP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/structure/disposalpipe/sorting/mail{ + sortType = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "ugX" = ( -/obj/machinery/atmospherics/components/trinary/filter/critical{ - dir = 1 +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/turf/open/floor/engine, -/area/engineering/main) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/vending/tool, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/commons/storage/primary) "uhb" = ( /obj/structure/cable{ icon_state = "1-2" @@ -41892,6 +46285,12 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "uhK" = ( @@ -41901,26 +46300,20 @@ /obj/effect/turf_decal/bot, /obj/vehicle/ridden/atv/snowmobile, /obj/item/key, -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "uhO" = ( /obj/machinery/door/airlock/external{ name = "Engineering External Access"; - req_access_txt = "10;13" + req_access_txt = "11;13" }, /obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, -/area/engineering/main) -"uhZ" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/area/engineering/engine_smes) "uio" = ( /obj/machinery/airalarm{ dir = 8; @@ -41936,6 +46329,11 @@ /obj/machinery/disposal/bin, /turf/open/floor/pod/dark, /area/medical/paramedic) +"uiw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/port) "uiF" = ( /obj/effect/landmark/start/security_officer, /turf/open/floor/plasteel, @@ -41959,8 +46357,11 @@ dir = 4 }, /obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) @@ -41972,21 +46373,20 @@ pixel_y = 7 }, /obj/item/pen, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) "ujN" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/brown{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -29 - }, -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "ukd" = ( /obj/structure/cable{ icon_state = "4-8" @@ -41998,21 +46398,6 @@ "ukj" = ( /turf/open/floor/plasteel/white, /area/medical/virology) -"ukA" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/meter, -/turf/open/floor/engine, -/area/engineering/main) "ukE" = ( /obj/structure/cable{ icon_state = "1-2" @@ -42038,25 +46423,6 @@ "ukX" = ( /turf/open/floor/plasteel/dark, /area/ai_monitored/command/nuke_storage) -"ulb" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/obj/machinery/door/window/northleft{ - name = "Engineering Production"; - req_access_txt = "10" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/main) "ulg" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -42068,7 +46434,16 @@ name = "Station Intercom (Medbay)" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/obj/item/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/turf/open/floor/plasteel, /area/medical/medbay/central) "ulj" = ( /obj/machinery/door/airlock{ @@ -42083,29 +46458,25 @@ }, /turf/open/floor/plasteel/freezer, /area/commons/dorms) -"ulq" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/commons/dorms) -"ulB" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral{ +"ulk" = ( +/obj/machinery/light{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/photocopier, +/turf/open/floor/wood, +/area/service/library) +"ulq" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 8 }, -/obj/machinery/power/apc{ - areastring = "/area/engineering/secure_construction"; - dir = 8; - name = "Secure Construction"; - pixel_x = -25 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) +/turf/open/floor/plasteel, +/area/service/hydroponics) "ulF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/cable{ @@ -42114,8 +46485,10 @@ /turf/open/floor/plating, /area/icemoon/surface/outdoors) "ulT" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/turf/open/floor/carpet/blue, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/carpet/orange, /area/commons/dorms) "umq" = ( /obj/effect/turf_decal/stripes, @@ -42125,14 +46498,6 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) -"ums" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/main) "unr" = ( /obj/machinery/door/airlock/external{ name = "Supply Dock Airlock"; @@ -42147,20 +46512,10 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/cargo/storage) -"unL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/meter, -/turf/open/floor/engine, -/area/engineering/main) "unZ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/maintenance/aft/secondary) +/obj/structure/trash_pile, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "uoc" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -42172,49 +46527,33 @@ /turf/open/floor/plasteel/dark, /area/security/office) "uoi" = ( -/obj/effect/turf_decal/stripes, -/obj/machinery/atmospherics/components/binary/pump/on, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/light/small/broken{ +/obj/machinery/computer/slot_machine, +/obj/machinery/light{ dir = 1; - icon_state = "bulb-broken" + pixel_y = 16 }, -/turf/open/floor/engine, -/area/maintenance/aft/secondary) +/turf/open/floor/carpet/arcade, +/area/service/library) "uop" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_x = 28 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/hallway/primary/aft) "uoF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /turf/open/floor/wood, /area/commons/dorms) -"uoK" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room"; - req_access_txt = "10" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" - }, -/obj/machinery/door/firedoor/border_only{ - name = "south facing firelock" - }, -/turf/open/floor/engine, -/area/engineering/main) "uoO" = ( /obj/machinery/conveyor{ dir = 8; @@ -42229,12 +46568,19 @@ /turf/open/floor/plating, /area/cargo/sorting) "upj" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer3, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 6 +/obj/structure/table, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/engineering/atmospherics_engine) +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/item/stack/cable_coil, +/turf/open/floor/plasteel, +/area/engineering/lobby) "upE" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -42243,7 +46589,7 @@ /obj/structure/chair{ dir = 8 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/security/courtroom) "upN" = ( /obj/machinery/vending/wardrobe/viro_wardrobe, @@ -42276,12 +46622,9 @@ /turf/open/floor/plating, /area/maintenance/department/science) "uql" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/fore) "uqt" = ( @@ -42307,7 +46650,8 @@ dir = 8 }, /obj/effect/landmark/start/roboticist, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, /area/science/robotics/lab) "uqL" = ( /obj/effect/turf_decal/stripes/line{ @@ -42342,12 +46686,9 @@ /obj/structure/cable{ icon_state = "1-8" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/department/science/xenobiology) "urV" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/firedoor/border_only{ dir = 1; @@ -42358,12 +46699,21 @@ }, /obj/machinery/door/airlock/maintenance, /turf/open/floor/plating, -/area/maintenance/aft/secondary) +/area/service/library) "urX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/effect/landmark/xeno_spawn, +/obj/machinery/door/airlock/external{ + name = "Engineering External Access"; + req_access_txt = "11;13" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4; + name = "east facing firelock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, /turf/open/floor/plating, -/area/engineering/main) +/area/engineering/engine_smes) "usa" = ( /obj/structure/cable{ icon_state = "4-8" @@ -42383,14 +46733,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/aft/secondary) "usm" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = "MedbayFoyer"; - name = "Medbay"; - req_access_txt = "5" - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -42403,6 +46748,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "MedbayFoyer"; + name = "Medbay"; + req_access_txt = "5"; + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/paramedic) "usL" = ( @@ -42426,17 +46777,9 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "usM" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engineering/main) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engineering/engine_smes) "usN" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -42445,15 +46788,37 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/reagent_dispensers/water_cooler, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/maintenance/aft) "uti" = ( -/obj/machinery/atmospherics/components/binary/pump{ +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/light, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/supermatter{ + pixel_y = 32 + }, /turf/open/floor/plasteel, -/area/engineering/atmos) +/area/engineering/main) "utH" = ( /obj/machinery/door/window/southleft{ name = "Mass Driver Door"; @@ -42477,41 +46842,31 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/command/heads_quarters/hos) -"utZ" = ( -/obj/machinery/atmospherics/components/binary/pump{ - name = "Atmos to Gas" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engineering/main) "uub" = ( -/obj/machinery/button/door{ - desc = "A remote control-switch for secure storage."; - id = "Secure Storage"; - name = "Engineering Secure Storage"; - pixel_x = -24; - req_access_txt = "10" +/obj/machinery/status_display/evac, +/turf/closed/wall/r_wall, +/area/engineering/supermatter) +"uuA" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ + dir = 8 + }, +/turf/open/floor/engine/air, +/area/engineering/atmos) +"uuD" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 }, -/obj/structure/closet/secure_closet/engineering_welding, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engineering/main) -"uuA" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "uuL" = ( /obj/structure/cable{ icon_state = "1-4" @@ -42554,7 +46909,8 @@ dir = 1 }, /obj/machinery/stasis, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/box/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "uvO" = ( /obj/structure/table, @@ -42579,21 +46935,17 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/department/science/xenobiology) "uvW" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/obj/effect/turf_decal/tile/yellow{ +/obj/machinery/atmospherics/components/trinary/filter, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engineering/break_room) +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "uww" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -42663,21 +47015,20 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12"; + welded = 1; + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/central) "uxR" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -29 @@ -42685,6 +47036,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "uyc" = ( @@ -42693,6 +47050,18 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) +"uyz" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "uyD" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/disposalpipe/segment{ @@ -42700,18 +47069,6 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) -"uyK" = ( -/obj/machinery/airalarm{ - pixel_y = 28 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) "uyL" = ( /obj/structure/cable{ icon_state = "4-8" @@ -42719,10 +47076,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock{ - name = "Law Office"; - req_access_txt = "38" - }, /obj/machinery/door/firedoor/border_only{ dir = 8; name = "west facing firelock" @@ -42730,13 +47083,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock{ + name = "Law Office"; + req_access_txt = "38"; + dir = 4 + }, /turf/open/floor/plating, /area/service/lawoffice) "uyP" = ( /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) "uyS" = ( /obj/structure/cable{ @@ -42747,8 +47105,19 @@ }, /turf/open/floor/plating, /area/maintenance/department/bridge) +"uzd" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plasteel{ + dir = 4; + icon_state = "floor_trim" + }, +/area/science/robotics/lab) "uzf" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "uzQ" = ( @@ -42767,7 +47136,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/hallway/primary/central) "uAq" = ( /obj/structure/cable{ @@ -42796,20 +47165,8 @@ /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, /obj/effect/landmark/xeno_spawn, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/meeting_room) -"uAM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "uBm" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -42848,6 +47205,19 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"uCh" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Mix to Engine" + }, +/obj/machinery/camera{ + c_tag = "Atmospherics North East" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "uCp" = ( /obj/structure/cable{ icon_state = "4-8" @@ -42876,35 +47246,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"uCJ" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/obj/machinery/rnd/production/protolathe/department/engineering, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/camera{ - c_tag = "Engineering Storage"; - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/main) "uDl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -42940,6 +47281,10 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/dark, /area/medical/morgue) +"uDB" = ( +/obj/item/beacon, +/turf/open/floor/carpet, +/area/hallway/secondary/exit/departure_lounge) "uDI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -42947,6 +47292,23 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel, /area/maintenance/aft/secondary) +"uDO" = ( +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "uDX" = ( /obj/machinery/atmospherics/pipe/manifold/supply/visible, /obj/structure/disposalpipe/segment{ @@ -43030,15 +47392,6 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) -"uFD" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer3{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 5 - }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/engineering/atmospherics_engine) "uFV" = ( /obj/machinery/holopad, /turf/open/floor/wood, @@ -43077,6 +47430,11 @@ /obj/structure/chair/sofa/right{ dir = 1 }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/obj/structure/window/reinforced, /turf/open/floor/wood, /area/hallway/primary/port) "uGu" = ( @@ -43089,28 +47447,30 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/plasteel/dark/side{ - dir = 8; - icon_state = "dark" - }, +/turf/open/floor/plasteel/dark, /area/hallway/primary/central) "uGx" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, /turf/open/floor/plasteel, /area/cargo/sorting) "uGJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "uGV" = ( @@ -43156,6 +47516,21 @@ icon_state = "darkcorner" }, /area/hallway/primary/central) +"uIe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/robotics/lab) +"uIg" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "uIi" = ( /obj/structure/disposalpipe/sorting/mail{ dir = 8; @@ -43168,9 +47543,15 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "uIE" = ( @@ -43184,11 +47565,10 @@ /turf/open/floor/plasteel, /area/cargo/storage) "uIW" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 9 - }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/engineering/main) "uIZ" = ( /turf/closed/mineral/random/snow, /area/icemoon/underground/unexplored) @@ -43223,21 +47603,23 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"uJv" = ( +"uJr" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engineering/main) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/stairs/left, +/area/hallway/primary/central) +"uJv" = ( +/obj/structure/ore_box, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "uJP" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/fans/tiny, /obj/machinery/door/airlock/external/glass, -/turf/open/floor/carpet, +/turf/open/floor/plasteel, /area/hallway/primary/port) "uJS" = ( /obj/structure/sink{ @@ -43248,15 +47630,15 @@ /obj/structure/mirror{ pixel_x = -28 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel/freezer, /area/commons/dorms) "uJV" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/o2{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Air to Mix" }, +/obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/plasteel, /area/engineering/atmos) "uKF" = ( @@ -43278,23 +47660,24 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "uKR" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/table, +/obj/item/flashlight{ + pixel_x = 1; + pixel_y = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/item/flashlight{ + pixel_x = 1; + pixel_y = 5 }, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) +/obj/item/assembly/flash/handheld, +/obj/item/assembly/flash/handheld, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/turf/open/floor/plating, +/area/engineering/storage/tech) "uLa" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 8 }, /obj/structure/railing, @@ -43327,21 +47710,23 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "0-2" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "uMj" = ( -/obj/machinery/light/small{ +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "snaxi_mining_shutter"; + name = "blast door seal"; dir = 4 }, -/obj/machinery/portable_atmospherics/canister/toxins, /turf/open/floor/plating, -/area/engineering/storage) +/area/mine/lobby) "uMl" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -43361,6 +47746,12 @@ color = "#596479"; dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /turf/open/floor/carpet, /area/service/bar) "uNm" = ( @@ -43386,13 +47777,21 @@ }, /obj/effect/landmark/blobstart, /turf/open/floor/plating, -/area/engineering/secure_construction) +/area/commons/storage/primary) "uOr" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/toilet{ + dir = 8 }, -/turf/open/floor/plating, -/area/engineering/storage) +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/mine/lobby) +"uOy" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors) "uOD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -43411,6 +47810,12 @@ /area/hallway/primary/port) "uPD" = ( /obj/machinery/ntnet_relay, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/end{ + dir = 4 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "uPM" = ( @@ -43426,7 +47831,7 @@ "uQh" = ( /obj/structure/chair/office/light, /obj/effect/landmark/start/medical_doctor, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "uQt" = ( /obj/structure/cable{ @@ -43435,6 +47840,11 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel, /area/security/office) "uQF" = ( @@ -43451,17 +47861,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel/white, /area/medical/virology) -"uRa" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" - }, -/obj/machinery/door/firedoor/border_only{ - name = "south facing firelock" - }, -/turf/open/floor/plating, -/area/engineering/main) "uRj" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -43473,13 +47872,10 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/aft/secondary) "uRI" = ( /obj/structure/cable{ @@ -43492,9 +47888,14 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "uRU" = ( -/mob/living/simple_animal/opossum, -/turf/open/floor/plating, -/area/maintenance/aft/secondary) +/obj/structure/table/wood, +/obj/machinery/computer/libraryconsole, +/turf/open/floor/wood, +/area/service/library) +"uRW" = ( +/obj/structure/chair/stool, +/turf/open/floor/plasteel, +/area/engineering/main) "uRX" = ( /obj/machinery/door/firedoor/border_only{ name = "south facing firelock" @@ -43508,6 +47909,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/cafeteria, /area/science/xenobiology) +"uSg" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "uSo" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/RnD_secure, @@ -43522,36 +47931,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/paramedic) -"uSL" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) -"uSN" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/bin, -/turf/open/floor/plasteel, -/area/engineering/main) "uSQ" = ( /obj/structure/bodycontainer/morgue{ dir = 2 @@ -43590,16 +47969,22 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "uTx" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "uTU" = ( /turf/open/openspace/icemoon, /area/icemoon/surface/outdoors) "uUc" = ( /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/dark, /area/hallway/primary/aft) "uUx" = ( /obj/structure/grille, @@ -43625,6 +48010,10 @@ name = "Cargo Security APC"; pixel_x = -25 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "uUJ" = ( @@ -43646,7 +48035,7 @@ /area/mine/maintenance) "uVh" = ( /turf/closed/wall/r_wall, -/area/engineering/break_room) +/area/engineering/lobby) "uVx" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, @@ -43658,7 +48047,7 @@ pixel_y = 8; pixel_x = 8 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_tiled, /area/command/heads_quarters/captain) "uVz" = ( /obj/effect/turf_decal/tile/red, @@ -43679,23 +48068,19 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/obj/machinery/door/airlock/research/glass{ - name = "Robotics Lab"; - req_access_txt = "29" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/research/glass{ + name = "Robotics Lab"; + req_access_txt = "29"; + dir = 4 + }, /turf/open/floor/plasteel, /area/science/robotics/lab) -"uVL" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "uWI" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -43735,26 +48120,17 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/solars/port/fore) -"uXe" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/command/heads_quarters/ce) "uXD" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; name = "Medbay"; - req_access_txt = "5" - }, -/obj/structure/disposalpipe/segment{ + req_access_txt = "5"; dir = 4 }, /turf/open/floor/plasteel/white, @@ -43787,19 +48163,41 @@ name = "Library Desk Door"; req_access_txt = "37" }, -/turf/open/floor/wood, +/turf/open/floor/carpet/green, /area/service/library) "uXY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel/freezer, /area/commons/dorms) +"uYh" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "uYp" = ( /obj/machinery/mech_bay_recharge_port, /obj/structure/cable{ icon_state = "0-2" }, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "uYL" = ( @@ -43809,9 +48207,6 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "uYO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -43850,6 +48245,10 @@ /obj/machinery/vending/cigarette, /turf/open/floor/plasteel, /area/commons/fitness) +"uZR" = ( +/obj/machinery/cryopod/tele, +/turf/open/floor/pod/dark, +/area/commons/dorms) "vaa" = ( /obj/machinery/door/airlock/maintenance{ name = "Mixing Lab Maintenance"; @@ -43859,21 +48258,25 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/department/science/xenobiology) "vag" = ( /obj/machinery/camera{ c_tag = "Northwestern Hall 4"; dir = 8 }, +/obj/machinery/space_heater, /turf/open/floor/plasteel, /area/hallway/primary/port) "vah" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ +/obj/structure/fireaxecabinet{ + pixel_x = -32 + }, +/obj/machinery/suit_storage_unit/atmos, +/obj/machinery/light{ dir = 8 }, -/obj/machinery/meter, -/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engineering/atmos) "van" = ( @@ -43971,16 +48374,27 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) +"vaS" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/commons/dorms) "vaW" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/sorting) "vbf" = ( @@ -43994,7 +48408,7 @@ /turf/open/floor/plating, /area/command/heads_quarters/hos) "vby" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 1 }, /turf/open/floor/plasteel/grimy, @@ -44017,8 +48431,19 @@ }, /area/service/chapel/main) "vci" = ( -/turf/closed/wall, -/area/engineering/atmos) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/engineering/main) "vcn" = ( /obj/structure/light_construct/small, /turf/open/floor/wood{ @@ -44029,28 +48454,6 @@ /obj/structure/chair/stool, /turf/open/floor/plating, /area/maintenance/bar) -"vcx" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) -"vcD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall/r_wall, -/area/engineering/main) "vcI" = ( /obj/structure/bed, /obj/item/bedsheet/syndie, @@ -44064,25 +48467,28 @@ /turf/open/floor/plasteel/white, /area/science/misc_lab) "vcV" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engineering/main) -"vcZ" = ( /obj/machinery/light{ - dir = 1 + dir = 4 }, -/obj/machinery/button/door{ - id = "tegvent"; - name = "TEG Vent"; - pixel_y = 25 +/obj/structure/table/reinforced, +/obj/item/clipboard, +/obj/item/paper/monitorkey, +/obj/item/pen/fountain, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/recharger{ + pixel_y = 5; + pixel_x = -7 }, /turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) +/area/command/heads_quarters/ce) "vdu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -44095,15 +48501,43 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"vdE" = ( -/obj/effect/turf_decal/bot, -/obj/structure/sign/warning/nosmoking{ - pixel_x = -32 +"vdz" = ( +/obj/structure/cable{ + icon_state = "4-8" }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"vdE" = ( +/obj/structure/table/wood/poker, +/obj/item/storage/box/matches{ + pixel_y = -6 + }, +/obj/item/lighter{ + pixel_x = 10; + pixel_y = -12 + }, +/turf/open/floor/wood, +/area/hallway/primary/port) +"vdQ" = ( +/obj/machinery/holopad, /turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/area/engineering/main) "vdV" = ( /obj/structure/chair/sofa/left, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/open/floor/wood, /area/hallway/primary/port) "veh" = ( @@ -44152,6 +48586,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/maintenance/aft/secondary) +"vfI" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "vgu" = ( /obj/structure/cable{ icon_state = "2-4" @@ -44185,25 +48625,43 @@ /turf/open/floor/plasteel/dark, /area/science/server) "vgT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet, -/area/service/bar) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "vgY" = ( -/obj/machinery/field/generator, +/obj/structure/closet/firecloset, /turf/open/floor/plating, /area/engineering/storage) "vho" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/carpet, -/area/service/bar) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/turf/open/floor/carpet/royalblue, +/area/commons/dorms) "vhC" = ( /turf/open/floor/plasteel/chapel{ dir = 1 }, /area/service/chapel/main) +"vhS" = ( +/obj/structure/barricade/wooden, +/obj/machinery/door/firedoor/border_only/closed{ + dir = 8; + icon_state = "door_closed" + }, +/obj/machinery/door/airlock/mining{ + req_access_txt = "48"; + dir = 4 + }, +/turf/open/floor/plasteel, +/area/maintenance/aft/secondary) "vhX" = ( /turf/closed/wall, /area/cargo/sorting) @@ -44275,10 +48733,15 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/maintenance/department/bridge) "viV" = ( @@ -44324,10 +48787,10 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "vjz" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, /obj/effect/landmark/blobstart, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, /turf/open/floor/plasteel, /area/service/janitor) "vjI" = ( @@ -44343,6 +48806,12 @@ /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/storage) "vjJ" = ( @@ -44420,10 +48889,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, -/obj/effect/decal/medium_gato, /turf/open/floor/plasteel, /area/hallway/primary/fore) "vkr" = ( @@ -44449,8 +48917,8 @@ /turf/open/floor/wood, /area/service/bar) "vkJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 }, /turf/open/floor/plasteel, /area/commons/fitness) @@ -44477,6 +48945,12 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, /turf/open/floor/plasteel/checker, /area/command/heads_quarters/rd) "vlq" = ( @@ -44512,8 +48986,8 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "vlT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 }, /turf/open/floor/wood, /area/service/bar) @@ -44556,17 +49030,29 @@ /turf/open/floor/plasteel/dark, /area/security/office) "vnA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/mineral/equipment_vendor, /obj/machinery/door/firedoor, +/obj/machinery/door/window/westleft, /turf/open/floor/plating, /area/cargo/miningdock) "vnB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"vnE" = ( +/obj/effect/landmark/start/station_engineer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/lobby) "vnP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -44585,7 +49071,13 @@ dir = 4; pixel_x = -24 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel, /area/medical/medbay/central) "voo" = ( /obj/machinery/computer/cargo{ @@ -44614,15 +49106,6 @@ /obj/machinery/iv_drip, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"vpd" = ( -/obj/item/paper/fluff{ - info = "Crystal has been moved to a lockbox in secure storage until further notice."; - name = "Note from an engineer"; - pixel_x = -5; - pixel_y = 3 - }, -/turf/open/floor/engine, -/area/engineering/supermatter) "vpl" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -44638,6 +49121,12 @@ departmentType = 2; pixel_y = 30 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, /turf/open/floor/plasteel, /area/cargo/storage) "vpG" = ( @@ -44648,6 +49137,18 @@ "vpI" = ( /turf/closed/wall, /area/maintenance/disposal) +"vpK" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "vql" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -44658,7 +49159,8 @@ }, /obj/machinery/door/airlock/research{ name = "Toxins Launch Room"; - req_access_txt = "0" + req_access_txt = "0"; + dir = 4 }, /turf/open/floor/plasteel, /area/maintenance/aft) @@ -44679,6 +49181,14 @@ /area/science/mixing) "vqL" = ( /obj/machinery/telecomms/server/presets/supply, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "vqT" = ( @@ -44691,10 +49201,14 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/solars/starboard/aft) "vqW" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/computer/atmos_control/tank/mix_tank, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "vqY" = ( /obj/structure/chair{ dir = 4 @@ -44738,10 +49252,10 @@ dir = 1; name = "north facing firelock" }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/service/chapel/office) "vsn" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /obj/effect/turf_decal/tile/brown{ dir = 4 }, @@ -44759,11 +49273,15 @@ }, /turf/open/floor/plasteel, /area/cargo/sorting) +"vsp" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/wood, +/area/service/library) "vsX" = ( /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "vsZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -44779,9 +49297,9 @@ /turf/open/floor/plating, /area/maintenance/aft/secondary) "vtx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/fore) "vtz" = ( @@ -44828,6 +49346,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4; + icon_state = "steel_decals9" + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1; + icon_state = "steel_decals9" + }, /turf/open/floor/plasteel/freezer, /area/medical/surgery) "vuL" = ( @@ -44887,13 +49413,13 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/mixing) "vwu" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/tile/bar{ dir = 1 }, @@ -44906,28 +49432,9 @@ name = "north facing firelock" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/service/bar) -"vwA" = ( -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" - }, -/turf/open/floor/engine, -/area/engineering/supermatter) "vwD" = ( /obj/structure/cable{ icon_state = "2-4" @@ -44940,6 +49447,15 @@ }, /turf/open/floor/plating, /area/maintenance/department/electrical) +"vwG" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, +/area/hallway/primary/port) "vxc" = ( /obj/structure/cable{ icon_state = "1-2" @@ -44954,16 +49470,11 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "vyx" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, -/turf/open/floor/plasteel, -/area/engineering/main) +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "vyB" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -44977,12 +49488,16 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel{ + icon_state = "floor_trim" + }, /area/medical/medbay/central) "vyV" = ( /obj/structure/cable, @@ -45005,6 +49520,10 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"vyZ" = ( +/obj/machinery/holopad, +/turf/open/floor/plasteel/white, +/area/medical/chemistry) "vze" = ( /obj/structure/chair/comfy/brown{ dir = 1 @@ -45012,10 +49531,10 @@ /turf/open/floor/wood, /area/icemoon/surface/outdoors) "vzf" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plating, /area/maintenance/department/bridge) "vzo" = ( @@ -45026,19 +49545,12 @@ }, /turf/open/floor/plating, /area/icemoon/surface/outdoors) -"vzB" = ( -/obj/effect/turf_decal/stripes/corner{ +"vzN" = ( +/obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) -"vzN" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input, -/obj/machinery/air_sensor/atmos/air_tank{ - pixel_x = 25 - }, -/turf/open/floor/engine/air, /area/engineering/atmos) "vzQ" = ( /obj/structure/cable{ @@ -45085,16 +49597,25 @@ /turf/open/floor/plasteel/white, /area/maintenance/aft/secondary) "vAJ" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 1 }, -/turf/closed/wall, -/area/service/janitor) +/turf/open/floor/plasteel, +/area/cargo/storage) +"vAS" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/robotics/lab) "vAY" = ( /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/robotics/lab) "vBc" = ( /obj/machinery/camera{ @@ -45108,7 +49629,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/circuit/off, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "vBd" = ( /obj/effect/turf_decal/tile/blue{ @@ -45122,6 +49643,15 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) +"vBn" = ( +/obj/machinery/light, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "vBy" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -45146,7 +49676,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/catwalk_floor, /area/maintenance/aft/secondary) "vBI" = ( /obj/structure/cable{ @@ -45155,7 +49685,6 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /obj/structure/cable{ icon_state = "1-2" }, @@ -45184,25 +49713,14 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) -"vCW" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "vCZ" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 +/obj/structure/bed, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 }, -/turf/open/floor/plasteel/cafeteria, -/area/service/kitchen) +/obj/item/bedsheet/black, +/turf/open/floor/carpet/royalblack, +/area/commons/dorms) "vDa" = ( /obj/structure/closet/secure_closet/miner, /obj/item/clothing/shoes/winterboots/ice_boots, @@ -45218,11 +49736,9 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/solars/starboard/aft) "vDe" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 6 - }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/engineering/atmospherics_engine) +/obj/machinery/vending/engivend, +/turf/open/floor/plating, +/area/engineering/storage/tech) "vDg" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -45236,8 +49752,21 @@ }, /turf/open/floor/plating, /area/tcommsat/server) +"vDm" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 9; + icon_state = "steel_decals3" + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8; + icon_state = "steel_decals3" + }, +/turf/open/floor/plasteel, +/area/cargo/storage) "vDp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/airlock/public/glass{ name = "Snow Airlock" }, @@ -45290,6 +49819,13 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"vEj" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/engineering/main) "vEX" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -45308,11 +49844,23 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) +"vFD" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) "vFV" = ( /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -45324,6 +49872,16 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) +"vGc" = ( +/obj/machinery/telecomms/hub/preset, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) "vGi" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -45332,6 +49890,9 @@ /obj/machinery/atmospherics/components/trinary/filter/atmos/n2{ dir = 1 }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "vGF" = ( @@ -45353,13 +49914,16 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/starboard) "vGY" = ( @@ -45367,7 +49931,7 @@ icon_state = "4-8" }, /obj/machinery/holopad, -/turf/open/floor/circuit/off, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "vHp" = ( /obj/effect/turf_decal/tile/brown{ @@ -45376,24 +49940,16 @@ /obj/effect/turf_decal/tile/brown, /obj/structure/chair/office/dark, /obj/effect/landmark/start/quartermaster, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/cargo/qm) "vHs" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/light, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/effect/turf_decal/tile/yellow, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/engineering/main) "vHw" = ( @@ -45413,9 +49969,6 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/light{ dir = 1 }, @@ -45447,7 +50000,7 @@ name = "north facing firelock" }, /obj/structure/disposalpipe/segment, -/turf/open/floor/carpet, +/turf/open/floor/plasteel/dark, /area/command/heads_quarters/hos) "vIb" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -45456,18 +50009,11 @@ /turf/open/floor/plasteel/white, /area/medical/paramedic) "vIA" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output{ - dir = 1 - }, -/turf/open/floor/engine/airless, -/area/maintenance/aft/secondary) +/obj/structure/table/rolling, +/obj/item/trash/fatoray_scrap1, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "vIX" = ( -/obj/machinery/door/airlock/external{ - glass = 1; - name = "Mining External Airlock"; - opacity = 0; - req_access_txt = "54" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -45480,14 +50026,25 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/floor/plasteel/dark, +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining External Airlock"; + opacity = 0; + req_access_txt = "54"; + dir = 4 + }, +/turf/open/floor/plating, /area/mine/eva) "vJm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/item/kirbyplants{ icon_state = "plant-10" }, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/dark, /area/hallway/primary/aft) "vJn" = ( /obj/structure/disposalpipe/trunk{ @@ -45499,11 +50056,11 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "vJq" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, /turf/open/floor/carpet, /area/mine/lobby) "vJr" = ( @@ -45515,7 +50072,7 @@ /turf/open/floor/plasteel/dark, /area/security/prison) "vJs" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -45523,21 +50080,10 @@ }, /turf/open/floor/plasteel/freezer, /area/service/kitchen) -"vJx" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/open/floor/engine, -/area/engineering/main) "vJD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/obj/structure/chair/stool, /turf/open/floor/plasteel/grimy, /area/commons/fitness/recreation) "vJH" = ( @@ -45548,9 +50094,11 @@ dir = 1; name = "north facing firelock" }, -/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/airlock/public/glass{ + name = "Library" + }, /turf/open/floor/plasteel, -/area/maintenance/aft) +/area/service/library) "vJK" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 @@ -45584,11 +50132,17 @@ /turf/open/floor/plating, /area/maintenance/department/science) "vKu" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/table/wood/fancy/orange, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 }, -/turf/closed/wall, -/area/engineering/storage/tech) +/obj/item/reagent_containers/food/snacks/toastedsandwich{ + pixel_y = 6 + }, +/turf/open/floor/carpet/orange, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "vKO" = ( /obj/machinery/atmospherics/components/binary/valve{ dir = 4 @@ -45598,7 +50152,9 @@ /area/maintenance/department/science/xenobiology) "vLt" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, /area/hallway/primary/port) "vLu" = ( /obj/machinery/airalarm{ @@ -45619,7 +50175,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/service/chapel/office) "vLy" = ( /obj/machinery/conveyor{ @@ -45641,16 +50197,6 @@ }, /turf/open/floor/wood, /area/maintenance/bar) -"vLX" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/main) "vMb" = ( /turf/open/floor/plasteel/dark, /area/tcommsat/computer) @@ -45670,7 +50216,6 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "vMH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -45713,6 +50258,15 @@ }, /turf/open/floor/plasteel, /area/maintenance/aft) +"vNv" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/open/floor/plasteel, +/area/maintenance/aft) "vNB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -45737,7 +50291,7 @@ /obj/machinery/ai_slipper{ uses = 10 }, -/turf/open/floor/circuit, +/turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) "vOs" = ( /obj/structure/cable{ @@ -45753,7 +50307,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "vOS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/layer_manifold, /obj/machinery/door/airlock/public/glass{ name = "Snow Airlock" }, @@ -45794,8 +50348,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/carpet/royalblue, /area/command/bridge) +"vPR" = ( +/obj/structure/sign/warning/gato/docking, +/turf/closed/wall/r_wall, +/area/maintenance/aft) "vQl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -45818,17 +50376,24 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "vQB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/structure/reagent_dispensers/watertank/high, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/camera{ - c_tag = "Atmospherics Central"; +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/plasteel, -/area/engineering/atmos) +/area/engineering/main) "vQF" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -45839,13 +50404,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/hallway/primary/central) "vQP" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/heads_quarters/captain) "vRa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -45862,6 +50427,16 @@ dir = 8 }, /obj/machinery/disposal/bin, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/wood, /area/hallway/primary/port) "vRF" = ( @@ -45872,16 +50447,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/white, /area/medical/medbay/central) @@ -45921,6 +50486,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"vTw" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/commons/fitness) "vTO" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -45928,36 +50499,33 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "vUq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=Dorm"; location = "HOP2" }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/hallway/primary/aft) "vUz" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - sortType = 4 +/obj/structure/disposalpipe/junction/flip, +/obj/structure/cable{ + icon_state = "1-4" }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /turf/open/floor/plasteel, -/area/commons/storage/primary) +/area/hallway/primary/aft) "vUI" = ( /turf/open/floor/plasteel/freezer, /area/science/xenobiology) @@ -45978,29 +50546,8 @@ pixel_x = -6; pixel_y = -26 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/command/heads_quarters/hos) -"vUX" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/table, -/obj/item/multitool{ - pixel_x = 4 - }, -/obj/item/multitool, -/obj/item/assembly/igniter, -/obj/item/assembly/igniter{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/assembly/signaler, -/obj/item/assembly/signaler, -/turf/open/floor/plasteel, -/area/commons/storage/primary) "vVc" = ( /obj/machinery/airalarm{ pixel_y = 23 @@ -46058,9 +50605,11 @@ /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "vVU" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ - dir = 1 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "N2 to Pure" }, +/obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/plasteel, /area/engineering/atmos) "vVY" = ( @@ -46076,6 +50625,16 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) +"vWs" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/cargo/qm) "vWI" = ( /obj/effect/landmark/blobstart, /turf/open/floor/carpet, @@ -46091,57 +50650,47 @@ /turf/open/floor/plasteel/white, /area/science/misc_lab) "vXV" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 6 }, -/obj/machinery/meter, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "vYn" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" - }, -/obj/machinery/door/airlock/command/glass{ - name = "Chief Engineer"; - req_access_txt = "56" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/door/airlock/command{ + name = "Chief Engineer's Office"; + req_access_txt = "56"; + dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plasteel, -/area/command/heads_quarters/ce) -"vYt" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/machinery/door/airlock/atmos{ - name = "Antimatter Engine"; - req_access_txt = "10" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 }, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" }, /turf/open/floor/plasteel, -/area/engineering/secure_construction) +/area/command/heads_quarters/ce) +"vYt" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/commons/storage/primary) "vYA" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -46149,6 +50698,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/commons/fitness) "vYH" = ( @@ -46160,13 +50710,6 @@ }, /turf/open/floor/plasteel/grimy, /area/service/bar) -"vYJ" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) "vZd" = ( /obj/structure/table/glass, /obj/item/slime_scanner, @@ -46198,14 +50741,19 @@ name = "hyper-reinforced wall" }, /area/icemoon/surface/outdoors) +"vZJ" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "vZN" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/command/glass{ - name = "Research Director"; - req_access_txt = "30" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -46215,7 +50763,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plasteel/checker, +/obj/machinery/door/airlock/command/glass{ + name = "Research Director"; + req_access_txt = "30"; + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/command/heads_quarters/rd) "wac" = ( /obj/structure/cable{ @@ -46226,21 +50779,23 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) +"wak" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 10 + }, +/turf/closed/wall/r_wall, +/area/engineering/supermatter) "waz" = ( /obj/structure/table, /obj/item/hand_tele, /turf/open/floor/plasteel/dark, /area/command/teleporter) "wbv" = ( -/obj/machinery/light/small, -/obj/structure/disposalpipe/trunk{ +/obj/structure/chair/sofa/left/old{ dir = 4 }, -/obj/structure/disposaloutlet{ - dir = 1 - }, -/turf/open/floor/engine, -/area/maintenance/aft/secondary) +/turf/open/floor/carpet/green, +/area/service/library) "wbx" = ( /obj/docking_port/stationary{ dir = 4; @@ -46269,6 +50824,9 @@ /obj/structure/toilet{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, /turf/open/floor/plasteel/freezer, /area/commons/dorms) "wcc" = ( @@ -46331,11 +50889,32 @@ dir = 4 }, /area/service/chapel/main) +"wdq" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/commons/dorms) "wdy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/stairs/left, /area/hallway/primary/port) +"wdz" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/corner, +/area/engineering/lobby) "wdE" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat/service) @@ -46345,20 +50924,21 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "wdR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 }, -/turf/closed/wall, +/obj/structure/mirror{ + pixel_x = -28 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/turf/open/floor/plasteel/freezer, /area/commons/dorms) -"wdZ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/turf/open/floor/engine, -/area/engineering/main) "wem" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -46366,12 +50946,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/gear_painter, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/closet/wardrobe/white, /turf/open/floor/wood, /area/commons/dorms) "wev" = ( /obj/machinery/computer/security, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, /area/security/warden) "weT" = ( /obj/item/kirbyplants{ @@ -46389,23 +50973,9 @@ /turf/open/floor/plasteel/white, /area/science/lab) "wfc" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" - }, -/obj/machinery/door/window/southleft{ - dir = 8; - name = "Test Chamber"; - req_access_txt = "55" - }, -/turf/open/floor/engine, -/area/maintenance/aft/secondary) +/obj/effect/turf_decal/stripes/white/line, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "wfd" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ @@ -46422,21 +50992,6 @@ }, /turf/open/floor/plating, /area/science/xenobiology) -"wfe" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4; - name = "east facing firelock" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" - }, -/obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room"; - req_access_txt = "10" - }, -/turf/open/floor/engine, -/area/engineering/main) "wfg" = ( /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/effect/turf_decal/tile/blue{ @@ -46459,6 +51014,14 @@ c_tag = "Telecomms Server Room"; network = list("tcomms") }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "wfu" = ( @@ -46476,10 +51039,17 @@ /obj/machinery/space_heater, /turf/open/floor/pod/dark, /area/medical/paramedic) -"wgc" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Dormitory" +"wfW" = ( +/obj/structure/cable{ + icon_state = "0-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/catwalk_floor, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"wgc" = ( /obj/machinery/door/firedoor/border_only{ dir = 8; name = "west facing firelock" @@ -46491,27 +51061,21 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/public/glass{ + name = "Dormitory"; + dir = 4 + }, /turf/open/floor/wood, /area/commons/fitness) -"wgo" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/light{ +"wgl" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 }, -/obj/machinery/power/apc{ - areastring = "/area/engineering/atmospherics_engine"; - dir = 1; - name = "Atmospherics Engine APC"; - pixel_y = 23 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Gas waste pump" - }, -/turf/open/floor/plating, -/area/engineering/atmospherics_engine) +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "wgw" = ( /obj/structure/cable{ icon_state = "4-8" @@ -46540,19 +51104,17 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, /obj/machinery/door/airlock/public/glass{ name = "Auxiliary Tool Storage"; - req_access_txt = "12" - }, -/obj/machinery/door/firedoor/border_only{ + req_access_txt = "12"; dir = 8 }, /turf/open/floor/plasteel, /area/commons/storage/auxiliary) "wgO" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -46587,11 +51149,25 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"whC" = ( +/obj/structure/table/reinforced, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/clothing/mask/breath{ + pixel_x = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "whV" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/turf/open/floor/plasteel/freezer, +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes/white/line{ + dir = 2 + }, +/turf/open/floor/plasteel/white, /area/medical/surgery) "wio" = ( /obj/effect/spawner/structure/window/plasma/reinforced, @@ -46613,6 +51189,9 @@ color = "#596479"; dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, /turf/open/floor/carpet, /area/service/bar) "wjb" = ( @@ -46627,6 +51206,21 @@ /area/hallway/secondary/exit/departure_lounge) "wjh" = ( /obj/effect/landmark/event_spawn, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "wjr" = ( @@ -46636,18 +51230,22 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) "wjJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side, /area/hallway/primary/port) "wjP" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/mine/lobby) +"wjX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, +/area/service/library) "wkq" = ( /obj/structure/cable{ icon_state = "1-8" @@ -46660,6 +51258,14 @@ }, /turf/open/floor/plating, /area/maintenance/aft/secondary) +"wkN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "wkS" = ( /obj/structure/cable{ icon_state = "4-8" @@ -46672,9 +51278,6 @@ /turf/open/floor/plasteel/dark, /area/security/office) "wlf" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/airalarm{ pixel_y = 28 }, @@ -46688,7 +51291,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/engineering/lobby) "wlH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -46704,20 +51307,27 @@ /turf/open/floor/carpet, /area/hallway/secondary/exit/departure_lounge) "wlY" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior, -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" - }, -/turf/open/floor/plating, -/area/maintenance/aft/secondary) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/stairs, +/area/service/library) "wmi" = ( /obj/item/radio/intercom{ pixel_y = -26 }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) +"wml" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + dir = 4; + id = "ceprivacy"; + name = "privacy shutter" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/command/heads_quarters/ce) "wmv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/table, @@ -46766,7 +51376,7 @@ pixel_x = 25; pixel_y = 8 }, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) "wnF" = ( /obj/structure/sign/poster/contraband/random{ @@ -46791,6 +51401,17 @@ }, /turf/open/floor/plating, /area/construction/storage_wing) +"wok" = ( +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "woC" = ( /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ @@ -46799,15 +51420,21 @@ /turf/open/floor/plasteel/dark, /area/service/hydroponics) "wpc" = ( -/obj/machinery/light{ - dir = 4 +/obj/machinery/door/firedoor/border_only{ + dir = 1; + name = "north facing firelock" }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 +/obj/machinery/door/firedoor/border_only{ + name = "south facing firelock" + }, +/obj/machinery/door/airlock/public/glass{ + name = "Teleporters" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, /turf/open/floor/wood, -/area/service/library) +/area/commons/dorms) "wpj" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -46833,7 +51460,7 @@ "wpL" = ( /obj/structure/chair, /obj/effect/landmark/start/security_officer, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/hallway/primary/central) "wqu" = ( /obj/machinery/light, @@ -46850,10 +51477,25 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "wqN" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/effect/landmark/event_spawn, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/command/heads_quarters/ce) "wsq" = ( @@ -46863,6 +51505,15 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"wsH" = ( +/obj/structure/reagent_dispensers/fueltank/high, +/obj/machinery/light, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/turf/open/floor/plasteel, +/area/engineering/lobby) "wsJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -46879,17 +51530,34 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/checkpoint/supply) +"wta" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room"; + req_access_txt = "11"; + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "wtH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/white, /area/science/xenobiology) "wtJ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/manifold4w/supply/visible, +/obj/machinery/meter/atmos/distro_loop, +/turf/open/floor/plasteel, /area/engineering/atmos) "wtQ" = ( /obj/effect/turf_decal/tile/neutral, @@ -46925,7 +51593,7 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer1, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) "wuP" = ( @@ -46945,6 +51613,18 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel, /area/maintenance/aft/secondary) +"wuW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/computer/cryopod{ + pixel_y = -32 + }, +/turf/open/floor/plasteel{ + dir = 4; + icon_state = "floor_trim" + }, +/area/hallway/secondary/exit/departure_lounge) "wuZ" = ( /obj/structure/sign/departments/medbay/alt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -46959,7 +51639,10 @@ dir = 8; name = "west facing firelock" }, -/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/airlock/maintenance{ + dir = 8; + req_one_access_txt = "20;12" + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "wvu" = ( @@ -46995,11 +51678,17 @@ /turf/open/floor/plasteel/white, /area/science/misc_lab) "wvz" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 6 +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/light, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/engineering/atmospherics_engine) +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "wwa" = ( /obj/machinery/quantumpad{ map_pad_id = "3"; @@ -47013,6 +51702,26 @@ name = "northeast sector"; pixel_y = 13 }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "www" = ( @@ -47079,7 +51788,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/aft/secondary) "wyC" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -47139,11 +51848,20 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/medical/medbay/central) "wAc" = ( /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"wAg" = ( +/obj/structure/chair/office/dark{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/service/library) "wAm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -47151,7 +51869,7 @@ /obj/item/radio/intercom{ pixel_x = 28 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/service/chapel/office) "wAp" = ( /obj/structure/reagent_dispensers/watertank/high, @@ -47162,6 +51880,9 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/service/janitor) "wAJ" = ( @@ -47169,6 +51890,10 @@ /obj/structure/mineral_door/woodrustic, /turf/open/floor/plating, /area/icemoon/surface/outdoors) +"wAK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plating, +/area/engineering/storage/tech) "wBm" = ( /obj/docking_port/stationary{ dir = 8; @@ -47195,20 +51920,6 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"wBr" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -35 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "wBy" = ( /obj/structure/cable{ icon_state = "0-8" @@ -47238,7 +51949,7 @@ /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/hallway/primary/port) "wCc" = ( /obj/structure/table, @@ -47254,6 +51965,20 @@ "wCf" = ( /turf/open/floor/mech_bay_recharge_floor, /area/science/robotics/mechbay) +"wCE" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 6 + }, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/plasteel, +/area/commons/storage/primary) "wCG" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -47261,24 +51986,6 @@ }, /turf/open/floor/plating, /area/service/library) -"wCJ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) -"wCL" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engineering/secure_construction) "wCQ" = ( /obj/machinery/vending/wardrobe/gene_wardrobe, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -47296,21 +52003,49 @@ /obj/machinery/computer/security/telescreen/engine{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "wDc" = ( -/obj/effect/turf_decal/stripes/line, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -35 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/engine, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/item/grenade/chem_grenade/smart_metal_foam, +/obj/structure/rack/shelf, +/obj/item/grenade/chem_grenade/smart_metal_foam, +/obj/item/grenade/chem_grenade/smart_metal_foam, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/turf/open/floor/plasteel, /area/engineering/main) +"wDS" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8; + icon_state = "manifold-3" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) "wEb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /turf/open/floor/plasteel, @@ -47324,16 +52059,29 @@ /turf/open/floor/circuit, /area/science/lab) "wEQ" = ( -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/visible, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/mob/living/simple_animal/opossum/poppy, +/obj/machinery/camera{ + c_tag = "Engineering Secure Storage" + }, +/turf/open/floor/plating, +/area/engineering/storage) "wFq" = ( /obj/machinery/firealarm{ dir = 8; pixel_x = 24 }, -/turf/open/floor/plasteel/dark, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/white/side{ + dir = 8 + }, /area/science/robotics/lab) "wFB" = ( /obj/effect/turf_decal/tile/brown{ @@ -47345,6 +52093,9 @@ /obj/structure/table, /obj/item/clothing/head/soft, /obj/item/clothing/head/soft, +/obj/structure/noticeboard{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/cargo/storage) "wFV" = ( @@ -47359,35 +52110,46 @@ }, /turf/open/floor/pod/dark, /area/medical/paramedic) +"wFY" = ( +/obj/machinery/camera{ + c_tag = "Atmospherics Central"; + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -27 + }, +/obj/machinery/suit_storage_unit/atmos, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/engineering/atmos) "wGe" = ( /obj/structure/closet/jcloset, /obj/item/reagent_containers/glass/bucket, /obj/item/mop, /turf/open/floor/plasteel, /area/service/janitor) -"wGk" = ( -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Hot Loop Exit" - }, -/turf/open/floor/plating, -/area/engineering/atmospherics_engine) +"wGq" = ( +/obj/structure/sign/warning/gato/docking, +/turf/closed/wall, +/area/maintenance/disposal) "wGG" = ( -/obj/structure/window/plasma/reinforced{ +/obj/machinery/power/terminal{ dir = 1 }, -/obj/structure/window/plasma/reinforced, -/obj/machinery/door/poddoor{ - id = "tegheat"; - name = "TEG Heatshield" +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/engineering/atmospherics_engine) +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "wGK" = ( /obj/structure/cable{ icon_state = "1-8" @@ -47408,10 +52170,36 @@ /obj/effect/turf_decal/arrows/red{ dir = 4 }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "wGY" = ( /obj/machinery/telecomms/server/presets/command, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/end{ + dir = 4 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "wHc" = ( @@ -47421,11 +52209,17 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/plasteel{ + dir = 4; + icon_state = "floor_trim" + }, /area/hallway/primary/fore) "wHq" = ( /obj/structure/disposalpipe/segment, @@ -47450,12 +52244,27 @@ }, /turf/open/floor/carpet, /area/commons/dorms) +"wHO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/dark, +/area/hallway/primary/central) "wHX" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "wHY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -47463,13 +52272,16 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /obj/structure/disposalpipe/sorting/mail{ dir = 4; sortType = 21 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "wIi" = ( @@ -47488,6 +52300,9 @@ }, /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "wJB" = ( @@ -47533,11 +52348,18 @@ dir = 8 }, /area/hallway/secondary/entry) -"wKz" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +"wKw" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, +/turf/open/floor/plasteel, +/area/commons/dorms) +"wKz" = ( +/obj/structure/cable, /obj/machinery/light{ dir = 4 }, @@ -47561,6 +52383,13 @@ }, /turf/open/floor/pod/dark, /area/maintenance/starboard) +"wKD" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/turf/open/floor/carpet, +/area/commons/dorms) "wKH" = ( /obj/structure/table, /obj/item/storage/firstaid/fire, @@ -47609,11 +52438,6 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/plasteel, /area/hallway/primary/port) -"wMp" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/open/floor/plasteel/dark, -/area/engineering/atmospherics_engine) "wMt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -47632,18 +52456,12 @@ /turf/open/floor/carpet, /area/maintenance/aft/secondary) "wMv" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -35 }, -/turf/open/floor/plasteel/dark, -/area/engineering/main) +/turf/closed/wall/r_wall, +/area/engineering/storage/tech) "wMH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/disposalpipe/segment{ @@ -47716,19 +52534,29 @@ /turf/open/floor/wood, /area/maintenance/bar) "wNw" = ( -/obj/effect/turf_decal/vg_decals/atmos/plasma, -/obj/machinery/light/small{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/open/floor/engine/plasma, -/area/engineering/atmos) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "wNN" = ( /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -47744,6 +52572,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "wNW" = ( @@ -47754,8 +52588,12 @@ /turf/open/floor/plasteel/white, /area/science/lab) "wOe" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4; + icon_state = "manifold-3" }, /turf/open/floor/plasteel, /area/service/hydroponics) @@ -47775,7 +52613,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/department/science/xenobiology) "wOS" = ( /obj/structure/table/reinforced, @@ -47785,19 +52623,16 @@ /area/science/mixing) "wOZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 + dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) +/turf/open/floor/engine, +/area/engineering/supermatter) "wPg" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/hallway/primary/central) "wPu" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, @@ -47830,26 +52665,21 @@ /obj/item/ashtray, /turf/open/floor/plasteel/grimy, /area/service/bar) -"wPV" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +"wQi" = ( +/obj/machinery/light/small{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) -"wQi" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer3, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 5 +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/engineering/atmospherics_engine) +/obj/machinery/vending/mealdor, +/turf/open/floor/plasteel/white, +/area/engineering/break_room{ + name = "Engineering Breakroom" + }) "wQs" = ( /obj/machinery/light/small{ dir = 1 @@ -47872,7 +52702,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/firedoor/border_only{ dir = 1; name = "north facing firelock" @@ -47882,6 +52711,8 @@ name = "Hydroponics"; req_access_txt = "35" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/service/hydroponics) "wQH" = ( @@ -47889,7 +52720,9 @@ dir = 8 }, /obj/structure/fans/tiny, -/obj/machinery/door/airlock/external/glass, +/obj/machinery/door/airlock/external/glass{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "wRj" = ( @@ -47901,13 +52734,22 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) +"wRs" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "wRJ" = ( /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "wRO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -47915,21 +52757,6 @@ }, /turf/closed/wall, /area/hallway/primary/central) -"wRR" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engineering/main) "wRS" = ( /turf/closed/wall, /area/medical/surgery) @@ -47938,26 +52765,74 @@ /turf/open/floor/plating, /area/maintenance/central) "wSI" = ( -/turf/open/floor/plasteel/dark, -/area/engineering/supermatter) +/obj/machinery/button/door{ + desc = "A remote control-switch for secure storage."; + id = "Secure Storage"; + name = "Engineering Secure Storage"; + pixel_x = 24; + req_access_txt = "11"; + pixel_y = 4 + }, +/obj/structure/table/reinforced, +/mob/living/simple_animal/parrot/Polly, +/obj/item/cartridge/engineering{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/cartridge/engineering{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/cartridge/engineering{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/cartridge/atmos, +/obj/machinery/button/door{ + desc = "A remote control-switch for secure storage."; + id = "ceprivacy"; + name = "Privacy Shutters"; + pixel_x = 24; + req_access_txt = "11"; + pixel_y = -5 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/command/heads_quarters/ce) "wSO" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Storage"; + req_access_txt = "11"; + dir = 8 + }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "Gas to Filter" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 }, -/turf/open/floor/engine, -/area/engineering/main) +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "wST" = ( /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "wSZ" = ( /obj/structure/table/reinforced, @@ -47970,13 +52845,21 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"wTw" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 +"wTs" = ( +/obj/machinery/light{ + dir = 4 }, +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"wTw" = ( /obj/structure/sink/kitchen{ pixel_y = 28 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, /turf/open/floor/plasteel/grimy, /area/service/bar) "wTM" = ( @@ -48005,13 +52888,6 @@ /obj/structure/mineral_door/woodrustic, /turf/open/floor/plating, /area/icemoon/surface/outdoors) -"wUd" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 9 - }, -/obj/machinery/meter, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "wUC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -48037,7 +52913,7 @@ /obj/machinery/posialert{ pixel_x = -32 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/robotics/lab) "wWq" = ( /obj/structure/cable, @@ -48045,22 +52921,32 @@ /turf/open/floor/plating, /area/maintenance/department/electrical) "wWG" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/pipedispenser/disposal, -/obj/structure/fireaxecabinet{ - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "wWH" = ( /obj/structure/table/wood, /turf/open/floor/carpet, /area/service/bar) +"wWV" = ( +/obj/machinery/door/poddoor/preopen{ + dir = 4; + id = "ceprivacy"; + name = "privacy shutter" + }, +/obj/structure/cable/yellow, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/command/heads_quarters/ce) "wXm" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -48090,15 +52976,21 @@ /turf/closed/wall/mineral/wood, /area/icemoon/surface/outdoors) "wXT" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 }, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/turf/open/floor/wood, +/area/service/library) +"wZg" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 5 + }, +/turf/closed/wall/r_wall, +/area/engineering/supermatter) "wZi" = ( /obj/structure/cable{ icon_state = "4-8" @@ -48113,6 +53005,7 @@ icon_state = "2-8" }, /obj/effect/landmark/start/roboticist, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "wZX" = ( @@ -48127,12 +53020,23 @@ /obj/machinery/sleeper{ dir = 4 }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/box/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) +"xak" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "xap" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/turf/closed/wall, +/area/commons/storage/primary) "xau" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 @@ -48167,6 +53071,8 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/fore) "xbi" = ( @@ -48188,19 +53094,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/aft/secondary) -"xbN" = ( -/obj/structure/table, -/obj/item/storage/belt/utility, -/obj/item/storage/belt/utility, -/obj/item/storage/belt/utility, -/obj/structure/cable, -/obj/machinery/power/apc{ - areastring = "/area/engineering/break_room"; - name = "Engineering Foyer APC"; - pixel_y = -24 - }, -/turf/open/floor/plasteel, -/area/engineering/break_room) "xbO" = ( /obj/structure/cable{ icon_state = "4-8" @@ -48225,6 +53118,14 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "xcW" = ( @@ -48244,23 +53145,38 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/plasteel/cult, +/turf/open/floor/wood/wood_diagonal, /area/service/lawoffice) +"xdq" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "xdG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, +/obj/item/beacon, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "xdM" = ( -/obj/machinery/door/airlock/mining{ - req_access_txt = "48" - }, -/obj/structure/barricade/wooden, /obj/machinery/door/firedoor/border_only/closed{ dir = 8; icon_state = "door_closed" }, +/obj/machinery/door/airlock/external{ + name = "Mining Dock Airlock"; + req_access_txt = "48"; + shuttledocked = 1; + dir = 8 + }, /turf/open/floor/plasteel, /area/maintenance/aft/secondary) "xen" = ( @@ -48281,7 +53197,16 @@ /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) "xeY" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "xfe" = ( @@ -48309,21 +53234,16 @@ }, /turf/open/floor/plasteel, /area/security/warden) -"xfX" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/field/generator, -/turf/open/floor/plating, -/area/engineering/storage) "xgp" = ( /obj/machinery/computer/holodeck{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "0-2" }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, /turf/open/floor/wood, /area/commons/dorms) "xgG" = ( @@ -48360,21 +53280,6 @@ }, /turf/open/floor/plasteel, /area/construction/storage_wing) -"xgN" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engineering/main) "xhc" = ( /obj/structure/cable{ icon_state = "1-2" @@ -48384,7 +53289,7 @@ /area/maintenance/aft) "xhl" = ( /obj/structure/table/wood, -/turf/open/floor/wood, +/turf/open/floor/carpet/green, /area/service/library) "xhA" = ( /obj/structure/cable{ @@ -48399,7 +53304,12 @@ /area/command/heads_quarters/captain) "xhE" = ( /obj/structure/closet/wardrobe/pjs, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel, /area/medical/medbay/central) "xhG" = ( /obj/structure/light_construct/small{ @@ -48415,25 +53325,24 @@ /obj/structure/chair/beanbag/gato{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/carpet/gato, /area/commons/dorms) "xhR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8; - name = "west facing firelock" - }, /obj/machinery/door/airlock/engineering/glass{ name = "Engineering"; - req_access_txt = "32" + req_access_txt = "10"; + dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/engineering/lobby) "xis" = ( /obj/structure/cable{ icon_state = "4-8" @@ -48448,37 +53357,27 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "xit" = ( -/obj/effect/turf_decal/vg_decals/atmos/air, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/engine/air, -/area/engineering/atmos) -"xiB" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/engine, -/area/engineering/main) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/turf/open/floor/plating, +/area/engineering/storage/tech) "xiH" = ( /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/starboard/fore) "xiZ" = ( -/obj/machinery/door/firedoor/border_only{ - name = "south facing firelock" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/closed/wall, -/area/service/bar) +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, +/area/cargo/storage) "xjf" = ( -/obj/structure/tank_dispenser{ - pixel_x = -1 +/obj/machinery/atmospherics/pipe/simple/purple/visible{ + dir = 6 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -48494,12 +53393,28 @@ /obj/effect/turf_decal/tile/brown{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /obj/machinery/door/airlock/mining/glass{ name = "Quartermaster"; - req_access_txt = "41" + req_access_txt = "41"; + dir = 4 }, /turf/open/floor/plasteel, /area/cargo/qm) +"xjy" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/turf/open/floor/carpet/royalblue, +/area/commons/dorms) "xjG" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -48546,10 +53461,15 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 }, -/obj/machinery/meter, /turf/open/floor/plasteel, /area/engineering/atmos) "xkK" = ( @@ -48558,6 +53478,7 @@ /area/service/bar) "xla" = ( /obj/machinery/vending/wardrobe/atmos_wardrobe, +/obj/machinery/light, /turf/open/floor/plasteel, /area/engineering/atmos) "xld" = ( @@ -48593,14 +53514,23 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"xlV" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{ +"xlN" = ( +/obj/structure/sign/painting/library{ + pixel_x = -32 + }, +/obj/structure/chair/bench/right{ dir = 8 }, -/obj/machinery/air_sensor/atmos/nitrogen_tank{ +/turf/open/floor/plasteel, +/area/service/library) +"xlV" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{ + dir = 8 + }, +/obj/machinery/air_sensor/atmos/air_tank{ pixel_y = -25 }, -/turf/open/floor/engine/n2, +/turf/open/floor/engine/air, /area/engineering/atmos) "xlZ" = ( /obj/effect/spawner/structure/window/reinforced, @@ -48613,16 +53543,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) -"xmh" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "xmi" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 4 @@ -48631,12 +53551,12 @@ /turf/open/floor/plating, /area/engineering/atmos) "xmq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/chair/comfy/beige{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, /turf/open/floor/carpet, /area/commons/dorms) "xmr" = ( @@ -48645,6 +53565,14 @@ /area/construction/storage_wing) "xmu" = ( /obj/machinery/telecomms/message_server, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "xmC" = ( @@ -48710,7 +53638,7 @@ /obj/item/kirbyplants{ icon_state = "applebush" }, -/turf/open/floor/wood, +/turf/open/floor/wood/wood_large, /area/security/courtroom) "xpK" = ( /obj/effect/turf_decal/tile/brown, @@ -48738,16 +53666,22 @@ }, /turf/open/floor/plasteel/dark, /area/tcommsat/computer) +"xpT" = ( +/obj/structure/table/wood/poker, +/obj/item/ashtray{ + name = "candle holder" + }, +/turf/open/floor/wood, +/area/hallway/primary/port) "xpV" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "waste relief valve" +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 9 }, /turf/open/floor/plasteel, /area/engineering/atmos) "xqd" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/components/binary/pump{ +/obj/machinery/computer/atmos_control/tank/carbon_tank{ dir = 8 }, /turf/open/floor/plasteel, @@ -48777,18 +53711,35 @@ name = "Room Six"; dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/wood, /area/commons/dorms) +"xqB" = ( +/obj/item/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_y = 29 + }, +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/turf/open/floor/carpet/royalblack, +/area/commons/dorms) "xqC" = ( /obj/machinery/airalarm{ dir = 4; pixel_x = -22 }, -/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 5 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "xqN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/red, /obj/structure/disposalpipe/segment{ dir = 6 @@ -48807,16 +53758,7 @@ }, /turf/open/openspace/icemoon, /area/icemoon/surface/outdoors) -"xrK" = ( -/obj/structure/fluff/railing{ - dir = 1 - }, -/turf/open/openspace/icemoon, -/area/engineering/atmospherics_engine) "xrU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -48827,7 +53769,7 @@ /obj/structure/table, /obj/item/lightreplacer, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/engineering/lobby) "xsd" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -48837,12 +53779,9 @@ /turf/open/floor/plasteel/white, /area/science/misc_lab) "xse" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/obj/effect/decal/big_gato, +/turf/open/floor/plasteel/dark, +/area/command/bridge) "xso" = ( /obj/machinery/light{ dir = 1 @@ -48853,15 +53792,6 @@ /obj/structure/girder, /turf/open/floor/plating, /area/maintenance/aft/secondary) -"xsB" = ( -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/obj/machinery/atmospherics/components/binary/valve/digital/layer1{ - name = "injector valve" - }, -/turf/open/floor/plating, -/area/engineering/atmospherics_engine) "xtf" = ( /obj/docking_port/stationary{ dwidth = 3; @@ -48973,6 +53903,21 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors) +"xwg" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "xwH" = ( /obj/machinery/turretid{ icon_state = "control_stun"; @@ -48986,12 +53931,6 @@ /turf/open/floor/circuit/off, /area/ai_monitored/turret_protected/ai) "xwL" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -48999,19 +53938,35 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/engineering/lobby) "xxj" = ( -/obj/item/radio/intercom{ - pixel_y = -26 +/obj/structure/closet/emcloset, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, /turf/open/floor/plating, -/area/maintenance/aft/secondary) +/area/commons/dorms) "xxK" = ( /obj/structure/dresser, /obj/structure/sign/painting{ pixel_y = -32 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, /turf/open/floor/carpet/red, /area/commons/dorms) "xyg" = ( @@ -49064,28 +54019,19 @@ dir = 4 }, /area/hallway/primary/port) -"xzD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 9 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/engine, -/area/engineering/main) "xzM" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, /obj/structure/closet/secure_closet/atmospherics, /obj/machinery/power/apc{ areastring = "/area/engineering/atmos"; name = "Atmospherics APC"; pixel_y = -24 }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "xzR" = ( @@ -49094,18 +54040,38 @@ }, /turf/open/floor/plasteel, /area/mine/lobby) -"xzW" = ( -/obj/structure/cable{ - icon_state = "2-4" +"xzZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) +"xAa" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/light{ + dir = 4 }, /obj/effect/turf_decal/stripes/line{ - dir = 9 + dir = 4 }, -/obj/structure/closet/radiation, /turf/open/floor/engine, -/area/engineering/main) +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "xAe" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/computer/atmos_control/tank/toxin_tank{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "xAh" = ( @@ -49113,13 +54079,18 @@ /obj/machinery/power/tracker, /turf/open/floor/plasteel/solarpanel, /area/solars/starboard/aft) -"xAx" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 +"xAk" = ( +/obj/machinery/power/apc/highcap/fifteen_k{ + areastring = "/area/engineering/storage"; + dir = 1; + name = "Engineering Secure Storage APC"; + pixel_y = 24 }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/engineering/storage) "xAA" = ( /obj/structure/bodycontainer/morgue, /obj/effect/turf_decal/tile/blue{ @@ -49136,21 +54107,14 @@ dir = 4; pixel_x = -24 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/wood, /area/commons/dorms) -"xAS" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plasteel/dark, -/area/engineering/supermatter) "xBl" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -49174,7 +54138,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/blue, /area/service/chapel/office) "xCr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -49200,34 +54164,6 @@ /obj/machinery/recharge_station, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat/service) -"xCv" = ( -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/obj/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer1, -/obj/machinery/door/poddoor{ - id = "tegheat"; - name = "TEG Heatshield" - }, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/engineering/atmospherics_engine) -"xCI" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 9 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/meter, -/turf/open/floor/engine, -/area/engineering/main) "xCK" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -49238,7 +54174,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -49247,6 +54183,9 @@ /obj/structure/sign/poster/official/fashion{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/wood, /area/commons/dorms) "xDk" = ( @@ -49266,30 +54205,15 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/service) -"xDw" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/main) "xDD" = ( /obj/structure/window/plasma/reinforced{ - dir = 4 + dir = 1 }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/structure/cable/yellow{ + icon_state = "0-2" }, /obj/machinery/power/rad_collector/anchored, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4; - name = "east facing firelock" - }, /turf/open/floor/engine, /area/engineering/supermatter) "xDI" = ( @@ -49323,9 +54247,6 @@ /turf/open/floor/plasteel/dark, /area/command/bridge) "xEl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -49370,28 +54291,37 @@ /turf/open/floor/plasteel/dark, /area/command/teleporter) "xFB" = ( -/obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/effect/turf_decal/tile/yellow{ +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 4 }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, +/obj/structure/closet/secure_closet/engineering_welding, +/obj/item/clothing/glasses/meson/engine, +/turf/open/floor/plasteel, /area/engineering/main) "xFD" = ( /turf/closed/wall, /area/service/bar) -"xFN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +"xFJ" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 6 }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"xFN" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -49415,24 +54345,27 @@ /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) "xGb" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/chair/comfy/black{ +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 4 }, /turf/open/floor/plasteel, -/area/hallway/primary/fore) +/area/hallway/primary/aft) "xGu" = ( /obj/structure/urinal{ pixel_y = 32 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, /turf/open/floor/plasteel/freezer, /area/commons/dorms) "xGI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, /turf/open/floor/plasteel, /area/cargo/storage) "xGK" = ( @@ -49455,14 +54388,53 @@ /obj/structure/chair/sofa/right{ dir = 8 }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/wood, /area/hallway/primary/port) -"xHL" = ( -/obj/structure/cable{ - icon_state = "4-8" +"xGV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/caution{ + pixel_x = -5; + dir = 1 }, /turf/open/floor/engine, -/area/engineering/main) +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) +"xHn" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark/corner{ + dir = 8 + }, +/area/hallway/primary/port) +"xHr" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/commons/storage/primary) +"xHL" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/poddoor/preopen{ + id = "engsm"; + name = "radiation shutters" + }, +/turf/open/floor/plating, +/area/engineering/supermatter) "xHP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, @@ -49491,6 +54463,12 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/wood, /area/command/meeting_room) +"xIv" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plasteel/dark, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "xIH" = ( /obj/machinery/button/door{ id = "Skynet_launch"; @@ -49499,6 +54477,10 @@ pixel_y = -24; req_access_txt = "29" }, +/obj/effect/turf_decal/stripes{ + dir = 1; + icon_state = "warningline" + }, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "xIU" = ( @@ -49514,6 +54496,10 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, /turf/open/floor/plasteel, /area/service/janitor) "xJr" = ( @@ -49539,25 +54525,28 @@ /turf/open/floor/plating, /area/science/xenobiology) "xKs" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/plasteel, -/area/commons/storage/primary) +/turf/closed/wall/r_wall, +/area/engineering/storage/tech) "xKK" = ( /turf/closed/wall/r_wall, /area/commons/dorms) "xKP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/chair{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "xKX" = ( @@ -49580,6 +54569,12 @@ name = "Room Five"; dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/wood, /area/commons/dorms) "xLW" = ( @@ -49587,19 +54582,19 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/science/robotics/lab) "xMw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/open/floor/plasteel/white, +/turf/open/floor/plasteel, /area/medical/medbay/central) "xMH" = ( /obj/structure/chair/stool{ pixel_y = 8 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/maintenance/solars/port/fore) "xNn" = ( /obj/structure/cable{ @@ -49653,6 +54648,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "xNV" = ( @@ -49691,10 +54687,12 @@ /turf/open/floor/plasteel/white, /area/science/misc_lab) "xOF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, -/turf/closed/wall/r_wall, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/box, +/turf/open/floor/plasteel, /area/engineering/atmos) "xPK" = ( /obj/machinery/light{ @@ -49703,25 +54701,24 @@ /turf/open/floor/wood, /area/hallway/secondary/exit/departure_lounge) "xPQ" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/aft) "xQe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/space_heater, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engineering/engine_smes) "xQr" = ( /obj/structure/table, /turf/open/floor/plasteel, @@ -49730,18 +54727,17 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/hallway/primary/aft) "xQA" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" }, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/area/medical/medbay/central) "xQF" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -49753,39 +54749,23 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/storage/tech) -"xQX" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "xRp" = ( /obj/machinery/light/small{ dir = 4 }, -/turf/open/floor/plasteel, -/area/maintenance/aft/secondary) +/obj/structure/bookcase/random, +/turf/open/floor/carpet/orange, +/area/service/library) "xRt" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/commons/storage/auxiliary) "xRI" = ( -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ +/obj/machinery/light/small{ dir = 4 }, -/obj/machinery/hydroponics/constructable, -/turf/open/floor/plasteel/dark, -/area/service/hydroponics) +/turf/open/floor/carpet/green, +/area/commons/dorms) "xSj" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/suit/toggle/owlwings, @@ -49801,14 +54781,12 @@ /turf/open/floor/plasteel, /area/service/bar) "xSz" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 }, -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/fore) +/turf/open/floor/carpet, +/area/commons/dorms) "xSA" = ( /obj/structure/cable{ icon_state = "1-8" @@ -49824,7 +54802,7 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/carpet, +/turf/open/floor/carpet/red, /area/security/detectives_office) "xTK" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, @@ -49834,12 +54812,14 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 8 }, /obj/structure/disposalpipe/sorting/mail/flip{ - sortType = 5 + sortType = 5; + sortTypes = list(4, 5, 6) }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/hallway/primary/aft) "xTU" = ( @@ -49847,6 +54827,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/brown, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, /turf/open/floor/plasteel, /area/cargo/storage) "xUc" = ( @@ -49897,6 +54880,21 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) +"xVI" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engineering/engine_smes) "xVL" = ( /obj/structure/cable{ icon_state = "4-8" @@ -49908,7 +54906,10 @@ name = "Station Intercom (General)"; pixel_y = 24 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel{ + dir = 1; + icon_state = "floor_trim" + }, /area/hallway/primary/port) "xWa" = ( /obj/machinery/button/door{ @@ -49918,7 +54919,11 @@ pixel_x = -24; specialfunctions = 4 }, -/turf/open/floor/carpet/blue, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/turf/open/floor/carpet/green, /area/commons/dorms) "xWd" = ( /obj/structure/disposalpipe/segment, @@ -49936,11 +54941,9 @@ /turf/open/floor/wood, /area/maintenance/bar) "xWG" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 6 - }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) +/obj/machinery/atmospherics/pipe/manifold/yellow/visible, +/turf/open/floor/plasteel, +/area/engineering/atmos) "xWM" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -49976,10 +54979,22 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"xXj" = ( +/obj/item/stack/marker_beacon{ + anchored = 1; + icon_state = "markerburgundy-on"; + light_color = "#FA644B"; + light_power = 3; + light_range = 2; + name = "landing marker"; + picked_color = "Burgundy" + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "xXr" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, -/area/engineering/secure_construction) +/area/engineering/atmos) "xXv" = ( /obj/machinery/light{ dir = 1 @@ -49998,22 +55013,28 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/structure/sign/poster/official/antifat{ + pixel_x = 32 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "xXL" = ( -/obj/structure/table, -/obj/item/aicard, -/obj/item/ai_module/reset, -/obj/item/assembly/flash/handheld, -/obj/item/assembly/flash/handheld, -/obj/item/clothing/gloves/color/yellow, -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = 27 +/obj/structure/rack, +/obj/effect/spawner/lootdrop/techstorage/security, +/turf/open/floor/plating, +/area/engineering/storage/tech) +"xXS" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, /turf/open/floor/plasteel/dark, -/area/engineering/storage/tech) +/area/ai_monitored/command/storage/eva) "xXZ" = ( /obj/machinery/atmospherics/components/unary/cryo_cell, /turf/open/floor/plasteel/white, @@ -50033,38 +55054,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - name = "south facing firelock" - }, -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/external/glass, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/commons/dorms) -"xYt" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engineering/main) -"xYv" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engineering/supermatter) "xYN" = ( /obj/structure/cable{ icon_state = "1-2" @@ -50077,17 +55070,17 @@ "xYS" = ( /turf/open/floor/engine, /area/engineering/supermatter) -"xZj" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/meter, -/turf/open/floor/engine, -/area/engineering/main) "xZo" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engineering/atmos) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "xZA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -50115,20 +55108,6 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/ai_monitored/security/armory) -"yai" = ( -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/smes/engineering, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/camera{ - c_tag = "TEG West"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/atmospherics_engine) "yap" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -50151,25 +55130,23 @@ /turf/closed/wall/r_wall, /area/science/misc_lab) "yaJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/machinery/vending/engivend, /turf/open/floor/plasteel, /area/engineering/main) "yaN" = ( /obj/machinery/vending/snack/random, /turf/open/floor/wood, /area/hallway/primary/port) -"yaZ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/engine, -/area/engineering/main) +"ybm" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/turf/open/floor/carpet/royalblack, +/area/commons/dorms) "ybO" = ( /obj/machinery/mass_driver{ dir = 8; @@ -50208,6 +55185,18 @@ }, /turf/open/floor/plasteel, /area/maintenance/aft/secondary) +"ycp" = ( +/obj/machinery/atmospherics/components/binary/pump/on, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/engineering/atmospherics_engine{ + name = "Supermatter Engine" + }) "ycy" = ( /obj/structure/cable{ icon_state = "1-2" @@ -50268,9 +55257,6 @@ /turf/open/floor/plating, /area/maintenance/department/electrical) "yeh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -50278,16 +55264,13 @@ /turf/open/floor/plasteel, /area/commons/fitness) "yez" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 4 }, /turf/open/floor/plating, /area/maintenance/department/bridge) "yeH" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/structure/cable, /turf/open/floor/plating, /area/security/checkpoint/supply) @@ -50304,7 +55287,6 @@ /turf/open/floor/plasteel, /area/mine/eva) "yeV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/brown{ dir = 4 }, @@ -50327,6 +55309,12 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/nuclearbomb/beer{ + desc = "One of the more successful achievements of the GATO Corporate Warfare Division, their nuclear fission explosives are renowned for being cheap to produce and devastatingly effective. Signs explain that though this particular device has been decommissioned, every GATO station is equipped with an equivalent one, just in case. All Captains carefully guard the disk needed to detonate them - at least, the sign says they do. There seems to be a tap on the back."; + name = "GATO-brand nuclear fission explosive"; + pixel_x = 2; + pixel_y = 6 + }, /turf/open/floor/carpet, /area/command/corporate_showroom) "yft" = ( @@ -50344,14 +55332,15 @@ /turf/open/floor/plasteel/cafeteria, /area/service/kitchen) "yfW" = ( -/obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "13" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + name = "External Airlock"; + req_access_txt = "13"; + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/central) "yga" = ( @@ -50378,13 +55367,27 @@ /obj/machinery/computer/rdservercontrol{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/circuit/off, /area/science/server) "ygC" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/carrot, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) +"ygL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8 + }, +/turf/open/floor/wood, +/area/commons/dorms) +"ygP" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/floor/plating, +/area/engineering/atmos) "yhj" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -50400,6 +55403,9 @@ dir = 4; pixel_x = -24 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "yhE" = ( @@ -50415,7 +55421,7 @@ /obj/structure/chair/comfy/black{ dir = 1 }, -/turf/open/floor/carpet, +/turf/open/floor/carpet/royalblue, /area/command/meeting_room) "yia" = ( /obj/machinery/power/terminal{ @@ -50445,9 +55451,7 @@ /obj/structure/mirror{ pixel_x = -28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/freezer, /area/commons/dorms) "yig" = ( @@ -50478,18 +55482,19 @@ /area/security/checkpoint/supply) "yjs" = ( /obj/structure/cable{ - icon_state = "0-2" + icon_state = "0-4" }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/department/bridge) "yjx" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel/white/corner{ + dir = 8 }, -/turf/open/floor/plasteel, -/area/cargo/storage) +/area/hallway/primary/fore) "yjM" = ( /obj/machinery/firealarm{ dir = 1; @@ -50530,23 +55535,33 @@ /obj/item/gavelblock, /turf/open/floor/wood, /area/security/courtroom) -"ykE" = ( -/obj/structure/cable{ - icon_state = "4-8" +"ykr" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 }, -/turf/open/floor/plating, -/area/engineering/atmospherics_engine) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "ykI" = ( -/obj/structure/chair{ - dir = 1 - }, /obj/machinery/camera{ c_tag = "Medbay Foyer"; dir = 1; network = list("ss13","medbay") }, +/obj/effect/turf_decal/box/white, +/obj/item/storage/firstaid/regular, +/obj/structure/table, +/obj/item/reagent_containers/glass/bottle/epinephrine, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"ykW" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1; + icon_state = "steel_decals_central7" + }, +/turf/open/floor/plasteel, +/area/cargo/storage) "ylm" = ( /obj/machinery/door/airlock/public/glass{ id_tag = "permahydro"; @@ -50554,13 +55569,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) -"ylO" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/landmark/blobstart, -/turf/open/floor/engine, -/area/engineering/atmospherics_engine) (1,1,1) = {" sks @@ -161923,7 +166931,7 @@ nHQ nHQ ksL nHQ -uIZ +nHQ uIZ uIZ sks @@ -162179,9 +167187,9 @@ lcA lzT joS hYb +uJv +nHQ nHQ -uIZ -uIZ uIZ uIZ sks @@ -162436,12 +167444,12 @@ fkN kJo jHM hYb +uJv nHQ nHQ uIZ uIZ uIZ -uIZ sks sks sks @@ -162687,13 +167695,13 @@ uIZ nHQ nHQ nHQ -hYb +nHQ hYb dRj kJo qJx hYb -hYb +uJv nHQ nHQ nHQ @@ -162943,12 +167951,12 @@ uIZ nHQ nHQ wuo -eDv +uMj hYb hYb -lcA +aQa vIX -joS +fym hYb hYb nfB @@ -163467,7 +168475,7 @@ sBG pFv lLf qyV -nfB +sIe nHQ nHQ uIZ @@ -163711,7 +168719,7 @@ sks sks nHQ nHQ -wuo +nHQ wuo ekL ktD @@ -163725,7 +168733,7 @@ gIp dfS yga hYb -hYb +nHQ nHQ uIZ sks @@ -165253,21 +170261,21 @@ sks uIZ nHQ nHQ -wuo +nHQ wuo sTo tkx nDs lNt mBp -qgk +oUO fVd cca tUR cjE iZm wuo -wuo +uIZ uIZ uIZ sks @@ -165512,12 +170520,12 @@ uIZ nHQ nHQ eDv -srI +sTo mNk aGQ dQv -aQa qgk +oUO wuo ktX akr @@ -165772,8 +170780,8 @@ wuo wuo srI vJq -wuo -wuo +srI +ffW oUO wuo sSi @@ -166027,10 +171035,10 @@ uIZ nHQ nHQ wuo -eDv +uMj qFg wuo -kxw +wuo lih wuo wuo @@ -166285,17 +171293,17 @@ uIZ nHQ nHQ nHQ -qFg +jCY wuo -guY +uOr cNQ -mpW -wuo +guY wuo uIZ uIZ uIZ uIZ +uIZ sks sks sks @@ -166542,7 +171550,7 @@ sks sks uIZ nHQ -gCx +vyx wuo wuo wuo @@ -166798,8 +171806,8 @@ sks sks sks uIZ -uIZ -uIZ +nHQ +igp uIZ uIZ uIZ @@ -167056,7 +172064,7 @@ sks sks sks sks -sks +gCx sks sks sks @@ -182538,15 +187546,15 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -182795,20 +187803,20 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -183561,7 +188569,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -183816,9 +188824,9 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn btn btn @@ -183840,7 +188848,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -184071,11 +189079,11 @@ djs djs djs djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -184097,7 +189105,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -184325,14 +189333,14 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -184354,7 +189362,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -184611,7 +189619,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -184820,7 +189828,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -184868,8 +189876,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -185066,18 +190074,18 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -185125,8 +190133,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -185382,8 +190390,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -185639,7 +190647,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -185896,8 +190904,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -186088,7 +191096,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -186153,7 +191161,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -186343,9 +191351,9 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn btn btn @@ -186410,8 +191418,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -186597,12 +191605,12 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -186667,8 +191675,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -186848,18 +191856,18 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -186924,7 +191932,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -187181,7 +192189,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -187358,7 +192366,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -187438,7 +192446,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -187614,8 +192622,8 @@ djs djs djs djs -djs -djs +dmB +dmB btn btn btn @@ -187695,7 +192703,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -187871,8 +192879,8 @@ djs djs djs djs -djs -djs +dmB +dmB btn btn btn @@ -188128,8 +193136,8 @@ djs djs djs djs -djs -djs +dmB +dmB btn btn btn @@ -188194,9 +193202,9 @@ btn btn btn btn +eKi sgP -sgP -sgP +eKi btn btn btn @@ -188384,9 +193392,9 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn btn btn @@ -188417,13 +193425,13 @@ mmf wRj oiB oiB -aEc -vuL +hdS +jxQ vBc hVK cba nFz -aEc +hdS oiB oiB jBO @@ -188635,15 +193643,15 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -188674,13 +193682,13 @@ mmf wRj oiB oiB -vuL +jxQ vuL nbI tlp xwH dWy -vuL +jxQ oiB oiB jBO @@ -188723,8 +193731,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -188894,13 +193902,13 @@ btn btn btn btn -djs +dmB btn -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -188931,13 +193939,13 @@ pDy rVR oiB oiB -vuL +jxQ vuL tlq fwd tlq nOG -vuL +jxQ oiB oiB uYL @@ -188980,8 +193988,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -189156,7 +194164,7 @@ btn btn btn btn -djs +dmB btn btn btn @@ -189188,13 +194196,13 @@ ygq oiB oiB kyF -vuL +jxQ whg van tlq vjJ dWy -vuL +jxQ dox oiB oiB @@ -189237,7 +194245,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -189445,13 +194453,13 @@ uRI oiB oiB giB -jxQ +vuL nOG tlq oiB tlq nOG -jxQ +vuL odU oiB oiB @@ -189488,12 +194496,12 @@ btn btn btn btn -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -189661,7 +194669,7 @@ rQo qBH fZz nBE -sgP +eKi sgP sgP sgP @@ -189702,13 +194710,13 @@ rVR oiB oiB jxQ -jxQ +vuL jQb eaH tsC gDN pkz -jxQ +vuL jxQ oiB oiB @@ -189745,11 +194753,11 @@ btn btn btn btn -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -189925,7 +194933,7 @@ btn hLl sgP sgP -sgP +eKi sgP sgP sgP @@ -190002,8 +195010,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -190175,9 +195183,9 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn iwB ajf @@ -190259,8 +195267,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -190434,12 +195442,12 @@ djs djs djs djs -djs +dmB btn btn btn btn -djs +dmB btn btn sgP @@ -190516,7 +195524,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -190692,17 +195700,17 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB btn sgP sgP sgP -sgP +eKi sgP hLl sgP @@ -190950,11 +195958,11 @@ djs djs djs djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -191208,23 +196216,23 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB btn btn btn btn +eKi sgP sgP sgP sgP sgP -sgP -sgP +eKi sgP sgP hLl @@ -191466,11 +196474,11 @@ djs djs djs djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -191489,9 +196497,9 @@ bjH bjH ocs duJ -duJ +rli mfH -tkZ +vdz fRX duJ bjH @@ -191723,11 +196731,11 @@ djs djs djs djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -191746,9 +196754,9 @@ bjH bjH wfs duJ -duJ +vGc wAc -hCL +tkZ gYX duJ mXr @@ -191980,11 +196988,11 @@ djs djs djs djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -192003,9 +197011,9 @@ bjH bjH sLP duJ -duJ +lwt rmZ -tkZ +odO ljw duJ mVQ @@ -192237,11 +197245,11 @@ djs djs djs djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -192494,11 +197502,11 @@ djs djs djs djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -192511,7 +197519,7 @@ btn btn btn btn -sgP +eKi hLl bjH bjH @@ -193005,7 +198013,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -193262,7 +198270,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -193517,9 +198525,9 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn btn btn @@ -193774,9 +198782,9 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn btn btn @@ -194029,11 +199037,11 @@ djs djs djs djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -194330,7 +199338,7 @@ dZo hmd rnm gwf -mTW +tBx uww jtY rhn @@ -194567,7 +199575,7 @@ btn btn btn btn -sgP +eKi hLl sgP sgP @@ -194638,7 +199646,7 @@ djs djs djs djs -djs +dmB sgP sgP cea @@ -194648,7 +199656,7 @@ nYe njL sgP sgP -djs +dmB djs djs djs @@ -194797,7 +199805,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -194895,8 +199903,8 @@ djs djs djs djs -djs -djs +dmB +dmB sgP sgP nYe @@ -194904,10 +199912,10 @@ aAN nYe sgP sgP -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -195054,7 +200062,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -195084,14 +200092,14 @@ sgP sgP hLl uJP -jnT +fbg qrS hJL -hJL +iKR vAf -klC +xdq rEF -klC +dtv hJL hJL hJL @@ -195152,19 +200160,19 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB nYe nYe eiO nYe nYe -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -195310,8 +200318,8 @@ djs djs djs djs -djs -djs +dmB +dmB btn btn btn @@ -195341,7 +200349,7 @@ sgP sgP iwB gHu -hmJ +oVc iKm oVc oVc @@ -195397,6 +200405,7 @@ btn btn btn btn +dmB djs djs djs @@ -195408,20 +200417,19 @@ djs djs djs djs -djs -djs -djs -djs +dmB +dmB +dmB sLm fiu cJs lrB sLm -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -195598,7 +200606,7 @@ sgP sgP sgP aFq -jIv +jnT aFq ckC vux @@ -195654,6 +200662,7 @@ btn btn btn btn +dmB djs djs djs @@ -195665,20 +200674,19 @@ djs djs djs djs -djs -djs -djs -djs +dmB +dmB +dmB sLm yia vDr fiu sLm -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -195853,7 +200861,7 @@ sgP sgP sgP sgP -ikX +gmE ikX ikX mcu @@ -195869,7 +200877,7 @@ lhn kni akn akn -fbg +dkt xFV hXG aQM @@ -195911,6 +200919,7 @@ btn btn btn btn +dmB djs djs djs @@ -195921,20 +200930,19 @@ djs djs djs djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB sLm eUW rDA sFm sLm -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -196168,6 +201176,7 @@ btn btn btn btn +dmB djs djs djs @@ -196177,21 +201186,20 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB sLm wEl gGs sLm sLm -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -196425,6 +201433,8 @@ btn btn btn btn +dmB +dmB djs djs djs @@ -196433,22 +201443,20 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB btn rIA hLl rIA btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -196620,7 +201628,7 @@ sck lku xMw suw -hWD +gHE eXo ikX roj @@ -196682,31 +201690,31 @@ btn btn btn btn +dmB +dmB +dmB djs djs djs djs djs djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB btn rIA hLl -rIA +xXj btn -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -196939,30 +201947,30 @@ btn btn btn btn +dmB +dmB +dmB +dmB +dmB djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB btn btn rIA hLl rIA btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -197196,30 +202204,30 @@ btn btn btn btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB btn sgP rIA hLl rIA btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -197410,11 +202418,11 @@ ooE kni wMk gqR -vRa -vRa +tnK +hPC owQ jru -pfn +mGP oDY pfn rKE @@ -197453,17 +202461,17 @@ btn btn btn btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -197473,10 +202481,10 @@ ajf cdS btn btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -197710,18 +202718,18 @@ btn btn btn btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB btn sgP sgP @@ -197729,10 +202737,10 @@ hLl rIA sgP btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -197877,7 +202885,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -197924,12 +202932,12 @@ nXE hog lvG lVZ -fbg +kfO sbF +xpT kiX -kiX -qba -fbg +ovF +qbC rFv sLO xUM @@ -197967,10 +202975,10 @@ btn btn btn btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB btn btn btn @@ -197978,18 +202986,18 @@ btn btn btn btn -djs +dmB btn sgP sgP hLl rIA -sgP +eKi btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -198132,12 +203140,12 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -198175,7 +203183,7 @@ mwu bgx qAz kCl -qAz +vpK hQY xuD xNT @@ -198183,15 +203191,15 @@ okG vOs wjJ vdV -kiX -kiX +vdE +qli qba hZN dtR eES +azF dMb -dMb -dMb +dds dQd ihU wXR @@ -198224,12 +203232,12 @@ btn btn btn btn -djs +dmB btn btn btn btn -sgP +eKi rIA rIA rIA @@ -198243,9 +203251,9 @@ hLl rIA btn btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -198388,13 +203396,13 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -198432,21 +203440,21 @@ uqC qhO sWi ulg -fYV +kMn pSt aMc wuZ sMz gSs -fbg -uPM +kfO +ofO uPM uPM qba -fbg +qbC cIl mrY -fbg +lDG cKP eII dQd @@ -198456,8 +203464,8 @@ xkp onC urt eiZ -eiZ -sgP +cuR +eKi sgP sgP sgP @@ -198481,7 +203489,7 @@ btn btn btn btn -djs +dmB sgP sgP mST @@ -198499,9 +203507,9 @@ ajf cdS rIA btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -198686,7 +203694,7 @@ qAz clI qAz cBa -hWD +xQA uQh qIb hWD @@ -198695,16 +203703,16 @@ kOC iTW vdu lVZ -fbg -uPM +kfO +ofO mJE yaN qba -fbg +ptl iFH mos wdy -wdy +uiw fSz xHP qLV @@ -198751,14 +203759,14 @@ rIA rIA rIA rIA -rIA +xXj sgP btn btn btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -198943,7 +203951,7 @@ nEu xNs hWD fSm -hWD +xQA sli gQk hWD @@ -198952,16 +203960,16 @@ kOC iTW vdu cVG -pfn +bET sSv ksm fBP kuW -fbg +qbC fgq jQn -grV -grV +orF +eKa iXy eqp ehx @@ -199011,10 +204019,10 @@ btn btn btn btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -199197,27 +204205,27 @@ hoO hoO wfg ssR -xNs +ewq hWD fSm cSY ieJ rBY -hWD +apL nSS ykI aMh iiw bdx -fbg -qba +kfO +ljy uPM uPM -uPM -fbg +qdx +qbC bdx -rcM -fbg +gjY +mER wBZ fWz uzQ @@ -199227,8 +204235,8 @@ jhM dtb xlZ blB -blB -rpG +hRN +kUn nSp nSp sgP @@ -199240,36 +204248,36 @@ btn btn btn btn +btn +btn sgP sgP sgP sgP sgP -sgP -sgP -sgP +eKi mST cdS rIA rIA rIA -sgP +eKi btn btn btn btn btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -199460,23 +204468,23 @@ fSm hWD hWD tpp -hWD +vZJ hWD hWD jZd bGN rnm wjJ -qba -kiX +ljy +gwp kiX uGq hZN rnm bcq +azF dMb -dMb -dMb +dds uzQ gey xlZ @@ -199497,7 +204505,7 @@ mJy mJy mJy btn -sgP +btn sgP sgP sgP @@ -199512,20 +204520,20 @@ btn btn btn btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -199717,18 +204725,18 @@ fSm hWD biW tpp -hWD +vZJ hWD kGX mYE uCI bdx -fbg -qba -kiX +kfO +tRv kiX +xpT btx -fbg +qbC cDx aqC xUM @@ -199754,7 +204762,7 @@ vze ano mJy btn -sgP +btn sgP sgP sgP @@ -199765,24 +204773,24 @@ cdS rIA btn btn +dmB +dmB +dmB +dmB +dmB +dmB djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -200014,19 +205022,19 @@ btn sgP sgP sgP -sgP +eKi sgP mST cdS rIA btn btn -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -200237,12 +205245,12 @@ gtm tyy vJK dtz -bgz +xHn bgz bgz kgd bgz -bgz +qPk nXb gQa nfa @@ -200277,10 +205285,10 @@ cdS rIA btn btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -200464,7 +205472,7 @@ sgP nDK sxw ukj -ukj +clj mQA veh msP @@ -200533,9 +205541,9 @@ cdS rIA btn btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -200789,9 +205797,9 @@ cdS rIA sgP btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -200960,11 +205968,11 @@ djs djs djs djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -201046,8 +206054,8 @@ rIA btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -201218,10 +206226,10 @@ djs djs djs djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB btn btn btn @@ -201287,7 +206295,7 @@ rIA rIA sNB aNx -sgP +eKi sgP btn btn @@ -201302,9 +206310,9 @@ hLl rIA btn btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -201476,9 +206484,9 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn btn btn @@ -201517,7 +206525,7 @@ hWD tyy iEj sDl -sDl +vyZ cyn tyy vDT @@ -201528,10 +206536,10 @@ oOk lhF xLW vAY -qRH -qRH +uzd +tYU iNE -qRH +gil kNj wUC hBb @@ -201554,14 +206562,14 @@ btn btn sgP sgP -sgP +eKi hLl rIA btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -201734,8 +206742,8 @@ djs djs djs djs -djs -djs +dmB +dmB btn btn btn @@ -201783,12 +206791,12 @@ bpg rXz tIs rtY -qRH -qRH -qRH -qRH -qRH -qRH +qpV +kiO +hFP +hFP +cWy +cWy rkG kid sBn @@ -201815,9 +206823,9 @@ sgP hLl rIA btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -201992,7 +207000,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -202041,11 +207049,11 @@ rXz nLp bgg hPp -qRH -qRH -qRH -qRH -qRH +ouT +sIb +sIb +cWy +cWy kNj uYp gkQ @@ -202072,9 +207080,9 @@ sgP hLl rIA btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -202267,7 +207275,7 @@ sgP sgP sgP fhX -oMy +dEw fDk fDk oMy @@ -202296,13 +207304,13 @@ bdx fbg rXz hwh -rtY -qRH -qRH -qRH -qRH -qRH -qRH +iOH +uIe +vAS +aqs +aqs +kiO +cWy kNj wCf npx @@ -202329,9 +207337,9 @@ sgP hLl rIA btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -202558,7 +207566,7 @@ sbB lyO sxB jIR -qRH +ccC dfW rXz aKW @@ -202779,7 +207787,7 @@ btn btn sgP sgP -sgP +eKi fMc sgP sgP @@ -202831,12 +207839,12 @@ sNB aNx sgP btn +eKi sgP sgP sgP sgP -sgP -sgP +eKi sgP sgP sgP @@ -202853,10 +207861,10 @@ btn btn btn btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -203073,7 +208081,7 @@ wnU xgJ rFC heJ -hPp +qRH rXz btn btn @@ -203279,7 +208287,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -203319,7 +208327,7 @@ xRt wgE lVW dQZ -rcM +vwG bdx aTH rFC @@ -203330,7 +208338,7 @@ asJ prd rFC eQo -hPp +qRH rXz btn btn @@ -203378,10 +208386,10 @@ btn btn btn btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -203536,7 +208544,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -203793,7 +208801,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -204050,7 +209058,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -204111,7 +209119,7 @@ btn btn sgP sgP -sgP +eKi ssF uBY sgP @@ -204307,7 +209315,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -204349,7 +209357,7 @@ gJT dQZ jZX irn -fbg +fna rFC rFC tdM @@ -204606,7 +209614,7 @@ dQZ dQZ akn ixZ -fbg +cdk akn btn sgP @@ -204821,7 +209829,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -204835,7 +209843,7 @@ btn sgP sgP sgP -sgP +eKi fhX sgP sgP @@ -204863,7 +209871,7 @@ rIA rIA akn cfH -fbg +txc akn btn btn @@ -205078,7 +210086,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -205120,7 +210128,7 @@ rIA rIA akn eed -kAm +sSS akn akn btn @@ -205190,7 +210198,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -205335,7 +210343,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -205447,8 +210455,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -205592,7 +210600,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -205704,9 +210712,9 @@ btn btn btn btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -205850,9 +210858,9 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn btn btn @@ -205961,10 +210969,10 @@ btn btn btn btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -206108,8 +211116,8 @@ djs djs djs djs -djs -djs +dmB +dmB btn btn btn @@ -206170,7 +211178,7 @@ sgP sgP sNB aNx -sgP +eKi sgP sgP sgP @@ -206366,7 +211374,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -206398,12 +211406,12 @@ rpG btn btn btn -ltb +jQK btn btn btn btn -ltb +jQK sgP sgP btn @@ -206623,7 +211631,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -206880,7 +211888,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -206994,8 +212002,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -207137,7 +212145,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -207148,7 +212156,7 @@ btn btn sgP sgP -sgP +eKi hKb vGF qCx @@ -207251,15 +212259,15 @@ btn btn btn btn -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -207393,8 +212401,8 @@ djs djs djs djs -djs -djs +dmB +dmB btn btn btn @@ -207637,21 +212645,21 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +btn +btn +btn +btn +btn +btn +btn +btn +btn +dmB +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -207903,12 +212911,12 @@ btn btn btn btn -djs -djs -djs -djs -djs -djs +btn +btn +btn +btn +btn +btn btn btn btn @@ -208038,7 +213046,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -208153,6 +213161,12 @@ djs djs btn btn +ltb +ltb +rIA +pGs +pGs +btn btn btn btn @@ -208160,12 +213174,6 @@ btn btn btn btn -djs -djs -djs -djs -djs -djs btn btn btn @@ -208177,7 +213185,7 @@ btn btn sgP sgP -sgP +eKi sqK bHO sgP @@ -208295,7 +213303,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -208410,19 +213418,15 @@ djs djs btn btn -mJy -mJy -mJy -mJy -mJy -btn -btn -djs -djs -djs -djs -djs -djs +ltb +unZ +rIA +olc +rIA +rIA +rIA +rIA +rIA btn btn btn @@ -208432,6 +213436,10 @@ btn btn btn btn +btn +btn +btn +sgP sgP sgP sgP @@ -208482,7 +213490,7 @@ sgP sgP raS sNB -rIA +xXj sgP sgP sgP @@ -208552,8 +213560,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -208667,20 +213675,16 @@ djs djs btn btn -mJy -ger -vze -ano -mJy +ltb +unZ +rIA +rIA +pGs btn btn -djs -djs -djs -djs -djs -djs -btn +btn +sgP +rIA btn btn btn @@ -208691,6 +213695,10 @@ btn btn sgP sgP +uOy +sgP +sgP +sgP sgP rBc dPG @@ -208809,11 +213817,11 @@ btn btn btn btn -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -208924,25 +213932,25 @@ djs djs btn btn -mJy -jEf -ihT -ihT -qkH +ltb +vIA +rIA +rIA +rIA btn btn -djs -djs -djs -djs -djs -djs -btn +btn +btn +rIA btn btn btn btn btn +sgP +rIA +rIA +rIA btn btn btn @@ -209066,12 +214074,12 @@ btn btn btn btn -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -209181,23 +214189,23 @@ djs djs btn btn -mJy -uqt -ihT -kTg -mJy -btn -btn -djs -djs -djs -djs -djs -djs +pGs +rIA +rIA +unZ +ltb btn btn btn btn +rIA +btn +btn +btn +btn +sgP +sgP +btn btn btn btn @@ -209438,21 +214446,21 @@ djs djs btn btn -mJy -mJy -mJy -mJy -mJy +ltb +ltb +ltb +ltb +ltb btn btn -djs -djs -djs -djs -djs -djs btn btn +rIA +rIA +sgP +btn +rIA +rIA btn btn btn @@ -209702,16 +214710,16 @@ btn btn btn btn -djs -djs -djs -djs -djs -djs btn btn btn btn +sgP +rIA +rIA +btn +btn +btn btn btn btn @@ -209768,7 +214776,7 @@ sgP raS sNB osA -iWV +peV dOG btn btn @@ -209959,12 +214967,12 @@ btn btn btn btn -djs -djs -djs -djs -djs -djs +btn +btn +btn +btn +btn +btn btn btn btn @@ -210102,7 +215110,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -210216,12 +215224,12 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs +dmB +dmB +btn +btn +btn +btn btn btn btn @@ -210359,8 +215367,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -210476,9 +215484,9 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn btn btn @@ -210616,8 +215624,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -210734,8 +215742,8 @@ djs djs djs djs -djs -djs +dmB +dmB btn btn btn @@ -210747,7 +215755,7 @@ btn sgP sgP sgP -sgP +eKi rBc dPG sgP @@ -210991,8 +215999,8 @@ djs djs djs djs -djs -djs +dmB +dmB btn btn btn @@ -211052,7 +216060,7 @@ sgP sgP raS sNB -sgP +eKi rIA rIA rIA @@ -211249,7 +216257,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -211505,8 +216513,8 @@ djs djs djs djs -djs -djs +dmB +dmB btn btn btn @@ -211557,7 +216565,7 @@ sgP rIA rIA rIA -rIA +xXj rIA rIA rIA @@ -211603,7 +216611,7 @@ ljz sAL eSn oqU -qwT +iPk stF qwT qwT @@ -211761,9 +216769,9 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn btn btn @@ -211824,7 +216832,7 @@ ljX lIB gUQ osA -iWV +peV rIA rIA rIA @@ -212016,8 +217024,8 @@ djs djs djs djs -djs -djs +dmB +dmB btn btn btn @@ -212088,8 +217096,8 @@ pTa sgP bik dxj -gYo -gYo +ebK +ebK tbQ sgP sgP @@ -212271,10 +217279,10 @@ djs djs djs djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB btn btn btn @@ -212526,12 +217534,12 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -212549,7 +217557,7 @@ sgP sgP rBc dPG -sgP +eKi sgP sgP sgP @@ -212631,7 +217639,7 @@ uQt pGo mTP qlt -wJB +kse jFv mFb cHq @@ -212782,13 +217790,13 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -212859,8 +217867,8 @@ bik gYo bik dxj -gYo -gYo +bMj +bMj tbQ sgP sgP @@ -213039,8 +218047,8 @@ djs djs djs djs -djs -djs +dmB +dmB fvR fvR fvR @@ -213114,7 +218122,7 @@ ofB mrn bik hHo -bik +gBz tbQ hHo hHo @@ -213126,7 +218134,7 @@ fYi oUf syK fvo -pWg +jxG iZi upE jrw @@ -213145,7 +218153,7 @@ oCN shr cyY aQl -wJB +kse jFv vbH hoT @@ -213295,20 +218303,20 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB fvR pTh -uJS +wdR wbR fvR pTh -uJS +wdR wbR fvR pTh -uJS +wdR wbR fvR kxB @@ -213551,26 +218559,26 @@ djs djs djs djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB fvR fTz aqX -mRB +iPS fvR fTz aqX -mRB +iPS fvR fTz aqX -mRB +iPS fvR otH kUr -jOZ +ews jOZ lwL rXE @@ -213638,7 +218646,7 @@ ban ban wdF jrw -eqI +hEa pQB efW sLB @@ -213667,9 +218675,9 @@ jKo aum noP jFv -jFv -jFv -lFZ +oFk +btE +btE lFZ kda leX @@ -213684,7 +218692,7 @@ usL ert phv heN -uwK +xse uwK iJQ pRT @@ -213807,11 +218815,11 @@ djs djs djs djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB fvR fvR fvR @@ -213826,9 +218834,9 @@ fvR gcM fvR kxB +wdq vPp -vPp -vPp +dSS vPp rXE sgP @@ -213895,17 +218903,17 @@ bgE ban uaf jrw -eqI +hEa hGt -eqI +hEa xpB fNP jrw -uda +hmJ gxD oxd uAh -pOn +uda qlt lBm mtG @@ -213924,11 +218932,11 @@ qDa wcU uae jFv -hHz -lFZ +jCe lFZ lFZ lFZ +jAh leX nQN hOY @@ -213941,7 +218949,7 @@ tNQ ert hEI uwK -uwK +cDX tCg ahQ wqu @@ -214064,11 +219072,11 @@ djs djs djs djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB fvR hUG kfb @@ -214083,9 +219091,9 @@ lBJ iRy fvR ejo -cep -cep -cep +oHN +qIy +eKE doh rXE sgP @@ -214125,7 +219133,7 @@ ikc mJy rBc aNx -sgP +eKi sgP sgP sgP @@ -214154,7 +219162,7 @@ iBS oUf jrw jrw -dEw +rtp jrw jrw oUf @@ -214181,12 +219189,12 @@ tZm qFD vNJ jFv -jyN +jCe qdr lFZ wKm lFZ -leX +sFE leX leX leX @@ -214197,9 +219205,9 @@ izX rTC hff qtj -uwK -cDX -uwK +tLZ +bxF +tLZ uwK yap kck @@ -214320,23 +219328,23 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB fvR xhQ -pBN +kfQ fRZ fvR cjK -mLz +scl rMJ fvR mHV -iRy +vho bgM fvR fvR @@ -214388,8 +219396,8 @@ sgP sgP sgP sgP -osA -blB +qTw +hRN sjr pCt xlZ @@ -214409,7 +219417,7 @@ ban ban mjM jgG -rNy +bQN ldx rNy rNy @@ -214442,7 +219450,7 @@ hBA xWQ lFZ rnG -lFZ +wfc nAk uGu bbo @@ -214456,7 +219464,7 @@ hff hyV tLZ bxF -uwK +tLZ uwK xDW kck @@ -214576,24 +219584,24 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB fvR vkM -pBN +ngF ocM fvR kON -mLz +esd xxK fvR wQs -iRy +xjy gbv fvR qBR @@ -214605,7 +219613,7 @@ bTq rXE rBc dPG -sgP +eKi btn btn btn @@ -214699,12 +219707,12 @@ gHi pRR bap bRZ -bap -bap -bap -rDg -bap -bap +hVT +uJr +jlo +hqi +jlo +jlo dtu hnL aBI @@ -214833,13 +219841,13 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +fvR +fvR +fvR +fvR fvR mTY pBN @@ -214855,9 +219863,9 @@ pIP fvR rFl cep -nfZ -eHl -kwd +nUe +nrC +sVo kwd kuT sqK @@ -214956,12 +219964,12 @@ nCN nCN nCN axe -nCN -nCN -nCN +jiT +edO +wHO spD -nCN -nCN +wHO +wHO cjk rIY cLK @@ -214970,7 +219978,7 @@ dyg dgo tvv bxc -uwK +tLZ iJQ arv cIn @@ -215090,13 +220098,13 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +fvR +lTM +maN +cBt fvR fvR xqy @@ -215111,10 +220119,10 @@ cdU fvR fvR jld -cep -nfZ +kVC +aQZ eHl -kwd +fNo kwd kuT sqK @@ -215149,7 +220157,7 @@ sgP mJy rVu uIi -rxb +eTA mJy qGR aNx @@ -215159,8 +220167,8 @@ sgP sgP rIA rIA -osA -sHf +qTw +qZE gUY xoM lBd @@ -215180,7 +220188,7 @@ ban ban mjM jgG -xBl +egc cRd rRC kuY @@ -215209,15 +220217,15 @@ xBl xBl xBl oJa -lFZ +rWd lFZ jyO mUn -xBl +xak sQv iMm jyN -sQv +rME tPZ ert eoM @@ -215227,7 +220235,7 @@ hff nrA tLZ lcj -uwK +tLZ uDs fmS cIn @@ -215346,28 +220354,28 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs -djs -ljt +dmB +dmB +dmB +dmB +fvR +uZR +nrk +vaS +rXE aIj -cep -sKn +nfZ +nsS cep ptH xAR -cep +lkj cep sKn -cep -cep +nfZ +lkj aJo -eQc +cep cep nfZ rXE @@ -215406,7 +220414,7 @@ sgP mJy rVu nqT -rxb +eTA mJy sqK kYe @@ -215463,15 +220471,15 @@ sHN wCG rRM sfn -rRM -rRM sHN sHN sHN -kUi +sHN +sHN +nan twi kUi -daA +aYe daA fTT daA @@ -215482,9 +220490,9 @@ bdA cbM hff fya -uwK -qzc -uwK +tLZ +lcj +tLZ uwK yap cIn @@ -215602,30 +220610,30 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn btn -btn -btn -btn -sgP -ljt +fvR +uZR nrk +axv +wpc cep -cep -cep -cep -cep -kVC -fra -fra -fra -fra -fra +szv +jRD dxg -fra +dxg +tTQ +gCn +dxg +dxg +tTQ +qDM +dxg +dxg +rlb lBY fvR fvR @@ -215692,7 +220700,7 @@ tMu kmx cjq ban -xIU +npO kAz oHR hna @@ -215712,7 +220720,7 @@ kPz lhT xWm mkd -hya +mDe gXB shB sHN @@ -215725,7 +220733,7 @@ kxn sHN tmZ sHN -kUi +aaj twi kUi daA @@ -215740,7 +220748,7 @@ fDK ert eUw uwK -uwK +qzc uwK ota cYr @@ -215859,31 +220867,31 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn btn -btn -btn -btn -sgP +fvR +uZR +nrk +wKw ljt aax -cep +ygL thi rAf rAf fIM xgp -fqV +uFo qaQ sWf bKk gma rqm -cep nfZ +cep rXE sgP sgP @@ -215967,7 +220975,7 @@ fAV eNH rck apJ -gCr +gXB hya jAF gXB @@ -215976,13 +220984,13 @@ sHN jEh ckR qwM -qid +acn xhl aCZ sHN sHN sHN -kUi +hCL twi vNt daA @@ -215997,7 +221005,7 @@ dQQ ert oJg tCg -uwK +xse uwK iJQ wNk @@ -216116,16 +221124,16 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn btn -btn -btn -btn -btn -ltb +fvR +sUf +nrk +nBM +fvR fvR fvR fvR @@ -216200,9 +221208,9 @@ tbQ tbQ tbQ tbQ -ban +gdY tMu -iKR +uDB tMu tMu ban @@ -216233,9 +221241,9 @@ syh mgd mgd tIE -bWY -xhl acn +kPk +hQp sHN dgV sHN @@ -216272,7 +221280,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -216373,17 +221381,17 @@ djs djs djs djs -djs -djs -djs -btn -btn -btn -btn -btn +dmB +dmB +dmB btn btn fvR +fvR +fvR +fvR +fvR +fvR qIg qIg qIg @@ -216396,7 +221404,7 @@ qIg qIg cPh lmb -vPp +lOU gZU rXE sgP @@ -216492,11 +221500,11 @@ acn oey acn uXV -acn +hgs jOC jOd sHN -kUi +vNv twi kUi daA @@ -216529,7 +221537,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -216629,10 +221637,10 @@ djs djs djs djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB btn btn btn @@ -216640,7 +221648,7 @@ btn btn btn btn -cPh +jOi qIg qIg qIg @@ -216653,7 +221661,7 @@ qIg qIg cPh iAz -vPp +xSz fvs rXE sgP @@ -216685,6 +221693,7 @@ aNx sgP sgP sgP +eKi sgP sgP sgP @@ -216694,8 +221703,7 @@ sgP sgP sgP sgP -sgP -sgP +eKi sgP sgP sgP @@ -216745,8 +221753,8 @@ gXB usa sHN mMZ -wpc -nan +acn +oey hay riX rXN @@ -216786,7 +221794,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -216885,11 +221893,11 @@ djs djs djs djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -216910,7 +221918,7 @@ qIg qIg cPh uYO -vPp +qQt hcW rXE sgP @@ -216999,18 +222007,18 @@ dvu aht exl hcY -shB -fNc -fNc -fNc -fNc -fNc -fNc -fNc -fNc +fTC +sHN +ulk +acn +oey +vsp sHN sHN -kUi +sHN +sHN +sHN +hCL twi kUi suF @@ -217043,8 +222051,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -217167,7 +222175,7 @@ qIg qIg cPh tOY -vPp +wKD xmq rXE sgP @@ -217256,15 +222264,15 @@ vAn vft plR bFb -shB -hcY -xse -xQA -vdE +fTC +sHN +olu +acn +oey rOg kIE -kIE -uKG +rOg +sHN kAJ dAh hZa @@ -217300,8 +222308,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -217396,7 +222404,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -217424,7 +222432,7 @@ qIg qIg cPh lmb -vPp +lOU dil rXE sgP @@ -217485,12 +222493,12 @@ kcc ncq vjv ncq -kcc +ncq ncq ncq ncq pDv -ncq +qqa mAs izF vjV @@ -217509,24 +222517,24 @@ feB glf aio nSs -eCp +fgc vMN cap hcY -shB -hcY -eww -eww -rOg -kIE -kIE -kIE -uKG dLb -uQF +gKj +eww +kzM +oey +dpI +dpI +dpI +sHN +sqm +rEK lHj kUi -kUi +muy suF kkr xoJ @@ -217652,8 +222660,8 @@ djs djs djs djs -djs -djs +dmB +dmB btn btn btn @@ -217684,7 +222692,7 @@ qzm piM jML rXE -rXE +sgP sgP sgP rBc @@ -217747,8 +222755,8 @@ tbQ nkG tbQ bik -ncq -ncq +dRP +orQ bik rVn rVn @@ -217771,16 +222779,16 @@ kOO rnY bFb uRA -gKj +sHN fDg -kzM -ovF -beW -beW -beW +cJk +oey +dpI +dpI +dpI vJH -kUi -uQF +sqm +sPN ppc kUi uKG @@ -217793,8 +222801,8 @@ daA sgP sgP sgP -btn -btn +sgP +sgP sgP sgP sgP @@ -217909,8 +222917,8 @@ djs djs djs djs -djs -djs +dmB +dmB btn btn btn @@ -217923,7 +222931,7 @@ btn sgP rIA rIA -rIA +xXj rIA rIA rIA @@ -217932,13 +222940,13 @@ kwd lZc kVC oFq -fra -fra -fra +aBw +dxg +dxg fra tXM -ulq -fra +jMs +tTQ ajs lof rXE @@ -217946,7 +222954,7 @@ rXE rXE rBc dPG -sgP +eKi rIA rIA rIA @@ -217957,13 +222965,13 @@ rIA rIA ltb sgP +eKi sgP sgP sgP sgP sgP -sgP -sgP +eKi sgP rYw kYe @@ -218000,11 +223008,11 @@ gYo tbQ gYo tbQ -ncq -ncq -ncq +qfl +qfl +wuW bik -ncq +vFD mqk bik rxb @@ -218035,9 +223043,9 @@ lSa lSl xRp pFM -uKG +cto sqm -uQF +eHe lHj kUi vtY @@ -218049,10 +223057,10 @@ sgP sgP sgP sgP -btn -btn -btn -btn +sgP +sgP +sgP +sgP sgP sgP sgP @@ -218164,10 +223172,10 @@ djs djs djs djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB btn btn btn @@ -218197,7 +223205,7 @@ jse vBI hRM qah -hRM +nuf osV eMF xYo @@ -218261,9 +223269,9 @@ cVl qTN cVl bik -ncq -ncq -bik +vFD +vFD +hOp rxb rxb rxb @@ -218285,34 +223293,34 @@ ugw nrl hcY erp -hcY -unZ -hcY -hcY -hcY -hcY -hcY -uKG -uKG -eKi -lHj +sHN +sHN +sHN +fNc +sHN +sHN +sHN +sHN +xzd +xzd +kDA kUi vtY vtY vtY +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA sgP sgP sgP -sgP -sgP -btn -btn -btn -btn -btn -sgP -sgP -btn btn sgP sgP @@ -218420,11 +223428,11 @@ djs djs djs djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB btn btn btn @@ -218435,27 +223443,27 @@ btn btn btn sgP -rIA +xXj hLl btn btn sgP -sgP -rXE +iOM +fvR fvR fvR fvR -wdR lUI fvR fvR fvR fvR -eKE +fvR +oWa cep abh -fra -jOG +bRd +bIm bIm afc gVr @@ -218494,7 +223502,7 @@ btn btn btn osA -iWV +peV rIA rIA rIA @@ -218518,8 +223526,8 @@ bik bik bik bik -ncq -ncq +jig +qid tbQ rxb rxb @@ -218540,17 +223548,17 @@ nSs uqL bfj abH -nzQ -gjY -nzQ +hcY +erp +sHN kXW -nzQ -vIA +bzE +acn fOE -fmB +sYX +xlN dRx -dRx -uKG +xzd amt nYs kUi @@ -218558,18 +223566,18 @@ rhl kUi mqr nKq +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +sgP sgP sgP -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn btn btn sgP @@ -218697,24 +223705,24 @@ hLl btn btn btn -sgP -ltb +fvR rlm jcp uJS yif -ehU +cRk fvR -mIZ +hys +bTg xWa qae jMs -cep +dxg jaG mim -fvR -dmB -fvR +kwd +kwd +ufT rIA rIA rIA @@ -218775,8 +223783,8 @@ sgP sgP sgP tbQ -ncq -ncq +jig +qid rfS rxb rxb @@ -218799,34 +223807,34 @@ eCp eCp eCp erp -wlY +sHN jpn bzE -eIZ -fOE -fmB -dRx -dRx -uKG -uQF +acn +jLJ +wlY +jOG +jOG +eGS +meB twi kUi vtY vtY vtY +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +sgP sgP sgP -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn btn btn btn @@ -218954,23 +223962,23 @@ hLl btn btn btn -btn -ltb +fvR rlm jcp mRB -fPC +mRB ehU fvR -ulT -dlU +bWY +xRI +dVf fvR -jMs -cep +psm +kVC dft -jYx -fvR fvR +eIZ +xxj fvR rIA rIA @@ -219032,7 +224040,7 @@ sgP sgP sgP tbQ -ncq +lln nvf tbQ rxb @@ -219054,35 +224062,35 @@ nSs cqt nyA wPu -nzQ -gjY -nzQ +eCp +erp +sHN uoi -nzQ -gZR -fOE +bzE +acn +acn fmB -dRx -dRx -uKG +dvd +mbB +xzd suQ twi aQs vtY +eKi +sgP +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA sgP sgP -sgP -sgP -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn btn btn btn @@ -219211,8 +224219,7 @@ hLl btn btn btn -btn -ltb +fvR rlm jcp qbG @@ -219222,7 +224229,8 @@ fvR fvR fvR fvR -eKE +fvR +oWa tAJ hkP giO @@ -219308,38 +224316,38 @@ fkV fPt bVe nSs +fgc eCp -eCp -eCp -bFb +iSD +iSD erp -hcY +sHN gSg -hcY -hcY -hcY -hcY -hcY -hcY -uKG +hnJ +acn +acn +sHN +sHN +sHN +xzd kmf -twi +rwF kUi vtY sgP sgP +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +sgP sgP -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn btn btn btn @@ -219468,15 +224476,15 @@ hLl btn btn btn -btn -ltb +fvR fvR fvR fvR mRB -mRB +ehU fvR -mIZ +jih +jRE ogZ fRE jMs @@ -219567,36 +224575,36 @@ nWA cem fAz xau -xxj -hcY -bof -hVT -nrl iSD -lln -lln -hcY -sgP -sgP -vtY +gRK +erp +sHN +qaL +acn +acn +acn +lAY +jxY +lAY +uKG hHa -twi +rwF kUi vtY sgP sgP +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +sgP sgP -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn btn btn btn @@ -219725,14 +224733,14 @@ hLl sgP sgP sgP -btn sgP -ltb +fvR iiD ulj -mRB -mRB +iNI +iRd fvR +kYa ulT dlU fvR @@ -219749,7 +224757,7 @@ hLa tMt aOB qza -gpQ +kWC gSc iqP sgP @@ -219763,7 +224771,7 @@ btn sgP sgP sgP -sgP +eKi rYw kYe sgP @@ -219823,25 +224831,35 @@ wkq wOv bFb eCp -hcY -hcY -hcY -hcY -hcY +eCp +iSD +eCp +erp +sHN uRU qKy -ydI +acn sVX -hcY -sgP -sgP -vtY -hHa -twi -kUi +wbv +gZR +ntm uKG +hHa +rwF +kUi +vPR sgP sgP +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA sgP btn btn @@ -219862,16 +224880,6 @@ btn btn btn btn -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn djs djs djs @@ -219983,8 +224991,7 @@ btn btn sgP sgP -sgP -ltb +fvR fvR fvR xGu @@ -219993,10 +225000,11 @@ fvR fvR fvR fvR +fvR oWa -hos +cep wem -kfQ +giO aPl icN uHl @@ -220005,8 +225013,8 @@ ktE jYH sCj cNN -muF -muF +cNN +oeB muF iqP sgP @@ -220080,36 +225088,36 @@ jVg ekH pGv eCp -hcY -bFf -bFf -bFf -hcY -eCp iSD -orF -orF -hcY -sgP -sgP -vtY +iSD +iSD +erp +sHN +tiy +nZt +acn +hgs +dWF +sNj +mij +uKG kmf -twi +rwF kUi vtY sgP sgP -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +sgP btn btn btn @@ -220234,26 +225242,26 @@ btn btn btn sgP -rIA +xXj hLl btn btn btn sgP -sgP -ltb +fvR jCO iIS mRB mRB fvR +xqB mIZ aPe gSn -psm -kVC +jMs +fra baF -bLO +sSK sSK sSK sSK @@ -220326,8 +225334,8 @@ iSD iSD xsy iSD -xdM -apb +vhS +ucY ydf lgt fgm @@ -220337,36 +225345,36 @@ dKf sIu eCp kEv -hcY +iSD gZf -bRd -wbv -hcY eCp -hcY -hcY -hcY -hcY -sgP -sgP +erp +sHN +aKU +wAg +acn +hgs +rUO +qlg +eHK uKG oxg -twi +rwF kUi vtY +eKi sgP +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA sgP -sgP -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn btn btn btn @@ -220497,20 +225505,20 @@ btn btn osI yjs -ixo +osI osI xKK xKK xKK -xKK fvR -ulT -dlU +ybm +rQR +vCZ fvR kre smh xCN -vAJ +oGp qdp dcK pab @@ -220518,7 +225526,7 @@ flB oGp iqP cha -abL +iqP iqP iqP iqP @@ -220594,25 +225602,35 @@ jTX niH eCp aSm -hcY -jxY -bFf -mbB -hcY +iSD +gZf +hKE +erp +sHN hBh -hcY -eCp -mLK -hcY -bVg -sgP +cHO +acn +hgs +jID +jYx +aYP uKG hHa -twi +rwF kUi vtY sgP sgP +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA sgP btn btn @@ -220623,16 +225641,6 @@ btn btn btn btn -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn djs djs djs @@ -220767,7 +225775,7 @@ xKK xKK nCw lpp -dVK +oGp gmN vjz pwp @@ -220851,30 +225859,35 @@ dPl kBa nbq lcd -hcY -cdk -wfc -jQK -hcY -eCp -heV -eCp -fYO -ivL -sgP -sgP +iSD +iSD +iSD +bof +amW +wjX +nzQ +iBb +dvi +lAY +tIx +lAY uKG lJe -twi +rwF kUi vtY sgP sgP -btn -btn -sgP -sgP -sgP +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA sgP btn btn @@ -220884,12 +225897,7 @@ btn btn btn btn -btn -btn -btn -btn -btn -djs +dmB djs djs djs @@ -220999,7 +226007,7 @@ btn sgP sgP sgP -sgP +eKi sgP sgP sgP @@ -221011,7 +226019,7 @@ osI bCB dAY gNk -hys +gQY pAl osI dAt @@ -221024,7 +226032,7 @@ fGb osI wgc sPa -qtn +oGp oGp wAp sgg @@ -221033,7 +226041,7 @@ hlB mVd mmM oJS -pGs +iyj bcB sgP sgP @@ -221109,32 +226117,34 @@ niH eCp bwu jRA -jlo -peV -dvd -bFb eCp -hcY -hcY -hcY -hcY -bVg -sgP -vtY +eCp +eCp +sHN +sHN +sHN +sHN +sHN +sHN +sHN +sHN +uKG hHa eRy kUi vtY sgP sgP -sgP -sgP -sgP -sgP -sgP -sgP -sgP -sgP +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA sgP btn btn @@ -221143,10 +226153,8 @@ btn btn btn btn -btn -btn -djs -djs +dmB +dmB djs djs djs @@ -221352,7 +226360,7 @@ iSD cib ydf iSD -ptl +cib ydf iSD iSD @@ -221370,30 +226378,30 @@ aip vtu eCp eCp -pGv -fna -eCp -iPk -hcY -sgP +tFI +iSD +nYv +mLK +iSD +bVg sgP vtY hHa -twi +rwF kUi vtY sgP sgP -sgP -sgP -sgP -sgP -sgP -sgP -sgP -sgP -sgP -sgP +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA sgP sgP btn @@ -221402,8 +226410,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -221578,7 +226586,7 @@ btn sgP btn osA -iWV +peV rIA rIA rIA @@ -221591,7 +226599,7 @@ rIA rIA rIA rIA -iWV +peV rIA rIA rIA @@ -221601,7 +226609,7 @@ rIA rIA rIA rIA -hcY +kjr mCV hcY eCp @@ -221627,19 +226635,19 @@ sbI sne sui sbI -uuL -egc -sbI -lAY -hcY +mjq +heV +eCp +fYO +ivL sgP sgP vtY kmf -twi +rwF kUi uKG -sgP +eKi sgP sgP sgP @@ -221659,8 +226667,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -221795,7 +226803,7 @@ kUu osI ruh coh -vkJ +qZi oGp oGp oGp @@ -221819,7 +226827,7 @@ sgP sgP sgP sgP -sgP +eKi sNB aNx sgP @@ -221885,17 +226893,17 @@ xbk rRX ycl xbk -nwI -jiT -mER -hcY -sgP +iSD +iSD +iSD +iSD +bVg sgP vtY ocr -twi +rwF kUi -uKG +hHz vtY vtY vtY @@ -221916,8 +226924,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -222018,7 +227026,7 @@ hZL kan oMF kSM -sgP +eKi sgP hLl sgP @@ -222026,7 +227034,7 @@ sgP sgP sgP hLl -iWV +peV rIA rIA rIA @@ -222042,7 +227050,7 @@ osI osI osI osI -qDM +osI smn osI jWy @@ -222053,11 +227061,11 @@ osI nUH lGv mLw -lkj +piO emC fUs emC -fHg +vhX yeV sAI mqT @@ -222131,7 +227139,7 @@ ajC kPw dCh hcY -eCp +gZf eCp rRX qpr @@ -222150,9 +227158,9 @@ sgP sgP vtY hHa -twi -kUi +rwF kUi +ahs kUi kUi kUi @@ -222173,8 +227181,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -222280,7 +227288,7 @@ sgP hLl sgP sgP -sgP +eKi sgP hLl rIA @@ -222290,20 +227298,20 @@ rIA rIA jPO geJ -msO +gCr pqX msO yhl msO -sac +xGb msO msO wpj rkZ icY vMH -tCw -cax +qZi +qZi ruh qZi gJi @@ -222324,7 +227332,7 @@ otI voo dTP sgP -iWV +peV rIA rIA rIA @@ -222332,7 +227340,7 @@ rIA rIA rIA rIA -iWV +peV sgP sNB aNx @@ -222388,7 +227396,7 @@ hcY tKh bfU hcY -eCp +fgc eCp rRX wXG @@ -222430,8 +227438,8 @@ sgP btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -222550,15 +227558,15 @@ bVA miN wNN xQt -xQt +eGI uop -xQt +fyi xQt xQt qVL gKt pOF -kxE +jOe kxE kxE ejp @@ -222566,16 +227574,16 @@ kxE apQ hzM mBf -vkJ +qZi piO bRr fXF -yjx -sII +bSc +vhX vsn vaW -lRq -jfJ +mLW +brf gIm vHp otI @@ -222672,10 +227680,10 @@ vtY vtY vtY vtY -uKG +qVX xzd tuT -uKG +qVX xzd vql xzd @@ -222687,7 +227695,7 @@ sgP sgP btn btn -djs +dmB djs djs djs @@ -222804,37 +227812,37 @@ rIA rIA usN iBY -aQZ -dMY -bKc -bKc -bKc -dSS -bKc -bKc -dSS -bKc -bsH +gCr +gBt +iye +iye +iye +iye +iye +iye +iye +iye +iye iye iye gwk -qZi -qZi +nPH +fPC fZd -qZi -coh +fPC +mZG vkJ piO piO kJT fBN -gku +vhX pbp ppa mLW brf kXN -otI +vWs eNf dTP sgP @@ -222944,8 +227952,8 @@ sgP sgP btn btn -djs -djs +dmB +dmB djs djs djs @@ -223061,8 +228069,8 @@ rIA hUl fhu msO -oeB -cEO +gCr +ipS iye bbu pmS @@ -223073,9 +228081,9 @@ jlC imB jkT pmS -pmS +oBB mWU -qZi +eJv qZi sLQ gfC @@ -223085,7 +228093,7 @@ mNB piO piO iwn -sII +vhX vhX rTb vhX @@ -223159,7 +228167,7 @@ hcY vtu eCp hcY -eCp +rEP eCp fBH hfl @@ -223201,7 +228209,7 @@ sgP sgP btn btn -djs +dmB djs djs djs @@ -223318,18 +228326,18 @@ rIA rIA jPO gZt -oeB +huM des iye dLA -pmS +hos oqJ iye kpO sAV -xRI -cxk -cxk +rPc +rPc +rPc hUz mWU qZi @@ -223458,7 +228466,7 @@ sgP sgP btn btn -djs +dmB djs djs djs @@ -223583,8 +228591,8 @@ qKx iye iye dhc -pmS -xRI +cra +cxk cxk cxk hUz @@ -223598,13 +228606,13 @@ wEb yeh piO wFB -mjs -mVA +cgC +ufI ggs mjs +dVK ufI -ufI -ufI +sOs nze daI uST @@ -223715,7 +228723,7 @@ sgP sgP btn btn -djs +dmB djs djs djs @@ -223825,15 +228833,15 @@ btn sgP sgP hLl -vpI +wGq vpI miE miE miE vpI vpI -oeB -mEs +msO +gBt iye mkb qJo @@ -223841,10 +228849,10 @@ sPU gHv ehk wOe -hqT -pmS -pmS -pmS +abL +qmh +ehk +jfJ eLE iyL pFN @@ -223855,14 +228863,14 @@ wEb mSC piO vpl -bSc +fTt kEp qsy ovd rKs ruY oNW -ufI +vAJ gLu jXZ jXZ @@ -223949,8 +228957,8 @@ sgP btn btn btn -djs -djs +dmB +dmB btn btn btn @@ -223972,7 +228980,7 @@ sgP sgP btn btn -djs +dmB djs djs djs @@ -224089,19 +229097,19 @@ vpI gFr aOa vpI -oeB -mEs +msO +gBt iye aXp jGB iye gLv jBi -pmS +jrd rPc -cxk -cxk -hUz +rPc +rPc +bsH mWU iyL pFN @@ -224112,13 +229120,13 @@ don sOj piO coE -bSc +xiZ kye -ggs +vDm rGm -ufI +ykW pJR -mVA +oSM ufI daI uST @@ -224187,7 +229195,7 @@ sgP iwB ajf dNx -sgP +eKi sgP sgP sgP @@ -224205,10 +229213,10 @@ btn btn btn btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB btn btn btn @@ -224229,7 +229237,7 @@ sgP btn btn btn -djs +dmB djs djs djs @@ -224337,7 +229345,7 @@ btn btn sgP sgP -sgP +eKi hLl sgP rsm @@ -224346,7 +229354,7 @@ vpI scC gFr nLL -oeB +jvj mEs iye sCT @@ -224354,11 +229362,11 @@ hqT iye qdm woC -pmS -rPc +jrd cxk cxk -hUz +cxk +ulq mWU iyL pFN @@ -224369,13 +229377,13 @@ mJf hdX piO tmq -bSc +xiZ ufI -ggs +vDm eEJ -ufI +ykW kDc -kye +hXS rfN jGL gpk @@ -224388,8 +229396,8 @@ rIA rIA rIA rIA -iWV -sgP +peV +eKi sNB aNx sgP @@ -224466,7 +229474,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -224485,7 +229493,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -224601,9 +229609,9 @@ kFe vLy vpI vpI -nLL +otX vpI -oeB +msO uxR iye cSD @@ -224626,13 +229634,13 @@ wEb arP piO pxx -bSc -ufI -ggs +xiZ +dVK +vDm rGm -ufI +hqe ivT -ufI +hXS fyt gqZ jXZ @@ -224725,13 +229733,13 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn btn -djs -djs +dmB +dmB btn btn sgP @@ -224741,8 +229749,8 @@ sgP btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -224858,9 +229866,9 @@ kFe vLy fCU aJr -nTg +ebQ miE -oeB +aLi cEO uMv uMv @@ -224871,7 +229879,7 @@ mWU fcc wzD iye -iye +jqh iye iye uZo @@ -224882,14 +229890,14 @@ pFN wEb mSC piO -pxx -bSc -ufI -ggs -bSc -ufI -ufI -ufI +qtn +bpx +rVA +bKc +dtM +kMO +rVA +cmp bxR daI jXZ @@ -224962,7 +229970,7 @@ sgP btn btn btn -djs +dmB btn djs djs @@ -224984,12 +229992,12 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB btn btn sgP @@ -224997,9 +230005,9 @@ sgP sgP btn btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -225128,11 +230136,11 @@ pbQ yfO yfO pVz -vCZ +yfO wMb tsX nBl -qZi +vTw qZi qZi rvc @@ -225140,7 +230148,7 @@ cax jTE piO oXN -bSc +xiZ ufI oMG mvb @@ -225217,6 +230225,10 @@ btn hLl sgP btn +dmB +dmB +dmB +dmB djs djs djs @@ -225238,15 +230250,11 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB btn btn sgP @@ -225254,8 +230262,8 @@ sgP sgP btn btn -djs -djs +dmB +dmB djs djs djs @@ -225374,8 +230382,8 @@ vLy llv vpI vpI -dtM -mEs +sac +gBt uMv oGD jXx @@ -225389,7 +230397,7 @@ yfO wMb tsX qHa -qZi +fHg hvW iUx vYA @@ -225397,7 +230405,7 @@ qjK gRi piO vjI -qNj +liR ufI gYp piO @@ -225474,6 +230482,10 @@ btn hLl sgP btn +dmB +dmB +dmB +dmB djs djs djs @@ -225495,15 +230507,11 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB btn btn sgP @@ -225511,8 +230519,8 @@ sgP sgP btn btn -djs -djs +dmB +dmB djs djs djs @@ -225631,7 +230639,7 @@ vLy nTg miE gdO -oeB +gCr gGK tZF sLY @@ -225652,7 +230660,7 @@ xFD mfL ddv plU -lkj +piO pgX oOE ufI @@ -225731,6 +230739,10 @@ btn hLl sgP btn +dmB +dmB +dmB +dmB djs djs djs @@ -225753,14 +230765,10 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB btn btn sgP @@ -225768,7 +230776,7 @@ sgP sgP btn btn -djs +dmB djs djs djs @@ -225888,9 +230896,9 @@ vLy vVY miE hTS -rGD -dMY -dQy +ptt +mEs +uMv shy lvc eLJ @@ -225916,11 +230924,11 @@ qFv dHF piO tpw -mNg +kcd mNg neq dLU -fSP +gqy rqi qYv qYv @@ -225986,8 +230994,12 @@ btn btn btn hLl -sgP +eKi btn +dmB +dmB +dmB +dmB djs djs djs @@ -226012,12 +231024,8 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs +dmB +dmB btn btn sgP @@ -226025,7 +231033,7 @@ sgP sgP btn btn -djs +dmB djs djs djs @@ -226146,7 +231154,7 @@ mWZ vpI rBO vUq -mEs +gBt uMv udw rKD @@ -226164,7 +231172,7 @@ pNS cph xFD fKW -kcd +mNg xBw piO uMl @@ -226177,8 +231185,8 @@ miy dzw dLU dzw -mNg -cmr +fqV +yjx pno gUr uUA @@ -226245,6 +231253,10 @@ btn hLl sgP btn +dmB +dmB +dmB +dmB djs djs djs @@ -226269,12 +231281,8 @@ djs djs djs djs -djs -djs -djs -djs -djs -djs +dmB +dmB btn btn sgP @@ -226282,7 +231290,7 @@ sgP sgP btn btn -djs +dmB djs djs djs @@ -226402,8 +231410,8 @@ vLy pAy vpI lYS -oeB -mEs +huM +dQy uMv uMv uMv @@ -226419,9 +231427,9 @@ lXD fIe cph sUh -xFD +nJY fKW -kcd +mNg cCO jXZ jXZ @@ -226430,12 +231438,12 @@ jXZ qEZ jXZ vun -mNg +pZW xaW -mNg +lRq bVZ -mNg -cmr +fWN +dwq wsN jUi ubZ @@ -226502,6 +231510,9 @@ btn hLl sgP btn +dmB +dmB +dmB djs djs djs @@ -226528,10 +231539,7 @@ djs djs djs djs -djs -djs -djs -djs +dmB btn btn sgP @@ -226539,7 +231547,7 @@ sgP sgP btn btn -djs +dmB djs djs djs @@ -226650,7 +231658,7 @@ btn btn btn btn -sgP +eKi hLl sgP pDo @@ -226673,13 +231681,13 @@ jEJ ldZ dWv lXD -fIe +tbN eyw lZL kwf -lfC +gIL fSl -xGb +dJd jXZ oqV sPj @@ -226687,11 +231695,11 @@ sIy bSc jXZ asU -mNg +dtm tYd tYd tYd -mNg +eyh cmr mcC gfF @@ -226759,10 +231767,10 @@ btn hLl sgP btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -226796,7 +231804,7 @@ sgP sgP btn btn -djs +dmB djs djs djs @@ -226916,7 +231924,7 @@ vpI aOa vpI cQh -oeB +gCr qEk gjL thZ @@ -226924,14 +231932,14 @@ coW rwm iaC shH -odE +rGn gNg eNI mZA oKD lXD -fIe -fIe +ttS +bLO sRT xFD mZR @@ -226944,14 +231952,14 @@ qMI qNj piO ifW -mNg -piS -piS -piS -mNg +ixo +dLU +dLU +dLU +gOU cmr iEb -fyi +jUi tfa dwN pBp @@ -226971,12 +231979,12 @@ btn btn btn btn -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -227010,15 +232018,15 @@ btn btn btn btn -sgP +eKi sgP mST cdS sgP btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -227053,7 +232061,7 @@ sgP sgP btn btn -djs +dmB djs djs djs @@ -227172,27 +232180,27 @@ qBr gFr nMZ vpI -msO -rGD -dMY -odE +aXk +ptt +xeY +rGn qyP brF nCi joR irR rGn -vlT -lXD +fIe lXD +gku lXD fIe -fIe +eQc fIe gib xFD -lfC -kcd +fio +mNg wTi hiQ jXZ @@ -227201,11 +232209,11 @@ qQO jXZ piO oCb -mNg -xSz +ddb foA -xSz -mNg +foA +foA +xzZ cmr cIC xEl @@ -227228,10 +232236,10 @@ btn btn btn btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -227273,9 +232281,9 @@ hLl sgP btn btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -227310,7 +232318,7 @@ sgP sgP btn btn -djs +dmB djs djs djs @@ -227439,18 +232447,18 @@ jMI uwV fVV bTn -vho +fIe +ldN cjg -cjg -ipS +ldN ldN uMM wiR fIe jPc -lfC -ugP -aCo +dMY +mNg +kGB mIv aCo aCo @@ -227460,23 +232468,23 @@ aCo dhF mNg kcd -kYa -kcd mNg +oEG +sII cmr qYv qyt qJT yeH qYv -qYv -sgP +ifp +eKi sgP sgP sgP sNB aNx -sgP +eKi sgP sgP btn @@ -227485,9 +232493,9 @@ btn btn btn btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -227529,10 +232537,10 @@ sgP hLl sgP btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -227567,7 +232575,7 @@ sgP sgP btn btn -djs +dmB djs djs djs @@ -227688,38 +232696,38 @@ rtm rXA vJm gvO -oGn +oBy +jPO jPO jPO jPO jPO jPO -oHn xFD koH ohR -iZI +qBz fHK -ldN +cSc iZI wWH sRT xSr -lfC -qWb -uzf -uzf -uzf -kWC -uzf -uzf +dMY +mNg +xFN +mNg uzf +mNg +kcd +mNg +mNg uGJ -neL +mNg dkA -gOU -dkA -gOU +mNg +mNg +rGD xqN vDp kmN @@ -227742,8 +232750,8 @@ btn btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -227786,9 +232794,9 @@ sgP hLl sgP btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -227938,44 +232946,44 @@ sgP sgP wJr sgP -wJr +vpI vpI vpI vpI vpI dWt -aLi +huM xPQ jIM -xQt +btg bAP jAg riL iSS vwu kMY -nPo -vgT gPU -ldN -tpV +nPo +gPU +gPU +ptG tpV fIe jPc -mZR +cRa skg -iVA -iVA +kZs +lRq iVA blu hGL -iVA -iVA +lRq +lRq gfe uql qfX qsf -qfX +ykr vtx gzZ jGu @@ -227999,7 +233007,7 @@ btn btn btn btn -djs +dmB djs djs djs @@ -228043,9 +233051,9 @@ sgP hLl sgP btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -228187,7 +233195,7 @@ btn btn btn wJr -sgP +rIA rIA rIA sgP @@ -228201,47 +233209,47 @@ wJr wJr vpI qWa -tgB -hUp -msO -msO -msO +gCr +pnJ +msO +pCK msO msO +mVA ckP pTB rGe -jeb lXD +tCw lXD fIe -fIe +eQc fIe fIe rSV suf lVu -sMi +ugP bpS -sMi +kOp wHc -dBg -sMi -sMi +kOp +kOp +kOp gXT -ljO -dBg +sMi +jrp vjZ dBg -sMi +hAt tJN gfh nSA -cRa +hpe hpe gfh -gfh -sgP +gEl +eKi sgP sgP sgP @@ -228293,16 +233301,16 @@ djs djs djs djs -djs +dmB btn sgP sgP hLl sgP btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -228440,44 +233448,44 @@ btn btn btn btn -btn -btn wJr wJr wJr rIA rIA -sgP +rIA wJr wJr wJr mkL mkL mkL -pWx -imw -imw -imw +wJr +wJr +mkL +faN +faN +vYt vYt imw -imw -imw -imw -imw +vYt +vYt +faN +faN msO -ckP +ifm xFD vHN kwZ vYH kDK lXD -fIe -fIe +ljO +rcw gib -xiZ -uKR -lYj +xFD +lfC +xFN dJd eLk hVA @@ -228486,15 +233494,15 @@ vnA hVA eLk xOl -kcd -jJf +bii +tYd xKP jJf -mNg +akY mzd hpe jYk -cmp +mrC mrC qwy gfh @@ -228549,16 +233557,16 @@ djs djs djs djs -djs -djs +dmB +dmB btn sgP sgP hLl sgP btn -djs -djs +dmB +dmB djs djs djs @@ -228696,8 +233704,6 @@ btn btn btn btn -btn -btn wJr wJr wJr @@ -228711,16 +233717,18 @@ mkL mkL rIA mkL -pWx -pWx -mUP -wCL -qqo -ulB -axo +mkL +mkL +mkL +faN +ugX +xHr +xHr +nEg ang +wCE dWA -bnc +faN msO pfJ xFD @@ -228729,11 +233737,11 @@ vby dAg wPU lXD +vlT +pHZ fIe -fIe -fIe -xFD -mZR +eSY +aUD fbq sVz hVA @@ -228743,16 +233751,16 @@ kSo rpJ abq pJE -kcd -piS -tKQ -piS +ixo +dLU +dLU +dLU wjh mzd hpe flS kaq -mrC +fWl mPc hpe sgP @@ -228806,16 +233814,16 @@ djs djs djs djs -djs -djs +dmB +dmB btn -sgP +eKi sgP hLl sgP btn -djs -djs +dmB +dmB djs djs djs @@ -228952,8 +233960,6 @@ btn btn btn btn -btn -btn wJr wJr wJr @@ -228968,17 +233974,19 @@ mkL dwJ rIA rIA -pWx -pWx +mkL +mkL +mkL +faN mUP -iyy -efH -cFe -cFe -lKx +hYd +vfI +aGY +sHC +qlo hJv -imw -msO +vYt +jvj nkq pAn eoG @@ -228990,26 +233998,26 @@ hbM bTU vkF xFD -lfC +tKQ qWb -aUD +wTi hVA mgg krv -fTt +qZM vwb hVA esV -kcd +ddb foA -qIy foA -mNg +foA +neL mzd hpe fVf lOL -mrC +tFr rXb hpe sgP @@ -229062,7 +234070,7 @@ djs djs djs djs -djs +dmB btn btn btn @@ -229071,8 +234079,8 @@ sgP hLl sgP btn -djs -djs +dmB +dmB djs djs djs @@ -229209,8 +234217,6 @@ btn btn btn btn -btn -btn wJr wJr wJr @@ -229225,17 +234231,19 @@ uTU dwJ rIA rIA -nYQ -nYQ -nYQ -cch -lkL -mWc -sut -ikK +rIA +mkL +faN +faN +faN +oVC +mtL +coD +eqx +vfI ujN -rOR -xeY +vYt +aLi gKE xFD pjJ @@ -229257,11 +234265,11 @@ qZM jPk hVA pER -kcd mNg -lOU +mNg +mNg fks -mNg +fKW mzd hpe smH @@ -229319,7 +234327,7 @@ djs djs djs djs -djs +dmB btn sgP sgP @@ -229328,8 +234336,8 @@ sgP hLl sgP btn -djs -djs +dmB +dmB djs djs djs @@ -229466,8 +234474,6 @@ btn btn btn btn -btn -btn wJr wJr wJr @@ -229482,17 +234488,19 @@ uTU dwJ rIA rIA +rIA +rIA jmo uOj pmw -cch -lkL +bzp +npN +fzc sut -sut -sut -asd +iAc +oko pLc -dQR +rox fCX xFD jYs @@ -229514,11 +234522,11 @@ qiu ceX nHu dzw -oEG dLU -jOe +dLU +dLU dzw -mNg +rxl mzd vlr lqV @@ -229576,7 +234584,7 @@ djs djs djs djs -djs +dmB btn sgP mST @@ -229585,8 +234593,8 @@ ajf cdS sgP btn -djs -djs +dmB +dmB djs djs djs @@ -229722,8 +234730,6 @@ btn btn btn btn -btn -btn wJr wJr wJr @@ -229739,17 +234745,19 @@ uTU dwJ rIA rIA -nYQ -nYQ -nYQ -uyK -lkL -lbe +rIA +rIA +faN +faN +faN +hbb +iyU +bdZ eSK -eSK -kkd -imw -fjH +puj +fqS +vYt +msO cFr xFD luh @@ -229772,10 +234780,10 @@ ryo ryo hxL tWV -mYe +igg dka flz -mNg +rmN mzd gfh gfh @@ -229793,6 +234801,7 @@ btn btn btn btn +dmB djs djs djs @@ -229832,8 +234841,7 @@ djs djs djs djs -djs -djs +dmB btn sgP hLl @@ -229842,8 +234850,8 @@ sgP sgP sgP btn -djs -djs +dmB +dmB djs djs djs @@ -229979,8 +234987,6 @@ btn btn btn btn -btn -btn wJr wJr wJr @@ -229996,32 +235002,34 @@ uTU dwJ rIA rIA -pWx -pWx -pWx -fUH -oLr -uSL -rEG -mXt +rIA +mkL +oaH +fFc +xap +ldJ +dyE +sse +sIv +evm jpW -imw +faN msO pfJ xFD -jof xFD xFD xFD xFD xFD xFD -faN -faN +xFD +xFD +xFD lVG bcF lRV -faN +nHu eNj qZM ryo @@ -230090,7 +235098,7 @@ djs djs djs djs -djs +dmB btn sgP hLl @@ -230099,8 +235107,8 @@ sgP btn btn btn -djs -djs +dmB +dmB djs djs djs @@ -230236,15 +235244,13 @@ btn btn btn btn -btn -btn wJr wJr wJr wJr wJr mJo -mDl +nit rUh mJo uTU @@ -230252,33 +235258,35 @@ uTU uTU dwJ rIA -rIA qXE qXE qXE -imw -imw +kjl +mJo +kjl +tFT +mJo hVp xXr -imw -imw -imw +mJo +mJo +mJo jfu efR qOo gOk -xQt -xQt -xQt +lYj +btg +wDS xTR -xQt -onx +lYj +btg mzu nXa vUz aVt pSL -faN +nHu flI lkJ ryo @@ -230305,6 +235313,7 @@ btn btn btn btn +dmB djs djs djs @@ -230345,19 +235354,18 @@ djs djs djs djs -djs -djs -djs +dmB +dmB btn sgP hLl sgP -sgP +eKi btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -230493,8 +235501,6 @@ btn btn btn btn -btn -btn wJr wJr wJr @@ -230509,31 +235515,33 @@ nhw nhw xrB rIA -rIA xQF +sxI +aoU +wtJ eoJ -npN +pjd fuB xqC ebt -xfe +ebt dzq hCw mJo plf -oeB +mVA pnJ msO msO rfn -msO +mVA qZu msO -pFI +pCK kRf -oBW +msO jhx -nSq +kDi pJQ feh feh @@ -230544,7 +235552,7 @@ feh feh qaj mYe -mYe +xXS mYe afA wJu @@ -230562,6 +235570,7 @@ btn btn btn btn +dmB djs djs djs @@ -230602,18 +235611,17 @@ djs djs djs djs -djs -djs -djs +dmB +dmB btn sgP hLl sgP sgP btn -djs -djs -djs +dmB +dmB +dmB djs djs djs @@ -230750,9 +235758,6 @@ btn btn btn btn -btn -btn -wJr wJr wJr wJr @@ -230767,18 +235772,21 @@ rIA rIA rIA rIA -xQF +shd +xpV +ebt +jPH xjf -ebt +mua pYC -ebt -ebt -xfe -dzq -hCw +pjd +qvv +qvv +sCt +qNW +mJo mJo mJo -xOF hVy mJo uVh @@ -230787,20 +235795,20 @@ uVh xhR uVh uVh -tCc -oBW +cTG +msO aGE -aDy +msO lXj -gLS feh -dUD -neW -oak -peC +rGW +pXa +cBp +pXa +qvD feh tat -tTQ +mYe ujA mYe mYe @@ -230860,17 +235868,17 @@ djs djs djs djs -djs -djs +dmB +dmB btn sgP hLl sgP sgP -djs -djs -djs -djs +btn +dmB +dmB +dmB djs djs djs @@ -231007,9 +236015,6 @@ btn btn btn btn -btn -btn -wJr wJr wJr wJr @@ -231024,39 +236029,42 @@ rIA rIA rIA rIA -xQF +wIi +jiu +aGu +jTq gLa ebt -mRz -nNu -rYe -rYe -big +ebt +ebt +ebt +ebt big +rsr vah -nCz +wFY aVy -kDy -cNt -rwQ +sLy +oHn +fxD jYc -uvW +kEg bQs oae -rwQ -vUX +upj +usN jvj tpu -aDy -iyU +okv +vgT kiT -feh -qgX +mAt qgX +lUq gRS -tFF +eLV feh -rkk +uhK mYe hqB mYe @@ -231117,18 +236125,18 @@ djs djs djs djs -djs -djs +dmB +dmB btn sgP hLl sgP sgP btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs @@ -231264,9 +236272,6 @@ btn btn btn btn -btn -btn -wJr wJr wJr mkL @@ -231280,39 +236285,42 @@ mJo mJo mJo mJo -rIA -xQF -gLa -ebt -mFc -gGb +mJo +wIi +xfe +vzN ebt ebt -bhj -bhj -uti -vci -wWG -qvv -xQe +ebt +ebt +ebt +ebt +ebt +hQb +pdd +onx +onx +onx +wRs +cNt fxD ePY hSJ -eFu +vnE hUm -fxD -qtB -gGj +wsH +usN +sDd dlS -ktc -msb -xKs -nAT +msO +gZt +feh +lFU hgp +chY emc -emc -auo -vKu +jYv +feh uhK rDZ hqB @@ -231374,19 +236382,19 @@ djs djs djs djs -djs -djs +dmB +dmB btn sgP hLl sgP sgP btn -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -231521,9 +236529,6 @@ btn btn btn btn -btn -btn -wJr wJr wJr wJr @@ -231535,48 +236540,51 @@ rIA mJo djE djE +qfg +heT +hMJ tqq -iHx -rIA -mJo -mJo -mJo -fkG -obG +mua +gLa +ebt +ebt +ebt +ebt +ebt deP ebt ebt ebt -eTZ -vci -gDP ebt +ebt +ebt +qAi xla mJo uVh wlf aVg -sbx -rwQ -dSv -qwI -aGE -aDy -lER -fjq +fmM +qsv +usN +nBO +gBt +msO +wTs feh +lZT rWa -bEX +jVc xXL -fdp +xch feh -qgh -qgh -qgh -qgh -qgh -qgh -qgh +jck +jck +jck +jck +hxL +hxL +hxL sgP sgP sgP @@ -231630,20 +236638,20 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn sgP hLl sgP sgP btn -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -231778,9 +236786,6 @@ btn btn btn btn -btn -btn -wJr wJr wJr mkL @@ -231790,50 +236795,53 @@ dwJ rIA rIA mJo -kVM -iIX -dDl -xZo -oPu -mua -vqW -sgx -pAB -puj -qvv -qvv -qvv -qvv -aPB -vQB -wEQ +qOG +bif +gFq +rQZ +lAG +nQx +tTu +ebt +ebt +ebt +ebt +ebt +ebt +ebt +ebt +ebt +ebt +ebt +ebt +ebt qAi -hYd +cPE kNi uVh rYF -roL -sbx -rwQ -xvd +eFu +meg +csW +fxD oiu nfk -pXa -xvd +pyL xvd jck +lzs +gdR +eDt +kkd +gDP +lbe jck +smN +rbT jck -jck -xQI -jck -qgh -hns -nWZ -mhv -bEB -hns -qgh +sgP +sgP +sgP sgP sgP sgP @@ -231887,31 +236895,31 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +btn btn sgP hLl sgP sgP btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -232035,9 +237043,6 @@ btn btn btn btn -btn -btn -wJr wJr wJr mkL @@ -232051,46 +237056,49 @@ djE djE hyS sQg +aeG +dev +riK uTx -meg -sXs -eus -ebt -eLV ebt ebt ebt ebt ebt -ebt -dMO -ebt -ebt +aER +oPu +oPu +oPu +oPu +oPu +oPu +rHo +oPu xky kAW aYw quj ntu -fmM +wdz mPH sYL iWN cnW idC -hgY -uCJ -tqc -ngz jck -smN -rbT +par +xit +fZj +wAK +sQY +xch +xQI +phx +sPL jck -loX -mhv -tOV -dAS -dAS -qgh +sgP +sgP +sgP sgP sgP sgP @@ -232143,34 +237151,34 @@ djs djs djs djs -djs -djs -btn +dmB +dmB btn btn sgP +sgP hLl sgP sgP btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -232292,9 +237300,6 @@ btn btn btn btn -btn -btn -wJr wJr wJr mkL @@ -232308,46 +237313,49 @@ mJo mJo mJo mJo +mJo +pAk +giz duB -meg -xpV -qhB ebt -eLV ebt ebt ebt +bGv +dFd +ebt +ebt ebt ebt xKX -ebt -ebt +bGv +qAi ebt xzM uVh eRe -nFI -xbN +roL +tgB bQv -gGo -wOZ -qkx -usM -rox -gvR -ulb -jiu -bcC +pGQ +aWx +lER +nez +lsl jck -dQT -sPL +uKR +ehh +fVM +ljH +hDY +vDe jck -eEM -mhv -lyD -ozX -ozX -qgh +xch +uSo +jck +sgP +sgP +sgP sgP sgP sgP @@ -232400,34 +237408,34 @@ djs djs djs djs -djs -djs +dmB +dmB btn sgP sgP +mST +cdS sgP -hLl -sgP -sgP +eKi btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -232549,9 +237557,6 @@ btn btn btn btn -btn -btn -wJr wJr wJr mkL @@ -232560,51 +237565,54 @@ rIA rIA rIA rIA -duB -uTx -uTx -uTx -uTx -uIW -aER -nLA -vXV -sXs -aTA -cpF +rIA +rIA +rIA +rIA +rIA +rIA +wIi +uIg +oTs ebt ebt ebt ebt ebt ebt -gdR -xKX +ebt +ebt +ebt +ebt +ebt +ebt +hQb +aFl pZD uVh xrU xwL owE -bQv -eNq +oBW +pGQ fwB -bfb -gxb -aai -auP -iiv -tHu +oKT +oPn +piP +jck +jck +jck wMv +xKs jck -xch -uSo jck -dSx -mhv -lyD -ozX -ozX -qgh +jck +jck +jck +jck +sgP +sgP +sgP sgP sgP sgP @@ -232657,36 +237665,36 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +btn +sgP +mST +cdS sgP sgP +btn +btn +dmB +dmB +dmB +dmB +nhp +ddB +ddB +ddB +ddB +ddB +ddB +ddB +ddB +ddB sgP -hLl -btn -btn -btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +ddB +ddB +ddB +ddB +ddB djs djs djs @@ -232806,9 +237814,6 @@ btn btn btn btn -btn -btn -wJr wJr wJr mkL @@ -232817,18 +237822,15 @@ puf puf qNs rIA -oXd +rIA mJo mJo mJo mJo +vXV +ipn +uCh xWG -wtJ -ssz -edq -fRG -aTA -bOM ebt ebt ebt @@ -232836,32 +237838,38 @@ ebt ebt ebt ebt -hQb +ebt +sLV +eTZ +xOF +xOF +xOF +ebt mpx gbP -sCt +pFX vYn -ctl +blp +wWV gbP -gGo -gEp -fpT -hyK -kbT +dsO +xwg +uIW +giQ mQc -ngl +mbI xFB cFG -jck -jck -jck -qgh -rJb -mhv -eaT -mhv -mvT -qgh +dSx +eqw +eWA +nvh +dAS +wQi +jUV +jUV +jUV +sgP sgP sgP sgP @@ -232914,36 +237922,36 @@ djs djs djs djs -djs -djs +dmB +dmB btn sgP -sgP -sgP hLl -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +sgP +sgP +btn +btn +dmB +dmB +dmB +dmB +dmB +sgP +ddB +sgP +sgP +sgP +edD +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +ddB djs djs djs @@ -233063,9 +238071,6 @@ btn btn btn btn -btn -btn -wJr wJr wJr wJr @@ -233074,51 +238079,54 @@ uTU uTU dwJ rIA -oXd +rIA mJo +jKJ +oXd +qqS nrY ipn qRu -uuA -lLd -qAi -cAa -mNR -nlP -iEI -sgx -bOM -ebt -xKX +xWG ebt ebt ebt ebt +ebt +ebt +ebt +ebt +fRG +nvZ +jxy +jof +nVr +nzN tFW -uXe +aSC iNZ pXS -ppw -gbP -xvd -edx -xvd -mjH -qkx +sLl +eME +nHR +jxt +alN +gON +eEi hwu -dhs -bvO -qbK -mVE -lPw -uub -qgh -syw -mhv +aiD +oWm +rkk +tnt +tmQ +vHs +nvh +qQd +eRk +oPU bsV -mhv -nZz -qgh +jUV +sgP sgP sgP sgP @@ -233171,36 +238179,36 @@ djs djs djs djs -djs -djs +dmB +dmB btn sgP -sgP -sgP hLl +sgP btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +btn +dmB +dmB +dmB +dmB +dmB +dmB +sgP +ddB +sgP +bDb +vDc +njT +sgP +bDb +vDc +njT +sgP +bDb +pwO +njT +sgP +ddB djs djs djs @@ -233320,9 +238328,6 @@ btn btn btn btn -btn -btn -wJr wJr wJr wJr @@ -233331,51 +238336,54 @@ uTU uTU dwJ rIA -oXd +rIA mJo -xit -vzN -qRu -uuA -lLd +qKE +tLS +ikK +odE +kib +pAB +aDV +sgx +sgx mNR -cAa -jvr +sgx +sgx +qGu +sgx +sgx mNR -mNR -nKd -oTs -ebt -ebt -ebt -ebt -deP +sgx +sgx +cpF +gaw ebt qcx -blp -oKB +wml +lNo wqN -tiD -gbP -mMi -fsX -xvd -gCj -ikV -vCW -nVJ -rKF -rKF -rKF -rKF -aXw -goh -twA -rVW -ffW -mhv -nZz +fIp qgh +gbP +gbe +ndH +mGO +jyf +ehl +oFR +rKF +mdE +qfQ +oPD +abk +nvh +mnv +rVW +syw +jLA +jUV +sgP sgP sgP sgP @@ -233427,37 +238435,37 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn sgP -sgP -sgP hLl +sgP btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +sgP +sgP +sgP +bDb +vgu +njT +sgP +bDb +vgu +njT +sgP +bDb +bpF +njT +sgP +ddB djs djs djs @@ -233577,9 +238585,6 @@ btn btn btn btn -btn -btn -wJr wJr wJr wJr @@ -233588,51 +238593,54 @@ uTU uTU dwJ rIA -oXd +rIA mJo mJo mJo mJo kqD -hjU -oWm -sgx -aTA -fIp -sgx -aTA -qfg -sgx -sgx -oPU -sgx -sgx +wIi +fmV +oTs +ebt +ebt +oTs +ebt +ebt +oTs +nOu +jvr +mkU +edq +nKd +aDV +dzV jrU dXr -pnU +gbP coV jXp -tqh +bUx +kIX gbP -pyc -fsX -xvd -pyL -mzt -boz +usM +wSO +usM +usM +mvT yaJ -tYS -tYS -tYS -sBe -omK -qgh -qqQ oPn -mhv -mhv -mhv -qgh +uRW +eQm +vci +omK +jzp +cSf +nmb +lLd +qkx +jUV +sgP sgP sgP sgP @@ -233684,37 +238692,37 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn -sgP -sgP -sgP +eKi hLl +sgP btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +sgP +sgP +sgP +bDb +vgu +njT +sgP +bDb +vgu +njT +sgP +bDb +bpF +njT +sgP +ddB djs djs djs @@ -233834,9 +238842,6 @@ btn btn btn btn -btn -btn -wJr wJr wJr wJr @@ -233845,51 +238850,54 @@ uTU uTU dwJ rIA -oXd +rIA oRl uTU uTU dwJ kqD +wIi +dgD +nCz qEx -xqd +xAe +iiN rtO -mNp xqd uJV mNp sfC -vGx -xAe +dQh +nNu hNJ vVU -xAe -xqd +vGx +rwQ cEz -gaw +gbP sVy dzF -lNo +ceR +aZu gbP -tnm -cob -xvd +mFc +dTz doT iiY -eMi +mvT fsV -sJT -mJI -qvQ -pQI +nof +tWj +ttf +tHu vHs -iqi -sKi -sKi -qnH -scB -kzg -qgh +nvh +fIV +kxD +tNc +gKK +jUV +sgP sgP sgP sgP @@ -233941,37 +238949,37 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn sgP -sgP -sgP hLl +eKi btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +sgP +sgP +sgP +bDb +vgu +njT +sgP +bDb +vgu +njT +sgP +bDb +bpF +njT +sgP +sgP djs djs djs @@ -234091,9 +239099,6 @@ djs djs djs btn -btn -wJr -wJr wJr wJr mkL @@ -234102,51 +239107,54 @@ mkL uTU dwJ rIA -oXd +rIA dCM nhw nhw xrB kqD -xQF +dMO +gwL +kOg +ygP +fZg +kOg +ygP +qhB aSu -hjU wIi aSu -hjU -wIi aSu -hjU +jeb +aSu +aSu +jeb xQF -aSu hjU -xQF -aSu -hjU -pnU -sIz gbP +nSq +vcV +wSI +fUH gbP -gbP -haK -dWC -xvd -gXZ -gXZ +asT +snA +avT +xVI eqG -cgQ -xvd -xvd -xvd -oeb -mrD -qgh -xfX -vgY -anw -scB -uMj -qgh +ind +vdQ +aEc +dUl +pkN +vHs +jUV +tsp +mmX +vKu +qHH +jUV +sgP sgP sgP sgP @@ -234198,40 +239206,40 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn sgP -sgP -sgP hLl -btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +sgP +igu +igu +igu +igu +vGi +sgP +cFl +sgP +sgP +sgP +sgP +bDb +vgu +njT +sgP +bDb +vgu +njT +sgP +bDb +bpF +njT +sgP +sgP +ddB +ddB +ddB djs djs djs @@ -234348,9 +239356,6 @@ djs djs djs btn -btn -wJr -wJr wJr wJr mkL @@ -234358,52 +239363,55 @@ mkL mkL uTU dwJ +iCR +rBp +rBp +rBp +rBp +rBp +rQg +rBp rBp -aHp -xap -xap -xap -xap hyf -xap +eus +rBp +hyf +eus nCD -aHp +iEI wur -nCD +kbm aHp -wur -nCD +eus +kbm aHp -xap -nCD -aHp -xap -nCD +eus +rBp faO -evm -rIA -rIA -rIA -uhO -dWC -asT -xvd -xzW -jPx -arY -kiE -eME -xvd -xvd -oeb +gbP +puy +mjo +gbP +gbP +gbP +qXI +rUR +mDl +mWc +usM +lHt +oPn +aTA +jEx +tHu mrD -qgh -qgh -qgh -qgh -qgh -qgh -qgh +jUV +bnc +aXw +lyD +eja +jUV +sgP sgP sgP sgP @@ -234455,40 +239463,40 @@ djs djs djs djs -djs -djs -djs +dmB +dmB +dmB btn sgP -sgP -sgP hLl -btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +sgP +igu +fPm +kjp +bQD +vGi +vGi +vGi +xso +sgP +sgP +sgP +sgP +hGf +sgP +sgP +sgP +hGf +sgP +sgP +sgP +hGf +sgP +sgP +sgP +sgP +sgP +ddB djs djs djs @@ -234605,32 +239613,30 @@ djs djs djs djs -djs -wJr -wJr -wJr +gxb wJr mkL mkL mkL uTU dwJ -oKT -oXd +kWs +rIA mJo iHx iHx mJo kqD +rIA mJo xmi fGD +mJo +xmi +fGD +mJo aLJ -iCR -fGD aLJ -iCR -fGD mJo xmi fGD @@ -234641,25 +239647,27 @@ mJo rIA rIA rIA -xvd -mMi -urX -vcD -hnT -aZu -wdZ -hlm -isc -xvd -xvd -oeb -lsl -xQX -lRR -qgh -ber -dcA -qgh +rIA +rIA +rIA +iqw +coC +wGG +pwy +wvz +usM +wDc +ktc +rUw +aPB +gen +aij +jUV +jUV +jUV +jUV +jUV +jUV sgP sgP sgP @@ -234713,39 +239721,39 @@ djs djs djs djs -djs -djs +dmB +dmB btn sgP +iwB +ajf +jix +gaz +iYM +kcK +ogr +lon +kXn +mRR +mRR +mRR +mRR +hzq +xmC +xmC +xmC +xmC +xmC +nPw +mRR +hzq +xmC +nPw +mRR +mRR +xAh sgP -sgP -hLl -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +ddB djs djs djs @@ -234862,62 +239870,62 @@ djs djs djs djs -djs -wJr -wJr -wJr +gxb wJr wJr wJr mkL uTU dwJ -oKT -dIi -sQg -ilI +kWs +rIA +iHx +rUh rVk iHx kqD -mJo -hrf -lWf -mJo -kJZ -aWc -mJo -nJq -xlV -mJo -eOr -hSC +rIA mJo vkL +lWf +mJo +qoZ +aWc +mJo +uuA +xlV +mJo +kJZ +hSC +mJo +nJq fZk mJo rIA rIA -xvd -xvd -xvd -cpn -xvd -nos -lKP -tem -ost -qoG -xvd -xvd -uSN -cSU -kFr -jEi -qgh -sYx -dti -qgh -sgP +rIA +rIA +rIA +rIA +iqw +mvT +mvT +uuD +gGo +prz +mhU +nof +gGb +vEj +pkN +vHs +jqI +iIX +bOM +bOM +bOM +bOM +bOM sgP sgP btn @@ -234970,39 +239978,39 @@ djs djs djs djs -djs -djs +dmB +dmB btn sgP sgP sgP -hLl -btn -btn -btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +mVC +cYD +aUB +fNs +vGi +vGi +vGi +xso +sgP +sgP +sgP +sgP +kjF +sgP +sgP +sgP +kjF +sgP +sgP +sgP +kjF +sgP +sgP +sgP +sgP +sgP +ddB djs djs djs @@ -235119,62 +240127,62 @@ djs djs djs djs -djs -wJr -wJr -wJr +gxb wJr wJr mkL mkL uTU dwJ -cXl -xap -eQm -ilI +efn +rBp +ppy +cOo rVk iHx kqD +rIA +mJo +nlP +oqN mJo -jKJ ayT +cwr mJo -hni cLN +eet mJo -ndH bTI +ntZ mJo -okv qeA +tQl mJo -qMm -wNw -mJo -qYT -myK -qWt -mlb -bbg -uJv -sIe -xDw -lKP -lKP -lKP +rIA +rIA +rIA +rIA +rIA +rIA +uhO +xQe +urX +hGj +gGo +mvT +uti +dcZ +ppr gXG -gYY -xvd -xvd -xvd -vcx -gGT -cbF -uOr -jfg -qgh -sgP +vQB +rpq +pya +bOM +gjX +pku +loX +loX +bOM sgP btn btn @@ -235227,39 +240235,39 @@ djs djs djs djs -djs -djs +dmB +dmB btn sgP sgP sgP -hLl +igu +igu +igu +igu +vGi +sgP +pra sgP sgP -btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +sgP +sgP +bDb +wVj +njT +sgP +bDb +wVj +njT +sgP +bDb +mtb +njT +sgP +sgP +ddB +ddB +ddB djs djs djs @@ -235376,10 +240384,7 @@ djs djs djs djs -djs -wJr -wJr -wJr +gxb wJr wJr mkL @@ -235393,6 +240398,7 @@ iHx iHx mJo kqD +rIA mJo mJo mJo @@ -235409,29 +240415,31 @@ mJo mJo mJo mJo -wJU -xJE +rIA +rIA +rIA +rIA +rIA +sJT +sJT +sJT +sJT +sJT +sJT +kmI +wta qSc -kNm -fdE -lKP -gRw -lKP -lKP -lKP -lKP -xHL -jXG -dng -vJx -xvd -oeb -dEH -qgh -qgh -qgh -qgh -sgP +sJT +qSc +jzE +qSc +sJT +bOM +xAk +dWC +loX +loX +bOM sgP btn btn @@ -235443,6 +240451,7 @@ btn btn btn btn +dmB djs djs djs @@ -235482,38 +240491,37 @@ djs djs djs djs -djs -djs -djs -djs +dmB +dmB +dmB btn sgP sgP sgP -hLl -sgP -sgP btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +sgP +sgP +sgP +bDb +wVj +njT +sgP +bDb +wVj +njT +sgP +bDb +mtb +njT +sgP +sgP djs djs djs @@ -235633,10 +240641,7 @@ djs djs djs djs -djs -wJr -wJr -wJr +gxb wJr wJr wJr @@ -235651,6 +240656,8 @@ uTU dwJ kqD rIA +rIA +rIA oRl uTU uTU @@ -235664,113 +240671,114 @@ uTU uTU uTU uTU -uTU dwJ -qYT -fdW -qSc -oBO -mtx -jSQ -rcO -gIt -gIt -gIt -jjE -ktf -ugX -emu -ums -xvd -oeb -pku -qSc -sgP -sgP +rIA +rIA +rIA +rIA +rIA +sJT +sIz +eOr +wWG +pTv +mWH +wWG +mKI +xZo +pod +cVQ +hrf +hNR +wNw +ugm +nMD +haK +tOV +tOV +bOM +btn +btn +btn +btn +btn +btn +btn +btn +btn +btn +btn +dmB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +dmB +dmB +btn +btn sgP sgP btn -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -btn -btn -btn -sgP -hLl +dmB +dmB +dmB +dmB +dmB +dmB +dmB sgP sgP -btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +sgP +bDb +wVj +njT +sgP +bDb +wVj +njT +sgP +bDb +mtb +njT +sgP +ddB djs djs djs @@ -235890,10 +240898,7 @@ djs djs djs djs -djs -wJr -wJr -wJr +gxb wJr wJr wJr @@ -235908,6 +240913,8 @@ nhw xrB kqD rIA +rIA +rIA dCM nhw nhw @@ -235921,31 +240928,32 @@ nhw nhw nhw nhw -nhw xrB -wJU -xJE +rIA +rIA +rIA +rIA +rIA qSc -oBO -yaZ -wSI -xbi -pya -pya -pya -xbi -aXz -owe -ugm -sLl -xvd -gFA -pku -qSc -sgP -sgP -sgP -sgP +ilI +ntP +lSv +lSv +lSv +lSv +bLd +lSv +lSv +lSv +lSv +brH +nnG +rdq +dWC +dls +bEB +bEB +bOM sgP btn btn @@ -235998,36 +241006,36 @@ djs djs djs djs -djs -djs -djs -djs +dmB +dmB btn sgP -hLl sgP sgP btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +sgP +sgP +sgP +bDb +wVj +njT +sgP +bDb +wVj +njT +sgP +bDb +mtb +njT +sgP +ddB djs djs djs @@ -236147,15 +241155,12 @@ djs djs djs djs -djs -wJr -wJr +gxb wJr wJr wJr mkL mkL -puf qNs rIA rIA @@ -236163,7 +241168,10 @@ rIA rIA rIA rIA -snA +veM +rZp +rZp +rZp rZp rZp rZp @@ -236181,110 +241189,110 @@ rZp rZp rZp tRu -keB -qKp -utZ -ukA -gNS -xbi -eWA -xDD -eGS -mhU -xbi -xvd -xgN -sLl -xvd -jbu -pku -qSc +rZp +rZp +bUs +kVM +dDl +vqW +lcs +xAa +pJp +rCp +psi +tdg +psi +psi +hrP +gGj +bOM +wEQ +dWC +dWC +bEB +bOM +btn +btn +btn +btn +btn +btn +btn +btn +btn +btn +btn +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +dmB +dmB +btn +sgP +sgP +sgP +btn +dmB +dmB +dmB +dmB +dmB +dmB +dmB sgP sgP sgP -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -btn +bDb +vqT +njT sgP -hLl +bDb +vqT +njT sgP +bDb +vqT +njT sgP -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +ddB djs djs djs @@ -236404,15 +241412,12 @@ djs djs djs djs -djs -wJr -wJr +gxb wJr wJr wJr mkL mkL -uTU dwJ rIA rIA @@ -236420,7 +241425,10 @@ rIA rIA rIA rIA -kqD +rIA +rIA +rIA +rIA rIA rIA rIA @@ -236436,112 +241444,112 @@ rIA qYT xJE qYT -myK xJE -piP +qYT +xJE +rIA qSc -kcW -qYe -pbN -xbi -nCS -nCS -nCS -jVd -gjX -pos -fvn -sLl -uoK -uAM -pmx -qSc -sgP +ilI +kDy +akO +qMm +txO +kgi +bhj +iPW +txO +jlY +jlY +aDy +fkG +bOM +eEM +kzg +vgY +bEB +bOM +btn +btn +btn +btn +btn +btn +btn +btn +btn +btn +btn +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +dmB +dmB +btn +btn sgP btn btn -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -btn +dmB +dmB +dmB +dmB +dmB +dmB +dmB +sgP +ddB +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP sgP -hLl sgP sgP -btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs djs djs djs @@ -236661,13 +241669,10 @@ djs djs djs djs -djs +gxb wJr wJr wJr -wJr -wJr -mkL mkL mkL uTU @@ -236676,8 +241681,11 @@ puf puf puf puf +puf qNs -kqD +rIA +rIA +rIA rIA gJX puf @@ -236690,115 +241698,115 @@ puf puf qNs qYT +obG +mqp +mqp mqp mqp mqp myK -mqp -fdW -qSc -kcW -qYe -pbN -jzR -xYS -vpd -xYS -feP -xYS -tce -wSO -arn -uRa -aWL -vyx -xvd +qWt +adi +dSl +lor +lor +xbi +fSN +dDb +nCf +xbi +lcX +dNu +aDy +fkG +bOM +bOM +bOM +bOM +bOM +bOM +btn +btn +btn +btn +btn +btn +btn +btn +dmB +dmB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +dmB +dmB +btn +btn +btn +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB sgP -sgP -btn -btn -btn -btn -btn -btn -btn -btn -btn -btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -btn -sgP -hLl -sgP -sgP -btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +ddB +ddB +ddB +ddB +ddB +ddB +ddB +ddB +ddB +ddB +ddB +ddB +ddB +ddB +ddB djs djs djs @@ -236934,7 +241942,7 @@ uTU uTU uTU dwJ -kqD +rIA rIA oRl uTU @@ -236947,33 +241955,33 @@ uTU uTU dwJ wJU +obG +mqp mqp mqp mqp -myK mqp xJE -qSc -kcW -qYe -pbN +sJT +ilI +gOX +uub xbi -xYv -xYv -xYv -aBj -rke -sYc -jzE -sLl -uoK -jLA -tQA -xvd -sgP -sgP -sgP -btn +bTA +qAy +fvn +wak +wZg +xbi +uub +uDO +kdO +gdQ +lHV +cXl +qqT +whC +sJT btn btn btn @@ -236982,6 +241990,8 @@ btn btn btn btn +dmB +dmB djs djs djs @@ -237025,30 +242035,28 @@ djs djs djs djs -djs -djs -djs -djs -djs -btn -sgP -hLl -sgP -sgP -btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -237191,7 +242199,7 @@ uTU uTU uTU dwJ -kqD +rIA rIA oRl uTU @@ -237204,33 +242212,33 @@ uTU uTU dwJ qYT +obG +mqp mqp mqp mqp -myK mqp fdW qSc -kNm -rSj -hIt -xbi -vwA -phx -phx -lnG -xbi -xvd -wRR -sLl -xvd -jCY -pku +ilI +iCi +xHL +qFf +jPx +wOZ +xYS +qtB +xDD +qFf +xHL +wHX +fkG qSc -sgP -sgP -sgP -sgP +ssz +tGS +kFH +frp +sJT btn btn btn @@ -237239,6 +242247,8 @@ btn btn btn btn +dmB +dmB djs djs djs @@ -237283,30 +242293,28 @@ djs djs djs djs +dmB +dmB +dmB +dmB +dmB djs djs djs -djs -btn -sgP -hLl -sgP -sgP -btn -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -237448,7 +242456,7 @@ uTU uTU uTU dwJ -kqD +rIA rIA oRl uTU @@ -237461,33 +242469,33 @@ uTU uTU dwJ wJU +obG +mqp mqp mqp mqp -myK mqp xJE +sJT +dsB +iCi +xHL +qFf +jPx +wOZ +xYS +qtB +xDD +qFf +knJ +wHX +fkG qSc -kNm -xiB -wSI -xbi -xAS -xAS -xAS -xbi -qVP -ucu -pnV -wDc -xvd -oeb -pku -qSc -sgP -sgP -btn -btn +ssz +tGS +kFH +vBn +sJT btn btn btn @@ -237496,6 +242504,7 @@ btn btn btn btn +dmB djs djs djs @@ -237545,15 +242554,6 @@ djs djs djs djs -sgP -hLl -sgP -sgP -btn -djs -djs -djs -djs djs djs djs @@ -237564,6 +242564,14 @@ djs djs djs djs +dmB +dmB +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -237705,7 +242713,7 @@ uTU uTU uTU dwJ -kqD +rIA rIA oRl uTU @@ -237718,33 +242726,33 @@ uTU uTU dwJ qYT +obG +obG +obG +obG +obG +mqp fdW -wJU -fdW -qYT -vYJ -vYJ -qWt -fym -rJB -pYW -oNC -jYE -aVU -jYE -xYt -gPG -bhm -xCI -qHH -xvd -gFA -pku +sJT +ilI +uyz +xHL +qFf +oKB +wOZ +xYS +qtB +dVF +qFf +xHL +bHA +fkG qSc -sgP -sgP -sgP -sgP +ssz +tGS +bvp +wgl +sJT btn btn btn @@ -237753,6 +242761,7 @@ btn btn btn btn +dmB djs djs djs @@ -237799,14 +242808,6 @@ djs djs djs djs -btn -btn -btn -sgP -hLl -sgP -sgP -btn djs djs djs @@ -237823,6 +242824,13 @@ djs djs djs djs +dmB +dmB +dmB +dmB +djs +djs +djs djs djs djs @@ -237962,7 +242970,7 @@ uTU uTU uTU dwJ -kqD +rIA rIA oRl uTU @@ -237975,33 +242983,33 @@ uTU uTU dwJ wJU -myK -myK -myK fdW wJU fdW -xvd -vcV -eja -jzp -awR -aif -awR -aif -awR -aif -awR -kTo -xZj -xvd -igp -pku -qSc -sgP -sgP -sgP -sgP +wJU +fdW +wJU +myK +qWt +ycp +dIi +uub +xbi +xbi +ath +jzR +iqB +xbi +xbi +uub +qhi +tCE +rfM +stp +igB +dQR +xIv +sJT btn btn btn @@ -238056,14 +243064,14 @@ djs djs djs djs -btn -sgP -sgP -sgP -hLl -sgP -sgP -btn +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -238219,7 +243227,7 @@ uTU uTU uTU dwJ -kqD +rIA rIA oRl uTU @@ -238234,31 +243242,31 @@ dwJ rIA rIA rIA -rBp -xap -xap -xap -kGB -unL -jUV -jRt -rJI -rJI -hJT -rJI -vLX -lJd -rJF -nvh -xzD -xvd -oeb -pku +rIA +rIA +rIA +rIA +rIA +sJT +ilI +cFY +sNl +xFJ +hni +abR +pnU +wok +hni +rYe +aBE +aqo +fkG +sJT qSc -sgP -sgP -sgP -btn +qSc +qSc +sJT +sJT btn btn btn @@ -238267,6 +243275,14 @@ btn btn btn btn +dmB +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -238313,14 +243329,6 @@ djs djs djs djs -btn -sgP -sgP -sgP -hLl -sgP -sgP -btn djs djs djs @@ -238476,7 +243484,7 @@ uTU uTU uTU dwJ -kqD +rIA rIA oRl uTU @@ -238491,27 +243499,27 @@ dwJ rIA rIA rIA -bif rIA rIA rIA -xvd -xvd -xvd -xvd -xvd -xvd -xvd -wfe -oRY -xvd -xvd -xvd -xvd -xvd -pOD -pku -qSc +rIA +rIA +sJT +ilI +pmV +lPT +mwp +nLA +pFI +mQC +uvW +nLA +mwp +pXV +bJg +mRz +bvq +wfk sgP sgP sgP @@ -238570,14 +243578,14 @@ djs djs djs djs -btn -sgP -sgP -sgP -hLl -btn -btn -btn +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -238733,7 +243741,7 @@ uTU uTU uTU dwJ -kqD +rIA rIA oRl uTU @@ -238750,25 +243758,26 @@ rIA rIA rIA rIA -gJX -puf -puf -hSV -ylO -rAG -xAx -fRe -yai -lZS -axM -vzB -xmh -uVL -pWB -hOy -rmI -wBr -xvd +rIA +rIA +rIA +sJT +fJD +lkA +dnJ +wkN +lKP +xGV +eYU +acW +hRR +wkN +nQu +uYh +byA +sJT +gnU +sgP sgP sgP sgP @@ -238780,7 +243789,6 @@ btn btn btn btn -btn djs djs djs @@ -238827,12 +243835,12 @@ djs djs djs djs -btn -sgP -sgP -sgP -hLl -btn +djs +djs +djs +djs +djs +djs djs djs djs @@ -238990,7 +243998,7 @@ nhw nhw nhw xrB -kqD +rIA rIA dCM nhw @@ -239007,25 +244015,26 @@ rIA rIA rIA rIA -xrK -hSV -hSV -hSV -oLd -hSV -vcZ -qUo -aCi -tLo -gIX -jDU -jpl -wPV +rIA +rIA +rIA +sJT +sJT +qSc dkb -eyS -jWV -jqy -xvd +qSc +sJT +qSc +qSc +qSc +sJT +qSc +dkb +qSc +sJT +sJT +gnU +sgP sgP sgP sgP @@ -239037,7 +244046,6 @@ btn btn btn btn -btn djs djs djs @@ -239084,12 +244092,12 @@ djs djs djs djs -btn -sgP -sgP -sgP -hLl -btn +djs +djs +djs +djs +djs +djs djs djs djs @@ -239247,42 +244255,43 @@ rIA rIA rIA rIA -veM -rZp -rZp -rZp -rZp -rZp -rZp -rZp -rZp -rZp -rZp -rZp -rZp -rZp -rZp -rZp -wHX -xrK -mxz -dCn -hoz -cFI -kIX -wGk -qUo +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +rIA +sJT +nUO +fTS +pLI +jfY +roM sfX -ykE -sfX -qUo -bsJ -gPu -hSV -xvd -xvd -xvd -xvd +hbi +rvl +pLI +fTS +nJe +sJT +sgP +gnU +sgP sgP sgP sgP @@ -239292,7 +244301,12 @@ btn btn btn btn -btn +dmB +djs +djs +djs +djs +djs djs djs djs @@ -239341,12 +244355,6 @@ djs djs djs djs -btn -sgP -sgP -sgP -hLl -btn djs djs djs @@ -239520,25 +244528,26 @@ rIA rIA rIA rIA -kqD -xrK -mxz -teW -jwd -ksE -xCv -xsB -qUo -sfX -ykE -sfX -qUo -bsJ -eYC -hsd -sgP -sgP +rIA +rIA +rIA +rIA +rIA +qSc +cAa +lJP +cmM +keB +jnO +lqB +tcN +sud +wfW +juW +ceI +qSc sgP +gnU sgP sgP sgP @@ -239549,7 +244558,12 @@ btn btn btn btn -btn +dmB +dmB +djs +djs +djs +djs djs djs djs @@ -239598,12 +244612,6 @@ djs djs djs djs -btn -sgP -sgP -sgP -hLl -btn djs djs djs @@ -239777,25 +244785,26 @@ puf puf qNs rIA -kqD -xrK -mxz -jti -jZl -fmu -wGG -bxp +rIA +rIA +rIA +rIA +rIA +qSc +dnC +pGz qUo -sfX iNd +dQR sfX -qUo -bsJ +uSg +dnC aYT -hsd -sgP -sgP +loi +iNd +qSc sgP +ucD sgP sgP sgP @@ -239806,7 +244815,12 @@ btn btn btn btn -btn +dmB +djs +djs +djs +djs +djs djs djs djs @@ -239855,12 +244869,6 @@ djs djs djs djs -btn -sgP -sgP -sgP -hLl -btn djs djs djs @@ -240034,23 +245042,24 @@ uTU uTU dwJ rIA -kqD -sSS -hSV -pLQ -hSV -hSV -hSV -qmw +rIA +rIA +rIA +rIA +rIA +qSc +mLG +jcJ qUo -sfX -roM -eND -eKH -bsJ -gLN -hSV -sgP +iNd +gDI +mrv +sSy +dnC +sXs +eYC +bsz +qSc sgP sgP sgP @@ -240063,7 +245072,28 @@ btn btn btn btn -btn +dmB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -240112,12 +245142,6 @@ djs djs djs djs -btn -sgP -sgP -sgP -hLl -btn djs djs djs @@ -240130,22 +245154,6 @@ djs djs djs djs -nhp -ddB -ddB -ddB -ddB -ddB -ddB -ddB -ddB -ddB -sgP -ddB -ddB -ddB -ddB -ddB djs djs djs @@ -240290,24 +245298,25 @@ uTU uTU uTU dwJ -qYT -aiZ -jIi -vDe -uFD -upj -wQi -dpb -jyf -qUo -sfX -pJf -sfX -qUo -bsJ -ekz -hSV -sgP +rIA +rIA +rIA +rIA +rIA +rIA +sJT +rmk +pLI +pLI +iNd +mrv +ipU +mrv +dnC +pLI +pLI +rOM +sJT sgP sgP sgP @@ -240320,7 +245329,28 @@ btn btn btn btn -btn +dmB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -240369,12 +245399,6 @@ djs djs djs djs -btn -sgP -sgP -sgP -hLl -btn djs djs djs @@ -240387,22 +245411,6 @@ djs djs djs djs -sgP -ddB -sgP -sgP -sgP -edD -sgP -sgP -sgP -sgP -sgP -sgP -sgP -sgP -sgP -ddB djs djs djs @@ -240547,25 +245555,25 @@ uTU uTU uTU dwJ -piP -kqD -jez -cWW -jez -cWW -jez -jqI -qkO -qUo -sfX -sfX -sfX -qUo -bsJ -syL -hSV -sgP -sgP +rIA +rIA +rIA +rIA +rIA +rIA +sJT +sJT +qSc +qSc +qSc +sJT +sJT +sJT +qSc +qSc +qSc +sJT +sJT sgP sgP btn @@ -240578,6 +245586,29 @@ btn btn btn btn +dmB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -240626,13 +245657,6 @@ djs djs djs djs -btn -sgP -sgP -sgP -hLl -btn -btn djs djs djs @@ -240644,22 +245668,6 @@ djs djs djs djs -sgP -ddB -sgP -bDb -vDc -njT -sgP -bDb -vDc -njT -sgP -bDb -pwO -njT -sgP -ddB djs djs djs @@ -240804,23 +245812,23 @@ uTU uTU uTU dwJ -piP -kqD -aiT -pkH -akz -vDe -jIi -hSV -azH -qUo -sfX -sfX -sfX -qUo -bsJ -wCJ -hsd +rIA +rIA +rIA +rIA +rIA +rIA +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP sgP sgP sgP @@ -240884,13 +245892,6 @@ djs djs djs djs -sgP -sgP -sgP -hLl -sgP -btn -btn djs djs djs @@ -240901,22 +245902,29 @@ djs djs djs djs -sgP -sgP -sgP -bDb -vgu -njT -sgP -bDb -vgu -njT -sgP -bDb -bpF -njT -sgP -ddB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -241061,23 +246069,23 @@ uTU uTU uTU dwJ -piP -kqD -sSS -cRm -wvz -kMf -kMf -gLe -wgo -jDU -jDU -jDU -jDU -jDU -aLk -mmX -hSV +rIA +rIA +rIA +rIA +rIA +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP sgP sgP sgP @@ -241140,13 +246148,6 @@ djs djs djs djs -btn -btn -btn -sgP -hLl -sgP -btn djs djs djs @@ -241158,22 +246159,29 @@ djs djs djs djs -sgP -sgP -sgP -bDb -vgu -njT -sgP -bDb -vgu -njT -sgP -bDb -bpF -njT -sgP -ddB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -241318,23 +246326,23 @@ uTU uTU uTU dwJ -wJU -aiZ -myK -myK -uhZ -fdW -wJU -jqI -gwa -mlY -qUo -qUo -cRf -qUo -bsJ -tmd -hSV +rIA +rIA +rIA +rIA +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP sgP sgP sgP @@ -241399,12 +246407,6 @@ djs djs djs djs -btn -sgP -hLl -sgP -btn -btn djs djs djs @@ -241415,22 +246417,28 @@ djs djs djs djs -sgP -sgP -sgP -bDb -vgu -njT -sgP -bDb -vgu -njT -sgP -bDb -bpF -njT -sgP -sgP +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -241576,22 +246584,22 @@ uTU uTU dwJ rIA -veM -rZp -rZp -dhh -rZp -rZp -gqE -wMp -wMp -jkj -jkj -wUd -qMB -jDD -fCS -hSV +rIA +rIA +rIA +rIA +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP sgP sgP sgP @@ -241656,41 +246664,41 @@ djs djs djs djs -btn -sgP -hLl -sgP -sgP -igu -igu -igu -igu -vGi -sgP -cFl -sgP -sgP -sgP -sgP -sgP -sgP -sgP -bDb -vgu -njT -sgP -bDb -vgu -njT -sgP -bDb -bpF -njT -sgP -sgP -ddB -ddB -ddB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -241836,19 +246844,19 @@ rIA rIA rIA rIA -oXd +rIA rIA mkL -hSV -hSV -hSV -hSV -hSV -hSV -hSV -hSV -hSV -hSV +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP +sgP sgP sgP sgP @@ -241913,41 +246921,41 @@ djs djs djs djs -btn -sgP -hLl -sgP -sgP -igu -fPm -kjp -bQD -vGi -vGi -vGi -xso -sgP -sgP -sgP -sgP -sgP -sgP -sgP -hGf -sgP -sgP -sgP -hGf -sgP -sgP -sgP -hGf -sgP -sgP -sgP -sgP -sgP -ddB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -242093,7 +247101,7 @@ rIA rIA rIA rIA -oXd +rIA mkL mkL wJr @@ -242170,41 +247178,41 @@ djs djs djs djs -btn -sgP -iwB -ajf -ajf -jix -gaz -iYM -kcK -ogr -lon -kXn -mRR -mRR -mRR -mRR -mRR -mRR -mRR -hzq -xmC -xmC -xmC -xmC -xmC -nPw -mRR -hzq -xmC -nPw -mRR -mRR -xAh -sgP -ddB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -242350,7 +247358,7 @@ rIA rIA rIA rIA -abg +rIA mkL wJr wJr @@ -242427,41 +247435,41 @@ djs djs djs djs -btn -btn -sgP -sgP -sgP -mVC -cYD -aUB -fNs -vGi -vGi -vGi -xso -sgP -sgP -sgP -sgP -sgP -sgP -sgP -kjF -sgP -sgP -sgP -kjF -sgP -sgP -sgP -kjF -sgP -sgP -sgP -sgP -sgP -ddB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -242686,39 +247694,39 @@ djs djs djs djs -sgP -sgP -sgP -igu -igu -igu -igu -vGi -sgP -pra -sgP -sgP -sgP -sgP -sgP -sgP -sgP -bDb -wVj -njT -sgP -bDb -wVj -njT -sgP -bDb -mtb -njT -sgP -sgP -ddB -ddB -ddB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -242942,11 +247950,6 @@ djs djs djs djs -btn -btn -btn -btn -btn djs djs djs @@ -242957,22 +247960,27 @@ djs djs djs djs -sgP -sgP -sgP -bDb -wVj -njT -sgP -bDb -wVj -njT -sgP -bDb -mtb -njT -sgP -sgP +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -243214,22 +248222,22 @@ djs djs djs djs -sgP -sgP -sgP -bDb -wVj -njT -sgP -bDb -wVj -njT -sgP -bDb -mtb -njT -sgP -ddB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -243471,22 +248479,22 @@ djs djs djs djs -sgP -sgP -sgP -bDb -wVj -njT -sgP -bDb -wVj -njT -sgP -bDb -mtb -njT -sgP -ddB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -243728,22 +248736,22 @@ djs djs djs djs -sgP -sgP -sgP -bDb -vqT -njT -sgP -bDb -vqT -njT -sgP -bDb -vqT -njT -sgP -ddB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -243985,22 +248993,22 @@ djs djs djs djs -sgP -ddB -sgP -sgP -sgP -sgP -sgP -sgP -sgP -sgP -sgP -sgP -sgP -sgP -sgP -sgP +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -244242,22 +249250,22 @@ djs djs djs djs -sgP -ddB -ddB -ddB -ddB -ddB -ddB -ddB -ddB -ddB -ddB -ddB -ddB -ddB -ddB -ddB +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs +djs djs djs djs @@ -245190,12 +250198,12 @@ btn btn btn btn -djs -djs -djs -djs -djs -djs +dmB +dmB +dmB +dmB +dmB +dmB djs djs djs @@ -245447,10 +250455,10 @@ btn btn btn btn -djs -djs -djs -djs +dmB +dmB +dmB +dmB djs djs djs diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 730786b2c0..346dba8172 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -190,6 +190,8 @@ #define ORGAN_SLOT_BUTT "butt" // GS13 EDIT #define ORGAN_SLOT_BELLY "belly" +// GS13 EDIT +#define ORGAN_SLOT_TAUR_BELLY "taur_belly" ////organ defines #define STANDARD_ORGAN_THRESHOLD 100 diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index c2021a86f2..d389d22d8d 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -66,6 +66,7 @@ #define ACCESS_CLONING 68 //Cloning room and clone pod ejection #define ACCESS_ENTER_GENPOP 69 #define ACCESS_LEAVE_GENPOP 70 +#define ACCESS_PSYCH 71 //GS13: Psychology room doors //BEGIN CENTCOM ACCESS /*Should leave plenty of room if we need to add more access levels. diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm index a5b36e862e..d8fbff214e 100644 --- a/code/__DEFINES/citadel_defines.dm +++ b/code/__DEFINES/citadel_defines.dm @@ -9,11 +9,12 @@ #define BUTT_LAYER_INDEX 1 #define VAGINA_LAYER_INDEX 2 #define TESTICLES_LAYER_INDEX 3 -#define BELLY_LAYER_INDEX 4 -#define GENITAL_LAYER_INDEX 5 -#define PENIS_LAYER_INDEX 6 +#define TAUR_BELLY_LAYER_INDEX 4 +#define BELLY_LAYER_INDEX 5 +#define GENITAL_LAYER_INDEX 6 +#define PENIS_LAYER_INDEX 7 -#define GENITAL_LAYER_INDEX_LENGTH 6 //keep it updated with each new index added, thanks. +#define GENITAL_LAYER_INDEX_LENGTH 7 //keep it updated with each new index added, thanks. //genital flags #define GENITAL_BLACKLISTED (1<<0) //for genitals that shouldn't be added to GLOB.genitals_list. @@ -72,6 +73,11 @@ #define DEF_BELLY_SHAPE "Soft Belly" //GS13 - More belly types +//GS13 EDIT TAUR BELLIES +#define TAUR_BELLY_SIZE_DEF 1 +#define TAUR_BELLY_SIZE_MAX 10 +#define TAUR_BELLY_SHAPE_DEF "Drake Belly" // GS13 - for future taur bodies... + //GS13 Port - Add back Arousal #define AROUSAL_MINIMUM_DEFAULT 0 #define AROUSAL_MAXIMUM_DEFAULT 100 diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 68a9033d7f..1933fae180 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -12,6 +12,8 @@ #define ROBOTICIST (1<<8) #define AI_JF (1<<9) #define CYBORG (1<<10) +#define JR_OFFICER (1<<11) +#define JR_ENGINEER (1<<12) #define MEDSCI (1<<1) @@ -24,6 +26,9 @@ #define GENETICIST (1<<5) #define VIROLOGIST (1<<6) #define PARAMEDIC (1<<7) +#define JR_DOCTOR (1<<8) +#define JR_SCIENTIST (1<<9) +#define MED_PSYCH (1<<10) #define CIVILIAN (1<<2) @@ -83,14 +88,15 @@ #define JOB_DISPLAY_ORDER_CHEMIST 24 #define JOB_DISPLAY_ORDER_VIROLOGIST 25 #define JOB_DISPLAY_ORDER_GENETICIST 26 -#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 27 -#define JOB_DISPLAY_ORDER_SCIENTIST 28 -#define JOB_DISPLAY_ORDER_ROBOTICIST 29 -#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 30 -#define JOB_DISPLAY_ORDER_WARDEN 31 -#define JOB_DISPLAY_ORDER_DETECTIVE 32 -#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33 -#define JOB_DISPLAY_ORDER_PRISONER 34 +#define JOB_DISPLAY_ORDER_PSYCH 27 //GS13: Psychologist +#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 28 +#define JOB_DISPLAY_ORDER_SCIENTIST 29 +#define JOB_DISPLAY_ORDER_ROBOTICIST 30 +#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 31 +#define JOB_DISPLAY_ORDER_WARDEN 32 +#define JOB_DISPLAY_ORDER_DETECTIVE 33 +#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 34 +#define JOB_DISPLAY_ORDER_PRISONER 35 #define DEPARTMENT_UNASSIGNED "No department assigned" diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index 2b0f51f230..3e8f6081bd 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -77,6 +77,8 @@ #define REAGENT_SPLITRETAINVOL (1<<7) //Retains initial volume of chem when splitting #define REAGENT_ORGANIC_PROCESS (1<<8) //Can be processed by organic carbons - will otherwise slowly dissipate #define REAGENT_ROBOTIC_PROCESS (1<<9) //Can be processed by robotic carbons - will otherwise slowly dissipate +//GS13 edit +#define REAGENT_BIOFUEL_PROCESS (1<<10) //Can be processed by robotic carbons with biofuel processor trait - should be on nutriment-type reagents and fatchems only #define REAGENT_ALL_PROCESS (REAGENT_ORGANIC_PROCESS | REAGENT_ROBOTIC_PROCESS) //expand this if you for some reason add more process flags diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 78d847e0cd..7cae535f22 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -254,6 +254,7 @@ #define TRAIT_NO_MOVE "no_move" #define TRAIT_NO_JUMPSUIT "no_jumpsuit" #define TRAIT_NO_MISC "no_misc" +#define TRAIT_NO_BELT "no_belt" #define TRAIT_NO_BACKPACK "no_backpack" #define TRAIT_NO_BUCKLE "no_buckle" #define TRAIT_DOCILE "docile" @@ -290,6 +291,7 @@ #define TRAIT_WATER_SPONGE "water_sponge" #define TRAIT_FATROUSAL "fatrousal" #define TRAIT_MILKY "milky" //basically faster milk production +#define TRAIT_BIOFUEL "biofuel_processor" //GS13 Port #define TRAIT_HEADPAT_SLUT "headpat_slut" diff --git a/code/__HELPERS/_cit_helpers.dm b/code/__HELPERS/_cit_helpers.dm index c885a5b996..474a3dd499 100644 --- a/code/__HELPERS/_cit_helpers.dm +++ b/code/__HELPERS/_cit_helpers.dm @@ -58,6 +58,7 @@ GLOBAL_LIST_EMPTY(cock_shapes_list) GLOBAL_LIST_EMPTY(balls_shapes_list) GLOBAL_LIST_EMPTY(butt_shapes_list) GLOBAL_LIST_EMPTY(belly_shapes_list) +GLOBAL_LIST_EMPTY(taur_belly_shapes_list) // GS13 TAUR BELLY EDIT GLOBAL_LIST_EMPTY(breasts_shapes_list) GLOBAL_LIST_EMPTY(vagina_shapes_list) //longcat memes. @@ -136,6 +137,11 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE) return TRUE return FALSE +/mob/living/carbon/proc/has_taur_belly() //GS13 EDIT TAUR BELLY + if(getorganslot(ORGAN_SLOT_TAUR_BELLY)) + return TRUE + return FALSE + /mob/living/carbon/proc/is_groin_exposed(list/L) if(!L) L = get_equipped_items() diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 6d0a690672..5d7b8e1a99 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -58,6 +58,7 @@ init_sprite_accessory_subtypes(/datum/sprite_accessory/butt, GLOB.butt_shapes_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/testicles, GLOB.balls_shapes_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/belly, GLOB.belly_shapes_list) + init_sprite_accessory_subtypes(/datum/sprite_accessory/taur_belly, GLOB.taur_belly_shapes_list) //GS13 EDIT TAUR BELLY for(var/gpath in subtypesof(/obj/item/organ/genital)) var/obj/item/organ/genital/G = gpath diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index fa2a7b06ae..48034a8f23 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -106,6 +106,8 @@ init_sprite_accessory_subtypes(/datum/sprite_accessory/ears/mam_ears, GLOB.mam_ears_list) if(!GLOB.mam_snouts_list.len) init_sprite_accessory_subtypes(/datum/sprite_accessory/snouts/mam_snouts, GLOB.mam_snouts_list) + if(!GLOB.taur_belly_shapes_list.len) //GS13 EDIT TAUR BELLY + init_sprite_accessory_subtypes(/datum/sprite_accessory/taur_belly, GLOB.taur_belly_shapes_list) //snowflake check so people's ckey features don't get randomly put on unmonkeys/spawns var/list/snowflake_mam_tails_list = list() @@ -222,6 +224,15 @@ "inflatable_belly" = FALSE, "belly_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), // GS13 EDIT END + // GS13 EDIT START - TAUR BELLY + "has_taur_belly" = FALSE, + "taur_belly_size" = TAUR_BELLY_SIZE_DEF, + "taur_belly_shape" = TAUR_BELLY_SHAPE_DEF, + "hide_taur_belly" = FALSE, + "taur_inflatable_belly" = FALSE, + "taur_belly_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"), + "taur_belly_visibility" = GEN_VISIBLE_NO_UNDIES, + // GS13 EDIT END "balls_visibility" = GEN_VISIBLE_NO_UNDIES, "breasts_visibility"= GEN_VISIBLE_NO_UNDIES, diff --git a/code/__HELPERS/reagents.dm b/code/__HELPERS/reagents.dm index 0ecf82b191..8c8bc75cd2 100644 --- a/code/__HELPERS/reagents.dm +++ b/code/__HELPERS/reagents.dm @@ -106,4 +106,8 @@ /proc/is_reagent_processing_invalid(datum/reagent/R, mob/living/owner) if(!R || !owner) return TRUE + //GS13 edit start + if(HAS_TRAIT(owner, TRAIT_BIOFUEL) && (R.chemical_flags & REAGENT_BIOFUEL_PROCESS)) + return FALSE + //GS13 edit end return ((HAS_TRAIT(owner, TRAIT_ROBOTIC_ORGANISM) && !(R.chemical_flags & REAGENT_ROBOTIC_PROCESS)) || (!HAS_TRAIT(owner, TRAIT_ROBOTIC_ORGANISM) && !(R.chemical_flags & REAGENT_ORGANIC_PROCESS))) diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index c66823050b..dac68a6cca 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -100,6 +100,7 @@ DEFINE_BITFIELD(chemical_flags, list( "REAGENT_ONMOBMERGE" = REAGENT_ONMOBMERGE, "REAGENT_ORGANIC_PROCESS" = REAGENT_ORGANIC_PROCESS, "REAGENT_ROBOTIC_PROCESS" = REAGENT_ROBOTIC_PROCESS, + "REAGENT_BIOFUEL_PROCESS" = REAGENT_BIOFUEL_PROCESS, "REAGENT_SNEAKYNAME" = REAGENT_SNEAKYNAME, "REAGENT_SPLITRETAINVOL" = REAGENT_SPLITRETAINVOL, )) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 562224bc2c..c470856327 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -119,6 +119,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list( //GS13 EDIT /obj/item/trash/fatoray_scrap1 = 1, /obj/item/trash/fatoray_scrap2 = 1, + /obj/item/metal_food/mram = 7, /obj/item/trash/odd_disk = 1, // GS13 EDIT END "" = 3 diff --git a/code/_onclick/hud/new_player.dm b/code/_onclick/hud/new_player.dm index e58d330eae..d5f105352a 100644 --- a/code/_onclick/hud/new_player.dm +++ b/code/_onclick/hud/new_player.dm @@ -299,6 +299,18 @@ var/mob/dead/new_player/new_player = hud.mymob + //GS13 EDIT + var/ooc_length = length(new_player?.client?.prefs?.features["ooc_notes"]) + if(ooc_length < 50) + to_chat(usr, "You need to set your OOC text or make it longer! (50 character minimum) This can be done in the background tab under the character settings menu.") + return + + var/flavor_length = length(new_player?.client?.prefs?.features["flavor_text"]) + if(flavor_length < 50) + to_chat(usr, "You need to set your flavor text or make it longer! (50 character minimum) This can be done in the background tab under the character settings menu.") + return + //GS13 EDIT END + if(SSticker.queued_players.len || (relevant_cap && living_player_count() >= relevant_cap && !(ckey(new_player.key) in GLOB.admin_datums))) to_chat(new_player, span_danger("[CONFIG_GET(string/hard_popcap_message)]")) diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index 59c37275e7..586fb56719 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -13,10 +13,12 @@ SUBSYSTEM_DEF(statpanels) if (!resumed) var/datum/map_config/cached = SSmapping.next_map_config var/round_time = world.time - SSticker.round_start_time + var/active_players = get_active_player_count(alive_check = FALSE, afk_check = TRUE, human_check = FALSE) //GS13 Edit: Get active in round players, even those who are dead var/list/global_data = list( "Map: [SSmapping.config?.map_name || "Loading..."]", cached ? "Next Map: [cached.map_name]" : null, "Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]", + "Connected Players: [GLOB.clients.len] | Active Players: [active_players]", //GS13 Edit: Active & connected (and likely observing) players "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]", "Round Time: [GAMETIMESTAMP("hh:mm:ss", round_time)]", "Station Time: [STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)]", diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 934842c05e..0def193f82 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -256,7 +256,10 @@ SUBSYSTEM_DEF(vote) var/amount_required = 0 //gs13 tweaked from 1 to 0 transfer_votes_done = 0 //gs13 tweaked from 1 to 0 (also removed it incrementing with each vote) text += "\nExtending requires at least [amount_required] votes to win." - if(choices[VOTE_CONTINUE] < amount_required || choices[VOTE_TRANSFER] >= choices[VOTE_CONTINUE]) + // GS13 EDIT + // if(choices[VOTE_CONTINUE] < amount_required || choices[VOTE_TRANSFER] >= choices[VOTE_CONTINUE]) + if(choices[VOTE_CONTINUE] < amount_required || choices[VOTE_TRANSFER] > choices[VOTE_CONTINUE]) + // GS13 END EDIT winners = list(VOTE_TRANSFER) else winners = list(VOTE_CONTINUE) diff --git a/code/datums/elements/decal.dm b/code/datums/elements/decal.dm index e3baf9aafa..bc322b18c0 100644 --- a/code/datums/elements/decal.dm +++ b/code/datums/elements/decal.dm @@ -12,6 +12,8 @@ * such collision by forcing a non-collision. */ var/rotated + //BLUEMOON FIX - ADDED BY GS13 + var/initial_dir // Stores the initial direction of the decal /datum/element/decal/Attach(atom/target, _icon, _icon_state, _dir, _cleanable=CLEAN_GOD, _color, _layer=TURF_LAYER, _description, _alpha=255, _rotated=FALSE) . = ..() @@ -20,6 +22,8 @@ description = _description cleanable = _cleanable rotated = _rotated + //BLUEMOON FIX - ADDED BY GS13 + initial_dir = _dir // Store the initial direction RegisterSignal(target,COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_overlay), TRUE) if(isturf(target)) @@ -63,7 +67,8 @@ /datum/element/decal/proc/apply_overlay(atom/source, list/overlay_list) SIGNAL_HANDLER - + //BLUEMOON FIX - ADDED BY GS13 + pic.dir = initial_dir // Use the initial direction instead of the turf's direction overlay_list += pic /datum/element/decal/proc/shuttlemove_react(datum/source, turf/newT) diff --git a/code/datums/mapgen/CaveGenerator.dm b/code/datums/mapgen/CaveGenerator.dm index 4d6ae0ae07..13c43ef7a6 100644 --- a/code/datums/mapgen/CaveGenerator.dm +++ b/code/datums/mapgen/CaveGenerator.dm @@ -41,7 +41,7 @@ if(!megafauna_spawn_list) megafauna_spawn_list = GLOB.megafauna_spawn_list if(!flora_spawn_list) - flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2) + flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2, /obj/structure/flora/gmushroom/gggmushroom = 2, /obj/structure/flora/shadowtree/shadowtreee = 2, /obj/structure/flora/plasmatree/plasmatreee = 2) //GS13 Edit: trees in caves if(!feature_spawn_list) feature_spawn_list = list(/obj/structure/geyser/random = 1) diff --git a/code/datums/mapgen/Cavegens/LavalandGenerator.dm b/code/datums/mapgen/Cavegens/LavalandGenerator.dm index 3ce3821708..b9c0278462 100644 --- a/code/datums/mapgen/Cavegens/LavalandGenerator.dm +++ b/code/datums/mapgen/Cavegens/LavalandGenerator.dm @@ -7,7 +7,7 @@ /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40, /obj/structure/spawner/lavaland = 2, \ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30, /obj/structure/spawner/lavaland/legion = 3, \ SPAWN_MEGAFAUNA = 4, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10) - flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2, /obj/structure/flora/ashtree = 1) + flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2, /obj/structure/flora/ashtree = 1, /obj/structure/flora/gmushroom/gggmushroom = 2, /obj/structure/flora/shadowtree/shadowtreee = 2, /obj/structure/flora/plasmatree/plasmatreee = 2) //GS13 Edit: trees in lavaland feature_spawn_list = list(/obj/structure/geyser/random = 1) initial_closed_chance = 45 diff --git a/code/game/gamemodes/bloodsucker/bloodsucker.dm b/code/game/gamemodes/bloodsucker/bloodsucker.dm index 73f24948d0..9ab900ef36 100644 --- a/code/game/gamemodes/bloodsucker/bloodsucker.dm +++ b/code/game/gamemodes/bloodsucker/bloodsucker.dm @@ -26,7 +26,7 @@ false_report_weight = 1 chaos = 4 restricted_jobs = list("Prisoner", "AI","Cyborg") - protected_jobs = list("Chaplain", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_jobs = list("Chaplain", "Security Cadet", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //GS13 Edit: Excempting cadets from antagery required_players = 20 required_enemies = 2 recommended_enemies = 4 diff --git a/code/game/gamemodes/brother/traitor_bro.dm b/code/game/gamemodes/brother/traitor_bro.dm index 511f3bb597..f0bec30545 100644 --- a/code/game/gamemodes/brother/traitor_bro.dm +++ b/code/game/gamemodes/brother/traitor_bro.dm @@ -8,7 +8,7 @@ required_players = 25 chaos = 5 restricted_jobs = list("Prisoner", "AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_jobs = list("Security Officer", "Security Cadet", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //GS13 Edit: Excempting cadets from antagery announce_span = "danger" announce_text = "There are Syndicate agents and Blood Brothers on the station!\n\ diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 05979867e2..0d25ea2137 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -12,7 +12,7 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th false_report_weight = 10 chaos = 5 restricted_jobs = list("Prisoner", "AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //citadel change - adds HoP, CE, CMO, and RD to ling role blacklist + protected_jobs = list("Security Officer", "Security Cadet", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //citadel change - adds HoP, CE, CMO, and RD to ling role blacklist + GS13 Edit: Excempting cadets from antagery required_players = 15 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index 8b7f265b11..186811fefe 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -139,7 +139,7 @@ Credit where due: required_enemies = 3 recommended_enemies = 5 enemy_minimum_age = 7 - protected_jobs = list("Prisoner", "AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //Silicons can eventually be converted + protected_jobs = list("Prisoner", "AI", "Cyborg", "Security Officer", "Security Cadet", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //Silicons can eventually be converted + GS13 Edit: Excempting cadets from antagery restricted_jobs = list("Chaplain", "Captain") announce_span = "brass" announce_text = "Servants of Ratvar are trying to summon the Justiciar!\n\ diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 72b3b53989..0168757f2d 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -40,7 +40,7 @@ false_report_weight = 10 chaos = 8 restricted_jobs = list("Prisoner", "AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_jobs = list("Security Officer", "Security Cadet", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //GS13 Edit: Excempting cadets from antagery required_players = 30 required_enemies = 3 recommended_enemies = 5 diff --git a/code/game/gamemodes/eldritch_cult/eldritch_cult.dm b/code/game/gamemodes/eldritch_cult/eldritch_cult.dm index 2086653012..db38ef27ce 100644 --- a/code/game/gamemodes/eldritch_cult/eldritch_cult.dm +++ b/code/game/gamemodes/eldritch_cult/eldritch_cult.dm @@ -5,7 +5,7 @@ false_report_weight = 5 chaos = 5 restricted_jobs = list("Prisoner", "AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //citadel change - adds HoP, CE, CMO, and RD to heretic role blacklist + protected_jobs = list("Security Officer","Security Cadet", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //citadel change - adds HoP, CE, CMO, and RD to heretic role blacklist + GS13 Edit: Excempting cadets from antagery required_players = 15 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/gamemodes/overthrow/overthrow.dm b/code/game/gamemodes/overthrow/overthrow.dm index 6a118567df..711673212e 100644 --- a/code/game/gamemodes/overthrow/overthrow.dm +++ b/code/game/gamemodes/overthrow/overthrow.dm @@ -5,7 +5,7 @@ antag_flag = ROLE_OVERTHROW chaos = 5 restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_jobs = list("Security Officer", "Security Cadet", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //GS13 Edit: Excempting cadets from antagery required_players = 20 // the core idea is of a swift, bloodless coup, so it shouldn't be as chaotic as revs. required_enemies = 2 // minimum two teams, otherwise it's just nerfed revs. recommended_enemies = 4 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 5b3e742336..961fe0b3d6 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -14,7 +14,7 @@ false_report_weight = 10 chaos = 8 restricted_jobs = list("Prisoner", "AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_jobs = list("Security Officer", "Security Cadet", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //GS13 Edit: Excempting cadets from antagery required_players = 20 required_enemies = 1 recommended_enemies = 3 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index d180e43d82..6e1f931a36 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -11,7 +11,7 @@ antag_flag = ROLE_TRAITOR false_report_weight = 20 //Reports of traitors are pretty common. restricted_jobs = list("Prisoner", "Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //citadel change - adds HoP, CE, CMO, and RD to ling role blacklist + protected_jobs = list("Security Officer", "Security Cadet", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") //citadel change - adds HoP, CE, CMO, and RD to ling role blacklist + GS13 Edit: Excempting cadets from antagery required_players = 0 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index 1919d424ee..73c5939761 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -21,7 +21,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) var/arrivalToggle = TRUE var/newhead = "%PERSON, %DISP_RANK (%RANK), is the department head." var/newheadToggle = TRUE - var/cryostorage = "%PERSON, %RANK, has been moved into cryogenic storage." // this shouldnt be changed + var/cryostorage = "%PERSON, %RANK, has been moved into cryogenic storage and/or teleported to Central Command." // this shouldnt be changed //GS13 - sorry, changed it var/greenlight = "Light_Green" var/pinklight = "Light_Pink" diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index bf690398a4..1f3233b7e4 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -15,7 +15,7 @@ /obj/machinery/computer/crew/syndie icon_keyboard = "syndie_key" -/obj/machinery/computer/crew/interact(mob/user) +/obj/machinery/computer/crew/ui_interact(mob/user) //GS13: Ghost crew monitor fix GLOB.crewmonitor.show(user,src) GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm index 1a44e806e0..14e7f42380 100644 --- a/code/game/objects/effects/decals/decal.dm +++ b/code/game/objects/effects/decals/decal.dm @@ -46,5 +46,4 @@ var/turf/T = loc if(!istype(T)) //you know this will happen somehow CRASH("Turf decal initialized in an object/nullspace") - var/turn_dir = 180 - dir2angle(T.dir) //Turning a dir by 0 results in a roulette of random dirs. - T.AddElement(/datum/element/decal, icon, icon_state, turn_dir ? turn(dir, turn_dir) : dir, CLEAN_GOD, color, null, null, alpha, FALSE) + T.AddElement(/datum/element/decal, icon, icon_state, dir, CLEAN_GOD, color, null, null, alpha) //BLUEMOON FIX - ADDED BY GS13 diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm index f7a614050e..b6797df210 100644 --- a/code/game/objects/items/inducer.dm +++ b/code/game/objects/items/inducer.dm @@ -19,6 +19,16 @@ if(!cell && cell_type) cell = new cell_type +// GS13 EDIT - added an engi inducer without a powercell this +/obj/item/inducer/dry + opened = TRUE + cell_type = null + +/obj/item/inducer/dry/Initialize(mapload) + . = ..() + update_icon() +// GS13 END EDIT + /obj/item/inducer/proc/induce(obj/item/stock_parts/cell/target, coefficient) var/totransfer = min(cell.charge,(powertransfer * coefficient)) var/transferred = target.give(totransfer) diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 6e16c6c039..b3f99b289f 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -615,7 +615,7 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) /obj/item/toy/plush/lizardplushie/kobold name = "spacelizard plushie" desc = "An adorable stuffed toy that resembles a lizard in a suit." - icon_state = "plushie_spacelizard" + icon_state = "spess_lizord" /obj/item/toy/plush/nukeplushie name = "operative plushie" @@ -653,7 +653,7 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) /obj/item/toy/plush/mothplushie name = "moth plushie" desc = "An adorable stuffed toy that resembles some kind of insect." - icon_state = "moff" + icon_state = "moffplush" squeak_override = list('modular_citadel/sound/voice/mothsqueak.ogg' = 1) can_random_spawn = FALSE @@ -722,7 +722,7 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) /obj/item/toy/plush/aiplush name = "AI plushie" desc = "A little stuffed toy AI core... it appears to be malfunctioning." - icon_state = "malfai" + icon_state = "AI_plush" attack_verb = list("hacked", "detonated", "overloaded") squeak_override = list('sound/machines/beep.ogg' = 9, 'sound/machines/buzz-two.ogg' = 1) @@ -762,7 +762,7 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) /obj/item/toy/plush/mammal/dog/borgi name = "borgi plushie" - icon_state = "borgi" + icon_state = "robotcorgi" desc = "An adorable stuffed toy that resembles a robot dog." /obj/item/toy/plush/xeno @@ -775,7 +775,7 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) /obj/item/toy/plush/bird name = "bird plushie" desc = "An adorable stuffed plushie that resembles an avian." - icon_state = "bird" + icon_state = "plushie_vox" attack_verb = list("peeped", "beeped", "poofed") squeak_override = list('modular_citadel/sound/voice/peep.ogg' = 1) can_random_spawn = FALSE @@ -810,7 +810,7 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) /obj/item/toy/plush/crab name = "crab plushie" desc = "Fewer pinches than a real one, but it still clicks." - icon_state = "crab" + icon_state = "mr_krabs" attack_verb = list("clicked", "clacked", "pinched") /obj/item/toy/plush/gondola diff --git a/code/game/objects/items/storage/dakis.dm b/code/game/objects/items/storage/dakis.dm index 29f12df4c4..9bbb659cf7 100644 --- a/code/game/objects/items/storage/dakis.dm +++ b/code/game/objects/items/storage/dakis.dm @@ -9,7 +9,7 @@ icon_state = "daki_base" slot_flags = ITEM_SLOT_BACK var/cooldowntime = 20 - var/static/list/dakimakura_options = list("Callie","Casca","Chaika","Elisabeth","Foxy Grandpa","Haruko","Holo","Ian","Jolyne","Kurisu","Marie","Mugi","Nar'Sie","Patchouli","Plutia","Rei","Reisen","Naga","Squid","Squigly","Tomoko","Toriel","Umaru","Yaranaika","Yoko") //Kurisu is the ideal girl." - Me, Logos. + var/static/list/dakimakura_options = list("Callie","Casca","Chaika","Elisabeth","Foxy Grandpa","Haruko","Holo","Ian","Jolyne","Kurisu","Marie","Mugi","Nar'Sie","Patchouli","Plutia","Rei","Reisen","Naga","Squid","Squigly","Sussy","Tomoko","Toriel","Umaru","Yaranaika","Yoko") //Kurisu is the ideal girl." - Me, Logos. GS13 Edit: Return of Sussy /obj/item/storage/daki/ComponentInitialize() . = ..() diff --git a/code/modules/arousal/genitals.dm b/code/modules/arousal/genitals.dm index 5585219929..008f66d07f 100644 --- a/code/modules/arousal/genitals.dm +++ b/code/modules/arousal/genitals.dm @@ -266,6 +266,8 @@ give_genital(/obj/item/organ/genital/butt) if(dna.features["has_belly"]) give_genital(/obj/item/organ/genital/belly) + if(dna.features["has_taur_belly"]) //GS13 EDIT TAUR BELLY + give_genital(/obj/item/organ/genital/taur_belly) /mob/living/carbon/human/proc/give_genital(obj/item/organ/genital/G) if(!dna || (NOGENITALS in dna.species.species_traits) || getorganslot(initial(G.slot))) @@ -327,6 +329,8 @@ S = GLOB.butt_shapes_list[G.shape] if(/obj/item/organ/genital/belly) S = GLOB.belly_shapes_list[G.shape] + if(/obj/item/organ/genital/taur_belly) //GS13 EDIT TAUR BELLY + S = GLOB.taur_belly_shapes_list[G.shape] if(!S || S.icon_state == "none") continue @@ -363,6 +367,8 @@ genital_overlay.color = "#[dna.features["butt_color"]]" if("belly_color") genital_overlay.color = "#[dna.features["belly_color"]]" + if("taur_belly_color") //GS13 EDIT TAUR BELLY + genital_overlay.color = "#[dna.features["taur_belly_color"]]" //GS13 - Because each genital's file has different naming schemes for their icon_states, // I've made it so each type is checked and the icon_state built based on which genital it is @@ -370,6 +376,9 @@ if("belly") genital_overlay.icon = G.icon genital_overlay.icon_state = "[G.icon_state]_[aroused_state]_[layertext]" + if("taur_belly") //GS13 EDIT TAUR BELLY + //genital_overlay.icon = G.icon + genital_overlay.icon_state = "[G.icon_state]_[aroused_state]_[layertext]" if("breasts") genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size][(dna.species.use_skintones && !dna.skin_tone_override) ? "-s" : ""]_[aroused_state]_[layertext]" if("penis") @@ -410,6 +419,7 @@ var/buttCheck = getorganslot(ORGAN_SLOT_BUTT) var/ballCheck = getorganslot(ORGAN_SLOT_TESTICLES) var/bellyCheck = getorganslot(ORGAN_SLOT_BELLY) + var/taurbellyCheck = getorganslot(ORGAN_SLOT_TAUR_BELLY) //GS13 EDIT TAUR BELLY if(organCheck == FALSE) if(ishuman(src) && dna.species.use_skintones) @@ -420,6 +430,7 @@ dna.features["butt_color"] = "[dna.species.fixed_mut_color]" dna.features["belly_color"] = "[dna.species.fixed_mut_color]" dna.features["testicles_color"] = "[dna.species.fixed_mut_color]" + dna.features["taur_belly_color"] = "[dna.species.fixed_mut_color]" //GS13 EDIT TAUR BELLY return //So people who haven't set stuff up don't get rainbow surprises. dna.features["cock_color"] = "[dna.features["mcolor"]]" @@ -427,6 +438,7 @@ dna.features["butt_color"] = "[dna.features["mcolor"]]" dna.features["belly_color"] = "[dna.features["mcolor"]]" dna.features["testicles_color"] = "[dna.features["mcolor"]]" + dna.features["taur_belly_color"] = "[dna.features["mcolor"]]" //GS13 EDIT TAUR BELLY else //If there's a new organ, make it the same colour. if(breastCheck == FALSE) dna.features["breasts_color"] = dna.features["cock_color"] @@ -438,4 +450,6 @@ dna.features["belly_color"] = dna.features["belly_color"] else if (ballCheck == FALSE) dna.features["testicles_color"] = dna.features["testicles_color"] + else if (taurbellyCheck == FALSE) + dna.features["taur_belly_color"] = dna.features["taur_belly_color"] //GS13 EDIT TAUR BELLY return TRUE diff --git a/code/modules/arousal/genitals_sprite_accessories.dm b/code/modules/arousal/genitals_sprite_accessories.dm index b8d0c9e9f9..8c55ba4d58 100644 --- a/code/modules/arousal/genitals_sprite_accessories.dm +++ b/code/modules/arousal/genitals_sprite_accessories.dm @@ -152,3 +152,19 @@ icon = 'hyperstation/icons/obj/genitals/belly_round.dmi' icon_state = "round" name = "Round Belly" + +//GS13 EDIT TAUR BELLY +/datum/sprite_accessory/taur_belly // Generic taur belly + icon = 'GainStation13/icons/obj/genitals/taur_belly/taur_belly_drake.dmi' + icon_state = "drake" + name = "generic taur belly" + color_src = "taur_belly_color" + //taur_dimension_x = 64 + feat_taur = "belly_taur" + center = TRUE + dimension_x = 64 + +/datum/sprite_accessory/taur_belly/drake + taur_icon = 'GainStation13/icons/obj/genitals/taur_belly/taur_belly_drake.dmi' + icon_state = "drake" + name = "Drake Belly" diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 00af91d8b9..9308e8ab23 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -134,7 +134,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/eye_type = DEFAULT_EYES_TYPE //Eye type var/split_eye_colors = FALSE var/datum/species/pref_species = new /datum/species/human() //Mutant race - var/list/features = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF", "mcolor3" = "FFFFFF", "tail_lizard" = "Smooth", "tail_human" = "None", "snout" = "Round", "horns" = "None", "horns_color" = "85615a", "ears" = "None", "wings" = "None", "wings_color" = "FFF", "frills" = "None", "deco_wings" = "None", "spines" = "None", "legs" = "Plantigrade", "insect_wings" = "Plain", "insect_fluff" = "None", "insect_markings" = "None", "arachnid_legs" = "Plain", "arachnid_spinneret" = "Plain", "arachnid_mandibles" = "Plain", "mam_body_markings" = list(), "mam_ears" = "None", "mam_snouts" = "None", "mam_tail" = "None", "mam_tail_animated" = "None", "xenodorsal" = "Standard", "xenohead" = "Standard", "xenotail" = "Xenomorph Tail", "taur" = "None", "genitals_use_skintone" = FALSE, "has_cock" = FALSE, "cock_shape" = DEF_COCK_SHAPE, "cock_length" = COCK_SIZE_DEF, "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, "cock_color" = "ffffff", "cock_taur" = FALSE, "has_balls" = FALSE, "balls_color" = "ffffff", "balls_shape" = DEF_BALLS_SHAPE, "balls_size" = BALLS_SIZE_DEF, "balls_cum_rate" = CUM_RATE, "balls_cum_mult" = CUM_RATE_MULT, "balls_efficiency" = CUM_EFFICIENCY, "has_breasts" = FALSE, "breasts_color" = "ffffff", "breasts_size" = BREASTS_SIZE_DEF, "breasts_shape" = DEF_BREASTS_SHAPE, "breasts_fluid" = /datum/reagent/consumable/milk, "breasts_producing" = FALSE, "has_vag" = FALSE, "vag_shape" = DEF_VAGINA_SHAPE, "vag_color" = "ffffff", "has_womb" = FALSE, "has_butt" = FALSE, "butt_color" = "ffffff", "butt_size" = BUTT_SIZE_DEF, "balls_visibility" = GEN_VISIBLE_NO_UNDIES, "breasts_visibility"= GEN_VISIBLE_NO_UNDIES, "cock_visibility" = GEN_VISIBLE_NO_UNDIES, "vag_visibility" = GEN_VISIBLE_NO_UNDIES, "butt_visibility" = GEN_VISIBLE_NO_UNDIES, "ipc_screen" = "Sunburst", "ipc_antenna" = "None", "flavor_text" = "", "silicon_flavor_text" = "", "ooc_notes" = "", "meat_type" = "Mammalian", "body_model" = MALE, "body_size" = RESIZE_DEFAULT_SIZE, "color_scheme" = OLD_CHARACTER_COLORING, "belly_size" = BELLY_SIZE_DEF, "belly_shape" = DEF_BELLY_SHAPE, "inflatable_belly" = FALSE, "belly_visibility" = GEN_VISIBLE_NO_UNDIES) + var/list/features = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF", "mcolor3" = "FFFFFF", "tail_lizard" = "Smooth", "tail_human" = "None", "snout" = "Round", "horns" = "None", "horns_color" = "85615a", "ears" = "None", "wings" = "None", "wings_color" = "FFF", "frills" = "None", "deco_wings" = "None", "spines" = "None", "legs" = "Plantigrade", "insect_wings" = "Plain", "insect_fluff" = "None", "insect_markings" = "None", "arachnid_legs" = "Plain", "arachnid_spinneret" = "Plain", "arachnid_mandibles" = "Plain", "mam_body_markings" = list(), "mam_ears" = "None", "mam_snouts" = "None", "mam_tail" = "None", "mam_tail_animated" = "None", "xenodorsal" = "Standard", "xenohead" = "Standard", "xenotail" = "Xenomorph Tail", "taur" = "None", "genitals_use_skintone" = FALSE, "has_cock" = FALSE, "cock_shape" = DEF_COCK_SHAPE, "cock_length" = COCK_SIZE_DEF, "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, "cock_color" = "ffffff", "cock_taur" = FALSE, "has_balls" = FALSE, "balls_color" = "ffffff", "balls_shape" = DEF_BALLS_SHAPE, "balls_size" = BALLS_SIZE_DEF, "balls_cum_rate" = CUM_RATE, "balls_cum_mult" = CUM_RATE_MULT, "balls_efficiency" = CUM_EFFICIENCY, "has_breasts" = FALSE, "breasts_color" = "ffffff", "breasts_size" = BREASTS_SIZE_DEF, "breasts_shape" = DEF_BREASTS_SHAPE, "breasts_fluid" = /datum/reagent/consumable/milk, "breasts_producing" = FALSE, "has_vag" = FALSE, "vag_shape" = DEF_VAGINA_SHAPE, "vag_color" = "ffffff", "has_womb" = FALSE, "has_butt" = FALSE, "butt_color" = "ffffff", "butt_size" = BUTT_SIZE_DEF, "balls_visibility" = GEN_VISIBLE_NO_UNDIES, "breasts_visibility"= GEN_VISIBLE_NO_UNDIES, "cock_visibility" = GEN_VISIBLE_NO_UNDIES, "vag_visibility" = GEN_VISIBLE_NO_UNDIES, "butt_visibility" = GEN_VISIBLE_NO_UNDIES, "ipc_screen" = "Sunburst", "ipc_antenna" = "None", "flavor_text" = "", "silicon_flavor_text" = "", "ooc_notes" = "", "meat_type" = "Mammalian", "body_model" = MALE, "body_size" = RESIZE_DEFAULT_SIZE, "color_scheme" = OLD_CHARACTER_COLORING, "belly_size" = BELLY_SIZE_DEF, "belly_shape" = DEF_BELLY_SHAPE, "inflatable_belly" = FALSE, "belly_visibility" = GEN_VISIBLE_NO_UNDIES, "taur_belly_size" = TAUR_BELLY_SIZE_DEF, "taur_belly_shape" = TAUR_BELLY_SHAPE_DEF, "taur_inflatable_belly" = FALSE, "taur_belly_visibility" = GEN_VISIBLE_NO_UNDIES) var/custom_speech_verb = "default" //if your say_mod is to be something other than your races var/custom_tongue = "default" //if your tongue is to be something other than your races @@ -343,6 +343,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) helplessness_clothing_back = 0 if(isnull(helplessness_clothing_jumpsuit)) helplessness_clothing_jumpsuit = 0 + if(isnull(helplessness_belts)) + helplessness_belts = 0 if(isnull(helplessness_hidden_face)) helplessness_hidden_face = 0 if(isnull(helplessness_mute)) @@ -869,10 +871,27 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Belly Visibility:[features["belly_visibility"]]" // GS13: tweak inflation description dat += "Inflation (climax with and manual belly size change in arousal menu):[features["inflatable_belly"] == 1 ? "Yes" : "No"]" - - dat += "" dat += "" + // GS13 EDIT TAUR BELLY START + if(features["taur"] != "None") + dat += APPEARANCE_CATEGORY_COLUMN + dat += "