From 3f8efac3c7d332d80d0bb5f4f1c4dc07e244b9e1 Mon Sep 17 00:00:00 2001 From: Guti <32563288+TheCaramelion@users.noreply.github.com> Date: Sat, 2 Dec 2023 16:20:40 +0100 Subject: [PATCH] Adds paperwork printers in departments (#7307) --- maps/southern_cross/southern_cross-2.dmm | 40 +++++++++++++--- maps/southern_cross/southern_cross-3.dmm | 60 +++++++++++++----------- 2 files changed, 66 insertions(+), 34 deletions(-) diff --git a/maps/southern_cross/southern_cross-2.dmm b/maps/southern_cross/southern_cross-2.dmm index 6c24e4dd4b..f1da7ac00c 100644 --- a/maps/southern_cross/southern_cross-2.dmm +++ b/maps/southern_cross/southern_cross-2.dmm @@ -14432,6 +14432,10 @@ /area/security/main) "aSH" = ( /obj/structure/table/standard, +/obj/item/weapon/form_printer{ + pixel_x = -3; + pixel_y = 7 + }, /obj/item/weapon/folder/red, /obj/item/clothing/glasses/hud/security, /obj/structure/cable/green{ @@ -20446,8 +20450,12 @@ dir = 4; health = 1e+006 }, -/obj/item/weapon/hand_labeler, /obj/machinery/door/firedoor/border_only, +/obj/item/weapon/form_printer{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/weapon/hand_labeler, /obj/machinery/door/blast/shutters{ dir = 4; id = "Warden_Shutters"; @@ -22358,6 +22366,10 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, +/obj/item/weapon/form_printer{ + pixel_x = -3; + pixel_y = 4 + }, /obj/item/device/defib_kit/loaded, /turf/simulated/floor/tiled/white, /area/medical/reception) @@ -23838,6 +23850,10 @@ /obj/effect/floor_decal/corner/brown/bordercorner{ dir = 1 }, +/obj/item/weapon/form_printer{ + pixel_x = -3; + pixel_y = 7 + }, /turf/simulated/floor/tiled, /area/quartermaster/office) "bvv" = ( @@ -30982,6 +30998,10 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, +/obj/item/weapon/form_printer{ + pixel_x = -10; + pixel_y = 7 + }, /turf/simulated/floor/tiled, /area/security/lobby) "bSI" = ( @@ -34198,6 +34218,10 @@ /obj/item/weapon/handcuffs, /obj/item/weapon/storage/fancy/cigarettes/dromedaryco, /obj/item/device/tape/random, +/obj/item/weapon/form_printer{ + pixel_x = -3; + pixel_y = 7 + }, /obj/item/device/taperecorder{ pixel_x = -4; pixel_y = 2 @@ -60016,10 +60040,10 @@ dir = 6 }, /obj/machinery/button/holosign{ - pixel_x = -11; - pixel_y = -24; + id = "chemon"; name = "Chemist on duty sign"; - id = "chemon" + pixel_x = -11; + pixel_y = -24 }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) @@ -60686,9 +60710,9 @@ }, /obj/structure/cable/green, /obj/machinery/button/holosign{ - pixel_x = -35; - name = "Roboticist on duty sign"; id = "roboton"; + name = "Roboticist on duty sign"; + pixel_x = -35; pixel_y = 9 }, /turf/simulated/floor/tiled/white, @@ -65649,6 +65673,10 @@ c_tag = "SCI - R&D Lab Aft"; dir = 1 }, +/obj/item/weapon/form_printer{ + pixel_x = -3; + pixel_y = 7 + }, /turf/simulated/floor/tiled/white, /area/rnd/lab) "oJi" = ( diff --git a/maps/southern_cross/southern_cross-3.dmm b/maps/southern_cross/southern_cross-3.dmm index 258af808e2..d6d2bf38d4 100644 --- a/maps/southern_cross/southern_cross-3.dmm +++ b/maps/southern_cross/southern_cross-3.dmm @@ -2120,9 +2120,9 @@ /area/ai) "bXC" = ( /obj/machinery/atmospherics/omni/atmos_filter{ + tag_east = 2; tag_south = 6; - tag_west = 1; - tag_east = 2 + tag_west = 1 }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/dormsatmos) @@ -3738,8 +3738,8 @@ "dyU" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/flag/catpirate/right{ - name = "Horned skull flag"; - desc = "Rattle my bones, horned skull cuisuine!" + desc = "Rattle my bones, horned skull cuisuine!"; + name = "Horned skull flag" }, /turf/simulated/wall/r_wall, /area/maintenance/thirddeck/hiddenkitchen) @@ -8173,9 +8173,9 @@ /area/hallway/primary/thirddeck/starboard) "gzV" = ( /obj/machinery/atmospherics/omni/atmos_filter{ - tag_west = 1; tag_east = 2; - tag_south = 7 + tag_south = 7; + tag_west = 1 }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/dormsatmos) @@ -9708,9 +9708,9 @@ "igE" = ( /obj/machinery/atmospherics/omni/atmos_filter{ tag_east = 2; - tag_west = 1; + tag_north = 5; tag_south = 3; - tag_north = 5 + tag_west = 1 }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/dormsatmos) @@ -11138,6 +11138,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/item/weapon/form_printer{ + pixel_x = -3; + pixel_y = 7 + }, /turf/simulated/floor/carpet, /area/bridge/meeting_room) "jMJ" = ( @@ -14007,8 +14011,8 @@ "mzR" = ( /obj/machinery/atmospherics/binary/pump/on{ dir = 4; - target_pressure = 301.325; - name = "Scrubber to Waste" + name = "Scrubber to Waste"; + target_pressure = 301.325 }, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -14832,7 +14836,7 @@ /area/bridge/meeting_room) "npi" = ( /obj/structure/table/wooden_reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/weapon/form_printer{ pixel_x = -3; pixel_y = 7 }, @@ -19244,30 +19248,30 @@ "rdH" = ( /obj/structure/closet/cabinet, /obj/item/weapon/storage/box/capguntoy{ - pixel_y = -5; - pixel_x = 6 + pixel_x = 6; + pixel_y = -5 }, /obj/random/drinkbottle{ - pixel_y = -1; - pixel_x = -5 + pixel_x = -5; + pixel_y = -1 }, /obj/random/drinkbottle{ - pixel_y = -1; - pixel_x = -5 + pixel_x = -5; + pixel_y = -1 }, /obj/random/drinkbottle{ - pixel_y = -1; - pixel_x = -5 + pixel_x = -5; + pixel_y = -1 }, /obj/item/stack/material/plastic{ - pixel_y = 0; + amount = 25; pixel_x = -7; - amount = 25 + pixel_y = 0 }, /obj/item/stack/material/steel{ amount = 25; - pixel_y = 3; - pixel_x = -7 + pixel_x = -7; + pixel_y = 3 }, /obj/item/stack/material/glass{ amount = 25; @@ -19286,9 +19290,9 @@ pixel_y = 6 }, /obj/item/stack/material/wood{ - pixel_y = 0; + amount = 20; pixel_x = -10; - amount = 20 + pixel_y = 0 }, /turf/simulated/wall/r_wall, /area/maintenance/thirddeck/hiddenkitchen) @@ -20000,8 +20004,8 @@ /area/maintenance/thirddeck/dormsatmos) "rNS" = ( /obj/machinery/atmospherics/omni/atmos_filter{ - tag_north = 4; tag_east = 1; + tag_north = 4; tag_west = 2 }, /turf/simulated/floor/plating, @@ -25101,8 +25105,8 @@ /area/crew_quarters/sleep/vistor_room_12) "wcv" = ( /obj/machinery/gibber{ - req_access = null; - emagged = 1 + emagged = 1; + req_access = null }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/hiddenkitchen)