From c221bcc07d978e87d528592b7b290f03f012f39a Mon Sep 17 00:00:00 2001 From: Geeves Date: Tue, 19 Nov 2019 19:34:00 +0200 Subject: [PATCH] adds the dining hall (#7369) --- html/changelogs/geeves - diningDeck.yml | 6 + maps/_common/areas/holodeck.dm | 4 + maps/aurora/aurora-1_centcomm.dmm | 218 ++++++++++++++++-------- maps/aurora/code/aurora_holodeck.dm | 4 + 4 files changed, 162 insertions(+), 70 deletions(-) create mode 100644 html/changelogs/geeves - diningDeck.yml diff --git a/html/changelogs/geeves - diningDeck.yml b/html/changelogs/geeves - diningDeck.yml new file mode 100644 index 00000000000..d75dd258640 --- /dev/null +++ b/html/changelogs/geeves - diningDeck.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Added a new holodeck variant, Dining Hall." diff --git a/maps/_common/areas/holodeck.dm b/maps/_common/areas/holodeck.dm index 342789fc307..9df9cbd8bcf 100644 --- a/maps/_common/areas/holodeck.dm +++ b/maps/_common/areas/holodeck.dm @@ -66,6 +66,10 @@ name = "\improper Holodeck - Picnic Area" sound_env = PLAIN +/area/holodeck/source_dininghall + name = "\improper Holodeck - Dining Hall" + sound_env = PLAIN + /area/holodeck/source_snowfield name = "\improper Holodeck - Snow Field" sound_env = FOREST diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 30195ed9a99..6f59a1a2cfc 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -23679,6 +23679,14 @@ "drL" = ( /turf/space/transit/east/shuttlespace_ew10, /area/shuttle/distress/transit) +"dtU" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + icon_state = "spline_fancy"; + dir = 4 + }, +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/source_dininghall) "duC" = ( /obj/machinery/door/airlock/centcom{ name = "Cmdt Office"; @@ -23758,6 +23766,10 @@ }, /turf/simulated/floor/tiled, /area/centcom/ferry) +"dXM" = ( +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_dininghall) "dYm" = ( /turf/space/transit/east/shuttlespace_ew6, /area/shuttle/distress/transit) @@ -24217,6 +24229,9 @@ dir = 8 }, /area/centcom/living) +"hSw" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_dininghall) "hXg" = ( /obj/machinery/button/remote/airlock{ desiredstate = 1; @@ -24931,6 +24946,13 @@ name = "plating" }, /area/centcom/distress_prep) +"nZg" = ( +/obj/structure/table/wood, +/obj/item/weapon/flame/candle{ + pixel_x = 10 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_dininghall) "obp" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -25168,6 +25190,14 @@ dir = 4 }, /area/centcom/distress_prep) +"pCk" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + icon_state = "spline_fancy"; + dir = 4 + }, +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/source_dininghall) "pDD" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/phoronreinforced{ @@ -25282,6 +25312,14 @@ icon_state = "floor" }, /area/centcom/ferry) +"qYc" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + icon_state = "spline_fancy"; + dir = 8 + }, +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/source_dininghall) "raM" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -25468,6 +25506,22 @@ "sBS" = ( /turf/space/transit/east/shuttlespace_ew2, /area/shuttle/distress/transit) +"sGH" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + icon_state = "spline_fancy"; + dir = 4 + }, +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/source_dininghall) +"sIY" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + icon_state = "spline_fancy"; + dir = 8 + }, +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/source_dininghall) "sQk" = ( /obj/structure/bed/chair/office/dark, /obj/effect/ghostspawpoint{ @@ -25547,6 +25601,10 @@ dir = 4 }, /area/centcom/living) +"tfU" = ( +/obj/structure/table/wood, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_dininghall) "tou" = ( /obj/effect/landmark{ name = "CCIAEscort" @@ -25889,6 +25947,13 @@ dir = 2 }, /area/centcom/distress_prep) +"wEa" = ( +/obj/structure/table/wood, +/obj/item/weapon/flame/candle{ + pixel_x = -10 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_dininghall) "wEJ" = ( /obj/structure/window/reinforced/crescent, /obj/structure/window/reinforced/crescent{ @@ -25918,6 +25983,11 @@ icon_state = "green" }, /area/centcom/living) +"wMQ" = ( +/obj/structure/table/wood, +/obj/structure/flora/pottedplant/random, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_dininghall) "wNS" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/external{ @@ -26052,6 +26122,14 @@ }, /turf/simulated/floor/tiled/dark, /area/centcom/legion) +"yds" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + icon_state = "spline_fancy"; + dir = 8 + }, +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/source_dininghall) "yhL" = ( /obj/machinery/door/airlock/centcom{ name = "Representative Office"; @@ -72852,16 +72930,16 @@ acN acN aed aeO -abn -abn -abn -abn -abn -abn -abn -abn -abn -abn +sGH +dtU +dtU +sGH +dtU +dtU +pCk +pCk +dtU +dtU aeO aaM aaM @@ -73109,16 +73187,16 @@ acN aed aez aeO -abn -abn -abn -abn -abn -abn -abn -abn -abn -abn +hSw +dXM +dXM +dXM +dXM +dXM +dXM +dXM +dXM +hSw aeO aaM aaM @@ -73366,16 +73444,16 @@ adI aee aee aeO -abn -abn -abn -abn -abn -abn -abn -abn -abn -abn +hSw +tfU +nZg +tfU +nZg +tfU +nZg +tfU +tfU +hSw aeO aaM aaM @@ -73623,16 +73701,16 @@ adJ aee aee aeO -abn -abn -abn -abn -abn -abn -abn -abn -abn -abn +hSw +tfU +wMQ +tfU +wMQ +tfU +wMQ +tfU +tfU +hSw aeO aaM aaM @@ -73880,16 +73958,16 @@ adK aee aee aeO -abn -abn -abn -abn -abn -abn -abn -abn -abn -abn +hSw +tfU +tfU +wEa +tfU +wEa +tfU +wEa +tfU +hSw aeO aaM aaM @@ -74137,16 +74215,16 @@ acO aef aez aeO -abn -abn -abn -abn -abn -abn -abn -abn -abn -abn +hSw +dXM +dXM +dXM +dXM +dXM +dXM +dXM +dXM +hSw aeO aaM aaM @@ -74394,16 +74472,16 @@ acO acO aef aeO -abn -abn -abn -abn -abn -abn -abn -abn -abn -abn +qYc +qYc +yds +yds +qYc +qYc +sIY +qYc +qYc +sIY aeO aaM aaM diff --git a/maps/aurora/code/aurora_holodeck.dm b/maps/aurora/code/aurora_holodeck.dm index c0cc16fe29e..6e057d07dce 100644 --- a/maps/aurora/code/aurora_holodeck.dm +++ b/maps/aurora/code/aurora_holodeck.dm @@ -44,6 +44,9 @@ "picnicarea" = new /datum/holodeck_program(/area/holodeck/source_picnicarea, list('sound/music/title2.ogg') ), + "dininghall" = new /datum/holodeck_program(/area/holodeck/source_dininghall, + list('sound/music/title2.ogg') + ), "theatre" = new /datum/holodeck_program(/area/holodeck/source_theatre), "meetinghall" = new /datum/holodeck_program(/area/holodeck/source_meetinghall), "courtroom" = new /datum/holodeck_program(/area/holodeck/source_courtroom, @@ -79,6 +82,7 @@ "Desert" = "desert", "Space" = "space", "Picnic Area" = "picnicarea", + "Dining Hall" = "dininghall", "Snow Field" = "snowfield", "Theatre" = "theatre", "Meeting Hall" = "meetinghall",