From 17768dd8e845b6aba4f9f0855c92683a5c50bc7f Mon Sep 17 00:00:00 2001 From: partykp Date: Thu, 23 Apr 2020 21:28:50 +0200 Subject: [PATCH 1/3] redefines hop paperwork meta --- _maps/map_files/YogStation/YogStation.dmm | 84 +++++++++++++++-------- 1 file changed, 56 insertions(+), 28 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index d04866db6593..7a7003f0cab1 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -29532,18 +29532,6 @@ "bjB" = ( /turf/open/floor/plating, /area/maintenance/central) -"bjC" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - areastring = "/area/bridge/meeting_room"; - dir = 4; - name = "Conference Room APC"; - pixel_x = 24 - }, -/turf/open/floor/plating, -/area/maintenance/central) "bjD" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty, @@ -30917,11 +30905,6 @@ "bmo" = ( /turf/closed/wall, /area/crew_quarters/heads/hop) -"bmp" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/central) "bmq" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -33162,10 +33145,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/office) -"bqv" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/hallway/primary/central) "bqw" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -51163,6 +51142,16 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/hallway/primary/central) +"dEe" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "dEY" = ( /obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, @@ -54173,6 +54162,19 @@ /obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"kMd" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + areastring = "/area/bridge/meeting_room"; + dir = 4; + name = "Conference Room APC"; + pixel_x = 24 + }, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/central) "kNE" = ( /obj/structure/lattice, /obj/machinery/door/poddoor/preopen{ @@ -55960,6 +55962,17 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"pln" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/item/pen, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "pmW" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance"; @@ -57100,6 +57113,14 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/plasteel, /area/storage/tools) +"rRX" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/pen, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "rVk" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -58175,6 +58196,13 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"ugX" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "uiz" = ( /obj/structure/table, /obj/item/storage/box/lights/mixed, @@ -86916,10 +86944,10 @@ bkT mlj mlj boX -bqv -bqv -bqv -bqv +pln +rRX +rRX +dEe bwg aJw aJq @@ -87170,8 +87198,8 @@ bgH bie bjB bkW -bmp mlj +ugX bpa bqy cBr @@ -87427,7 +87455,7 @@ aZP aZP bjA bqG -bmo +bmr bmr boZ bqx @@ -87939,7 +87967,7 @@ bdY aMv bgI aZP -bjC +kMd bkX bmo bnO From fdfc9dfd422d0acd3ac67ce7986385697e60cdea Mon Sep 17 00:00:00 2001 From: partykp Date: Thu, 23 Apr 2020 22:42:32 +0200 Subject: [PATCH 2/3] cubicles --- _maps/map_files/YogStation/YogStation.dmm | 134 +++++++++++++--------- 1 file changed, 79 insertions(+), 55 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 7a7003f0cab1..158fa5afce9e 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -51142,16 +51142,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/hallway/primary/central) -"dEe" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "dEY" = ( /obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, @@ -52211,6 +52201,19 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/tcommsat/entrance) +"giU" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + areastring = "/area/bridge/meeting_room"; + dir = 4; + name = "Conference Room APC"; + pixel_x = 24 + }, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/central) "gjl" = ( /turf/closed/wall, /area/quartermaster/warehouse) @@ -52513,6 +52516,15 @@ }, /turf/open/floor/plasteel/dark, /area/engine/atmos) +"gRd" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "gUn" = ( /obj/machinery/button/door{ id = "atmos"; @@ -52990,6 +53002,19 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"hXh" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/chair/stool{ + pixel_x = 1 + }, +/obj/machinery/door/window/eastright, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "hXW" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, @@ -53099,6 +53124,18 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/science/nanite) +"iuy" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/chair/stool{ + pixel_x = 1; + pixel_y = 8 + }, +/obj/machinery/door/window/eastleft, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "iuF" = ( /obj/machinery/telecomms/server/presets/security, /obj/effect/turf_decal/tile/neutral{ @@ -54162,19 +54199,6 @@ /obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"kMd" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - areastring = "/area/bridge/meeting_room"; - dir = 4; - name = "Conference Room APC"; - pixel_x = 24 - }, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/central) "kNE" = ( /obj/structure/lattice, /obj/machinery/door/poddoor/preopen{ @@ -55962,17 +55986,6 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"pln" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/item/pen, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "pmW" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance"; @@ -57113,14 +57126,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/plasteel, /area/storage/tools) -"rRX" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/pen, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "rVk" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -58048,6 +58053,18 @@ "tQD" = ( /turf/closed/wall/r_wall, /area/maintenance/aft) +"tRq" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/item/pen, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "tRr" = ( /obj/machinery/advanced_airlock_controller{ dir = 4; @@ -58196,13 +58213,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) -"ugX" = ( -/obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "uiz" = ( /obj/structure/table, /obj/item/storage/box/lights/mixed, @@ -59012,6 +59022,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port/aft) +"wje" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/item/pen, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "wjn" = ( /obj/structure/cable, /obj/structure/cable{ @@ -86944,10 +86968,10 @@ bkT mlj mlj boX -pln -rRX -rRX -dEe +wje +iuy +hXh +tRq bwg aJw aJq @@ -87199,7 +87223,7 @@ bie bjB bkW mlj -ugX +gRd bpa bqy cBr @@ -87967,7 +87991,7 @@ bdY aMv bgI aZP -kMd +giU bkX bmo bnO From 0d8c9532cb372ba76dcadabe690da6f1b0313bfd Mon Sep 17 00:00:00 2001 From: partykp Date: Fri, 24 Apr 2020 02:45:02 +0200 Subject: [PATCH 3/3] less player jostling --- _maps/map_files/YogStation/YogStation.dmm | 158 +++++++++++----------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 158fa5afce9e..a10466377fce 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -48943,6 +48943,18 @@ "cmd" = ( /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"cmg" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/item/pen, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "cmn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -51298,6 +51310,18 @@ /obj/item/clothing/neck/stethoscope, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"ehN" = ( +/obj/structure/window/reinforced, +/obj/structure/chair/stool{ + pixel_x = 1; + pixel_y = 8 + }, +/obj/machinery/door/window/westright, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "eiN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 @@ -52201,19 +52225,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/tcommsat/entrance) -"giU" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - areastring = "/area/bridge/meeting_room"; - dir = 4; - name = "Conference Room APC"; - pixel_x = 24 - }, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/central) "gjl" = ( /turf/closed/wall, /area/quartermaster/warehouse) @@ -52516,15 +52527,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/atmos) -"gRd" = ( -/obj/structure/table/reinforced, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/paper_bin, -/obj/item/pen, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "gUn" = ( /obj/machinery/button/door{ id = "atmos"; @@ -53002,19 +53004,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"hXh" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/chair/stool{ - pixel_x = 1 - }, -/obj/machinery/door/window/eastright, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "hXW" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, @@ -53124,18 +53113,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/science/nanite) -"iuy" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/chair/stool{ - pixel_x = 1; - pixel_y = 8 - }, -/obj/machinery/door/window/eastleft, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "iuF" = ( /obj/machinery/telecomms/server/presets/security, /obj/effect/turf_decal/tile/neutral{ @@ -54267,6 +54244,15 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space/basic, /area/engine/atmos_distro) +"kUa" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "kVO" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ dir = 8 @@ -55194,6 +55180,20 @@ "nds" = ( /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"nfX" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/item/pen, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "ngM" = ( /obj/structure/transit_tube/curved/flipped{ dir = 4 @@ -57618,6 +57618,19 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) +"sWd" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + areastring = "/area/bridge/meeting_room"; + dir = 4; + name = "Conference Room APC"; + pixel_x = 24 + }, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/central) "sYf" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -58053,18 +58066,6 @@ "tQD" = ( /turf/closed/wall/r_wall, /area/maintenance/aft) -"tRq" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/item/pen, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "tRr" = ( /obj/machinery/advanced_airlock_controller{ dir = 4; @@ -58960,6 +58961,19 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"vZM" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/chair/stool{ + pixel_x = 1 + }, +/obj/machinery/door/window/westleft, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "vZX" = ( /obj/structure/cable{ icon_state = "2-4" @@ -59022,20 +59036,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port/aft) -"wje" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/item/pen, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "wjn" = ( /obj/structure/cable, /obj/structure/cable{ @@ -86968,10 +86968,10 @@ bkT mlj mlj boX -wje -iuy -hXh -tRq +nfX +ehN +vZM +cmg bwg aJw aJq @@ -87223,7 +87223,7 @@ bie bjB bkW mlj -gRd +kUa bpa bqy cBr @@ -87991,7 +87991,7 @@ bdY aMv bgI aZP -giU +sWd bkX bmo bnO