From ab93a38e9cd6303347a9a7efe4cfc06b7d7f3c88 Mon Sep 17 00:00:00 2001 From: Mickyan Date: Fri, 28 Feb 2020 01:23:29 +0100 Subject: [PATCH 1/3] art gallery --- _maps/map_files/PubbyStation/PubbyStation.dmm | 1130 ++++++++++++++--- code/game/area/Space_Station_13_areas.dm | 4 + code/modules/power/lighting.dm | 5 + 3 files changed, 967 insertions(+), 172 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 54f60593d79..0bb6df57e9c 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -34447,6 +34447,13 @@ }, /turf/open/floor/plasteel, /area/science/mixing) +"bHH" = ( +/obj/structure/bookcase/random/religion, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/library/lounge) "bHI" = ( /obj/structure/grille/broken, /turf/open/space/basic, @@ -44772,12 +44779,6 @@ "ckH" = ( /turf/open/floor/plasteel/dark, /area/library) -"ckI" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/library/lounge) "ckJ" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, @@ -47638,9 +47639,6 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cvy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -47651,6 +47649,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cvA" = ( @@ -47763,12 +47762,8 @@ /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cvM" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-10" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/structure/cable, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) "cvR" = ( @@ -49126,6 +49121,22 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/disposal) +"dbI" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/sign/painting/library{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "dci" = ( /obj/structure/rack, /obj/item/gun/energy/laser/practice, @@ -49353,6 +49364,13 @@ icon_state = "platingdmg1" }, /area/maintenance/department/engine) +"dCh" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/sign/painting/library_private{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "dJm" = ( /obj/machinery/door/airlock/research/glass{ name = "Research Pit"; @@ -49481,6 +49499,17 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"ebp" = ( +/obj/structure/sign/plaques/kiddie{ + desc = "It reads: PRIVATE EXHIBIT - Please inquire with library staff for guided tours."; + name = "\improper Private Section Notice"; + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "ebD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -49557,6 +49586,12 @@ /obj/structure/chair/office, /turf/open/floor/wood, /area/lawoffice) +"elH" = ( +/obj/structure/sign/painting/library{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "emV" = ( /turf/open/space, /area/space/nearstation) @@ -49626,6 +49661,9 @@ /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, /area/engine/engineering) +"ewV" = ( +/turf/open/floor/carpet, +/area/library/artgallery) "ezF" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -49845,6 +49883,12 @@ /obj/machinery/atmospherics/components/trinary/filter, /turf/open/floor/plasteel/dark, /area/maintenance/disposal/incinerator) +"fdN" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "fdQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49904,6 +49948,13 @@ }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) +"fgB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/library/artgallery) "fhE" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -49980,6 +50031,10 @@ dir = 1 }, /area/hallway/secondary/exit/departure_lounge) +"fnq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/carpet, +/area/library/artgallery) "fon" = ( /obj/structure/lattice, /obj/structure/grille, @@ -50078,6 +50133,16 @@ }, /turf/closed/wall, /area/science/mixing) +"fwx" = ( +/obj/structure/sign/painting/library_secure{ + pixel_y = -32 + }, +/obj/structure/table/wood/fancy, +/obj/item/stack/sheet/bone{ + pixel_y = 6 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "fwI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, @@ -50098,6 +50163,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/maintenance/department/engine) +"fAe" = ( +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 2 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "fBp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/orange/visible/layer3, @@ -50153,6 +50225,20 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"fGm" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "fIN" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -50180,6 +50266,23 @@ }, /turf/open/floor/plating, /area/maintenance/department/cargo) +"fPk" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "fQf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -50359,6 +50462,10 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"gkQ" = ( +/obj/structure/table/wood, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "gkR" = ( /obj/item/twohanded/required/kirbyplants/random, /obj/structure/extinguisher_cabinet{ @@ -50474,6 +50581,30 @@ heat_capacity = 1e+006 }, /area/hallway/secondary/exit/departure_lounge) +"gtl" = ( +/obj/item/toy/crayon/black, +/obj/item/toy/crayon/white{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/toy/crayon/black, +/obj/item/toy/crayon/white{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/structure/table/wood, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/obj/machinery/power/apc{ + dir = 1; + name = "Monastery Art Gallery APC"; + pixel_y = 23 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "gue" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -50703,6 +50834,12 @@ }, /turf/closed/wall, /area/science/mixing) +"gMG" = ( +/obj/structure/table/wood, +/obj/item/newspaper, +/obj/item/reagent_containers/food/drinks/coffee, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "gMO" = ( /obj/structure/plasticflaps/opaque, /obj/structure/window/reinforced, @@ -50779,6 +50916,19 @@ }, /turf/open/floor/plasteel/dark, /area/science/genetics) +"gXh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/structure/sign/painting/library_private{ + pixel_x = 32 + }, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "gXQ" = ( /obj/effect/turf_decal/tile/yellow, /obj/structure/cable, @@ -50940,6 +51090,14 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/primary/central) +"hwY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet{ + pixel_x = -24 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "hxn" = ( /obj/structure/window/reinforced{ dir = 1 @@ -51127,6 +51285,10 @@ }, /turf/open/space/basic, /area/engine/engineering) +"hTS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "hUt" = ( /obj/structure/closet/crate{ icon_state = "crateopen" @@ -51195,6 +51357,25 @@ /obj/structure/chair/stool, /turf/open/floor/plasteel, /area/engine/engineering) +"hZf" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "hZQ" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 9 @@ -51232,6 +51413,14 @@ /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/library) +"icy" = ( +/obj/machinery/door/airlock/grunge{ + name = "Art Storage" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "idA" = ( /obj/structure/cable, /obj/machinery/power/port_gen/pacman, @@ -51285,6 +51474,16 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"iiJ" = ( +/obj/machinery/door/window/northright{ + base_state = "left"; + dir = 1; + icon_state = "left"; + name = "Secure Art Exhibit"; + req_access_txt = "37" + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "ijF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, @@ -51332,6 +51531,10 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) +"ipj" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/mineral/iron, +/area/library/artgallery) "ipH" = ( /obj/effect/turf_decal/caution, /obj/effect/turf_decal/stripes/line{ @@ -51354,6 +51557,10 @@ }, /turf/open/floor/plasteel, /area/engine/lobby) +"irO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/carpet, +/area/library/artgallery) "itl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -51488,6 +51695,24 @@ }, /turf/open/floor/plasteel/white, /area/storage/emergency/port) +"iJb" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "iJi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -51605,6 +51830,9 @@ }, /turf/open/floor/plating, /area/engine/engineering) +"iYT" = ( +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "jcB" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -51926,6 +52154,17 @@ }, /turf/open/floor/engine, /area/engine/supermatter) +"jOw" = ( +/obj/structure/table/wood/fancy, +/obj/structure/sign/painting/library_secure{ + pixel_y = -32 + }, +/obj/machinery/light/dim, +/obj/item/reagent_containers/food/drinks/trophy{ + pixel_y = 10 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "jOB" = ( /turf/open/floor/plating, /area/storage/emergency/starboard) @@ -52196,6 +52435,12 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) +"kvv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/open/floor/carpet, +/area/library/artgallery) "kwm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -52254,6 +52499,24 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"kzj" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/structure/chair/wood, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "kAa" = ( /obj/structure/chair{ dir = 8 @@ -52309,6 +52572,12 @@ }, /turf/open/floor/wood, /area/maintenance/department/engine) +"kEk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "kEL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -52380,6 +52649,23 @@ }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) +"kFP" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "kIo" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -52530,6 +52816,13 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"kVM" = ( +/obj/structure/sign/painting/library_private{ + pixel_x = 32 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "kVO" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -52554,6 +52847,21 @@ }, /turf/open/floor/plating, /area/engine/engineering) +"kZU" = ( +/obj/structure/table/wood/fancy, +/obj/structure/sign/painting/library_secure{ + pixel_y = -32 + }, +/obj/item/kitchen/knife/combat/bone{ + desc = "An old bone sharpened into a blade. It's rather dull nowadays."; + force = 8; + name = "ancient bone dagger"; + pixel_y = 6; + throwforce = 8 + }, +/obj/machinery/light/dim, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "lbC" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -52640,6 +52948,12 @@ }, /turf/open/floor/plasteel, /area/storage/primary) +"lpU" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/closed/mineral, +/area/chapel/asteroid/monastery) "lqc" = ( /obj/item/toy/gun, /obj/effect/decal/cleanable/oil, @@ -52672,6 +52986,14 @@ }, /turf/open/space, /area/space/nearstation) +"lto" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, +/obj/machinery/light/dim{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "ltu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/closed/wall/r_wall, @@ -53196,6 +53518,12 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/science) +"mFu" = ( +/obj/machinery/light/dim{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "mHy" = ( /obj/item/storage/fancy/cigarettes/cigpack_shadyjims, /turf/open/floor/wood, @@ -53286,6 +53614,22 @@ /obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/dark, /area/science/genetics) +"mTp" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "mTS" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -53414,6 +53758,32 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) +"niN" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) +"njB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "nku" = ( /obj/machinery/door/airlock/centcom{ name = "Crematorium"; @@ -53496,6 +53866,10 @@ /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/science/xenobiology) +"nrg" = ( +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "nsy" = ( /obj/structure/table, /obj/item/stack/sheet/metal/fifty, @@ -53601,6 +53975,12 @@ }, /turf/open/floor/plasteel/white, /area/science/explab) +"nBO" = ( +/obj/machinery/light/dim{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "nDo" = ( /obj/structure/bed, /turf/open/floor/plating, @@ -53672,6 +54052,18 @@ }, /turf/open/floor/engine, /area/science/explab) +"nKQ" = ( +/obj/structure/sign/painting/library_private{ + pixel_x = 32 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + external_pressure_bound = 140; + name = "server vent"; + pressure_checks = 0 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "nLl" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -53744,10 +54136,45 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/engine/engineering) +"nPm" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/light/dim{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "nPA" = ( /obj/item/chair, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"nQb" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "nQc" = ( /obj/structure/table, /obj/item/stack/sheet/metal/fifty, @@ -53780,6 +54207,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/lawoffice) +"nSJ" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/library/artgallery) "nUq" = ( /obj/machinery/atmospherics/pipe/layer_manifold/visible{ dir = 4 @@ -53794,10 +54227,28 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"nVN" = ( +/obj/item/storage/crayons{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/crayons, +/obj/structure/table/wood, +/obj/structure/sign/poster/official/soft_cap_pop_art{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "nVU" = ( /obj/item/twohanded/spear, /turf/open/floor/plating, /area/maintenance/department/engine) +"nWF" = ( +/obj/structure/sign/painting/library_private{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "nWP" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -54056,6 +54507,11 @@ "ovX" = ( /turf/open/floor/plasteel, /area/engine/lobby) +"owx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "owS" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -54066,6 +54522,15 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/office) +"oya" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/camera{ + c_tag = "Monastery Art Gallery"; + dir = 8; + network = list("ss13","monastery") + }, +/turf/open/floor/carpet, +/area/library/artgallery) "oyF" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, @@ -54436,6 +54901,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/department/engine) +"phR" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "pkM" = ( /obj/machinery/door/airlock/external{ req_access_txt = "22" @@ -54572,6 +55046,15 @@ }, /turf/open/floor/plating/airless, /area/maintenance/disposal/incinerator) +"pIy" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "pKd" = ( /obj/effect/spawner/lootdrop/maintenance/two, /obj/structure/closet/crate, @@ -54652,6 +55135,10 @@ }, /turf/closed/wall/r_wall, /area/medical/virology) +"pQA" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/carpet, +/area/library/artgallery) "pSc" = ( /obj/machinery/chem_heater, /obj/item/radio/intercom{ @@ -54884,6 +55371,22 @@ }, /turf/open/floor/plasteel, /area/science/mixing) +"qtD" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "qtF" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -55169,6 +55672,16 @@ }, /turf/open/floor/wood, /area/maintenance/department/engine) +"reR" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm{ + pixel_y = 22 + }, +/obj/effect/decal/cleanable/cobweb, +/obj/item/camera, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "reV" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -55203,6 +55716,12 @@ icon_state = "wood-broken4" }, /area/maintenance/department/engine) +"rie" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "riF" = ( /obj/machinery/computer/arcade, /obj/effect/turf_decal/tile/neutral{ @@ -55269,6 +55788,12 @@ luminosity = 2 }, /area/maintenance/department/science) +"roy" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "rrb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, @@ -55304,6 +55829,12 @@ }, /turf/open/floor/plasteel, /area/tcommsat/computer) +"rta" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall/mineral/iron, +/area/library/artgallery) "rtG" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 @@ -55808,6 +56339,15 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"sBW" = ( +/obj/structure/closet/crate/bin, +/obj/item/reagent_containers/glass/rag, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "sDY" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -56130,6 +56670,14 @@ /obj/machinery/portable_atmospherics/canister, /turf/open/floor/engine, /area/engine/engineering) +"tqW" = ( +/obj/machinery/door/window/northright{ + dir = 1; + name = "Secure Art Exhibit"; + req_access_txt = "37" + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "tqX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -56193,6 +56741,11 @@ }, /turf/open/floor/plating, /area/engine/engineering) +"txB" = ( +/obj/structure/bookcase/random/adult, +/obj/machinery/light/small, +/turf/open/floor/plasteel/dark, +/area/library/lounge) "typ" = ( /obj/structure/table/glass, /obj/item/hemostat, @@ -56228,6 +56781,18 @@ /obj/item/pen, /turf/open/floor/plasteel/dark, /area/science/explab) +"tBb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/machinery/camera{ + c_tag = "Monastery Art Storage"; + dir = 4; + network = list("ss13","monastery") + }, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "tCP" = ( /obj/docking_port/stationary/public_mining_dock, /turf/open/floor/plating, @@ -56236,6 +56801,14 @@ /obj/item/wrench, /turf/open/floor/plating, /area/maintenance/department/cargo) +"tFt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/structure/sign/painting/library_private{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "tHk" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -56273,6 +56846,12 @@ }, /turf/open/floor/plating, /area/engine/engineering) +"tJH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "tJX" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -56280,6 +56859,25 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/engine, /area/engine/engineering) +"tKm" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) +"tNT" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "tPm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56391,6 +56989,16 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"tXV" = ( +/obj/machinery/door/airlock/grunge{ + name = "Art Gallery" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "tYF" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -56544,6 +57152,16 @@ }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) +"umO" = ( +/obj/machinery/door/morgue{ + name = "Private Exhibit"; + req_access_txt = "37" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "uoj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -56714,6 +57332,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/department/engine) +"uIv" = ( +/obj/structure/bookcase/random/adult, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "uLi" = ( /obj/structure/chair/office/light, /obj/structure/disposalpipe/segment, @@ -56860,6 +57483,22 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"vek" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "veM" = ( /obj/machinery/suit_storage_unit/rd, /obj/machinery/light{ @@ -57002,6 +57641,14 @@ /obj/item/clothing/mask/gas, /turf/open/floor/plating, /area/maintenance/department/science) +"vvY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet{ + pixel_x = 24 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "vxp" = ( /obj/machinery/door/window/eastright{ base_state = "left"; @@ -57015,6 +57662,22 @@ /obj/item/assembly/mousetrap, /turf/open/floor/engine, /area/science/explab) +"vzg" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "vzz" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -57114,6 +57777,12 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"vMn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/closed/wall/mineral/iron, +/area/library/artgallery) "vMx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -57314,6 +57983,9 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/main/monastery) +"whJ" = ( +/turf/closed/wall/mineral/iron, +/area/library/artgallery) "wig" = ( /obj/machinery/vending/cigarette, /turf/open/floor/plating{ @@ -57373,6 +58045,17 @@ /obj/structure/chair, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"woX" = ( +/obj/structure/sign/painting/library_secure{ + pixel_y = -32 + }, +/obj/structure/table/wood/fancy, +/obj/item/reagent_containers/glass/mortar{ + pixel_y = 8 + }, +/obj/item/pestle, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "wpI" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -57475,6 +58158,30 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) +"wBO" = ( +/obj/item/toy/crayon/spraycan{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/toy/crayon/spraycan, +/obj/structure/table/wood, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) +"wCj" = ( +/obj/item/paint/paint_remover{ + pixel_y = 8 + }, +/obj/structure/table/wood, +/obj/item/soap/nanotrasen, +/obj/structure/sign/poster/official/fruit_bowl{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "wDm" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -57546,6 +58253,26 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/department/engine) +"wIX" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/library/artgallery) +"wJL" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/sign/painting/library{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "wKa" = ( /obj/machinery/light/small, /turf/open/floor/plating, @@ -57597,6 +58324,12 @@ }, /turf/open/floor/plating, /area/science/mixing) +"wPj" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall/mineral/iron, +/area/library/artgallery) "wQU" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/pipe/simple/general/hidden{ @@ -57821,6 +58554,19 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) +"xkB" = ( +/obj/structure/closet/crate, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXnineteen, +/obj/item/canvas/twentythreeXnineteen, +/obj/item/canvas/twentythreeXnineteen, +/obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/nineteenXnineteen, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "xlA" = ( /obj/structure/table/glass, /obj/effect/turf_decal/tile/neutral{ @@ -57968,6 +58714,13 @@ icon_state = "panelscorched" }, /area/maintenance/department/security/brig) +"xyJ" = ( +/obj/structure/sign/painting/library{ + pixel_x = -32 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "xzp" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -58065,6 +58818,13 @@ /obj/machinery/navbeacon/wayfinding/lawyer, /turf/open/floor/plasteel/dark, /area/lawoffice) +"xMQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/dim{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "xNx" = ( /obj/structure/lattice, /obj/structure/disposalpipe/junction/flip, @@ -58146,6 +58906,23 @@ }, /turf/open/floor/plasteel, /area/science/xenobiology) +"xXB" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/chapel/main/monastery) "ybX" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, @@ -58206,6 +58983,15 @@ /obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/department/cargo) +"yii" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/airalarm{ + pixel_y = 22 + }, +/turf/open/floor/plasteel/dark, +/area/library/artgallery) "ylb" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -76661,7 +77447,7 @@ chn cfE cfE cvy -cfG +ctL cwe cwe fWv @@ -76917,15 +77703,15 @@ cvc cho cvk cdx -cvc +xXB cvM cfm cwe -fWv +bHH qOE mKc qOE -cln +txB cwe caS aht @@ -77174,14 +77960,14 @@ cfm ciF cuQ cfm -cfm -cfm -cfm +wPj +tXV +whJ cwe ckp -ckI +qOE ckX -ckI +qOE cln cwe cfN @@ -77431,9 +78217,9 @@ cio chq ciX cfm -cfN -cfN -cfN +yii +fPk +fdN cwe cwe cwe @@ -77688,19 +78474,19 @@ cgM chr chL cfm +niN +njB +kFP +whJ +xyJ +dbI +nBO +dbI +elH +whJ +whJ +whJ cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -aaa aaa aaa aaa @@ -77945,18 +78731,18 @@ cip chs ciY cfm -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN +pIy +fPk +rie +whJ +tNT +mTp +tNT +tNT +tNT +fAe +kZU +whJ cfN aaa aaa @@ -78202,20 +78988,20 @@ cfm cht cfm cfm +nPm +nrg +fGm +fnq +fnq +pQA +ewV +ewV +ewV +iiJ +fwx +whJ cfN cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -aaa aaa aaa aht @@ -78459,20 +79245,20 @@ ciq chu ciZ cfm +phR +iJb +hTS +oya +nSJ +fgB +irO +kvv +ewV +tqW +woX +whJ cfN cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -aaa aaa aaa aht @@ -78716,20 +79502,20 @@ cfm cfm cfm cfm +niN +njB +qtD +whJ +vzg +nQb +tNT +vek +tNT +fAe +jOw +whJ cfN cfN -cfN -cfN -cfN -cfN -aaa -aaa -cfN -cfN -cfN -cfN -aaa -aaa aaa aaa aht @@ -78964,28 +79750,28 @@ crO crO crO crO -crO -crO +lpU +lpU +whJ +gtl +tBb +lto +hwY +owx +icy +vvY +kzj +gMG +whJ +ebp +hZf +mFu +wJL +iYT +whJ +whJ +whJ cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cfN -aaa -aaa -aaa -aaa -cfN -cfN -aaa -aaa aaa aaa aaa @@ -79222,27 +80008,27 @@ aaa aaa aaa aaa -aaa -aaa +cfN +whJ +wCj +tKm +tNT +tNT +roy +ipj +vMn +whJ +whJ +whJ +umO +rta +whJ +whJ +whJ +whJ cfN cfN cfN -cfN -cfN -cfN -cfN -cfN -cfN -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa cfN @@ -79479,26 +80265,26 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +cfN +whJ +wBO +fdN +qtD +qtD +kEk +whJ +reR +tFt +dCh +dCh +tJH +sBW +whJ +cfN cfN cfN cfN cfN -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -79736,22 +80522,22 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cfN +whJ +nVN +gkQ +gkQ +gkQ +xkB +whJ +uIv +kVM +nWF +xMQ +nKQ +gXh +whJ +cfN aaa aaa aaa @@ -79994,20 +80780,20 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +whJ +whJ +wIX +wIX +wIX +wIX +whJ +whJ +whJ +whJ +whJ +whJ +whJ +whJ aaa aaa aaa diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index bbc117ec3f6..e7cbea92bfd 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -427,6 +427,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Library Lounge" icon_state = "library" +/area/library/artgallery + name = " Art Gallery" + icon_state = "library" + /area/library/abandoned name = "Abandoned Library" icon_state = "library" diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 34914b1c990..2ffaf6e5871 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -243,6 +243,11 @@ status = LIGHT_BROKEN icon_state = "tube-broken" +/obj/machinery/light/dim + nightshift_allowed = FALSE + bulb_colour = "#FFDDCC" + bulb_power = 0.8 + // the smaller bulb light fixture /obj/machinery/light/small From b1ab5f01f4dcc7b15780c7a28675e5864fa16814 Mon Sep 17 00:00:00 2001 From: Mickyan Date: Fri, 28 Feb 2020 16:04:19 +0100 Subject: [PATCH 2/3] fixes --- _maps/map_files/PubbyStation/PubbyStation.dmm | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 0bb6df57e9c..516339afbde 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -52948,12 +52948,6 @@ }, /turf/open/floor/plasteel, /area/storage/primary) -"lpU" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/closed/mineral, -/area/chapel/asteroid/monastery) "lqc" = ( /obj/item/toy/gun, /obj/effect/decal/cleanable/oil, @@ -53868,6 +53862,9 @@ /area/science/xenobiology) "nrg" = ( /obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/library/artgallery) "nsy" = ( @@ -57647,6 +57644,9 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 24 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/library/artgallery) "vxp" = ( @@ -58714,13 +58714,6 @@ icon_state = "panelscorched" }, /area/maintenance/department/security/brig) -"xyJ" = ( -/obj/structure/sign/painting/library{ - pixel_x = -32 - }, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plasteel/dark, -/area/library/artgallery) "xzp" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -78478,7 +78471,7 @@ niN njB kFP whJ -xyJ +elH dbI nBO dbI @@ -79750,8 +79743,8 @@ crO crO crO crO -lpU -lpU +cfN +cfN whJ gtl tBb From f0eccbee9b02fe2023d0ad37c323d6cfa0a6ef84 Mon Sep 17 00:00:00 2001 From: Mickyan Date: Fri, 28 Feb 2020 20:14:52 +0100 Subject: [PATCH 3/3] firelocks and some details --- _maps/map_files/PubbyStation/PubbyStation.dmm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 516339afbde..d1a94c845bf 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -51419,6 +51419,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/dark, /area/library/artgallery) "idA" = ( @@ -56994,6 +56995,7 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel/dark, /area/library/artgallery) "tYF" = ( @@ -58565,6 +58567,11 @@ /obj/item/canvas/nineteenXnineteen, /obj/item/canvas/nineteenXnineteen, /obj/item/canvas/nineteenXnineteen, +/obj/item/wirecutters, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, /turf/open/floor/plasteel/dark, /area/library/artgallery) "xlA" = ( @@ -58983,6 +58990,10 @@ /obj/machinery/airalarm{ pixel_y = 22 }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -28 + }, /turf/open/floor/plasteel/dark, /area/library/artgallery) "ylb" = (