From 02ac856d730fed5d3ed5c6e365f7a88ee485c717 Mon Sep 17 00:00:00 2001 From: SleepingZi <83357017+SleepingZi@users.noreply.github.com> Date: Wed, 28 Apr 2021 10:23:04 -0500 Subject: [PATCH 1/5] Add files via upload --- .../surface_submaps/mountains/mountains.dm | 11 +++- .../mountains/mountains_areas.dm | 4 ++ .../mountains/speakeasy_vr.dmm | 53 +++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm diff --git a/maps/submaps/surface_submaps/mountains/mountains.dm b/maps/submaps/surface_submaps/mountains/mountains.dm index a7ac3cc3bb4..82031db4086 100644 --- a/maps/submaps/surface_submaps/mountains/mountains.dm +++ b/maps/submaps/surface_submaps/mountains/mountains.dm @@ -41,6 +41,7 @@ #include "Cliff1.dmm" #include "excavation1.dmm" #include "spatial_anomaly.dmm" +#include "speakeasy.dmm" #endif // The 'mountains' is the mining z-level, and has a lot of caves. @@ -235,7 +236,7 @@ cost = 5 allow_duplicates = TRUE template_group = "Underground Cliffs" - + /datum/map_template/surface/mountains/normal/deadly_rabbit // VOREStation Edit name = "The Killer Rabbit" desc = "A cave where the Knights of the Round have fallen to a murderous Rabbit." @@ -363,3 +364,11 @@ mappath = 'maps/submaps/surface_submaps/mountains/spatial_anomaly.dmm' cost = 20 fixed_orientation = TRUE + +/datum/map_template/surface/mountains/normal/Speakeasy //VOREStation Edit + name = "Speakeasy" + desc = "A hidden underground bar to serve drinks in secret and in style." + mappath = 'maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm' + cost = 10 + allow_duplicates = FALSE + diff --git a/maps/submaps/surface_submaps/mountains/mountains_areas.dm b/maps/submaps/surface_submaps/mountains/mountains_areas.dm index d39e38823b4..a3cdf9ca6a9 100644 --- a/maps/submaps/surface_submaps/mountains/mountains_areas.dm +++ b/maps/submaps/surface_submaps/mountains/mountains_areas.dm @@ -163,3 +163,7 @@ /area/submap/spatial_anomaly name = "POI - Spatial Anomaly" ambience = AMBIENCE_FOREBODING + +/area/submap/Speakeasy + name = "POI - Speakeasy" + requires_power = FALSE \ No newline at end of file diff --git a/maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm b/maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm new file mode 100644 index 00000000000..372bbe71d56 --- /dev/null +++ b/maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm @@ -0,0 +1,53 @@ +"a" = (/turf/template_noop,/area/submap/Speakeasy) +"c" = (/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) +"f" = (/obj/structure/table/gamblingtable,/turf/simulated/floor/wood,/area/submap/Speakeasy) +"g" = (/obj/structure/bed/chair/wood{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) +"h" = (/obj/random/handgun,/turf/simulated/floor/wood,/area/submap/Speakeasy) +"i" = (/obj/item/clothing/head/fedora,/turf/simulated/floor/wood,/area/submap/Speakeasy) +"j" = (/obj/structure/bookcase,/turf/simulated/floor/wood,/area/submap/Speakeasy) +"k" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/wood,/area/submap/Speakeasy) +"l" = (/obj/structure/bed/chair/comfy/black,/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) +"m" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wmarble,/area/submap/Speakeasy) +"n" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor/wood,/area/submap/Speakeasy) +"o" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/Speakeasy) +"p" = (/obj/machinery/light/small/poi{dir = 4},/turf/simulated/floor/wmarble,/area/submap/Speakeasy) +"s" = (/obj/structure/bed/chair/wood{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) +"u" = (/obj/structure/table/gamblingtable,/obj/machinery/light/poi{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) +"v" = (/obj/structure/table/fancyblack,/obj/item/clothing/mask/smokable/cigarette/cigar,/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) +"w" = (/turf/simulated/wall/wood,/area/submap/Speakeasy) +"x" = (/obj/structure/toilet,/turf/simulated/floor/wmarble,/area/submap/Speakeasy) +"B" = (/turf/simulated/floor/wood,/area/submap/Speakeasy) +"D" = (/obj/structure/sink{dir = 4; pixel_x = 14},/turf/simulated/floor/wmarble,/area/submap/Speakeasy) +"E" = (/obj/structure/bed/chair/comfy/black{dir = 1},/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) +"H" = (/obj/machinery/vending/boozeomat,/turf/simulated/floor/wood,/area/submap/Speakeasy) +"I" = (/obj/structure/table/woodentable,/obj/random/drinkbottle,/turf/simulated/floor/wood,/area/submap/Speakeasy) +"K" = (/obj/effect/floor_decal/corner/black/diagonal,/turf/simulated/floor/tiled/neutral,/area/submap/Speakeasy) +"L" = (/obj/structure/bed/chair/wood{dir = 8},/turf/simulated/floor/wood,/area/submap/Speakeasy) +"M" = (/obj/machinery/light/poi{dir = 1},/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) +"N" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/submap/Speakeasy) +"O" = (/obj/machinery/light/poi{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) +"R" = (/obj/machinery/light/poi{dir = 8},/obj/structure/bed/chair/wood{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) +"U" = (/turf/simulated/floor/wmarble,/area/submap/Speakeasy) +"V" = (/obj/structure/table/woodentable,/obj/machinery/chemical_dispenser/bar_soft/full{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) +"W" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/wood,/area/submap/Speakeasy) +"X" = (/obj/structure/table/woodentable,/obj/machinery/chemical_dispenser/bar_alc/full,/turf/simulated/floor/wood,/area/submap/Speakeasy) +"Y" = (/obj/structure/table/fancyblack,/obj/random/cash/big,/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) + +(1,1,1) = {" +aaaaaaaaaaaaaaaa +awwwwwwwwwwwwwwa +awnnwBMlMBwxUpwa +awiBjBYvYBwUUDwa +awhBjBcEcBwwwmwa +awwwwBBBBBwfLBwa +awXHwwwowwwgBBwa +awBBBOBBBBBBBBwa +awVNININNIBBBBwa +awBkkkkkkkBBBBwa +awBBBBBBBBKKKWwa +awBBBBBBBBKKKuwa +awRNNLBBBBKKKgwa +awsNNLBBBBsfLBwa +awwwwwwowwwwwwwa +aaaaaaaaaaaaaaaa +"} From b4130f0225e79ceeb5a74986dd59d3fae87d7ac3 Mon Sep 17 00:00:00 2001 From: SleepingZi <83357017+SleepingZi@users.noreply.github.com> Date: Thu, 29 Apr 2021 09:05:08 -0500 Subject: [PATCH 2/5] Add files via upload --- .../mountains/speakeasy_vr.dmm | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm b/maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm index 372bbe71d56..6d6cc6cdbb1 100644 --- a/maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm +++ b/maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm @@ -7,17 +7,18 @@ "j" = (/obj/structure/bookcase,/turf/simulated/floor/wood,/area/submap/Speakeasy) "k" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/wood,/area/submap/Speakeasy) "l" = (/obj/structure/bed/chair/comfy/black,/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) -"m" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wmarble,/area/submap/Speakeasy) +"m" = (/obj/structure/table/woodentable,/obj/machinery/light/poi{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) "n" = (/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor/wood,/area/submap/Speakeasy) "o" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/Speakeasy) -"p" = (/obj/machinery/light/small/poi{dir = 4},/turf/simulated/floor/wmarble,/area/submap/Speakeasy) +"p" = (/obj/machinery/media/jukebox,/turf/simulated/floor/wood,/area/submap/Speakeasy) "s" = (/obj/structure/bed/chair/wood{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) "u" = (/obj/structure/table/gamblingtable,/obj/machinery/light/poi{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) "v" = (/obj/structure/table/fancyblack,/obj/item/clothing/mask/smokable/cigarette/cigar,/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) "w" = (/turf/simulated/wall/wood,/area/submap/Speakeasy) -"x" = (/obj/structure/toilet,/turf/simulated/floor/wmarble,/area/submap/Speakeasy) +"x" = (/obj/structure/bed/chair/sofa/blue/left{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) "B" = (/turf/simulated/floor/wood,/area/submap/Speakeasy) -"D" = (/obj/structure/sink{dir = 4; pixel_x = 14},/turf/simulated/floor/wmarble,/area/submap/Speakeasy) +"C" = (/turf/simulated/mineral/floor/cave,/area/submap/Speakeasy) +"D" = (/obj/structure/bed/chair/sofa/black/corner{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) "E" = (/obj/structure/bed/chair/comfy/black{dir = 1},/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) "H" = (/obj/machinery/vending/boozeomat,/turf/simulated/floor/wood,/area/submap/Speakeasy) "I" = (/obj/structure/table/woodentable,/obj/random/drinkbottle,/turf/simulated/floor/wood,/area/submap/Speakeasy) @@ -26,8 +27,8 @@ "M" = (/obj/machinery/light/poi{dir = 1},/turf/simulated/floor/carpet/turcarpet,/area/submap/Speakeasy) "N" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/submap/Speakeasy) "O" = (/obj/machinery/light/poi{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) -"R" = (/obj/machinery/light/poi{dir = 8},/obj/structure/bed/chair/wood{dir = 4},/turf/simulated/floor/wood,/area/submap/Speakeasy) -"U" = (/turf/simulated/floor/wmarble,/area/submap/Speakeasy) +"R" = (/obj/structure/bed/chair/sofa/black{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) +"U" = (/obj/structure/bed/chair/sofa/blue/right{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) "V" = (/obj/structure/table/woodentable,/obj/machinery/chemical_dispenser/bar_soft/full{dir = 1},/turf/simulated/floor/wood,/area/submap/Speakeasy) "W" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/wood,/area/submap/Speakeasy) "X" = (/obj/structure/table/woodentable,/obj/machinery/chemical_dispenser/bar_alc/full,/turf/simulated/floor/wood,/area/submap/Speakeasy) @@ -35,19 +36,19 @@ (1,1,1) = {" aaaaaaaaaaaaaaaa -awwwwwwwwwwwwwwa -awnnwBMlMBwxUpwa -awiBjBYvYBwUUDwa -awhBjBcEcBwwwmwa -awwwwBBBBBwfLBwa -awXHwwwowwwgBBwa -awBBBOBBBBBBBBwa -awVNININNIBBBBwa +awwwwwwwwwwaaaaa +awnnwBMlMBwwwwaa +awiBjBYvYBwfLwwa +awhBjBcEcBwgBBwa +awwwwBBBBBwBWWwa +awXHwwwowwwBNmwa +awBBBOBBBBBBNNwa +awVNININNIBBggwa awBkkkkkkkBBBBwa -awBBBBBBBBKKKWwa -awBBBBBBBBKKKuwa -awRNNLBBBBKKKgwa -awsNNLBBBBsfLBwa -awwwwwwowwwwwwwa -aaaaaaaaaaaaaaaa +awpBBBBBBBKKKWwa +awwxffBBBBKKKuwa +aawDRUBBBBKKKgwa +aawwwwBBBBsfLwwa +aaaaawwowwwwwwaa +aaaaaaCCCaaaaaaa "} From 58aee0ab1af6752086300de42409681a1ac4b6af Mon Sep 17 00:00:00 2001 From: SleepingZi <83357017+SleepingZi@users.noreply.github.com> Date: Thu, 29 Apr 2021 13:43:51 -0500 Subject: [PATCH 3/5] Add files via upload --- maps/submaps/surface_submaps/mountains/mountains.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/submaps/surface_submaps/mountains/mountains.dm b/maps/submaps/surface_submaps/mountains/mountains.dm index 82031db4086..8a15ba8a99c 100644 --- a/maps/submaps/surface_submaps/mountains/mountains.dm +++ b/maps/submaps/surface_submaps/mountains/mountains.dm @@ -41,7 +41,7 @@ #include "Cliff1.dmm" #include "excavation1.dmm" #include "spatial_anomaly.dmm" -#include "speakeasy.dmm" +#include "speakeasy_vr.dmm" #endif // The 'mountains' is the mining z-level, and has a lot of caves. From cf47730bebcc6285a325c6fff4e6af3e46fd1138 Mon Sep 17 00:00:00 2001 From: SleepingZi <83357017+SleepingZi@users.noreply.github.com> Date: Tue, 4 May 2021 09:03:23 -0500 Subject: [PATCH 4/5] Add files via upload --- maps/submaps/surface_submaps/mountains/mountains.dm | 3 ++- maps/submaps/surface_submaps/mountains/mountains_areas.dm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/maps/submaps/surface_submaps/mountains/mountains.dm b/maps/submaps/surface_submaps/mountains/mountains.dm index 8a15ba8a99c..2493ab26925 100644 --- a/maps/submaps/surface_submaps/mountains/mountains.dm +++ b/maps/submaps/surface_submaps/mountains/mountains.dm @@ -42,6 +42,7 @@ #include "excavation1.dmm" #include "spatial_anomaly.dmm" #include "speakeasy_vr.dmm" +#include "Campsite_vr.dmm" #endif // The 'mountains' is the mining z-level, and has a lot of caves. @@ -365,7 +366,7 @@ cost = 20 fixed_orientation = TRUE -/datum/map_template/surface/mountains/normal/Speakeasy //VOREStation Edit +/datum/map_template/surface/mountains/normal/Speakeasy //VOREStation add name = "Speakeasy" desc = "A hidden underground bar to serve drinks in secret and in style." mappath = 'maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm' diff --git a/maps/submaps/surface_submaps/mountains/mountains_areas.dm b/maps/submaps/surface_submaps/mountains/mountains_areas.dm index a3cdf9ca6a9..4078c4b988c 100644 --- a/maps/submaps/surface_submaps/mountains/mountains_areas.dm +++ b/maps/submaps/surface_submaps/mountains/mountains_areas.dm @@ -164,6 +164,6 @@ name = "POI - Spatial Anomaly" ambience = AMBIENCE_FOREBODING -/area/submap/Speakeasy +/area/submap/Speakeasy //VOREStation add name = "POI - Speakeasy" requires_power = FALSE \ No newline at end of file From bd2e212ba2ae3e265e12501c01f4193282f5ac27 Mon Sep 17 00:00:00 2001 From: SleepingZi <83357017+SleepingZi@users.noreply.github.com> Date: Tue, 4 May 2021 09:43:21 -0500 Subject: [PATCH 5/5] Add files via upload --- maps/submaps/surface_submaps/mountains/mountains.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/maps/submaps/surface_submaps/mountains/mountains.dm b/maps/submaps/surface_submaps/mountains/mountains.dm index 2493ab26925..2fffd44a723 100644 --- a/maps/submaps/surface_submaps/mountains/mountains.dm +++ b/maps/submaps/surface_submaps/mountains/mountains.dm @@ -42,7 +42,6 @@ #include "excavation1.dmm" #include "spatial_anomaly.dmm" #include "speakeasy_vr.dmm" -#include "Campsite_vr.dmm" #endif // The 'mountains' is the mining z-level, and has a lot of caves.