From 943b2c5b41846fe9e0f76ffac0605b72f9849bef Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Mon, 2 Jan 2023 14:23:43 +0100 Subject: [PATCH] Machinist Workshop Expansion and Fixes (#15396) --- .../objects/items/weapons/surgery_tools.dm | 29 +- html/changelogs/machinist_workshop_tweaks.yml | 7 + maps/away/away_site/racers/racers.dmm | 2 +- maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 884 ++++++++++-------- 4 files changed, 532 insertions(+), 390 deletions(-) create mode 100644 html/changelogs/machinist_workshop_tweaks.yml diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 17d2df69d9a..b56b0b6bb8e 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -212,7 +212,7 @@ /obj/item/surgery/fix_o_vein, /obj/item/stack/medical/advanced/bruise_pack, /obj/item/stack/nanopaste - ) + ) starts_with = list( /obj/item/surgery/bonesetter = 1, @@ -224,7 +224,7 @@ /obj/item/surgery/surgicaldrill = 1, /obj/item/surgery/bone_gel = 1, /obj/item/surgery/fix_o_vein = 1, - /obj/item/stack/medical/advanced/bruise_pack = 1, + /obj/item/stack/medical/advanced/bruise_pack = 1 ) /obj/item/storage/box/fancy/tray/update_icon() @@ -325,21 +325,22 @@ /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, - /obj/item/surgery/cautery, - ) - +/obj/item/storage/box/fancy/tray/machinist + name = "machinist operation tray" + desc = "A tray of various tools for use by machinists in repairing robots." can_hold = list( - /obj/item/surgery/circular_saw, + /obj/item/surgery/cautery, /obj/item/surgery/circular_saw, /obj/item/surgery/hemostat, /obj/item/surgery/retractor, /obj/item/surgery/scalpel, - /obj/item/surgery/surgicaldrill + /obj/item/stack/nanopaste + ) + + starts_with = list( + /obj/item/surgery/cautery = 1, + /obj/item/surgery/circular_saw = 1, + /obj/item/surgery/hemostat = 1, + /obj/item/surgery/retractor = 1, + /obj/item/surgery/scalpel = 1 ) \ No newline at end of file diff --git a/html/changelogs/machinist_workshop_tweaks.yml b/html/changelogs/machinist_workshop_tweaks.yml new file mode 100644 index 00000000000..ea28b3be7c3 --- /dev/null +++ b/html/changelogs/machinist_workshop_tweaks.yml @@ -0,0 +1,7 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - maptweak: "Expands the machinist workshop. Gives the machinist workshop a welder fuel tank and tinting windows." + - bugfix: "Fixes the machinist workshop ringer terminal not being mounted on the wall." \ No newline at end of file diff --git a/maps/away/away_site/racers/racers.dmm b/maps/away/away_site/racers/racers.dmm index a8318b47faf..4381399d2a7 100644 --- a/maps/away/away_site/racers/racers.dmm +++ b/maps/away/away_site/racers/racers.dmm @@ -3158,7 +3158,7 @@ /area/racers) "pvh" = ( /obj/structure/table/steel, -/obj/item/storage/box/fancy/tray/robotics, +/obj/item/storage/box/fancy/tray/machinist, /obj/item/stack/medical/bruise_pack, /obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 6bf8ce8f9bb..a3f3b4de9aa 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -427,17 +427,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/stairwell/central) -"alr" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/mauve{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, -/area/rnd/strongroom) "amf" = ( /obj/effect/floor_decal/corner/green{ dir = 6 @@ -529,15 +518,18 @@ /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 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "aoC" = ( @@ -1306,12 +1298,6 @@ "aAx" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/rnd/xenobiology/xenoflora) -"aBa" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/wing/port) "aBn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1510,6 +1496,19 @@ }, /turf/simulated/floor/wood, /area/horizon/library) +"aGx" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "aHj" = ( /obj/machinery/computer/sentencing/courtroom{ pixel_x = -29 @@ -2216,15 +2215,18 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) "aWN" = ( -/obj/machinery/conveyor{ - dir = 6; - id = "Robocompo" - }, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/corner/black{ dir = 10 }, -/obj/structure/plasticflaps, -/turf/simulated/floor/carpet/rubber, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -28 + }, +/turf/simulated/floor/tiled, /area/operations/lower/machinist) "aXf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3365,15 +3367,10 @@ /turf/simulated/floor/wood, /area/horizon/library) "bAZ" = ( -/obj/machinery/mecha_part_fabricator, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/carpet/rubber, +/obj/machinery/recharge_station, +/obj/effect/floor_decal/corner/black/full, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled, /area/operations/lower/machinist) "bBh" = ( /obj/effect/floor_decal/corner/brown/full{ @@ -4070,16 +4067,16 @@ /obj/machinery/door/firedoor, /obj/structure/table/reinforced/steel, /obj/machinery/door/window/eastleft{ - name = "Machinist Workshop Desk Interior Access"; + name = "Machinist Workshop Desk"; req_access = list(29) }, /obj/machinery/door/window/westright{ - name = "Machinist Workshop Desk Exterior Access" + name = "Machinist Workshop Desk" }, -/obj/machinery/door/blast/shutters/open{ - dir = 8; - id = "shutters_deck1_workshopdesk"; - name = "Workshop Desk Shutter" +/obj/machinery/door/blast/shutters{ + id = "shutters_deck2_workshopdesk"; + name = "Machinist Workshop Desk Shutter"; + dir = 8 }, /turf/simulated/floor/tiled/dark/full, /area/operations/lower/machinist) @@ -4247,8 +4244,10 @@ /turf/simulated/floor/tiled, /area/security/main) "bUN" = ( -/obj/effect/floor_decal/corner/black/diagonal, -/turf/simulated/floor/tiled, +/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ + id = "polarized_deck2_workshop" + }, +/turf/simulated/floor/tiled/dark/full, /area/operations/lower/machinist) "bVc" = ( /obj/structure/disposalpipe/segment{ @@ -4564,20 +4563,21 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "cda" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/floor_decal/corner/mauve{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/junction/yjunction, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "2-8" }, /turf/simulated/floor/tiled, /area/rnd/hallway) @@ -5302,15 +5302,13 @@ /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/lounge/bar) "cAx" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, -/area/rnd/strongroom) +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/full, +/area/maintenance/wing/port) "cBq" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/warning{ @@ -6298,6 +6296,13 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/medical) +"dev" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "dex" = ( /obj/effect/floor_decal/spline/fancy/wood/cee{ dir = 1 @@ -6515,12 +6520,6 @@ }, /turf/simulated/floor/tiled/dark, /area/maintenance/wing/port/far) -"dkr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/strongroom) "dkz" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -6841,14 +6840,13 @@ /area/security/security_office) "drw" = ( /obj/machinery/conveyor{ - dir = 8; + dir = 1; id = "Robocompo" }, -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, -/obj/machinery/light, /obj/structure/plasticflaps, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, /turf/simulated/floor/carpet/rubber, /area/operations/lower/machinist) "drB" = ( @@ -7157,9 +7155,16 @@ /turf/simulated/floor/tiled, /area/operations/lobby) "dzI" = ( -/obj/machinery/mecha_part_fabricator, -/obj/structure/railing/mapped, +/obj/machinery/mecha_part_fabricator{ + dir = 4 + }, /obj/effect/floor_decal/spline/plain{ + dir = 9 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped{ dir = 1 }, /turf/simulated/floor/carpet/rubber, @@ -7872,10 +7877,10 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) "dTj" = ( -/obj/machinery/light/small/emergency, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/wing/port) "dTI" = ( @@ -7952,6 +7957,25 @@ }, /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) +"dVy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "dVE" = ( /obj/structure/sign/securearea{ desc = "A caution sign which reads 'CAUTION: BRIG COMMUNAL AREA' and 'SECURE AREA'."; @@ -9737,6 +9761,15 @@ "eVu" = ( /turf/simulated/wall, /area/horizon/stairwell/bridge) +"eWb" = ( +/obj/structure/closet/secure_closet/scientist, +/obj/effect/floor_decal/corner/mauve/full{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/research, +/obj/machinery/firealarm/north, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) "eWm" = ( /obj/effect/floor_decal/corner/green{ dir = 5 @@ -10506,8 +10539,23 @@ /turf/simulated/wall, /area/engineering/atmos/storage) "fns" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/reagent_dispensers/extinguisher, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/light/small/emergency{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/wing/port) "fnP" = ( @@ -10550,16 +10598,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_office) -"fqa" = ( -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/floor_decal/spline/plain{ - dir = 9 - }, -/turf/simulated/floor/carpet/rubber, -/area/operations/lower/machinist) "fqg" = ( /obj/effect/floor_decal/corner/black/diagonal, /obj/effect/decal/cleanable/dirt, @@ -10860,12 +10898,6 @@ /obj/random/loot, /turf/simulated/floor/tiled/dark, /area/maintenance/aux_atmospherics/deck_2/starboard) -"fxD" = ( -/obj/effect/floor_decal/corner/black/diagonal, -/obj/machinery/recharge_station, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, -/area/operations/lower/machinist) "fyi" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -11134,12 +11166,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) -"fEY" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/strongroom) "fFx" = ( /obj/machinery/light/small{ dir = 8 @@ -11846,6 +11872,15 @@ }, /turf/simulated/floor/tiled, /area/storage/primary) +"fVz" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) "fVL" = ( /obj/structure/cable{ icon_state = "1-4" @@ -11938,6 +11973,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/full, /area/horizon/stairwell/central) +"fYN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) "fYW" = ( /obj/structure/table/rack, /obj/machinery/door/window/brigdoor/eastleft{ @@ -12211,14 +12256,9 @@ /obj/effect/floor_decal/corner/mauve{ dir = 10 }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "RDStorage"; - name = "Storage Lockdown"; - pixel_x = 7; - pixel_y = -25; - req_access = list(30) - }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/hallway) "gei" = ( @@ -12696,10 +12736,23 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/table/rack, /obj/effect/floor_decal/corner/black/full{ dir = 1 }, +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/window/southright{ + name = "Welding Fuel Tank Storage" + }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/operations/lower/machinist) "gnD" = ( @@ -13035,13 +13088,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/security/armory) -"guh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/closet/crate, -/obj/random/loot, -/turf/simulated/floor/plating, -/area/maintenance/wing/port) "guj" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 5 @@ -13093,17 +13139,6 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_room) -"guA" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/closet/secure_closet/machinist, -/obj/effect/floor_decal/corner/black{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, -/area/operations/lower/machinist) "guQ" = ( /obj/effect/floor_decal/corner/green/full, /turf/simulated/floor/tiled, @@ -13426,13 +13461,9 @@ /turf/simulated/floor/plating, /area/maintenance/substation/wing_port) "gBT" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/firealarm/east, /turf/simulated/floor/tiled/dark, /area/rnd/strongroom) "gCj" = ( @@ -13837,7 +13868,7 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "gKG" = ( -/obj/structure/reagent_dispensers/fueltank, +/obj/structure/reagent_dispensers/watertank, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/maintenance/wing/port) @@ -15684,7 +15715,7 @@ /obj/structure/table/standard, /obj/machinery/button/remote/blast_door{ dir = 4; - id = "shutters_deck1_workshopdesk"; + id = "shutters_deck2_workshopdesk"; name = "Machinist Workshop Desk Shutters"; pixel_x = -25; pixel_y = -7; @@ -16597,14 +16628,6 @@ }, /turf/simulated/floor/tiled, /area/maintenance/aux_atmospherics/deck_2/starboard/wing) -"iic" = ( -/obj/structure/closet/secure_closet/scientist, -/obj/effect/floor_decal/corner/mauve{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/outline/research, -/turf/simulated/floor/tiled/dark, -/area/rnd/strongroom) "iid" = ( /obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/spline/plain{ @@ -17838,6 +17861,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/security/prison) +"iNl" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "iNu" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -17885,21 +17915,20 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical) "iOD" = ( -/obj/structure/disposalpipe/junction/yjunction, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 + icon_state = "1-8" }, /turf/simulated/floor/tiled, /area/rnd/hallway) @@ -17930,18 +17959,6 @@ }, /turf/simulated/floor/lino/grey, /area/horizon/crew_quarters/lounge/bar) -"iPi" = ( -/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 = -13; - pixel_y = -6 - }, -/obj/effect/floor_decal/corner/black{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/operations/lower/machinist) "iQK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18223,6 +18240,17 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) +"iYo" = ( +/obj/effect/floor_decal/corner/mauve{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) "iYu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -20432,6 +20460,9 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/carpet/rubber, /area/operations/lower/machinist) "kbL" = ( @@ -20758,7 +20789,9 @@ /turf/simulated/floor/tiled, /area/security/prison) "kjO" = ( -/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /obj/structure/trash_pile, /turf/simulated/floor/plating, /area/maintenance/wing/port) @@ -20810,12 +20843,9 @@ /turf/space/dynamic, /area/template_noop) "knA" = ( -/obj/machinery/light, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -28 +/obj/effect/floor_decal/corner/black{ + dir = 9 }, -/obj/effect/floor_decal/corner/black/diagonal, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/operations/lower/machinist) @@ -21928,12 +21958,14 @@ /obj/effect/floor_decal/corner/mauve{ dir = 10 }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "RDStorage"; + name = "Storage Lockdown"; + pixel_x = -7; + pixel_y = -25; + req_access = list(30) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/hallway) "kVm" = ( @@ -22638,6 +22670,13 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, /area/horizon/kitchen) +"lmZ" = ( +/obj/random/junk, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "lng" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -23698,23 +23737,6 @@ "lPd" = ( /turf/simulated/floor, /area/maintenance/wing/port/far) -"lPk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/maintenance/wing/port) "lPn" = ( /obj/effect/floor_decal/corner/green{ dir = 5 @@ -25244,16 +25266,6 @@ /obj/machinery/computer/ship/navigation, /turf/simulated/floor/reinforced, /area/horizon/zta) -"mDi" = ( -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/full, -/area/maintenance/wing/port) "mDD" = ( /obj/machinery/light{ dir = 1 @@ -26184,6 +26196,20 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) +"mXS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/full, +/area/maintenance/wing/port) "mYp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -27916,6 +27942,9 @@ opacity = 0 }, /obj/structure/table/reinforced, +/obj/machinery/door/window/southright{ + name = "Research Desk" + }, /turf/simulated/floor/tiled/dark/full, /area/rnd/research) "nRF" = ( @@ -29505,11 +29534,17 @@ /turf/simulated/floor/tiled, /area/hallway/engineering/tesla) "oGK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/trash_pile, -/turf/simulated/floor/plating, -/area/maintenance/wing/port) +/obj/machinery/mecha_part_fabricator{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/simulated/floor/carpet/rubber, +/area/operations/lower/machinist) "oGR" = ( /obj/machinery/r_n_d/protolathe, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -29766,6 +29801,17 @@ }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) +"oPk" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve{ + dir = 6 + }, +/obj/structure/closet/secure_closet/scientist, +/obj/effect/floor_decal/industrial/outline/research, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) "oPC" = ( /obj/machinery/firealarm/west, /obj/effect/floor_decal/corner/yellow{ @@ -31157,11 +31203,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/full, /area/engineering/engine_airlock) -"pyV" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plating, -/area/maintenance/wing/port) "pzc" = ( /obj/effect/floor_decal/corner_wide/yellow{ dir = 5 @@ -33807,6 +33848,15 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/zta) +"qPP" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/item/material/shard{ + icon_state = "small" + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "qPY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -33977,7 +34027,10 @@ /turf/simulated/floor/tiled, /area/security/brig) "qTB" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/spline/plain/cee{ dir = 1 }, @@ -34473,12 +34526,8 @@ /turf/simulated/floor/tiled/dark, /area/turret_protected/ai) "rfO" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/turf/simulated/floor/plating, -/area/maintenance/wing/port) +/turf/simulated/wall/r_wall, +/area/operations/lower/machinist) "rgc" = ( /obj/structure/flora/pottedplant/random, /obj/effect/floor_decal/spline/fancy/wood{ @@ -36130,23 +36179,18 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room) "rUh" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/plasticflaps/mining, -/obj/machinery/door/blast/shutters/open{ - dir = 2 - }, /obj/machinery/conveyor{ dir = 1; - id = "rnd"; - layer = 2.9 + id = "rnd" }, /obj/machinery/door/firedoor, /obj/effect/floor_decal/spline/plain/cee, +/obj/structure/plasticflaps/mining, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "shutters_deck2_rescon"; + name = "Conveyor Shutter" + }, /turf/simulated/floor/carpet/rubber, /area/rnd/research) "rUu" = ( @@ -36556,6 +36600,14 @@ /obj/structure/girder, /turf/simulated/floor/plating, /area/maintenance/wing/port/far) +"sgl" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/closet/crate, +/obj/random/loot, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "sgp" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -37791,6 +37843,12 @@ /area/security/brig) "sRC" = ( /obj/effect/floor_decal/spline/plain, +/obj/machinery/button/switch/windowtint{ + pixel_x = -25; + dir = 4; + pixel_y = -4; + id = "polarized_deck2_workshop" + }, /turf/simulated/floor/tiled/white, /area/operations/lower/machinist) "sSY" = ( @@ -38936,11 +38994,14 @@ /turf/simulated/floor/tiled/dark, /area/rnd/strongroom) "twc" = ( -/obj/machinery/mecha_part_fabricator, -/obj/structure/railing/mapped, /obj/effect/floor_decal/spline/plain{ dir = 5 }, +/obj/machinery/conveyor{ + dir = 1; + id = "Robocompo" + }, +/obj/structure/plasticflaps, /turf/simulated/floor/carpet/rubber, /area/operations/lower/machinist) "two" = ( @@ -39166,6 +39227,13 @@ }, /turf/simulated/floor/tiled/ramp, /area/turret_protected/ai_upload_foyer) +"tCY" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "tDc" = ( /turf/simulated/floor/carpet/rubber, /area/rnd/research) @@ -39754,6 +39822,7 @@ /obj/effect/floor_decal/corner/black{ dir = 6 }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/operations/lower/machinist) "tPU" = ( @@ -40057,13 +40126,16 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port) "tYa" = ( -/obj/machinery/ringer{ - department = "Machinist Workshop"; - id = "robo_ringer"; - pixel_y = -32; - req_access = list(29) +/obj/machinery/light, +/obj/machinery/conveyor{ + dir = 1; + id = "Robocompo" }, -/turf/simulated/floor/tiled, +/obj/structure/plasticflaps, +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/turf/simulated/floor/carpet/rubber, /area/operations/lower/machinist) "tYj" = ( /turf/simulated/wall/r_wall, @@ -40811,10 +40883,10 @@ c_tag = "Operations - Machinist Workshop Starboard"; dir = 4 }, -/obj/machinery/firealarm/west, /obj/machinery/vending/robotics, /obj/effect/floor_decal/corner/black/full, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled, /area/operations/lower/machinist) "uoq" = ( @@ -41236,12 +41308,15 @@ /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "uxf" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "Robocompo" +/obj/machinery/mecha_part_fabricator{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 4 }, -/obj/effect/floor_decal/spline/plain, -/obj/structure/plasticflaps, /turf/simulated/floor/carpet/rubber, /area/operations/lower/machinist) "uxn" = ( @@ -41754,6 +41829,7 @@ /obj/effect/floor_decal/corner/mauve{ dir = 10 }, +/obj/machinery/firealarm/south, /turf/simulated/floor/tiled, /area/rnd/hallway) "uKV" = ( @@ -42510,6 +42586,11 @@ }, /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) +"veG" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "veO" = ( /obj/structure/bed/stool/chair/padded/black{ dir = 1 @@ -43910,11 +43991,13 @@ /turf/simulated/floor/tiled/full, /area/engineering/engine_airlock) "vPg" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 +/obj/machinery/mech_recharger, +/obj/effect/floor_decal/corner/black{ + dir = 9 }, -/turf/simulated/floor/plating, -/area/maintenance/wing/port) +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled, +/area/operations/lower/machinist) "vPj" = ( /turf/simulated/wall/r_wall, /area/security/armory) @@ -44142,6 +44225,10 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/lino/grey, /area/horizon/bar) +"vUK" = ( +/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor, +/turf/simulated/floor/tiled/dark/full, +/area/rnd/strongroom) "vUO" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 1 @@ -45420,6 +45507,13 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) +"wwR" = ( +/obj/structure/reagent_dispensers/extinguisher, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/port) "wxr" = ( /turf/simulated/wall, /area/medical/or1) @@ -45868,6 +45962,13 @@ name = "Research Shutters"; pixel_x = 8 }, +/obj/machinery/button/remote/blast_door{ + desc = "It controls the research shutters."; + id = "shutters_deck2_rescon"; + name = "Research Conveyor Shutter"; + pixel_x = 8; + pixel_y = 10 + }, /turf/simulated/floor/tiled/white, /area/rnd/research) "wGT" = ( @@ -46488,7 +46589,19 @@ /turf/simulated/floor/tiled/dark, /area/medical/gen_treatment) "wUS" = ( -/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/port) "wUU" = ( @@ -46716,11 +46829,16 @@ }, /obj/item/device/floor_painter, /obj/item/reagent_containers/weldpack, -/obj/machinery/light, /obj/effect/floor_decal/corner/black{ dir = 10 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/ringer{ + department = "Machinist Workshop"; + id = "robo_ringer"; + pixel_y = -32; + req_access = list(29) + }, /turf/simulated/floor/tiled, /area/operations/lower/machinist) "wZF" = ( @@ -47199,6 +47317,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/operations/lower/machinist) "xlQ" = ( @@ -47891,11 +48010,9 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "xGz" = ( -/obj/structure/closet/secure_closet/scientist, -/obj/effect/floor_decal/corner/mauve/full{ - dir = 1 +/obj/effect/floor_decal/corner/mauve{ + dir = 5 }, -/obj/effect/floor_decal/industrial/outline/research, /turf/simulated/floor/tiled/dark, /area/rnd/strongroom) "xGM" = ( @@ -48170,7 +48287,7 @@ icon_state = "1-8" }, /obj/effect/floor_decal/corner/black{ - dir = 10 + dir = 8 }, /turf/simulated/floor/tiled, /area/operations/lower/machinist) @@ -48226,9 +48343,19 @@ /obj/machinery/alarm{ pixel_y = 28 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate/old, /turf/simulated/floor/plating, /area/maintenance/wing/port) "xNO" = ( @@ -48308,9 +48435,19 @@ dir = 8 }, /obj/machinery/firealarm/east, -/obj/effect/floor_decal/corner/black/full{ - dir = 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 = -13; + pixel_y = -6 }, +/obj/effect/floor_decal/corner/black{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/operations/lower/machinist) "xQj" = ( @@ -48423,18 +48560,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/effect/floor_decal/corner/mauve{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "xSM" = ( @@ -49129,7 +49263,7 @@ /area/operations/office) "yhR" = ( /obj/structure/table/standard, -/obj/item/storage/box/fancy/tray/robotics, +/obj/item/storage/box/fancy/tray/machinist, /obj/effect/floor_decal/spline/plain{ dir = 9 }, @@ -73861,9 +73995,9 @@ ulB kXY qsj uTr -guA +ntg +ncx ncx -tYa wZw uTr xmw @@ -74269,12 +74403,12 @@ kbF oUZ ukT jPr -bUN cHz kaT +dev kaT cNU -mia +sgl ibU hrC erH @@ -74470,13 +74604,13 @@ uTr tld xkS kur -jPr -fxD +aWN +uTr +uTr +uTr uTr -aBa -vPg emN -mia +sgl ibU ljm aVf @@ -74674,9 +74808,9 @@ goQ aCP xMm knA +vPg +bAZ uTr -uTr -guh kaT dTj vNG @@ -74870,17 +75004,17 @@ cer vBO qhA qUz -nCG +bUN yhR qdf qfP +ncx +ncx +ncx dYe -fqa -aWN uTr -wUS kaT -mia +qPP vNG lLj unV @@ -75072,17 +75206,17 @@ qrx taf fKk rnA -nCG +bUN aTp sRC qfP -iPi -bAZ -uxf +ncx +ncx +ncx +dYe uTr -oGK -kaT -mia +tCY +kjO vNG kep cQu @@ -75274,17 +75408,17 @@ hfv pZQ wEq rnA -nCG +bUN xdr tSJ qfP -dYe +ncx dzI uxf +oGK uTr +veG kjO -kaT -mia vNG xMV fpj @@ -75483,9 +75617,9 @@ opW xQg twc drw +tYa uTr -wsW -mDi +kaT hps vNG sEk @@ -75678,16 +75812,16 @@ rbK iRq wpb kZL -kGX -kGX -kGX -kGX -kGX -kGX -kGX -kGX -pyV -kaT +rfO +rfO +rfO +rfO +rfO +rfO +rfO +rfO +uTr +iYf hps elh qPI @@ -75880,14 +76014,14 @@ cer gFa cda gec -kGX -fEO -wou -tjP -xzd -rom -rgR -kGX +xWb +hiq +aGx +hiq +hiq +hiq +hiq +mXS fns kaT hps @@ -76081,17 +76215,17 @@ gYm cer hIj xSA -vEg -goc -alr -cAx -rUZ -cdv -nOJ -smn +rnA kGX -wsW -iYf +kGX +kGX +kGX +kGX +kGX +kGX +kGX +wUS +wwR hps sGm sGm @@ -76285,15 +76419,15 @@ vBO oOi gUA kGX -iic -dkr -fEY -cdv -sHY -smn +fEO +wou +tjP +xzd +rom +rgR kGX wUS -kaT +iNl wAm cRr mst @@ -76486,16 +76620,16 @@ sig lKI nZu rnA -kGX +vUK xGz gBT -urh -tvX -qzF -vLu +fVz +cdv +nOJ +smn kGX xNJ -kaT +lmZ wAm wAm wAm @@ -76687,18 +76821,18 @@ jxs mdR pBn aov -lcG -kGX -kGX -kGX -kGX -kGX -kGX -kGX +vEg +goc +iYo +fYN +rUZ +cdv +sHY +smn kGX +wUS kaT -kaT -kaT +cAx kaT kaT uUz @@ -76890,15 +77024,15 @@ sig dZU iOD kVk -xWb -hiq -hiq -hiq -hiq -hiq -hiq -hiq -lPk +kGX +eWb +oPk +urh +tvX +qzF +vLu +kGX +wUS uUR wsW mEc @@ -77091,16 +77225,16 @@ weq sig kXY nnr -rnA -dOi -dOi -dOi -dOi -dOi -dOi -dOi -rfO -bGp +lcG +kGX +kGX +kGX +kGX +kGX +kGX +kGX +kGX +dVy eUp wsW hSG