From 71bc3b73860ed40ff3fe94a892e69856240e88d3 Mon Sep 17 00:00:00 2001 From: Maxim Date: Sun, 6 Feb 2022 18:29:07 -0500 Subject: [PATCH 1/6] Merge branch 'yogstation13:master' into pools --- code/__DEFINES/components.dm | 3 +- code/__DEFINES/movespeed_modification.dm | 2 + code/game/turfs/turf.dm | 2 + .../mob/living/carbon/human/species.dm | 4 + .../carbon/human/species_types/ethereal.dm | 1 + .../carbon/human/species_types/felinid.dm | 1 + .../carbon/human/species_types/golems.dm | 1 + .../carbon/human/species_types/jellypeople.dm | 3 +- code/modules/pool/components/swimming.dm | 131 ++++++++ .../pool/components/swimming_dissolve.dm | 28 ++ .../pool/components/swimming_ethereal.dm | 11 + .../pool/components/swimming_felinid.dm | 27 ++ .../modules/pool/components/swimming_golem.dm | 9 + code/modules/pool/pool.dm | 294 ++++++++++++++++++ code/modules/pool/pool_items.dm | 78 +++++ icons/mob/inhands/items_lefthand.dmi | Bin 21517 -> 21928 bytes icons/mob/inhands/items_righthand.dmi | Bin 22024 -> 22420 bytes icons/mob/inhands/weapons/melee_lefthand.dmi | Bin 2488 -> 2684 bytes icons/mob/inhands/weapons/melee_righthand.dmi | Bin 2473 -> 2670 bytes icons/obj/pool.dmi | Bin 0 -> 3049 bytes sound/effects/splash.ogg | Bin 0 -> 15067 bytes sound/effects/splosh.ogg | Bin 0 -> 19099 bytes yogstation.dme | 7 + 23 files changed, 600 insertions(+), 2 deletions(-) create mode 100644 code/modules/pool/components/swimming.dm create mode 100644 code/modules/pool/components/swimming_dissolve.dm create mode 100644 code/modules/pool/components/swimming_ethereal.dm create mode 100644 code/modules/pool/components/swimming_felinid.dm create mode 100644 code/modules/pool/components/swimming_golem.dm create mode 100644 code/modules/pool/pool.dm create mode 100644 code/modules/pool/pool_items.dm create mode 100644 icons/obj/pool.dmi create mode 100644 sound/effects/splash.ogg create mode 100644 sound/effects/splosh.ogg diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm index 1c275dffcbc7..9d7eb469cad7 100644 --- a/code/__DEFINES/components.dm +++ b/code/__DEFINES/components.dm @@ -191,6 +191,7 @@ #define COMPONENT_BLOCK_MAGIC 1 #define COMSIG_MOB_HUD_CREATED "mob_hud_created" //from base of mob/create_mob_hud(): () #define COMSIG_MOB_ATTACK_HAND "mob_attack_hand" //from base of +#define COMSIG_MOB_ATTACK_HAND_TURF "mob_attack_hand_turf" //from the base of turf/attack_hand #define COMSIG_MOB_ITEM_ATTACK "mob_item_attack" //from base of /obj/item/attack(): (mob/M, mob/user) #define COMSIG_MOB_APPLY_DAMAGE "mob_apply_damage" //from base of /mob/living/proc/apply_damage(): (damage, damagetype, def_zone) #define COMSIG_MOB_ITEM_AFTERATTACK "mob_item_afterattack" //from base of obj/item/afterattack(): (atom/target, mob/user, proximity_flag, click_parameters) @@ -240,7 +241,7 @@ #define COMSIG_CARBON_STATUS_STAMCRIT "living_stamcrit" //from base of mob/living/carbon/enter_stamcrit() #define COMSIG_BODYPART_GAUZED "bodypart_gauzed" // from /obj/item/bodypart/proc/apply_gauze(/obj/item/stack/gauze) #define COMSIG_BODYPART_GAUZE_DESTROYED "bodypart_degauzed" // from [/obj/item/bodypart/proc/seep_gauze] when it runs out of absorption - +#define COMSIG_CARBON_SPECIESCHANGE "mob_carbon_specieschange" //from base of mob/living/carbon/set_species(): (new_race) // /mob/living/simple_animal/hostile signals #define COMSIG_HOSTILE_ATTACKINGTARGET "hostile_attackingtarget" #define COMPONENT_HOSTILE_NO_ATTACK 1 diff --git a/code/__DEFINES/movespeed_modification.dm b/code/__DEFINES/movespeed_modification.dm index d95b015d3156..d174f57c35bc 100644 --- a/code/__DEFINES/movespeed_modification.dm +++ b/code/__DEFINES/movespeed_modification.dm @@ -72,3 +72,5 @@ #define MOVESPEED_ID_CLOCKCHANT "CLOCKCHANT" #define MOVESPEED_ID_NECRO_VIRUS_SLOWDOWN "NECRO_VIRUS" + +#define MOVESPEED_ID_SWIMMING "SWIMMING_SPEED_MOD" diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index cabbf46d8054..8aadd86a4e91 100755 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -120,6 +120,8 @@ GLOBAL_LIST_EMPTY(station_turfs) /turf/attack_hand(mob/user) . = ..() + if(SEND_SIGNAL(user, COMSIG_MOB_ATTACK_HAND_TURF, src) & COMPONENT_NO_ATTACK_HAND) + . = TRUE if(.) return user.Move_Pulled(src) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 801eabf75825..95b109cc1439 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -156,6 +156,10 @@ GLOBAL_LIST_EMPTY(mentor_races) ///Bitflag that controls what in game ways can select this species as a spawnable source. Think magic mirror and pride mirror, slime extract, ERT etc, see defines in __DEFINES/mobs.dm, defaults to NONE, so people actually have to think about it var/changesource_flags = NONE + + //The component to add when swimming + var/swimming_component = /datum/component/swimming + /////////// // PROCS // /////////// diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 090aba2eb7a7..aedbece3e919 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -25,6 +25,7 @@ inert_mutation = SHOCKTOUCH hair_color = "fixedmutcolor" hair_alpha = 140 + swimming_component = /datum/component/swimming/ethereal var/current_color var/EMPeffect = FALSE var/emageffect = FALSE diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index 5bf71c26daff..3f26a17452ce 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -12,6 +12,7 @@ mutantears = /obj/item/organ/ears/cat mutanttail = /obj/item/organ/tail/cat changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT + swimming_component = /datum/component/swimming/felinid species_language_holder = /datum/language_holder/felinid /datum/species/human/felinid/qualifies_for_rank(rank, list/features) diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 53b203f5dfb5..67d85cafbf41 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -22,6 +22,7 @@ // changes, only the Random Golem type can be chosen limbs_id = "golem" fixed_mut_color = "aaa" + swimming_component = /datum/component/swimming/golem var/info_text = "As an Iron Golem, you don't have any special traits." var/random_eligible = TRUE //If false, the golem subtype can't be made through golem mutation toxin diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index a9a1698abf49..fb67c03d956f 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -17,6 +17,7 @@ burnmod = 0.5 // = 1/2x generic burn damage changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT species_language_holder = /datum/language_holder/jelly + swimming_component = /datum/component/swimming/dissolve /datum/species/jelly/on_species_loss(mob/living/carbon/C) if(regenerate_limbs) @@ -738,4 +739,4 @@ to_chat(H, span_notice("You connect [target]'s mind to your slime link!")) else to_chat(H, span_warning("You can't seem to link [target]'s mind...")) - to_chat(target, span_warning("The foreign presence leaves your mind.")) \ No newline at end of file + to_chat(target, span_warning("The foreign presence leaves your mind.")) diff --git a/code/modules/pool/components/swimming.dm b/code/modules/pool/components/swimming.dm new file mode 100644 index 000000000000..d08c57582032 --- /dev/null +++ b/code/modules/pool/components/swimming.dm @@ -0,0 +1,131 @@ +//Component used to show that a mob is swimming, and force them to swim a lil' bit slower. Components are actually really based! + +/datum/component/swimming + dupe_mode = COMPONENT_DUPE_UNIQUE + var/lengths = 0 //How far have we swum? + var/lengths_for_bonus = 25 //If you swim this much, you'll count as having "excercised" and thus gain a buff. + var/list/species = list() + var/drowning = FALSE + var/ticks_drowned = 0 + var/slowdown = 4 + var/bob_height_min = 2 + var/bob_height_max = 5 + var/bob_tick = 0 + +/datum/component/swimming/Initialize() + . = ..() + if(!isliving(parent)) + message_admins("Swimming component erroneously added to a non-living mob ([parent]).") + return INITIALIZE_HINT_QDEL //Only mobs can swim, like Ian... + var/mob/M = parent + M.visible_message("[parent] starts splashing around in the water!") + M.add_movespeed_modifier(MOVESPEED_ID_SWIMMING, update=TRUE, priority=50, multiplicative_slowdown=slowdown, movetypes=GROUND) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/onMove) + RegisterSignal(parent, COMSIG_CARBON_SPECIESCHANGE, .proc/onChangeSpecies) + RegisterSignal(parent, COMSIG_MOB_ATTACK_HAND_TURF, .proc/try_leave_pool) + START_PROCESSING(SSprocessing, src) + enter_pool() + +/datum/component/swimming/proc/onMove() + lengths ++ + if(lengths > lengths_for_bonus) + var/mob/living/L = parent + SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "exercise", /datum/mood_event/exercise) + L.apply_status_effect(STATUS_EFFECT_EXERCISED) //Swimming is really good excercise! + lengths = 0 + +//Damn edge cases +/datum/component/swimming/proc/onChangeSpecies() + var/mob/living/carbon/C = parent + var/component_type = /datum/component/swimming + if(istype(C) && C?.dna?.species) + component_type = C.dna.species.swimming_component + var/mob/M = parent + RemoveComponent() + M.AddComponent(component_type) + +/datum/component/swimming/proc/try_leave_pool(datum/source, turf/clicked_turf) + var/mob/living/L = parent + if(!L.can_interact_with(clicked_turf)) + return + if(is_blocked_turf(clicked_turf)) + return + if(istype(clicked_turf, /turf/open/indestructible/sound/pool)) + return + to_chat(parent, "You start to climb out of the pool...") + if(do_after(parent, 1 SECONDS, target=clicked_turf)) + L.forceMove(clicked_turf) + L.visible_message("[parent] climbs out of the pool.") + RemoveComponent() + +/datum/component/swimming/UnregisterFromParent() + exit_pool() + var/mob/M = parent + if(drowning) + stop_drowning(M) + if(bob_tick) + M.pixel_y = 0 + M.remove_movespeed_modifier(MOVESPEED_ID_SWIMMING) + UnregisterSignal(parent, COMSIG_MOVABLE_MOVED) + UnregisterSignal(parent, COMSIG_CARBON_SPECIESCHANGE) + UnregisterSignal(parent, COMSIG_MOB_ATTACK_HAND_TURF) + STOP_PROCESSING(SSprocessing, src) + return ..() + +/datum/component/swimming/process() + var/mob/living/L = parent + var/floating = FALSE + var/obj/item/twohanded/required/pool/helditem = L.get_active_held_item() + if(istype(helditem) && helditem.wielded) + bob_tick ++ + animate(L, time=9.5, pixel_y = (L.pixel_y == bob_height_max) ? bob_height_min : bob_height_max) + floating = TRUE + else + if(bob_tick) + animate(L, time=5, pixel_y = 0) + bob_tick = 0 + if(!floating && is_drowning(L)) + if(!drowning) + start_drowning(L) + drowning = TRUE + drown(L) + else if(drowning) + stop_drowning(L) + drowning = FALSE + L.adjust_fire_stacks(-1) + +/datum/component/swimming/proc/is_drowning(mob/living/victim) + var/obj/item/twohanded/required/pool/helditem = victim.get_active_held_item() + if(istype(helditem) && helditem.wielded) + return + return ((!(victim.mobility_flags & MOBILITY_STAND)) && (!HAS_TRAIT(victim, TRAIT_NOBREATH))) + +/datum/component/swimming/proc/drown(mob/living/victim) + if(victim.losebreath < 1) + victim.losebreath += 1 + ticks_drowned ++ + if(prob(20)) + victim.emote("cough") + else if(prob(25)) + victim.emote("gasp") + if(ticks_drowned > 20) + if(prob(10)) + victim.visible_message("[victim] falls unconcious for a moment!") + victim.Unconscious(10) + +/datum/component/swimming/proc/start_drowning(mob/living/victim) + to_chat(victim, "Water fills your lungs and mouth, you can't breathe!") + ADD_TRAIT(victim, TRAIT_MUTE, "pool") + +/datum/component/swimming/proc/stop_drowning(mob/living/victim) + victim.emote("cough") + to_chat(victim, "You cough up the last of the water, regaining your ability to speak and breathe clearly!") + REMOVE_TRAIT(victim, TRAIT_MUTE, "pool") + ticks_drowned = 0 + +/datum/component/swimming/proc/enter_pool() + return + +//Essentially the same as remove component, but easier for overiding +/datum/component/swimming/proc/exit_pool() + return diff --git a/code/modules/pool/components/swimming_dissolve.dm b/code/modules/pool/components/swimming_dissolve.dm new file mode 100644 index 000000000000..e92f1009afce --- /dev/null +++ b/code/modules/pool/components/swimming_dissolve.dm @@ -0,0 +1,28 @@ +/datum/component/swimming/dissolve + var/start_alpha = 0 + +/datum/component/swimming/dissolve/enter_pool() + var/mob/living/L = parent + start_alpha = L.alpha + to_chat(parent, "You begin disolving into the pool, get out fast!") + +/datum/component/swimming/dissolve/process() + ..() + var/mob/living/L = parent + var/mob/living/carbon/human/H = L + if(istype(H)) + if(H.wear_suit && istype(H.wear_suit, /obj/item/clothing)) + var/obj/item/clothing/CH = H.wear_suit + if (CH.clothing_flags & THICKMATERIAL) + return + L.adjustCloneLoss(1) + L.alpha = ((L.health-HEALTH_THRESHOLD_DEAD) / (L.maxHealth - HEALTH_THRESHOLD_DEAD)) * 255 + if(L.stat == DEAD) + L.visible_message("[L] dissolves into the pool!") + var/obj/item/organ/brain = L.getorgan(/obj/item/organ/brain) + brain.Remove(L) //Maybe making them completely unrecoverable is too far + brain.forceMove(get_turf(L)) + qdel(L) + +/datum/component/swimming/dissolve/exit_pool() + animate(parent, alpha=start_alpha, time=20) diff --git a/code/modules/pool/components/swimming_ethereal.dm b/code/modules/pool/components/swimming_ethereal.dm new file mode 100644 index 000000000000..13f1877e9d3b --- /dev/null +++ b/code/modules/pool/components/swimming_ethereal.dm @@ -0,0 +1,11 @@ +/datum/component/swimming/ethereal/enter_pool() + var/mob/living/L = parent + L.visible_message("Sparks of energy begin coursing around the pool!") + +/datum/component/swimming/ethereal/process() + ..() + var/mob/living/L = parent + if(prob(2) && L.nutrition > NUTRITION_LEVEL_FED) + L.adjust_nutrition(-50) + tesla_zap(L, 7, 2000, TESLA_MOB_STUN) + playsound(L, 'sound/machines/defib_zap.ogg', 50, TRUE) diff --git a/code/modules/pool/components/swimming_felinid.dm b/code/modules/pool/components/swimming_felinid.dm new file mode 100644 index 000000000000..b6cde0425452 --- /dev/null +++ b/code/modules/pool/components/swimming_felinid.dm @@ -0,0 +1,27 @@ +/datum/component/swimming/felinid/enter_pool() + var/mob/living/L = parent + L.emote("scream") + to_chat(parent, "You get covered in water and start panicking!") + +/datum/component/swimming/felinid/process() + ..() + var/mob/living/L = parent + var/obj/item/twohanded/required/pool/helditem = L.get_active_held_item() + if(istype(helditem) && helditem.wielded) + return + switch(rand(1, 100)) + if(1 to 4) + to_chat(parent, "You can't touch the bottom!") + L.emote("scream") + if(5 to 7) + if(L.confused < 5) + L.confused += 1 + if(8 to 12) + L.Jitter(10) + if(13 to 14) + shake_camera(L, 15, 1) + L.emote("whimper") + L.Paralyze(10) + to_chat(parent, "You feel like you are never going to get out...") + if(15 to 17) + L.emote("cry") diff --git a/code/modules/pool/components/swimming_golem.dm b/code/modules/pool/components/swimming_golem.dm new file mode 100644 index 000000000000..669d2aa097ff --- /dev/null +++ b/code/modules/pool/components/swimming_golem.dm @@ -0,0 +1,9 @@ +/datum/component/swimming/golem/enter_pool() + var/mob/living/M = parent + M.Paralyze(60) + M.visible_message("[M] crashed violently into the ground!", + "You sink like a rock!") + playsound(get_turf(M), 'sound/effects/picaxe1.ogg') + +/datum/component/swimming/golem/is_drowning() + return FALSE diff --git a/code/modules/pool/pool.dm b/code/modules/pool/pool.dm new file mode 100644 index 000000000000..530ee5eac5b2 --- /dev/null +++ b/code/modules/pool/pool.dm @@ -0,0 +1,294 @@ +//Simple pool behaviour. Sprites by Cdey! + +/** +How to pool! +Place pool turfs on the inside of your pool. This is where you swim. Pool end caps to cap it off on the north face +Place pool border decals around the pool so it doesn't look weird +Place a pool ladder at the top of the pool so that it leads to a normal tile (or else it'll be hard to get out of the pool.) +Place a pool filter somewhere in the pool if you want people to be able to modify the pool's settings (Temperature) or dump reagents into the pool (which'll change the pool's colour) +*/ + +/obj/effect/overlay/poolwater + name = "Pool water" + icon = 'icons/obj/pool.dmi' + icon_state = "water" + anchored = TRUE + layer = ABOVE_ALL_MOB_LAYER + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + +/turf/open/indestructible/sound/pool + name = "Swimming pool" + desc = "A fun place where you go to swim! Drag and drop yourself onto it to climb in..." + icon = 'icons/obj/pool.dmi' + icon_state = "pool" + sound = 'sound/effects/splash.ogg' + var/id = null //Set me if you don't want the pool and the pump to be in the same area, or you have multiple pools per area. + var/obj/effect/water_overlay = null + +/turf/open/indestructible/sound/pool/end + icon_state = "poolwall" + +/turf/open/indestructible/sound/pool/Initialize(mapload) + . = ..() + water_overlay = new /obj/effect/overlay/poolwater(get_turf(src)) + +/turf/open/indestructible/sound/pool/proc/set_colour(colour) + water_overlay.color = colour + +/turf/open/indestructible/sound/pool/end/ChangeTurf(path, list/new_baseturfs, flags) + if(water_overlay) + qdel(water_overlay) + . = ..() + +/turf/open/CanPass(atom/movable/mover, turf/target) + var/datum/component/swimming/S = mover.GetComponent(/datum/component/swimming) //If you're swimming around, you don't really want to stop swimming just like that do you? + if(S) + return FALSE //If you're swimming, you can't swim into a regular turf, y'dig? + . = ..() + +/turf/open/indestructible/sound/pool/CanPass(atom/movable/mover, turf/target) + if(mover.throwing) + return TRUE + var/datum/component/swimming/S = mover.GetComponent(/datum/component/swimming) //You can't get in the pool unless you're swimming. + return (isliving(mover)) ? S : ..() //So you can do stuff like throw beach balls around the pool! + +/turf/open/indestructible/sound/pool/Entered(atom/movable/AM) + . = ..() + SEND_SIGNAL(AM, COMSIG_COMPONENT_CLEAN_ACT, 2) + if(isliving(AM)) + var/datum/component/swimming/S = AM.GetComponent(/datum/component/swimming) //You can't get in the pool unless you're swimming. + if(!S) + var/mob/living/carbon/C = AM + var/component_type = /datum/component/swimming + if(istype(C) && C?.dna?.species) + component_type = C.dna.species.swimming_component + AM.AddComponent(component_type) + +/turf/open/indestructible/sound/pool/Exited(atom/movable/Obj, atom/newloc) + . = ..() + if(!istype(newloc, /turf/open/indestructible/sound/pool)) + var/datum/component/swimming/S = Obj.GetComponent(/datum/component/swimming) //Handling admin TPs here. + S?.RemoveComponent() + +/turf/open/MouseDrop_T(atom/dropping, mob/user) + if(!isliving(user) || !isliving(dropping)) //No I don't want ghosts to be able to dunk people into the pool. + return + var/atom/movable/AM = dropping + var/datum/component/swimming/S = dropping.GetComponent(/datum/component/swimming) + if(S) + if(do_after(user, 1 SECONDS, target=src)) + S.RemoveComponent() + visible_message("[dropping] climbs out of the pool.") + AM.forceMove(src) + else + . = ..() + +/turf/open/indestructible/sound/pool/MouseDrop_T(atom/dropping, mob/user) + if(!isliving(user) || !isliving(dropping)) //No I don't want ghosts to be able to dunk people into the pool. + return + var/datum/component/swimming/S = dropping.GetComponent(/datum/component/swimming) //If they're already swimming, don't let them start swimming again. + if(S) + return FALSE + . = ..() + if(user != dropping) + dropping.visible_message("[user] starts to lower [dropping] down into [src].", \ + "You start to lower [dropping] down into [src].") + else + to_chat(user, "You start climbing down into [src]...") + if(do_after(user, 4 SECONDS, target=src)) + splash(dropping) + +/datum/mood_event/poolparty + description = "I love swimming!.\n" + mood_change = 2 + timeout = 2 MINUTES + +/datum/mood_event/robotpool + description = "I really wasn't built with water resistance in mind...\n" + mood_change = -3 + timeout = 2 MINUTES + +/datum/mood_event/poolwet + description = "Eugh! my clothes are soaking wet from that swim.\n" + mood_change = -4 + timeout = 4 MINUTES + +/turf/open/indestructible/sound/pool/proc/splash(mob/user) + user.forceMove(src) + playsound(src, 'sound/effects/splosh.ogg', 100, 1) //Credit to hippiestation for this sound file! + user.visible_message("SPLASH!") + var/zap = 0 + if(issilicon(user)) //Do not throw brick in a pool. Brick begs. + zap = 1 //Sorry borgs! Swimming will come at a cost. + if(ishuman(user)) + var/mob/living/carbon/human/F = user + var/datum/species/SS = F.dna.species + if(MOB_ROBOTIC in SS.inherent_biotypes || ispreternis(F)) //ZAP goes preternis + zap = 2 //You can protect yourself from water damage with thick clothing. + if(F.head && istype(F.head, /obj/item/clothing)) + var/obj/item/clothing/CH = F.head + if (CH.clothing_flags & THICKMATERIAL) //thick suits should suffice! But preternis are robots and probably not water-sealed. + zap -- + if(F.wear_suit && istype(F.wear_suit, /obj/item/clothing)) + var/obj/item/clothing/CS = F.wear_suit + if (CS.clothing_flags & THICKMATERIAL) + zap -- + if(zap > 0) + user.emp_act(zap) + user.emote("scream") //Chad coders use M.say("*scream") + do_sparks(zap, TRUE, user) + to_chat(user, "WARNING: WATER DAMAGE DETECTED!") + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "robotpool", /datum/mood_event/robotpool) + else + if(!check_clothes(user)) + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "pool", /datum/mood_event/poolparty) + return + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "pool", /datum/mood_event/poolwet) + +//Largely a copypaste from shower.dm. Checks if the mob was stupid enough to enter a pool fully clothed. We allow masks as to not discriminate against clown and mime players. +/turf/open/indestructible/sound/pool/proc/check_clothes(mob/living/carbon/human/H) + if(!istype(H) || iscatperson(H)) //Don't care about non humans. + return FALSE + if(H.wear_suit && (H.wear_suit.clothing_flags & SHOWEROKAY)) + // Do not check underclothing if the over-suit is suitable. + // This stops people feeling dumb if they're showering + // with a radiation suit on. + return FALSE + + . = FALSE + if(!(H.wear_suit?.clothing_flags & SHOWEROKAY)) + return TRUE + if(!(H.w_uniform?.clothing_flags & SHOWEROKAY)) + return TRUE + if(!(H.head?.clothing_flags & SHOWEROKAY)) + return TRUE + +/obj/effect/turf_decal/pool + name = "Pool siding" + icon = 'icons/obj/pool.dmi' + icon_state = "poolborder" + +/obj/effect/turf_decal/pool/corner + icon_state = "bordercorner" + +/obj/effect/turf_decal/pool/innercorner + icon_state = "innercorner" + +//Pool machinery + +/obj/structure/pool_ladder + name = "Pool ladder" + desc = "Click this to get out of a pool quickly." + icon = 'icons/obj/pool.dmi' + icon_state = "ladder" + pixel_y = 12 + +GLOBAL_LIST_EMPTY(pool_filters) + +/obj/machinery/pool_filter + name = "Pool filter" + desc = "A device which can help you regulate conditions in a pool. Use a wrench to change its operating temperature, or hit it with a reagent container to load in new liquid to add to the pool." + icon = 'icons/obj/pool.dmi' + icon_state = "poolfilter" + pixel_y = 12 //So it sits above the water + idle_power_usage = IDLE_POWER_USE + var/id = null //change this if youre an annoying mapper who wants multiple pools per area. + var/list/pool = list() + var/desired_temperature = 300 //Room temperature + var/current_temperature = 300 //current temp + var/preset_reagent_type = null //Set this if you want your pump to start filled with a given reagent. SKEWIUM POOL SKEWIUM POOL! + +/obj/machinery/pool_filter/examine(mob/user) + . = ..() + . += "The thermostat on it reads [current_temperature]." + +/obj/machinery/pool_filter/Initialize() + . = ..() + create_reagents(100, OPENCONTAINER) //If you're a terrible terrible clown and want to dump reagents into the pool. + if(preset_reagent_type) + reagents.add_reagent(preset_reagent_type, 100) + var/area/AR = get_area(src) + for(var/turf/open/indestructible/sound/pool/water in get_area_turfs(AR)) + if(id && water.id != id) + continue //Not the same id. Fine. Ignore that one then! + pool += water + GLOB.pool_filters += src + +//Brick can set the pool to low temperatures remotely. This will probably be hell on malf! + +/obj/machinery/pool_filter/attack_robot(mob/user) + . = ..() + wrench_act(user, null) + +/obj/machinery/pool_filter/attack_ai(mob/user) + . = ..() + wrench_act(user, null) + +/obj/machinery/pool_filter/wrench_act(mob/living/user, obj/item/I) + . = ..() + var/newTemp = input(user, "Set a new temperature for [src] (Kelvin).", "[src]", null) as num + if(!newTemp) + return + newTemp = clamp(newTemp, T0C, 320) + desired_temperature = newTemp + return FALSE + +/obj/machinery/pool_filter/process() + if(!LAZYLEN(pool) || !is_operational()) + return //No use having one of these processing for no reason is there? + use_power(idle_power_usage) + var/delta = (current_temperature > desired_temperature) ? -0.5 : 0.5 + current_temperature += delta + current_temperature = clamp(current_temperature, T0C, desired_temperature) + var/trans_amount = reagents.total_volume / pool.len //Split up the reagents equally. + for(var/turf/open/indestructible/sound/pool/water as() in pool) + if(reagents.reagent_list.len) + water.set_colour(mix_color_from_reagents(reagents.reagent_list)) + else + water.set_colour("#009999") + if(water.contents.len && reagents.total_volume > 0) + for(var/mob/living/M in water) + if(!istype(M)) + continue + var/datum/reagents/splash_holder = new/datum/reagents(trans_amount) //Take some of our reagents out, react them with the pool denizens. + splash_holder.my_atom = water + reagents.trans_to(splash_holder, trans_amount, transfered_by = src) + splash_holder.chem_temp = current_temperature + if(prob(80)) + splash_holder.reaction(M, TOUCH) + else //Sometimes the water penetrates a lil deeper than just a splosh. + splash_holder.reaction(M, INGEST) + splash_holder.trans_to(M, trans_amount, transfered_by = src) //Actually put reagents in the mob + qdel(splash_holder) + var/mob/living/carbon/C = M + if(current_temperature <= 283.5) //Colder than 10 degrees is going to make you very cold + if(iscarbon(M)) + C.adjust_bodytemperature(-80, 80) + to_chat(M, "The water is freezing cold!") + else if(current_temperature >= 308.5) //Hotter than 35 celsius is going to make you burn up + if(iscarbon(M)) + C.adjust_bodytemperature(35, 0, 500) + M.adjustFireLoss(5) + to_chat(M, "The water is searing hot!") + +/obj/structure/pool_ladder/attack_hand(mob/user) + var/datum/component/swimming/S = user.GetComponent(/datum/component/swimming) + if(S) + to_chat(user, "You start to climb out of the pool...") + if(do_after(user, 1 SECONDS, target=src)) + S.RemoveComponent() + visible_message("[user] climbs out of the pool.") + user.forceMove(get_turf(get_step(src, NORTH))) //Ladders shouldn't adjoin another pool section. Ever. + else + to_chat(user, "You start to climb into the pool...") + var/turf/T = get_turf(src) + if(do_after(user, 1 SECONDS, target=src)) + if(!istype(T, /turf/open/indestructible/sound/pool)) //Ugh, fine. Whatever. + user.forceMove(get_turf(src)) + else + var/turf/open/indestructible/sound/pool/P = T + P.splash(user) + +/obj/structure/pool_ladder/attack_robot(mob/user) + . = ..() + attack_hand(user) diff --git a/code/modules/pool/pool_items.dm b/code/modules/pool/pool_items.dm new file mode 100644 index 000000000000..9d4049449892 --- /dev/null +++ b/code/modules/pool/pool_items.dm @@ -0,0 +1,78 @@ +/obj/item/twohanded/required/pool + icon = 'icons/obj/pool.dmi' + lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items_righthand.dmi' + force = 0 + damtype = STAMINA + force_wielded = 5 + wieldsound = 'sound/weapons/tap.ogg' + unwieldsound = 'sound/weapons/tap.ogg' + w_class = WEIGHT_CLASS_BULKY + attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") + +/obj/item/twohanded/required/pool/Initialize() + . = ..() + //Pick a random color + color = pick(COLOR_YELLOW, COLOR_LIME, COLOR_RED, COLOR_BLUE_LIGHT, COLOR_CYAN, COLOR_MAGENTA) + +/obj/item/twohanded/required/pool/rubber_ring + name = "inflateable ring" + desc = "An inflateable ring used for keeping people afloat. Throw at drowning people to save them." + icon_state = "rubber_ring" + +/obj/item/twohanded/required/pool/rubber_ring/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) + . = ..() + if(ishuman(hit_atom)) + var/mob/living/carbon/human/H = hit_atom + //Make sure they are in a pool + if(!istype(get_turf(H), /turf/open/indestructible/sound/pool)) + return + //Make sure they are alive and can pick it up + if(H.stat) + return + //Try shove it in their inventory + if(H.put_in_active_hand(src)) + visible_message("The [src] lands over [H]'s head!") + +/obj/item/twohanded/required/pool/pool_noodle + icon_state = "pool_noodle" + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + name = "pool noodle" + desc = "A long noodle made of foam. Helping those with fears of swimming swim since the 1980s." + var/suiciding = FALSE + +/obj/item/twohanded/required/pool/pool_noodle/attack(mob/target, mob/living/carbon/human/user) + . = ..() + if(wielded && prob(50)) + INVOKE_ASYNC(src, .proc/jedi_spin, user) + +/obj/item/twohanded/required/pool/pool_noodle/proc/jedi_spin(mob/living/user) //rip complex code, but this fucked up blocking + user.emote("flip") + +/obj/item/twohanded/required/pool/pool_noodle/suicide_act(mob/user) + if(suiciding) + return SHAME + suiciding = TRUE + user.visible_message("[user] begins kicking their legs to stay afloat!") + var/mob/living/L = user + if(istype(L)) + L.Immobilize(63) + animate(user, time=20, pixel_y=18) + sleep(20) + animate(user, time=10, pixel_y=12) + sleep(10) + user.visible_message("[user] keeps swimming higher and higher!") + animate(user, time=10, pixel_y=22) + sleep(10) + animate(user, time=10, pixel_y=16) + sleep(10) + animate(user, time=15, pixel_y=32) + sleep(15) + user.visible_message("[user] suddenly realised they aren't in the water and cannot float.") + animate(user, time=1, pixel_y=0) + sleep(1) + user.ghostize() + user.gib() + suiciding = FALSE + return MANUAL_SUICIDE diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 6add2927d80dfff14d3d5c8a7b55b250e068b196..d2ccb674dfb369eef97d7df162cbcd0d4620ce2b 100644 GIT binary patch delta 2189 zcmV;82y*w0r~#;}0gxAefCvTv000cl$s+&&0(5#*Sad{Xb7OL8aCB*JZU6vyoSm1! zZrd;nhR^X+2<_D!8aLZcz6|Y(9@6#18|=udk!%oXSqEwc6b!>!%WE*oNzG3 zB4}VlpCt#{OBS*SeZo8!fxH;VdyP<%oLF#w1~YaMSW+IvAM>G55DP=>%5G_ZV;9|= zEamNLgt5S;p2_upkz(E;hdv*(}Rx!&w(eO5|&3 zh+xJ7#Z6&OC=3NHK`{xLu^0>`^3!g{$mG}Mx3NJ|45C`Ky{?;W-JG|n;8BBfYf1lI zImT*mE>D7Ut7Ux8UEvhvl+QGI`hJ(!?_(Wgsv}8L643O$fpQqgdslwgv^Kq-#QZ=by)IkvvZkzigh4|M7EhsqUT+Zq@DML-iAP=$|QU&!Z2snF1O> z0utA=wL-ZJe+QvWo^c$p3^r)MoxOP# zyll5oM(zpjAX0e2!wzEUgltY7rH*v8#f%o()rwnM$+Lrd>f1I+lk|O)yv_G>Y1+K+ z^ZeiEN%Q{tym{4_T>;qGf7sy7zX@R*BV&w_nycFw!)u@c zV@&7*;PRsxV_yS}@cX|%`v<`CqZ!5tK-)U9)aJUbSvz`6kx1mL{kDxpqfWJ2mFv2^ zxz(|;v0=hAMy~6cxw$#5udja}jYggQws#!IdGO#tCrS&YmEV5W(9n<*ruknxdQ6Vv z>^t|-e`wT+Mx&uQwr+U;qfZ@4`sJ^`yIl%^5DPp2x~^*$78Z2+^l7J=lfU%lQt`sV zLeQm!Rx}!Q>=^a>iPAg&LqkJfH@hG6U!M&CVVnO}_GA7V3(N06fIj8Au9=*iY1@krBcR*yIKLyK5y$L1Ofm6w4hPYswc>>=nZ$-Y}RD6**$$tOiY+t zw{A5Ii9xw7?dhx5&koWaYP&x=+SXX{@2vm;eBlj1euNKi8{Jrm%VaXj<#PLOm(6BP ze=3zSi;Iha)M?vJBoa!e)0&>1*68Typ7FkP>5@vNl5)A6GMS9uWz=1lPM zJ{$hh>9lU%yt!w*XJ==3Z0|jWAjR8!f6mW+`q^Nc`w;*E0KUlQ^BNx?_r2Zm@p0wz zdEeV@#ofDiYlgsBEM|f@=6dW{Jbd_Y&v+-3$&S_GbxLwJi`Px1kTmw|*1e3W6q4pt z8!LIIB*)vvX7PGYTn>JH=X_7pVcD^nQ+u@$0098L2y(@#Q>$6K?Os*ets8YEe-a6u zJ9n;b-}}|rI0j{<7ZV}dn`$9k2L@Q@CfVws1eq>0h0jj(slqOkknQ#mqXb$008J8O$WeQL9bRI z2`Uga+ith}m)?v^E|>GIj$AHhS_yxIasU9(NK*lDX=%xn%jF%xqFgTP$&)8LLSU`! z{LpN>-R|G(>eZ``U;VezR#0OA0Dk}ukER0P)2B}*y$O9bSj6LTojG$x@pxR)+u-5d z-Y>QK->sMWUtL}GwSRA$-5LV`0C0FTy|U!Gu92kS;bFz&@f|CF_In#rE?&Io+v-=n z{zpbew)?Qb=P>u*D>VQBfbeT6B;;~AbK=Aa4G$0Rd2V%eRnMP4_w~|eqbmOG%A=(1 z@Ojw#@0A(=06@646%@Q7q#L25-}~>C8UO%5AF`Ju>A$~glOY2k7q$HdynS2)b6j|n P00000NkvXXu0mjfh!9u_ delta 1862 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 delta 1943 zcmV;I2Wa?|uK|dx0gxAeUt9Bo6s?Cvlv8q+KO|`K|gO#5@NkCA4wd%?TvE+xVYSR-Z z)v8^!*)vR-RI9cZ4kVn&>mcGV3!6@6U4S`?Iso@svgZ&Za+cc@V}~apKg^VD!3qac zEP@6`^jUJCy<{Pa&?n4u5y*>y{HYO2k`oK!XE0+IfhFZp{5~HF1#x7EU0IX{ICjy^ z$x?n_jW8DMsb_M3eWaM*kVBupxn>~WWU&{DF@%+zf37w?IykFVZR^+Xx5e2bl9b5T z&=A3l1&W)(oKP4FEI}~|nXwoQCGyj5#>nK?<+rgxQVgP6wY{mEZQU$wDtOZ1+*;Cq zRgSS5oXeBo+-e!$avyMta?WR(Jbk;*>v7f^xu4CL-%>+=8d28o^yv?hTeR5F4_K5C zhL=#{;|Uo$J?Cf35qy3GJdl>)Nl*pO`*`o5l=|>qi$*H)RCKchPxE9}1K(XvYU-wL zmZDB02$oGrU=GLpEDZ%UPUE@Lvm5ZH9NqrkoLV~jOTE3VZIs?p9(CndyDOp07 zPnZNYcD4S0yEpa!Ym5@u*!NsclMiNgzy*`%7443MuE&C>6FNE|pCgzNhP)?)%!mc! z|DwzMB(&jxtOIc0aY4un+~@suLLZ97p&gjftUgYgOUZZjZrQC*Ivn%1**joNGU>=G$7 z1cShs4guo^MAJZVk|Gy-iXCE~F>WOXy&cM>vi@0?^xi*xKZ|AkdGx&Z-06M%>JGno z^G36C7j^!VwD$JjMt1dYZ~tvz?-kTGX#(H=lko^me;{Udp06AK_Wu69>G#}Gc%Elg zS68jYM|63fXLg>i8_)Bo|AaEePT_fF#yl`hVZHRU1EcoEv~7AOG#g=eWnX^L#y#+YP`3iSq>3 zkL`)gKkqNj+b#(WY%f97KM4&$Qjh;2R{xW-4*-~8p68iLrIMHrvPz|5UcP*3Z9KN) z2dz@6Q2z+U4_eY18R`!JozmUz%w#gDt*tF3f1wGeR4Qg`YfD$JUQNX@ei&}vyh;5d z5l(kI>ef{GkGrmG{M%vV*`8BWasdDUh?Umn zf38p{m_nh@(NHZeE}91q9`tPz$Cb;V&$XRPFOQ^-_v?1wDDk4;>FjJI^BP9ia{vJV zldZLZI7O<7y*!o7ZK>lt*xOR-=@5-vf3J8^@ag7e*eQ$+4IluZt3sh*T-P7E~&g!cJo#rBX=?3kze7>5u=}vu7Rgv)Sxe-)oRudaZ0ee|hpG zv{l+UDb=XnGxc)T_&<+V@}^$Snzf zIUgE806$2p1ln}k7=z5kS1)Hx>fN8ZeAkm{97vMB`0fu$ z((y|E%#BI=Yy6mDdjELdG%wxIe>aa@y<7iD?)@o6sR?Xex^dh5vxpGCdT1}F)y}ccDT9L}-uOBi>AMQw!e*6COq2tt#PyX)54Aa!{kxb)2jpj!> zH=R=T$FIUp=>*d_(A4qKnO;K!2mt7?yStkzl}g%-*-7u4o0}??O4{Ase;xWFf@-yz zavVq9#_z}XFSMxDYATn@DwoTnB|bzh?QG|A8u$Lxhui)NV0$w+h@-=QhJLLrjpmWk zhdY`wb)BD1%l-D3uv0oAeYm4W^K1=ZB(Jgo0EExK0#(vT4OLM5^Wz-HQMFnfIp5at zw`%+?r7v95xv$Hi?|=SRzUd3s)ZBY9^w?~um$N2H`2YZrcv1TA8&S#y0000000000 d00004;$MO5QGs^;nMwcv002ovPDHLkV1m!4-j@IX diff --git a/icons/mob/inhands/weapons/melee_lefthand.dmi b/icons/mob/inhands/weapons/melee_lefthand.dmi index 50ae2fb1639def792761ed8e5cdf9181459bed50..551e45cd5428ad5ae62bdce03953ef9d80542542 100644 GIT binary patch delta 2524 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 delta 2309 zcmY+Ddpy(s7sp2zj0nRwm%^7Vmlf)3s5Xfh=GID4O_JO~BSd^ii*ns$zC}c4M2(V0 z%Unt;eVbG+VRH|Qxx_G=Uwyy7-=pvE{Bh2CpT~K;&+G9#kFy4$D`)FTkcs+tRHRyb z>p&ooM5Kqy5s>wGkN=Mchd8JLFf&_B4Tfr6YQAIOF#jOC_QvF zjs^qT`e3J1E$Ty<5kW+r_6m`G=o>^vDrq=r!1Itc>D*k|Z>Q$BN-YPa{*@T)X<&GW zazm(G=4ymE`N zxOBIN`o#KrM7IpI25t}l?7e=2#o3|W_c?w4Ymfe?cte#>IX@_hBOu3Gz**Xif9+Ioh^8H*y8nTodGb z9}Dndi}Kq(2i@$QQ>1tB3*EmOnLu%iQ|=v} z)bb^tkpZ_39Od597R=cv-%v3+$jEHHxneuTa?{hzm@U6QVN4CoiYr--104rR(l)K% zUZh{3TRL66S|U_1D0eVRO*o_|&|JdpsB)D*?d0zU+iUqIzjg7=kOq2!99~TxYN9zf zPi#;_gwv1BR>S>~K$RhxJd=?PJMo5Gkx+SOj1uSTLE77Lt`c|TlH;Tc){8`m+{SxW zweR8gLca=h(A?uL+9L+k@)KY@Tn#ma{0-|LS7HIygk3Z09BrSYUot};BT%Vt^3WGM zt@g>(rGatO+ofD0`B_$1&ud!*0oH7wd4CWDh^;&m&CJXo+?9N~-^dIxa+V&^gQ$#` z8>9(e*Xt^GWbnlpY@ITj2tw?%%HZIl)h}a|cE87uS}F~0wxjk6o^RU-wd6_@)0@M+ z(d3K#BMvC%>^7bh@lV^jLrpmxYIee(dKvb{#5ex?HX3KDCi@qxvAOr(qx8=OY6A6s zPzqeJgH-5aljEuK^J}(m`CD_Li)t@YQDUJUaHC?l>m=EBd@`NtCN zt;a&=Q&KzAH@ub^LI>Uww+z#BtY>Ho4fz`bGxsUDahL)L$JOo?*)&IlT0b1Zu~U6t!ms6^EPjOe9O-9&O?lLkq%) zDE^MYei@e`7Pv}8NJ1W+DLb{GHZInG^gVZZgI*vWkj+9A+-N=0If|5YG5e<@7f{DYUoef1uE%+_H>4A_WP zKW(}Wx6 za81YHp!$`m)@YwOE+kz5GmnmWa6WNP{Bl)A^C7i*TKsZD)nEXUkRgEmdv@xGDCId@ zfv?gGC(Zi-?}S+b`yFGsv}AAFuPb3mboTZxCa+F^tI@>g-AFdwxP8Vo5s!W-keYGS z#+uy2MHbFcU5jFk_*cYhC%#t(QG}ngc2nq-1~Gbk_(MWXEKYj`I~l&?k7^T0jzYQF{NDTKO|m@EVGtYx~T}3RUSR zJzrWwE`D-U?C9EFcY(F&?OOk`f_k!fW?Oit&{D#Z1 zW3!7I+UG-7h$mx|x#3YzOk{%iX$K@h4Pd{@F*@F*uVz4q9_gm$J>Gvwqy`X5W})K3 zG%I(HLch1|6#Q^Y+#GKK@1@Ee9^tL#NtUT{Uef6F>_ys$w|ickC$n}oVeQVmFsta} z@^YEDw8eW4EegIZUYm z`8o}=)(i{c#r1Qnl+jgSTvw=eY-_`Mk8PL8vpA+3p*8`n83|{|@x;kU^=`zoWCy1F z7kXnoY>J+-EPKIe6-V-&S1%oLDdC@3V%lj@4FmdtHmxx9`Y#sM%FacsuEz)Vs=(AZ zTMAsFG0kPeqb+esA1B9hEnfS|6oqtOdEOAR(HYpuP+|JU9(7P2fa~N|NA;V#<@GtA zxjb}t`Mth7^z$mA?c~#=IjWqjFqqP)+e2Ic<{5V7H#u8}?bm`tHW9J8W$D%*E~))! z9JjaxR*^$wVM@K2;ZVjdon0y36zAqzK~!3_%VvRNc5fJvTg+3s&Z=2__Xv3YI|aEO z4;)BLZ0u)e_7?G07~W$cNTzrX3lbH9Lir;Wg6*4lD}QNAHq;ksEe7OsEhIVbQhu}i z(Vx}u_V$97g@*t53Lb@G=*wdT@+_%e0BmA~ePa{uX0Lj2rU)R_bi+4xT%R!>%Yl9e zcqbYS^s`hNM3?jW$vyyIUJS)Hfe&6k z>!Qmv&MV3UTDx+8DQ*|I?Pjfny(D_@ewNU7F1C+se6Icn D<0)y= diff --git a/icons/mob/inhands/weapons/melee_righthand.dmi b/icons/mob/inhands/weapons/melee_righthand.dmi index 24f4e1ab8210a7de0bfc909e834a49de579bd582..21976c191fde28abbe99fe97e03729e1d569afaf 100644 GIT binary patch delta 2513 zcmY*Xc{tPy7amk|35mfiyF?2YmB=nz?!Ao4F2E3d4}> z5s}dtM#erE42BuTRnPZ)ec$=xJmb7VgRUx@h!Rn~F-b@OsX?$}lSV(>9FL6ur?V9H3vr zQP9A_61^og7@K_Bw=7!uMnJ-2uhQVI*hAT79M7~GP`tl2`bU)yw|rZ?gQUIAk=7gG$)r==aO{4?b6?D70u&_7}MPlMJx6< zao#IrV4cuBh)fFuC!*nfe&qS465`49zbRMQUx~|N(V)j{oe{0=GnS8!d4X-_B`Qp= zCHimsjn8u#P+dy#ZLl#DDc*+m_HBZ_hl{s}*TymMDJ0MGM6p69@%u{m^MXdbNOAS| z_WcL4aQohF(a+R?9DENLO>Hd#3G1+``A9>q(nd` z7<&&`;}7h_$7sACYt;)5Z8Dp$BXq|H7IOTw<7bi-XPxbQe^Qat&<$W-)tPR$8gdc% z9RkkEaZSz2scn_TnzR4bz6}(>@*B^2O$erms3gvZ=0Td>**=FjU}}*$NrjiitT>CK z#y!@vP1-zNj-yNjR;}DYw9>vKxv?@ZTSTd)0F(JV!Jy9T<&66(XmPbsG0p00DcjSlXEj%T^~V0@KPucW<4KB( ze(7mvl;&53a+;^Yzx=ilo9L-}MT6J>dU|vF$4M3JDFBXqX2jVvGgDV$CihF~0AH_i zd9sI*Wy|`|ds(6&WFD@w!|3#-&nBm~w{bsDXcud#{@`X|;6 zxMg^)C6aT{QRPg=hUCH1{|W(l!%MQG1N10Yu3i>hGO`)lPpakmxJ?+&pwVv)=Xil1 zaMsiBtNmaluB|f7B5AqID!H0Thc~NehfIYIjjrF%Rp^QlB9s_f5ugexEhX6RJg=%S z7A_C8^nt_HKQN$6BEKoVhgu?t#XZnu@eeo~%xvD|MzIz0qQUcjyjWjfIQ)y!K}DR7 z*}SpheQnOec!frv?PrAbtIx7^;VV(FxhVJlK%dpm!LQ~GL5d$8M$EAq=EOq0950kK zHt2msbPgR9g41FbOP(jfIEa97DaAa=HbZ0lNj@izObkog%1v8Ua<+HT7S2fdwA1V% z{D12O+H^er`l!nFN%S%nho`-mJ4!`OkO@01TsUe1hSGwK{tmwjz~*RlcE=X`18L`j zJR|6sFMv_ku%Ak$-yut(PQ8@yo!>F6=mv=nlmjI}c?n+mGSRvh78prl9)Cvk@c9&4 z$6aUAgw(Ne+848fwrD~G)zjMar$KC*5ZC{(IdpfEczI>Be4b*H6t~*(21kHHI=KY* zt?VqOo_@kp9mK76L?59TbnpC{FzqfnpO}`Q`L2O+UUCE=vh9y5HYBo~Tb*h|>_Yh% z&GC({)zw|HlJ*?He+B8^NG`-NJ3FOTpi5`ijF!u~nB>C3$duC6@7tplGw-|=K_IyRnxkkNz7ljR*@GWzU<7esUA^B)Of#1CH0T^-b~fj zs#NddbaGz09k~xhh@=c%9P28EzNKW<&K`jrUgGDW;lBw?%Gk~qV`}QhJ1~h>Z>(}}{4AI*k-f*dPdd7v)ls_eo7!(0z5~0j+ z$t!kCqFUWY9Jqvz;-bo)^?qgT`jMvEV`{Qe(-7Za%Cda8?Zt22$z~lLJBYh$N(~8k zC&lcv{#Rxu9Xso8J37P`nkT#@F8OEA`chwxj?O*+fVj1T33U2)k*(7>L%&^)(zcxR zy4+3hm-g6)q`@xy!)JL9Nu2zz24XPpwq1vIf*H)z(z6wsjE77XPA}j*>-z4nx$BpD zTmz10i#t5nVkuB13PX7Fx&d$uU2Tw?{OtM7aKUxK`3kM)s|QoJ+SSv1zitkg^bKn| zM>w}tCeBN|<-Rw}}Y;M%)0lc@395cf=%-o+JX lFQiAR6r~n&;D`%k_n6r6+LQUvm(D*7GBdU?s=DeD|1TaD^xpsg delta 2314 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 Date: Wed, 9 Feb 2022 14:56:05 -0500 Subject: [PATCH 2/6] re-map pools --- _maps/map_files/YogsBox/YogsBox.dmm | 710 +++++++++++--------------- _maps/map_files/Yogsmeta/Yogsmeta.dmm | 682 ++++++++++--------------- _maps/shuttles/emergency_luxury.dmm | 245 ++++----- 3 files changed, 702 insertions(+), 935 deletions(-) diff --git a/_maps/map_files/YogsBox/YogsBox.dmm b/_maps/map_files/YogsBox/YogsBox.dmm index 07887ba41bc8..bfab694bd139 100644 --- a/_maps/map_files/YogsBox/YogsBox.dmm +++ b/_maps/map_files/YogsBox/YogsBox.dmm @@ -231,16 +231,6 @@ /mob/living/simple_animal/spiffles, /turf/open/floor/plasteel, /area/clerk) -"aaE" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) "aaG" = ( /obj/structure/window/reinforced, /obj/structure/chair{ @@ -5904,29 +5894,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"apf" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -24 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "apg" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -6397,23 +6364,6 @@ }, /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet) -"aqT" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "aqU" = ( /obj/machinery/door/poddoor/shutters{ id = "armory"; @@ -6526,16 +6476,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"arn" = ( -/obj/structure/closet/athletic_mixed, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "aro" = ( /turf/open/floor/engine{ name = "Holodeck Projector Floor" @@ -6789,20 +6729,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"asr" = ( -/obj/structure/closet/boxinggloves, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/clothing/shoes/jackboots, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "ast" = ( /obj/structure/closet/lasertag/blue, /obj/effect/turf_decal/tile/neutral{ @@ -6996,15 +6922,6 @@ }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) -"ath" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "ati" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -7053,24 +6970,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/courtroom) -"atn" = ( -/obj/machinery/door/window/eastright{ - base_state = "left"; - dir = 8; - icon_state = "left"; - name = "Fitness Ring" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) "ato" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair{ @@ -7216,15 +7115,6 @@ "atN" = ( /turf/closed/wall/r_wall, /area/science/nanite) -"atP" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) "atQ" = ( /obj/machinery/door/airlock{ id_tag = "Dorm5"; @@ -7371,15 +7261,6 @@ /obj/machinery/light/small, /turf/open/floor/plasteel/dark, /area/security/courtroom) -"aur" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) "auu" = ( /obj/structure/chair{ dir = 8 @@ -7389,18 +7270,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"auv" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) "auw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -7513,6 +7382,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/maintenance/department/electrical) +"auN" = ( +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness) "auO" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -7968,12 +7840,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) -"awb" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "awc" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -8422,19 +8288,6 @@ }, /turf/open/floor/plasteel, /area/hydroponics/garden) -"axU" = ( -/obj/structure/window/reinforced, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) -"axW" = ( -/obj/machinery/door/window/eastright{ - base_state = "left"; - icon_state = "left"; - name = "Fitness Ring" - }, -/obj/structure/window/reinforced, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) "axX" = ( /obj/machinery/light/small{ dir = 8 @@ -8796,35 +8649,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"azl" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"azm" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"azn" = ( -/obj/structure/table, -/obj/item/clothing/mask/balaclava, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "azq" = ( /obj/structure/cable{ icon_state = "1-2" @@ -9056,47 +8880,6 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) -"aAk" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) -"aAl" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "aAm" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -28786,10 +28569,6 @@ /obj/effect/turf_decal/trimline/red/filled/line, /turf/open/floor/plasteel, /area/security/checkpoint/medical) -"bZi" = ( -/obj/machinery/holopad, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "bZC" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -32477,20 +32256,6 @@ /obj/structure/chair/office/dark, /turf/open/floor/plasteel/dark, /area/engine/engineering) -"cUT" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) "cVb" = ( /turf/closed/wall, /area/hallway/secondary/service) @@ -33042,6 +32807,22 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"drN" = ( +/obj/structure/closet/boxinggloves, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/clothing/shoes/jackboots, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/twohanded/required/pool/rubber_ring, +/obj/item/twohanded/required/pool/rubber_ring, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "dsh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -33725,6 +33506,12 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/fore) +"dOj" = ( +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "dOS" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -33758,6 +33545,25 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"dPw" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -24 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "dPy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -34671,6 +34477,18 @@ "eyT" = ( /turf/open/floor/plasteel/dark, /area/maintenance/department/tcoms) +"eyY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "ezo" = ( /obj/machinery/status_display/ai{ pixel_y = -32 @@ -35252,15 +35070,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"eQU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "eQZ" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -35318,17 +35127,6 @@ /obj/machinery/light, /turf/open/floor/plasteel, /area/construction/mining/aux_base) -"eTs" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) "eUi" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/closet/firecloset/full, @@ -35860,16 +35658,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) -"fkH" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) "flZ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -36138,6 +35926,16 @@ }, /turf/open/floor/plasteel, /area/security/main) +"frJ" = ( +/obj/structure/sign/departments/minsky/command/charge{ + pixel_x = 32 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "fsW" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/plasteel, @@ -36479,6 +36277,18 @@ /obj/structure/table/reinforced, /turf/open/floor/plasteel/dark, /area/science/xenobiology) +"fHE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/effect/turf_decal/pool/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "fHT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -36495,6 +36305,13 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"fIa" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "fIb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -38204,19 +38021,6 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) -"gOF" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) "gPr" = ( /obj/machinery/door/window/northleft{ base_state = "right"; @@ -38302,6 +38106,10 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"gQL" = ( +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "gQM" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -40518,19 +40326,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"ild" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) "ile" = ( /obj/structure/closet/secure_closet/paramedic, /obj/effect/turf_decal/delivery, @@ -42630,6 +42425,27 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space/basic, /area/engine/atmos_distro) +"jvO" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/pool/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "jwH" = ( /obj/structure/cable{ icon_state = "1-2" @@ -42864,15 +42680,6 @@ }, /turf/open/space, /area/solar/port/fore) -"jFA" = ( -/obj/structure/sign/departments/minsky/command/charge{ - pixel_x = 32 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "jFB" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /obj/structure/cable{ @@ -42954,17 +42761,27 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/library) -"jIM" = ( -/obj/structure/window/reinforced{ - dir = 4 +"jJC" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/turf_decal/tile/green{ - dir = 1 +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/obj/effect/turf_decal/tile/green{ +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/turf/open/floor/plasteel, /area/crew_quarters/fitness) "jJK" = ( /obj/machinery/telecomms/processor/preset_three, @@ -42986,6 +42803,10 @@ /obj/structure/window/reinforced, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) +"jKl" = ( +/obj/structure/pool_ladder, +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness) "jKn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43640,6 +43461,10 @@ dir = 4 }, /area/chapel/main) +"kfM" = ( +/obj/item/twohanded/required/pool/rubber_ring, +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness) "kgV" = ( /obj/machinery/camera{ c_tag = "Bridge West Entrance"; @@ -44783,6 +44608,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel/dark, /area/engine/atmos_distro) +"kTa" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/pool/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "kTm" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel, @@ -44917,6 +44750,13 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/fore) +"kXv" = ( +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "kXE" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -46874,19 +46714,6 @@ "mof" = ( /turf/closed/wall/r_wall, /area/quartermaster/sorting) -"moI" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) "mqp" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -47701,6 +47528,12 @@ /obj/structure/cable/yellow, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) +"mNU" = ( +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "mOa" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/firedoor/border_only, @@ -49417,6 +49250,13 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"nMw" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/pool/corner, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "nMN" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -49428,11 +49268,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"nMX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "nOA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -51882,6 +51717,18 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"pqy" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "pqK" = ( /turf/closed/wall, /area/maintenance/department/medical/morgue) @@ -52456,20 +52303,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) -"pGM" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness) "pHz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -53906,6 +53739,24 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) +"quL" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "quT" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -54532,6 +54383,9 @@ "qQV" = ( /turf/template_noop, /area/template_noop) +"qRD" = ( +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness) "qRK" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -55144,15 +54998,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel/dark, /area/engine/atmos_distro) -"ris" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "riv" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 @@ -56808,15 +56653,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/maintenance/fore) -"sjh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "sjo" = ( /obj/structure/cable{ icon_state = "1-2" @@ -57058,6 +56894,30 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/port) +"srS" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/table, +/obj/item/clothing/mask/balaclava, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "srV" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -30 @@ -57329,6 +57189,13 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"sBY" = ( +/obj/machinery/pool_filter{ + pixel_x = -16; + pixel_y = -21 + }, +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness) "sCf" = ( /turf/open/floor/plating, /area/maintenance/department/medical/morgue) @@ -58285,6 +58152,10 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"tlk" = ( +/obj/item/twohanded/required/pool/pool_noodle, +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness) "tlm" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -58767,6 +58638,18 @@ /obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, /area/medical/sleeper) +"tzF" = ( +/obj/structure/closet/athletic_mixed, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/twohanded/required/pool/pool_noodle, +/obj/item/twohanded/required/pool/pool_noodle, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "tzL" = ( /obj/structure/table, /obj/item/electronics/apc, @@ -59415,15 +59298,6 @@ }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) -"tTv" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "tTI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -64406,6 +64280,18 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) +"xgc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "xgh" = ( /obj/structure/window/reinforced{ dir = 4 @@ -102074,8 +101960,8 @@ xVA aqc apv arl -aqT -apf +quL +dPw avw rea rVP @@ -102331,13 +102217,13 @@ sIp kJl arj asb -awb -ath -asN -bZi -asN -azl -aAl +nMw +dOj +kXv +fIa +dOj +jvO +srS aCr iSq ayz @@ -102587,14 +102473,14 @@ qdv xls bDx arj -arn -asN -atn -eTs -moI -aaE -asN -aAk +tzF +gQL +jKl +qRD +qRD +qRD +mNU +jJC aCr cIO aAN @@ -102844,13 +102730,13 @@ arj arj arj arj -asr -asN -atP -pGM -cUT -axU -azn +drN +gQL +auN +qRD +kfM +qRD +mNU aAn aCr aCh @@ -103102,12 +102988,12 @@ iwj uyw arj asq -asN -aur -ild -gOF -axU -azm +gQL +auN +tlk +qRD +sBY +mNU auU aCr aCr @@ -103359,12 +103245,12 @@ cYm eeI arj ast -asN -auv -fkH -jIM -axW -asN +gQL +auN +qRD +qRD +qRD +mNU jXO iVG aCt @@ -103616,12 +103502,12 @@ nGE eOZ arj vBs -sjh -ris -ris -eQU -tTv -nMX +fHE +xgc +xgc +eyY +pqy +kTa nWA arj alP @@ -103876,7 +103762,7 @@ mck eAX gaI mhm -jFA +frJ eAX udq aAo diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index ebf0fdb80e7a..0a458876b302 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -3550,23 +3550,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"ahi" = ( -/obj/structure/chair, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) -"ahj" = ( -/obj/structure/chair, -/obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) -"ahk" = ( -/obj/structure/chair, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "ahl" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -4354,12 +4337,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/atmos) -"aiR" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "aiT" = ( /obj/machinery/door/airlock/maintenance{ name = "Paramedic Staging Area Maintenance"; @@ -5220,24 +5197,6 @@ }, /turf/open/floor/plasteel, /area/security/main) -"akL" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) -"akM" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "akN" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -5345,17 +5304,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/security/warden) -"ale" = ( -/obj/structure/table, -/obj/item/clothing/under/sl_suit{ - desc = "Whoever wears this makes the rules."; - name = "referee suit" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "alg" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -6327,13 +6275,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/main) -"anI" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "anJ" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -6494,14 +6435,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"aok" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "aol" = ( /obj/machinery/door/airlock/command/glass{ name = "Gravity Generator Area"; @@ -11171,20 +11104,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engineering) -"azw" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "azx" = ( /obj/machinery/nuclearbomb/selfdestruct, /obj/effect/turf_decal/tile/neutral{ @@ -37965,6 +37884,18 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"bGr" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "bGs" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -38430,6 +38361,18 @@ }, /turf/open/floor/carpet, /area/crew_quarters/dorms) +"bHA" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "bHC" = ( /obj/machinery/light/small{ dir = 8 @@ -45017,6 +44960,19 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"bYv" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "bYC" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -64195,16 +64151,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/port/fore) -"dqi" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "dqu" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -64534,13 +64480,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) -"dBY" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "dCb" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/red{ @@ -65874,6 +65813,10 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"eNI" = ( +/obj/machinery/pool_filter, +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness/recreation) "eNS" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{ dir = 1 @@ -65971,6 +65914,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"eUh" = ( +/obj/structure/chair, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "eUw" = ( /obj/machinery/camera{ c_tag = "Engineering - Transit Tube Access"; @@ -66398,6 +66349,10 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) +"fpv" = ( +/obj/structure/pool_ladder, +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness/recreation) "fqS" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -66526,6 +66481,13 @@ }, /turf/open/floor/plasteel, /area/janitor) +"fyq" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "fyr" = ( /obj/structure/table, /obj/item/stack/sheet/metal/fifty, @@ -66987,6 +66949,17 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"fTT" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "fUT" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -67190,6 +67163,23 @@ icon_state = "platingdmg2" }, /area/maintenance/fore) +"gcX" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "gdD" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -67726,28 +67716,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"gIZ" = ( -/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 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "gJh" = ( /obj/structure/chair/office/dark, /obj/structure/cable/yellow{ @@ -67931,25 +67899,6 @@ }, /turf/open/floor/plasteel, /area/engine/foyer) -"gRG" = ( -/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 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "gSl" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -67978,6 +67927,9 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"gXa" = ( +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness/recreation) "gXd" = ( /obj/machinery/mineral/stacking_unit_console{ machinedir = 8; @@ -68633,15 +68585,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"hHm" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "hHS" = ( /obj/machinery/light/small{ dir = 4 @@ -69193,6 +69136,12 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) +"ilM" = ( +/obj/structure/chair, +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "ilS" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -69688,11 +69637,6 @@ }, /turf/open/floor/engine, /area/science/mixing/chamber) -"iRE" = ( -/obj/structure/window/reinforced, -/obj/effect/turf_decal/trimline/blue/line, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "iRO" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -69735,6 +69679,18 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"iSv" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "iSC" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -70833,6 +70789,16 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) +"jZo" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/pool/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "jZz" = ( /obj/machinery/airalarm/tcomms{ pixel_y = 24 @@ -70888,13 +70854,6 @@ name = "Holodeck Projector Floor" }, /area/holodeck/rec_center) -"kbS" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "kcd" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -70922,6 +70881,12 @@ /obj/machinery/light, /turf/open/floor/plasteel, /area/engine/atmos) +"kdo" = ( +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "kdq" = ( /obj/machinery/door/poddoor/preopen{ id = "Engineering"; @@ -71323,15 +71288,18 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) -"kAo" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ +"kxv" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 10 +/obj/effect/turf_decal/pool/corner{ + dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "kAI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -72055,6 +72023,9 @@ "lnc" = ( /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) +"lni" = ( +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness/recreation) "lnH" = ( /obj/machinery/rnd/production/circuit_imprinter, /obj/machinery/airalarm{ @@ -73362,15 +73333,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) -"mJk" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "mKO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -73868,28 +73830,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"ntv" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 9 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "nue" = ( /obj/structure/chair/office/dark, /obj/structure/cable/yellow{ @@ -74535,17 +74475,6 @@ /obj/item/storage/box/fancy/candle_box, /turf/open/floor/engine/cult, /area/library) -"nYd" = ( -/obj/machinery/door/window/eastright{ - base_state = "left"; - icon_state = "left"; - name = "Fitness Ring" - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "nYJ" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -74907,9 +74836,6 @@ }, /turf/open/floor/plasteel, /area/medical/genetics) -"ovH" = ( -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "owf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -75562,6 +75488,15 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"ple" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "plS" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/RnD_secure, @@ -75970,6 +75905,15 @@ /obj/item/clothing/mask/gas, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"pFW" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/pool/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "pGf" = ( /obj/machinery/light{ dir = 1 @@ -76041,21 +75985,6 @@ }, /turf/open/floor/engine, /area/engine/atmos_distro) -"pIU" = ( -/obj/machinery/door/window/westleft{ - name = "Fitness Ring" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "pIW" = ( /obj/structure/window/reinforced{ dir = 1 @@ -76184,16 +76113,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) -"pSt" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "pSG" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/hidden{ dir = 8 @@ -77497,15 +77416,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"rfZ" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "rgh" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -78032,6 +77942,14 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"rDR" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "rEW" = ( /obj/machinery/button{ id = "maintshut"; @@ -78061,15 +77979,6 @@ }, /turf/open/floor/plasteel, /area/engine/foyer) -"rHB" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "rHS" = ( /obj/machinery/camera{ c_tag = "Brig Physicians Office"; @@ -78278,6 +78187,12 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"scS" = ( +/obj/structure/chair, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "scU" = ( /obj/structure/table, /obj/item/toy/cards/deck, @@ -78917,6 +78832,15 @@ }, /turf/open/floor/plating, /area/engine/atmos_distro) +"sHQ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "sIj" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -79406,6 +79330,16 @@ icon_state = "panelscorched" }, /area/engine/atmos_distro) +"tiR" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "tkt" = ( /turf/open/floor/plasteel, /area/janitor) @@ -79454,16 +79388,6 @@ }, /turf/open/floor/plating, /area/engine/foyer) -"tmG" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "tnW" = ( /obj/machinery/recharge_station, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -80024,18 +79948,6 @@ }, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) -"tSM" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 5 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "tTl" = ( /obj/machinery/air_sensor{ id_tag = "air_sensor" @@ -80065,26 +79977,6 @@ }, /turf/open/floor/carpet, /area/crew_quarters/theatre) -"tVk" = ( -/obj/structure/window/reinforced, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "tVx" = ( /obj/effect/landmark/start/yogs/psychiatrist, /obj/structure/chair/wood{ @@ -80411,15 +80303,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/plasteel, /area/engine/atmos_distro) -"unl" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "unu" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -80769,10 +80652,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) -"uIn" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "uIZ" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -81060,11 +80939,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) -"uUV" = ( -/obj/structure/window/reinforced, -/obj/effect/turf_decal/trimline/red/line, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "uUX" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -81316,15 +81190,6 @@ }, /turf/open/floor/engine/cult, /area/library) -"vgT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "vgV" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 9 @@ -81399,12 +81264,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/wood, /area/library) -"vhT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "viD" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -81873,6 +81732,15 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"vGT" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "vHv" = ( /obj/machinery/light_switch{ pixel_x = -23 @@ -82146,14 +82014,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"vPl" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "vPs" = ( /obj/effect/landmark/stationroom/maint/threexthree, /turf/template_noop, @@ -82311,18 +82171,6 @@ /obj/item/storage/box/syringes, /turf/open/floor/plasteel, /area/hydroponics) -"waq" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 9 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "wau" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -83055,6 +82903,20 @@ /obj/effect/landmark/stationroom/maint/fivexthree, /turf/template_noop, /area/maintenance/starboard/secondary) +"wPJ" = ( +/obj/structure/table, +/obj/item/clothing/under/sl_suit{ + desc = "Whoever wears this makes the rules."; + name = "referee suit" + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "wQA" = ( /turf/closed/wall/r_wall, /area/science/mixing/chamber) @@ -83297,6 +83159,15 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"xeG" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/pool/corner, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "xfO" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -83471,12 +83342,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"xpE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "xqo" = ( /obj/machinery/cryopod, /obj/machinery/light{ @@ -83902,6 +83767,15 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"xSG" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "xSI" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment{ @@ -119764,13 +119638,13 @@ hsn iKc odl lZV -vPl -aiR -ale -mJk -azw -aok -dqi +xeG +ple +wPJ +bHA +gcX +fTT +kxv aoZ dhs arB @@ -120021,13 +119895,13 @@ kay sGn hvR agu -kbS -waq -hHm -pIU -hHm -kAo -tmG +rDR +fpv +gXa +gXa +gXa +gXa +bYv api aqf arB @@ -120278,13 +120152,13 @@ oSR qca afw agu -ahi -unl -uIn -vgT -ovH -iRE -akL +scS +lni +gXa +gXa +gXa +gXa +iSv api aqg arC @@ -120535,13 +120409,13 @@ doc qca afx agw -ahj -ntv -gRG -gIZ -gRG -tVk -anI +ilM +lni +gXa +gXa +gXa +gXa +tiR apA amb amL @@ -120792,13 +120666,13 @@ sGn sGn kGo agx -ahk -rfZ -ovH -xpE -vhT -uUV -akM +eUh +lni +gXa +gXa +gXa +gXa +bGr apB arp asW @@ -121049,13 +120923,13 @@ aaa acP acP agy -ahl -tSM -rHB -nYd -rHB -pSt -akN +fyq +eNI +gXa +gXa +gXa +gXa +sHQ ahh aqj arB @@ -121306,13 +121180,13 @@ acP acP afz agz -dBY -ahl -ahl -ahg -akN -akN -akN +jZo +vGT +vGT +kdo +xSG +xSG +pFW ahh aqk arB diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm index ac32cc9d3b76..59ef37a9d921 100644 --- a/_maps/shuttles/emergency_luxury.dmm +++ b/_maps/shuttles/emergency_luxury.dmm @@ -16,6 +16,12 @@ "aT" = ( /turf/template_noop, /area/template_noop) +"bU" = ( +/obj/structure/pool_ladder, +/turf/open/indestructible/sound/pool/end{ + id = "luxury" + }, +/area/shuttle/escape/luxury) "ca" = ( /obj/item/reagent_containers/food/snacks/bearsteak{ pixel_y = 6 @@ -26,14 +32,6 @@ }, /turf/open/floor/carpet, /area/shuttle/escape/luxury) -"cf" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/holofloor/beach/coast_b{ - dir = 4 - }, -/area/shuttle/escape/luxury) "cv" = ( /obj/docking_port/mobile/emergency{ dwidth = 5; @@ -146,17 +144,6 @@ }, /turf/open/floor/plating, /area/shuttle/escape/luxury) -"hv" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/structure/musician/piano{ - icon_state = "piano" - }, -/turf/open/floor/mineral/gold{ - dir = 4 - }, -/area/shuttle/escape/luxury) "kk" = ( /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti{ pixel_y = 5 @@ -194,12 +181,6 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet, /area/shuttle/escape/luxury) -"lG" = ( -/turf/open/floor/holofloor/beach/coast_t{ - dir = 1; - icon_state = "sandwater_inner" - }, -/area/shuttle/escape/luxury) "mc" = ( /obj/item/reagent_containers/food/snacks/notasandwich{ pixel_y = 11 @@ -303,11 +284,6 @@ }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/luxury) -"qw" = ( -/turf/open/floor/holofloor/beach/coast_b{ - dir = 4 - }, -/area/shuttle/escape/luxury) "rj" = ( /obj/item/reagent_containers/food/snacks/cakeslice/slimecake{ pixel_y = 2 @@ -315,11 +291,6 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet, /area/shuttle/escape/luxury) -"rl" = ( -/turf/open/floor/holofloor/beach/coast_t{ - icon_state = "sandwater_inner" - }, -/area/shuttle/escape/luxury) "rw" = ( /obj/structure/sign/poster/official/fruit_bowl{ pixel_y = -32 @@ -360,11 +331,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/shuttle/escape/luxury) -"vg" = ( -/turf/open/floor/holofloor/beach/coast_t{ - icon_state = "sandwater_t" - }, -/area/shuttle/escape/luxury) "vh" = ( /obj/machinery/computer/crew, /turf/open/floor/mineral/diamond, @@ -384,12 +350,6 @@ /obj/item/broken_bottle, /turf/open/floor/plating, /area/shuttle/escape/luxury) -"vS" = ( -/turf/open/floor/holofloor/beach/coast_b{ - dir = 9; - icon_state = "sandwater_b" - }, -/area/shuttle/escape/luxury) "wa" = ( /obj/structure/chair/comfy/teal{ dir = 1; @@ -420,6 +380,14 @@ dir = 4 }, /area/shuttle/escape/luxury) +"xp" = ( +/obj/machinery/pool_filter{ + id = "luxury" + }, +/turf/open/indestructible/sound/pool/end{ + id = "luxury" + }, +/area/shuttle/escape/luxury) "yR" = ( /obj/item/reagent_containers/food/snacks/carneburrito{ pixel_y = 4 @@ -456,10 +424,13 @@ dir = 4 }, /area/shuttle/escape/luxury) -"Av" = ( +"Ag" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/effect/turf_decal/pool/corner{ + dir = 1 + }, /turf/open/floor/mineral/gold{ dir = 4 }, @@ -476,6 +447,11 @@ }, /turf/open/floor/carpet, /area/shuttle/escape/luxury) +"Ci" = ( +/turf/open/indestructible/sound/pool{ + id = "luxury" + }, +/area/shuttle/escape/luxury) "CF" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -499,6 +475,16 @@ }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/luxury) +"DP" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/pool, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) "DX" = ( /obj/structure/chair/comfy/black{ dir = 1 @@ -525,6 +511,28 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet, /area/shuttle/escape/luxury) +"EE" = ( +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) +"Fc" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/structure/musician/piano{ + icon_state = "piano" + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) "Ft" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt/dust, @@ -540,21 +548,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/shuttle/escape/luxury) -"Gz" = ( -/turf/open/floor/holofloor/beach/coast_b{ - dir = 10; - icon_state = "sandwater_b" - }, -/area/shuttle/escape/luxury) -"Hx" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/mineral/gold{ - dir = 4 - }, -/area/shuttle/escape/luxury) "HK" = ( /obj/item/reagent_containers/food/snacks/honkdae{ pixel_y = 8 @@ -566,6 +559,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/shuttle/escape/luxury) +"Jr" = ( +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/pool/corner, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) "JI" = ( /obj/machinery/door/poddoor/shutters{ id = "ohnopoors" @@ -615,6 +615,14 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet, /area/shuttle/escape/luxury) +"MW" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/indestructible/sound/pool{ + id = "luxury" + }, +/area/shuttle/escape/luxury) "Nz" = ( /obj/machinery/scanner_gate/luxury_shuttle{ layer = 2.6 @@ -639,6 +647,13 @@ dir = 4 }, /area/shuttle/escape/luxury) +"NO" = ( +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/pool, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) "Or" = ( /obj/machinery/door/airlock/external{ name = "Steerage" @@ -658,12 +673,6 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet, /area/shuttle/escape/luxury) -"Pc" = ( -/turf/open/floor/holofloor/beach/coast_t{ - dir = 1; - icon_state = "sandwater_t" - }, -/area/shuttle/escape/luxury) "Pk" = ( /obj/structure/chair/comfy/shuttle, /obj/machinery/light/small{ @@ -691,7 +700,7 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/shuttle/escape/luxury) -"RK" = ( +"Rz" = ( /obj/machinery/light{ dir = 4 }, @@ -701,6 +710,9 @@ /obj/structure/chair/comfy/black{ dir = 8 }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, /turf/open/floor/mineral/gold{ dir = 4 }, @@ -831,11 +843,6 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet, /area/shuttle/escape/luxury) -"Zo" = ( -/turf/open/floor/holofloor/beach/coast_t{ - dir = 4 - }, -/area/shuttle/escape/luxury) "Zx" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -1129,21 +1136,21 @@ Ek zQ Xt zQ -Xt -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -zQ -Av +Jr +EE +EE +EE +EE +EE +EE +EE +EE +EE +EE +EE +EE +EE +Ag zQ zQ oP @@ -1156,21 +1163,21 @@ mt fR mt zQ -Xt -rl -Zo -Zo -Zo -Zo -Zo -Zo -Zo -Zo -Zo -Zo -Zo -lG -hv +NO +bU +Ci +Ci +Ci +Ci +Ci +Ci +Ci +Ci +Ci +Ci +Ci +Ci +Fc zQ zQ zQ @@ -1183,21 +1190,21 @@ ZZ sG mt zQ -Hx -vg -vS -qw -qw -qw -qw -cf -qw -qw -qw -qw -Gz -Pc -RK +DP +xp +Ci +Ci +Ci +Ci +Ci +MW +Ci +Ci +Ci +Ci +Ci +Ci +Rz zQ zQ pv From 64b6e11db5bdcd0b9a865f350021be172389653a Mon Sep 17 00:00:00 2001 From: Maxim Date: Wed, 9 Feb 2022 15:23:37 -0500 Subject: [PATCH 3/6] fix luxury pool --- _maps/map_files/YogsBox/YogsBox.dmm | 606 +++++++++++++------------- _maps/map_files/Yogsmeta/Yogsmeta.dmm | 562 ++++++++++++------------ _maps/shuttles/emergency_luxury.dmm | 244 +++++------ 3 files changed, 698 insertions(+), 714 deletions(-) diff --git a/_maps/map_files/YogsBox/YogsBox.dmm b/_maps/map_files/YogsBox/YogsBox.dmm index bfab694bd139..cdbc940c089c 100644 --- a/_maps/map_files/YogsBox/YogsBox.dmm +++ b/_maps/map_files/YogsBox/YogsBox.dmm @@ -7382,9 +7382,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/maintenance/department/electrical) -"auN" = ( -/turf/open/indestructible/sound/pool/end, -/area/crew_quarters/fitness) "auO" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -28236,6 +28233,10 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"bUY" = ( +/obj/structure/pool_ladder, +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness) "bVa" = ( /obj/machinery/smartfridge/chemistry/virology/preloaded, /obj/effect/turf_decal/tile/green{ @@ -32807,22 +32808,6 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) -"drN" = ( -/obj/structure/closet/boxinggloves, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/clothing/shoes/jackboots, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/item/twohanded/required/pool/rubber_ring, -/obj/item/twohanded/required/pool/rubber_ring, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "dsh" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -33172,6 +33157,10 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/storage) +"dDy" = ( +/obj/item/twohanded/required/pool/rubber_ring, +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness) "dDZ" = ( /obj/effect/landmark/stationroom/maint/tenxfive, /turf/template_noop, @@ -33506,12 +33495,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/fore) -"dOj" = ( -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "dOS" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -33545,25 +33528,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"dPw" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -24 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "dPy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 @@ -33865,6 +33829,13 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) +"dYT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/pool/corner, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "eam" = ( /obj/structure/cable{ icon_state = "4-8" @@ -34298,6 +34269,18 @@ }, /turf/open/floor/plasteel, /area/security/main) +"euc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "euq" = ( /obj/structure/cable{ icon_state = "4-8" @@ -34477,18 +34460,6 @@ "eyT" = ( /turf/open/floor/plasteel/dark, /area/maintenance/department/tcoms) -"eyY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/pool{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "ezo" = ( /obj/machinery/status_display/ai{ pixel_y = -32 @@ -35658,6 +35629,18 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) +"flh" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/effect/turf_decal/pool/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "flZ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -35926,16 +35909,6 @@ }, /turf/open/floor/plasteel, /area/security/main) -"frJ" = ( -/obj/structure/sign/departments/minsky/command/charge{ - pixel_x = 32 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "fsW" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/plasteel, @@ -36277,18 +36250,6 @@ /obj/structure/table/reinforced, /turf/open/floor/plasteel/dark, /area/science/xenobiology) -"fHE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/pool/corner{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "fHT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -36305,13 +36266,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"fIa" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "fIb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -37713,6 +37667,18 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) +"gDs" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "gDG" = ( /obj/structure/cable{ icon_state = "4-8" @@ -38106,10 +38072,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) -"gQL" = ( -/obj/effect/turf_decal/pool, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "gQM" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -40252,6 +40214,28 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"iib" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "iiE" = ( /obj/machinery/light/small, /obj/structure/closet/crate/hydroponics, @@ -41739,6 +41723,13 @@ /obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/library) +"jdj" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "jdH" = ( /obj/structure/rack, /obj/item/tank/internals/oxygen, @@ -42167,6 +42158,9 @@ /obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) +"jqy" = ( +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness) "jqQ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -42425,27 +42419,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space/basic, /area/engine/atmos_distro) -"jvO" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/pool/corner{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "jwH" = ( /obj/structure/cable{ icon_state = "1-2" @@ -42481,6 +42454,18 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"jwR" = ( +/obj/structure/closet/athletic_mixed, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/twohanded/required/pool/pool_noodle, +/obj/item/twohanded/required/pool/pool_noodle, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "jxh" = ( /obj/structure/cable{ icon_state = "1-2" @@ -42699,6 +42684,30 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/plasteel/white, /area/medical/genetics) +"jGJ" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/table, +/obj/item/clothing/mask/balaclava, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "jGO" = ( /obj/machinery/light{ dir = 1 @@ -42761,28 +42770,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/library) -"jJC" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "jJK" = ( /obj/machinery/telecomms/processor/preset_three, /turf/open/floor/circuit/green/telecomms/mainframe, @@ -42803,10 +42790,6 @@ /obj/structure/window/reinforced, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) -"jKl" = ( -/obj/structure/pool_ladder, -/turf/open/indestructible/sound/pool/end, -/area/crew_quarters/fitness) "jKn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43461,10 +43444,6 @@ dir = 4 }, /area/chapel/main) -"kfM" = ( -/obj/item/twohanded/required/pool/rubber_ring, -/turf/open/indestructible/sound/pool, -/area/crew_quarters/fitness) "kgV" = ( /obj/machinery/camera{ c_tag = "Bridge West Entrance"; @@ -44608,14 +44587,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel/dark, /area/engine/atmos_distro) -"kTa" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/pool/corner{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "kTm" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel, @@ -44750,13 +44721,6 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/fore) -"kXv" = ( -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "kXE" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -46145,6 +46109,18 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"lSd" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "lSA" = ( /obj/item/shard, /obj/effect/decal/cleanable/glass, @@ -47528,12 +47504,6 @@ /obj/structure/cable/yellow, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) -"mNU" = ( -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "mOa" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/firedoor/border_only, @@ -49250,13 +49220,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"nMw" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/pool/corner, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "nMN" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -51268,6 +51231,13 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"oTl" = ( +/obj/machinery/pool_filter{ + pixel_x = -16; + pixel_y = -21 + }, +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness) "oTV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -51372,6 +51342,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/storage) +"oWe" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/pool/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "oXp" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -51702,6 +51680,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/security/main) +"ppv" = ( +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "ppF" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -51717,18 +51702,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"pqy" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/pool{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "pqK" = ( /turf/closed/wall, /area/maintenance/department/medical/morgue) @@ -52303,6 +52276,22 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) +"pGQ" = ( +/obj/structure/closet/boxinggloves, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/clothing/shoes/jackboots, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/twohanded/required/pool/rubber_ring, +/obj/item/twohanded/required/pool/rubber_ring, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "pHz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -53001,6 +52990,10 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) +"qaR" = ( +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "qbE" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -53739,24 +53732,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) -"quL" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "quT" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -54383,9 +54358,6 @@ "qQV" = ( /turf/template_noop, /area/template_noop) -"qRD" = ( -/turf/open/indestructible/sound/pool, -/area/crew_quarters/fitness) "qRK" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -55883,6 +55855,9 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) +"rMc" = ( +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness) "rMv" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -56894,30 +56869,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/port) -"srS" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/table, -/obj/item/clothing/mask/balaclava, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "srV" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -30 @@ -57189,13 +57140,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"sBY" = ( -/obj/machinery/pool_filter{ - pixel_x = -16; - pixel_y = -21 - }, -/turf/open/indestructible/sound/pool, -/area/crew_quarters/fitness) "sCf" = ( /turf/open/floor/plating, /area/maintenance/department/medical/morgue) @@ -58152,10 +58096,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"tlk" = ( -/obj/item/twohanded/required/pool/pool_noodle, -/turf/open/indestructible/sound/pool, -/area/crew_quarters/fitness) "tlm" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -58638,18 +58578,6 @@ /obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, /area/medical/sleeper) -"tzF" = ( -/obj/structure/closet/athletic_mixed, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/item/twohanded/required/pool/pool_noodle, -/obj/item/twohanded/required/pool/pool_noodle, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "tzL" = ( /obj/structure/table, /obj/item/electronics/apc, @@ -59079,6 +59007,12 @@ /obj/machinery/light, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"tMA" = ( +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "tMG" = ( /obj/effect/turf_decal/loading_area{ dir = 1 @@ -59340,6 +59274,16 @@ }, /turf/open/space/basic, /area/solar/port/fore) +"tUR" = ( +/obj/structure/sign/departments/minsky/command/charge{ + pixel_x = 32 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "tVa" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -60179,6 +60123,10 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) +"uvz" = ( +/obj/item/twohanded/required/pool/pool_noodle, +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness) "uvA" = ( /obj/item/cigbutt/roach, /turf/open/floor/plating, @@ -60925,6 +60873,27 @@ /obj/machinery/atmospherics/components/unary/portables_connector, /turf/open/floor/plasteel/white, /area/maintenance/department/tcoms) +"uTt" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/pool/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "uUo" = ( /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; @@ -61712,6 +61681,24 @@ /obj/structure/chair, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"vvo" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "vvr" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -62961,6 +62948,12 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"wiC" = ( +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "wiS" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -64280,18 +64273,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) -"xgc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/pool{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "xgh" = ( /obj/structure/window/reinforced{ dir = 4 @@ -65991,6 +65972,25 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/plating, /area/hallway/secondary/entry) +"ygI" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -24 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "yhk" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -101960,8 +101960,8 @@ xVA aqc apv arl -quL -dPw +vvo +ygI avw rea rVP @@ -102217,13 +102217,13 @@ sIp kJl arj asb -nMw -dOj -kXv -fIa -dOj -jvO -srS +dYT +wiC +ppv +jdj +wiC +uTt +jGJ aCr iSq ayz @@ -102473,14 +102473,14 @@ qdv xls bDx arj -tzF -gQL -jKl -qRD -qRD -qRD -mNU -jJC +jwR +qaR +bUY +jqy +jqy +jqy +tMA +iib aCr cIO aAN @@ -102730,13 +102730,13 @@ arj arj arj arj -drN -gQL -auN -qRD -kfM -qRD -mNU +pGQ +qaR +rMc +jqy +dDy +jqy +tMA aAn aCr aCh @@ -102988,12 +102988,12 @@ iwj uyw arj asq -gQL -auN -tlk -qRD -sBY -mNU +qaR +rMc +uvz +jqy +oTl +tMA auU aCr aCr @@ -103245,12 +103245,12 @@ cYm eeI arj ast -gQL -auN -qRD -qRD -qRD -mNU +qaR +rMc +jqy +jqy +jqy +tMA jXO iVG aCt @@ -103502,12 +103502,12 @@ nGE eOZ arj vBs -fHE -xgc -xgc -eyY -pqy -kTa +flh +euc +euc +lSd +gDs +oWe nWA arj alP @@ -103762,7 +103762,7 @@ mck eAX gaI mhm -frJ +tUR eAX udq aAo diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index 0a458876b302..72c90748c5c0 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -31829,6 +31829,10 @@ "bqH" = ( /turf/closed/wall, /area/crew_quarters/heads/hop) +"bqI" = ( +/obj/machinery/pool_filter, +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness/recreation) "bqJ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -33104,6 +33108,20 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel, /area/hallway/primary/central) +"btz" = ( +/obj/structure/table, +/obj/item/clothing/under/sl_suit{ + desc = "Whoever wears this makes the rules."; + name = "referee suit" + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "btC" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -37884,18 +37902,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"bGr" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "bGs" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -38361,18 +38367,6 @@ }, /turf/open/floor/carpet, /area/crew_quarters/dorms) -"bHA" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "bHC" = ( /obj/machinery/light/small{ dir = 8 @@ -44960,19 +44954,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"bYv" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "bYC" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -63916,6 +63897,17 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) +"dmp" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "dmq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65733,6 +65725,18 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"eHd" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "eJo" = ( /obj/structure/table, /obj/item/crowbar/red, @@ -65796,6 +65800,23 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) +"eMu" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "eMO" = ( /obj/effect/landmark/xeno_spawn, /obj/structure/chair, @@ -65813,10 +65834,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"eNI" = ( -/obj/machinery/pool_filter, -/turf/open/indestructible/sound/pool/end, -/area/crew_quarters/fitness/recreation) "eNS" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{ dir = 1 @@ -65914,14 +65931,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"eUh" = ( -/obj/structure/chair, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/pool, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "eUw" = ( /obj/machinery/camera{ c_tag = "Engineering - Transit Tube Access"; @@ -66349,10 +66358,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) -"fpv" = ( -/obj/structure/pool_ladder, -/turf/open/indestructible/sound/pool/end, -/area/crew_quarters/fitness/recreation) "fqS" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -66481,13 +66486,6 @@ }, /turf/open/floor/plasteel, /area/janitor) -"fyq" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/pool, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "fyr" = ( /obj/structure/table, /obj/item/stack/sheet/metal/fifty, @@ -66949,17 +66947,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) -"fTT" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "fUT" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -67163,23 +67150,6 @@ icon_state = "platingdmg2" }, /area/maintenance/fore) -"gcX" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "gdD" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -67259,6 +67229,15 @@ /obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/plasteel/white/side, /area/medical/surgery) +"gkU" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "glh" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/hidden, /turf/open/floor/plating, @@ -67927,8 +67906,18 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) -"gXa" = ( -/turf/open/indestructible/sound/pool, +"gWL" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/pool/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "gXd" = ( /obj/machinery/mineral/stacking_unit_console{ @@ -68670,6 +68659,12 @@ /obj/item/trash/pistachios, /turf/open/floor/plating, /area/maintenance/port/aft) +"hLV" = ( +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "hMu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -69136,12 +69131,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) -"ilM" = ( -/obj/structure/chair, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/pool, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "ilS" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -69594,6 +69583,12 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"iOa" = ( +/obj/structure/chair, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "iOj" = ( /obj/effect/landmark/stationroom/maint/threexthree, /turf/template_noop, @@ -69679,18 +69674,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"iSv" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "iSC" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -70593,6 +70576,10 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"jTc" = ( +/obj/structure/pool_ladder, +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness/recreation) "jTe" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -70789,16 +70776,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) -"jZo" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/pool/corner{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "jZz" = ( /obj/machinery/airalarm/tcomms{ pixel_y = 24 @@ -70881,12 +70858,6 @@ /obj/machinery/light, /turf/open/floor/plasteel, /area/engine/atmos) -"kdo" = ( -/obj/effect/turf_decal/pool{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "kdq" = ( /obj/machinery/door/poddoor/preopen{ id = "Engineering"; @@ -71149,6 +71120,15 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) +"kpp" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "kpD" = ( /obj/structure/window/reinforced, /obj/machinery/door/firedoor/border_only{ @@ -71288,19 +71268,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) -"kxv" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/pool/corner{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "kAI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -72023,9 +71990,6 @@ "lnc" = ( /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) -"lni" = ( -/turf/open/indestructible/sound/pool/end, -/area/crew_quarters/fitness/recreation) "lnH" = ( /obj/machinery/rnd/production/circuit_imprinter, /obj/machinery/airalarm{ @@ -73121,6 +73085,16 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/hallway/primary/central) +"myf" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/pool/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "myZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -75488,15 +75462,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) -"ple" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "plS" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/RnD_secure, @@ -75760,6 +75725,15 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"pAG" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/pool/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "pAV" = ( /obj/machinery/button/door{ id = "AI Core shutters"; @@ -75905,15 +75879,6 @@ /obj/item/clothing/mask/gas, /turf/open/floor/plasteel, /area/engine/atmos_distro) -"pFW" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/pool/corner{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "pGf" = ( /obj/machinery/light{ dir = 1 @@ -76040,6 +76005,12 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"pMm" = ( +/obj/structure/chair, +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "pMu" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -77081,6 +77052,9 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/plasteel, /area/engine/foyer) +"qKm" = ( +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness/recreation) "qKT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1; @@ -77240,6 +77214,13 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"qVA" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "qVN" = ( /obj/machinery/door/poddoor/shutters, /turf/open/floor/plating, @@ -77942,14 +77923,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"rDR" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/pool, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "rEW" = ( /obj/machinery/button{ id = "maintshut"; @@ -77979,6 +77952,14 @@ }, /turf/open/floor/plasteel, /area/engine/foyer) +"rHe" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "rHS" = ( /obj/machinery/camera{ c_tag = "Brig Physicians Office"; @@ -78012,6 +77993,18 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"rMh" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "rNv" = ( /obj/machinery/bounty_board, /turf/closed/wall/r_wall, @@ -78187,12 +78180,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) -"scS" = ( -/obj/structure/chair, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/pool, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "scU" = ( /obj/structure/table, /obj/item/toy/cards/deck, @@ -78832,15 +78819,6 @@ }, /turf/open/floor/plating, /area/engine/atmos_distro) -"sHQ" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "sIj" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -79024,6 +79002,15 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/port/fore) +"sSF" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "sTu" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/stripes/corner{ @@ -79330,16 +79317,6 @@ icon_state = "panelscorched" }, /area/engine/atmos_distro) -"tiR" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "tkt" = ( /turf/open/floor/plasteel, /area/janitor) @@ -79734,6 +79711,15 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"tGX" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "tHQ" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/abandoned, @@ -79770,6 +79756,19 @@ }, /turf/open/floor/plasteel, /area/janitor) +"tIs" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "tJN" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 10 @@ -80016,6 +80015,16 @@ /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, /area/engine/atmos_distro) +"tXC" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "tYt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ @@ -80578,6 +80587,14 @@ }, /turf/open/floor/plasteel, /area/engine/storage_shared) +"uFC" = ( +/obj/structure/chair, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "uGb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -81056,6 +81073,18 @@ }, /turf/open/floor/carpet, /area/medical/psych) +"uXz" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "uYo" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/engine/air, @@ -81732,15 +81761,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) -"vGT" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/pool{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "vHv" = ( /obj/machinery/light_switch{ pixel_x = -23 @@ -82441,6 +82461,15 @@ }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) +"wtu" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/pool/corner, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "wtH" = ( /obj/item/radio/intercom{ pixel_y = 25 @@ -82903,20 +82932,6 @@ /obj/effect/landmark/stationroom/maint/fivexthree, /turf/template_noop, /area/maintenance/starboard/secondary) -"wPJ" = ( -/obj/structure/table, -/obj/item/clothing/under/sl_suit{ - desc = "Whoever wears this makes the rules."; - name = "referee suit" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "wQA" = ( /turf/closed/wall/r_wall, /area/science/mixing/chamber) @@ -83159,15 +83174,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"xeG" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/pool/corner, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "xfO" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -83207,6 +83213,9 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"xhV" = ( +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness/recreation) "xie" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 6 @@ -83767,15 +83776,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"xSG" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/pool{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "xSI" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment{ @@ -119638,13 +119638,13 @@ hsn iKc odl lZV -xeG -ple -wPJ -bHA -gcX -fTT -kxv +wtu +sSF +btz +eHd +eMu +dmp +gWL aoZ dhs arB @@ -119895,13 +119895,13 @@ kay sGn hvR agu -rDR -fpv -gXa -gXa -gXa -gXa -bYv +rHe +jTc +qKm +qKm +qKm +qKm +tIs api aqf arB @@ -120152,13 +120152,13 @@ oSR qca afw agu -scS -lni -gXa -gXa -gXa -gXa -iSv +iOa +xhV +qKm +qKm +qKm +qKm +rMh api aqg arC @@ -120409,13 +120409,13 @@ doc qca afx agw -ilM -lni -gXa -gXa -gXa -gXa -tiR +pMm +xhV +qKm +qKm +qKm +qKm +tXC apA amb amL @@ -120666,13 +120666,13 @@ sGn sGn kGo agx -eUh -lni -gXa -gXa -gXa -gXa -bGr +uFC +xhV +qKm +qKm +qKm +qKm +uXz apB arp asW @@ -120923,13 +120923,13 @@ aaa acP acP agy -fyq -eNI -gXa -gXa -gXa -gXa -sHQ +qVA +bqI +qKm +qKm +qKm +qKm +gkU ahh aqj arB @@ -121180,13 +121180,13 @@ acP acP afz agz -jZo -vGT -vGT -kdo -xSG -xSG -pFW +myf +tGX +tGX +hLV +kpp +kpp +pAG ahh aqk arB diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm index 59ef37a9d921..4274c02ddaa1 100644 --- a/_maps/shuttles/emergency_luxury.dmm +++ b/_maps/shuttles/emergency_luxury.dmm @@ -16,12 +16,6 @@ "aT" = ( /turf/template_noop, /area/template_noop) -"bU" = ( -/obj/structure/pool_ladder, -/turf/open/indestructible/sound/pool/end{ - id = "luxury" - }, -/area/shuttle/escape/luxury) "ca" = ( /obj/item/reagent_containers/food/snacks/bearsteak{ pixel_y = 6 @@ -112,6 +106,20 @@ dir = 4 }, /area/shuttle/escape/luxury) +"fc" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/structure/musician/piano{ + icon_state = "piano" + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) "fA" = ( /obj/machinery/light, /turf/open/floor/mineral/gold{ @@ -136,6 +144,10 @@ /obj/machinery/computer/station_alert, /turf/open/floor/mineral/diamond, /area/shuttle/escape/luxury) +"gQ" = ( +/obj/structure/pool_ladder, +/turf/open/indestructible/sound/pool/end, +/area/shuttle/escape/luxury) "gU" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt/dust, @@ -181,6 +193,14 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet, /area/shuttle/escape/luxury) +"lO" = ( +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) "mc" = ( /obj/item/reagent_containers/food/snacks/notasandwich{ pixel_y = 11 @@ -306,6 +326,13 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet, /area/shuttle/escape/luxury) +"sv" = ( +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/pool, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) "sG" = ( /obj/structure/sink{ color = "#FFD700"; @@ -331,6 +358,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/shuttle/escape/luxury) +"ty" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/pool, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) "vh" = ( /obj/machinery/computer/crew, /turf/open/floor/mineral/diamond, @@ -380,14 +417,6 @@ dir = 4 }, /area/shuttle/escape/luxury) -"xp" = ( -/obj/machinery/pool_filter{ - id = "luxury" - }, -/turf/open/indestructible/sound/pool/end{ - id = "luxury" - }, -/area/shuttle/escape/luxury) "yR" = ( /obj/item/reagent_containers/food/snacks/carneburrito{ pixel_y = 4 @@ -424,17 +453,6 @@ dir = 4 }, /area/shuttle/escape/luxury) -"Ag" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/turf_decal/pool/corner{ - dir = 1 - }, -/turf/open/floor/mineral/gold{ - dir = 4 - }, -/area/shuttle/escape/luxury) "AJ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/item/trash/pistachios, @@ -447,11 +465,6 @@ }, /turf/open/floor/carpet, /area/shuttle/escape/luxury) -"Ci" = ( -/turf/open/indestructible/sound/pool{ - id = "luxury" - }, -/area/shuttle/escape/luxury) "CF" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -475,16 +488,6 @@ }, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/luxury) -"DP" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/pool, -/turf/open/floor/mineral/gold{ - dir = 4 - }, -/area/shuttle/escape/luxury) "DX" = ( /obj/structure/chair/comfy/black{ dir = 1 @@ -511,28 +514,6 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet, /area/shuttle/escape/luxury) -"EE" = ( -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/mineral/gold{ - dir = 4 - }, -/area/shuttle/escape/luxury) -"Fc" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/structure/musician/piano{ - icon_state = "piano" - }, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/mineral/gold{ - dir = 4 - }, -/area/shuttle/escape/luxury) "Ft" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt/dust, @@ -559,13 +540,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/shuttle/escape/luxury) -"Jr" = ( -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/pool/corner, -/turf/open/floor/mineral/gold{ - dir = 4 - }, -/area/shuttle/escape/luxury) "JI" = ( /obj/machinery/door/poddoor/shutters{ id = "ohnopoors" @@ -615,14 +589,6 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet, /area/shuttle/escape/luxury) -"MW" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/indestructible/sound/pool{ - id = "luxury" - }, -/area/shuttle/escape/luxury) "Nz" = ( /obj/machinery/scanner_gate/luxury_shuttle{ layer = 2.6 @@ -647,13 +613,6 @@ dir = 4 }, /area/shuttle/escape/luxury) -"NO" = ( -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/pool, -/turf/open/floor/mineral/gold{ - dir = 4 - }, -/area/shuttle/escape/luxury) "Or" = ( /obj/machinery/door/airlock/external{ name = "Steerage" @@ -700,7 +659,7 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/shuttle/escape/luxury) -"Rz" = ( +"QI" = ( /obj/machinery/light{ dir = 4 }, @@ -724,6 +683,9 @@ /obj/machinery/computer/communications, /turf/open/floor/mineral/diamond, /area/shuttle/escape/luxury) +"Sf" = ( +/turf/open/indestructible/sound/pool, +/area/shuttle/escape/luxury) "SO" = ( /obj/item/reagent_containers/food/snacks/hotdog{ pixel_y = 3 @@ -737,10 +699,28 @@ "Tg" = ( /turf/template_noop, /area/shuttle/escape/luxury) +"Tm" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/turf_decal/pool/corner{ + dir = 1 + }, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) "TJ" = ( /obj/structure/chair/comfy/shuttle, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/luxury) +"Ue" = ( +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/pool/corner, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) "Uj" = ( /obj/structure/table/wood/fancy/black, /obj/item/reagent_containers/food/drinks/bottle/champagne{ @@ -843,6 +823,10 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet, /area/shuttle/escape/luxury) +"Yw" = ( +/obj/machinery/pool_filter, +/turf/open/indestructible/sound/pool/end, +/area/shuttle/escape/luxury) "Zx" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -1136,21 +1120,21 @@ Ek zQ Xt zQ -Jr -EE -EE -EE -EE -EE -EE -EE -EE -EE -EE -EE -EE -EE -Ag +Ue +lO +lO +lO +lO +lO +lO +lO +lO +lO +lO +lO +lO +lO +Tm zQ zQ oP @@ -1163,21 +1147,21 @@ mt fR mt zQ -NO -bU -Ci -Ci -Ci -Ci -Ci -Ci -Ci -Ci -Ci -Ci -Ci -Ci -Fc +sv +gQ +Sf +Sf +Sf +Sf +Sf +Sf +Sf +Sf +Sf +Sf +Sf +Sf +fc zQ zQ zQ @@ -1190,21 +1174,21 @@ ZZ sG mt zQ -DP -xp -Ci -Ci -Ci -Ci -Ci -MW -Ci -Ci -Ci -Ci -Ci -Ci -Rz +ty +Yw +Sf +Sf +Sf +Sf +Sf +Sf +Sf +Sf +Sf +Sf +Sf +Sf +QI zQ zQ pv From 2b4b3f2a255e290eaba93bc84946e62cee454dc2 Mon Sep 17 00:00:00 2001 From: Maxim Date: Wed, 9 Feb 2022 15:45:29 -0500 Subject: [PATCH 4/6] some more map changes --- _maps/map_files/YogsBox/YogsBox.dmm | 606 +++++++++++++------------- _maps/map_files/Yogsmeta/Yogsmeta.dmm | 556 +++++++++++------------ _maps/shuttles/emergency_luxury.dmm | 256 ++++++----- 3 files changed, 707 insertions(+), 711 deletions(-) diff --git a/_maps/map_files/YogsBox/YogsBox.dmm b/_maps/map_files/YogsBox/YogsBox.dmm index cdbc940c089c..a2c4767dbdea 100644 --- a/_maps/map_files/YogsBox/YogsBox.dmm +++ b/_maps/map_files/YogsBox/YogsBox.dmm @@ -14245,6 +14245,12 @@ }, /turf/open/floor/plating, /area/maintenance/fore) +"aQG" = ( +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "aQK" = ( /obj/effect/spawner/xmastree, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -28233,10 +28239,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"bUY" = ( -/obj/structure/pool_ladder, -/turf/open/indestructible/sound/pool/end, -/area/crew_quarters/fitness) "bVa" = ( /obj/machinery/smartfridge/chemistry/virology/preloaded, /obj/effect/turf_decal/tile/green{ @@ -32027,6 +32029,9 @@ /obj/machinery/atmospherics/pipe/manifold4w/yellow/visible, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"cQr" = ( +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness) "cQw" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/firedoor/border_only, @@ -32976,6 +32981,9 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"dyc" = ( +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness) "dyd" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -33157,10 +33165,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/storage) -"dDy" = ( -/obj/item/twohanded/required/pool/rubber_ring, -/turf/open/indestructible/sound/pool, -/area/crew_quarters/fitness) "dDZ" = ( /obj/effect/landmark/stationroom/maint/tenxfive, /turf/template_noop, @@ -33829,13 +33833,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) -"dYT" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/pool/corner, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "eam" = ( /obj/structure/cable{ icon_state = "4-8" @@ -34018,6 +34015,30 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"eil" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/structure/table, +/obj/item/clothing/mask/balaclava, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "eiN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -34269,18 +34290,6 @@ }, /turf/open/floor/plasteel, /area/security/main) -"euc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/pool{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "euq" = ( /obj/structure/cable{ icon_state = "4-8" @@ -35629,18 +35638,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) -"flh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/effect/turf_decal/pool/corner{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "flZ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -37667,18 +37664,6 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) -"gDs" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/pool{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "gDG" = ( /obj/structure/cable{ icon_state = "4-8" @@ -38061,6 +38046,10 @@ }, /turf/open/floor/plasteel/white, /area/medical/surgery) +"gQE" = ( +/obj/item/twohanded/required/pool/pool_noodle, +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness) "gQJ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/turf_decal/stripes/line, @@ -38093,6 +38082,27 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"gSB" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/pool/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "gSO" = ( /obj/structure/sink{ dir = 8; @@ -38567,6 +38577,16 @@ /obj/item/assembly/flash/handheld, /turf/open/floor/plasteel, /area/science/robotics/lab) +"hlY" = ( +/obj/structure/sign/departments/minsky/command/charge{ + pixel_x = 32 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "hmc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -40214,28 +40234,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"iib" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "iiE" = ( /obj/machinery/light/small, /obj/structure/closet/crate/hydroponics, @@ -40402,6 +40400,10 @@ }, /turf/open/floor/plasteel/white, /area/medical/paramedic) +"ine" = ( +/obj/structure/pool_ladder, +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness) "inJ" = ( /obj/effect/turf_decal/arrows/white{ color = "#99ccff"; @@ -41723,13 +41725,6 @@ /obj/effect/turf_decal/ramp_middle, /turf/open/floor/wood, /area/library) -"jdj" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "jdH" = ( /obj/structure/rack, /obj/item/tank/internals/oxygen, @@ -42078,6 +42073,22 @@ }, /turf/open/floor/circuit/telecomms, /area/science/xenobiology) +"jpg" = ( +/obj/structure/closet/boxinggloves, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/clothing/shoes/jackboots, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/twohanded/required/pool/rubber_ring, +/obj/item/twohanded/required/pool/rubber_ring, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "jpr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -42158,9 +42169,6 @@ /obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) -"jqy" = ( -/turf/open/indestructible/sound/pool, -/area/crew_quarters/fitness) "jqQ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -42454,18 +42462,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"jwR" = ( -/obj/structure/closet/athletic_mixed, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/item/twohanded/required/pool/pool_noodle, -/obj/item/twohanded/required/pool/pool_noodle, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "jxh" = ( /obj/structure/cable{ icon_state = "1-2" @@ -42684,30 +42680,6 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/plasteel/white, /area/medical/genetics) -"jGJ" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/table, -/obj/item/clothing/mask/balaclava, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "jGO" = ( /obj/machinery/light{ dir = 1 @@ -43180,6 +43152,18 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"jXj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/effect/turf_decal/pool/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "jXF" = ( /obj/structure/cable{ icon_state = "4-8" @@ -43465,6 +43449,12 @@ }, /turf/open/floor/plasteel, /area/vacant_room/commissary) +"khY" = ( +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "kie" = ( /obj/structure/cable{ icon_state = "1-2" @@ -44721,6 +44711,13 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/fore) +"kXy" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/pool/corner, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "kXE" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -44964,6 +44961,10 @@ /mob/living/carbon/monkey, /turf/open/floor/grass, /area/medical/genetics) +"lfz" = ( +/obj/item/twohanded/required/pool/rubber_ring, +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness) "lfO" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 4 @@ -46109,18 +46110,6 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) -"lSd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/pool{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "lSA" = ( /obj/item/shard, /obj/effect/decal/cleanable/glass, @@ -46562,6 +46551,24 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/service) +"mkt" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "mkx" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -48449,6 +48456,13 @@ }, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) +"nmf" = ( +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "nnm" = ( /obj/machinery/camera{ c_tag = "Secondary AI Core"; @@ -50149,6 +50163,18 @@ }, /turf/open/floor/plating, /area/science/xenobiology) +"ooF" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "opi" = ( /obj/structure/cable{ icon_state = "2-8" @@ -51231,13 +51257,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) -"oTl" = ( -/obj/machinery/pool_filter{ - pixel_x = -16; - pixel_y = -21 - }, -/turf/open/indestructible/sound/pool, -/area/crew_quarters/fitness) "oTV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -51342,14 +51361,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/storage) -"oWe" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/pool/corner{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "oXp" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -51680,13 +51691,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/security/main) -"ppv" = ( -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "ppF" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -52276,22 +52280,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) -"pGQ" = ( -/obj/structure/closet/boxinggloves, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/clothing/shoes/jackboots, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/item/twohanded/required/pool/rubber_ring, -/obj/item/twohanded/required/pool/rubber_ring, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "pHz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -52990,10 +52978,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"qaR" = ( -/obj/effect/turf_decal/pool, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "qbE" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -55525,6 +55509,14 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"rDf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/pool/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "rDi" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ @@ -55855,9 +55847,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) -"rMc" = ( -/turf/open/indestructible/sound/pool/end, -/area/crew_quarters/fitness) "rMv" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -57290,6 +57279,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) +"sHY" = ( +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "sIa" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -25 @@ -57572,6 +57565,25 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"sTk" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -24 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "sTv" = ( /obj/structure/cable{ icon_state = "4-8" @@ -58035,6 +58047,28 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"tiA" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "tiN" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; @@ -58945,6 +58979,18 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"tKv" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "tKT" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 8 @@ -59007,12 +59053,6 @@ /obj/machinery/light, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"tMA" = ( -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "tMG" = ( /obj/effect/turf_decal/loading_area{ dir = 1 @@ -59274,16 +59314,6 @@ }, /turf/open/space/basic, /area/solar/port/fore) -"tUR" = ( -/obj/structure/sign/departments/minsky/command/charge{ - pixel_x = 32 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "tVa" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -60123,10 +60153,6 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) -"uvz" = ( -/obj/item/twohanded/required/pool/pool_noodle, -/turf/open/indestructible/sound/pool, -/area/crew_quarters/fitness) "uvA" = ( /obj/item/cigbutt/roach, /turf/open/floor/plating, @@ -60873,27 +60899,6 @@ /obj/machinery/atmospherics/components/unary/portables_connector, /turf/open/floor/plasteel/white, /area/maintenance/department/tcoms) -"uTt" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/pool/corner{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "uUo" = ( /obj/machinery/door/poddoor/preopen{ id = "Biohazard"; @@ -61681,24 +61686,6 @@ /obj/structure/chair, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"vvo" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "vvr" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -61763,6 +61750,13 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) +"vwe" = ( +/obj/machinery/pool_filter{ + pixel_x = -16; + pixel_y = -21 + }, +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness) "vwq" = ( /obj/structure/janitorialcart, /obj/effect/turf_decal/delivery, @@ -62484,6 +62478,18 @@ }, /turf/open/floor/plasteel/white, /area/medical/storage) +"vVj" = ( +/obj/structure/closet/athletic_mixed, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/item/twohanded/required/pool/pool_noodle, +/obj/item/twohanded/required/pool/pool_noodle, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "vVN" = ( /obj/structure/window/reinforced{ dir = 8 @@ -62948,12 +62954,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"wiC" = ( -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "wiS" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -62964,6 +62964,13 @@ }, /turf/open/space/basic, /area/engine/atmos_distro) +"wiV" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "wjk" = ( /obj/machinery/flasher{ id = "PCell 3"; @@ -63393,6 +63400,18 @@ /obj/structure/ore_box, /turf/open/floor/plasteel, /area/construction/mining/aux_base) +"wyi" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "wyn" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/machinery/atmospherics/miner/n2o, @@ -65972,25 +65991,6 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2, /turf/open/floor/plating, /area/hallway/secondary/entry) -"ygI" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -24 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "yhk" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -101960,8 +101960,8 @@ xVA aqc apv arl -vvo -ygI +mkt +sTk avw rea rVP @@ -102217,13 +102217,13 @@ sIp kJl arj asb -dYT -wiC -ppv -jdj -wiC -uTt -jGJ +kXy +aQG +nmf +wiV +aQG +gSB +eil aCr iSq ayz @@ -102473,14 +102473,14 @@ qdv xls bDx arj -jwR -qaR -bUY -jqy -jqy -jqy -tMA -iib +vVj +sHY +ine +cQr +cQr +cQr +khY +tiA aCr cIO aAN @@ -102730,13 +102730,13 @@ arj arj arj arj -pGQ -qaR -rMc -jqy -dDy -jqy -tMA +jpg +sHY +dyc +cQr +lfz +cQr +khY aAn aCr aCh @@ -102988,12 +102988,12 @@ iwj uyw arj asq -qaR -rMc -uvz -jqy -oTl -tMA +sHY +dyc +gQE +cQr +vwe +khY auU aCr aCr @@ -103245,12 +103245,12 @@ cYm eeI arj ast -qaR -rMc -jqy -jqy -jqy -tMA +sHY +dyc +cQr +cQr +cQr +khY jXO iVG aCt @@ -103502,12 +103502,12 @@ nGE eOZ arj vBs -flh -euc -euc -lSd -gDs -oWe +jXj +wyi +wyi +ooF +tKv +rDf nWA arj alP @@ -103762,7 +103762,7 @@ mck eAX gaI mhm -tUR +hlY eAX udq aAo diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index 72c90748c5c0..e68bdbfc8a20 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -31829,10 +31829,6 @@ "bqH" = ( /turf/closed/wall, /area/crew_quarters/heads/hop) -"bqI" = ( -/obj/machinery/pool_filter, -/turf/open/indestructible/sound/pool/end, -/area/crew_quarters/fitness/recreation) "bqJ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -33108,20 +33104,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel, /area/hallway/primary/central) -"btz" = ( -/obj/structure/table, -/obj/item/clothing/under/sl_suit{ - desc = "Whoever wears this makes the rules."; - name = "referee suit" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "btC" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -57795,6 +57777,9 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/mixing) +"cBC" = ( +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness/recreation) "cBJ" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -61780,6 +61765,16 @@ dir = 1 }, /area/science/robotics/lab) +"cYe" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/pool/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "cYj" = ( /obj/structure/closet/firecloset, /obj/effect/spawner/lootdrop/maintenance, @@ -63897,17 +63892,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) -"dmp" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "dmq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64143,6 +64127,12 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/port/fore) +"dqo" = ( +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "dqu" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -64317,6 +64307,9 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"dzB" = ( +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness/recreation) "dzP" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=10-Aft-To-Central"; @@ -65123,6 +65116,16 @@ "eaC" = ( /turf/open/space/basic, /area/space/nearstation) +"ebd" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "ebk" = ( /obj/item/folder/white{ pixel_x = 4; @@ -65725,18 +65728,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) -"eHd" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "eJo" = ( /obj/structure/table, /obj/item/crowbar/red, @@ -65800,21 +65791,11 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) -"eMu" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, +"eLI" = ( /obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/pool{ - dir = 4 + dir = 8 }, +/obj/effect/turf_decal/pool, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "eMO" = ( @@ -67229,15 +67210,6 @@ /obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/plasteel/white/side, /area/medical/surgery) -"gkU" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "glh" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/hidden, /turf/open/floor/plating, @@ -67906,19 +67878,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) -"gWL" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/pool/corner{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "gXd" = ( /obj/machinery/mineral/stacking_unit_console{ machinedir = 8; @@ -68608,6 +68567,10 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"hIR" = ( +/obj/machinery/pool_filter, +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness/recreation) "hKT" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -68659,12 +68622,6 @@ /obj/item/trash/pistachios, /turf/open/floor/plating, /area/maintenance/port/aft) -"hLV" = ( -/obj/effect/turf_decal/pool{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "hMu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -69119,6 +69076,23 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"ijS" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "ilr" = ( /obj/machinery/door/airlock{ id_tag = "AuxShower"; @@ -69583,12 +69557,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) -"iOa" = ( -/obj/structure/chair, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/pool, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "iOj" = ( /obj/effect/landmark/stationroom/maint/threexthree, /turf/template_noop, @@ -69914,6 +69882,15 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/space/basic, /area/engine/atmos_distro) +"jjs" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "jjM" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -70189,6 +70166,10 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"jwI" = ( +/obj/structure/pool_ladder, +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness/recreation) "jwW" = ( /turf/closed/wall/mineral/plastitanium, /area/crew_quarters/fitness/recreation) @@ -70576,10 +70557,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/service) -"jTc" = ( -/obj/structure/pool_ladder, -/turf/open/indestructible/sound/pool/end, -/area/crew_quarters/fitness/recreation) "jTe" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -71120,15 +71097,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel/dark/telecomms, /area/ai_monitored/turret_protected/ai) -"kpp" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/pool{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "kpD" = ( /obj/structure/window/reinforced, /obj/machinery/door/firedoor/border_only{ @@ -71215,6 +71183,19 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"kud" = ( +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "kug" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -71734,6 +71715,15 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"kWp" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/pool/corner, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "kWx" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -71940,6 +71930,19 @@ icon_state = "platingdmg2" }, /area/maintenance/port/fore) +"lla" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/pool/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "llj" = ( /obj/structure/toilet{ pixel_y = 13 @@ -72091,6 +72094,15 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"lrZ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "lso" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 @@ -72249,6 +72261,18 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"lys" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "lyN" = ( /obj/machinery/button/door{ id = "qm_mine_warehouse"; @@ -72342,6 +72366,20 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"lBv" = ( +/obj/structure/table, +/obj/item/clothing/under/sl_suit{ + desc = "Whoever wears this makes the rules."; + name = "referee suit" + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "lCo" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -73085,16 +73123,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/hallway/primary/central) -"myf" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/pool/corner{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "myZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -73393,6 +73421,12 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"mVb" = ( +/obj/structure/chair, +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "mVL" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -74266,6 +74300,15 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/plasteel, /area/hallway/primary/central) +"nPC" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/pool/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "nPJ" = ( /obj/machinery/light/small{ dir = 1 @@ -75048,6 +75091,18 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"oNk" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "oOU" = ( /obj/structure/sign/warning/vacuum/external{ pixel_x = 32 @@ -75444,6 +75499,15 @@ /obj/machinery/rnd/production/techfab/department/service, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"pjT" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "pkA" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -75641,6 +75705,12 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"pwY" = ( +/obj/structure/chair, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "pxC" = ( /obj/machinery/shower{ pixel_y = 20 @@ -75725,15 +75795,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"pAG" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/pool/corner{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "pAV" = ( /obj/machinery/button/door{ id = "AI Core shutters"; @@ -75752,6 +75813,17 @@ /obj/machinery/ai/data_core/primary, /turf/open/floor/circuit/green/telecomms/mainframe, /area/ai_monitored/turret_protected/ai) +"pBH" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "pBX" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -76005,12 +76077,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"pMm" = ( -/obj/structure/chair, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/pool, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "pMu" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -77052,9 +77118,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/plasteel, /area/engine/foyer) -"qKm" = ( -/turf/open/indestructible/sound/pool, -/area/crew_quarters/fitness/recreation) "qKT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1; @@ -77214,13 +77277,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) -"qVA" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/pool, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "qVN" = ( /obj/machinery/door/poddoor/shutters, /turf/open/floor/plating, @@ -77952,14 +78008,6 @@ }, /turf/open/floor/plasteel, /area/engine/foyer) -"rHe" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/pool, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "rHS" = ( /obj/machinery/camera{ c_tag = "Brig Physicians Office"; @@ -77993,18 +78041,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) -"rMh" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "rNv" = ( /obj/machinery/bounty_board, /turf/closed/wall/r_wall, @@ -78250,6 +78286,15 @@ }, /turf/open/floor/plasteel, /area/engine/storage_shared) +"shA" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "siF" = ( /obj/structure/grille, /turf/open/floor/plating/airless, @@ -79002,15 +79047,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/port/fore) -"sSF" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "sTu" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/stripes/corner{ @@ -79711,15 +79747,6 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) -"tGX" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/pool{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "tHQ" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/abandoned, @@ -79756,19 +79783,6 @@ }, /turf/open/floor/plasteel, /area/janitor) -"tIs" = ( -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "tJN" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 10 @@ -80015,16 +80029,6 @@ /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, /area/engine/atmos_distro) -"tXC" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "tYt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ @@ -80587,14 +80591,6 @@ }, /turf/open/floor/plasteel, /area/engine/storage_shared) -"uFC" = ( -/obj/structure/chair, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/pool, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "uGb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -81021,6 +81017,18 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"uVL" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "uWh" = ( /obj/structure/table, /obj/item/candle, @@ -81073,18 +81081,6 @@ }, /turf/open/floor/carpet, /area/medical/psych) -"uXz" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "uYo" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/engine/air, @@ -82461,15 +82457,6 @@ }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) -"wtu" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/pool/corner, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "wtH" = ( /obj/item/radio/intercom{ pixel_y = 25 @@ -83213,9 +83200,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"xhV" = ( -/turf/open/indestructible/sound/pool/end, -/area/crew_quarters/fitness/recreation) "xie" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 6 @@ -83322,6 +83306,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"xmU" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "xmY" = ( /obj/effect/turf_decal/stripes/end{ dir = 1 @@ -83871,6 +83863,14 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"xWy" = ( +/obj/structure/chair, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "xXt" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -119638,13 +119638,13 @@ hsn iKc odl lZV -wtu -sSF -btz -eHd -eMu -dmp -gWL +kWp +shA +lBv +uVL +ijS +pBH +lla aoZ dhs arB @@ -119895,13 +119895,13 @@ kay sGn hvR agu -rHe -jTc -qKm -qKm -qKm -qKm -tIs +xmU +jwI +cBC +cBC +cBC +cBC +kud api aqf arB @@ -120152,13 +120152,13 @@ oSR qca afw agu -iOa -xhV -qKm -qKm -qKm -qKm -rMh +pwY +dzB +cBC +cBC +cBC +cBC +oNk api aqg arC @@ -120409,13 +120409,13 @@ doc qca afx agw -pMm -xhV -qKm -qKm -qKm -qKm -tXC +mVb +dzB +cBC +cBC +cBC +cBC +ebd apA amb amL @@ -120666,13 +120666,13 @@ sGn sGn kGo agx -uFC -xhV -qKm -qKm -qKm -qKm -uXz +xWy +dzB +cBC +cBC +cBC +cBC +lys apB arp asW @@ -120923,13 +120923,13 @@ aaa acP acP agy -qVA -bqI -qKm -qKm -qKm -qKm -gkU +eLI +hIR +cBC +cBC +cBC +cBC +pjT ahh aqj arB @@ -121180,13 +121180,13 @@ acP acP afz agz -myf -tGX -tGX -hLV -kpp -kpp -pAG +cYe +jjs +jjs +dqo +lrZ +lrZ +nPC ahh aqk arB diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm index 4274c02ddaa1..1242221ee18d 100644 --- a/_maps/shuttles/emergency_luxury.dmm +++ b/_maps/shuttles/emergency_luxury.dmm @@ -106,20 +106,6 @@ dir = 4 }, /area/shuttle/escape/luxury) -"fc" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/structure/musician/piano{ - icon_state = "piano" - }, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/mineral/gold{ - dir = 4 - }, -/area/shuttle/escape/luxury) "fA" = ( /obj/machinery/light, /turf/open/floor/mineral/gold{ @@ -144,10 +130,6 @@ /obj/machinery/computer/station_alert, /turf/open/floor/mineral/diamond, /area/shuttle/escape/luxury) -"gQ" = ( -/obj/structure/pool_ladder, -/turf/open/indestructible/sound/pool/end, -/area/shuttle/escape/luxury) "gU" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt/dust, @@ -156,6 +138,9 @@ }, /turf/open/floor/plating, /area/shuttle/escape/luxury) +"jr" = ( +/turf/open/indestructible/sound/pool, +/area/shuttle/escape/luxury) "kk" = ( /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti{ pixel_y = 5 @@ -193,14 +178,6 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet, /area/shuttle/escape/luxury) -"lO" = ( -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/mineral/gold{ - dir = 4 - }, -/area/shuttle/escape/luxury) "mc" = ( /obj/item/reagent_containers/food/snacks/notasandwich{ pixel_y = 11 @@ -222,6 +199,23 @@ /obj/structure/shuttle/engine/propulsion, /turf/open/floor/plating/airless, /area/shuttle/escape/luxury) +"ni" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) "oo" = ( /obj/machinery/door/poddoor/shutters{ id = "ohnopoors" @@ -241,6 +235,17 @@ }, /turf/open/floor/plating/airless, /area/shuttle/escape/luxury) +"oD" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/turf_decal/pool/corner{ + dir = 1 + }, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) "oP" = ( /obj/machinery/vending/wallmed{ pixel_x = -28 @@ -326,13 +331,6 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet, /area/shuttle/escape/luxury) -"sv" = ( -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/pool, -/turf/open/floor/mineral/gold{ - dir = 4 - }, -/area/shuttle/escape/luxury) "sG" = ( /obj/structure/sink{ color = "#FFD700"; @@ -358,16 +356,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/shuttle/escape/luxury) -"ty" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/pool, -/turf/open/floor/mineral/gold{ - dir = 4 - }, -/area/shuttle/escape/luxury) "vh" = ( /obj/machinery/computer/crew, /turf/open/floor/mineral/diamond, @@ -417,6 +405,41 @@ dir = 4 }, /area/shuttle/escape/luxury) +"wY" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/pool, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) +"xe" = ( +/obj/structure/pool_ladder, +/turf/open/indestructible/sound/pool/end, +/area/shuttle/escape/luxury) +"yo" = ( +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/pool, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) +"yt" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/structure/musician/piano{ + icon_state = "piano" + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) "yR" = ( /obj/item/reagent_containers/food/snacks/carneburrito{ pixel_y = 4 @@ -552,6 +575,14 @@ /obj/structure/grille/indestructable, /turf/open/floor/plating, /area/shuttle/escape/luxury) +"Kl" = ( +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) "Kn" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -589,6 +620,13 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet, /area/shuttle/escape/luxury) +"Mt" = ( +/obj/machinery/door/firedoor/border_only, +/obj/effect/turf_decal/pool/corner, +/turf/open/floor/mineral/gold{ + dir = 4 + }, +/area/shuttle/escape/luxury) "Nz" = ( /obj/machinery/scanner_gate/luxury_shuttle{ layer = 2.6 @@ -659,23 +697,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/shuttle/escape/luxury) -"QI" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/structure/chair/comfy/black{ - dir = 8 - }, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/mineral/gold{ - dir = 4 - }, -/area/shuttle/escape/luxury) "RR" = ( /turf/open/floor/carpet, /area/shuttle/escape/luxury) @@ -683,9 +704,6 @@ /obj/machinery/computer/communications, /turf/open/floor/mineral/diamond, /area/shuttle/escape/luxury) -"Sf" = ( -/turf/open/indestructible/sound/pool, -/area/shuttle/escape/luxury) "SO" = ( /obj/item/reagent_containers/food/snacks/hotdog{ pixel_y = 3 @@ -699,28 +717,10 @@ "Tg" = ( /turf/template_noop, /area/shuttle/escape/luxury) -"Tm" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/turf_decal/pool/corner{ - dir = 1 - }, -/turf/open/floor/mineral/gold{ - dir = 4 - }, -/area/shuttle/escape/luxury) "TJ" = ( /obj/structure/chair/comfy/shuttle, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/luxury) -"Ue" = ( -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/pool/corner, -/turf/open/floor/mineral/gold{ - dir = 4 - }, -/area/shuttle/escape/luxury) "Uj" = ( /obj/structure/table/wood/fancy/black, /obj/item/reagent_containers/food/drinks/bottle/champagne{ @@ -823,10 +823,6 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/carpet, /area/shuttle/escape/luxury) -"Yw" = ( -/obj/machinery/pool_filter, -/turf/open/indestructible/sound/pool/end, -/area/shuttle/escape/luxury) "Zx" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -1120,21 +1116,21 @@ Ek zQ Xt zQ -Ue -lO -lO -lO -lO -lO -lO -lO -lO -lO -lO -lO -lO -lO -Tm +Mt +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +Kl +oD zQ zQ oP @@ -1147,21 +1143,21 @@ mt fR mt zQ -sv -gQ -Sf -Sf -Sf -Sf -Sf -Sf -Sf -Sf -Sf -Sf -Sf -Sf -fc +yo +xe +jr +jr +jr +jr +jr +jr +jr +jr +jr +jr +jr +jr +yt zQ zQ zQ @@ -1174,21 +1170,21 @@ ZZ sG mt zQ -ty -Yw -Sf -Sf -Sf -Sf -Sf -Sf -Sf -Sf -Sf -Sf -Sf -Sf -QI +wY +xe +jr +jr +jr +jr +jr +jr +jr +jr +jr +jr +jr +jr +ni zQ zQ pv From 9ecb81968b6696af669dba0d8086465b8751eea7 Mon Sep 17 00:00:00 2001 From: Maxim Date: Wed, 9 Feb 2022 21:18:31 -0500 Subject: [PATCH 5/6] spelling changes --- code/modules/pool/pool_items.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/pool/pool_items.dm b/code/modules/pool/pool_items.dm index 9d4049449892..b54f5072cccd 100644 --- a/code/modules/pool/pool_items.dm +++ b/code/modules/pool/pool_items.dm @@ -16,8 +16,8 @@ color = pick(COLOR_YELLOW, COLOR_LIME, COLOR_RED, COLOR_BLUE_LIGHT, COLOR_CYAN, COLOR_MAGENTA) /obj/item/twohanded/required/pool/rubber_ring - name = "inflateable ring" - desc = "An inflateable ring used for keeping people afloat. Throw at drowning people to save them." + name = "inflatable" + desc = "An inflatable ring used for keeping people afloat. Throw at drowning people to save them." icon_state = "rubber_ring" /obj/item/twohanded/required/pool/rubber_ring/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) From 4eff01d9410ec5c3e2db8b18f980cb42ab95a7f8 Mon Sep 17 00:00:00 2001 From: Maxim Date: Wed, 9 Feb 2022 21:22:44 -0500 Subject: [PATCH 6/6] map changes --- _maps/map_files/YogsBox/YogsBox.dmm | 165 ++++++----- _maps/map_files/Yogsmeta/Yogsmeta.dmm | 382 +++++++++++++------------- 2 files changed, 270 insertions(+), 277 deletions(-) diff --git a/_maps/map_files/YogsBox/YogsBox.dmm b/_maps/map_files/YogsBox/YogsBox.dmm index a2c4767dbdea..6c182be0cac6 100644 --- a/_maps/map_files/YogsBox/YogsBox.dmm +++ b/_maps/map_files/YogsBox/YogsBox.dmm @@ -7639,21 +7639,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"avw" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "avx" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -32262,6 +32247,25 @@ /obj/structure/chair/office/dark, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"cUT" = ( +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -24 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "cVb" = ( /turf/closed/wall, /area/hallway/secondary/service) @@ -39696,6 +39700,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/janitor) +"hUH" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "hVc" = ( /obj/structure/table, /obj/item/multitool, @@ -41458,6 +41479,21 @@ dir = 4 }, /area/crew_quarters/theatre) +"iSt" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "iSP" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -46551,24 +46587,6 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/service) -"mkt" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "mkx" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -48456,13 +48474,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) -"nmf" = ( -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "nnm" = ( /obj/machinery/camera{ c_tag = "Secondary AI Core"; @@ -57565,25 +57576,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/service) -"sTk" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -24 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "sTv" = ( /obj/structure/cable{ icon_state = "4-8" @@ -58047,28 +58039,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"tiA" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness) "tiN" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; @@ -61608,6 +61578,29 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/hallway/secondary/entry) +"vsE" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness) "vsP" = ( /obj/effect/turf_decal/stripes/end, /turf/open/floor/plating, @@ -101960,9 +101953,9 @@ xVA aqc apv arl -mkt -sTk -avw +hUH +cUT +iSt rea rVP azj @@ -102219,7 +102212,7 @@ arj asb kXy aQG -nmf +aQG wiV aQG gSB @@ -102480,7 +102473,7 @@ cQr cQr cQr khY -tiA +vsE aCr cIO aAN diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index e68bdbfc8a20..6de4d27c71f2 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -2695,65 +2695,6 @@ }, /turf/open/floor/plasteel/freezer, /area/crew_quarters/fitness/recreation) -"afu" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/sillycup{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/food/drinks/sillycup, -/obj/item/reagent_containers/food/drinks/sillycup{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/reagent_containers/food/drinks/sillycup{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/reagent_containers/food/drinks/sillycup{ - pixel_x = 5; - pixel_y = 3 - }, -/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/dark, -/area/crew_quarters/fitness/recreation) -"afw" = ( -/obj/structure/closet/masks, -/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/dark, -/area/crew_quarters/fitness/recreation) -"afx" = ( -/obj/structure/closet/athletic_mixed, -/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/dark, -/area/crew_quarters/fitness/recreation) "afz" = ( /obj/structure/closet/emcloset, /obj/structure/sign/warning/pods{ @@ -3550,12 +3491,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"ahl" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "ahm" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -63695,6 +63630,15 @@ }, /turf/open/floor/carpet, /area/bridge/showroom/corporate) +"diE" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "diH" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/structure/sign/poster/contraband/random{ @@ -64502,6 +64446,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/crew_quarters/locker) +"dCx" = ( +/obj/effect/turf_decal/pool{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "dCA" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral{ @@ -65116,16 +65068,6 @@ "eaC" = ( /turf/open/space/basic, /area/space/nearstation) -"ebd" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/pool{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "ebk" = ( /obj/item/folder/white{ pixel_x = 4; @@ -65327,6 +65269,10 @@ dir = 1 }, /area/crew_quarters/kitchen) +"elt" = ( +/obj/effect/landmark/start/assistant, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "elS" = ( /obj/machinery/computer/scan_consolenew{ dir = 4 @@ -66129,15 +66075,6 @@ dir = 1 }, /area/engine/engineering) -"feq" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "fey" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -68417,15 +68354,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port/fore) -"hCv" = ( -/obj/machinery/light_switch{ - pixel_x = -26 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "hDn" = ( /obj/machinery/light{ dir = 1 @@ -69076,23 +69004,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/engine/atmos_distro) -"ijS" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "ilr" = ( /obj/machinery/door/airlock{ id_tag = "AuxShower"; @@ -69591,6 +69502,10 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) +"iQE" = ( +/obj/item/twohanded/required/pool/pool_noodle, +/turf/open/indestructible/sound/pool/end, +/area/crew_quarters/fitness/recreation) "iRa" = ( /obj/structure/sign/warning/fire{ pixel_y = -32 @@ -69816,16 +69731,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/engine/atmos_distro) -"jdY" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -26 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "jeN" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -71577,6 +71482,18 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) +"kPU" = ( +/obj/machinery/light_switch{ + pixel_x = -26 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "kQm" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Foyer"; @@ -71618,6 +71535,22 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/plasteel, /area/engine/foyer) +"kRk" = ( +/obj/structure/closet/athletic_mixed, +/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 + }, +/obj/item/twohanded/required/pool/rubber_ring, +/obj/item/twohanded/required/pool/rubber_ring, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/fitness/recreation) "kRB" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, @@ -72366,20 +72299,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"lBv" = ( -/obj/structure/table, -/obj/item/clothing/under/sl_suit{ - desc = "Whoever wears this makes the rules."; - name = "referee suit" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "lCo" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -72868,6 +72787,10 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"mgw" = ( +/obj/item/twohanded/required/pool/rubber_ring, +/turf/open/indestructible/sound/pool, +/area/crew_quarters/fitness/recreation) "mgP" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -73421,12 +73344,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) -"mVb" = ( -/obj/structure/chair, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/pool, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "mVL" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -74758,6 +74675,19 @@ }, /turf/open/floor/plating, /area/engine/atmos_distro) +"oom" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -26 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "opk" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 4 @@ -75526,6 +75456,22 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"plB" = ( +/obj/structure/closet/masks, +/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 + }, +/obj/item/twohanded/required/pool/pool_noodle, +/obj/item/twohanded/required/pool/pool_noodle, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/fitness/recreation) "plS" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/RnD_secure, @@ -76413,6 +76359,15 @@ dir = 1 }, /area/medical/surgery) +"qcG" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "qdi" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/structure/cable/yellow{ @@ -77444,15 +77399,6 @@ }, /turf/open/floor/plating, /area/engine/atmos_distro) -"rfe" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "rgh" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -77889,6 +77835,21 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) +"rAR" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/sign/poster/official/random{ + pixel_x = -32 + }, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/fitness/recreation) "rBD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/light/small{ @@ -78286,6 +78247,15 @@ }, /turf/open/floor/plasteel, /area/engine/storage_shared) +"shx" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/pool{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "shA" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -78498,6 +78468,13 @@ /obj/structure/girder/reinforced, /turf/open/space/basic, /area/space/nearstation) +"sxk" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "sxU" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -80392,6 +80369,11 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) +"urU" = ( +/obj/structure/chair, +/obj/effect/turf_decal/pool, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "usm" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ dir = 4 @@ -81017,18 +80999,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) -"uVL" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/pool{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/recreation) "uWh" = ( /obj/structure/table, /obj/item/candle, @@ -81909,6 +81879,24 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"vLb" = ( +/obj/structure/table, +/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 + }, +/obj/item/clothing/under/sl_suit{ + desc = "Whoever wears this makes the rules."; + name = "referee suit" + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/fitness/recreation) "vLK" = ( /obj/item/reagent_containers/food/snacks/grown/wheat, /obj/item/reagent_containers/food/snacks/grown/watermelon, @@ -83599,6 +83587,18 @@ /obj/machinery/atmospherics/miner/oxygen, /turf/open/floor/engine/o2, /area/engine/atmos_distro) +"xCh" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -27 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) "xDl" = ( /obj/structure/chair{ dir = 8 @@ -118871,7 +118871,7 @@ acP acP acP tDT -feq +rAR amv acP alO @@ -119123,15 +119123,15 @@ tys hPi qca xYj -akN -akN -jdY -rfe -ahg -ahl -ahl -hCv -alQ +kGC +diE +oom +xCh +nhy +qcG +qcG +kPU +vmz aqc arB asT @@ -119379,16 +119379,16 @@ vsg jPM oSR qca -afu -kGC -nhy -nhy -nhy -nhy -nhy -nhy -nhy -vmz +vLb +akN +ahg +ahg +ahg +elt +ahg +ahg +ahg +alQ aqd arB asU @@ -119640,9 +119640,9 @@ odl lZV kWp shA -lBv -uVL -ijS +shA +dCx +pBH pBH lla aoZ @@ -120150,7 +120150,7 @@ vsg gLv oSR qca -afw +plB agu pwY dzB @@ -120407,15 +120407,15 @@ xqo fWM doc qca -afx +kRk agw -mVb +urU dzB cBC +mgw cBC cBC -cBC -ebd +shx apA amb amL @@ -120667,7 +120667,7 @@ sGn kGo agx xWy -dzB +iQE cBC cBC cBC @@ -121696,7 +121696,7 @@ afB agz ahn agz -aiY +sxk aiY ahh akj