diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index aa8a5a3c193..5c334f6695f 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -8,7 +8,7 @@ extended_round_description = "We are on an unavoidable collision course with an asteroid field. You have only a moment to prepare before you are barraged by dust and meteors. As if it was not enough, all kinds of negative events seem to happen more frequently. Good Luck." config_tag = "meteor" required_players = 15 // Definitely not good for low-pop - votable = 0 + votable = 1 shuttle_delay = 2 var/next_wave = INFINITY // Set in post_setup() correctly to take into account potential longer pre-start times. var/alert_sent = 0 diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index f252c6371a1..2d2dfeb051c 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -318,4 +318,22 @@ /obj/item/device/mass_spectrometer, /obj/item/reagent_containers/glass/beaker/vial, /obj/item/reagent_containers/syringe + ) + +/obj/item/storage/box/fancy/tray/robotics + starts_with = list( + /obj/item/surgery/circular_saw = 1, + /obj/item/surgery/hemostat = 1, + /obj/item/surgery/retractor = 1, + /obj/item/surgery/scalpel = 1, + /obj/item/surgery/surgicaldrill = 1 + ) + + can_hold = list( + /obj/item/surgery/circular_saw, + /obj/item/surgery/circular_saw, + /obj/item/surgery/hemostat, + /obj/item/surgery/retractor, + /obj/item/surgery/scalpel, + /obj/item/surgery/surgicaldrill ) \ No newline at end of file diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 0c8156e5628..790b2a2d410 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -480,13 +480,6 @@ /obj/structure/window/shuttle/skrell ) -/obj/structure/window/shuttle/scc - icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi' - icon_state = "scc_window" - basestate = "scc_window" - health = 160 - maxhealth = 160 - smooth = 0 /obj/structure/window/shuttle/scc_space_ship name = "window" @@ -504,12 +497,9 @@ smooth = SMOOTH_MORE /obj/structure/window/shuttle/scc - icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi' - icon_state = "scc_window" - basestate = "scc_window" + icon = 'icons/obj/smooth/scc_shuttle_window.dmi' health = 160 maxhealth = 160 - smooth = 0 /obj/structure/window/shuttle/crescent desc = "It looks rather strong." diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 855fdcd733b..3d4ec3c7bcd 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -179,12 +179,6 @@ icon_state = "necro_sec_alt" worn_state = "necro_sec_alt" -/obj/item/clothing/under/rank/security/idris - name = "Idris Incorporated security uniform" - desc = "A uniform worn by Idris Incorporated employees and contractors." - icon_state = "idris_sec" - worn_state = "idris_sec" - /obj/item/clothing/under/rank/security/eridani name = "Eridani PMC uniform" desc = "A uniform worn by contracted Eridani security forces." diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index c6f246a026d..74cc42ee3df 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -20,15 +20,17 @@ despawn_turfs = typecacheof(despawn_turfs) /datum/event/carp_migration/announce() - if(affecting_z in current_map.station_levels) - var/announcement = "" - var/soundfile = 'sound/AI/spacecarp.ogg' - if(severity == EVENT_LEVEL_MAJOR && deploy_drones) - announcement = "Massive migration of unknown biological entities has been detected near [location_name()], please stand-by. The NDV Icarus has dispatched combat drones to assist." - soundfile = 'sound/AI/massivespacecarp.ogg' - else - announcement = "Unknown biological [length(spawned_carp) == 1 ? "entity has" : "entities have"] been detected near [location_name()], please stand-by.[severity == EVENT_LEVEL_MODERATE ? " The NDV Icarus has dispatched combat drones to assist." : ""]" - command_announcement.Announce(announcement, "Lifesign Alert", new_sound = soundfile) + for (var/zlevel in affecting_z) + if(zlevel in current_map.station_levels) + var/announcement = "" + var/soundfile = 'sound/AI/spacecarp.ogg' + if(severity == EVENT_LEVEL_MAJOR && deploy_drones) + announcement = "Massive migration of unknown biological entities has been detected near [location_name()], please stand-by. The NDV Icarus has dispatched combat drones to assist." + soundfile = 'sound/AI/massivespacecarp.ogg' + else + announcement = "Unknown biological [length(spawned_carp) == 1 ? "entity has" : "entities have"] been detected near [location_name()], please stand-by.[severity == EVENT_LEVEL_MODERATE ? " The NDV Icarus has dispatched combat drones to assist." : ""]" + command_announcement.Announce(announcement, "Lifesign Alert", new_sound = soundfile) + break /datum/event/carp_migration/start() if(severity == EVENT_LEVEL_MAJOR) @@ -103,8 +105,10 @@ spawn_fish(7, 3, 5) /datum/event/carp_migration/cozmo/announce() - if(affecting_z in current_map.station_levels) - command_announcement.Announce("A migration of non-hostile entities has been detected outside.", "Lifesign Alert", 'sound/AI/cozmo_migration.ogg') + for (var/zlevel in affecting_z) + if(zlevel in current_map.station_levels) + command_announcement.Announce("A migration of non-hostile entities has been detected outside.", "Lifesign Alert", 'sound/AI/cozmo_migration.ogg') + break /datum/event/carp_migration/cozmo/spawn_fish(var/num_groups, var/group_size_min = 3, var/group_size_max = 5, var/spawn_drones = FALSE) set waitfor = FALSE diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index e10fe0e0482..c1b6d7a10ad 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -7,15 +7,16 @@ /datum/event/electrical_storm/announce() ..() - if(affecting_z in current_map.station_levels) - switch(severity) - if(EVENT_LEVEL_MUNDANE) - command_announcement.Announce("A minor electrical storm has been detected near the [location_name()]. Please watch out for possible electrical discharges.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electronicoverload.ogg') - if(EVENT_LEVEL_MODERATE) - command_announcement.Announce("The [location_name()] is about to pass through an electrical storm. Please secure sensitive electrical equipment until the storm passes.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electronicoverload.ogg') - if(EVENT_LEVEL_MAJOR) - command_announcement.Announce("Alert. A strong electrical storm has been detected in proximity of the [location_name()]. It is recommended to immediately secure sensitive electrical equipment until the storm passes.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electronicoverload.ogg') - + for (var/zlevel in affecting_z) + if(zlevel in current_map.station_levels) + switch(severity) + if(EVENT_LEVEL_MUNDANE) + command_announcement.Announce("A minor electrical storm has been detected near the [location_name()]. Please watch out for possible electrical discharges.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electronicoverload.ogg') + if(EVENT_LEVEL_MODERATE) + command_announcement.Announce("The [location_name()] is about to pass through an electrical storm. Please secure sensitive electrical equipment until the storm passes.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electronicoverload.ogg') + if(EVENT_LEVEL_MAJOR) + command_announcement.Announce("Alert. A strong electrical storm has been detected in proximity of the [location_name()]. It is recommended to immediately secure sensitive electrical equipment until the storm passes.", "[location_name()] Sensor Array", new_sound = 'sound/AI/electronicoverload.ogg') + break /datum/event/electrical_storm/start() ..() @@ -67,5 +68,7 @@ /datum/event/electrical_storm/end() ..() - if(affecting_z in current_map.station_levels) - command_announcement.Announce("The [location_name()] has cleared the electrical storm. Please repair any electrical overloads.", "Electrical Storm Alert") \ No newline at end of file + for (var/zlevel in affecting_z) + if(zlevel in current_map.station_levels) + command_announcement.Announce("The [location_name()] has cleared the electrical storm. Please repair any electrical overloads.", "Electrical Storm Alert") + break \ No newline at end of file diff --git a/code/modules/events/gravity.dm b/code/modules/events/gravity.dm index d442579d653..4d26728310e 100644 --- a/code/modules/events/gravity.dm +++ b/code/modules/events/gravity.dm @@ -7,8 +7,10 @@ endWhen = rand(15, 60) /datum/event/gravity/announce() - if(affecting_z in current_map.station_levels) - command_announcement.Announce("Feedback surge detected in the gravity generation systems. Artificial gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes.", "Gravity Failure") + for (var/zlevel in affecting_z) + if(zlevel in current_map.station_levels) + command_announcement.Announce("Feedback surge detected in the gravity generation systems. Artificial gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes.", "Gravity Failure") + break /datum/event/gravity/start() gravity_is_on = 0 diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm index c2b9a89af05..effc1c0e4a0 100644 --- a/code/modules/events/meteors.dm +++ b/code/modules/events/meteors.dm @@ -19,12 +19,16 @@ endWhen = worst_case_end() /datum/event/meteor_wave/announce() - if(affecting_z in current_map.station_levels) - command_announcement.Announce(current_map.meteors_detected_message, "Meteor Alert", new_sound = 'sound/AI/meteors.ogg') + for (var/zlevel in affecting_z) + if(zlevel in current_map.station_levels) + command_announcement.Announce(current_map.meteors_detected_message, "Meteor Alert", new_sound = 'sound/AI/meteors.ogg') + break /datum/event/meteor_wave/start() - if(affecting_z in current_map.station_levels) - command_announcement.Announce(current_map.meteor_contact_message, "Meteor Alert") + for (var/zlevel in affecting_z) + if(zlevel in current_map.station_levels) + command_announcement.Announce(current_map.meteor_contact_message, "Meteor Alert") + break /datum/event/meteor_wave/end(var/faked) if(faked) @@ -104,7 +108,10 @@ return downed_ship_meteors /datum/event/meteor_wave/downed_ship/announce() - command_announcement.Announce(current_map.ship_meteor_end_message, "Ship Debris Alert", new_sound = 'sound/AI/unknownvesseldowned.ogg') + for (var/zlevel in affecting_z) + if(zlevel in current_map.station_levels) + command_announcement.Announce(current_map.ship_meteor_end_message, "Ship Debris Alert", new_sound = 'sound/AI/unknownvesseldowned.ogg') + break /datum/event/meteor_wave/downed_ship/start() command_announcement.Announce(current_map.ship_meteor_contact_message, "Ship Debris Alert") @@ -127,7 +134,10 @@ ic_name = "a dust belt" /datum/event/meteor_wave/dust/announce() - command_announcement.Announce(current_map.dust_detected_message, "Dust Belt Alert") + for (var/zlevel in affecting_z) + if(zlevel in current_map.station_levels) + command_announcement.Announce(current_map.dust_detected_message, "Dust Belt Alert") + break /datum/event/meteor_wave/dust/start() command_announcement.Announce(current_map.dust_contact_message, "Dust Belt Alert") diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 71ac9792ef9..4d810a3b114 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -321,7 +321,7 @@ /mob/living/silicon/robot/proc/process_level_restrictions() //Abort if they should not get blown - if(lock_charge || scrambled_codes || emagged) + if(lock_charge || scrambled_codes || emagged || current_map.allow_borgs_to_leave) return FALSE //Check if they are on a player level -> abort var/turf/T = get_turf(src) diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index c6f1aebd2c6..2707864f19a 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -295,7 +295,9 @@ max_stack = 2 /obj/item/ammo_casing/gauss/carbine + name = "compact tungsten slug" desc = "A heavy tungsten gauss slug. This one has a casing adapated for carbine models." + projectile_type = /obj/item/projectile/bullet/gauss/carbine /obj/item/ammo_casing/gauss/emp name = "ion slug" diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 2aa8dd6de3d..7170d77e84b 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -352,6 +352,10 @@ muzzle_type = /obj/effect/projectile/muzzle/gauss embed = 0 +/obj/item/projectile/bullet/gauss/carbine + name = "compact slug" + damage = 20 + /obj/item/projectile/bullet/gauss/highex name = "high-ex shell" damage = 10 diff --git a/icons/obj/smooth/scc_shuttle_window.dmi b/icons/obj/smooth/scc_shuttle_window.dmi new file mode 100644 index 00000000000..6e9483c91a2 Binary files /dev/null and b/icons/obj/smooth/scc_shuttle_window.dmi differ diff --git a/maps/_common/mapsystem/map.dm b/maps/_common/mapsystem/map.dm index a8398ba88b1..49efce82905 100644 --- a/maps/_common/mapsystem/map.dm +++ b/maps/_common/mapsystem/map.dm @@ -87,8 +87,8 @@ var/meteor_contact_message = "Contact with meteor wave imminent, all hands brace for impact." var/meteor_end_message = "The station has cleared the meteor shower, please return to your stations." - var/ship_detected_end_message = "The NDV Icarus reports that it has downed an unknown vessel that was approaching your station. Prepare for debris impact - please evacuate the surface level if needed." - var/ship_meteor_contact_message = "Ship debris colliding now, all hands brace for impact." + var/ship_meteor_contact_message = "The NDV Icarus reports that it has downed an unknown vessel that was approaching your station. Prepare for debris impact - please evacuate the surface level if needed." + var/ship_detected_end_message = "Ship debris colliding now, all hands brace for impact." var/ship_meteor_end_message = "The last of the ship debris has hit or passed by the station, it is now safe to commence repairs." var/dust_detected_message = "A belt of space dust is approaching the station." @@ -104,9 +104,10 @@ "Unidentified hackers have targetted a combat drone wing deployed from the NDV Icarus. If any are sighted in the area, approach with caution.") var/rogue_drone_end_message = "Icarus drone control reports the malfunctioning wing has been recovered safely." var/rogue_drone_destroyed_message = "Icarus drone control registers disappointment at the loss of the drones, but the survivors have been recovered." - + var/num_exoplanets = 0 var/list/planet_size //dimensions of planet zlevel, defaults to world size. Due to how maps are generated, must be (2^n+1) e.g. 17,33,65,129 etc. Map will just round up to those if set to anything other. + var/allow_borgs_to_leave = FALSE //this controls if borgs can leave the station or ship without exploding /datum/map/New() if(!map_levels) diff --git a/maps/sccv_horizon/code/sccv_horizon.dm b/maps/sccv_horizon/code/sccv_horizon.dm index 054476003fa..98918be1910 100644 --- a/maps/sccv_horizon/code/sccv_horizon.dm +++ b/maps/sccv_horizon/code/sccv_horizon.dm @@ -22,7 +22,7 @@ station_name = "SCCV Horizon" station_short = "Horizon" - dock_name = "The Shipyard" + dock_name = "SCC Shipyard" dock_short = "Shipyard" boss_name = "Stellar Corporate Conglomerate" boss_short = "SCC" @@ -64,6 +64,28 @@ emergency_shuttle_recall_message = "The emergency evacuation has been canceled." emergency_shuttle_called_message = "An emergency evacuation has been called. It will start in approximately %ETA%." + meteors_detected_message = "A meteor storm has been detected on collision course with the ship. Estimated three minutes until impact, please activate station shields, and seek shelter in the central areas." + meteor_contact_message = "Contact with meteor wave imminent, all hands brace for impact." + meteor_end_message = "The ship has cleared the meteor shower, please return to your stations." + + ship_meteor_contact_message = "Debris from a nearby derelict are on collision course with the ship. Prepare for impact." + ship_detected_end_message = "Ship debris colliding now, all hands brace for impact." + ship_meteor_end_message = "The last of the ship debris has hit or passed by the ship, it is now safe to commence repairs." + + dust_detected_message = "A belt of space dust is approaching the ship." + dust_contact_message = "The ship is now passing through a belt of space dust." + dust_end_message = "The ship has now passed through the belt of space dust." + + radiation_detected_message = "High levels of radiation detected near the ship. Please evacuate into one of the shielded maintenance tunnels." + radiation_contact_message = "The ship has entered the radiation belt. Please remain in a sheltered area until we have passed the radiation belt." + radiation_end_message = "The ship has passed the radiation belt. Please report to medbay if you experience any unusual symptoms. Maintenance will lose all-access again shortly." + + rogue_drone_detected_messages = list("Combat drone swarm from a nearby facility have engaged the ship. If any are sighted in the area, approach with caution.", + "Malfunctioning combat drones have been detected close to the ship. If any are sighted in the area, approach with caution.") + rogue_drone_end_message = "The hostile drone swarm has left the ship's proximity." + rogue_drone_destroyed_message = "Sensors indicate the unidentified drone swarm has left the immediate proximity of the ship." + + map_shuttles = list( /datum/shuttle/autodock/ferry/lift/scc_ship/cargo, /datum/shuttle/autodock/ferry/lift/scc_ship/morgue, @@ -90,6 +112,8 @@ spawn_types = list(/datum/spawnpoint/living_quarters_lift, /datum/spawnpoint/cryo) default_spawn = "Living Quarters Lift" + allow_borgs_to_leave = TRUE + /datum/map/sccv_horizon/finalize_load() // generate an empty space Z world.maxz++ diff --git a/maps/sccv_horizon/code/sccv_horizon_areas.dm b/maps/sccv_horizon/code/sccv_horizon_areas.dm index aea6539ceb0..18acbc3938f 100644 --- a/maps/sccv_horizon/code/sccv_horizon_areas.dm +++ b/maps/sccv_horizon/code/sccv_horizon_areas.dm @@ -154,6 +154,9 @@ name = "Operations Equipment Storage" icon_state = "dark160" +/area/operations/lower/machinist + name = "Machinist Workshop" + //Wings /area/maintenance/substation/wing_starboard diff --git a/maps/sccv_horizon/placeholder-1_deck_1.dmm b/maps/sccv_horizon/placeholder-1_deck_1.dmm index 38ac9b0f341..0c0c78a1524 100644 --- a/maps/sccv_horizon/placeholder-1_deck_1.dmm +++ b/maps/sccv_horizon/placeholder-1_deck_1.dmm @@ -186,27 +186,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/research_port) -"alW" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/machinery/light/small/emergency{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/engineering) "amw" = ( /obj/structure/shuttle_part{ icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; @@ -311,14 +290,8 @@ dir = 4 }, /obj/machinery/light, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/table/reinforced/steel, -/obj/machinery/door/firedoor, -/turf/simulated/floor/carpet/rubber, -/area/operations/storage) +/turf/simulated/floor/tiled/dark, +/area/operations/lower/machinist) "aqr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -653,6 +626,14 @@ name = "AI core maintenance hatch"; opacity = 0 }, +/obj/machinery/door/airlock/external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "ai_core_inner"; + locked = 1; + name = "Inner Core Airlock"; + req_access = list(13) + }, /turf/simulated/floor/plating, /area/turret_protected/ai) "aFN" = ( @@ -866,7 +847,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "aPY" = ( /obj/structure/railing/mapped{ dir = 8 @@ -889,7 +870,7 @@ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "aSL" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1522,13 +1503,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled, /area/quartermaster/storage) -"bsP" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, -/area/operations/storage) "btw" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 5 @@ -1692,6 +1666,18 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) +"bBL" = ( +/obj/machinery/door/airlock/external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "ai_core_outer"; + locked = 1; + name = "Outer Core Airlock"; + req_access = list(13) + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/plating, +/area/turret_protected/ai) "bBR" = ( /obj/machinery/computer/general_air_control/large_tank_control{ input_tag = "co2_in"; @@ -2079,7 +2065,7 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "bSo" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 4 @@ -2115,24 +2101,25 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "bVc" = ( -/obj/machinery/light{ - dir = 8 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/effect/floor_decal/corner/black{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "2-4" }, /turf/simulated/floor/tiled, -/area/hallway/primary/aft) +/area/maintenance/engineering) "bVh" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload_foyer) -"bVO" = ( -/obj/structure/closet/crate, -/turf/simulated/floor/tiled/dark, -/area/operations/storage) "bVV" = ( /obj/item/material/shard, /turf/simulated/floor/plating, @@ -3291,9 +3278,6 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/air) -"daY" = ( -/turf/simulated/wall, -/area/operations/upper) "dcs" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; @@ -3501,10 +3485,6 @@ "dlM" = ( /turf/simulated/floor/tiled, /area/storage/eva) -"dmq" = ( -/obj/structure/bed/stool/padded/red, -/turf/simulated/floor/tiled/dark, -/area/operations/storage) "dns" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3665,7 +3645,7 @@ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "dtN" = ( /obj/machinery/light/spot/weak{ dir = 8 @@ -3686,16 +3666,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "dvT" = ( -/obj/structure/table/reinforced/steel, -/obj/machinery/door/window/brigdoor/westleft{ - name = "Workshop"; - req_access = list(29) - }, /obj/machinery/door/firedoor, -/obj/item/paper_bin, -/obj/item/pen/black, -/turf/simulated/floor/tiled/dark, -/area/operations/lower) +/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ + id = "1deckworkshop" + }, +/turf/simulated/floor/plating, +/area/operations/lower/machinist) "dwY" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 5 @@ -4113,12 +4089,10 @@ dir = 1 }, /obj/effect/floor_decal/corner/white/diagonal, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, +/obj/structure/table/steel, +/obj/item/device/floor_painter, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "dVs" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -4254,7 +4228,7 @@ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "eaO" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -4318,21 +4292,6 @@ }, /turf/simulated/floor/tiled, /area/maintenance/wing/port/deck1) -"ecj" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/alarm{ - pixel_y = 28 - }, -/turf/simulated/floor/tiled/dark, -/area/operations/storage) "edm" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/industrial/outline/yellow, @@ -4926,12 +4885,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) -"eCQ" = ( -/obj/effect/landmark{ - name = "cavernspawn" - }, -/turf/template_noop, -/area/template_noop) "eDa" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, @@ -4961,7 +4914,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/door/window/northleft, +/obj/machinery/door/window/northleft{ + name = "Medical Voidsuit"; + req_access = list(5) + }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "eDE" = ( @@ -5090,6 +5046,9 @@ dir = 1 }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "eKb" = ( @@ -5741,17 +5700,15 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "fga" = ( -/obj/structure/table/reinforced/steel, -/obj/machinery/camera/network/supply{ - c_tag = "Cargo - Workshop"; - dir = 4 +/obj/machinery/optable{ + desc = "Used for advanced medical procedures, such as removing brains for cyborgification. Also used to repair unlawed synthetics."; + name = "Workshop Operation Table" }, -/obj/item/stack/material/glass/full, -/obj/item/stack/material/glass/full, -/obj/item/stack/material/steel/full, -/obj/item/stack/material/steel/full, -/turf/simulated/floor/tiled/dark, -/area/operations/lower) +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/operations/lower/machinist) "fgF" = ( /obj/effect/floor_decal/corner/black{ dir = 5 @@ -5978,15 +5935,15 @@ /turf/simulated/floor/tiled, /area/hangar/cargo) "fqU" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -28 - }, /obj/effect/floor_decal/corner/white{ dir = 9 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/small/east, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "frg" = ( /obj/structure/table/steel, /obj/machinery/light{ @@ -6308,7 +6265,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/door/window/southright, +/obj/machinery/door/window/southright{ + name = "Engineering Voidsuit"; + req_one_access = list(11,24) + }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "fHA" = ( @@ -6950,8 +6910,13 @@ layer = 2.9 }, /obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters/open{ + dir = 2; + id = "machinistworkshop"; + name = "Machinist Workshop" + }, /turf/simulated/floor/plating, -/area/operations/upper) +/area/operations/lower/machinist) "ghn" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -7314,16 +7279,10 @@ /turf/simulated/wall/shuttle/scc/cardinal, /area/shuttle/mining) "gxS" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/low{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/tiled/dark, -/area/operations/lower) +/area/operations/lower/machinist) "gya" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold4w/visible/black, @@ -7376,9 +7335,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/research_port) -"gyJ" = ( -/turf/simulated/wall, -/area/operations/storage) "gyL" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue, /turf/simulated/floor/reinforced/airmix, @@ -7391,14 +7347,14 @@ dir = 8 }, /obj/structure/table/reinforced/steel, -/obj/item/storage/toolbox/mechanical, /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/disposalpipe/segment{ - dir = 1; + dir = 8; icon_state = "pipe-c" }, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "gzQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7596,8 +7552,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, -/area/operations/storage) +/area/operations/lower/machinist) "gIc" = ( /obj/structure/table/standard, /obj/item/hoist_kit{ @@ -8006,12 +7963,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining{ name = "Workshop"; req_access = list(29) }, /turf/simulated/floor/tiled/dark, -/area/operations/lower) +/area/operations/lower/machinist) "heH" = ( /turf/simulated/floor/reinforced/oxygen, /area/engineering/atmos/air) @@ -8074,6 +8031,7 @@ /area/engineering/atmos) "hgH" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, /area/security/checkpoint) "hgR" = ( @@ -8180,7 +8138,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/door/window/southleft, +/obj/machinery/door/window/southleft{ + name = "Security Voidsuits"; + req_access = list(2) + }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "hmn" = ( @@ -8198,7 +8159,10 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/door/window/southleft, +/obj/machinery/door/window/southleft{ + name = "Engineering Voidsuit"; + req_one_access = list(11,24) + }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "hnN" = ( @@ -8385,6 +8349,14 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) +"hvO" = ( +/obj/machinery/vending/robotics, +/obj/structure/sign/nosmoking_1{ + pixel_y = 28 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "hwk" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8; @@ -8518,6 +8490,15 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"hDI" = ( +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) "hEh" = ( /obj/machinery/conveyor{ id = "mining_1"; @@ -8691,7 +8672,7 @@ layer = 2.9 }, /turf/simulated/floor/plating, -/area/operations/upper) +/area/operations/lower/machinist) "hNC" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8749,14 +8730,18 @@ /turf/simulated/floor/plating, /area/engineering/atmos) "hPD" = ( -/obj/structure/railing/mapped{ - dir = 1 - }, /obj/effect/floor_decal/corner/white/full{ dir = 1 }, +/obj/machinery/door/window/brigdoor/northright{ + name = "Workshop"; + req_access = list(29) + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "hQr" = ( /obj/effect/floor_decal/corner/blue{ dir = 6 @@ -8942,11 +8927,16 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "hYh" = ( -/obj/structure/table/rack, -/obj/item/storage/toolbox/mechanical, -/obj/item/storage/toolbox/mechanical, +/obj/structure/table/steel, +/obj/machinery/light{ + dir = 1; + icon_state = "tube1" + }, +/obj/item/nitrilebox, +/obj/item/storage/box/masks, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/dark, -/area/operations/lower) +/area/operations/lower/machinist) "hYy" = ( /turf/simulated/floor/tiled, /area/hangar/intrepid) @@ -8997,6 +8987,7 @@ /area/maintenance/engineering) "ibH" = ( /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/maintenance/hangar/starboard) "icl" = ( @@ -9144,7 +9135,7 @@ }, /obj/effect/floor_decal/corner/white/full, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "ifU" = ( /obj/structure/grille, /obj/structure/window/shuttle/scc, @@ -9461,7 +9452,7 @@ req_access = list(29) }, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "iAs" = ( /obj/structure/railing/mapped{ dir = 1 @@ -9518,7 +9509,7 @@ /area/shuttle/escape_pod/pod4) "iDw" = ( /turf/simulated/wall, -/area/operations/lower) +/area/operations/lower/machinist) "iDM" = ( /obj/structure/cable{ icon_state = "4-8" @@ -9634,22 +9625,6 @@ icon_state = "vault" }, /area/maintenance/wing/port/deck1) -"iJc" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, -/area/operations/storage) "iJi" = ( /obj/effect/floor_decal/corner_wide/purple/diagonal, /obj/structure/cable/green{ @@ -10145,12 +10120,26 @@ /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) "jiU" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/table/rack, +/obj/item/storage/toolbox/mechanical{ + desc = "A blue toolbox containing mechanic-related tools." }, +/obj/item/storage/toolbox/mechanical{ + desc = "A blue toolbox containing mechanic-related tools." + }, +/obj/item/storage/toolbox/electrical, +/obj/item/device/multitool, +/obj/item/device/multitool, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/head/welding, +/obj/item/clothing/head/welding, +/obj/item/storage/belt/utility, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, /obj/machinery/firealarm/north, /turf/simulated/floor/tiled/dark, -/area/operations/storage) +/area/operations/lower/machinist) "jjZ" = ( /obj/machinery/firealarm/east, /obj/effect/floor_decal/corner/black/full{ @@ -10223,26 +10212,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/white, /area/shuttle/intrepid) -"joU" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/white/diagonal, -/obj/effect/floor_decal/corner/black, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/operations/lower) "joW" = ( /obj/effect/decal/cleanable/dirt, /obj/random/junk, @@ -10532,8 +10501,24 @@ /turf/simulated/floor/plating, /area/turbolift/primary/deck_1) "jBX" = ( -/obj/effect/map_effect/airlock/s_to_n, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "ai_core_airlock"; + name = "interior access button"; + pixel_x = 25; + pixel_y = -25; + req_access = list(13) + }, +/obj/machinery/airlock_sensor/airlock_interior{ + frequency = 1380; + id_tag = "ai_core_sensor_interior"; + master_tag = null; + pixel_x = -25; + pixel_y = -25 + }, +/turf/simulated/floor/plating, /area/turret_protected/ai) "jCf" = ( /obj/machinery/light/small/emergency, @@ -10631,7 +10616,7 @@ dir = 5 }, /turf/simulated/floor/carpet/rubber, -/area/operations/upper) +/area/operations/lower/machinist) "jEt" = ( /obj/structure/shuttle_part{ icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi'; @@ -10722,11 +10707,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) -"jHe" = ( -/obj/structure/table/reinforced/steel, -/obj/machinery/cell_charger, -/turf/simulated/floor/tiled/dark, -/area/operations/storage) "jHu" = ( /obj/structure/tank_wall{ icon_state = "m-8" @@ -10973,10 +10953,11 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "jWE" = ( -/obj/effect/floor_decal/corner/white/diagonal, -/obj/effect/floor_decal/corner/black, -/turf/simulated/floor/tiled, -/area/operations/storage) +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/operations/lower/machinist) "jWI" = ( /obj/machinery/newscaster{ pixel_x = 30 @@ -11493,8 +11474,13 @@ pixel_x = 28 }, /obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/table/steel, +/obj/item/device/flashlight/lamp{ + pixel_x = 2; + pixel_y = 2 + }, /turf/simulated/floor/tiled/dark, -/area/operations/upper) +/area/operations/lower/machinist) "kzC" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black, /obj/effect/floor_decal/industrial/warning{ @@ -11696,13 +11682,32 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"kHz" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "Robocompo" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/operations/lower/machinist) "kHS" = ( /obj/effect/floor_decal/industrial/loading/yellow{ dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/button/remote/blast_door{ + id = "machinistworkshop"; + name = "Conveyor Belt Shutter"; + pixel_x = 24; + pixel_y = 24 + }, /turf/simulated/floor/tiled/dark, -/area/operations/upper) +/area/operations/lower/machinist) "kHT" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -12125,19 +12130,6 @@ }, /turf/simulated/floor/carpet/rubber, /area/shuttle/intrepid) -"laW" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/dark, -/area/operations/storage) "lbr" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12569,25 +12561,11 @@ /turf/simulated/floor/plating, /area/engineering/storage/lower) "lzt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/simulated/floor/carpet/rubber, -/area/operations/storage) +/turf/simulated/floor/reinforced, +/area/operations/lower/machinist) "lAU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -12847,7 +12825,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/door/window/southright, +/obj/machinery/door/window/southright{ + name = "Security Voidsuit"; + req_access = list(2) + }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "lOi" = ( @@ -13236,12 +13217,24 @@ /obj/machinery/gibber, /turf/simulated/floor/tiled, /area/crew_quarters/kitchen/freezer) +"mdZ" = ( +/obj/machinery/conveyor{ + dir = 10; + id = "Robocompo" + }, +/obj/structure/plasticflaps/mining, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/dark, +/area/operations/lower/machinist) "mey" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/simulated/floor/carpet/rubber, -/area/operations/upper) +/area/operations/lower/machinist) "mfk" = ( /obj/machinery/door/blast/regular/open{ id = "hangarlockdown"; @@ -13331,6 +13324,14 @@ }, /turf/simulated/floor/tiled/dark, /area/hangar/auxiliary) +"mjG" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance_hatch{ + req_access = list(12) + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/plating, +/area/maintenance/hangar/starboard) "mky" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -13433,9 +13434,6 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -13467,14 +13465,14 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate, /obj/item/material/shard, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/research_port) "mpI" = ( @@ -13972,8 +13970,12 @@ /obj/structure/reagent_dispensers/acid{ pixel_x = -32 }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -28 + }, /turf/simulated/floor/carpet/rubber, -/area/operations/upper) +/area/operations/lower/machinist) "mPy" = ( /obj/machinery/atmospherics/binary/pump{ name = "Mix to Connectors" @@ -14274,9 +14276,6 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "mZe" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm/east, @@ -14645,7 +14644,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/operations/lower) +/area/operations/lower/machinist) "nrq" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 @@ -15402,6 +15401,14 @@ /obj/structure/trash_pile, /turf/simulated/floor/plating, /area/maintenance/engineering) +"ocs" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "Robocompo" + }, +/obj/effect/floor_decal/industrial/warning/cee, +/turf/simulated/floor/tiled/dark, +/area/operations/lower/machinist) "oct" = ( /obj/vehicle/train/cargo/trolley, /obj/effect/floor_decal/spline/plain, @@ -15635,13 +15642,6 @@ }, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) -"osQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/white/diagonal, -/obj/effect/floor_decal/corner/black, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/operations/lower) "otX" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -15772,7 +15772,7 @@ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "ozx" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, @@ -15991,14 +15991,24 @@ /turf/simulated/wall, /area/outpost/mining_main/eva) "oPL" = ( -/obj/structure/bed/stool/chair/office/dark{ - dir = 4 +/obj/structure/table/steel, +/obj/item/device/flash/synthetic{ + pixel_x = -7; + pixel_y = 1 }, -/obj/effect/landmark/start{ - name = "Machinist" +/obj/item/device/flash/synthetic{ + pixel_y = 1 + }, +/obj/item/device/flash/synthetic{ + pixel_x = 7; + pixel_y = 1 + }, +/obj/item/device/flash/synthetic{ + pixel_x = 14; + pixel_y = 1 }, /turf/simulated/floor/tiled/dark, -/area/operations/lower) +/area/operations/lower/machinist) "oQa" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/dark, @@ -16128,10 +16138,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "oZj" = ( -/obj/structure/table/reinforced/steel, -/obj/machinery/light, +/obj/machinery/mecha_part_fabricator{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, -/area/operations/storage) +/area/operations/lower/machinist) "oZJ" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 9 @@ -16404,15 +16415,7 @@ "plZ" = ( /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled/dark, -/area/operations/upper) -"pne" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/white/diagonal, -/obj/effect/floor_decal/corner/black, -/turf/simulated/floor/tiled, -/area/operations/lower) +/area/operations/lower/machinist) "pnf" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable{ @@ -16779,7 +16782,7 @@ dir = 9 }, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "pEF" = ( /obj/structure/closet/secure_closet/xenoarchaeologist{ req_access = null; @@ -16846,10 +16849,16 @@ /turf/simulated/floor/tiled, /area/hangar/cargo) "pHI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/firealarm/north, +/obj/structure/table/steel, +/obj/item/device/robotanalyzer{ + pixel_y = 8 + }, +/obj/item/device/robotanalyzer, +/obj/machinery/camera/network/supply{ + c_tag = "Cargo - Machinist Workshop Entrance" + }, /turf/simulated/floor/tiled/dark, -/area/operations/lower) +/area/operations/lower/machinist) "pIf" = ( /obj/structure/table/reinforced/steel, /obj/item/paper_bin{ @@ -17155,7 +17164,7 @@ }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled/dark, -/area/operations/upper) +/area/operations/lower/machinist) "pYa" = ( /turf/simulated/wall, /area/hangar/intrepid/interstitial) @@ -17180,7 +17189,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/operations/lower) +/area/operations/lower/machinist) "pYW" = ( /obj/structure/railing/mapped{ dir = 8 @@ -17317,17 +17326,14 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "qcC" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/tiled/dark, -/area/operations/storage) +/area/operations/lower/machinist) "qdm" = ( /obj/machinery/light/small{ dir = 4 @@ -17520,10 +17526,11 @@ /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) "qks" = ( -/obj/structure/table/reinforced/steel, -/obj/item/device/multitool, -/turf/simulated/floor/tiled/dark, -/area/operations/lower) +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/reinforced, +/area/operations/lower/machinist) "qlv" = ( /turf/simulated/floor/reinforced, /area/engineering/gravity_gen) @@ -17573,10 +17580,9 @@ /turf/simulated/floor/reinforced/airless, /area/engineering/atmos/propulsion) "qns" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/rods, +/obj/effect/map_effect/wingrille_spawn/reinforced, /turf/simulated/floor/plating, -/area/maintenance/cargo) +/area/operations/lower/machinist) "qnt" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -18148,15 +18154,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/white/diagonal, -/obj/effect/floor_decal/corner/black, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled, -/area/operations/lower) +/turf/simulated/floor/tiled/dark, +/area/operations/lower/machinist) "qOf" = ( /obj/effect/floor_decal/corner/brown/full{ dir = 8 @@ -18469,7 +18472,7 @@ pixel_y = 28 }, /turf/simulated/floor/tiled/dark, -/area/operations/lower) +/area/operations/lower/machinist) "qZZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -18582,15 +18585,22 @@ /turf/simulated/floor/tiled/dark, /area/hangar/control) "ref" = ( -/obj/machinery/light{ - dir = 4 +/obj/structure/table/steel, +/obj/item/cell/high{ + pixel_y = 10 + }, +/obj/item/cell/high{ + pixel_y = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/structure/table/reinforced/steel, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/cell_charger, /turf/simulated/floor/tiled/dark, -/area/operations/lower) +/area/operations/lower/machinist) "reE" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -18681,11 +18691,6 @@ }, /turf/simulated/floor/tiled, /area/outpost/mining_main/eva) -"rjv" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/operations/upper) "rjz" = ( /obj/structure/cable{ icon_state = "2-4" @@ -18906,7 +18911,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/door/window/northright, +/obj/machinery/door/window/northright{ + name = "Medical Voidsuit"; + req_access = list(5) + }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "rrR" = ( @@ -19285,10 +19293,6 @@ /area/outpost/mining_main/refinery) "rPA" = ( /obj/effect/floor_decal/corner/white/diagonal, -/obj/machinery/camera/network/supply{ - c_tag = "Cargo - Workshop Lobby"; - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/hangar/intrepid) "rPJ" = ( @@ -19388,20 +19392,9 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "rTF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/white/diagonal, -/obj/effect/floor_decal/corner/black, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/turf/simulated/floor/tiled, -/area/operations/lower) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/operations/lower/machinist) "rVm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -19614,19 +19607,11 @@ }, /area/medical/morgue/lower) "sfr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/industrial/warning{ + dir = 6 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/white/diagonal, -/obj/effect/floor_decal/corner/black, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/operations/lower) +/turf/simulated/floor/reinforced, +/area/operations/lower/machinist) "sfF" = ( /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion/starboard) @@ -19688,6 +19673,22 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/hangar) +"shB" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "Robocompo" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/operations/lower/machinist) "siF" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /obj/structure/tank_wall/hydrogen{ @@ -20188,9 +20189,6 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "sJJ" = ( -/obj/structure/railing/mapped{ - dir = 1 - }, /obj/machinery/light{ dir = 8 }, @@ -20198,8 +20196,17 @@ /obj/effect/floor_decal/corner/white/full{ dir = 8 }, +/obj/machinery/door/window/brigdoor/westleft{ + dir = 1; + name = "Workshop"; + req_access = list(29) + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "conpipe-c" + }, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "sJN" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -20336,19 +20343,17 @@ /turf/space/dynamic, /area/template_noop) "sPT" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 5 }, -/obj/effect/floor_decal/corner/white/diagonal, -/obj/effect/floor_decal/corner/black, -/turf/simulated/floor/tiled, -/area/operations/storage) +/turf/simulated/floor/tiled/dark, +/area/operations/lower/machinist) "sQc" = ( /obj/machinery/computer/ship/helm{ dir = 1 @@ -20423,6 +20428,28 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod/pod2) "sSK" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "ai_core_pump" + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "ai_core_airlock"; + name = "AI Core airlock controller"; + pixel_x = 30; + req_one_access = list(13); + tag_airpump = "ai_core_pump"; + tag_chamber_sensor = "ai_core_sensor"; + tag_exterior_door = "ai_core_outer"; + tag_exterior_sensor = "ai_core_sensor_exterior"; + tag_interior_door = "ai_core_inner"; + tag_interior_sensor = "ai_core_sensor_interior" + }, +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "ai_core_sensor"; + pixel_x = -30 + }, /turf/simulated/floor/plating, /area/turret_protected/ai) "sTw" = ( @@ -20496,6 +20523,7 @@ dir = 1 }, /obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/closet/wardrobe/robotics_black, /turf/simulated/floor/tiled/white, /area/hangar/intrepid) "sZp" = ( @@ -20521,7 +20549,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, -/area/operations/lower) +/area/operations/lower/machinist) "tbd" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -20701,6 +20729,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/white/diagonal, +/obj/machinery/camera/network/supply{ + c_tag = "Cargo - Workshop Lobby"; + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/hangar/intrepid) "thU" = ( @@ -20745,28 +20777,45 @@ /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) -"tkG" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/white/diagonal, -/obj/effect/floor_decal/corner/black, -/turf/simulated/floor/tiled, -/area/operations/lower) "tkS" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black, /obj/machinery/meter, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) "tlx" = ( +/obj/structure/table/rack, +/obj/item/stack/material/plasteel{ + amount = 20; + pixel_y = 4; + randpixel = 0 + }, +/obj/item/stack/material/glass{ + amount = 50; + pixel_x = -1; + pixel_y = 2; + randpixel = 0 + }, +/obj/item/stack/material/steel{ + amount = 50; + pixel_x = 1; + pixel_y = -2; + randpixel = 0 + }, +/obj/item/stack/material/steel{ + amount = 50; + pixel_x = 1; + pixel_y = -2; + randpixel = 0 + }, +/obj/item/stack/material/steel{ + amount = 50; + pixel_x = 1; + pixel_y = -2; + randpixel = 0 + }, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/tiled/dark, -/area/operations/storage) +/area/operations/lower/machinist) "tlU" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 6 @@ -20829,13 +20878,16 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "tqT" = ( -/obj/structure/closet/wardrobe/machinist, -/obj/machinery/camera/network/supply{ - c_tag = "Cargo - Workshop Storage"; - dir = 4 +/obj/machinery/conveyor{ + dir = 4; + id = "Robocompo" + }, +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, /turf/simulated/floor/tiled/dark, -/area/operations/storage) +/area/operations/lower/machinist) "tri" = ( /obj/machinery/atmospherics/unary/outlet_injector{ frequency = 1441; @@ -21094,9 +21146,6 @@ /turf/simulated/floor/plating, /area/hangar/auxiliary) "tGK" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21105,8 +21154,9 @@ name = "Workshop"; req_access = list(29) }, -/turf/simulated/floor/tiled/dark, -/area/operations/storage) +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled/white, +/area/operations/lower/machinist) "tGU" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -21278,11 +21328,19 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "tMp" = ( -/obj/structure/table/rack, -/obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/glass/beaker, -/turf/simulated/floor/tiled/dark, -/area/operations/lower) +/obj/structure/table/steel, +/obj/machinery/button/switch/windowtint{ + id = "1deckworkshop"; + pixel_y = 25 + }, +/obj/item/storage/box/fancy/tray/robotics{ + pixel_x = -15 + }, +/obj/item/device/mmi, +/obj/item/device/mmi, +/obj/item/device/mmi, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "tNo" = ( /obj/structure/closet/hydrant{ pixel_x = 28; @@ -21792,8 +21850,14 @@ c_tag = "Cargo - Workshop Desk"; dir = 1 }, +/obj/machinery/requests_console{ + department = "Operations"; + departmentType = 2; + name = "Machinist Workshop"; + pixel_y = -30 + }, /turf/simulated/floor/carpet/rubber, -/area/operations/upper) +/area/operations/lower/machinist) "ukS" = ( /turf/simulated/wall, /area/hangar/cargo) @@ -21948,7 +22012,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/operations/upper) +/area/operations/lower/machinist) "uqE" = ( /obj/structure/bed/stool/chair/office/dark, /obj/effect/floor_decal/corner/white/diagonal, @@ -21956,7 +22020,7 @@ name = "Machinist" }, /turf/simulated/floor/tiled/dark, -/area/operations/upper) +/area/operations/lower/machinist) "urr" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -22310,6 +22374,13 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/propulsion/starboard) +"uJE" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/binary/pump{ + use_power = 1 + }, +/turf/simulated/floor/tiled, +/area/maintenance/hangar/starboard) "uKh" = ( /obj/machinery/atmospherics/binary/pump/high_power{ dir = 8; @@ -22569,7 +22640,13 @@ /obj/effect/map_effect/wingrille_spawn/reinforced, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/operations/storage) +/area/operations/lower/machinist) +"uXR" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/reinforced, +/area/operations/lower/machinist) "uYi" = ( /obj/structure/railing/mapped, /obj/structure/bed/stool/chair/padded/black{ @@ -22864,13 +22941,8 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "vjM" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/corner/white/diagonal, -/obj/effect/floor_decal/corner/black, -/turf/simulated/floor/tiled, -/area/operations/lower) +/turf/simulated/floor/tiled/dark, +/area/operations/lower/machinist) "vjT" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -22882,12 +22954,12 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ +/obj/machinery/door/airlock/mining{ name = "Workshop"; req_access = list(29) }, /turf/simulated/floor/tiled/dark, -/area/operations/upper) +/area/operations/lower/machinist) "vjW" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 @@ -23056,27 +23128,22 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "vrg" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/conveyor_switch/oneway{ + desc = "A conveyor control switch. It appears to only go in one direction. Controls the components conveyor belt."; + id = "Robocompo"; + pixel_x = -10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/closet/wardrobe/machinist, /turf/simulated/floor/tiled/dark, -/area/operations/storage) +/area/operations/lower/machinist) "vrm" = ( -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/structure/cable{ + icon_state = "4-8" }, /turf/simulated/floor/tiled/ramp/bottom{ dir = 8 @@ -23101,18 +23168,15 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid) "vsW" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/table/steel, +/obj/item/device/mmi/digital/posibrain{ + pixel_y = -8 }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/item/device/mmi/digital/posibrain{ + pixel_y = 8 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/modular_computer/console/preset/supply, /turf/simulated/floor/tiled/dark, -/area/operations/lower) +/area/operations/lower/machinist) "vsY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -23238,6 +23302,22 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "ai_core_airlock"; + name = "exterior access button"; + pixel_x = 27; + pixel_y = 26; + req_one_access = list(13) + }, +/obj/machinery/airlock_sensor/airlock_exterior{ + frequency = 1380; + id_tag = "ai_core_sensor_exterior"; + master_tag = null; + pixel_x = -25; + pixel_y = 25 + }, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload_foyer) "vCG" = ( @@ -23551,7 +23631,7 @@ dir = 9 }, /turf/simulated/floor/carpet/rubber, -/area/operations/upper) +/area/operations/lower/machinist) "vTJ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -23843,13 +23923,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/obj/machinery/computer/rdconsole/core{ - req_access = list(29) - }, /obj/effect/floor_decal/industrial/hatch, /obj/machinery/r_n_d/protolathe, /turf/simulated/floor/carpet/rubber, -/area/operations/upper) +/area/operations/lower/machinist) "wjM" = ( /obj/structure/bed/stool/chair/office/bridge{ dir = 1 @@ -24041,8 +24118,14 @@ /obj/item/stack/packageWrap, /obj/item/stack/wrapping_paper, /obj/item/device/hand_labeler, +/obj/machinery/ringer{ + department = "Robotics"; + id = "robo_ringer"; + pixel_x = -25; + req_access = list(29) + }, /turf/simulated/floor/tiled/dark, -/area/operations/upper) +/area/operations/lower/machinist) "wpM" = ( /obj/machinery/atmospherics/omni/mixer{ active_power_usage = 7500; @@ -24087,13 +24170,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_mining{ - name = "Workshop"; - req_access = list(29) - }, /turf/simulated/floor/tiled/dark, -/area/operations/storage) +/area/operations/lower/machinist) "wqR" = ( /turf/simulated/wall/shuttle/scc/cardinal, /area/shuttle/escape_pod/pod4) @@ -24438,20 +24516,9 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "wMO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/bed/stool/chair/office/dark, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/white/diagonal, -/obj/effect/floor_decal/corner/black, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/operations/lower) +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced, +/area/operations/lower/machinist) "wNn" = ( /obj/machinery/door/airlock/maintenance_hatch{ req_one_access = list(48,67) @@ -24599,23 +24666,23 @@ /area/hangar/intrepid) "wVB" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 9 }, /obj/structure/railing/mapped{ dir = 1 }, +/obj/machinery/light/small/emergency{ + dir = 4 + }, /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/item/material/shard{ - icon_state = "small" - }, /turf/simulated/floor/plating, /area/maintenance/engineering) "wVE" = ( @@ -25550,19 +25617,27 @@ /turf/simulated/floor/tiled/ramp/bottom, /area/hangar/intrepid) "xFB" = ( -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/structure/table/steel, +/obj/item/storage/firstaid/regular{ + empty = 1; + name = "First-Aid (empty)" }, -/obj/machinery/power/apc/low{ - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/item/storage/firstaid/regular{ + empty = 1; + name = "First-Aid (empty)" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/item/device/healthanalyzer, +/obj/item/device/healthanalyzer, +/obj/item/reagent_containers/glass/bucket{ + pixel_y = 2 }, +/obj/item/reagent_containers/glass/bucket{ + pixel_y = 2 + }, +/obj/item/device/assembly/prox_sensor, +/obj/item/device/assembly/prox_sensor, /turf/simulated/floor/tiled/dark, -/area/operations/storage) +/area/operations/lower/machinist) "xGe" = ( /obj/machinery/door/airlock/engineering, /obj/structure/cable/green{ @@ -25645,9 +25720,6 @@ /turf/simulated/floor/airless, /area/engineering/atmos) "xJE" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/railing/mapped{ @@ -25656,7 +25728,7 @@ /turf/simulated/floor/tiled/ramp/bottom{ dir = 1 }, -/area/operations/storage) +/area/operations/lower/machinist) "xKE" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -25845,10 +25917,8 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "xPv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "xPX" = ( @@ -25920,10 +25990,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "xTG" = ( @@ -26112,8 +26180,13 @@ }, /obj/item/paper_bin, /obj/item/pen/black, +/obj/machinery/ringer_button{ + id = "robo_ringer"; + pixel_x = 5; + pixel_y = 5 + }, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "yaP" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -26154,7 +26227,7 @@ "ycX" = ( /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled/white, -/area/operations/upper) +/area/operations/lower/machinist) "ydm" = ( /obj/structure/shuttle/engine/propulsion/burst/left{ dir = 4 @@ -26270,17 +26343,28 @@ /turf/simulated/floor/tiled/dark, /area/hangar/cargo) "yif" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/tiled/dark, -/area/operations/storage) +/area/operations/lower/machinist) "yiT" = ( /obj/machinery/mineral/stacking_unit_console{ pixel_y = -3 }, /turf/simulated/wall, /area/outpost/mining_main/refinery) +"ykR" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/visible/universal, +/turf/simulated/floor/plating, +/area/maintenance/hangar/starboard) "ylr" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/binary/pump/high_power{ @@ -31859,7 +31943,7 @@ eSV eSV eSV eSV -iUQ +eSV eSV eSV eSV @@ -32033,7 +32117,6 @@ eSV eSV eSV eSV -eCQ eSV eSV eSV @@ -32055,7 +32138,8 @@ eSV eSV eSV eSV -eCQ +eSV +eSV eSV eSV eSV @@ -33648,7 +33732,7 @@ eSV eSV eSV eSV -iUQ +eSV eSV eSV eSV @@ -33841,7 +33925,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -33883,13 +33967,13 @@ eSV eSV eSV eSV -eCQ eSV eSV eSV eSV eSV -iUQ +eSV +eSV eSV eSV eSV @@ -34902,7 +34986,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -35652,7 +35736,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -36063,7 +36147,7 @@ eSV eSV eSV eSV -iUQ +eSV eSV eSV eSV @@ -37937,7 +38021,7 @@ eSV eSV eSV eSV -iUQ +eSV eSV eSV eSV @@ -38276,7 +38360,7 @@ eSV eSV eSV eSV -iUQ +eSV eSV eSV eSV @@ -38474,7 +38558,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -38548,7 +38632,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -40285,7 +40369,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -41579,7 +41663,7 @@ eSV eSV eSV eSV -iUQ +eSV eSV eSV eSV @@ -41989,7 +42073,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -43347,7 +43431,7 @@ abh abh qBv ebK -gtS +bVc wVB nnw wqj @@ -43550,12 +43634,12 @@ arr arr arr vrm -alW -nnw +iDw +iDw qns -wqj -jak -pzg +qns +iDw +iDw rgo pzg pzg @@ -43589,9 +43673,9 @@ wJg iCZ eJG ibH -nPL -ibH -wHJ +ykR +uJE +mjG xPv raq msv @@ -43719,7 +43803,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -43750,14 +43834,14 @@ adj ohB leB cdT -gyJ +iDw gGE -gyJ -gyJ -gyJ -gyJ -gyJ -gyJ +iDw +mdZ +kHz +shB +ocs +iDw aJa nPK uGn @@ -43952,14 +44036,14 @@ non non dOa bMg -gyJ -ecj +iDw +wqs vrg tqT -bVO -dmq oZj -gyJ +oZj +oZj +iDw lou shp quA @@ -44154,14 +44238,14 @@ bHx fVm lNE rpK -gyJ +iDw yif sPT jWE -jWE -jWE -jHe -gyJ +vjM +vjM +vjM +iDw pzg pzg nTR @@ -44356,12 +44440,12 @@ aMG cEl lNE cxG -gyJ +iDw jiU -sPT -jWE -jWE -jWE +wqs +vjM +vjM +vjM tlx uWW sYZ @@ -44412,7 +44496,7 @@ eSV eSV eSV eSV -iUQ +eSV eSV eSV eSV @@ -44558,11 +44642,11 @@ wbg cEl lNE aDm -gyJ +iDw xFB -iJc -bsP -laW +wqs +vjM +vjM qcC xJE tGK @@ -44760,19 +44844,19 @@ arr arr tes arr -gyJ -gyJ +iDw +hvO wqs -gyJ +uXR lzt aqn -daY -daY -daY +iDw +iDw +iDw izN -daY -daY -daY +iDw +iDw +iDw edm hts uCH @@ -44964,7 +45048,7 @@ sLn qIT iDw hYh -tkG +wqs fga wMO pYD @@ -44974,7 +45058,7 @@ pEE ifK vSS mPm -daY +iDw qtm jDq uCH @@ -45166,7 +45250,7 @@ mnr tKE iDw tMp -tkG +wqs qks sfr pYD @@ -45176,7 +45260,7 @@ ycX dsT mey ukF -daY +iDw lwm tbd wqf @@ -45369,7 +45453,7 @@ xqe iDw pHI qNU -osQ +rTF rTF taF gzI @@ -45378,8 +45462,8 @@ aPV eaw jEf wjr -daY -daY +iDw +iDw eKo fWx wuD @@ -45570,8 +45654,8 @@ xvG uhE iDw gxS -joU -pne +nqA +vjM vjM pYD dUK @@ -45776,7 +45860,7 @@ nqA vsW oPL ref -daY +iDw hMV bRX oys @@ -45828,7 +45912,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -45975,17 +46059,17 @@ fyb iDw iDw her -iDw +dvT dvT iDw -daY +iDw ggZ -daY +iDw vjT -daY -rjv -rjv -daY +iDw +uWW +uWW +iDw gFI gkE mNH @@ -46175,9 +46259,9 @@ bBD fvq ygx pLU -ygx +hDI uUZ -bVc +ygx qnt kBe pYa @@ -46338,7 +46422,7 @@ eSV eSV eSV eSV -iUQ +eSV eSV eSV eSV @@ -47960,7 +48044,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -49369,7 +49453,7 @@ eSV eSV eSV eSV -iUQ +eSV eSV eSV eSV @@ -50069,7 +50153,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -52406,7 +52490,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -52433,7 +52517,7 @@ lPL sxc qZp qZp -jBX +qZp pdC pdC cDa @@ -52632,10 +52716,10 @@ eNY fVh ben gsG -gsG +jBX aFA sSK -sSK +bBL vCC pdC vcF @@ -52687,7 +52771,7 @@ eSV eSV eSV eSV -iUQ +eSV eSV eSV eSV @@ -53702,7 +53786,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -54231,7 +54315,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -55651,7 +55735,7 @@ eSV eSV eSV eSV -iUQ +eSV eSV eSV eSV @@ -56264,7 +56348,7 @@ eSV eSV eSV eSV -iUQ +eSV eSV eSV eSV @@ -57273,7 +57357,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -58293,7 +58377,7 @@ eSV eSV eSV eSV -iUQ +eSV eSV eSV eSV @@ -58329,7 +58413,7 @@ eSV eSV eSV eSV -iUQ +eSV eSV eSV eSV @@ -58542,7 +58626,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -58894,7 +58978,6 @@ eSV eSV eSV eSV -eCQ eSV eSV eSV @@ -58914,7 +58997,8 @@ eSV eSV eSV eSV -iUQ +eSV +eSV eSV eSV eSV @@ -60349,7 +60433,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV @@ -60938,7 +61022,7 @@ eSV eSV eSV eSV -eCQ +eSV eSV eSV eSV diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm index 9b5dee8c6c2..9a3bb65ce67 100644 --- a/maps/sccv_horizon/placeholder-2_deck_2.dmm +++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm @@ -406,24 +406,15 @@ /turf/simulated/floor/plating, /area/engineering/engine_room/tesla) "alr" = ( -/obj/structure/table/steel, -/obj/item/device/flash/synthetic{ - pixel_x = -7; - pixel_y = 1 +/obj/structure/table/reinforced{ + table_mat = "steel"; + table_reinf = "mhydrogen" }, -/obj/item/device/flash/synthetic{ - pixel_y = 1 +/obj/machinery/light{ + dir = 1 }, -/obj/item/device/flash/synthetic{ - pixel_x = 7; - pixel_y = 1 - }, -/obj/item/device/flash/synthetic{ - pixel_x = 14; - pixel_y = 1 - }, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/turf/simulated/floor/carpet/rubber, +/area/rnd/strongroom) "amf" = ( /obj/effect/floor_decal/corner/green{ dir = 6 @@ -682,10 +673,9 @@ /turf/simulated/floor/grass/alt, /area/hydroponics/garden) "ati" = ( -/obj/machinery/atmospherics/portables_connector{ +/obj/machinery/atmospherics/pipe/tank/air{ dir = 8 }, -/obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor/plating, /area/engineering/engine_room) "atB" = ( @@ -977,8 +967,14 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "aAp" = ( -/turf/simulated/floor/carpet/rubber, -/area/assembly/robotics/workshop) +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "aAx" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -986,13 +982,12 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "aBa" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/structure/railing/mapped{ + dir = 8 }, -/turf/simulated/floor/tiled/ramp/bottom{ - dir = 1 - }, -/area/assembly/robotics/workshop) +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "aBq" = ( /obj/structure/sink{ dir = 4; @@ -1651,16 +1646,14 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/junction{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/white, /area/hallway/medical) "aUQ" = ( @@ -1905,30 +1898,8 @@ /turf/simulated/floor/reinforced, /area/hallway/primary/central_two) "baq" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/table/rack, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = 1; - pixel_y = -2; - randpixel = 0 - }, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = 1; - pixel_y = -2; - randpixel = 0 - }, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = 1; - pixel_y = -2; - randpixel = 0 - }, /turf/simulated/floor/tiled, -/area/assembly/robotics) +/area/teleporter) "baJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ @@ -2090,7 +2061,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/assembly/robotics/workshop) +/area/assembly/chargebay) "bhR" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -2524,12 +2495,6 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/grass/alt, /area/hallway/primary/central_two) -"bvi" = ( -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/assembly/robotics) "bvV" = ( /obj/structure/plasticflaps/airtight, /obj/machinery/door/window/westleft{ @@ -2598,6 +2563,9 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "byx" = ( @@ -2941,12 +2909,6 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/far) "bKX" = ( -/obj/machinery/button/remote/blast_door{ - id = "bar_desk"; - name = "Bar Pickup Desk Shutters"; - pixel_x = 30; - req_access = list(25) - }, /obj/structure/sink{ dir = 4; pixel_x = 12 @@ -2965,12 +2927,6 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_monitoring/tesla) -"bMJ" = ( -/obj/structure/table/steel, -/obj/item/cell/high, -/obj/item/cell/high, -/turf/simulated/floor/tiled, -/area/assembly/robotics) "bNd" = ( /obj/machinery/power/apc/high{ pixel_y = -24 @@ -3574,11 +3530,14 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/storage) "cdv" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/reinforced, -/area/assembly/robotics) +/turf/simulated/floor/carpet/rubber, +/area/rnd/strongroom) "cei" = ( /obj/structure/window/phoronreinforced{ dir = 4 @@ -3709,32 +3668,7 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "cjX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/research{ - name = "Research storage"; - req_access = list(7) - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular{ - closed_layer = 3.5; - density = 0; - icon_state = "pdoor0"; - id = "RDStorage"; - name = "Storage lockdown"; - opacity = 0 - }, -/obj/machinery/button/remote/blast_door{ - id = "RDStorage"; - name = "Storage lockdown"; - pixel_x = 27; - pixel_y = 5; - req_access = list(30) - }, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/wall, /area/rnd/strongroom) "ckc" = ( /obj/structure/railing/mapped, @@ -3979,11 +3913,6 @@ }, /turf/simulated/floor/wood, /area/medical/psych) -"ctM" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/assembly/robotics) "cua" = ( /obj/structure/table/standard, /obj/item/storage/firstaid/o2{ @@ -4006,8 +3935,6 @@ dir = 8 }, /obj/structure/cable/green{ - d1 = 1; - d2 = 4; icon_state = "1-4" }, /turf/simulated/floor/tiled, @@ -4047,6 +3974,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/assembly/chargebay) "cxu" = ( @@ -4144,10 +4074,9 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "cAx" = ( -/obj/machinery/light{ - dir = 8 +/obj/machinery/door/window/brigdoor{ + req_access = list(7) }, -/obj/structure/closet/radiation, /turf/simulated/floor/carpet/rubber, /area/rnd/strongroom) "cBq" = ( @@ -4207,13 +4136,6 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/storage) -"cCC" = ( -/obj/structure/closet/wardrobe/robotics_black, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/assembly/robotics) "cCM" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/structure/disposalpipe/segment, @@ -5065,10 +4987,12 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark/start{ name = "Scientist" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/rnd/conference) "dht" = ( @@ -5180,10 +5104,10 @@ /turf/simulated/floor/tiled, /area/security/prison) "dkr" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/door/window/brigdoor/northright{ + dir = 2; + req_access = list(7) }, -/obj/structure/closet/crate, /turf/simulated/floor/carpet/rubber, /area/rnd/strongroom) "dkz" = ( @@ -5279,14 +5203,15 @@ /turf/simulated/floor/plating, /area/maintenance/hangar/port) "dnJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/cable/green{ - icon_state = "1-4" + icon_state = "1-8" }, -/turf/simulated/floor/carpet/rubber, -/area/rnd/strongroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/teleporter) "dnP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5674,6 +5599,9 @@ /obj/effect/floor_decal/corner/mauve{ dir = 5 }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "dDo" = ( @@ -5720,6 +5648,9 @@ /obj/effect/floor_decal/corner/mauve{ dir = 5 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "dEz" = ( @@ -5757,29 +5688,15 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/far) "dGp" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/structure/table/rack, -/obj/item/stack/material/glass{ - amount = 50; - pixel_x = -1; - pixel_y = 2; - randpixel = 0 - }, -/obj/item/stack/material/glass{ - amount = 50; - pixel_x = -1; - pixel_y = 2; - randpixel = 0 - }, -/obj/item/stack/material/plasteel{ - amount = 20; - pixel_y = 4; - randpixel = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/item/device/radio/beacon, /turf/simulated/floor/tiled, -/area/assembly/robotics) +/area/teleporter) "dGz" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d2-2" @@ -6550,6 +6467,9 @@ target_temperature = 278 }, /obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "ekM" = ( @@ -7089,6 +7009,9 @@ name = "Mech Bay"; req_access = list(29) }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/carpet/rubber, /area/assembly/chargebay) "eBj" = ( @@ -7563,9 +7486,10 @@ /turf/simulated/floor/tiled/white, /area/rnd/research) "eUp" = ( -/obj/structure/closet/secure_closet/sciguncabinet, -/turf/simulated/floor/carpet/rubber, -/area/rnd/strongroom) +/obj/random/junk, +/obj/machinery/light/small/emergency, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "eUT" = ( /obj/structure/bed/stool/chair/padded/black{ dir = 4 @@ -7798,15 +7722,14 @@ dir = 4; pixel_x = -28 }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, /obj/machinery/power/apc/high{ dir = 1; name = "north bump"; pixel_y = 24 }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, /turf/simulated/floor/carpet/rubber, /area/server) "eZG" = ( @@ -8021,12 +7944,6 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/medical) -"ffh" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/simulated/floor/reinforced, -/area/assembly/robotics) "ffP" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -8169,13 +8086,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_research{ - name = "Robotics"; - req_access = list(29) - }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/carpet/rubber, -/area/assembly/robotics) +/obj/machinery/door/airlock/command{ + name = "Teleport Access"; + req_access = list(17) + }, +/turf/simulated/floor/tiled, +/area/teleporter) "fkZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -8304,9 +8221,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /obj/effect/floor_decal/corner/grey{ dir = 8 }, @@ -8316,6 +8230,15 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/rnd/conference) "fqg" = ( @@ -8437,12 +8360,10 @@ req_access = list(3) }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - d1 = 1; - d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/security/armory) "ftS" = ( @@ -8691,23 +8612,18 @@ /turf/simulated/floor/wood, /area/hydroponics/garden) "fEO" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/assembly/robotics) +/area/teleporter) "fEQ" = ( /obj/structure/railing/mapped, /obj/structure/window/reinforced, /turf/simulated/open, /area/hallway/primary/central_two) "fEY" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/carpet/rubber, /area/rnd/strongroom) "fFx" = ( @@ -8886,11 +8802,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -8906,6 +8817,9 @@ /obj/effect/floor_decal/corner/mauve{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "fKn" = ( @@ -9453,11 +9367,6 @@ /area/maintenance/aft) "gaA" = ( /obj/effect/floor_decal/industrial/warning, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -9465,6 +9374,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/security/armory) "gbk" = ( @@ -9573,9 +9485,12 @@ /turf/simulated/floor/tiled/dark, /area/security/armory) "gec" = ( -/obj/machinery/r_n_d/circuit_imprinter, -/turf/simulated/floor/carpet/rubber, -/area/assembly/robotics/workshop) +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/teleporter) "gei" = ( /obj/structure/table/standard, /obj/item/storage/box/freezer/organcooler, @@ -9704,17 +9619,6 @@ /mob/living/simple_animal/carp/fluff/ginny, /turf/simulated/floor/reinforced, /area/crew_quarters/heads/chief) -"ghL" = ( -/obj/machinery/alarm{ - pixel_y = 28; - target_temperature = 278 - }, -/obj/machinery/disposal/small/south, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/assembly/robotics) "ghX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9900,13 +9804,12 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port) "goc" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/light_switch{ + pixel_x = 10; + pixel_y = 26 }, -/obj/machinery/mineral/rigpress, -/obj/machinery/firealarm/north, /turf/simulated/floor/tiled, -/area/assembly/robotics) +/area/teleporter) "gof" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/structure/sign/nosmoking_2{ @@ -9931,15 +9834,17 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "goQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/floor_decal/industrial/warning, +/obj/item/device/radio/intercom{ + dir = 8; + name = "Station Intercom (General)"; + pixel_x = 24 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/turf/simulated/floor/carpet/rubber, -/area/rnd/strongroom) +/turf/simulated/floor/tiled, +/area/teleporter) "gps" = ( /obj/structure/lattice, /obj/machinery/light{ @@ -10109,14 +10014,16 @@ /turf/simulated/floor/tiled/dark, /area/security/armory) "guh" = ( -/obj/structure/plasticflaps/mining, -/obj/machinery/conveyor{ - dir = 1; - id = "robotics"; - layer = 2.9 +/obj/structure/table/rack{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/assembly/robotics/workshop) +/obj/item/clothing/suit/fire, +/obj/item/tank/oxygen, +/obj/item/clothing/mask/gas, +/obj/item/extinguisher, +/obj/item/clothing/head/hardhat/red, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "guj" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 5 @@ -10368,12 +10275,9 @@ /turf/simulated/floor/plating, /area/maintenance/substation/wing_port) "gBT" = ( -/obj/item/storage/bag/circuits/basic, -/obj/item/device/integrated_electronics/wirer, -/obj/item/device/integrated_electronics/debugger, -/obj/structure/table/steel, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/obj/structure/window/reinforced, +/turf/simulated/floor/carpet/rubber, +/area/rnd/strongroom) "gCj" = ( /obj/structure/closet/secure_closet/engineering_electrical, /obj/effect/floor_decal/industrial/outline/yellow, @@ -10472,11 +10376,10 @@ /area/crew_quarters/bar) "gDR" = ( /obj/effect/map_effect/wingrille_spawn/reinforced, +/obj/machinery/door/firedoor, /obj/structure/cable/green{ - d2 = 8; icon_state = "0-8" }, -/obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/security/prison) "gDT" = ( @@ -10630,12 +10533,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"gIs" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/turf/simulated/floor/reinforced, -/area/assembly/robotics) "gII" = ( /obj/structure/table/standard, /obj/item/storage/slide_projector, @@ -10673,15 +10570,10 @@ /turf/simulated/floor/plating, /area/maintenance/hangar/port) "gKG" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table/reinforced{ - table_mat = "steel"; - table_reinf = "mhydrogen" - }, -/turf/simulated/floor/carpet/rubber, -/area/rnd/strongroom) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "gKT" = ( /obj/structure/cable{ icon_state = "1-2" @@ -11238,21 +11130,9 @@ /turf/simulated/floor/tiled, /area/quartermaster/lobby) "heH" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/corner/white{ - dir = 4 - }, -/obj/effect/floor_decal/corner/white{ - dir = 8 - }, -/obj/structure/bed/stool/chair/office/dark{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/assembly/robotics) +/obj/machinery/suit_storage_unit/standard_unit, +/turf/simulated/floor/tiled, +/area/teleporter) "hfh" = ( /obj/effect/map_effect/wingrille_spawn/reinforced, /turf/simulated/floor/plating, @@ -11347,7 +11227,13 @@ /turf/simulated/floor/tiled, /area/engineering/storage_hard) "hiq" = ( -/obj/machinery/light{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/carpet/rubber, @@ -11756,14 +11642,6 @@ }, /turf/simulated/floor/carpet, /area/medical/psych) -"htx" = ( -/obj/structure/table/steel, -/obj/item/reagent_containers/spray/cleaner, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/assembly/robotics) "huw" = ( /turf/simulated/floor/tiled/dark, /area/rnd/conference) @@ -12731,6 +12609,9 @@ /obj/machinery/light/small, /turf/simulated/floor/plating, /area/storage/tech) +"ibU" = ( +/turf/simulated/wall/r_wall, +/area/security/brig/processing) "ica" = ( /obj/structure/bookcase/libraryspawn/fiction, /turf/simulated/floor/wood, @@ -12908,17 +12789,12 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "iic" = ( -/obj/structure/table/steel, -/obj/item/device/mmi/digital/posibrain{ - pixel_x = -5; - pixel_y = 3 +/obj/structure/table/reinforced{ + table_mat = "steel"; + table_reinf = "mhydrogen" }, -/obj/item/device/mmi/digital/posibrain{ - pixel_x = 11; - pixel_y = 3 - }, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/turf/simulated/floor/carpet/rubber, +/area/rnd/strongroom) "iid" = ( /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet/rubber, @@ -13423,8 +13299,6 @@ pixel_y = -32 }, /obj/structure/cable/green{ - d1 = 1; - d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/tiled, @@ -13790,6 +13664,12 @@ c_tag = "Dinner - Bartender Area"; dir = 4 }, +/obj/machinery/button/remote/blast_door{ + id = "bar_desk"; + name = "Bar Pickup Desk Shutters"; + pixel_x = -30; + req_access = list(25) + }, /turf/simulated/floor/lino/grey, /area/crew_quarters/bar) "iLR" = ( @@ -13930,9 +13810,8 @@ /turf/simulated/floor/tiled, /area/security/prison) "iRb" = ( -/obj/machinery/mecha_part_fabricator, -/turf/simulated/floor/carpet/rubber, -/area/assembly/robotics/workshop) +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "iRj" = ( /obj/structure/closet/chefcloset{ desc = "It's a storage unit for foodservice equipment." @@ -14760,17 +14639,15 @@ req_access = list(3) }, /obj/machinery/door/firedoor, -/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/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/security/armory) "jpO" = ( @@ -14951,14 +14828,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, -/area/assembly/robotics) +/area/teleporter) "jvV" = ( /turf/simulated/wall, /area/engineering/storage_eva) @@ -14999,20 +14872,9 @@ /turf/simulated/floor/tiled/white, /area/medical/pharmacy) "jwc" = ( -/obj/structure/closet/secure_closet/scientist, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/gloves/latex/nitrile/tajara, -/obj/item/clothing/gloves/latex/nitrile/tajara, -/obj/item/clothing/gloves/latex/nitrile/unathi, -/obj/item/clothing/gloves/latex/nitrile/unathi, -/obj/item/nitrilebox, -/obj/machinery/camera/network/research{ - c_tag = "Research - Research Storage"; - dir = 4 - }, -/turf/simulated/floor/carpet/rubber, -/area/rnd/strongroom) +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "jwY" = ( /obj/effect/floor_decal/corner/mauve/full{ dir = 1 @@ -15024,13 +14886,12 @@ /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "jxs" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "robotics"; - layer = 2.9 +/obj/machinery/light/small/emergency{ + dir = 4 }, -/turf/simulated/floor/carpet/rubber, -/area/assembly/robotics/workshop) +/obj/machinery/space_heater, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "jxz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -15153,16 +15014,14 @@ /turf/simulated/floor/tiled/white, /area/medical/main_storage) "jCk" = ( -/obj/machinery/door/window/southright, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/corner/white{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/white{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/tiled/white, -/area/assembly/robotics) +/turf/simulated/floor/tiled, +/area/teleporter) "jCt" = ( /obj/machinery/light/small, /turf/simulated/floor/lino/grey, @@ -16070,14 +15929,13 @@ /obj/structure/cable/green{ icon_state = "12-0" }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, /obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ id = "HoS Windows" }, /obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hos) "kgp" = ( @@ -16811,11 +16669,30 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "kJQ" = ( -/obj/structure/bed/stool/chair/office/dark{ - dir = 8 +/obj/machinery/door/airlock/research{ + name = "Research storage"; + req_access = list(7) + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/regular{ + closed_layer = 3.5; + density = 0; + icon_state = "pdoor0"; + id = "RDStorage"; + name = "Storage lockdown"; + opacity = 0 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/carpet/rubber, -/area/assembly/robotics/workshop) +/area/rnd/strongroom) "kKk" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -17224,10 +17101,10 @@ }, /area/maintenance/wing/port/far) "kZv" = ( -/obj/structure/table/steel, -/obj/item/reagent_containers/glass/beaker/sulphuric, -/turf/simulated/floor/carpet/rubber, -/area/assembly/robotics/workshop) +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/light/small/emergency, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "kZD" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/bed/stool/chair/office/light{ @@ -17758,11 +17635,6 @@ /area/rnd/xenobiology/xenoflora_hazard) "lrW" = ( /obj/effect/floor_decal/industrial/warning, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -17770,6 +17642,9 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/security/armory) "lss" = ( @@ -17824,13 +17699,6 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_room/tesla) -"lup" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, -/area/assembly/robotics) "luT" = ( /obj/structure/railing/mapped{ dir = 4 @@ -17918,6 +17786,9 @@ dir = 4 }, /obj/effect/floor_decal/spline/plain/corner, +/obj/structure/extinguisher_cabinet{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/white, /area/rnd/conference) "lAi" = ( @@ -18789,15 +18660,6 @@ }, /turf/simulated/floor/plating, /area/storage/tech) -"lXC" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/assembly/robotics) "lXO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -18971,11 +18833,10 @@ name = "Security Blast Door"; opacity = 0 }, +/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /obj/structure/cable/green{ - d2 = 2; icon_state = "0-2" }, -/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /turf/simulated/floor/tiled, /area/security/lobby) "mdn" = ( @@ -19227,10 +19088,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) -"miZ" = ( -/obj/machinery/door/window/southleft, -/turf/simulated/floor/tiled, -/area/assembly/robotics) "mjb" = ( /obj/structure/cable{ icon_state = "1-2" @@ -19360,17 +19217,15 @@ /turf/simulated/floor/tiled, /area/engineering/storage_hard) "mpV" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/storage/tech) "mpX" = ( @@ -20174,9 +20029,7 @@ }, /obj/machinery/door/firedoor, /obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" + icon_state = "4-8" }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hos) @@ -20261,6 +20114,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/assembly/chargebay) "mRr" = ( @@ -20301,20 +20157,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/conference) -"mSR" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - name = "Robotics Lab"; - req_access = list(29) - }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/assembly/robotics) "mTY" = ( /obj/machinery/computer/robotics{ dir = 4 @@ -20584,14 +20426,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/effect/floor_decal/corner_wide/green{ dir = 9 }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) "nbJ" = ( @@ -20631,6 +20471,12 @@ dir = 6 }, /obj/machinery/hologram/holopad, +/obj/machinery/requests_console{ + department = "Research and Development"; + departmentType = 2; + name = "Research Meeting Room"; + pixel_x = 30 + }, /turf/simulated/floor/tiled/dark, /area/rnd/conference) "ncN" = ( @@ -20655,16 +20501,15 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "ndO" = ( -/obj/structure/closet/secure_closet/scientist, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/gloves/latex/nitrile/tajara, -/obj/item/clothing/gloves/latex/nitrile/tajara, -/obj/item/clothing/gloves/latex/nitrile/unathi, -/obj/item/clothing/gloves/latex/nitrile/unathi, -/obj/item/nitrilebox, -/turf/simulated/floor/carpet/rubber, -/area/rnd/strongroom) +/obj/structure/table/rack, +/obj/item/tank/oxygen, +/obj/item/clothing/mask/gas, +/obj/machinery/camera/network/command{ + c_tag = "Third Deck - Teleporter"; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/teleporter) "nen" = ( /obj/machinery/button/remote/blast_door{ desc = "It controls the Mech Bay's shutters."; @@ -20702,7 +20547,7 @@ /obj/effect/floor_decal/industrial/warning, /obj/machinery/door/window/northright, /turf/simulated/floor/tiled/dark, -/area/assembly/robotics/workshop) +/area/assembly/chargebay) "nfz" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21195,8 +21040,6 @@ pixel_y = -27 }, /obj/structure/cable/green{ - d1 = 1; - d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/tiled, @@ -21427,8 +21270,6 @@ dir = 1 }, /obj/structure/cable/green{ - d1 = 1; - d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/tiled, @@ -21581,8 +21422,6 @@ /area/security/armory) "nDx" = ( /obj/structure/cable/green{ - d1 = 1; - d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/tiled/dark, @@ -21836,13 +21675,14 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "nOJ" = ( -/obj/structure/table/steel, -/obj/item/stack/material/glass/full, -/obj/structure/reagent_dispensers/acid{ - pixel_x = -32 +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/carpet/rubber, -/area/assembly/robotics/workshop) +/area/rnd/strongroom) "nOS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -22036,16 +21876,14 @@ /obj/effect/floor_decal/corner_wide/paleblue{ dir = 1 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/junction{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/white, /area/hallway/medical) "nXQ" = ( @@ -22384,13 +22222,11 @@ /obj/machinery/light_switch{ pixel_x = 23 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/security/armory) "ojd" = ( @@ -22672,6 +22508,9 @@ /obj/effect/landmark/start{ name = "Research Director" }, +/obj/machinery/newscaster{ + pixel_x = 30 + }, /turf/simulated/floor/tiled/dark, /area/rnd/conference) "ouo" = ( @@ -23137,17 +22976,15 @@ /turf/simulated/floor/tiled/dark, /area/hallway/engineering/tesla) "oGI" = ( -/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/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/storage/tech) "oGR" = ( @@ -23513,8 +23350,6 @@ /area/engineering/storage_hard) "oSM" = ( /obj/structure/cable/green{ - d1 = 1; - d2 = 8; icon_state = "1-8" }, /turf/simulated/floor/carpet/rubber, @@ -23592,9 +23427,6 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) -"oVB" = ( -/turf/simulated/floor/tiled, -/area/assembly/robotics) "oWm" = ( /obj/effect/floor_decal/spline/fancy{ dir = 8 @@ -24183,29 +24015,6 @@ /obj/effect/map_effect/wingrille_spawn/reinforced, /turf/simulated/floor/plating, /area/rnd/xenobiology) -"pnD" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/corner/white{ - dir = 4 - }, -/obj/effect/floor_decal/corner/white{ - dir = 8 - }, -/obj/machinery/ringer_button{ - id = "robo_ringer"; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/door/window/northleft, -/obj/machinery/door/window{ - base_state = "right"; - icon_state = "right"; - name = "Robotics Desk"; - req_access = list(29) - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/assembly/robotics) "pnF" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -24411,12 +24220,6 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"pwK" = ( -/obj/effect/landmark{ - name = "cavernspawn" - }, -/turf/template_noop, -/area/template_noop) "pwO" = ( /obj/machinery/shieldwallgen, /obj/effect/floor_decal/industrial/outline/yellow, @@ -24495,15 +24298,12 @@ /turf/simulated/floor/tiled, /area/engineering/engine_airlock) "pyV" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/corner/white{ +/obj/machinery/shieldwallgen, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/floor_decal/corner/white{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/assembly/robotics) +/turf/simulated/floor/tiled, +/area/teleporter) "pzc" = ( /obj/effect/floor_decal/corner_wide/yellow{ dir = 5 @@ -24794,6 +24594,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/assembly/chargebay) "pIE" = ( @@ -25470,19 +25273,14 @@ /turf/simulated/floor/plating, /area/engineering/engine_monitoring/tesla) "qdw" = ( -/obj/structure/window/reinforced{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/window/southleft, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/corner/white{ - dir = 4 - }, -/obj/effect/floor_decal/corner/white{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/assembly/robotics) +/turf/simulated/floor/tiled, +/area/teleporter) "qdY" = ( /obj/structure/railing/mapped{ dir = 4 @@ -25953,6 +25751,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/assembly/chargebay) "quV" = ( @@ -26270,9 +26071,26 @@ /turf/simulated/floor/plating, /area/engineering/lobby) "qFg" = ( -/obj/machinery/light, -/turf/simulated/floor/carpet/rubber, -/area/assembly/robotics/workshop) +/obj/effect/floor_decal/corner/mauve/diagonal, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/grey{ + dir = 8 + }, +/obj/effect/floor_decal/corner/white{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = -20 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/conference) "qFs" = ( /obj/structure/cable{ icon_state = "4-8" @@ -26453,7 +26271,7 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "qMd" = ( -/turf/simulated/wall, +/turf/simulated/wall/r_wall, /area/assembly/robotics/workshop) "qMJ" = ( /obj/structure/shuttle_part/scc_space_ship{ @@ -26615,12 +26433,22 @@ /turf/simulated/floor/tiled, /area/quartermaster/lobby) "qRY" = ( -/obj/machinery/door/window{ - dir = 8; - req_access = list(7) +/obj/effect/floor_decal/corner/mauve/diagonal, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/carpet/rubber, -/area/rnd/strongroom) +/obj/effect/floor_decal/corner/grey{ + dir = 8 + }, +/obj/effect/floor_decal/corner/white{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/white, +/area/rnd/conference) "qSa" = ( /obj/machinery/disposal/small/north, /obj/structure/disposalpipe/trunk{ @@ -26819,13 +26647,14 @@ /turf/simulated/floor/plating, /area/engineering/engine_monitoring/tesla) "qXH" = ( +/obj/machinery/firealarm/east, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, -/area/assembly/robotics) +/area/teleporter) "qXJ" = ( /obj/structure/window/reinforced{ dir = 8 @@ -26887,7 +26716,7 @@ /area/hydroponics) "qZi" = ( /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "2-8" }, /turf/simulated/floor/tiled, /area/assembly/chargebay) @@ -26931,14 +26760,10 @@ /turf/simulated/floor/tiled, /area/security/brig) "raA" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/obj/machinery/teleport/pad, +/obj/machinery/light, +/turf/simulated/floor/plating, +/area/teleporter) "rbe" = ( /obj/structure/railing/mapped{ dir = 4 @@ -26972,12 +26797,9 @@ /turf/simulated/floor/plating, /area/crew_quarters/heads/hor) "rbL" = ( -/obj/structure/table/reinforced{ - table_mat = "steel"; - table_reinf = "mhydrogen" - }, -/turf/simulated/floor/carpet/rubber, -/area/rnd/strongroom) +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "rbO" = ( /obj/item/aicard, /obj/item/aiModule/reset, @@ -27127,26 +26949,10 @@ /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload_foyer) "rfO" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/stack/material/steel{ - amount = 50 - }, -/obj/item/stack/material/glass{ - amount = 50 - }, -/obj/machinery/power/apc/low{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/turf/simulated/floor/carpet/rubber, -/area/rnd/strongroom) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "rfQ" = ( /obj/machinery/door/airlock/glass, /obj/machinery/door/firedoor, @@ -27201,8 +27007,9 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "rgR" = ( -/turf/simulated/wall/r_wall, -/area/maintenance/substation/research) +/obj/structure/closet/radiation, +/turf/simulated/floor/carpet/rubber, +/area/rnd/strongroom) "rhz" = ( /obj/effect/floor_decal/corner/blue{ dir = 5 @@ -27272,21 +27079,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark, /area/medical/pharmacy) -"rjc" = ( -/obj/structure/table/steel, -/obj/item/device/flashlight/lamp{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/corner/white{ - dir = 4 - }, -/obj/effect/floor_decal/corner/white{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/assembly/robotics) "rjK" = ( /obj/effect/floor_decal/spline/fancy/wood/corner, /turf/simulated/floor/wood, @@ -27456,11 +27248,12 @@ /turf/simulated/floor/tiled, /area/storage/primary) "rom" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/closet/secure_closet/sciguncabinet, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/turf/simulated/floor/carpet/rubber, +/area/rnd/strongroom) "rou" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 10 @@ -28473,9 +28266,6 @@ /obj/item/paper_bin, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) -"rRA" = ( -/turf/simulated/wall, -/area/assembly/robotics) "rSv" = ( /obj/structure/cable{ icon_state = "1-2" @@ -28615,9 +28405,11 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_two) "rUZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/rnd/conference) @@ -28747,13 +28539,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/quartermaster/lobby) -"rZp" = ( -/obj/structure/window/reinforced, -/obj/machinery/conveyor_switch/oneway{ - id = "robotics" - }, -/turf/simulated/floor/tiled, -/area/assembly/robotics) "rZU" = ( /obj/effect/floor_decal/corner/mauve/full, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -29079,12 +28864,13 @@ /turf/simulated/floor/plating, /area/storage/tech) "smn" = ( -/obj/structure/railing/mapped{ - dir = 8 +/obj/machinery/power/apc/low{ + name = "south bump"; + pixel_y = -24 }, -/obj/structure/railing/mapped, -/turf/simulated/floor/plating, -/area/maintenance/wing/port) +/obj/structure/cable/green, +/turf/simulated/floor/carpet/rubber, +/area/rnd/strongroom) "smr" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -29646,11 +29432,8 @@ /turf/simulated/floor/reinforced, /area/turret_protected/ai_upload_foyer) "sHY" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/reinforced, -/area/assembly/robotics) +/turf/simulated/floor/carpet/rubber, +/area/rnd/strongroom) "sIe" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light/small/emergency, @@ -30485,10 +30268,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cafeteria) -"thJ" = ( -/obj/machinery/door/window/southright, -/turf/simulated/floor/tiled, -/area/assembly/robotics) "thL" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/portable_atmospherics/canister/nitrogen, @@ -30569,12 +30348,13 @@ /turf/simulated/floor/lino/grey, /area/crew_quarters/cafeteria) "tjP" = ( -/obj/machinery/optable, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/structure/closet/crate, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -28 }, -/turf/simulated/floor/reinforced, -/area/assembly/robotics) +/turf/simulated/floor/carpet/rubber, +/area/rnd/strongroom) "tjS" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/stone/marble, @@ -30859,17 +30639,17 @@ /turf/simulated/floor/grass/alt, /area/rnd/xenobiology/xenoflora) "tvX" = ( -/obj/structure/table/steel, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer{ - pixel_y = 8 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/camera/network/research{ - c_tag = "Research - Robotics Lab"; - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/carpet/rubber, +/area/rnd/strongroom) "twC" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -31458,13 +31238,12 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/hor) "tNT" = ( -/obj/structure/window/reinforced, -/obj/machinery/light{ - dir = 8 +/obj/machinery/door/airlock/maintenance{ + req_access = list(17) }, -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/teleporter) "tNU" = ( /obj/structure/railing/mapped{ dir = 1 @@ -31624,21 +31403,13 @@ }, /area/medical/surgery) "tTb" = ( -/obj/structure/table/steel, -/obj/structure/window/reinforced{ - dir = 4 +/obj/item/hand_tele, +/obj/structure/table/standard, +/obj/machinery/alarm{ + pixel_y = 28 }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/corner/white{ - dir = 4 - }, -/obj/effect/floor_decal/corner/white{ - dir = 8 - }, -/obj/item/paper_bin, -/obj/item/pen, -/turf/simulated/floor/tiled/white, -/area/assembly/robotics) +/turf/simulated/floor/tiled, +/area/teleporter) "tTM" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ @@ -31781,18 +31552,15 @@ /turf/simulated/wall, /area/security/security_office) "tYa" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/corner/white{ +/obj/machinery/shieldwallgen, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/floor_decal/corner/white{ - dir = 8 - }, -/obj/structure/bed/stool/chair/office/dark{ +/obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/assembly/robotics) +/turf/simulated/floor/tiled, +/area/teleporter) "tYj" = ( /turf/simulated/wall/r_wall, /area/engineering/engine_monitoring) @@ -32328,7 +32096,6 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/light, /obj/effect/floor_decal/corner/grey{ dir = 8 }, @@ -32474,19 +32241,18 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "urh" = ( -/obj/structure/table/steel, -/obj/machinery/ringer{ - department = "Robotics"; - id = "robo_ringer"; - pixel_x = 28; - req_access = list(29) +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 }, -/obj/item/surgery/scalpel, -/obj/item/surgery/hemostat, -/obj/item/surgery/retractor, -/obj/item/surgery/circular_saw, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/obj/item/stack/material/steel{ + amount = 50 + }, +/obj/item/stack/material/glass{ + amount = 50 + }, +/turf/simulated/floor/carpet/rubber, +/area/rnd/strongroom) "urs" = ( /obj/machinery/power/emitter, /obj/effect/floor_decal/industrial/outline/yellow, @@ -32768,20 +32534,10 @@ /turf/simulated/floor/reinforced, /area/storage/tech) "uzL" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/obj/structure/table/standard, +/obj/item/modular_computer/laptop/preset/command/teleporter, +/turf/simulated/floor/plating, +/area/teleporter) "uzU" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -32846,6 +32602,16 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/machinery/button/remote/blast_door{ + id = "RDStorage"; + name = "Storage lockdown"; + pixel_x = -27; + pixel_y = -5; + req_access = list(30) + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/rnd/conference) "uDs" = ( @@ -32972,20 +32738,16 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "uGP" = ( -/obj/structure/table/steel, -/obj/item/storage/toolbox/mechanical, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/obj/structure/closet/hydrant{ + pixel_x = -32 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "uGW" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/effect/floor_decal/corner/grey{ dir = 8 }, @@ -32995,6 +32757,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, +/obj/machinery/firealarm/south, /turf/simulated/floor/tiled/white, /area/rnd/conference) "uHh" = ( @@ -33338,15 +33101,13 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "uRu" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/dark, /area/security/armory) "uRz" = ( @@ -33421,14 +33182,8 @@ /turf/simulated/floor/tiled/dark, /area/security/prison) "uTr" = ( -/obj/machinery/power/apc{ - is_critical = 1; - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/cable/green, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/turf/simulated/wall/r_wall, +/area/teleporter) "uTw" = ( /turf/simulated/wall, /area/turret_protected/ai_upload) @@ -33681,14 +33436,13 @@ /obj/structure/cable/green{ icon_state = "12-0" }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, /obj/machinery/door/firedoor, /obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ id = "HoS Windows" }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hos) "vdQ" = ( @@ -33920,8 +33674,6 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ - d1 = 1; - d2 = 4; icon_state = "1-4" }, /turf/simulated/floor/tiled, @@ -34290,11 +34042,8 @@ /turf/simulated/floor/plating, /area/hallway/engineering/tesla) "vyd" = ( -/obj/machinery/door/airlock/maintenance{ - req_access = list(29) - }, -/turf/simulated/floor/plating, -/area/assembly/robotics) +/turf/simulated/wall/r_wall, +/area/assembly/chargebay) "vye" = ( /obj/structure/table/standard, /obj/effect/floor_decal/spline/plain{ @@ -34489,14 +34238,10 @@ /turf/simulated/floor/tiled/white, /area/quartermaster/break_room) "vEg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/carpet/rubber, -/area/rnd/strongroom) +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "vEh" = ( /obj/machinery/power/terminal{ dir = 1 @@ -34646,6 +34391,9 @@ /obj/effect/floor_decal/corner/mauve{ dir = 10 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "vJw" = ( @@ -34711,9 +34459,16 @@ /turf/simulated/floor/plating, /area/hallway/medical) "vLu" = ( -/obj/machinery/vending/robotics, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/obj/structure/closet/secure_closet/scientist, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/gloves/latex/nitrile/tajara, +/obj/item/clothing/gloves/latex/nitrile/tajara, +/obj/item/clothing/gloves/latex/nitrile/unathi, +/obj/item/clothing/gloves/latex/nitrile/unathi, +/obj/item/nitrilebox, +/turf/simulated/floor/carpet/rubber, +/area/rnd/strongroom) "vMD" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -34767,6 +34522,9 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"vNG" = ( +/turf/simulated/wall/r_wall, +/area/security/brig/processing_secondary) "vNK" = ( /obj/structure/railing/mapped, /obj/structure/railing/mapped{ @@ -34874,11 +34632,13 @@ /turf/simulated/floor/tiled, /area/engineering/engine_airlock) "vPg" = ( -/obj/structure/table/steel, -/obj/item/nitrilebox, -/obj/item/storage/box/masks, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/obj/machinery/door/airlock/maintenance{ + name = "Firefighting equipment"; + req_access = list(12) + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "vPj" = ( /turf/simulated/wall/r_wall, /area/security/armory) @@ -34987,8 +34747,7 @@ /turf/simulated/floor/tiled/white, /area/medical/or1) "vRt" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/closet, /turf/simulated/floor/plating, /area/maintenance/wing/port) "vRT" = ( @@ -35137,6 +34896,10 @@ /obj/effect/floor_decal/spline/plain/corner{ dir = 4 }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -28 + }, /turf/simulated/floor/tiled/white, /area/rnd/conference) "vWt" = ( @@ -35203,12 +34966,10 @@ icon_state = "pipe-c" }, /obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" + icon_state = "1-2" }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-4" }, /turf/simulated/floor/tiled, /area/security/brig) @@ -35530,8 +35291,6 @@ dir = 5 }, /obj/structure/cable/green{ - d1 = 1; - d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/tiled, @@ -36813,6 +36572,9 @@ /obj/effect/floor_decal/corner/mauve{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/rnd/hallway) "wNk" = ( @@ -36848,12 +36610,9 @@ /turf/simulated/floor/tiled/dark, /area/hydroponics) "wOV" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, -/area/assembly/robotics) +/area/teleporter) "wPj" = ( /obj/structure/railing/mapped{ dir = 4 @@ -37525,13 +37284,11 @@ pixel_x = 32; pixel_y = -10 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/security/armory) "xkH" = ( @@ -37578,14 +37335,10 @@ /turf/simulated/floor/tiled, /area/assembly/chargebay) "xmF" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/obj/machinery/teleport/station, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/plating, +/area/teleporter) "xnf" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -37762,13 +37515,9 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "xsU" = ( -/obj/structure/table/steel, -/obj/item/device/mmi, -/obj/item/device/mmi, -/obj/item/device/mmi, -/obj/item/device/mmi, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/obj/structure/closet/crate, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "xsX" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 @@ -37923,9 +37672,13 @@ /turf/simulated/wall, /area/rnd/hallway) "xzd" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced, -/area/assembly/robotics) +/obj/structure/closet/secure_closet/sciguncabinet, +/obj/machinery/camera/network/research{ + c_tag = "Research - Research Storage"; + dir = 4 + }, +/turf/simulated/floor/carpet/rubber, +/area/rnd/strongroom) "xzx" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -38093,17 +37846,15 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/hor) "xFZ" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/dark, /area/security/armory) "xGl" = ( @@ -38113,9 +37864,9 @@ }, /area/maintenance/wing/starboard/far) "xGz" = ( -/obj/structure/bed/stool/chair/office/dark, -/turf/simulated/floor/tiled, -/area/assembly/robotics) +/obj/machinery/light, +/turf/simulated/floor/carpet/rubber, +/area/rnd/strongroom) "xGM" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/structure/curtain/medical, @@ -38383,11 +38134,9 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "xNJ" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, +/obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled, -/area/assembly/robotics) +/area/teleporter) "xNO" = ( /obj/effect/map_effect/wingrille_spawn/reinforced, /turf/simulated/floor/plating, @@ -38444,32 +38193,9 @@ /turf/simulated/floor/lino/grey, /area/crew_quarters/bar) "xQg" = ( -/obj/structure/table/steel, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)" - }, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)" - }, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, -/obj/item/reagent_containers/glass/bucket{ - pixel_y = -14 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/corner/white{ - dir = 4 - }, -/obj/effect/floor_decal/corner/white{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/assembly/robotics) +/obj/machinery/shieldwallgen, +/turf/simulated/floor/tiled, +/area/teleporter) "xQj" = ( /turf/simulated/open, /area/hallway/primary/central_two) @@ -38554,9 +38280,11 @@ /turf/simulated/floor/tiled, /area/security/armory) "xSO" = ( -/obj/machinery/computer/rdconsole/robotics, -/turf/simulated/floor/carpet/rubber, -/area/assembly/robotics/workshop) +/obj/machinery/door/airlock/maintenance_hatch{ + req_one_access = list(12,47) + }, +/turf/simulated/floor/plating, +/area/assembly/chargebay) "xSU" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -38613,12 +38341,21 @@ pixel_y = -32 }, /obj/structure/cable/green{ - d1 = 1; - d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/security/brig) +"xVz" = ( +/obj/effect/map_effect/wingrille_spawn/reinforced, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/security/prison) "xVB" = ( /obj/structure/railing/mapped{ dir = 4 @@ -39231,6 +38968,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/assembly/chargebay) "ykA" = ( @@ -39238,23 +38978,16 @@ /turf/simulated/floor/tiled/dark, /area/turbolift/scc_ship/morgue_lift) "ylk" = ( -/obj/structure/table/steel, -/obj/item/device/assembly/prox_sensor{ - pixel_x = -7 +/obj/machinery/power/apc/low{ + dir = 8; + name = "west bump"; + pixel_x = -24 }, -/obj/item/device/assembly/prox_sensor{ - pixel_x = 3 +/obj/structure/cable/green{ + icon_state = "0-4" }, -/obj/structure/window/reinforced, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/floor_decal/corner/white{ - dir = 4 - }, -/obj/effect/floor_decal/corner/white{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/assembly/robotics) +/turf/simulated/floor/tiled, +/area/teleporter) "ylu" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/meter, @@ -41797,7 +41530,6 @@ qgN qgN qgN qgN -pwK qgN qgN qgN @@ -41820,7 +41552,8 @@ qgN qgN qgN qgN -pwK +qgN +qgN qgN qgN qgN @@ -42035,7 +41768,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -42212,7 +41945,6 @@ qgN qgN qgN qgN -hVj qgN qgN qgN @@ -42224,7 +41956,8 @@ qgN qgN qgN qgN -hVj +qgN +qgN qgN qgN qgN @@ -43009,7 +42742,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -43256,7 +42989,7 @@ qgN qgN qgN qgN -pwK +qgN qgN qgN qgN @@ -44613,7 +44346,7 @@ qgN qgN qgN qgN -pwK +qgN qgN qgN qgN @@ -44816,7 +44549,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -45473,7 +45206,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -46884,7 +46617,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -47220,7 +46953,7 @@ qgN qgN qgN qgN -qgN +hVj qgN qgN qgN @@ -47705,7 +47438,7 @@ qgN qgN qgN qgN -pwK +qgN qgN qgN qgN @@ -48245,9 +47978,9 @@ qgN qgN qgN qgN -pwK qgN -hVj +qgN +qgN qgN qgN qgN @@ -48302,7 +48035,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -48518,7 +48251,7 @@ qgN qgN qgN qgN -qgN +hVj qgN qgN qgN @@ -49724,7 +49457,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -50658,7 +50391,7 @@ qgN qgN qgN qgN -pwK +qgN qgN qgN qgN @@ -50868,7 +50601,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -51252,7 +50985,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -53969,7 +53702,7 @@ qgN qgN qgN qgN -pwK +qgN qgN qgN qgN @@ -54078,7 +53811,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -56808,7 +56541,7 @@ qgN qgN qgN qgN -pwK +qgN qgN qgN qgN @@ -57107,7 +56840,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -57926,7 +57659,7 @@ qgN qgN qgN dpj -dpj +lJE lJE oSQ rMw @@ -58127,7 +57860,7 @@ qgN qgN qgN qgN -qgN +dpj dpj lJE rMw @@ -58832,7 +58565,7 @@ qgN qgN qgN qgN -qgN +hVj qgN qgN qgN @@ -59945,7 +59678,7 @@ qgN qgN qgN qgN -pwK +qgN qgN qgN qgN @@ -60939,7 +60672,7 @@ qgN qgN qgN qgN -qgN +hVj qgN qgN qgN @@ -62965,7 +62698,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -63427,9 +63160,9 @@ quT mQW nGI mzL -qMd -qMd -qMd +qav +qav +qav tXR msO ukV @@ -63674,7 +63407,7 @@ qgN qgN qgN qgN -pwK +qgN qgN qgN qgN @@ -63849,7 +63582,7 @@ kkW aaa gDR jAp -gDR +xVz nFf gDR lKN @@ -64025,18 +63758,18 @@ eUj cNU dDS rnA -rRA -ctM -ctM -rRA -oVB -mSR -rRA +uTr +uTr +uTr +uTr +uTr +uTr +uTr qMd -qMd -qMd -qMd -czU +vyd +vyd +xSO +ibU dLe dQR bkn @@ -64065,7 +63798,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -64227,18 +63960,18 @@ oAR cNU ekI fVA -ctM -rjc +uTr +xQg xQg ylk xNJ fEO tNT -qMd -xSO -nOJ +kaT +kaT +kaT kZv -czU +ibU hrC erH oZB @@ -64429,18 +64162,18 @@ bmq bmq wMv rnA -pnD +uTr tYa pyV jCk -xNJ -fEO -miZ +gec +ndO +uTr aBa aAp -kJQ -aAp -czU +jOv +kaT +ibU ljm aVf jno @@ -64631,18 +64364,18 @@ jko jIL umH rnA -rRA +uTr tTb heH qdw wOV xmF -thJ -aBa -aAp -aAp -qFg -sEk +uTr +wsW +wsW +wsW +kaT +vNG sEk sEk sEk @@ -64833,18 +64566,18 @@ cer xxy qhA hYo -rRA +uTr goc baq dGp -lup +wOV raA -rZp -qMd +uTr +uGP iRb -iRb -gec -sEk +vPg +kaT +vNG lLj unV aHj @@ -64879,7 +64612,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -65038,15 +64771,15 @@ vMD fkF jvL qXH -qXH -qXH +dnJ +goQ uzL -bvi +uTr guh jxs -jxs -jxs -sEk +wsW +kaT +vNG kep cQu qjh @@ -65237,18 +64970,18 @@ hfv pZQ wEq uKJ -rRA -ghL -oVB -ffh -gIs -lXC uTr -qMd -qMd -qMd -qMd -sEk +uTr +uTr +uTr +uTr +uTr +uTr +kGX +wsW +wsW +kaT +vNG xMV fpj tdv @@ -65439,15 +65172,15 @@ wbV tcX uSS rnA -ctM +kGX iic -oVB +gBT tjP xzd rom -oVB -oVB -vyd +rgR +kGX +pXp kaT wAm sEk @@ -65478,7 +65211,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -65641,17 +65374,17 @@ rbK iRq wpb rnA -ctM +kGX alr -oVB +cAx sHY cdv -oVB -oVB -xsU -rRA +nOJ smn +kGX +pXp kaT +kZv uNK elh qPI @@ -65843,17 +65576,17 @@ cer gFa cda xEp -ctM -bMJ -oVB -oVB -oVB -oVB +kGX +iic +dkr +fEY +hiq +sHY xGz -vPg -ctM +kGX erY kaT +kaT uNK elh qPI @@ -66045,16 +65778,16 @@ cer hIj xSA kZL -rRA -cCC +kGX +iic gBT urh tvX vLu -htx -uGP -rRA -vRt +vLu +kGX +vEg +kaT kaT uNK uNK @@ -66247,16 +65980,16 @@ cer qUz oOi xzx -rRA -rRA -rRA -rRA -rRA -rRA kGX kGX kGX kGX +kJQ +kGX +kGX +kGX +wsW +wsW dTj wsW mst @@ -66455,10 +66188,10 @@ lhU uDd fqa uon -kGX -ndO -cAx -kGX +cjX +pXp +kaT +kaT kaT kaT nvF @@ -66658,10 +66391,10 @@ dgZ rUZ uGW cjX -goQ -dnJ -kGX -kGX +pXp +kaT +vRt +wsW kaT kaT uXV @@ -66859,11 +66592,11 @@ qFD pJy nac eZp -kGX -dkr -vEg +cjX +erY +kaT jwc -kGX +wsW mEc dSI nTF @@ -67009,7 +66742,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -67060,12 +66793,12 @@ kpi xun ygL nac -eZp -kGX +qFg +cjX rfO -fEY +kaT eUp -kGX +wsW hSG dSI nTF @@ -67262,12 +66995,12 @@ kpi rlX rVL nac -eZp -kGX -gKG qRY +cjX gKG -kGX +kaT +xsU +wsW kaT oVe uXV @@ -67302,7 +67035,7 @@ qgN qgN qgN qgN -pwK +qgN qgN qgN qgN @@ -67465,11 +67198,11 @@ huw qIr huw eZp -kGX +cjX rbL -hiq -rbL -kGX +kaT +xsU +wsW xed xuX oqW @@ -67667,11 +67400,11 @@ jjl jjl wlF vVL -kGX -kGX -kGX -rgR -rgR +cjX +bzh +kaT +sYc +sYc sYc sYc qsg @@ -67872,7 +67605,7 @@ dxH wsW aTd kaT -rgR +sYc uoz lRx ahu @@ -67913,7 +67646,7 @@ qgN qgN qgN qgN -qgN +hVj qgN qgN qgN @@ -68040,7 +67773,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -68074,7 +67807,7 @@ dxH wsW aTd kaT -rgR +sYc fLU crw sYc @@ -68275,8 +68008,8 @@ dOi kur wsW kaT -kaT -rgR +kZv +sYc pIi mGZ sYc @@ -68434,7 +68167,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -68706,7 +68439,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -69450,7 +69183,7 @@ qgN qgN qgN qgN -pwK +qgN qgN qgN qgN @@ -69913,14 +69646,14 @@ kmx qgN qgN qgN -hVj qgN qgN qgN qgN qgN qgN -pwK +qgN +qgN qgN qgN qgN @@ -71681,7 +71414,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -71878,7 +71611,7 @@ qgN qgN qgN qgN -pwK +qgN qgN qgN qgN @@ -72276,7 +72009,7 @@ qgN qgN qgN qgN -qgN +hVj qgN qgN qgN @@ -72336,7 +72069,7 @@ qgN qgN qgN qgN -pwK +qgN qgN qgN qgN @@ -73905,7 +73638,7 @@ qgN qgN qgN qgN -pwK +qgN qgN qgN qgN @@ -74158,7 +73891,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -76376,7 +76109,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -76563,7 +76296,7 @@ qgN qgN qgN qgN -hVj +qgN qgN qgN qgN @@ -78176,7 +77909,7 @@ qgN qgN qgN qgN -qgN +hVj qgN qgN qgN diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm index 4b9af88527a..46323e415a5 100644 --- a/maps/sccv_horizon/placeholder-3_deck_3.dmm +++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm @@ -13,10 +13,17 @@ /area/storage/shields) "ae" = ( /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "4-8" }, -/turf/simulated/floor, -/area/hallway/crew_area) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/firealarm/south, +/turf/simulated/floor/tiled/white, +/area/hallway/medical/upper) "af" = ( /obj/structure/cable{ icon_state = "4-8" @@ -39,6 +46,7 @@ /obj/machinery/door/airlock/maintenance{ req_one_access = list(12) }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/maintenance/engineering_ladder) "ai" = ( @@ -210,6 +218,7 @@ "az" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/hologram/holopad, +/mob/living/simple_animal/cat/fluff/Runtime, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "aA" = ( @@ -420,7 +429,7 @@ "aW" = ( /obj/machinery/door/airlock/highsecurity{ name = "Shield Generator Room"; - req_one_access = list(11.24) + req_one_access = list(11,24) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -566,13 +575,6 @@ }, /turf/simulated/open, /area/turret_protected/ai) -"bm" = ( -/obj/structure/table/wood, -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/hallway/primary/starboard) "bn" = ( /obj/machinery/power/apc/low{ dir = 4; @@ -642,12 +644,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) -"bv" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/turf/simulated/open, -/area/hallway/primary/starboard) "bw" = ( /obj/structure/lattice, /turf/simulated/open/airless, @@ -831,14 +827,6 @@ /obj/structure/flora/pottedplant/random, /turf/simulated/floor/tiled/dark, /area/bridge) -"bP" = ( -/obj/structure/lattice, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped, -/turf/simulated/open, -/area/hallway/primary/starboard) "bQ" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -949,13 +937,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) -"cc" = ( -/obj/structure/lattice, -/obj/machinery/light/spot/weak{ - dir = 8 - }, -/turf/simulated/open, -/area/hallway/primary/starboard) "ce" = ( /obj/machinery/bluespacerelay, /obj/effect/floor_decal/spline/plain{ @@ -1004,15 +985,18 @@ /turf/simulated/floor/carpet, /area/lawoffice/consular) "ck" = ( -/obj/item/hand_tele, -/obj/structure/table/standard, -/obj/item/device/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = -25 +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled, -/area/teleporter) +/area/hallway/primary/port) "cm" = ( /obj/structure/flora/pottedplant/random{ pixel_x = -5 @@ -1245,8 +1229,10 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "cJ" = ( -/obj/structure/closet/emcloset, /obj/effect/floor_decal/corner/paleblue/full, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/crew_area) "cK" = ( @@ -1316,14 +1302,14 @@ /turf/simulated/open, /area/maintenance/wing/starboard) "cS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/corner/red{ dir = 5 }, -/obj/effect/floor_decal/corner/red/full{ - dir = 1 +/obj/effect/floor_decal/corner/red{ + dir = 5 }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) @@ -1370,10 +1356,10 @@ name = "Security - Investigations Office" }) "cZ" = ( -/obj/machinery/hologram/holopad, /obj/effect/floor_decal/corner/blue{ dir = 9 }, +/obj/machinery/hologram/holopad/long_range, /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "db" = ( @@ -1496,13 +1482,6 @@ }, /turf/simulated/floor/carpet, /area/lawoffice/consular) -"dq" = ( -/obj/structure/lattice, -/obj/structure/railing/mapped{ - dir = 8 - }, -/turf/simulated/open, -/area/hallway/primary/starboard) "dr" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -1710,8 +1689,8 @@ /turf/simulated/floor/tiled/white, /area/medical/equipment) "dG" = ( -/obj/machinery/vending/coffee, /obj/effect/floor_decal/corner/paleblue/full, +/obj/machinery/vending/cola, /turf/simulated/floor/tiled, /area/hallway/crew_area) "dH" = ( @@ -1821,24 +1800,23 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "dL" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/hallway/primary/starboard) -"dM" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped{ +/obj/machinery/light{ dir = 1 }, -/obj/structure/railing/mapped, -/turf/simulated/open, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/starboard) +"dM" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "dN" = ( /obj/machinery/light, @@ -1920,15 +1898,6 @@ }, /turf/simulated/floor/carpet/rubber, /area/lawoffice/representative) -"dZ" = ( -/obj/structure/flora/pottedplant/random{ - pixel_x = 7 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/hallway/primary/starboard) "ea" = ( /obj/structure/curtain/open/shower, /obj/random/soap, @@ -1941,11 +1910,15 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/hallway/crew_area) "ec" = ( -/obj/structure/reagent_dispensers/extinguisher, -/obj/structure/closet/hydrant{ - pixel_y = 30 +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 8 }, -/turf/simulated/floor, +/obj/machinery/vending/zora, +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 + }, +/turf/simulated/floor/tiled, /area/hallway/crew_area) "ed" = ( /obj/structure/curtain/open/shower, @@ -2154,8 +2127,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ - d1 = 1; - d2 = 4; icon_state = "1-4" }, /turf/simulated/floor, @@ -2361,20 +2332,11 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/firealarm/west, -/obj/machinery/camera/network/third_deck{ - c_tag = "Third Deck - Hallway 5"; - dir = 4 - }, /turf/simulated/floor/tiled, /area/hallway/primary/port) "fj" = ( @@ -2732,6 +2694,16 @@ "gi" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/tcommsat/chamber) +"gj" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/machinery/door/window{ + dir = 1 + }, +/turf/simulated/floor, +/area/hallway/crew_area) "gk" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2807,9 +2779,12 @@ /turf/simulated/floor, /area/maintenance/security_starboard) "gv" = ( -/obj/structure/closet/firecloset/full, -/turf/simulated/floor, -/area/hallway/crew_area) +/obj/machinery/door/airlock/medical{ + name = "Staff Facilities"; + req_access = list(66) + }, +/turf/simulated/floor/tiled, +/area/hallway/medical/upper) "gw" = ( /obj/structure/bed/stool/chair{ dir = 8 @@ -2887,6 +2862,18 @@ }, /turf/simulated/floor/tiled/ramp, /area/hallway/primary/starboard) +"gH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/crew_area) "gI" = ( /obj/structure/table/standard, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -2909,6 +2896,13 @@ }, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) +"gJ" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "gL" = ( /obj/item/paper_bin{ pixel_x = -3; @@ -2946,10 +2940,24 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "gP" = ( -/obj/machinery/space_heater, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/machinery/vending/coffee, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/hallway/crew_area) +"gQ" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 28; + req_one_access = list(24,11,55) + }, +/turf/simulated/floor/wood, +/area/security/vacantoffice2) "gR" = ( /obj/structure/bed/stool/chair/padded/black, /obj/effect/landmark/start{ @@ -3067,9 +3075,21 @@ /turf/simulated/floor/tiled/dark, /area/engineering/break_room) "hg" = ( -/obj/machinery/suit_storage_unit/standard_unit, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/camera/network/third_deck{ + c_tag = "Third Deck - Hallway 5"; + dir = 4 + }, /turf/simulated/floor/tiled, -/area/teleporter) +/area/hallway/primary/port) "hh" = ( /obj/machinery/telecomms/relay/preset/telecomms, /turf/simulated/floor/tiled{ @@ -3348,14 +3368,11 @@ /turf/simulated/floor, /area/maintenance/security_starboard) "hQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/red/full{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Holodeck" }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hallway/primary/starboard) "hR" = ( /obj/structure/window/shuttle/scc_space_ship, @@ -3570,10 +3587,13 @@ /turf/simulated/floor/tiled/white, /area/medical/ward/isolation) "im" = ( -/obj/structure/table/standard, -/obj/item/modular_computer/laptop/preset/command/teleporter, -/turf/simulated/floor/plating, -/area/teleporter) +/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) "in" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3583,12 +3603,13 @@ /turf/simulated/floor, /area/hallway/primary/starboard) "io" = ( -/obj/machinery/portable_atmospherics/canister/air/airlock, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/portables_connector{ - dir = 4 +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 }, -/turf/simulated/floor, +/obj/structure/extinguisher_cabinet{ + pixel_x = -25 + }, +/turf/simulated/floor/tiled, /area/hallway/crew_area) "ip" = ( /obj/structure/window/shuttle/scc_space_ship, @@ -3971,16 +3992,16 @@ /turf/simulated/floor/wood, /area/crew_quarters/fitness) "jo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "2-8" }, /obj/effect/floor_decal/corner/red{ dir = 5 }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "jp" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -4006,13 +4027,6 @@ "js" = ( /turf/simulated/open, /area/hallway/crew_area) -"ju" = ( -/obj/machinery/light/small/emergency{ - dir = 4 - }, -/obj/structure/table/rack, -/turf/simulated/floor, -/area/maintenance/security_starboard) "jv" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4150,6 +4164,15 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/medical/washroom) +"jH" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hallway/crew_area) "jI" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp/green, @@ -4288,7 +4311,7 @@ dir = 5 }, /obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "kd" = ( /obj/machinery/newscaster{ @@ -4363,12 +4386,6 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) -"kl" = ( -/obj/item/device/radio/beacon, -/obj/machinery/firealarm/west, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/teleporter) "km" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -4469,12 +4486,12 @@ }, /area/maintenance/engineering_ladder) "kz" = ( -/obj/machinery/door/airlock/glass{ - name = "Holodeck" +/obj/structure/lattice, +/obj/machinery/light{ + dir = 4 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, -/area/hallway/crew_area) +/turf/simulated/open, +/area/hallway/primary/starboard) "kB" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4741,6 +4758,13 @@ /obj/structure/banner/scc, /turf/simulated/floor/wood, /area/security/vacantoffice2) +"lj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 + }, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "lk" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -4813,10 +4837,11 @@ /turf/simulated/floor/wood, /area/journalistoffice) "lu" = ( -/obj/structure/railing/mapped{ - dir = 1 +/obj/machinery/door/airlock/glass{ + name = "Holodeck" }, -/turf/simulated/open, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "lv" = ( /obj/effect/floor_decal/corner_wide/green{ @@ -4914,12 +4939,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) -"lG" = ( -/obj/structure/bed/stool/chair{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/hallway/primary/starboard) "lI" = ( /obj/structure/table/rack, /obj/random/loot, @@ -5004,10 +5023,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/firealarm/south, -/obj/effect/floor_decal/corner_wide/green{ - dir = 10 - }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "lT" = ( @@ -5125,16 +5140,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) -"mh" = ( -/obj/structure/table/rack, -/obj/item/tank/oxygen, -/obj/item/clothing/mask/gas, -/obj/machinery/camera/network/command{ - c_tag = "Third Deck - Teleporter"; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/teleporter) "mi" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -5535,11 +5540,11 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "ne" = ( -/obj/effect/floor_decal/corner/red{ - dir = 5 +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 }, -/obj/effect/floor_decal/corner/red{ - dir = 5 +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) @@ -5731,15 +5736,10 @@ /turf/simulated/floor/tiled/white, /area/medical/ward/isolation) "nD" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/simulated/floor, +/turf/simulated/floor/tiled, /area/hallway/crew_area) "nF" = ( /obj/structure/window/shuttle/scc_space_ship, @@ -5756,19 +5756,11 @@ /turf/simulated/floor, /area/crew_quarters/captain) "nG" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Holodeck" +/obj/effect/landmark{ + name = "RevenantRift" }, -/turf/simulated/floor/tiled, -/area/hallway/crew_area) -"nI" = ( -/obj/structure/lattice, -/obj/machinery/light/spot/weak{ - dir = 1 - }, -/turf/simulated/open, -/area/hallway/primary/starboard) +/turf/simulated/floor/holofloor/reinforced, +/area/holodeck/alphadeck) "nJ" = ( /obj/machinery/computer/security/engineering{ dir = 4 @@ -5853,15 +5845,6 @@ /obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled/white, /area/bridge) -"nV" = ( -/obj/structure/bed/stool/chair{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/hallway/primary/starboard) "nW" = ( /obj/machinery/light/small/emergency{ dir = 8 @@ -6428,22 +6411,11 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "po" = ( -/obj/machinery/door/airlock/command{ - name = "Teleport Access"; - req_access = list(17) - }, +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, /obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/teleporter) +/turf/simulated/floor/plating, +/area/hallway/primary/port) "pp" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -6807,7 +6779,7 @@ /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "pX" = ( -/obj/machinery/hologram/holopad, +/obj/machinery/hologram/holopad/long_range, /turf/simulated/floor/wood, /area/crew_quarters/captain) "pY" = ( @@ -6975,11 +6947,14 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "qs" = ( -/obj/machinery/light{ - icon_state = "tube1" +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/reinforced, -/area/hallway/crew_area) +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/starboard) "qt" = ( /obj/structure/table/standard, /obj/machinery/light/small/red{ @@ -7001,18 +6976,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) -"qv" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/teleporter) "qw" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/effect/floor_decal/spline/fancy/wood{ @@ -7249,14 +7212,13 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) "rb" = ( -/obj/structure/bed/stool/chair{ - dir = 1 +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 +/obj/machinery/computer/HolodeckControl/Exodus{ + pixel_y = 32 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "rc" = ( /obj/structure/cable/green{ @@ -7410,9 +7372,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "rr" = ( @@ -7535,6 +7494,10 @@ /obj/effect/landmark/start{ name = "Passenger" }, +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 + }, /turf/simulated/floor/carpet, /area/crew_quarters/lounge) "rI" = ( @@ -7626,11 +7589,10 @@ /turf/simulated/floor/carpet, /area/crew_quarters/lounge/secondary) "rT" = ( -/obj/structure/railing/mapped, -/obj/structure/railing/mapped{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/turf/simulated/open, +/turf/simulated/floor/tiled, /area/hallway/primary/starboard) "rU" = ( /obj/structure/cable{ @@ -7641,15 +7603,14 @@ /turf/simulated/open, /area/maintenance/engineering_ladder) "rV" = ( -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, /obj/machinery/power/apc/super{ dir = 8; pixel_x = -24 }, /obj/machinery/deployable/barrier, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/tiled/dark, /area/crew_armory) "rY" = ( @@ -8030,6 +7991,12 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics_morgue) +"sX" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "sY" = ( /obj/structure/table/wood, /obj/item/folder/blue, @@ -8041,21 +8008,12 @@ /obj/effect/landmark{ name = "carpspawn" }, -/turf/simulated/floor/reinforced, +/turf/template_noop, /area/template_noop) "ta" = ( -/obj/structure/table/wood, -/obj/effect/floor_decal/spline/fancy/wood/corner, -/turf/simulated/floor/wood, -/area/hallway/primary/starboard) -"tb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, /area/hallway/primary/starboard) "tc" = ( /obj/structure/bed/stool/chair/office/dark{ @@ -8170,11 +8128,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor, /area/maintenance/bridge) -"tq" = ( -/obj/structure/railing/mapped, -/obj/structure/lattice, -/turf/simulated/open, -/area/hallway/primary/starboard) "ts" = ( /obj/structure/bed/stool/chair/sofa/left/brown{ dir = 8 @@ -8194,16 +8147,17 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "tu" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Firefighting Equipment"; - req_access = list(12) +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 }, -/turf/simulated/floor, +/obj/structure/sign/staff_only{ + pixel_y = 32 + }, +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled, /area/hallway/crew_area) "tv" = ( /obj/structure/cable/green{ @@ -8293,9 +8247,6 @@ }, /turf/simulated/floor/plating, /area/hallway/crew_area) -"tD" = ( -/turf/simulated/wall/r_wall, -/area/teleporter) "tE" = ( /obj/structure/bed/stool/chair/office/bridge{ dir = 4 @@ -8349,9 +8300,6 @@ }, /area/tcommsat/chamber) "tL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -9183,9 +9131,8 @@ }, /area/tcommsat/chamber) "wf" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor, -/area/maintenance/security_starboard) +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/area/hallway/primary/starboard) "wg" = ( /obj/effect/floor_decal/corner/grey/diagonal{ dir = 8 @@ -9203,6 +9150,15 @@ /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /turf/simulated/floor, /area/bridge) +"wj" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/crew_area) "wl" = ( /obj/structure/railing/mapped{ dir = 1 @@ -9278,15 +9234,6 @@ "ww" = ( /turf/simulated/floor/tiled, /area/crew_quarters/sleep/cryo) -"wx" = ( -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/railing/mapped{ - dir = 4 - }, -/turf/simulated/open, -/area/hallway/primary/starboard) "wy" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -9411,11 +9358,13 @@ /turf/simulated/floor/tiled, /area/bridge) "wK" = ( -/obj/effect/floor_decal/corner/paleblue/full{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/closet/emcloset, +/obj/machinery/newscaster{ + pixel_y = 30 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "wM" = ( @@ -9526,13 +9475,10 @@ /turf/simulated/floor/tiled/white, /area/security/forensics_morgue) "xb" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/floor, +/turf/simulated/floor/tiled, /area/hallway/crew_area) "xc" = ( /obj/structure/window/shuttle/scc_space_ship, @@ -9853,12 +9799,6 @@ /obj/structure/closet, /turf/simulated/floor, /area/maintenance/security_starboard) -"xR" = ( -/obj/effect/landmark{ - name = "cavernspawn" - }, -/turf/template_noop, -/area/template_noop) "xS" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10082,15 +10022,6 @@ /obj/machinery/anti_bluespace, /turf/simulated/floor/carpet, /area/crew_quarters/captain) -"yx" = ( -/obj/structure/bed/stool/chair{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/turf/simulated/floor/wood, -/area/hallway/primary/starboard) "yy" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -10127,13 +10058,6 @@ }, /turf/simulated/floor/tiled, /area/bridge) -"yB" = ( -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/lattice, -/turf/simulated/open, -/area/hallway/primary/starboard) "yC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -10462,10 +10386,12 @@ /obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) +"zn" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "zo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 8 }, @@ -10572,9 +10498,6 @@ temperature = 278 }, /area/tcommsat/chamber) -"zH" = ( -/turf/simulated/floor, -/area/maintenance/security_starboard) "zI" = ( /obj/machinery/alarm{ pixel_y = 28 @@ -10763,6 +10686,11 @@ /obj/machinery/light/small/emergency{ dir = 4 }, +/obj/machinery/atmospherics/portables_connector{ + dir = 8; + layer = 2.8 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor, /area/maintenance/engineering_ladder) "Ac" = ( @@ -10874,13 +10802,6 @@ /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) -"Av" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube1" - }, -/turf/simulated/floor/reinforced, -/area/hallway/crew_area) "Aw" = ( /obj/machinery/light{ dir = 8 @@ -10891,6 +10812,11 @@ /obj/machinery/firealarm/west, /turf/simulated/floor/tiled, /area/bridge) +"Ax" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "Ay" = ( /obj/structure/bed/stool/chair{ dir = 1 @@ -10943,6 +10869,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor, /area/maintenance/engineering_ladder) "AE" = ( @@ -11033,11 +10962,6 @@ /obj/structure/bed/stool/chair/office/bridge, /turf/simulated/floor/carpet/rubber, /area/bridge) -"AR" = ( -/obj/structure/lattice, -/obj/machinery/light/spot/weak, -/turf/simulated/open, -/area/hallway/primary/starboard) "AS" = ( /obj/effect/floor_decal/corner_wide/blue{ dir = 5 @@ -11308,15 +11232,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cafeteria) -"Bw" = ( -/obj/structure/bed/stool/chair{ - dir = 4 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/hallway/primary/starboard) "Bx" = ( /obj/machinery/door/firedoor, /obj/machinery/door/window/westright, @@ -11424,18 +11339,6 @@ /obj/effect/floor_decal/corner/blue/full, /turf/simulated/floor/tiled, /area/bridge) -"BK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/full{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/starboard) "BL" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/structure/curtain/open, @@ -11742,12 +11645,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor, /area/journalistoffice) -"CC" = ( -/obj/effect/landmark{ - name = "RevenantRift" - }, -/turf/simulated/floor/holofloor/reinforced, -/area/holodeck/alphadeck) "CE" = ( /obj/machinery/light/small/red{ dir = 8 @@ -12021,12 +11918,10 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "Dn" = ( +/obj/machinery/deployable/barrier, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; icon_state = "4-8" }, -/obj/machinery/deployable/barrier, /turf/simulated/floor/tiled/dark, /area/crew_armory) "Do" = ( @@ -12105,15 +12000,6 @@ /obj/machinery/firealarm/north, /turf/simulated/floor/wood, /area/crew_quarters/lounge/secondary) -"DB" = ( -/obj/machinery/computer/HolodeckControl/Exodus{ - pixel_y = 32 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/hallway/crew_area) "DC" = ( /obj/structure/closet/emcloset, /turf/simulated/floor, @@ -12297,13 +12183,11 @@ /turf/simulated/wall, /area/security/forensics_morgue) "Ee" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/door/airlock/maintenance{ - req_access = list(17) +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor, -/area/maintenance/security_starboard) +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) "Ef" = ( /obj/structure/sink{ dir = 8; @@ -12553,7 +12437,10 @@ /turf/simulated/floor/tiled/dark, /area/bridge/selfdestruct) "EN" = ( -/obj/structure/flora/pottedplant/random, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/stool/chair, /turf/simulated/floor/tiled, /area/hallway/crew_area) "EP" = ( @@ -12693,6 +12580,13 @@ "Fj" = ( /turf/simulated/wall, /area/security/investigations_storage) +"Fl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled/dark, +/area/engineering/break_room) "Fm" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /turf/simulated/floor, @@ -13141,12 +13035,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/selfdestruct) -"Gm" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/hallway/primary/starboard) "Go" = ( /obj/machinery/door/window/northleft, /obj/effect/floor_decal/spline/plain{ @@ -13275,10 +13163,6 @@ /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /turf/simulated/floor/tiled, /area/hallway/crew_area) -"GC" = ( -/obj/structure/bed/stool/chair, -/turf/simulated/floor/wood, -/area/hallway/primary/starboard) "GD" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -13367,10 +13251,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/captain) -"GN" = ( -/obj/structure/lattice, -/turf/simulated/open, -/area/hallway/primary/starboard) "GO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13404,15 +13284,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"GS" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/teleporter) "GT" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -13446,16 +13317,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/forensics_office) -"GV" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -28 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/teleporter) "GW" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 1 @@ -13495,12 +13356,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor, /area/maintenance/engineering_ladder) "Ha" = ( @@ -13515,9 +13374,6 @@ }, /turf/simulated/floor/wood, /area/bridge/minibar) -"Hb" = ( -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/starboard) "Hc" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -13698,12 +13554,6 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) -"Hy" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/turf/simulated/open, -/area/hallway/primary/starboard) "Hz" = ( /turf/simulated/wall, /area/hallway/crew_area) @@ -13886,15 +13736,6 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) -"HY" = ( -/obj/effect/floor_decal/corner/red/full{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/starboard) "Ia" = ( /obj/item/modular_computer/console/preset/engineering, /obj/structure/cable/cyan{ @@ -14071,12 +13912,6 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -14087,6 +13922,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/hallway/crew_area) "Iz" = ( @@ -14155,12 +13993,12 @@ /obj/structure/closet/secure_closet/freezer/fridge, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cafeteria) -"II" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 +"IH" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 1 }, -/turf/simulated/floor/wood, -/area/hallway/primary/starboard) +/turf/simulated/floor/tiled, +/area/hallway/crew_area) "IJ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -14354,13 +14192,10 @@ }, /turf/simulated/floor, /area/maintenance/security_starboard) -"Jc" = ( -/obj/machinery/teleport/station, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/teleporter) +"Jb" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "Je" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/blue{ @@ -14384,13 +14219,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) -"Jj" = ( -/obj/structure/bed/stool/chair, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/hallway/primary/starboard) "Jl" = ( /obj/effect/floor_decal/corner/blue{ dir = 9 @@ -14720,6 +14548,14 @@ dir = 4 }, /area/hallway/primary/starboard) +"JZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/binary/pump{ + dir = 1; + use_power = 1 + }, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "Ka" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -14727,11 +14563,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ - d2 = 4; icon_state = "0-4" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/captain) "Kb" = ( @@ -15077,14 +14912,6 @@ }, /turf/simulated/floor/reinforced, /area/template_noop) -"KP" = ( -/obj/machinery/teleport/pad, -/obj/effect/decal/warning_stripes, -/turf/simulated/floor/plating, -/area/teleporter) -"KQ" = ( -/turf/simulated/wall/r_wall, -/area/maintenance/security_starboard) "KR" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -15381,15 +15208,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) -"Ly" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/port) "Lz" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15563,9 +15381,6 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "LP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -15575,6 +15390,9 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/hallway/crew_area) "LS" = ( @@ -15860,14 +15678,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop/xo) -"MB" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/door/airlock/maintenance{ - req_access = list(17) - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor, -/area/teleporter) "MD" = ( /obj/structure/bed/stool/chair{ dir = 4 @@ -15979,10 +15789,10 @@ /turf/simulated/floor/tiled/white, /area/medical/exam) "MS" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/flora/pottedplant, /turf/simulated/floor/tiled, /area/hallway/crew_area) "MU" = ( @@ -16056,18 +15866,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) -"Nc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/floor_decal/corner/red/full{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/primary/starboard) "Nd" = ( /obj/structure/closet/secure_closet/guncabinet{ name = "Weaponry (Anti-Materiel)" @@ -16264,13 +16062,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/toilet) -"Nx" = ( -/obj/structure/lattice, -/obj/structure/railing/mapped{ - dir = 4 - }, -/turf/simulated/open, -/area/hallway/primary/starboard) "Ny" = ( /obj/effect/floor_decal/corner_wide/blue{ dir = 5 @@ -16335,9 +16126,6 @@ /turf/simulated/floor/carpet, /area/crew_quarters/captain) "NI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -16370,8 +16158,6 @@ /area/security/vacantoffice2) "NM" = ( /obj/structure/cable/green{ - d1 = 1; - d2 = 4; icon_state = "1-4" }, /turf/simulated/floor/tiled/dark, @@ -16735,9 +16521,6 @@ /obj/item/pen, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) -"OF" = ( -/turf/simulated/floor/wood, -/area/hallway/primary/starboard) "OG" = ( /obj/effect/floor_decal/corner/blue/full, /obj/structure/banner/scc, @@ -17413,15 +17196,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cafeteria) -"Qe" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "Qg" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -17553,13 +17327,6 @@ }, /turf/simulated/floor/tiled/dark, /area/lawoffice/representative) -"Qr" = ( -/obj/machinery/shieldwallgen, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/teleporter) "Qs" = ( /obj/structure/bed/stool/chair/padded/brown{ dir = 4 @@ -17631,6 +17398,10 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/hallway/crew_area) "QD" = ( @@ -17696,9 +17467,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cafeteria) -"QL" = ( -/turf/simulated/floor/holofloor/reinforced, -/area/holodeck/alphadeck) "QM" = ( /obj/structure/cable/cyan{ icon_state = "2-8" @@ -17733,20 +17501,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/selfdestruct) -"QQ" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/turf/simulated/floor/tiled, -/area/teleporter) "QR" = ( /obj/effect/floor_decal/corner/blue{ dir = 10 @@ -17767,17 +17521,11 @@ /obj/effect/floor_decal/corner/beige/diagonal, /turf/simulated/floor/tiled/white, /area/security/forensics_office) -"QT" = ( -/obj/effect/landmark{ - name = "cavernspawn" - }, -/turf/simulated/floor/reinforced, -/area/template_noop) "QW" = ( /obj/effect/floor_decal/corner/red{ dir = 5 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "QY" = ( /obj/effect/floor_decal/corner_wide/red/full{ @@ -17814,6 +17562,16 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/lounge) +"Rd" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/machinery/door/window/eastright{ + dir = 1 + }, +/turf/simulated/floor, +/area/hallway/crew_area) "Rf" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -17866,7 +17624,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/hologram/holopad, +/obj/machinery/hologram/holopad/long_range, /turf/simulated/floor/carpet/rubber, /area/bridge) "Rn" = ( @@ -17948,10 +17706,6 @@ }, /turf/simulated/floor/tiled, /area/bridge/minibar) -"Ry" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced, -/turf/simulated/floor, -/area/hallway/primary/starboard) "Rz" = ( /obj/structure/bed/padded, /obj/item/bedsheet/nanotrasen, @@ -18159,15 +17913,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"Se" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled, -/area/teleporter) "Sf" = ( /obj/structure/bed/stool/chair/office/dark{ dir = 8 @@ -18429,13 +18174,6 @@ "SK" = ( /turf/simulated/wall/r_wall, /area/lawoffice/consular) -"SM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "SN" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -18705,6 +18443,9 @@ name = "south bump"; pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor, /area/maintenance/engineering_ladder) "Tx" = ( @@ -18766,27 +18507,11 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "TF" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/machinery/power/apc/low{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/railing/mapped, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ +/obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/table/standard, +/obj/item/material/ashtray/glass, /turf/simulated/floor/tiled, /area/hallway/crew_area) "TG" = ( @@ -18998,16 +18723,6 @@ "Uc" = ( /turf/simulated/wall/r_wall, /area/hallway/primary/starboard) -"Ud" = ( -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/template_noop) -"Ue" = ( -/obj/structure/lattice, -/obj/structure/railing/mapped{ - dir = 1 - }, -/turf/simulated/open, -/area/hallway/primary/starboard) "Uf" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -19073,14 +18788,12 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) "Uo" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/structure/bed/stool/chair/padded/brown{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/carpet, /area/crew_quarters/captain) "Up" = ( @@ -19131,6 +18844,18 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) +"Uv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/hallway/crew_area) "Uw" = ( /turf/simulated/floor/tiled/dark, /area/bridge/selfdestruct) @@ -19340,10 +19065,7 @@ /obj/effect/floor_decal/corner/paleblue/full{ dir = 1 }, -/obj/machinery/newscaster{ - pixel_y = 30 - }, -/obj/structure/flora/pottedplant/random, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "Vd" = ( @@ -19621,13 +19343,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) -"VH" = ( -/obj/machinery/light{ - dir = 8; - icon_state = "tube1" - }, -/turf/simulated/floor/reinforced, -/area/hallway/crew_area) "VI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -19710,21 +19425,6 @@ temperature = 278 }, /area/tcommsat/chamber) -"VR" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/port) "VS" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -19970,12 +19670,8 @@ /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "WD" = ( -/obj/structure/lattice, -/obj/machinery/light/spot/weak{ - dir = 4 - }, -/turf/simulated/open, -/area/hallway/primary/starboard) +/turf/simulated/floor/holofloor/reinforced, +/area/holodeck/alphadeck) "WE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/hologram/holopad, @@ -20400,7 +20096,7 @@ /area/crew_armory) "XP" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/teleporter) +/area/hallway/primary/port) "XQ" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -20408,12 +20104,12 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "XR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/floor_decal/corner/red{ dir = 5 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "XS" = ( @@ -20508,12 +20204,6 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/entry/emergency) -"Yd" = ( -/obj/effect/landmark{ - name = "carpspawn" - }, -/turf/template_noop, -/area/template_noop) "Ye" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -20606,6 +20296,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/security/vacantoffice2) +"Yo" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/bed/stool/chair{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/crew_area) "Yq" = ( /obj/machinery/telecomms/bus/preset_four, /turf/simulated/floor/tiled{ @@ -21294,12 +20993,18 @@ /turf/simulated/floor/carpet, /area/crew_quarters/lounge/secondary) "ZN" = ( -/obj/machinery/space_heater, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/light/small{ - dir = 4 +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 }, -/turf/simulated/floor, +/obj/machinery/power/apc/low{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled, /area/hallway/crew_area) "ZP" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ @@ -21880,7 +21585,7 @@ Wm Wm Wm Wm -Wm +sZ Wm Wm Wm @@ -26129,7 +25834,7 @@ at at at at -sZ +at at at at @@ -26526,7 +26231,7 @@ at at at at -QT +at at at at @@ -26678,7 +26383,7 @@ Wm Wm Wm Wm -Wm +sZ Wm Wm Wm @@ -27122,7 +26827,7 @@ at at at at -QT +at at at at @@ -27701,7 +27406,7 @@ Wm Wm Wm Wm -xR +Wm Wm Wm Wm @@ -28158,7 +27863,6 @@ Wm Wm Wm Wm -Yd Wm Wm Wm @@ -28171,7 +27875,8 @@ Wm Wm Wm Wm -xR +Wm +Wm Wm Wm Wm @@ -28764,7 +28469,7 @@ Wm Wm Wm Wm -xR +Wm Wm Wm Wm @@ -28940,7 +28645,7 @@ at at at at -sZ +at at at at @@ -29326,7 +29031,7 @@ Wm Wm Wm Wm -Yd +Wm Wm Wm Wm @@ -29756,7 +29461,7 @@ at at at at -sZ +at at at at @@ -30148,7 +29853,7 @@ at at at at -sZ +at at at at @@ -30385,7 +30090,7 @@ Wm Wm Wm Wm -Yd +Wm Wm Wm Wm @@ -30758,7 +30463,7 @@ at at at at -QT +at at at at @@ -30966,12 +30671,12 @@ at at at at -Av at at at at -Av +at +at at at eb @@ -31165,17 +30870,17 @@ at at at at -eb -GQ -GQ -eb -GQ -GQ -GQ -GQ -eb -GQ -GQ +at +at +at +at +at +at +at +at +at +at +at eb UM qe @@ -31367,17 +31072,17 @@ at at at at -GQ -QL -QL -QL -QL -QL -QL -QL -QL -QL -QL +at +at +at +at +at +at +at +at +at +at +at eb QC Ku @@ -31518,7 +31223,7 @@ Wm Wm Wm Wm -xR +Wm Wm Wm Wm @@ -31569,17 +31274,17 @@ at at at at -GQ -QL -QL -QL -QL -QL -QL -QL -QL -QL -QL +at +at +at +at +at +at +at +at +at +at +at GQ WL OL @@ -31770,18 +31475,18 @@ at at at at -qs -eb -QL -QL -QL -QL -QL -QL -QL -QL -QL -QL +at +at +at +at +at +at +at +at +at +at +at +at eb Op Vr @@ -31946,7 +31651,7 @@ Wm Wm Wm Wm -Yd +Wm Wm Wm Wm @@ -31973,18 +31678,18 @@ at at at at -GQ -QL -QL -QL -QL -QL -QL -QL -QL -QL -QL -kz +at +at +at +at +at +at +at +at +at +at +at +eb pm mb GQ @@ -32027,7 +31732,7 @@ Wm Wm Wm Wm -Wm +sZ Wm Wm Wm @@ -32161,7 +31866,6 @@ at at at at -QT at at at @@ -32175,19 +31879,20 @@ at at at at -GQ -QL -QL -QL -QL -CC -QL -QL -QL -QL -QL +at +at +at +at +at +at +at +at +at +at +at +at eb -DB +WL mb GQ at @@ -32377,18 +32082,18 @@ at at at at -GQ -QL -QL -QL -QL -QL -QL -QL -QL -QL -QL -nG +at +at +at +at +at +at +at +at +at +at +at +eb pm mb GQ @@ -32569,7 +32274,6 @@ at at at at -sZ at at at @@ -32578,18 +32282,19 @@ at at at at -qs -eb -QL -QL -QL -QL -QL -QL -QL -QL -QL -QL +at +at +at +at +at +at +at +at +at +at +at +at +at eb Op Jr @@ -32613,7 +32318,7 @@ Wm Wm Wm Wm -xR +Wm Wm Wm Wm @@ -32781,17 +32486,17 @@ at at at at -GQ -QL -QL -QL -QL -QL -QL -QL -QL -QL -QL +at +at +at +at +at +at +at +at +at +at +at GQ WL mb @@ -32983,17 +32688,17 @@ at at at at -GQ -QL -QL -QL -QL -QL -QL -QL -QL -QL -QL +at +at +at +at +at +at +at +at +at +at +at eb mr gE @@ -33185,17 +32890,17 @@ at at at at -eb -GQ -GQ -eb -GQ -GQ -GQ -GQ -eb -GQ -GQ +at +at +at +at +at +at +at +at +at +at +at eb vr XD @@ -33231,7 +32936,7 @@ Wm Wm Wm Wm -xR +Wm Wm Wm Wm @@ -33351,7 +33056,7 @@ Wm Wm Wm Wm -Yd +Wm Wm Wm Wm @@ -33390,12 +33095,12 @@ at at at at -VH at at at at -VH +at +at at at GQ @@ -33806,6 +33511,7 @@ GQ WL LP cJ +gj eb at at @@ -33817,7 +33523,6 @@ at at at at -at fh Wm Wm @@ -34007,7 +33712,8 @@ at eb WL tL -EP +jH +Rd eb at at @@ -34017,7 +33723,6 @@ at at at at -at Rh Tr PF @@ -34409,8 +34114,8 @@ yX Tb Ac yX -WL -tL +ZN +Uv EP Hz tO @@ -34612,7 +34317,7 @@ TS Ur yX WL -tL +gH EP Hz CO @@ -34813,8 +34518,8 @@ yX yX yX yX -WL -tL +wj +gH EP Hz DA @@ -34984,7 +34689,7 @@ at at at at -sZ +at at at at @@ -35014,9 +34719,9 @@ yX ec nD io -Hz -Op -tL +MS +IH +gH as Hz jU @@ -35211,13 +34916,13 @@ fr mq ua dK -do -AC -eE ae -xb -tu -MS +AC +gP +pm +pm +pm +pm Ix Pa Nq @@ -35244,7 +34949,7 @@ Wm Wm Wm Wm -Yd +Wm Wm Wm Wm @@ -35414,12 +35119,12 @@ mW YA xf lR -AC gv -ZN -gP -Hz -EN +pm +pm +pm +pm +pm FB Gz Hz @@ -35617,12 +35322,12 @@ uh NP EV AC -Hz -Hz -Hz -Hz -Hz +tu +xb +EN TF +Yo +Ts js Hz KC @@ -36444,8 +36149,8 @@ gW at fh aa -Wm -Wm +aa +aa Wm Wm Wm @@ -36646,10 +36351,10 @@ gW at fh aa -Wm -Wm -Wm -Wm +aa +aa +aa +aa Wm Wm Wm @@ -36784,7 +36489,7 @@ at at at at -QT +at at at at @@ -36848,16 +36553,16 @@ gW at fh aa +aa +aa +aa +aa Wm Wm Wm Wm Wm Wm -Yd -Wm -Wm -Wm Wm Wm Wm @@ -37050,10 +36755,10 @@ eA at fh aa -Wm -Wm -Wm -Wm +aa +aa +aa +aa Wm Wm Wm @@ -37252,6 +36957,10 @@ gW at fh aa +aa +aa +aa +aa Wm Wm Wm @@ -37275,10 +36984,6 @@ Wm Wm Wm Wm -Yd -Wm -Wm -Wm Wm Wm Wm @@ -37454,10 +37159,10 @@ gW at fh aa -Wm -Wm -Wm -Wm +aa +aa +aa +aa Wm Wm Wm @@ -37656,10 +37361,10 @@ gW at fh aa -Wm -Wm -Wm -Wm +aa +aa +aa +aa Wm Wm Wm @@ -37860,8 +37565,8 @@ fh Vu Vu aa -Wm -Wm +aa +aa Wm Wm Wm @@ -39704,7 +39409,7 @@ Wm Wm Wm Wm -xR +Wm Wm Wm Wm @@ -40406,7 +40111,7 @@ Wm Wm Wm Wm -xR +Wm Wm Wm Wm @@ -41035,15 +40740,15 @@ aa HN em fK -fK -kp -kp -fK -kp -kp +sX +lj +JZ +Jb +Ax +Ax ah -DJ -DJ +zn +gJ ga cx qu @@ -41199,7 +40904,7 @@ Wm Wm Wm Wm -Wm +sZ Wm Wm Wm @@ -41664,16 +41369,16 @@ iY co UV UV +kz UV -GN cV XR kb QW jo -QB -QB -QB +qs +qs +qs QB Te hB @@ -41863,20 +41568,20 @@ xs xs uV iY +xs co -UV -UV -UV -GN -cV -BK -HY -HY -Nc -hQ -hQ +co +xs +co +co +co +co +xs +co +co +xs cS -ne +uk WN QA eP @@ -42065,20 +41770,20 @@ cE Vm Ie JJ -lu -UV -UV -UV -GN -cV -tb -Bw -II -II -II -Bw +co +WD +WD +WD +WD +WD +WD +WD +WD +WD +WD +xs dL -Ou +uk Ji co Ou @@ -42134,7 +41839,7 @@ Wm Wm Wm Wm -Wm +sZ Wm Wm Wm @@ -42267,20 +41972,20 @@ cb yh gl iY -lu -UV -UV -UV -GN -cV -Jj -bm -lG -OF -GC -ta -rb +co +WD +WD +WD +WD +WD +WD +WD +WD +WD +WD +co Ou +uk oY co Ou @@ -42454,7 +42159,7 @@ aT KZ KZ gg -hf +Fl hk vm bz @@ -42468,21 +42173,21 @@ uk hY kF tR -iY -Ue -GN -GN -GN -GN -GN -bP -nV -Gm -dZ -Gm -yx dM +xs +WD +WD +WD +WD +WD +WD +WD +WD +WD +WD +xs Ou +uk Ji co Tx @@ -42672,20 +42377,20 @@ yh gl iY lu -UV -UV -UV -GN -UV -UV -bv -dq -bv -bv -bv -cV +WD +WD +WD +WD +WD +WD +WD +WD +WD +WD +lu Ou rp +Ji co Ou Uq @@ -42873,20 +42578,20 @@ Ei Vm GO Yb -lu -UV -UV -UV -GN -UV -UV -UV -GN -UV -UV -UV -cV -Ou +co +WD +WD +WD +WD +nG +WD +WD +WD +WD +WD +xs +rb +cb zo Oz vb @@ -43075,21 +42780,21 @@ Uc Uc UH JB -lu -UV -UV -UV +hQ WD -UV -UV -UV WD -UV -UV -UV -cV +WD +WD +WD +WD +WD +WD +WD +WD +hQ Ou hY +ta LV fI kX @@ -43134,7 +42839,7 @@ Wm Wm Wm Wm -xR +Wm Wm Wm Wm @@ -43276,22 +42981,22 @@ tg et cT gl -iY -yB -GN -GN -AR -Ry -nI -GN -AR -Ry -nI -GN -GN -tq +dM +xs +WD +WD +WD +WD +WD +WD +WD +WD +WD +WD +xs Ou -SM +Dy +WN QA eP Uq @@ -43479,21 +43184,21 @@ ey cT gl iY -lu -UV -UV -UV -cc -UV -UV -UV -cc -UV -UV -UV -cV +co +WD +WD +WD +WD +WD +WD +WD +WD +WD +WD +co Ou -Qe +rT +Ji co Ou Uq @@ -43681,20 +43386,20 @@ QH aW xk iY -lu -UV -UV -UV -GN -UV -UV -UV -GN -UV -UV -UV -cV -Ou +co +WD +WD +WD +WD +WD +WD +WD +WD +WD +WD +xs +dL +uk oY co Ou @@ -43883,20 +43588,20 @@ PY cT gl iY -wx -Hy -Hy -Hy -Nx -Hy -Hy -Hy -Nx -Hy -Hy -Hy -rT +xs +co +co +xs +co +co +co +co +xs +co +co +xs Ou +uk Ji co Tx @@ -44088,17 +43793,17 @@ DV xi xi xi +ne xi xi xi xi -xi -xi -xi +ne xi xi xi vb +uk Ji co Ou @@ -44480,10 +44185,10 @@ Ms Fr Ss Sj -Sj +ck Sj fi -Sj +hg Sj rc hU @@ -44684,12 +44389,12 @@ he mo Gp he -VR -Ly +he +he he he QD -Hb +eP zW Dk MY @@ -44882,16 +44587,16 @@ Gb BX BX OV -tD -tD -tD -tD +XP +XP +XP po -tD -tD -KQ -KQ -KQ +po +po +XP +XP +wf +im Ht rl TG @@ -45084,14 +44789,14 @@ Cx BX BX Be -tD -ck -hg -kl -qv -GV -MB -wf +XP +at +at +at +at +at +at +at wf Ee zZ @@ -45286,16 +44991,16 @@ Kp Hq zi wW -tD -QQ -GS -GS -Se -Qr -tD -zH -KQ -KQ +XP +at +at +at +at +at +at +at +wf +im Qm rl rl @@ -45455,7 +45160,7 @@ Wm Wm Wm Wm -xR +Wm Wm Wm Wm @@ -45484,18 +45189,18 @@ aK aK aK aK -uv -uv -uv -uv XP -im -Jc -KP -mh -Qr -tD -ju +XP +XP +XP +XP +at +at +at +at +at +at +at Cu wK WQ @@ -45690,14 +45395,14 @@ at at at at -Ud -Ud -Ud -Ud -Ud -Ud -Ud -Ud +at +at +at +at +at +at +at +at Cu Vb HU @@ -45947,7 +45652,7 @@ Wm Wm Wm Wm -Yd +Wm Wm Wm Wm @@ -46078,7 +45783,7 @@ at at at at -QT +at at at at @@ -46301,7 +46006,7 @@ at at at at -QT +at at at at @@ -46351,7 +46056,7 @@ Wm Wm Wm Wm -xR +Wm Wm Wm Wm @@ -47572,7 +47277,7 @@ Wm Wm Wm Wm -Yd +Wm Wm Wm Wm @@ -49152,7 +48857,7 @@ nq nf lh AN -WA +gQ ma ou iK @@ -49532,7 +49237,7 @@ at at at at -QT +at at at at @@ -50387,7 +50092,7 @@ Wm Wm Wm Wm -xR +Wm Wm Wm Wm @@ -50523,7 +50228,7 @@ Wm Wm Wm Wm -Yd +Wm Wm Wm Wm @@ -50787,7 +50492,7 @@ Wm Wm Wm Wm -Yd +Wm Wm Wm Wm @@ -50974,7 +50679,7 @@ at at at at -QT +at at at at @@ -51351,7 +51056,7 @@ at at at at -sZ +at at at at @@ -51563,7 +51268,7 @@ at at at at -sZ +at at at at @@ -52219,7 +51924,7 @@ Wm Wm Wm Wm -Wm +sZ Wm Wm Wm @@ -52522,7 +52227,7 @@ Wm Wm Wm Wm -Wm +sZ Wm Wm Wm @@ -53375,7 +53080,7 @@ at at at at -QT +at at at at @@ -54600,7 +54305,7 @@ at at at at -QT +at at at at @@ -54630,7 +54335,7 @@ Wm Wm Wm Wm -Yd +Wm Wm Wm Wm @@ -55198,7 +54903,7 @@ at at at at -sZ +at at at at @@ -59649,7 +59354,7 @@ Wm Wm Wm Wm -Wm +sZ Wm Wm Wm diff --git a/maps/sccv_horizon/placeholder-4_centcomm.dmm b/maps/sccv_horizon/placeholder-4_centcomm.dmm index e10aa51c544..8b46bfcd336 100644 --- a/maps/sccv_horizon/placeholder-4_centcomm.dmm +++ b/maps/sccv_horizon/placeholder-4_centcomm.dmm @@ -4758,15 +4758,6 @@ icon_state = "lino_grey" }, /area/centcom/bar) -"akr" = ( -/obj/effect/ghostspawpoint{ - identifier = "OdinChef"; - name = "igs - OdinChef" - }, -/turf/unsimulated/floor{ - icon_state = "lino_grey" - }, -/area/centcom/bar) "aks" = ( /obj/machinery/appliance/cooker/fryer{ stat = 0 @@ -5818,15 +5809,6 @@ icon_state = "lino_grey" }, /area/centcom/bar) -"amr" = ( -/obj/effect/ghostspawpoint{ - identifier = "OdinBartender"; - name = "igs - OdinBartender" - }, -/turf/unsimulated/floor{ - icon_state = "lino_grey" - }, -/area/centcom/bar) "ams" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 @@ -12262,15 +12244,6 @@ icon_state = "dark2" }, /area/centcom/holding) -"aBV" = ( -/obj/effect/ghostspawpoint{ - identifier = "OdinCheckpoint"; - name = "igs - OdinCheckpoint" - }, -/turf/unsimulated/floor{ - icon_state = "dark2" - }, -/area/centcom/holding) "aBW" = ( /obj/structure/table/rack, /obj/item/clothing/mask/gas/half, @@ -12835,10 +12808,6 @@ }, /area/centcom/holding) "aDo" = ( -/obj/effect/ghostspawpoint{ - identifier = "OdinCheckpoint"; - name = "igs - OdinCheckpoint" - }, /obj/structure/bed/stool/chair/office/dark{ dir = 8 }, @@ -14738,20 +14707,8 @@ }, /turf/unsimulated/floor, /area/centcom/ferry) -"aIX" = ( -/obj/effect/landmark{ - name = "LateJoinCorporate Liaison" - }, -/obj/structure/bed/stool/chair/padded/blue, -/turf/unsimulated/floor{ - icon_state = "wood_light" - }, -/area/centcom/ferry) "aIY" = ( /obj/structure/bed/stool/chair/padded/blue, -/obj/effect/landmark{ - name = "LateJoinCorporate Liaison" - }, /turf/unsimulated/floor{ icon_state = "wood_light" }, @@ -14932,17 +14889,6 @@ icon_state = "wood_light" }, /area/centcom/ferry) -"aJA" = ( -/obj/structure/bed/stool/chair/padded/blue{ - dir = 8 - }, -/obj/effect/landmark{ - name = "LateJoinConsular Officer" - }, -/turf/unsimulated/floor{ - icon_state = "wood_light" - }, -/area/centcom/ferry) "aJB" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -15155,9 +15101,6 @@ }, /area/centcom/ferry) "aKg" = ( -/obj/effect/landmark{ - name = "LateJoinConsular Officer" - }, /obj/structure/bed/stool/chair/padded/blue{ dir = 8 }, @@ -17855,22 +17798,10 @@ "aRt" = ( /turf/simulated/floor, /area/tdome/tdome1) -"aRw" = ( -/obj/structure/window/shuttle/scc{ - icon_state = "c4" - }, -/turf/simulated/floor/plating, -/area/supply/dock) "aRx" = ( /obj/structure/computerframe, /turf/simulated/floor/shuttle/black, /area/supply/dock) -"aRy" = ( -/obj/structure/window/shuttle/scc{ - icon_state = "c5" - }, -/turf/simulated/floor/plating, -/area/supply/dock) "aRz" = ( /turf/simulated/wall/shuttle/scc/cardinal, /area/supply/dock) @@ -17906,24 +17837,6 @@ icon_state = "floor" }, /area/tdome/tdome1) -"aRH" = ( -/obj/structure/window/shuttle/scc{ - icon_state = "c1" - }, -/turf/simulated/floor/plating, -/area/supply/dock) -"aRI" = ( -/obj/structure/window/shuttle/scc{ - icon_state = "c2" - }, -/turf/simulated/floor/plating, -/area/supply/dock) -"aRJ" = ( -/obj/structure/window/shuttle/scc{ - icon_state = "c3" - }, -/turf/simulated/floor/plating, -/area/supply/dock) "aRL" = ( /turf/simulated/floor/plating, /area/centcom/suppy) @@ -54841,8 +54754,8 @@ anf ani aRz ank -aRw -aRH +aQY +aQY aOi aOi aNR @@ -55099,7 +55012,7 @@ anf anj anl aRx -aRI +aQY aOi aSm aNR @@ -55355,8 +55268,8 @@ anf ani aRz anO -aRy -aRJ +aQY +aQY aOi aOi aNR @@ -57391,7 +57304,7 @@ aHs aHK aIj aIw -aIX +aIY aJz aJz aKL @@ -57906,7 +57819,7 @@ aHM alR aIw aIZ -aJA +aKg aKg aKL aLy @@ -61747,7 +61660,7 @@ awx azF aug aAZ -aBV +ayK ayK aDo aDQ @@ -62261,9 +62174,9 @@ ayE azH aug aBb -aBV ayK -aBV +ayK +ayK aDQ aum aFh @@ -64043,7 +63956,7 @@ akk adV alv ajp -amr +ajp ajp ajp aoF @@ -67123,7 +67036,7 @@ aik adV ajn ajp -akr +ajp ajp ajp ajp @@ -67894,7 +67807,7 @@ aik aht ajq ajp -akr +ajp ajp ajp ajp