From 813a2c956c832208ecf614dfc569be06d02f32c3 Mon Sep 17 00:00:00 2001 From: KandJX <83637364+YegorKandziuba@users.noreply.github.com> Date: Fri, 3 Nov 2023 10:56:10 +0200 Subject: [PATCH] Fix areas, holomap and minor mapping bugs Co-authored-by: LordNest --- maps/sierra/areas/shuttles.dm | 4 + maps/sierra/areas/z1_sierra_deck4.dm | 29 +- maps/sierra/areas/z2_sierra_deck3.dm | 68 ++ maps/sierra/areas/z3_sierra_deck2.dm | 43 + maps/sierra/areas/z4_sierra_deck1.dm | 50 +- maps/sierra/areas/z5_sierra_bridge.dm | 26 + maps/sierra/z1-z5_sierra.dmm | 1123 +++++++++++++++++++------ mods/jukebox_tapes/code/jukebox.dm | 9 + 8 files changed, 1049 insertions(+), 303 deletions(-) diff --git a/maps/sierra/areas/shuttles.dm b/maps/sierra/areas/shuttles.dm index c77b3180be35c..5463ff9c0d6e3 100644 --- a/maps/sierra/areas/shuttles.dm +++ b/maps/sierra/areas/shuttles.dm @@ -10,6 +10,7 @@ /area/shuttle/escape_pod area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT icon_state = "exit" + holomap_color = HOLOMAP_AREACOLOR_ESCAPE /area/shuttle/escape_pod/escape_pod1/station name = "Shuttle - Escape - Pod One" @@ -56,6 +57,7 @@ icon_state = "shuttlered" base_turf = /turf/simulated/floor/plating area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_EXPLORATION /area/exploration_shuttle/cockpit name = "Shuttle - Charon - Cockpit" @@ -79,6 +81,7 @@ dynamic_lighting = 1 area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED req_access = list(access_guppy) + holomap_color = HOLOMAP_AREACOLOR_CARGO /area/crucian_hangar/start name = "Shuttle - Сrucian" @@ -94,6 +97,7 @@ dynamic_lighting = 1 area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED req_access = list(access_petrov) + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/shuttle/petrov/ship icon_state = "shuttlered" diff --git a/maps/sierra/areas/z1_sierra_deck4.dm b/maps/sierra/areas/z1_sierra_deck4.dm index e3b826eb1fb71..f59d1633c74f8 100644 --- a/maps/sierra/areas/z1_sierra_deck4.dm +++ b/maps/sierra/areas/z1_sierra_deck4.dm @@ -2,22 +2,27 @@ name = "Fourth Deck - Hallway - Fore" icon_state = "hallF" req_access = list(access_external_airlocks) + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/fourthdeck/center name = "Fourth Deck - Hallway - Central" icon_state = "hallC3" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/fourthdeck/aft name = "Fourth Deck - Hallway - Aft" icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/fourthdeck/central_stairwell name = "Fourth Deck - Stairwell - Central" icon_state = "hallC2" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/fourthdeck/aft_stairwell name = "Fourth Deck - Stairwell - Fore " icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/maintenance/fourthdeck name = "Fourth Deck - Maintenance" @@ -53,16 +58,19 @@ /area/crew_quarters/visitors name = "Fourth Deck - Visitors" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/commissary name = "Fourth Deck - Commissary" icon_state = "crew_quarters" req_access = list(access_commissary) + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/docking name = "Fourth Deck - Docking Bay" icon_state = "crew_quarters" lighting_tone = AREA_LIGHTING_COOL + holomap_color = HOLOMAP_AREACOLOR_CREW /* COMMAND AREAS * ============= @@ -71,6 +79,7 @@ name = "Fourth Deck - Expedition - Leader's Office" icon_state = "heads_sea" req_access = list(access_el) + holomap_color = HOLOMAP_AREACOLOR_EXPLORATION /* ENGINEERING AREAS * ================= @@ -79,21 +88,26 @@ /area/storage/primary name = "Fourth Deck - Primary Tool Storage" icon_state = "primarystorage" + holomap_color = HOLOMAP_AREACOLOR_CARGO /area/storage/auxillary/port name = "Fourth Deck - Supply - Auxillary Warehouse" icon_state = "auxstorage" req_access = list(access_cargo) + holomap_color = HOLOMAP_AREACOLOR_CARGO /area/storage/airlock_canisters name = "Fourth Deck - Supply - Central Airlock's Canisters" req_access = list(list(access_cargo, access_engine)) + holomap_color = HOLOMAP_AREACOLOR_CARGO // Thusters /area/thruster/d3port name = "Fourth Deck - Nacelle - Port" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/thruster/d3starboard name = "Fourth Deck - Nacelle - Starboard" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /* VACANT AREAS * ============ @@ -119,7 +133,6 @@ /area/vacant/cargo name = "Fourth Deck - Abandoned - Requisition" icon_state = "quart" - holomap_color = HOLOMAP_AREACOLOR_CARGO /* RND AREAS * ========= @@ -130,12 +143,14 @@ icon_state = "toxstorage" sound_env = SMALL_ENCLOSED req_access = list(access_tox_storage) + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /* SUPPLY AREAS * ============ */ /area/quartermaster req_access = list(access_cargo) + holomap_color = HOLOMAP_AREACOLOR_CARGO /area/quartermaster/office name = "Fourth Deck - Supply" @@ -177,6 +192,7 @@ name = "Fourth Deck - Expedition - Locker Room" icon_state = "exploration" req_access = list(access_explorer) + holomap_color = HOLOMAP_AREACOLOR_EXPLORATION /area/quartermaster/exploration/eva name = "Fourth Deck - Expedition - EVA" @@ -215,17 +231,6 @@ name = "Fourth Deck - Hangar - Stairs" icon_state = "auxstorage" -/* CREW AREAS - * ========== - */ -/area/janitor - name = "Fourth Deck - Service - Custodial Closet" - icon_state = "janitor" - req_access = list(access_janitor) - -/area/hydroponics/third_deck_storage - name = "Fourth Deck - Service - Hydroponics Storage" - /* SECURITY AREAS * */ diff --git a/maps/sierra/areas/z2_sierra_deck3.dm b/maps/sierra/areas/z2_sierra_deck3.dm index a396c921922a5..c6671dd3ac88e 100644 --- a/maps/sierra/areas/z2_sierra_deck3.dm +++ b/maps/sierra/areas/z2_sierra_deck3.dm @@ -2,18 +2,22 @@ name = "Third Deck - Hallway - Fore" icon_state = "hallF" req_access = list(access_external_airlocks) + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/thirddeck/center name = "Third Deck - Hallway - Central" icon_state = "hallC3" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/thirddeck/central_stairwell name = "Third Deck - Stairwell - Central" icon_state = "hallC2" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/thirddeck/aft_stairwell name = "Third Deck - Stairwell - Fore " icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/maintenance/thirddeck name = "Third Deck - Maintenance" @@ -51,24 +55,33 @@ icon_state = "disposal" req_access = list(list(access_cargo, access_engine, access_el)) +/area/hydroponics/third_deck_storage + name = "Third Deck - Service - Hydroponics Storage" + holomap_color = HOLOMAP_AREACOLOR_CREW + /area/crew_quarters/sleep/cryo/thirddeck name = "Third Deck - Living - Cryogenic Storage" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/head/deck3 name = "Third Deck - Head" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/bar name = "Third Deck - Service - Bar" icon_state = "bar" sound_env = SMALL_ENCLOSED req_access = list(list(access_kitchen, access_bar)) + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/bar/cobed name = "Third Deck - Service - Bartender's Room" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/cafe name = "Third Deck - Living - Cafe" icon_state = "cafeteria" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/command/chief_steward name = "Third Deck - Service - Chief Steward's Office" @@ -76,6 +89,7 @@ sound_env = SMALL_ENCLOSED lighting_tone = AREA_LIGHTING_WARM req_access = list(access_chief_steward) + holomap_color = HOLOMAP_AREACOLOR_CREW /* ENGINEERING AREAS * ================= @@ -84,6 +98,7 @@ name = "Third Deck - Engineering - Storage" icon_state = "engineering_storage" sound_env = SMALL_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/engine_room name = "Third Deck - Engine - Supermatter" @@ -96,11 +111,13 @@ 'maps/sierra/sound/ambience/engineering3.ogg' ) req_access = list(access_engine_equip) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/engine_eva name = "Third Deck - Engineering - EVA" icon_state = "engine_eva" req_access = list(list(access_eva, access_external_airlocks), access_engine) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/engine_monitoring name = "Third Deck - Engine - Monitoring" @@ -110,23 +127,28 @@ 'maps/sierra/sound/ambience/engineering2.ogg', 'maps/sierra/sound/ambience/engineering3.ogg' ) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/engine_smes name = "Third Deck - Engine - SMES" icon_state = "engine_smes" sound_env = SMALL_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/engineering_monitoring name = "Third Deck - Engineering - Monitoring" icon_state = "engine_monitoring" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/locker_room name = "Third Deck - Engineering - Locker Room" icon_state = "engineering_locker" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/materials_storage name = "Third Deck - Engineering - Materials Storage" icon_state = "engineering_storage" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/atmos name = "Third Deck - Engineering - Atmospherics" @@ -139,46 +161,54 @@ ) sound_env = LARGE_ENCLOSED req_access = list(access_atmospherics) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/gravitaional_generator name = "Third Deck - Gravitational Generator" icon_state = "engine_monitoring" req_access = list(list(access_engine_equip, access_heads), list(access_seneng, access_engine_equip)) sound_env = SMALL_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/bluespace name = "Third Deck - Engineering - BlueSpace Drive" icon_state = "engine_monitoring" req_access = list(list(access_engine_equip, access_heads), access_engine, access_maint_tunnels) sound_env = SMALL_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/bluespace/chamber name = "Third Deck - Engineering - BlueSpace Drive - Chamber" icon_state = "engine" sound_env = LARGE_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/fuelbay name = "Third Deck - Engineering - Fuel Bay" icon_state = "engineering" req_access = list(access_construction) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/engineering/atmos/storage name = "Third Deck - Engineering - Atmospherics Storage" icon_state = "atmos_storage" sound_env = SMALL_ENCLOSED req_access = list(access_atmospherics) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/turret_protected/ai_cyborg_station name = "Third Deck - Cyborg Station" icon_state = "ai_cyborg" sound_env = SMALL_ENCLOSED area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/turret_protected/ai_cyborg_upload name = "Third Deck - Cyborg Upload" icon_state = "ai_cyborg" sound_env = SMALL_ENCLOSED area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/shield/thirddeck name = "Third Deck - Shield Generator" @@ -189,6 +219,30 @@ icon_state = "heads_ce" name = "Bridge - Command - CE's Office" req_access = list(access_ce) + holomap_color = HOLOMAP_AREACOLOR_COMMAND + +// Tcomm +/area/tcommsat/ + ambience = list( + 'sound/ambience/ambisin2.ogg', + 'sound/ambience/signal.ogg', + 'sound/ambience/ambigen10.ogg', + 'maps/sierra/sound/ambience/aiservers.wav' + ) + req_access = list(access_tcomsat) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING + +/area/tcommsat/chamber + name = "Third Deck - Telecoms" + icon_state = "tcomsatcham" + +/area/tcommsat/computer + name = "Third Deck - Telecoms - Monitoring" + icon_state = "tcomsatcomp" + +/area/tcommsat/storage + name = "Third Deck - Telecoms - Storage" + icon_state = "tcomsatstore" /* RUST * ================= @@ -196,6 +250,7 @@ /area/vacant/prototype req_access = list(access_engine) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/vacant/prototype/control name = "\improper Prototype Fusion Reactor Control Room" @@ -211,10 +266,12 @@ icon_state = "SolarcontrolP" sound_env = SMALL_ENCLOSED req_access = list(access_engine) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/maintenance/solar/starboard name = "First Deck - Solar - Starboard" icon_state = "SolarcontrolS" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/solar area_flags = AREA_FLAG_EXTERNAL @@ -237,9 +294,11 @@ name = "Third Deck - Engineering - Technical Storage" icon_state = "storage" req_access = list(access_tech_storage) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/storage/tech/high_risk name = "Third Deck - Engineering - High Security Storage" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING // Hangar /area/quartermaster/hangar/upper @@ -278,7 +337,16 @@ /area/rnd/xenobiology/entry2 name = "Xenobiology Access" icon_state = "xeno_lab" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/rnd/xenobiology/level2 name = "Xenobiology Level Two" icon_state = "xeno_lab" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE + +// EVA + +/area/storage/eva + name = "Third Deck - EVA" + icon_state = "eva" + req_access = list(access_eva) diff --git a/maps/sierra/areas/z3_sierra_deck2.dm b/maps/sierra/areas/z3_sierra_deck2.dm index 46217b989c9de..daae6d65dbb8d 100644 --- a/maps/sierra/areas/z3_sierra_deck2.dm +++ b/maps/sierra/areas/z3_sierra_deck2.dm @@ -1,22 +1,27 @@ /area/hallway/primary/seconddeck/fore name = "Second Deck - Hallway - Fore " icon_state = "hallF" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/seconddeck/center name = "Second Deck - Hallway - Central" icon_state = "hallC3" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/seconddeck/aft name = "Second Deck - Hallway - Aft" icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/seconddeck/central_stairwell name = "Second Deck - Stairwell - Central " icon_state = "hallC2" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/seconddeck/aft_stairwell name = "Second Deck - Stairwell - Fore " icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/maintenance/seconddeck name = "Second Deck - Maintenance" @@ -57,6 +62,7 @@ /area/crew_quarters/safe_room/seconddeck name = "Second Deck - Safe Room" area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_ESCAPE /area/maintenance/substation/seconddeck name = "Second Deck - Substation" @@ -64,6 +70,7 @@ /area/crew_quarters/laundry name = "Second Deck - Laundry Room" icon_state = "Sleep" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/maintenance/abandoned_hydroponics name = "Second Deck - Abandoned - Hydroponics" @@ -77,38 +84,47 @@ /area/rnd/xenobiology/entry name = "Xenobiology Access" icon_state = "xeno_lab" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/rnd/xenobiology/storage2 name = "Xenobiology Access" icon_state = "xeno_lab" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/rnd/xenobiology/level1 name = "Xenobiology Level One" icon_state = "xeno_lab" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/rnd/xenobiology/atmos name = "Xenobiology - Atmos Hub" icon_state = "xeno_lab" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/rnd/xenobiology/water_cell name = "Xenobiology - Water Cell" icon_state = "xeno_lab" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/assembly/chargebay name = "Second Deck - RND - Mech Bay" icon_state = "mechbay" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/assembly/robotics name = "Second Deck - RND - Robotics Lab" icon_state = "robotics" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/rnd/toxins name = "Second Deck - RND - Toxins Lab" icon_state = "toxstorage" req_access = list(access_tox_storage) + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/rnd/toxins/storage name = "Second Deck - RND - Canister Storage" + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /* VACANT AREAS * ============ @@ -142,81 +158,105 @@ /area/holocontrol name = "Second Deck - Holodeck Control" icon_state = "Holodeck" + holomap_color = HOLOMAP_AREACOLOR_CREW /* CREW AREAS * ========== */ + +/area/janitor + name = "Second Deck - Service - Custodial Closet" + icon_state = "janitor" + req_access = list(access_janitor) + holomap_color = HOLOMAP_AREACOLOR_CREW + /area/hydroponics name = "Second Deck - Service - Hydroponics" icon_state = "hydro" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/galley name = "Second Deck - Service - Galley" icon_state = "kitchen" req_access = list(list(access_kitchen, access_bar)) + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/galley/backroom name = "Second Deck - Service - Galley Backroom" icon_state = "kitchen" req_access = list(list(access_kitchen, access_bar)) + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/galley/freezer name = "Second Deck - Service - Galley Cold Storage" icon_state = "kitchen" req_access = list(list(access_kitchen, access_bar)) + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/cafe/upper name = "Second Deck - Living - Cafe" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/sauna name = "Second Deck - Living - Sauna" icon_state = "sauna" sound_env = SMALL_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/head name = "Second Deck - Living - Restroom" icon_state = "toilet" sound_env = SMALL_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/garden_room name = "Second deck - living - Lounge" icon_state = "game_room_inf" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/gym name = "Second Deck - Living - Gym" icon_state = "fitness" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/actor name = "Second Deck - Service - Actor" icon_state = "Theatre" sound_env = SMALL_SOFTFLOOR req_access = list(access_actor) + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/actor/stage name = "Second Deck - Service - Stage" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/lounge name = "Second Deck - Living - Lounge" sound_env = MEDIUM_SOFTFLOOR + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/sleep/bunk name = "Second Deck - Living - Dormitory" icon_state = "Sleep" sound_env = SMALL_SOFTFLOOR area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/sleep/cryo name = "Second Deck - Living - Cryogenic Storage" icon = 'maps/sierra/icons/turf/areas.dmi' icon_state = "cryo" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/sleep/cryo/south name = "Second Deck - Living - Cryogenic Storage - South" icon_state = "cryo_south" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/adherent name = "Second Deck - Living - Adherent Maintenence" icon_state = "robotics" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/chapel/main name = "Second Deck - Chapel" @@ -228,17 +268,20 @@ 'maps/sierra/sound/ambience/chapel4.ogg' ) sound_env = LARGE_ENCLOSED + holomap_color = HOLOMAP_AREACOLOR_CREW /area/chapel/office name = "Second Deck - Chapel - Chaplain's Office" req_access = list(access_chapel_office) color = COLOR_GRAY80 sound_env = SMALL_SOFTFLOOR + holomap_color = HOLOMAP_AREACOLOR_CREW /area/chapel/mortuary name = "Second Deck - Chapel - Morgue" req_access = list(access_chapel_office) color = COLOR_GRAY80 + holomap_color = HOLOMAP_AREACOLOR_CREW /* MEDBAY AREAS diff --git a/maps/sierra/areas/z4_sierra_deck1.dm b/maps/sierra/areas/z4_sierra_deck1.dm index d99c1ec1a0117..3149874b5067a 100644 --- a/maps/sierra/areas/z4_sierra_deck1.dm +++ b/maps/sierra/areas/z4_sierra_deck1.dm @@ -37,22 +37,27 @@ /area/hallway/primary/firstdeck/fore name = "First Deck - Hallway - Fore" icon_state = "hallF" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/firstdeck/center name = "First Deck - Hallway - Central" icon_state = "hallC1" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/firstdeck/aft name = "First Deck - Hallway - Aft" icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/firstdeck/central_stairwell name = "First Deck - Stairwell - Central" icon_state = "hallC2" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/firstdeck/aft_stairwell name = "First Deck - Stairwell - Fore" icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/maintenance/substation/firstdeck name = "First Deck - Substation" @@ -65,22 +70,26 @@ icon_state = "heads_rd" name = "First Deck - Command - RD's Office" req_access = list(access_rd) + holomap_color = HOLOMAP_AREACOLOR_SCIENCE /area/crew_quarters/heads/office/cmo icon_state = "heads_cmo" name = "First Deck - Command - CMO's Office" req_access = list(access_cmo) + holomap_color = HOLOMAP_AREACOLOR_MEDICAL /area/crew_quarters/heads/office/hos icon_state = "heads_hos" - name = "First Deck - Command - HoS' Office" + name = "Bridge - Command - HoS' Office" req_access = list(access_hos) + holomap_color = HOLOMAP_AREACOLOR_SECURITY /area/command/bsa - name = "Fourth Deck - Obstruction Field Disperser" + name = "First Deck - Obstruction Field Disperser" icon = 'maps/sierra/icons/turf/areas.dmi' icon_state = "bridge_gun" req_access = list(access_gun) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /* ENGINEERING AREAS * ================= @@ -89,42 +98,16 @@ name = "First Deck - Engineering - Auxiliary Power Storage" icon_state = "engine_smes" sound_env = SMALL_ENCLOSED - -// Tcomm -/area/tcommsat/ - ambience = list( - 'sound/ambience/ambisin2.ogg', - 'sound/ambience/signal.ogg', - 'sound/ambience/ambigen10.ogg', - 'maps/sierra/sound/ambience/aiservers.wav' - ) - req_access = list(access_tcomsat) - -/area/tcommsat/chamber - name = "First Deck - Telecoms" - icon_state = "tcomsatcham" - -/area/tcommsat/computer - name = "First Deck - Telecoms - Monitoring" - icon_state = "tcomsatcomp" - -/area/tcommsat/storage - name = "First Deck - Telecoms - Storage" - icon_state = "tcomsatstore" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING // Thusters /area/thruster/d1port name = "First Deck - Nacelle - Port " + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/thruster/d1starboard name = "First Deck - Nacelle - Starboard" - -/area/storage/eva - name = "First Deck - EVA" - icon_state = "eva" - req_access = list(access_eva) - - + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /* RND AREAS * ========= @@ -187,17 +170,21 @@ /area/crew_quarters/sleep/cryo/firstdeck name = "First Deck - Living - Cryogenic Storage" icon_state = "cryo_up" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/dungeon_master_lounge name = "First Deck - Living Room" sound_env = MEDIUM_SOFTFLOOR + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/lounge/upper name = "First Deck - Living - Library" + holomap_color = HOLOMAP_AREACOLOR_CREW /area/crew_quarters/safe_room name = "First Deck - Citadel" area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_ESCAPE /* SECURITY AREAS * ============== @@ -292,6 +279,7 @@ /area/hallway/infirmary name = "First Deck - Infirmary - Hallway" icon_state = "medbay" + holomap_color = HOLOMAP_AREACOLOR_MEDICAL /area/medical/infirmreception name = "First Deck - Infirmary - Reception" diff --git a/maps/sierra/areas/z5_sierra_bridge.dm b/maps/sierra/areas/z5_sierra_bridge.dm index ec0fd7dfed432..dc71fe303eb88 100644 --- a/maps/sierra/areas/z5_sierra_bridge.dm +++ b/maps/sierra/areas/z5_sierra_bridge.dm @@ -1,14 +1,17 @@ /area/hallway/primary/bridgedeck/center name = "Bridge - Hallway - Central" icon_state = "hallC3" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/bridgedeck/aft name = "Bridge - Hallway - Aft" icon_state = "hallA" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/hallway/primary/bridgedeck/central_stairwell name = "Bridge - Stairwell - Central" icon_state = "hallC2" + holomap_color = HOLOMAP_AREACOLOR_HALLWAYS /area/maintenance/bridgedeck name = "Bridge - Maintenance" @@ -31,6 +34,7 @@ /area/crew_quarters/sleep/cryo/bridge name = "Bridge - Living - Cryogenic Storage" + holomap_color = HOLOMAP_AREACOLOR_CREW /* COMMAND AREAS * ============= @@ -40,22 +44,26 @@ icon_state = "heads_cap" sound_env = MEDIUM_SOFTFLOOR req_access = list(access_captain) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/captain req_access = list(access_captain) icon_state = "heads_cap" + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/captain/beach name = "Bridge - Command - Captain's Recreation Facility" icon_state = "heads_cap" sound_env = PLAIN req_access = list("ACCESS_BRIDGE") + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/bridge name = "Bridge Deck - Bridge" icon_state = "bridge" req_access = list(access_bridge) ambience = list('maps/sierra/sound/ambience/bridge.wav') + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/bridge/nano icon = 'maps/sierra/icons/turf/areas.dmi' @@ -89,6 +97,7 @@ icon_state = "teleporter" sound_env = SMALL_ENCLOSED req_access = list(access_teleporter) + holomap_color = HOLOMAP_AREACOLOR_COMMAND // AI /area/turret_protected @@ -102,6 +111,7 @@ 'maps/sierra/sound/ambience/ai3.ogg' ) forced_ambience = list('maps/sierra/sound/ambience/ambxerxes_looped.wav') + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/turret_protected/ai name = "AI Chamber" @@ -119,54 +129,66 @@ /area/crew_quarters/safe_room/bridge name = "Bridge - Safe Room" + holomap_color = HOLOMAP_AREACOLOR_ESCAPE /area/crew_quarters/heads/office/rd/cobed icon_state = "heads_rd" name = "Bridge - Command - RD's Quarters" req_access = list(access_rd) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/cmo/cobed icon_state = "heads_cmo" name = "Bridge - Command - CMO's Quarters" req_access = list(access_cmo) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/ce/cobed icon_state = "heads_ce" name = "Bridge - Command - CE's Quarters" req_access = list(access_ce) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/hos/cobed icon_state = "heads_hos" name = "Bridge - Command - HoS's Quarters" req_access = list(access_hos) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/hop name = "Bridge - Command - HoP's Office" icon_state = "heads_hop" req_access = list(access_hop) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/hop/cobed name = "Bridge - Command - HoP's Quarters" + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/iaa icon_state = "heads_cl" name = "Bridge - Command - IAA's Office" req_access = list(access_iaa) + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/iaa/high_sec name = "Bridge - Command - IAA's Communication Relay" + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/office/iaa/cobed name = "Bridge - Command - IAA's Quarters" area_flags = AREA_FLAG_RAD_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/bridge/adjutants name = "Bridge - Adjutants Room" icon = 'maps/sierra/icons/turf/areas.dmi' icon_state = "bridge_gun" + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/bridge/adjutants/cobed name = "Bridge - Adjutants Dormintories" + holomap_color = HOLOMAP_AREACOLOR_COMMAND /area/crew_quarters/heads/captain/secret_room/level_one @@ -178,16 +200,19 @@ icon_state = "toilet" sound_env = SMALL_ENCLOSED area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED + holomap_color = HOLOMAP_AREACOLOR_CREW // Solars /area/maintenance/solar/bridge_port name = "Bridge - Solar - Port" icon_state = "SolarcontrolP" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/maintenance/solar/bridge_starboard name = "Bridge - Solar - Starboard" icon_state = "SolarcontrolS" + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING /area/solar/bridge_starboard name = "Bridge - Solar - Starboard Array" @@ -202,3 +227,4 @@ icon_state = "atmos_storage" sound_env = SMALL_ENCLOSED req_access = list(access_atmospherics) + holomap_color = HOLOMAP_AREACOLOR_ENGINEERING diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index 579018e35cfe5..158dd5725b196 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -1054,6 +1054,10 @@ icon_state = "desert2" }, /area/crew_quarters/garden_room) +"ahU" = ( +/obj/machinery/light/spot, +/turf/simulated/wall/r_wall/prepainted, +/area/crew_quarters/heads/office/hop/cobed) "aif" = ( /obj/wallframe_spawn/reinforced/hull, /obj/machinery/door/firedoor, @@ -1630,10 +1634,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/firstdeck/centralstarboard) "amo" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -3919,6 +3919,7 @@ }, /obj/structure/table/standard, /obj/floor_decal/corner/grey/diagonal, +/obj/random/clipboard, /turf/simulated/floor/tiled, /area/rnd/research) "aCs" = ( @@ -4086,6 +4087,9 @@ /obj/structure/railing/mapped{ dir = 8 }, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/open, /area/hallway/primary/bridgedeck/central_stairwell) "aDB" = ( @@ -4387,7 +4391,11 @@ /area/maintenance/seconddeck/aftstarboard) "aFR" = ( /obj/machinery/washing_machine, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "aFT" = ( /obj/structure/cable/green{ @@ -5170,6 +5178,7 @@ /obj/structure/railing/mapped{ dir = 1 }, +/obj/structure/railing/mapped, /turf/simulated/open, /area/hallway/primary/firstdeck/central_stairwell) "aMo" = ( @@ -5237,7 +5246,6 @@ /obj/structure/bed/chair/padded/red{ dir = 1 }, -/obj/item/modular_computer/laptop/preset/custom_loadout, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/heads/office/hos) "aML" = ( @@ -7939,6 +7947,9 @@ dir = 8 }, /obj/structure/closet/secure_closet/personal, +/obj/floor_decal/techfloor{ + dir = 4 + }, /obj/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -8158,7 +8169,7 @@ /turf/simulated/floor/reinforced/oxygen, /area/thruster/d1port) "bjU" = ( -/obj/machinery/light, +/obj/machinery/light/spot, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -8270,7 +8281,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "bld" = ( /obj/structure/railing/mapped{ @@ -9446,6 +9464,19 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/marine_room) +"buZ" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/rotating_alarm/supermatter{ + dir = 8; + pixel_x = 14 + }, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftstarboard) "bva" = ( /obj/floor_decal/corner/yellow/three_quarters{ dir = 8 @@ -10306,15 +10337,16 @@ /turf/simulated/floor/tiled/white/monotile, /area/medical/locker) "bBr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/floor_decal/techfloor/orange{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) "bBv" = ( @@ -11288,7 +11320,14 @@ /area/turret_protected/ai_cyborg_upload) "bJC" = ( /obj/floor_decal/techfloor, -/obj/machinery/light/small, +/obj/machinery/light, +/obj/floor_decal/techfloor{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/random/machine/jukebox_custom, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) "bJI" = ( @@ -11559,12 +11598,11 @@ /turf/simulated/floor/carpet/blue2, /area/crew_quarters/heads/office/captain) "bLS" = ( -/obj/wallframe_spawn/reinforced/hull, -/obj/machinery/door/firedoor{ - dir = 4 +/obj/floor_decal/techfloor{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/quartermaster/hangar/upper) +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo/south) "bLT" = ( /obj/machinery/atmospherics/unary/vent_pump/tank{ external_pressure_bound = 0; @@ -11729,6 +11767,9 @@ "bNq" = ( /obj/machinery/portable_atmospherics/canister/helium, /obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/toxins/storage) "bNu" = ( @@ -12601,6 +12642,9 @@ /obj/floor_decal/techfloor/orange{ dir = 9 }, +/obj/machinery/light/spot{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/seconddeck/aftstarboard) "bUM" = ( @@ -13183,7 +13227,11 @@ /area/maintenance/firstdeck/foreport) "bYX" = ( /obj/random/ironing_board_structure, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "bZf" = ( /obj/structure/largecrate, @@ -14675,7 +14723,7 @@ /obj/floor_decal/corner/lime/border{ dir = 1 }, -/obj/machinery/light{ +/obj/machinery/light/spot{ dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -14795,6 +14843,16 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) +"cmk" = ( +/obj/floor_decal/techfloor, +/obj/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/floodlight{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/firstdeck/aftport) "cmm" = ( /obj/floor_decal/spline/fancy/black{ dir = 4 @@ -15314,7 +15372,13 @@ dir = 8; pixel_x = 32 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "crs" = ( /obj/machinery/door/firedoor, @@ -16608,6 +16672,15 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/hallway/primary/fourthdeck/center) +"cBm" = ( +/obj/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/machinery/rotating_alarm/supermatter{ + pixel_y = 14 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "cBq" = ( /obj/structure/catwalk, /obj/machinery/space_heater, @@ -18544,6 +18617,15 @@ /obj/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/medical/virology/atmos) +"cOZ" = ( +/obj/floor_decal/techfloor/orange{ + dir = 1 + }, +/obj/machinery/rotating_alarm/supermatter{ + pixel_y = 14 + }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/engine_room) "cPc" = ( /obj/structure/cable/green{ d1 = 1; @@ -18884,6 +18966,7 @@ /obj/structure/railing/mapped{ dir = 4 }, +/obj/structure/railing/mapped, /turf/simulated/open, /area/maintenance/seconddeck/aftstarboard) "cRI" = ( @@ -22206,9 +22289,6 @@ /obj/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/light/spot{ - dir = 1 - }, /obj/machinery/atm{ pixel_y = 33 }, @@ -23316,6 +23396,7 @@ "dyD" = ( /obj/machinery/vending/coffee, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "dyK" = ( @@ -24734,6 +24815,16 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/security/sierra/interrogation/second) +"dJd" = ( +/obj/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "dJe" = ( /obj/floor_decal/industrial/traffic, /turf/simulated/floor/reinforced{ @@ -27861,13 +27952,16 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/safe_room) "egL" = ( -/obj/structure/closet/emcloset/anchored, -/obj/structure/railing/mapped{ - dir = 1 +/obj/floor_decal/techfloor{ + dir = 4 }, /obj/floor_decal/techfloor{ + dir = 8 + }, +/obj/machinery/light/spot{ dir = 4 }, +/obj/structure/closet/secure_closet/personal, /obj/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -29447,6 +29541,10 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white/monotile, /area/rnd/xenobiology/xenoflora) +"esn" = ( +/obj/item/taperoll/engineering/applied, +/turf/simulated/wall/prepainted, +/area/janitor) "eso" = ( /obj/floor_decal/borderfloor{ dir = 4 @@ -33070,6 +33168,7 @@ /obj/floor_decal/techfloor{ dir = 4 }, +/obj/random/sierracloset, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) "eVJ" = ( @@ -33095,6 +33194,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/safe_room) +"eVU" = ( +/obj/machinery/computer/station_alert/security, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/escape_pod/escape_pod5/station) "eVW" = ( /obj/structure/closet/emcloset/anchored, /turf/simulated/floor/plating, @@ -35379,6 +35482,10 @@ /obj/floor_decal/techfloor{ dir = 5 }, +/obj/structure/flora/pottedplant/overgrown, +/obj/structure/sign/warning/smoking{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) "fnv" = ( @@ -35503,6 +35610,9 @@ "foH" = ( /obj/machinery/portable_atmospherics/canister/sleeping_agent, /obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/toxins/storage) "foM" = ( @@ -36005,6 +36115,9 @@ /obj/floor_decal/industrial/warning{ dir = 1 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/toxins) "fsK" = ( @@ -37517,7 +37630,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/obj/random/machine, +/obj/random/machine/jukebox_custom, /turf/simulated/floor/plating, /area/maintenance/thirddeck/foreport) "fFs" = ( @@ -39251,6 +39364,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/seconddeck/starboard) +"fRz" = ( +/obj/floor_decal/techfloor/orange{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/thirddeck/aftstarboard) "fRI" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -40139,7 +40261,7 @@ /obj/machinery/door/airlock/multi_tile/virology{ dir = 8 }, -/obj/wallframe_spawn/reinforced, +/obj/item/taperoll/engineering/applied, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "fZy" = ( @@ -41610,6 +41732,12 @@ /obj/structure/largecrate, /obj/random/maintenance, /obj/random/maintenance, +/obj/floor_decal/techfloor{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) "glV" = ( @@ -42479,7 +42607,7 @@ dir = 4 }, /obj/floor_decal/industrial/warning/full, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) "gss" = ( /obj/structure/closet/secure_closet/personal/patient, @@ -43026,7 +43154,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/thirddeck/foreport) "gxn" = ( /obj/floor_decal/borderfloor{ @@ -44288,10 +44416,13 @@ /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/aft) "gIe" = ( -/obj/machinery/light/small{ +/obj/floor_decal/corner/grey/border{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "gIf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -44512,6 +44643,8 @@ /obj/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/standard, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/monotile, /area/rnd/research) "gJQ" = ( @@ -47165,6 +47298,9 @@ }, /obj/decal/cleanable/blood/drip, /obj/decal/cleanable/blood/splatter, +/obj/structure/hygiene/toilet{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/foreport) "hdN" = ( @@ -51751,9 +51887,7 @@ /obj/floor_decal/techfloor/orange{ dir = 5 }, -/obj/structure/bed/chair/office/hard{ - dir = 4 - }, +/obj/structure/closet/emcloset/anchored, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -51971,6 +52105,9 @@ /obj/machinery/alarm{ pixel_y = 24 }, +/obj/structure/flora/pottedplant/thinbush{ + pixel_y = 10 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/office/cmo) "hSU" = ( @@ -52260,7 +52397,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, -/obj/machinery/light/small, +/obj/machinery/light, /obj/floor_decal/techfloor/orange, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftstarboard) @@ -53618,20 +53755,11 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) "igz" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/fourthdeck/port) +/obj/floor_decal/techfloor, +/obj/structure/table/standard, +/obj/item/reagent_containers/food/drinks/glass2/coffeecup/corp, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/firstdeck/aftport) "igB" = ( /obj/machinery/light/small/emergency{ dir = 4 @@ -54959,7 +55087,11 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/obj/floor_decal/corner/grey/bordercorner, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "irA" = ( /obj/random/closet, @@ -56079,6 +56211,10 @@ /obj/structure/railing/mapped{ dir = 4 }, +/obj/structure/railing/mapped{ + dir = 1; + icon_state = "railing0-1" + }, /turf/simulated/open, /area/maintenance/seconddeck/aftstarboard) "iAW" = ( @@ -56282,6 +56418,12 @@ /obj/structure/synthesized_instrument/synthesizer/piano, /turf/simulated/floor/wood/walnut, /area/vacant/bar) +"iDb" = ( +/obj/machinery/computer/modular/preset/medical{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/escape_pod/escape_pod5/station) "iDf" = ( /obj/floor_decal/borderfloor{ dir = 10 @@ -57321,6 +57463,27 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/center) +"iKC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/fourthdeck/aft) "iKK" = ( /obj/structure/cable/green{ d1 = 4; @@ -60962,7 +61125,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/random/machine, +/obj/random/machine/jukebox_custom, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) "jms" = ( @@ -62426,7 +62589,7 @@ /area/crew_quarters/docking) "jzN" = ( /obj/floor_decal/industrial/warning/corner, -/obj/structure/bed/chair/comfy/beige{ +/obj/structure/bed/chair/armchair/beige{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, @@ -63360,7 +63523,7 @@ /obj/structure/cart{ dir = 8 }, -/obj/machinery/light_construct{ +/obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, @@ -63843,10 +64006,6 @@ /turf/simulated/floor/plating, /area/hallway/primary/fourthdeck/fore) "jMh" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -65753,6 +65912,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/structure/bed/chair/armchair/beige{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/xenobiology/atmos) "jZR" = ( @@ -67263,6 +67425,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/machinery/light, /turf/simulated/floor/tiled/techfloor, /area/rnd/toxins) "kly" = ( @@ -68924,6 +69087,20 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/rnd/xenobiology/atmos) +"kxI" = ( +/obj/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/closet/secure_closet/personal, +/obj/machinery/light/spot{ + dir = 8 + }, +/obj/floor_decal/techfloor{ + dir = 4 + }, +/obj/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo/south) "kxQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -68961,6 +69138,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/machinery/light/spot{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) "kyc" = ( @@ -70634,9 +70814,9 @@ /area/crew_quarters/sleep/cryo/south) "kKz" = ( /obj/floor_decal/techfloor{ - dir = 1 + dir = 5 }, -/obj/structure/table/standard, +/obj/machinery/computer/modular/preset/civilian, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) "kKC" = ( @@ -70706,6 +70886,13 @@ }, /turf/simulated/floor/plating, /area/vacant/gambling) +"kLd" = ( +/obj/structure/bed/chair/comfy/purple{ + dir = 1 + }, +/obj/floor_decal/techfloor, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/firstdeck/aftport) "kLe" = ( /obj/landmark{ name = "JoinLateCryo" @@ -71526,12 +71713,12 @@ /turf/simulated/floor/plating, /area/vacant/gambling) "kQH" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan, -/obj/floor_decal/techfloor/orange{ - dir = 1 +/obj/floor_decal/corner/grey/border{ + dir = 9 }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/thirddeck/aftstarboard) +/obj/floor_decal/corner/grey/bordercorner, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "kQK" = ( /obj/floor_decal/borderfloor{ dir = 1 @@ -72730,7 +72917,13 @@ dir = 4; pixel_x = -24 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "lbY" = ( /obj/floor_decal/borderfloorblack{ @@ -72919,10 +73112,11 @@ "ldC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light/small{ +/obj/floor_decal/corner/grey/border{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "ldI" = ( /obj/item/device/radio/intercom{ @@ -74975,6 +75169,7 @@ /obj/floor_decal/techfloor{ dir = 6 }, +/obj/random/closet, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) "ltH" = ( @@ -75770,9 +75965,6 @@ /turf/simulated/floor/plating, /area/maintenance/seconddeck/foreport) "lzk" = ( -/obj/structure/table/wallf/steel{ - dir = 4 - }, /obj/machinery/door/window/brigdoor/westleft{ dir = 1 }, @@ -75796,6 +75988,10 @@ id_tag = "security_lockdown"; name = "Security Department Lockdown" }, +/obj/structure/wall_frame/standard, +/obj/structure/table/wallf/steel{ + dir = 4 + }, /turf/simulated/floor/plating, /area/security/sierra/brig) "lzz" = ( @@ -78685,7 +78881,16 @@ dir = 4; pixel_x = 24 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "lWr" = ( /obj/structure/table/marble, @@ -80026,7 +80231,11 @@ "mgz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "mgE" = ( /obj/floor_decal/spline/fancy/wood{ @@ -83073,6 +83282,19 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) +"mEt" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/rotating_alarm/supermatter{ + dir = 8; + pixel_x = 14 + }, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/aftport) "mEz" = ( /obj/wallframe_spawn/reinforced, /obj/machinery/door/firedoor{ @@ -83569,6 +83791,7 @@ /obj/structure/railing/mapped{ dir = 1 }, +/obj/structure/railing/mapped, /turf/simulated/open, /area/hallway/primary/firstdeck/central_stairwell) "mJw" = ( @@ -84141,7 +84364,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/catwalk, /obj/floor_decal/techfloor/orange{ dir = 10 }, @@ -84486,10 +84708,11 @@ /turf/simulated/floor/plating, /area/maintenance/seconddeck/aftport) "mQL" = ( -/obj/floor_decal/corner_techfloor_grid, -/obj/floor_decal/techfloor/corner, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/firstdeck/aftport) +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/machinery/light/spot, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/center) "mQV" = ( /obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, @@ -84847,7 +85070,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "mTI" = ( /turf/simulated/floor/greengrid, @@ -85171,6 +85403,11 @@ dir = 8 }, /obj/structure/table/standard, +/obj/item/folder/nt, +/obj/item/folder/white{ + pixel_y = 6; + pixel_x = 3 + }, /turf/simulated/floor/tiled/monotile, /area/rnd/research) "mXk" = ( @@ -86190,6 +86427,7 @@ /obj/floor_decal/techfloor/orange{ dir = 10 }, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/techfloor, /area/maintenance/seconddeck/aftstarboard) "nfe" = ( @@ -86493,7 +86731,8 @@ /area/exploration_shuttle/medical) "nhX" = ( /obj/machinery/door/airlock/civilian{ - name = "Theatr" + name = "Theatr"; + autoset_access = 0 }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/actor/stage) @@ -86531,6 +86770,21 @@ }, /turf/simulated/floor/tiled/dark/monotile, /area/bridge) +"nim" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/fourthdeck/port) "nit" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -86624,7 +86878,7 @@ /turf/simulated/floor/plating, /area/maintenance/seconddeck/foreport) "njl" = ( -/obj/structure/bed/chair/comfy/beige{ +/obj/structure/bed/chair/armchair/beige{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, @@ -88014,14 +88268,14 @@ /turf/simulated/floor/bluegrid, /area/rnd/servers) "nsf" = ( -/obj/floor_decal/corner_techfloor_grid{ - dir = 8 +/obj/structure/bed/chair/padded/green{ + dir = 1 }, -/obj/floor_decal/techfloor/corner{ - dir = 8 +/obj/floor_decal/techfloor{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/firstdeck/aftport) +/area/crew_quarters/sleep/cryo/south) "nsl" = ( /obj/floor_decal/corner/paleblue/bordercorner, /obj/structure/cable/green{ @@ -88040,14 +88294,14 @@ /turf/simulated/floor/tiled/dark/monotile, /area/medical/sleeper) "nsm" = ( -/obj/floor_decal/borderfloor, -/obj/floor_decal/corner/lime/border, -/obj/machinery/light, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/floor_decal/techfloor{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/hallway/primary/seconddeck/center) +/obj/random/vendor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/firstdeck/aftport) "nsv" = ( /turf/simulated/wall/prepainted, /area/engineering/locker_room) @@ -88425,7 +88679,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 1 }, /obj/machinery/shieldwallgen, @@ -89121,11 +89375,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/floor_decal/corner_techfloor_grid{ - dir = 4 - }, -/obj/floor_decal/techfloor/corner{ - dir = 4 +/obj/floor_decal/techfloor{ + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -89215,7 +89466,7 @@ /obj/machinery/door/blast/regular{ dir = 4; id_tag = "selfdestruct"; - name = "Self Destruct Access Blast Door" + name = "Delta Code Access Blast Door" }, /obj/machinery/button/blast_door{ id_tag = "selfdestruct"; @@ -90120,9 +90371,12 @@ /area/medical/virology/lab) "nJn" = ( /obj/floor_decal/techfloor{ - dir = 5 + dir = 4 }, -/obj/structure/table/standard, +/obj/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) "nJr" = ( @@ -92433,7 +92687,7 @@ dir = 1 }, /obj/floor_decal/industrial/warning/full, -/obj/machinery/light/small, +/obj/machinery/light, /obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) @@ -93435,6 +93689,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/center) "okZ" = ( @@ -93578,13 +93833,15 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "omE" = ( /obj/floor_decal/spline/fancy/black{ @@ -94317,6 +94574,14 @@ /obj/floor_decal/techfloor, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) +"osm" = ( +/obj/floor_decal/techfloor/orange, +/obj/machinery/rotating_alarm/supermatter{ + pixel_y = -14; + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/engineering/engine_room) "osy" = ( /obj/machinery/atmospherics/tvalve/mirrored/digital{ dir = 1 @@ -94512,7 +94777,8 @@ /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/civilian{ - dir = 8 + dir = 8; + autoset_access = 0 }, /turf/simulated/floor/tiled/dark/monotile, /area/hallway/primary/fourthdeck/central_stairwell) @@ -94564,6 +94830,27 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/bridge/storage) +"ouq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/warning/smoking{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/maintenance/firstdeck/aftport) "out" = ( /obj/structure/flora/ausbushes/genericbush, /obj/structure/railing/mapped, @@ -96156,6 +96443,9 @@ dir = 8 }, /obj/machinery/portable_atmospherics/powered/pump, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/toxins) "oGL" = ( @@ -96232,7 +96522,14 @@ /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/aft) "oGZ" = ( -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 5 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/structure/flora/pottedplant/large, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "oHh" = ( /obj/floor_decal/borderfloorblack{ @@ -96704,6 +97001,12 @@ }, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/office/iaa/high_sec) +"oLd" = ( +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/simulated/open, +/area/hallway/primary/bridgedeck/central_stairwell) "oLh" = ( /obj/structure/table/steel, /obj/item/rcd_ammo, @@ -96990,6 +97293,7 @@ /area/security/sierra/suits) "oOc" = ( /obj/floor_decal/techfloor, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) "oOh" = ( @@ -97407,6 +97711,18 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark/monotile, /area/medical/morgue/autopsy) +"oQH" = ( +/obj/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/obj/machinery/light/spot{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "oQJ" = ( /obj/floor_decal/techfloor/orange, /obj/structure/bed/chair/padded/blue{ @@ -97840,13 +98156,18 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light/small, /obj/floor_decal/corner_techfloor_grid{ dir = 8 }, /obj/floor_decal/techfloor/corner{ dir = 8 }, +/obj/floor_decal/corner_techfloor_grid{ + dir = 4 + }, +/obj/floor_decal/techfloor/corner{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) "oUp" = ( @@ -98082,6 +98403,9 @@ /obj/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, /obj/random/masks, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/fourthdeck/aft) "oWk" = ( @@ -98929,11 +99253,28 @@ /turf/simulated/floor/tiled/steel_grid, /area/shuttle/escape_pod/escape_pod3/station) "pdl" = ( -/obj/machinery/atm{ - pixel_x = 33 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/wall/r_wall/prepainted, -/area/crew_quarters/safe_room/seconddeck) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "pdt" = ( /obj/structure/table/marble, /obj/item/reagent_containers/food/condiment/barbecue{ @@ -100732,13 +101073,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/firstdeck/centralstarboard) "ppn" = ( -/obj/floor_decal/techfloor{ - dir = 10 +/obj/floor_decal/techfloor, +/obj/structure/bed/chair/comfy/purple{ + dir = 8 }, -/obj/structure/closet/secure_closet/personal, -/obj/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/sleep/cryo/south) +/area/maintenance/firstdeck/aftport) "pps" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -101104,16 +101444,13 @@ }, /obj/floor_decal/borderfloor/corner2, /obj/floor_decal/corner/lime/bordercorner2, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, /obj/floor_decal/borderfloor/corner2{ dir = 9 }, /obj/floor_decal/corner/lime/bordercorner2{ dir = 9 }, +/obj/machinery/light/spot, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) "prX" = ( @@ -102012,11 +102349,14 @@ /turf/simulated/floor/plating, /area/engineering/atmos/storage) "pzl" = ( -/obj/structure/closet/emcloset/anchored, +/obj/structure/closet/secure_closet/personal, /obj/structure/railing/mapped, /obj/floor_decal/techfloor{ dir = 4 }, +/obj/floor_decal/techfloor{ + dir = 8 + }, /obj/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -103335,6 +103675,7 @@ /obj/structure/railing/mapped{ dir = 1 }, +/obj/structure/railing/mapped, /turf/simulated/open, /area/hallway/primary/thirddeck/central_stairwell) "pKd" = ( @@ -104934,7 +105275,7 @@ /turf/simulated/wall/r_wall/hull, /area/turret_protected/ai) "pXx" = ( -/obj/structure/flora/pottedplant/aquatic, +/obj/structure/closet/emcloset/anchored, /obj/structure/cable/green{ d2 = 2; icon_state = "0-2" @@ -105248,6 +105589,21 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) +"pZG" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/floor_decal/corner/yellow{ + dir = 1 + }, +/obj/machinery/rotating_alarm/supermatter{ + dir = 8; + pixel_x = 14 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "pZH" = ( /obj/structure/cable/green{ d1 = 4; @@ -105385,6 +105741,7 @@ /obj/structure/railing/mapped{ dir = 4 }, +/obj/structure/railing/mapped, /turf/simulated/open, /area/hallway/primary/thirddeck/central_stairwell) "qap" = ( @@ -107097,8 +107454,15 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "qoq" = ( +/obj/floor_decal/techfloor, +/obj/structure/table/rack, +/obj/random/maintenance, +/obj/floor_decal/techfloor, /obj/floor_decal/techfloor{ - dir = 10 + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) @@ -107205,7 +107569,7 @@ dir = 4 }, /obj/floor_decal/industrial/warning/full, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) "qpp" = ( /turf/simulated/wall/r_wall/prepainted, @@ -108262,7 +108626,7 @@ }, /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/thirddeck/foreport) "qyL" = ( /obj/structure/cable{ @@ -110302,7 +110666,9 @@ /turf/simulated/floor/tiled/steel_grid, /area/security/sierra/hallway/aft) "qOC" = ( -/obj/machinery/vending/boozeomat, +/obj/machinery/vending/boozeomat{ + req_access = list("ACCESS_BAR") + }, /obj/machinery/light/led/small{ dir = 1 }, @@ -110428,7 +110794,14 @@ /obj/floor_decal/techfloor{ dir = 4 }, -/obj/structure/holoplant, +/obj/structure/closet/emcloset/anchored, +/obj/floor_decal/techfloor{ + dir = 8 + }, +/obj/floor_decal/industrial/outline/grey, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) "qPx" = ( @@ -110585,7 +110958,16 @@ "qQM" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "qQO" = ( /obj/floor_decal/industrial/warning{ @@ -110680,7 +111062,10 @@ "qRx" = ( /obj/structure/holoplant, /obj/floor_decal/techfloor{ - dir = 9 + dir = 8 + }, +/obj/floor_decal/techfloor{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -110853,10 +111238,13 @@ /turf/simulated/wall/r_wall/prepainted, /area/rnd/misc_lab) "qSy" = ( -/obj/structure/closet/emcloset/anchored, +/obj/structure/closet/secure_closet/personal, /obj/floor_decal/techfloor{ dir = 4 }, +/obj/floor_decal/techfloor{ + dir = 8 + }, /obj/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -110964,6 +111352,33 @@ }, /turf/simulated/floor/carpet/green, /area/medical/mentalhealth/therapyroom) +"qTL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/floor_decal/corner/yellow{ + dir = 1 + }, +/obj/machinery/rotating_alarm/supermatter{ + pixel_y = -14; + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "qTM" = ( /obj/floor_decal/industrial/warning{ dir = 10 @@ -111979,13 +112394,13 @@ /area/engineering/engine_room) "rbh" = ( /obj/floor_decal/corner_techfloor_grid{ - dir = 5 + dir = 4 }, /obj/floor_decal/techfloor/corner{ dir = 4 }, -/obj/floor_decal/techfloor/corner{ - dir = 1 +/obj/floor_decal/techfloor{ + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -112516,6 +112931,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/door/airlock/multi_tile/glass/security{ + dir = 8; + name = "Security Airlock" + }, /turf/simulated/floor/tiled/monotile, /area/security/sierra/hallway) "reP" = ( @@ -114521,6 +114940,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) "rvh" = ( @@ -114749,6 +115172,9 @@ dir = 8 }, /obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/open, /area/hallway/primary/seconddeck/central_stairwell) "rwV" = ( @@ -115058,6 +115484,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) +"rzi" = ( +/obj/floor_decal/corner/grey/border{ + dir = 1 + }, +/obj/floor_decal/corner/grey/bordercorner, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "rzl" = ( /obj/floor_decal/industrial/warning{ dir = 5 @@ -116029,10 +116462,13 @@ /obj/floor_decal/techfloor{ dir = 8 }, -/obj/structure/closet/secure_closet/personal, +/obj/structure/closet/emcloset/anchored, /obj/structure/railing/mapped{ dir = 1 }, +/obj/floor_decal/techfloor{ + dir = 4 + }, /obj/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -116140,7 +116576,16 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "rIu" = ( /obj/structure/table/steel, @@ -117585,6 +118030,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hallway/primary/fourthdeck/aft) +"rTs" = ( +/obj/floor_decal/techfloor{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo/south) "rTz" = ( /obj/structure/cable/green{ d1 = 4; @@ -118169,7 +118620,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/storage/tech) "rXn" = ( -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /obj/floor_decal/techfloor{ @@ -118305,14 +118756,18 @@ /turf/simulated/floor/carpet/blue2, /area/crew_quarters/cafe/upper) "rYW" = ( -/obj/floor_decal/techfloor{ - dir = 6 - }, /obj/structure/closet/crate/freezer, /obj/random/medical, /obj/random/medical, /obj/random/medical, /obj/random/firstaid, +/obj/floor_decal/techfloor, +/obj/floor_decal/techfloor{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) "rYX" = ( @@ -118592,10 +119047,6 @@ /turf/simulated/floor/plating, /area/maintenance/fourthdeck/aft) "sbo" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24 - }, /obj/structure/closet/emcloset/anchored, /obj/floor_decal/borderfloor{ dir = 6 @@ -119937,7 +120388,7 @@ icon_state = "1-2" }, /obj/item/airlock_brace{ - req_access = list("ACCESS_CAPTAIN") + req_access = list("ACCESS_AI_UPLOAD") }, /obj/machinery/door/blast/regular{ id_tag = "ai_upload_blast"; @@ -121037,6 +121488,7 @@ /obj/floor_decal/industrial/danger/corner{ dir = 8 }, +/obj/machinery/light/spot, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/aft_stairwell) "sut" = ( @@ -121807,14 +122259,11 @@ /turf/simulated/floor/carpet/purple, /area/crew_quarters/sleep/bunk) "szJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9 - }, -/obj/floor_decal/techfloor/orange{ - dir = 5 +/obj/structure/bed/chair/comfy/purple{ + dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/thirddeck/aftstarboard) +/area/maintenance/firstdeck/aftport) "szK" = ( /obj/structure/sign/warning/airlock{ dir = 1; @@ -122236,9 +122685,6 @@ /turf/simulated/floor/carpet/purple, /area/chapel/office) "sDk" = ( -/obj/structure/table/wallf/steel{ - dir = 4 - }, /obj/machinery/door/window/brigdoor/westright{ dir = 2; id_tag = "prison_lobby_window" @@ -122255,6 +122701,10 @@ name = "Prison Lobby Windows Shutters"; id_tag = "prison_lobby_window" }, +/obj/structure/wall_frame/standard, +/obj/structure/table/wallf/steel{ + dir = 4 + }, /turf/simulated/floor/plating, /area/security/sierra/brig) "sDn" = ( @@ -122437,6 +122887,15 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/item/device/flashlight/lamp/green{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/paper/sierra/medical_blood, +/obj/item/reagent_containers/food/drinks/glass2/coffeecup/glass{ + pixel_y = 7; + pixel_x = 8 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/office/cmo) "sEd" = ( @@ -123779,7 +124238,13 @@ "sNa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "sNg" = ( /obj/floor_decal/borderfloorblack/corner{ @@ -123983,6 +124448,10 @@ dir = 10 }, /obj/floor_decal/corner/darkblue/border, +/obj/item/paper_bin, +/obj/item/stamp/cmo, +/obj/item/sticky_pad/random, +/obj/item/pen, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/office/cmo) "sPn" = ( @@ -124190,7 +124659,7 @@ /obj/floor_decal/techfloor/orange{ dir = 8 }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, @@ -124216,7 +124685,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "sQx" = ( /obj/structure/railing/mapped{ @@ -124303,6 +124781,16 @@ /obj/item/stock_parts/manipulator, /turf/simulated/floor/plating, /area/maintenance/thirddeck/forestarboard) +"sQY" = ( +/obj/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/machinery/rotating_alarm/supermatter{ + pixel_y = -14; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/engineering/engine_room) "sQZ" = ( /obj/machinery/firealarm{ dir = 1; @@ -124372,11 +124860,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/floor_decal/techfloor/orange{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) @@ -124713,6 +125199,9 @@ /obj/floor_decal/techfloor{ dir = 8 }, +/obj/machinery/vending/cigarette{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/aftport) "sTO" = ( @@ -125077,6 +125566,10 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/rotating_alarm/supermatter{ + dir = 8; + pixel_x = 14 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "sWn" = ( @@ -127393,6 +127886,14 @@ }, /turf/simulated/floor/plating, /area/quartermaster/hangar) +"tqy" = ( +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 1; + icon_state = "railing0-1" + }, +/turf/simulated/open, +/area/maintenance/seconddeck/aftstarboard) "tqE" = ( /obj/structure/cable/green{ d1 = 1; @@ -127672,7 +128173,14 @@ /obj/machinery/light/spot, /obj/structure/table/standard, /obj/item/storage/box/detergent, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "ttq" = ( /obj/structure/table/rack, @@ -127786,6 +128294,7 @@ /area/hallway/primary/seconddeck/center) "tuN" = ( /obj/structure/table/standard, +/obj/item/reagent_containers/food/drinks/glass2/coffeecup/foundation, /turf/simulated/floor/tiled/dark, /area/medical/mentalhealth) "tuR" = ( @@ -127843,6 +128352,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/rotating_alarm/supermatter{ + pixel_y = 14 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "tvu" = ( @@ -127874,6 +128386,9 @@ tag_south = 1; tag_west = 1 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/rnd/toxins) "tvK" = ( @@ -130227,7 +130742,13 @@ d2 = 8; icon_state = "0-8" }, -/turf/simulated/floor/tiled/dark, +/obj/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/sleep/bunk) "tOd" = ( /obj/machinery/shield_diffuser, @@ -130652,7 +131173,7 @@ /obj/floor_decal/techfloor{ dir = 1 }, -/obj/structure/table/standard, +/obj/random/vendor, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) @@ -131488,10 +132009,15 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/heads/captain/secret_room/level_one) "tWK" = ( -/obj/wallframe_spawn/reinforced/hull, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/quartermaster/hangar/upper) +/obj/floor_decal/corner/grey/border{ + dir = 1 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "tWT" = ( /obj/machinery/door/airlock/research{ dir = 4; @@ -135945,16 +136471,12 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/bluespace) "uIl" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/machinery/atmospherics/portables_connector, -/obj/machinery/portable_atmospherics/powered/pump/filled, -/obj/floor_decal/industrial/warning/cee{ - dir = 8 +/obj/machinery/washing_machine, +/obj/floor_decal/corner/grey/border{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/maintenance/thirddeck/aftstarboard) +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "uIp" = ( /obj/structure/catwalk, /obj/floor_decal/borderfloor, @@ -136026,6 +136548,8 @@ }, /obj/structure/table/standard, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/item/paper_bin, +/obj/item/pen, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo/south) "uIE" = ( @@ -137902,6 +138426,7 @@ }, /obj/structure/reagent_dispensers/watertank, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/light, /turf/simulated/floor/tiled/techfloor, /area/maintenance/fourthdeck/aft) "uYw" = ( @@ -138848,6 +139373,20 @@ /obj/random/maintenance, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) +"ves" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "vez" = ( /obj/structure/cable/green{ d1 = 2; @@ -139183,6 +139722,13 @@ /obj/floor_decal/corner/red, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/hangar_stairs) +"vhj" = ( +/obj/structure/catwalk, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/port) "vho" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -140366,6 +140912,12 @@ }, /turf/simulated/floor/plating, /area/hallway/primary/seconddeck/fore) +"vpp" = ( +/obj/machinery/computer/modular/preset/security{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/escape_pod/escape_pod5/station) "vpr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -140602,7 +141154,7 @@ /obj/floor_decal/techfloor/orange{ dir = 6 }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, @@ -143717,6 +144269,7 @@ }, /obj/structure/table/standard, /obj/floor_decal/corner/grey/diagonal, +/obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled, /area/rnd/research) "vRl" = ( @@ -145826,6 +146379,26 @@ }, /turf/simulated/floor/carpet/red, /area/crew_quarters/heads/office/hos) +"wgr" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "wgs" = ( /obj/floor_decal/borderfloor/corner{ dir = 4 @@ -145997,6 +146570,23 @@ /obj/floor_decal/snow, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/galley/freezer) +"whn" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/seconddeck/center) "whv" = ( /obj/machinery/portable_atmospherics/canister/hydrogen, /obj/floor_decal/industrial/outline/blue, @@ -147458,6 +148048,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/item/modular_computer/tablet/lease/preset/command, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/office/cmo) "wtD" = ( @@ -148693,7 +149284,7 @@ "wEU" = ( /obj/machinery/door/airlock/vault/bolted{ id_tag = "selfddoor"; - name = "Self Destruct Access" + name = "Delta Code Chamber Access" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -150803,13 +151394,12 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/office/iaa) "wYN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5 - }, -/obj/floor_decal/techfloor/orange{ - dir = 9 +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/floor_decal/industrial/warning/cee{ + dir = 8 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/plating, /area/maintenance/thirddeck/aftstarboard) "wYV" = ( /obj/machinery/power/apc{ @@ -152794,6 +153384,9 @@ /area/hallway/primary/firstdeck/aft) "xoc" = ( /obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/open, /area/hallway/primary/seconddeck/central_stairwell) "xof" = ( @@ -155883,6 +156476,16 @@ /obj/item/paper/sierra/compactor, /turf/simulated/floor/tiled/techfloor, /area/maintenance/compactor) +"xMK" = ( +/obj/floor_decal/corner/grey/border{ + dir = 8 + }, +/obj/floor_decal/corner/grey/bordercorner{ + dir = 4 + }, +/obj/floor_decal/corner/grey/bordercorner, +/turf/simulated/floor/tiled/dark/monotile, +/area/crew_quarters/sleep/bunk) "xMO" = ( /obj/structure/railing/mapped{ dir = 4 @@ -157252,7 +157855,7 @@ "xXt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/catwalk, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /turf/simulated/floor/plating, @@ -177827,7 +178430,7 @@ pBU ouV hFo tKP -spm +nim vDr wid pGs @@ -178231,7 +178834,7 @@ bBf rAj ihy tKP -igz +spm mfJ pGs pGs @@ -183886,7 +184489,7 @@ fsX bZH adx seP -aUN +iKC lQb xuO aUd @@ -211146,7 +211749,7 @@ shn adB kXN nZd -pnE +qTL loO ckW tmA @@ -213359,7 +213962,7 @@ ego dWB bwv jDf -mkQ +pZG czb dtE mkQ @@ -218432,7 +219035,7 @@ bDX kCy aEa cKL -gPE +vhj gPE nyY mtR @@ -221231,8 +221834,8 @@ wUa nvT nvT kQa -bLS -bLS +bJM +bJM nvT vzJ uoA @@ -221435,7 +222038,7 @@ gms wgD aYW nAg -tWK +iIc uoA uoA uoA @@ -221632,12 +222235,12 @@ cqk mGJ dII wxL -tWK +iIc fPl esy wBV rrR -tWK +iIc uoA uoA uoA @@ -221839,7 +222442,7 @@ kno nrW cMY oii -tWK +iIc uoA uoA uoA @@ -222039,8 +222642,8 @@ wUa nvT nvT kQa -bLS -bLS +bJM +bJM nvT vzJ uoA @@ -223634,9 +224237,9 @@ tXe tXe sbr sbr -uIl +sbr wYN -mbu +fRz hjx qsg cTV @@ -223836,8 +224439,8 @@ tXe sbr sbr sbr +sbr mNF -kQH bBr xOY ptT @@ -224038,8 +224641,8 @@ tXe sbr sbr sbr +sbr dyd -szJ sRw vrX fqU @@ -224063,12 +224666,12 @@ noY aTn sNN aTn -aTn +buZ aTn aTn noY mHe -mHe +mEt fIN mHe mHe @@ -224076,7 +224679,7 @@ oyp mHe kGH mHe -mHe +mEt oyp mHe xDT @@ -226500,7 +227103,7 @@ teQ teQ teQ teQ -fEY +sQY jLt jLt jLt @@ -226686,7 +227289,7 @@ cfi aeU cOX cfi -nhq +cBm fEY wZg meg @@ -227904,13 +228507,13 @@ gzu cwp rbg rfI -rhb +osm sKx jYs oKq fNJ sKx -lXp +cOZ rfI nwB jEI @@ -253766,7 +254369,7 @@ ddv kCS vbG ske -pdl +ifz dNl rFj iAP @@ -254177,9 +254780,9 @@ asr eln qRx rGK +kxI biE biE -ppn ifz qrB ifz @@ -254378,10 +254981,10 @@ ydn iql szv rbh -faN -faN -faN -oOc +rTs +rTs +rTs +bLS ifz ifz ifz @@ -254984,10 +255587,10 @@ tvF fSx eln kKz -faN -faN -faN -faN +nsf +dHC +dHC +dHC oUm rFS cos @@ -255987,7 +256590,7 @@ bPF bPF clp pFH -nsm +gav wle chf dSQ @@ -256985,7 +257588,7 @@ jWt wzy wzy wzy -wzy +pMh pMh isY jbN @@ -257187,7 +257790,7 @@ pRi wzy wzy wzy -wzy +pMh pMh hdq jor @@ -257210,9 +257813,9 @@ eKL tKT qOv jyD -oGZ -omy -aFR +kQH +pdl +uIl mfA kDQ iMW @@ -257412,7 +258015,7 @@ kCN joT qOv dyD -oGZ +tWK omy tto mfA @@ -257614,8 +258217,8 @@ trz qOv qOv yka -oGZ -omy +rzi +wgr bYX mfA qVV @@ -257807,11 +258410,11 @@ qeZ cMN ccj mZx -oGZ +xMK mTF -sNa +ldC lbL -sNa +ldC qQM ldC sNa @@ -258012,12 +258615,12 @@ qOv oGZ bkU gIe -oGZ -oGZ -bkU +oQH +dJd +ves lWg crr -oGZ +gIe bkU tNN rIt @@ -259010,7 +259613,7 @@ lzW aGk adM aqL -xUw +esn qvO rYT crD @@ -260215,7 +260818,7 @@ lEK dBU eIl tUB -ccj +aJI dFc euX aWI @@ -260617,7 +261220,7 @@ wQk oVN sKf dBU -eIl +whn tUB kXS jNk @@ -264243,9 +264846,9 @@ wKF nUm bdT gPe -rWg -rWg qtw +rWg +tqy wwV lKH mBr @@ -289742,9 +290345,9 @@ gfi lko sjA sjA -bAr +vpp rky -bAr +iDb sjA sjA lko @@ -289943,7 +290546,7 @@ vUv gfi lko sjA -bAr +eVU psD rEh sKN @@ -300851,7 +301454,7 @@ iGy kVd kVd gHP -jmN +ouq rXn wop wop @@ -301056,7 +301659,7 @@ dNz jmN lln sTL -qoq +nsm wop wop wop @@ -301258,7 +301861,7 @@ daa kPc iWF ecL -nsf +fwh qoq wop wop @@ -301460,7 +302063,7 @@ dNz rMx peH ecL -ecL +kLd glU wop wop @@ -301661,8 +302264,8 @@ gNW qSx lrY bso -ecL -ecL +szJ +igz glU wop wop @@ -301864,7 +302467,7 @@ qSx cNo jJA ecL -ecL +ppn bJC wop wop @@ -302066,8 +302669,8 @@ qSx xiV jJA ecL -ecL fwh +cmk wop wop uYw @@ -302268,7 +302871,7 @@ qSx tkY rhy eFZ -mQL +fwh rYW wop wop @@ -335577,10 +336180,10 @@ rNx gDd eea alU -nwJ +mQL tqf lZj -lZj +oLd ftd mRr chE @@ -336187,7 +336790,7 @@ ltN tse tse tse -tse +ahU tse tse tse diff --git a/mods/jukebox_tapes/code/jukebox.dm b/mods/jukebox_tapes/code/jukebox.dm index 8b3b8668321de..c15c3f691f597 100644 --- a/mods/jukebox_tapes/code/jukebox.dm +++ b/mods/jukebox_tapes/code/jukebox.dm @@ -138,3 +138,12 @@ var/obj/machinery/jukebox/custom_tape/J = owner J.eject() return TOPIC_REFRESH + +/obj/random/machine/jukebox_custom + name = "random jukebox" + +/obj/random/machine/jukebox_custom/spawn_choices() + return list( + /obj/machinery/jukebox/custom_tape, + /obj/machinery/jukebox/custom_tape/old + )