From 0ae4f76fb91f33adca895ffa8b3228c52dbb03e7 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 30 Apr 2017 15:12:51 -0500 Subject: [PATCH] Winter Wonderland holodeck no longer has freon, and it's no longer restricted --- _maps/map_files/generic/Centcomm.dmm | 16 ++++++++-------- code/game/area/areas/holodeck.dm | 7 +++---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/_maps/map_files/generic/Centcomm.dmm b/_maps/map_files/generic/Centcomm.dmm index 6782e4cce4..d36c5165dc 100644 --- a/_maps/map_files/generic/Centcomm.dmm +++ b/_maps/map_files/generic/Centcomm.dmm @@ -20,7 +20,7 @@ /turf/closed/indestructible/riveted, /area/space) "af" = ( -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "ag" = ( /obj/structure/window/reinforced{ @@ -141,7 +141,7 @@ /area/space) "ax" = ( /obj/structure/flora/bush, -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "ay" = ( /obj/item/toy/snowball{ @@ -155,7 +155,7 @@ /obj/item/toy/snowball{ pixel_x = -4 }, -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "az" = ( /turf/open/floor/holofloor{ @@ -216,7 +216,7 @@ /area/holodeck/rec_center/court) "aI" = ( /obj/structure/flora/grass/brown, -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "aJ" = ( /obj/structure/table, @@ -268,7 +268,7 @@ /obj/structure/statue/snow/snowman{ anchored = 1 }, -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "aP" = ( /obj/structure/chair/wood/normal{ @@ -282,7 +282,7 @@ /area/holodeck/rec_center/lounge) "aQ" = ( /obj/structure/chair/wood/wings, -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "aR" = ( /obj/structure/window/reinforced/tinted{ @@ -303,11 +303,11 @@ /area/holodeck/rec_center/lounge) "aT" = ( /obj/structure/flora/tree/pine, -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "aU" = ( /obj/structure/chair/wood, -/turf/open/floor/holofloor/snow/cold, +/turf/open/floor/holofloor/snow, /area/holodeck/rec_center/winterwonderland) "aV" = ( /obj/structure/table/wood, diff --git a/code/game/area/areas/holodeck.dm b/code/game/area/areas/holodeck.dm index c4b4e02f7b..7bf213be52 100644 --- a/code/game/area/areas/holodeck.dm +++ b/code/game/area/areas/holodeck.dm @@ -96,16 +96,15 @@ /area/holodeck/rec_center/kobayashi name = "Holodeck - Kobayashi Maru" +/area/holodeck/rec_center/winterwonderland + name = "Holodeck - Winter Wonderland" + // Bad programs /area/holodeck/rec_center/burn name = "Holodeck - Atmospheric Burn Test" restricted = 1 -/area/holodeck/rec_center/winterwonderland - name = "Holodeck - Winter Wonderland" - restricted = 1 - /area/holodeck/rec_center/wildlife name = "Holodeck - Wildlife Simulation" restricted = 1