From 894b94ca85b535bb8faeed4f4995bf8535194201 Mon Sep 17 00:00:00 2001 From: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com> Date: Wed, 15 Jun 2022 18:19:19 -0400 Subject: [PATCH] Small space bar mapping additions (#14297) --- .../changelogs/doxxmedearly-spacebar_adds.yml | 5 + maps/away/generic/space_bar.dm | 8 +- maps/away/generic/space_bar.dmm | 218 +++++++++--------- 3 files changed, 126 insertions(+), 105 deletions(-) create mode 100644 html/changelogs/doxxmedearly-spacebar_adds.yml diff --git a/html/changelogs/doxxmedearly-spacebar_adds.yml b/html/changelogs/doxxmedearly-spacebar_adds.yml new file mode 100644 index 00000000000..8ea419b1d46 --- /dev/null +++ b/html/changelogs/doxxmedearly-spacebar_adds.yml @@ -0,0 +1,5 @@ +author: Doxxmedearly +delete-after: True +changes: + - maptweak: "Added to the space bar: another light in the backroom, a long-range holopad, and a box of crayons to the bartender's locker." + - maptweak: "Made the space bar hangar a separate area from the bar proper." diff --git a/maps/away/generic/space_bar.dm b/maps/away/generic/space_bar.dm index 11e9f737b71..c6f6a3a05b9 100644 --- a/maps/away/generic/space_bar.dm +++ b/maps/away/generic/space_bar.dm @@ -20,5 +20,9 @@ icon_state = "bar" flags = RAD_SHIELDED requires_power = FALSE - base_turf = /turf/space - no_light_control = TRUE \ No newline at end of file + base_turf = /turf/simulated/floor/plating + no_light_control = TRUE + +/area/space_bar/hangar + name = "Spacer Bar Hangar" + icon_state = "exit" \ No newline at end of file diff --git a/maps/away/generic/space_bar.dmm b/maps/away/generic/space_bar.dmm index 5babc0f567a..678fa4c8cbc 100644 --- a/maps/away/generic/space_bar.dmm +++ b/maps/away/generic/space_bar.dmm @@ -306,7 +306,7 @@ dir = 1 }, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "bhz" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -348,7 +348,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "bVS" = ( /obj/machinery/light{ icon_state = "tube1" @@ -377,7 +377,7 @@ icon_state = "tube1" }, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "ctQ" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/chem_master/condimaster{ @@ -394,7 +394,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/shuttle_landmark/automatic, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "cJe" = ( /obj/machinery/light/small{ dir = 8 @@ -492,7 +492,7 @@ dir = 10 }, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "fnY" = ( /obj/structure/table/stone/marble, /obj/effect/floor_decal/corner/grey/diagonal, @@ -520,6 +520,10 @@ identifier = "space_bar_chef"; name = "igs - space_bar_chef" }, +/obj/machinery/light{ + dir = 1; + icon_state = "tube1" + }, /turf/simulated/floor/holofloor/tiled, /area/space_bar) "fSX" = ( @@ -538,7 +542,7 @@ dir = 5 }, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "gaA" = ( /obj/machinery/light/small{ dir = 1 @@ -571,7 +575,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "gxE" = ( /obj/machinery/chem_heater, /turf/simulated/floor/lino/grey, @@ -665,7 +669,7 @@ /area/space_bar) "hBd" = ( /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "hFr" = ( /obj/machinery/light{ dir = 8; @@ -687,7 +691,7 @@ "hNl" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "hNM" = ( /obj/machinery/door/airlock/glass{ name = "Bar" @@ -782,6 +786,9 @@ }, /turf/simulated/floor/holofloor/tiled, /area/space_bar) +"jiW" = ( +/turf/simulated/wall/r_wall, +/area/space_bar/hangar) "jmo" = ( /obj/structure/bed/stool/bar/padded/red, /obj/effect/floor_decal/spline/fancy/wood/cee{ @@ -810,7 +817,7 @@ dir = 6 }, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "jIR" = ( /obj/structure/bed/stool/bar/padded/red, /turf/simulated/floor/wood, @@ -866,7 +873,7 @@ "lOr" = ( /obj/effect/shuttle_landmark/automatic, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "mhC" = ( /obj/structure/bed/stool/bar/padded/red, /obj/effect/floor_decal/spline/fancy/wood{ @@ -943,7 +950,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "odP" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -963,7 +970,7 @@ name = "Bar Lounge" }, /turf/simulated/floor/holofloor/tiled, -/area/space_bar) +/area/space_bar/hangar) "oAH" = ( /obj/machinery/button/remote/airlock{ desc = "A remote control-switch for the office door."; @@ -975,6 +982,10 @@ }, /turf/simulated/floor/wood, /area/space_bar) +"oYQ" = ( +/obj/machinery/hologram/holopad/long_range, +/turf/simulated/floor/lino/grey, +/area/space_bar) "oZv" = ( /obj/structure/bed/stool/bar/padded/red, /obj/effect/floor_decal/spline/fancy/wood, @@ -1036,7 +1047,7 @@ /area/space_bar) "pRm" = ( /turf/unsimulated/wall/fakepdoor, -/area/space_bar) +/area/space_bar/hangar) "qje" = ( /obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/holofloor/tiled, @@ -1044,7 +1055,7 @@ "qmJ" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "quQ" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/bed/stool/bar/padded/red, @@ -1065,7 +1076,7 @@ icon_state = "tube1" }, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "qWo" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/disposalpipe/segment, @@ -1135,7 +1146,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "szY" = ( /obj/structure/table/stone/marble, /obj/item/reagent_containers/glass/rag, @@ -1217,7 +1228,7 @@ dir = 9 }, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "uaE" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -1230,7 +1241,7 @@ icon_state = "tube1" }, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "uuL" = ( /obj/structure/mopbucket, /obj/item/reagent_containers/glass/bucket, @@ -1334,6 +1345,7 @@ /obj/item/reagent_containers/food/drinks/bottle/darmadhir_brew, /obj/item/storage/box/fancy/cigarettes/cigar, /obj/item/reagent_containers/food/drinks/bottle/vintage_wine, +/obj/item/storage/box/fancy/crayons, /turf/simulated/floor/holofloor/tiled, /area/space_bar) "wfU" = ( @@ -1354,7 +1366,7 @@ "wJk" = ( /obj/machinery/vending/engivend, /turf/simulated/floor/tiled/steel, -/area/space_bar) +/area/space_bar/hangar) "wLs" = ( /obj/structure/sign/double/barsign{ pixel_y = 32; @@ -24527,33 +24539,33 @@ xRX xRX xRX xRX -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW xRX xRX xRX @@ -24784,7 +24796,7 @@ xRX xRX xRX xRX -ygr +jiW hBd tQq gmi @@ -25041,7 +25053,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe hBd @@ -25298,7 +25310,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe hBd @@ -25555,7 +25567,7 @@ xRX xRX xRX xRX -ygr +jiW wJk aVe hBd @@ -25812,7 +25824,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe hBd @@ -26069,7 +26081,7 @@ xRX xRX xRX xRX -ygr +jiW upu aVe hBd @@ -26326,7 +26338,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe hBd @@ -26583,7 +26595,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe hBd @@ -26840,7 +26852,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe hBd @@ -27097,7 +27109,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe hBd @@ -27354,7 +27366,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe hBd @@ -27611,7 +27623,7 @@ xRX xRX xRX xRX -ygr +jiW upu aVe qmJ @@ -27868,7 +27880,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe hBd @@ -28125,7 +28137,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe hBd @@ -28382,7 +28394,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe hBd @@ -28639,7 +28651,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe hBd @@ -28896,7 +28908,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe qmJ @@ -29153,7 +29165,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe qmJ @@ -29410,7 +29422,7 @@ xRX xRX xRX xRX -ygr +jiW upu aVe qmJ @@ -29667,7 +29679,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe hBd @@ -29924,7 +29936,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe hBd @@ -30181,7 +30193,7 @@ frn frn ygr ygr -ygr +jiW hBd aVe hBd @@ -30438,7 +30450,7 @@ vth vth wRv hmL -ygr +jiW hBd aVe hBd @@ -30952,7 +30964,7 @@ sth sth jyw dcL -ygr +jiW hBd aVe hBd @@ -31209,7 +31221,7 @@ frn frn ygr ygr -ygr +jiW hBd aVe hBd @@ -31466,7 +31478,7 @@ xRX xRX xRX xRX -ygr +jiW hBd aVe hBd @@ -31723,7 +31735,7 @@ xRX xRX xRX xRX -ygr +jiW upu aVe hBd @@ -31980,7 +31992,7 @@ xRX xRX xRX xRX -ygr +jiW hBd fZJ bKn @@ -32237,33 +32249,33 @@ xRX xRX xRX xRX -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr -ygr +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW +jiW xRX xRX xRX @@ -34787,7 +34799,7 @@ ndF ygr huE gfL -gfL +oYQ sBA oZv xQS