From 7289b561227fb5b1a391814109d1702cb97a66c9 Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Sat, 27 Jul 2024 14:08:45 -0500 Subject: [PATCH] Dan to the rescue --- .../apartment_garden.dmm | 24 +- .../hilbertshotel_templates/movie_theater.dmm | 759 ++++++++++++++++++ .../modules/hilbertshotel/hilbertshotel.dm | 16 +- 3 files changed, 786 insertions(+), 13 deletions(-) create mode 100644 _maps/templates/splurt_templates/hilbertshotel_templates/movie_theater.dmm diff --git a/_maps/templates/splurt_templates/hilbertshotel_templates/apartment_garden.dmm b/_maps/templates/splurt_templates/hilbertshotel_templates/apartment_garden.dmm index ec0797d43c..c398c701fd 100644 --- a/_maps/templates/splurt_templates/hilbertshotel_templates/apartment_garden.dmm +++ b/_maps/templates/splurt_templates/hilbertshotel_templates/apartment_garden.dmm @@ -356,7 +356,7 @@ (1,1,1) = {" gm gm -gm +Ep bg Ep XX @@ -367,13 +367,13 @@ zn Dd zn af -gm +Ep gm gm "} (2,1,1) = {" gm -gm +Ep Cl Hx TH @@ -386,11 +386,11 @@ Vh tu Hx zn -gm +Ep gm "} (3,1,1) = {" -gm +Ep zn Hx Wh @@ -405,7 +405,7 @@ tu CE Hx Dd -gm +Ep "} (4,1,1) = {" Dd @@ -588,7 +588,7 @@ Hx zn "} (14,1,1) = {" -gm +Ep bg Hx Hx @@ -603,11 +603,11 @@ ph up zi bg -gm +Ep "} (15,1,1) = {" gm -gm +Ep zn Hx CE @@ -620,13 +620,13 @@ Hx zi zi bg -gm +Ep fz "} (16,1,1) = {" gm gm -gm +Ep bg Cl Dd @@ -637,7 +637,7 @@ Ep zn Dd Ep -gm +Ep gm gm "} diff --git a/_maps/templates/splurt_templates/hilbertshotel_templates/movie_theater.dmm b/_maps/templates/splurt_templates/hilbertshotel_templates/movie_theater.dmm new file mode 100644 index 0000000000..d874692468 --- /dev/null +++ b/_maps/templates/splurt_templates/hilbertshotel_templates/movie_theater.dmm @@ -0,0 +1,759 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"bd" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/obj/machinery/microwave, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"cj" = ( +/obj/machinery/vending/snack, +/turf/open/floor/f13{ + dir = 10; + icon_state = "redmark" + }, +/area/hilbertshotel) +"cy" = ( +/obj/structure/chair/booth, +/obj/item/trash/popcorn, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#d7d7d7" + }, +/area/hilbertshotel) +"cJ" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"cY" = ( +/obj/item/trash/popcorn, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#a1a1a1" + }, +/area/hilbertshotel) +"dQ" = ( +/obj/structure/chair/booth, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#d7d7d7" + }, +/area/hilbertshotel) +"ew" = ( +/turf/open/floor/f13{ + icon_state = "redrustyfull" + }, +/area/hilbertshotel) +"fI" = ( +/obj/structure/sink/greyscale{ + dir = 8; + pixel_x = -12; + pixel_y = 20 + }, +/obj/structure/toilet{ + dir = 4; + pixel_x = -3 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"go" = ( +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/obj/machinery/computer/terminal{ + dir = 8; + termtag = "Business" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"gA" = ( +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"ip" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/obj/machinery/reagentgrinder, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"jO" = ( +/turf/closed/indestructible/hoteldoor{ + icon_state = "door_closed"; + icon = 'icons/obj/doors/puzzledoor/default.dmi' + }, +/area/hilbertshotel) +"kj" = ( +/obj/structure/closet/crate/bin{ + pixel_y = 10 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"kr" = ( +/obj/structure/simple_door/house, +/turf/open/floor/f13{ + icon_state = "redrustyfull" + }, +/area/hilbertshotel) +"kD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/hilbertshotel) +"lZ" = ( +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/turf/closed/wall/f13/ruins{ + color = "#d9cdb9" + }, +/area/hilbertshotel) +"mh" = ( +/obj/structure/sign/departments/restroom, +/turf/closed/wall/mineral/concrete{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/hilbertshotel) +"mu" = ( +/obj/structure/closet/fridge, +/obj/effect/spawner/lootdrop/f13/foodspawner, +/obj/effect/spawner/lootdrop/f13/foodspawner, +/obj/effect/spawner/lootdrop/f13/foodspawner, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"my" = ( +/obj/structure/simple_door/house, +/obj/item/lock_bolt{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"nj" = ( +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#a1a1a1" + }, +/area/hilbertshotel) +"oL" = ( +/obj/item/trash/can, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#a1a1a1" + }, +/area/hilbertshotel) +"pl" = ( +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/obj/machinery/computer/terminal{ + termtag = "Business" + }, +/turf/open/floor/f13{ + icon_state = "redrustyfull" + }, +/area/hilbertshotel) +"py" = ( +/obj/machinery/vending/nukacolavend, +/turf/open/floor/f13{ + dir = 10; + icon_state = "redmark" + }, +/area/hilbertshotel) +"qx" = ( +/turf/open/floor/f13{ + color = "#f7e8e1"; + icon_state = "rampdowntop" + }, +/area/hilbertshotel) +"qO" = ( +/turf/closed/wall, +/area/hilbertshotel) +"qV" = ( +/obj/structure/chair/booth, +/obj/item/trash/boritos, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#e4e4e4" + }, +/area/hilbertshotel) +"tL" = ( +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/obj/item/reagent_containers/food/snacks/popcorn{ + pixel_y = 10 + }, +/obj/item/reagent_containers/food/snacks/popcorn{ + pixel_x = -10; + pixel_y = 10 + }, +/obj/item/reagent_containers/food/snacks/popcorn{ + pixel_x = -10; + pixel_y = 10 + }, +/obj/item/reagent_containers/food/snacks/popcorn{ + pixel_x = 10; + pixel_y = 10 + }, +/obj/item/reagent_containers/food/snacks/popcorn{ + pixel_x = 10 + }, +/obj/item/reagent_containers/food/snacks/popcorn{ + pixel_x = -10 + }, +/obj/item/reagent_containers/food/snacks/popcorn, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"tX" = ( +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"vh" = ( +/obj/structure/simple_door/house, +/obj/item/lock_bolt{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"vq" = ( +/obj/structure/chair/booth, +/obj/item/trash/candy, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#b2b2b2" + }, +/area/hilbertshotel) +"wz" = ( +/turf/closed/wall/mineral/concrete{ + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/hilbertshotel) +"yo" = ( +/turf/closed/wall/mineral/concrete{ + color = "#a9a1a1"; + desc = "A pre-War wall made of solid concrete."; + name = "concrete wall" + }, +/area/hilbertshotel) +"yV" = ( +/turf/open/indestructible/ground/outside/sidewalk{ + icon_state = "horizontalbottomborderbottom0" + }, +/area/hilbertshotel) +"zz" = ( +/obj/structure/chair/booth, +/obj/item/trash/raisins, +/obj/machinery/light/small/broken{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#e4e4e4" + }, +/area/hilbertshotel) +"zE" = ( +/obj/structure/chair/office/dark{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"Ak" = ( +/obj/machinery/light/small/broken{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#a1a1a1" + }, +/area/hilbertshotel) +"BD" = ( +/obj/structure/simple_door/house, +/turf/open/floor/f13{ + dir = 10; + icon_state = "redmark" + }, +/area/hilbertshotel) +"BI" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/f13{ + dir = 10; + icon_state = "redmark" + }, +/area/hilbertshotel) +"CN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/indestructible/ground/outside/sidewalk, +/area/hilbertshotel) +"CP" = ( +/obj/machinery/telecomms/relay/preset/auto, +/turf/open/indestructible/ground/outside/desert, +/area/hilbertshotel) +"CV" = ( +/obj/structure/chair/booth, +/obj/item/trash/sosjerky, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#b2b2b2" + }, +/area/hilbertshotel) +"Em" = ( +/obj/machinery/deepfryer, +/obj/machinery/light/broken{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"Ez" = ( +/obj/structure/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"GY" = ( +/obj/machinery/light/floor{ + flickering = 1; + layer = 3; + pixel_y = -18 + }, +/obj/machinery/computer/terminal{ + dir = 1; + termtag = "Projector"; + pixel_y = -11 + }, +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/turf/open/floor/f13{ + icon_state = "redrustyfull" + }, +/area/hilbertshotel) +"GZ" = ( +/turf/open/indestructible/ground/outside/sidewalk, +/area/hilbertshotel) +"Hm" = ( +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"HF" = ( +/obj/item/kirbyplants, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/f13{ + dir = 10; + icon_state = "redmark" + }, +/area/hilbertshotel) +"LL" = ( +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/obj/item/reagent_containers/food/snacks/popcorn{ + pixel_x = -10; + pixel_y = 20 + }, +/obj/item/storage/box/drinkingglasses{ + pixel_x = 5; + pixel_y = 20 + }, +/obj/machinery/computer/terminal{ + dir = 4; + termtag = "Business" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"LY" = ( +/turf/open/floor/f13{ + dir = 10; + icon_state = "redmark" + }, +/area/hilbertshotel) +"Oc" = ( +/obj/structure/filingcabinet/chestdrawer, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"PU" = ( +/obj/structure/chair/booth, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#e4e4e4" + }, +/area/hilbertshotel) +"Qh" = ( +/obj/machinery/light/small/broken{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#a1a1a1" + }, +/area/hilbertshotel) +"QF" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/obj/machinery/computer/terminal{ + termtag = "Business" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"St" = ( +/obj/structure/chair/booth, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#b2b2b2" + }, +/area/hilbertshotel) +"SH" = ( +/obj/structure/chair/booth, +/obj/item/trash/can, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#e4e4e4" + }, +/area/hilbertshotel) +"TZ" = ( +/obj/structure/chair/booth, +/obj/machinery/light/small/broken{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ + color = "#e4e4e4" + }, +/area/hilbertshotel) +"VB" = ( +/obj/machinery/light, +/turf/open/floor/f13{ + dir = 10; + icon_state = "redmark" + }, +/area/hilbertshotel) +"VI" = ( +/obj/structure/table/reinforced{ + color = "#c1b6a5" + }, +/obj/machinery/chem_dispenser/drinks{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) +"WK" = ( +/turf/open/space/bluespace, +/area/hilbertshotel) +"Xe" = ( +/turf/closed/indestructible/f13/matrix, +/area/hilbertshotel) +"XW" = ( +/obj/structure/sink/greyscale{ + dir = 4; + pixel_x = 12; + pixel_y = 20 + }, +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/small/broken{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/bar, +/area/hilbertshotel) + +(1,1,1) = {" +Xe +Xe +Xe +wz +wz +wz +wz +wz +wz +wz +wz +wz +wz +wz +wz +wz +"} +(2,1,1) = {" +Xe +yV +GZ +QF +Ez +tX +gA +Oc +wz +fI +wz +zz +dQ +St +Qh +wz +"} +(3,1,1) = {" +Xe +yV +GZ +cJ +kj +tX +zE +tX +wz +tX +wz +PU +dQ +St +cY +wz +"} +(4,1,1) = {" +Xe +yV +CN +wz +lZ +lZ +go +tX +mh +my +wz +SH +dQ +St +nj +qO +"} +(5,1,1) = {" +Xe +yV +kD +HF +LY +LY +LY +LY +LY +LY +BD +qx +qx +qx +nj +qO +"} +(6,1,1) = {" +Xe +yV +GZ +wz +BI +LY +py +VB +wz +wz +wz +PU +dQ +CV +nj +qO +"} +(7,1,1) = {" +Xe +yV +GZ +wz +LY +LY +wz +ew +wz +ew +wz +PU +dQ +St +nj +qO +"} +(8,1,1) = {" +jO +yV +CN +kr +LY +LY +pl +ew +kr +ew +GY +PU +dQ +St +nj +qO +"} +(9,1,1) = {" +Xe +yV +kD +wz +LY +LY +wz +ew +wz +ew +wz +PU +cy +St +nj +qO +"} +(10,1,1) = {" +Xe +yV +GZ +wz +BI +LY +cj +VB +wz +wz +wz +PU +dQ +St +nj +qO +"} +(11,1,1) = {" +Xe +yV +GZ +HF +LY +LY +LY +LY +LY +LY +BD +qx +qx +qx +oL +qO +"} +(12,1,1) = {" +Xe +yV +GZ +yo +VI +Hm +LL +tX +mh +vh +wz +qV +dQ +St +nj +qO +"} +(13,1,1) = {" +Xe +yV +CN +ip +tX +tX +tX +tX +wz +tX +wz +PU +dQ +vq +nj +wz +"} +(14,1,1) = {" +Xe +yV +kD +bd +tL +tL +Em +mu +wz +XW +wz +TZ +dQ +St +Ak +wz +"} +(15,1,1) = {" +Xe +Xe +Xe +wz +wz +wz +wz +wz +wz +wz +wz +wz +wz +wz +wz +wz +"} +(16,1,1) = {" +WK +WK +WK +WK +WK +WK +WK +WK +WK +WK +WK +WK +WK +WK +WK +CP +"} diff --git a/modular_splurt/code/modules/hilbertshotel/hilbertshotel.dm b/modular_splurt/code/modules/hilbertshotel/hilbertshotel.dm index 9739960bfb..b342a8323c 100644 --- a/modular_splurt/code/modules/hilbertshotel/hilbertshotel.dm +++ b/modular_splurt/code/modules/hilbertshotel/hilbertshotel.dm @@ -19,7 +19,8 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) "Apartment-4", "Apartment-Bar", "Apartment-Garden", - "Apartment-Sauna" + "Apartment-Sauna", + "Movie-Theater" ) var/datum/map_template/hilbertshotel/apartment/one/hilberts_hotel_rooms_apartment_one var/datum/map_template/hilbertshotel/apartment/two/hilberts_hotel_rooms_apartment_two @@ -29,6 +30,9 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) var/datum/map_template/hilbertshotel/apartment/garden/hilberts_hotel_rooms_apartment_garden var/datum/map_template/hilbertshotel/apartment/sauna/hilberts_hotel_rooms_apartment_sauna //SPLURT EDIT END + //FB Maps + var/datum/map_template/hilbertshotel/apartment/movietheater/hilberts_hotel_rooms_movie_theater + //FB Maps End var/datum/map_template/hilbertshotel/hotelRoomTemp var/datum/map_template/hilbertshotel/empty/hotelRoomTempEmpty var/datum/map_template/hilbertshotel/lore/hotelRoomTempLore @@ -58,6 +62,8 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) hilberts_hotel_rooms_apartment_bar = new() hilberts_hotel_rooms_apartment_garden = new() hilberts_hotel_rooms_apartment_sauna = new() + //FB EDIT START + hilberts_hotel_rooms_movie_theater = new() /obj/hilbertshotel/Destroy() ejectRooms() @@ -237,6 +243,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) if("Apartment-Bar") return hilberts_hotel_rooms_apartment_bar if("Apartment-Garden") return hilberts_hotel_rooms_apartment_garden if("Apartment-Sauna") return hilberts_hotel_rooms_apartment_sauna + if("Movie-Theater") return hilberts_hotel_rooms_movie_theater if("Mystery Room") return hotelRoomTempLore return hotelRoomTemp // Default to Hotel Room if no match is found @@ -260,6 +267,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) if("Apartment-Bar") mapTemplate = hilberts_hotel_rooms_apartment_bar if("Apartment-Garden") mapTemplate = hilberts_hotel_rooms_apartment_garden if("Apartment-Sauna") mapTemplate = hilberts_hotel_rooms_apartment_sauna + if("Movie-Theater") mapTemplate = hilberts_hotel_rooms_movie_theater if(!mapTemplate) mapTemplate = hotelRoomTemp //Default Hotel Room @@ -718,6 +726,12 @@ Not all that's countable has an end..._ name = "Apartment_sauna" mappath = '_maps/templates/splurt_templates/hilbertshotel_templates/apartment_sauna.dmm' +//FB maps +/datum/map_template/hilbertshotel/apartment/movietheater + name = "Movie_Theater" + mappath = '_maps/templates/splurt_templates/hilbertshotel_templates/movie_theater.dmm' + + // Fluff - Misc /obj/item/paper/fluff/hilbertshotel/welcomeletter name = "Welcome Letter"