From 61ef0f337e575b9d87b68e44b3cf43c03e13724c Mon Sep 17 00:00:00 2001 From: Satile1 Date: Thu, 25 May 2023 17:09:21 +0100 Subject: [PATCH] Hotel Radio channel! Mapping fixes and flavour --- code/__SPLURTCODE/DEFINES/radio.dm | 5 + code/game/communications.dm | 2 + .../objects/items/devices/radio/headset.dm | 1 + .../game/objects/items/devices/radio/radio.dm | 2 +- code/game/say.dm | 1 + code/modules/mob/living/say.dm | 1 + .../SpaceRuins/spacehotelsplurt.dmm | 1300 +++++++++-------- .../code/game/objects/items/cards_ids.dm | 2 +- .../objects/structures/ghost_role_spawners.dm | 12 +- .../modules/ruins/objects_and_mobs/radio.dm | 14 + tgstation.dme | 2 + 11 files changed, 685 insertions(+), 657 deletions(-) create mode 100644 code/__SPLURTCODE/DEFINES/radio.dm create mode 100644 modular_splurt/code/modules/ruins/objects_and_mobs/radio.dm diff --git a/code/__SPLURTCODE/DEFINES/radio.dm b/code/__SPLURTCODE/DEFINES/radio.dm new file mode 100644 index 0000000000..bb3bee158c --- /dev/null +++ b/code/__SPLURTCODE/DEFINES/radio.dm @@ -0,0 +1,5 @@ +#define RADIO_CHANNEL_HOTEL "Hotel" +#define RADIO_KEY_HOTEL "q" +#define RADIO_TOKEN_HOTEL ":q" + +#define FREQ_HOTEL 1281 diff --git a/code/game/communications.dm b/code/game/communications.dm index 2b45fc9469..e79c27b9fb 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -101,6 +101,7 @@ GLOBAL_LIST_INIT(radiochannels, list( RADIO_CHANNEL_SYNDICATE = FREQ_SYNDICATE, RADIO_CHANNEL_SUPPLY = FREQ_SUPPLY, RADIO_CHANNEL_SERVICE = FREQ_SERVICE, + RADIO_CHANNEL_HOTEL = FREQ_HOTEL, //SPLURT EDIT ADDITION - MAPPING RADIO_CHANNEL_AI_PRIVATE = FREQ_AI_PRIVATE, RADIO_CHANNEL_CTF_RED = FREQ_CTF_RED, RADIO_CHANNEL_CTF_BLUE = FREQ_CTF_BLUE @@ -117,6 +118,7 @@ GLOBAL_LIST_INIT(reverseradiochannels, list( "[FREQ_SYNDICATE]" = RADIO_CHANNEL_SYNDICATE, "[FREQ_SUPPLY]" = RADIO_CHANNEL_SUPPLY, "[FREQ_SERVICE]" = RADIO_CHANNEL_SERVICE, + "[FREQ_HOTEL]" = RADIO_CHANNEL_HOTEL, //SPLURT EDIT ADDITION - MAPPING "[FREQ_AI_PRIVATE]" = RADIO_CHANNEL_AI_PRIVATE, "[FREQ_CTF_RED]" = RADIO_CHANNEL_CTF_RED, "[FREQ_CTF_BLUE]" = RADIO_CHANNEL_CTF_BLUE diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 6688292eb2..015d03e701 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -10,6 +10,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( RADIO_CHANNEL_SYNDICATE = RADIO_TOKEN_SYNDICATE, RADIO_CHANNEL_SUPPLY = RADIO_TOKEN_SUPPLY, RADIO_CHANNEL_SERVICE = RADIO_TOKEN_SERVICE, + RADIO_CHANNEL_HOTEL = RADIO_TOKEN_HOTEL, //SPLURT EDIT ADDITION MODE_BINARY = MODE_TOKEN_BINARY, RADIO_CHANNEL_AI_PRIVATE = RADIO_TOKEN_AI_PRIVATE )) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 3a3ffd7ea1..10a85a8593 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -257,7 +257,7 @@ var/datum/signal/subspace/vocal/signal = new(src, freq, speaker, language, message, spans) // Independent radios, on the CentCom frequency, reach all independent radios - if (independent && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE)) + if (independent && (freq == FREQ_CENTCOM || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE || freq == FREQ_HOTEL)) //SPLURT EDIT ADDITION signal.data["compression"] = 0 signal.transmission_method = TRANSMISSION_SUPERSPACE signal.levels = list(0) // reaches all Z-levels diff --git a/code/game/say.dm b/code/game/say.dm index 44f020e7c4..73f773223d 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -11,6 +11,7 @@ GLOBAL_LIST_INIT(freqtospan, list( "[FREQ_SERVICE]" = "servradio", "[FREQ_SECURITY]" = "secradio", "[FREQ_COMMAND]" = "comradio", + "[FREQ_HOTEL]" = "servradio", //SPLURT EDIT ADDITION "[FREQ_AI_PRIVATE]" = "aiprivradio", "[FREQ_SYNDICATE]" = "syndradio", "[FREQ_CENTCOM]" = "centcomradio", diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index b9f98ff2b6..7f78baea42 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -19,6 +19,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( // Faction RADIO_KEY_SYNDICATE = RADIO_CHANNEL_SYNDICATE, RADIO_KEY_CENTCOM = RADIO_CHANNEL_CENTCOM, + RADIO_KEY_HOTEL = RADIO_CHANNEL_HOTEL, //SPLURT EDIT ADDITION // Admin MODE_KEY_ADMIN = MODE_ADMIN, diff --git a/modular_splurt/_maps/RandomRuins/SpaceRuins/spacehotelsplurt.dmm b/modular_splurt/_maps/RandomRuins/SpaceRuins/spacehotelsplurt.dmm index e9519cd182..8c814a114d 100644 --- a/modular_splurt/_maps/RandomRuins/SpaceRuins/spacehotelsplurt.dmm +++ b/modular_splurt/_maps/RandomRuins/SpaceRuins/spacehotelsplurt.dmm @@ -138,20 +138,42 @@ /obj/item/kirbyplants/random, /turf/open/floor/glass, /area/ruin/space/has_grav/hotel/guestroom) -"aY" = ( -/obj/machinery/vending/kink{ - onstation = 0 +"aU" = ( +/obj/structure/chair/comfy/brown{ + color = "#596479" }, +/turf/open/floor/carpet/royalblack, +/area/ruin/space/has_grav/hotel/bar) +"aY" = ( +/obj/machinery/smartfridge/drying_rack, /turf/open/floor/plasteel/vaporwave, /area/ruin/space/has_grav/hotel/bar) +"aZ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/visible/layer1{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/grille_or_trash, +/turf/open/floor/plating, +/area/ruin/space/has_grav/hotel) "bb" = ( /obj/structure/closet/crate/trashcart, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "be" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, -/turf/open/floor/wood/wood_tiled, -/area/ruin/space/has_grav/hotel/bar) +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "a7window"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/ruin/space/has_grav/hotel/guestroom) "bg" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -235,6 +257,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/hydroponics/constructable, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/bar) "by" = ( @@ -273,12 +296,16 @@ req_access = null; req_access_txt = "204" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "bH" = ( -/obj/machinery/vending/barkbox{ - onstation = 0 - }, +/obj/structure/table, +/obj/item/storage/fancy/rollingpapers, +/obj/item/storage/fancy/rollingpapers, +/obj/item/storage/fancy/rollingpapers, +/obj/item/storage/fancy/rollingpapers, +/obj/item/storage/fancy/rollingpapers, +/obj/machinery/reagentgrinder, /turf/open/floor/plasteel/vaporwave, /area/ruin/space/has_grav/hotel/bar) "bI" = ( @@ -315,6 +342,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 8 }, +/obj/machinery/button/door{ + id = "a7window"; + name = "Privacy Shutters"; + pixel_y = 23 + }, /turf/open/floor/carpet/green, /area/ruin/space/has_grav/hotel/guestroom) "bR" = ( @@ -375,6 +407,9 @@ /obj/structure/chair/sofa/corp{ dir = 4 }, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, /turf/open/floor/glass, /area/ruin/space/has_grav/hotel/guestroom) "cn" = ( @@ -398,10 +433,8 @@ /turf/open/pool, /area/ruin/space/has_grav/hotel/guestroom) "cq" = ( -/obj/machinery/vending/kink{ - onstation = 0 - }, -/turf/closed/wall, +/obj/item/kirbyplants/random, +/turf/open/floor/carpet/purple, /area/ruin/space/has_grav/hotel/guestroom) "cu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ @@ -503,13 +536,6 @@ /obj/structure/table/glass, /turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/bar) -"cP" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 4 - }, -/obj/structure/curtain/goliath, -/turf/open/floor/carpet/black, -/area/ruin/space/has_grav/hotel/workroom) "cQ" = ( /obj/machinery/gear_painter, /turf/open/floor/plasteel/showroomfloor, @@ -554,6 +580,7 @@ /area/ruin/space/has_grav/hotel/dock) "df" = ( /obj/machinery/light, +/obj/item/kirbyplants/random, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/hotel/guestroom) "dh" = ( @@ -616,6 +643,9 @@ dir = 4; network = list("hotel") }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, /turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/workroom) "dq" = ( @@ -706,7 +736,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ dir = 1 }, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "dI" = ( /obj/structure/bed/double{ @@ -756,7 +786,7 @@ }, /obj/machinery/computer/security/telescreen{ name = "Exhibition Suite"; - network = list("thunder,exhibition"); + network = list("thunder","exhibition"); pixel_y = 27 }, /turf/open/floor/plasteel/dark, @@ -795,13 +825,13 @@ /turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/bar) "eg" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer3{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1{ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "ej" = ( @@ -809,14 +839,9 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/power) "em" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 10 - }, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/hotel/bar) +/obj/structure/dresser, +/turf/open/floor/wood/wood_tiled, +/area/ruin/space/has_grav/hotel/guestroom) "en" = ( /obj/machinery/vending/kink{ onstation = 0 @@ -1049,11 +1074,7 @@ /area/ruin/space/has_grav/hotel/workroom) "fh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/structure/cable{ - icon_state = "1-2" + dir = 10 }, /turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel/bar) @@ -1069,7 +1090,6 @@ /area/space/nearstation) "fu" = ( /obj/machinery/biogenerator, -/obj/item/reagent_containers/glass/beaker/large, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) "fy" = ( @@ -1087,12 +1107,14 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/power) "fD" = ( -/obj/structure/table, -/obj/item/storage/fancy/rollingpapers, -/obj/item/storage/fancy/rollingpapers, -/obj/item/storage/fancy/rollingpapers, +/obj/machinery/door/airlock{ + id_tag = "a5"; + name = "Guest Room A5" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/hotel/bar) +/area/ruin/space/has_grav/hotel/guestroom) "fF" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -1229,7 +1251,9 @@ /obj/structure/window/reinforced/tinted{ dir = 4 }, -/obj/structure/dresser, +/obj/structure/bed/double, +/obj/item/bedsheet/cosmos/double, +/obj/item/toy/plush/mothplushie, /turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel/guestroom) "gk" = ( @@ -1291,17 +1315,6 @@ }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/custodial) -"gz" = ( -/obj/structure/table/wood/poker, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 8 - }, -/obj/item/storage/dice, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 8 - }, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/hotel/bar) "gA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 9 @@ -1367,9 +1380,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 5 - }, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/hotel/guestroom) "gQ" = ( @@ -1390,7 +1400,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "gW" = ( /turf/open/floor/plasteel/dark, @@ -1403,13 +1413,6 @@ icon_state = "wood-broken7" }, /area/ruin/space/has_grav/hotel) -"he" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/plating, -/area/ruin/space/has_grav/hotel/workroom) "hf" = ( /obj/machinery/air_sensor/atmos/nitrogen_tank, /obj/machinery/light/small{ @@ -1469,13 +1472,19 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/workroom) "ht" = ( -/obj/machinery/vending/games{ - onstation = 0 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/closed/wall, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "hu" = ( -/obj/structure/chair/sofa/corp/left{ +/obj/structure/chair/sofa/corp/right{ dir = 1 }, /turf/open/floor/glass, @@ -1549,6 +1558,9 @@ req_access = null; req_access_txt = "204" }, +/obj/structure/statue/boney/ashwalker{ + anchored = 1 + }, /turf/open/floor/wood/wood_large, /area/ruin/space/has_grav/hotel) "hH" = ( @@ -1752,15 +1764,13 @@ /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/guestroom) "iA" = ( -/obj/structure/chair/stool/bar, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /turf/open/floor/carpet/black, -/area/ruin/space/has_grav/hotel/bar) +/area/ruin/space/has_grav/hotel/guestroom) "iB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/plasteel/dark, @@ -1772,13 +1782,8 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel) "iG" = ( -/obj/machinery/door/airlock{ - id_tag = "a1"; - name = "Guest Room A1" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "iJ" = ( /obj/structure/toilet/secret/high_loot{ @@ -1813,7 +1818,7 @@ dir = 1 }, /obj/machinery/light, -/turf/open/floor/plasteel/dark, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "iY" = ( /obj/structure/cable/yellow{ @@ -1843,7 +1848,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "jm" = ( /obj/machinery/pool/controller, @@ -1878,7 +1883,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 1 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "jy" = ( /obj/structure/grille, @@ -1915,11 +1920,14 @@ /turf/open/floor/engine/air, /area/ruin/space/has_grav/hotel/power) "jJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 +/obj/machinery/door/airlock{ + id_tag = "a1"; + name = "Guest Room A1" }, -/turf/closed/wall, -/area/ruin/space/has_grav/hotel/workroom) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/plasteel/dark, +/area/ruin/space/has_grav/hotel/guestroom) "jL" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 8 @@ -1938,10 +1946,10 @@ /obj/structure/window/reinforced/tinted{ dir = 4 }, -/obj/structure/closet/secure_closet/personal/cabinet, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 8 }, +/obj/item/kirbyplants/random, /turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel/guestroom) "jS" = ( @@ -1977,7 +1985,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc/away{ - dir = 3; + dir = 8; name = "Hotel Corridors APC"; pixel_x = -25 }, @@ -2040,9 +2048,6 @@ /turf/open/floor/carpet/green, /area/ruin/space/has_grav/hotel/guestroom) "kp" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 10 - }, /obj/structure/curtain/goliath, /turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/workroom) @@ -2134,8 +2139,6 @@ /turf/open/floor/plasteel/vaporwave, /area/ruin/space/has_grav/hotel/bar) "kJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -2419,7 +2422,9 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "lQ" = ( -/obj/structure/dresser, +/obj/machinery/vending/games{ + onstation = 0 + }, /turf/open/floor/carpet/purple, /area/ruin/space/has_grav/hotel/guestroom) "lR" = ( @@ -2437,7 +2442,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/statue/silver/md, /turf/open/pool, /area/ruin/space/has_grav/hotel) "lV" = ( @@ -2464,7 +2468,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/bar) "mh" = ( /obj/effect/decal/cleanable/oil, @@ -2530,13 +2534,13 @@ /obj/item/clothing/gloves/color/yellow, /obj/item/storage/toolbox/electrical, /obj/item/clothing/gloves/color/yellow, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/power) "mz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 - }, -/turf/open/floor/carpet/royalblack, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/bar) "mA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -2601,7 +2605,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "mP" = ( /obj/structure/table/wood, @@ -2637,7 +2641,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 8 }, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/guestroom) "mW" = ( /obj/machinery/door/airlock{ @@ -2646,7 +2650,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/guestroom) "na" = ( /obj/structure/chair/sofa/corp/left, @@ -2662,8 +2666,11 @@ /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel) "nh" = ( -/turf/closed/wall/r_wall, -/area/ruin/space/has_grav/hotel/custodial) +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/carpet/black, +/area/ruin/space/has_grav/hotel/guestroom) "nj" = ( /turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/dock) @@ -2726,16 +2733,12 @@ /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/workroom) "nC" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/visible/layer1, /obj/machinery/door/airlock/maintenance{ name = "Hotel Maintenance"; req_access_txt = "200,201" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "nD" = ( @@ -2803,14 +2806,18 @@ /turf/open/floor/carpet/red, /area/ruin/space/has_grav/hotel/guestroom) "nY" = ( -/obj/machinery/computer/security/telescreen{ - name = "Exhibition Suite"; - network = list("thunder,exhibition"); - pixel_y = 27 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 8 }, -/obj/structure/chair/sofa/corp/corner, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/hotel/bar) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/visible/layer1{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/ruin/space/has_grav/hotel) "oa" = ( /obj/structure/bed/dogbed{ desc = "A comfy-looking pet bed. You can even strap your pet in, in case the gravity turns off."; @@ -2856,6 +2863,7 @@ /obj/structure/table, /obj/item/vending_refill/hydronutrients, /obj/item/vending_refill/autodrobe, +/obj/item/stack/tile/carpet/royalblack/fifty, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "op" = ( @@ -2887,6 +2895,9 @@ name = "Staff Only"; req_access_txt = "200,201" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/bar) "oz" = ( @@ -2914,7 +2925,7 @@ "oE" = ( /obj/machinery/computer/security/telescreen{ name = "Exhibition Suite"; - network = list("thunder,exhibition"); + network = list("thunder","exhibition"); pixel_y = 27 }, /turf/open/floor/carpet/royalblack, @@ -3003,6 +3014,11 @@ }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/security) +"pl" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/grille_or_trash, +/turf/open/floor/plating, +/area/ruin/space/has_grav/hotel) "po" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 9 @@ -3329,16 +3345,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) -"rm" = ( -/obj/structure/table/wood/poker, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 8 - }, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/hotel/bar) "rn" = ( /obj/structure/table, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ @@ -3378,6 +3384,19 @@ }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) +"ru" = ( +/obj/machinery/airalarm/directional/west{ + req_access = null; + req_access_txt = "204" + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/chair/sofa/corp/right{ + dir = 4 + }, +/turf/open/floor/carpet/royalblack, +/area/ruin/space/has_grav/hotel/bar) "rw" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 4; @@ -3445,6 +3464,9 @@ /obj/structure/chair/sofa/corp/corner{ dir = 1 }, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, /turf/open/floor/glass, /area/ruin/space/has_grav/hotel/guestroom) "rG" = ( @@ -3457,9 +3479,6 @@ /area/ruin/space/has_grav/hotel) "rH" = ( /obj/structure/table/wood/poker, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 8 - }, /obj/item/storage/dice, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/hotel/bar) @@ -3495,29 +3514,32 @@ /obj/structure/mirror{ pixel_y = 28 }, -/obj/structure/closet/secure_closet/bar{ - name = "Manager's Cabinet"; - req_access = null; - req_access_txt = "205" - }, /obj/item/card/id/away/hotel, /obj/item/card/id/away/hotel, /obj/item/card/id/away/hotel, /obj/item/card/id/away/hotel, /obj/item/card/id/away/hotel, /obj/item/card/id/away/hotel, +/obj/structure/closet/secure_closet, +/obj/item/radio/headset/headset_srv/hotel, +/obj/item/radio/headset/headset_srv/hotel, +/obj/item/radio/headset/headset_srv/hotel, +/obj/item/radio/headset/headset_srv/hotel, +/obj/item/encryptionkey/headset_service/hotel, +/obj/item/encryptionkey/headset_service/hotel, /turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel/workroom) "rS" = ( -/obj/machinery/door/airlock/grunge{ - name = "Hotel Staff Room"; - req_access_txt = "200" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/door/airlock/grunge{ + name = "Hotel Staff Room"; + req_access_txt = "200" + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel) "rV" = ( @@ -3544,10 +3566,12 @@ dir = 1; network = list("hotel") }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "sb" = ( -/obj/item/kirbyplants/random, +/obj/machinery/vending/kink{ + onstation = 0 + }, /turf/open/floor/carpet/purple, /area/ruin/space/has_grav/hotel/guestroom) "sd" = ( @@ -3618,6 +3642,7 @@ brightness = 3; dir = 8 }, +/obj/item/stack/tile/carpet/black/fifty, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "sw" = ( @@ -3817,10 +3842,17 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/custodial) "tv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 8 +/obj/machinery/button/door{ + id = "a1"; + name = "privacy button"; + normaldoorcontrol = 1; + pixel_y = 24; + specialfunctions = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/obj/structure/dresser, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/hotel/guestroom) "tw" = ( @@ -3879,16 +3911,6 @@ /obj/structure/reagent_dispensers/cooking_oil, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/bar) -"tQ" = ( -/obj/structure/table/wood/poker, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 - }, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/hotel/bar) "tS" = ( /obj/structure/chair/sofa/corp/corner{ dir = 4 @@ -3941,6 +3963,10 @@ dir = 6; network = list("hotel") }, +/obj/machinery/airalarm/directional/north{ + req_access = null; + req_access_txt = "204" + }, /turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/bar) "uk" = ( @@ -4018,11 +4044,9 @@ /turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "ux" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 8 - }, -/turf/open/floor/carpet/black, -/area/ruin/space/has_grav/hotel/bar) +/obj/item/stack/tile/carpet/blackred/fifty, +/turf/open/floor/plating, +/area/ruin/space/has_grav/hotel) "uy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -4175,10 +4199,9 @@ /turf/closed/wall, /area/ruin/space/has_grav/hotel/security) "vb" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 8 - }, -/turf/open/floor/carpet/royalblack, +/obj/structure/table, +/obj/item/reagent_containers/glass/beaker/large, +/turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/bar) "vc" = ( /obj/machinery/door/airlock{ @@ -4337,11 +4360,21 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/power) "vD" = ( -/obj/machinery/light{ - dir = 1 +/obj/machinery/camera{ + c_tag = "Commissary"; + dir = 4; + network = list("hotel") }, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/hotel/guestroom) +/obj/machinery/autolathe/toy, +/obj/item/stack/sheet/plastic/twenty, +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/glass/five, +/obj/item/stack/sheet/glass/five, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/vaporwave, +/area/ruin/space/has_grav/hotel/bar) "vE" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -4408,7 +4441,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/guestroom) "vT" = ( /obj/machinery/conveyor{ @@ -4536,13 +4569,13 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/workroom) "wv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/visible/layer1, /obj/machinery/door/airlock/maintenance{ name = "Hotel Maintenance"; req_access_txt = "200,201" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "wx" = ( @@ -4581,6 +4614,7 @@ name = "Privacy Shutters"; pixel_y = -11 }, +/obj/item/toy/plush/carpplushie, /turf/open/floor/glass, /area/ruin/space/has_grav/hotel/guestroom) "wK" = ( @@ -4662,7 +4696,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/guestroom) "wZ" = ( /obj/machinery/light{ @@ -4760,8 +4794,8 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/bar) @@ -4778,6 +4812,10 @@ "xA" = ( /obj/item/skub, /obj/effect/spawner/bundle/costume/nyangirl, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" + }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/guestroom) "xF" = ( @@ -4803,10 +4841,16 @@ /area/ruin/space/has_grav/hotel/bar) "xI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/vending/barkbox{ + onstation = 0 + }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel) "xK" = ( /obj/structure/table/reinforced, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) "xO" = ( @@ -4868,7 +4912,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 4 }, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/guestroom) "xX" = ( /obj/structure/sink{ @@ -4932,7 +4976,7 @@ }, /obj/machinery/computer/security/telescreen{ name = "Exhibition Suite"; - network = list("thunder,exhibition"); + network = list("thunder","exhibition"); pixel_y = -26 }, /turf/open/floor/plasteel/dark, @@ -4952,10 +4996,6 @@ /area/ruin/space/has_grav/hotel) "yr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -5009,7 +5049,7 @@ req_access = null; req_access_txt = "204" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "yG" = ( /obj/structure/cable{ @@ -5047,10 +5087,19 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/bar) "yS" = ( -/obj/structure/chair/sofa/corp/corner, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/hotel/bar) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/visible/layer1{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/ruin/space/has_grav/hotel) "yU" = ( /turf/open/floor/carpet/purple, /area/ruin/space/has_grav/hotel/guestroom) @@ -5156,7 +5205,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "zt" = ( /obj/machinery/light/small{ @@ -5297,10 +5346,6 @@ /area/ruin/space/has_grav/hotel) "Aj" = ( /obj/structure/table/wood/poker, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/hotel/bar) "Ak" = ( @@ -5323,6 +5368,9 @@ /obj/structure/chair/sofa/corp/left{ dir = 4 }, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, /turf/open/floor/glass, /area/ruin/space/has_grav/hotel/guestroom) "An" = ( @@ -5355,8 +5403,7 @@ /obj/structure/window/reinforced/tinted{ dir = 4 }, -/obj/item/kirbyplants/random, -/obj/item/toy/plush/carpplushie, +/obj/item/toy/plush/lampplushie, /turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel/guestroom) "AA" = ( @@ -5386,10 +5433,13 @@ /turf/open/floor/carpet/blackred, /area/ruin/space/has_grav/hotel/workroom) "AE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 }, -/turf/open/floor/wood/wood_tiled, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/bar) "AG" = ( /obj/effect/turf_decal/tile/red{ @@ -5406,11 +5456,13 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/security) "AH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 }, -/turf/open/floor/wood/wood_tiled, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/bar) "AI" = ( /obj/effect/turf_decal/tile/red, @@ -5512,6 +5564,9 @@ /obj/machinery/pool/filter{ pixel_y = -17 }, +/obj/structure/statue/silver/md{ + anchored = 1 + }, /turf/open/floor/wood/wood_large, /area/ruin/space/has_grav/hotel) "Bo" = ( @@ -5535,15 +5590,8 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/security) "Bq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance/glass{ - name = "Staff Only"; - req_access_txt = "200" +/obj/machinery/vending/cigarette{ + onstation = 0 }, /turf/open/floor/plasteel/vaporwave, /area/ruin/space/has_grav/hotel/bar) @@ -5555,9 +5603,10 @@ /turf/open/floor/plasteel/airless/solarpanel, /area/ruin/space/ruinsolars) "Bv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/workroom) "Bz" = ( @@ -5576,6 +5625,12 @@ /turf/open/floor/glass, /area/ruin/space/has_grav/hotel/bar) "BG" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, /turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/workroom) "BH" = ( @@ -5642,16 +5697,17 @@ /turf/open/floor/grass, /area/ruin/space/has_grav/hotel) "BT" = ( -/obj/structure/table/plasmaglass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/visible/layer1, +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/machinery/light/floor, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/hotel/bar) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plating, +/area/ruin/space/has_grav/hotel) "BV" = ( /obj/structure/chair/comfy/brown{ color = "#596479" @@ -5680,9 +5736,6 @@ /area/ruin/space/has_grav/hotel/dock) "BZ" = ( /obj/structure/table/wood/poker, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 4 - }, /obj/item/toy/cards/deck, /obj/machinery/light{ dir = 8 @@ -5777,11 +5830,14 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "Cz" = ( -/obj/machinery/airalarm/directional/north{ - req_access = null; - req_access_txt = "204" +/obj/machinery/door/airlock/maintenance{ + name = "Staff Only"; + req_access_txt = "200" }, -/turf/open/floor/carpet/black, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel/bar) "CC" = ( /obj/structure/closet/crate/hydroponics, @@ -5803,11 +5859,16 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel) "CK" = ( -/obj/item/toy/plush/lampplushie, -/obj/structure/table/wood, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 8 }, +/obj/machinery/button/door{ + id = "a5"; + name = "privacy button"; + normaldoorcontrol = 1; + pixel_y = -24; + specialfunctions = 4 + }, /turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel/guestroom) "CM" = ( @@ -5977,9 +6038,6 @@ /obj/machinery/jukebox{ queuecost = 0 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 8 - }, /turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/bar) "Dm" = ( @@ -6128,13 +6186,9 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/workroom) "DJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, -/obj/machinery/door/airlock/grunge{ - name = "Hotel Staff Room"; - req_access_txt = "200" - }, -/turf/open/floor/carpet/black, -/area/ruin/space/has_grav/hotel/workroom) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/plating, +/area/ruin/space/has_grav/hotel) "DK" = ( /obj/structure/bed/double, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ @@ -6143,10 +6197,9 @@ /turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel) "DL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 8 - }, -/turf/open/floor/wood/wood_tiled, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/bar) "DM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -6188,11 +6241,8 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/security) "DW" = ( -/obj/structure/table/wood/fancy/red, /obj/effect/decal/cleanable/glitter/pink, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 1 - }, +/obj/structure/table/wood/fancy/red, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/hotel/bar) "DY" = ( @@ -6337,22 +6387,18 @@ /turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "EH" = ( -/obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 1 + dir = 8 }, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/hotel/guestroom) "EI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 6 +/obj/machinery/vending/kink{ + onstation = 0 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/wood/wood_tiled, -/area/ruin/space/has_grav/hotel/bar) +/turf/open/floor/plasteel/dark, +/area/ruin/space/has_grav/hotel) "EJ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 10 @@ -6416,6 +6462,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, /turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel/bar) "EX" = ( @@ -6534,7 +6583,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/guestroom) "Fy" = ( /obj/structure/disposalpipe/segment{ @@ -6565,10 +6614,15 @@ name = "Hotel Maintenance"; req_access_txt = "200,201" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 8 + }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/workroom) "FG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/camera{ c_tag = "Bar Backroom"; @@ -6741,19 +6795,11 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/power) "Gw" = ( -/obj/machinery/camera{ - c_tag = "Commissary"; - dir = 1; - network = list("hotel") - }, -/obj/machinery/autolathe/toy, -/obj/item/stack/sheet/plastic/twenty, -/obj/machinery/light, -/obj/item/stack/sheet/metal/twenty, -/obj/item/stack/sheet/glass/five, -/obj/item/stack/sheet/glass/five, -/turf/open/floor/plasteel/vaporwave, -/area/ruin/space/has_grav/hotel/bar) +/obj/structure/table/wood, +/obj/item/storage/backpack/duffelbag, +/obj/item/paper/pamphlet/ruin/spacehotel, +/turf/open/floor/plasteel/dark, +/area/ruin/space/has_grav/hotel) "GD" = ( /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/bar) @@ -6763,9 +6809,6 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "GH" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 4 - }, /obj/machinery/door/window/eastleft{ name = "Staff Only"; req_access_txt = "200" @@ -6838,9 +6881,11 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "GW" = ( -/obj/machinery/power/smes/engineering, /obj/machinery/atmospherics/pipe/simple/supply/visible, /obj/structure/cable, +/obj/machinery/power/smes{ + charge = 5e+006 + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/power) "GX" = ( @@ -7042,7 +7087,6 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "HF" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer3, /obj/structure/cable{ icon_state = "4-8" }, @@ -7052,6 +7096,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/visible/layer1{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "HH" = ( @@ -7062,7 +7109,7 @@ /turf/open/floor/grass, /area/ruin/space/has_grav/hotel) "HI" = ( -/obj/item/kirbyplants/random, +/obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel/guestroom) "HL" = ( @@ -7073,7 +7120,6 @@ /turf/open/floor/engine/n2, /area/ruin/space/has_grav/hotel/power) "HP" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 10 }, @@ -7163,14 +7209,12 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "Ii" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ +/obj/structure/chair/comfy/brown{ + color = "#596479"; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 - }, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/hotel/bar) +/turf/open/floor/plasteel/dark, +/area/ruin/space/has_grav/hotel) "Ij" = ( /obj/structure/flora/ausbushes/fernybush, /obj/effect/turf_decal/weather/dirt{ @@ -7268,7 +7312,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "IG" = ( /obj/structure/chair/sofa/corp/corner{ @@ -7297,6 +7341,9 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/chair/comfy/black{ + dir = 4 + }, /turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel/guestroom) "IS" = ( @@ -7324,17 +7371,16 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/security) "IU" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer3, /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/structure/disposalpipe/junction{ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 8 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "IW" = ( @@ -7728,7 +7774,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/guestroom) "KF" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -7737,7 +7783,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/statue/boney/ashwalker, /turf/open/pool, /area/ruin/space/has_grav/hotel) "KG" = ( @@ -7831,9 +7876,14 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/security) "KW" = ( -/obj/machinery/smartfridge/drying_rack, -/turf/open/floor/plasteel/dark, -/area/ruin/space/has_grav/hotel/bar) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/ruin/space/has_grav/hotel/workroom) "Lb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/dark, @@ -7880,8 +7930,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/workroom) @@ -7901,7 +7951,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "Lx" = ( /obj/structure/chair/sofa/corp{ @@ -7930,12 +7980,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) "LI" = ( @@ -7958,7 +8008,7 @@ "LM" = ( /obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/guestroom) "LP" = ( /obj/machinery/button/door{ @@ -8048,11 +8098,14 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "Mj" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 8 }, -/turf/open/floor/wood/wood_tiled, -/area/ruin/space/has_grav/hotel/bar) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 8 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/ruin/space/has_grav/hotel/workroom) "Mk" = ( /turf/closed/wall, /area/ruin/space/has_grav/hotel/guestroom) @@ -8203,8 +8256,8 @@ /area/ruin/space/has_grav/hotel) "Ne" = ( /obj/machinery/door/airlock/vault{ - req_access_txt = "205"; - req_access = 205 + req_access = 205; + req_access_txt = "205" }, /turf/open/floor/engine, /area/ruin/space/has_grav/hotel) @@ -8250,9 +8303,6 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/power) "Nr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 5 - }, /obj/machinery/light, /obj/structure/chair/comfy/brown{ color = "#596479"; @@ -8367,14 +8417,13 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/workroom) "NN" = ( -/obj/machinery/hydroponics/constructable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 8 + }, +/turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/hotel/bar) "NQ" = ( /obj/effect/turf_decal/tile/red{ @@ -8384,7 +8433,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/red, -/turf/closed/wall/r_wall, +/turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/security) "NR" = ( /obj/structure/closet, @@ -8399,7 +8448,6 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel) "NV" = ( -/obj/machinery/hydroponics/constructable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 8 }, @@ -8450,7 +8498,7 @@ /area/ruin/space/has_grav/hotel) "Og" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, -/turf/open/floor/plasteel/dark, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "Oj" = ( /turf/open/floor/plating, @@ -8472,9 +8520,6 @@ /area/ruin/space/has_grav/hotel) "Os" = ( /obj/structure/table/wood/fancy/royalblack, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 8 - }, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/hotel/bar) "Ox" = ( @@ -8542,8 +8587,13 @@ /turf/open/floor/carpet/blue, /area/ruin/space/has_grav/hotel/guestroom) "OR" = ( -/obj/machinery/hydroponics/constructable, -/turf/open/floor/plasteel/dark, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/hotel/bar) "OW" = ( /obj/machinery/light/small{ @@ -8607,8 +8657,12 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav/hotel/security) "Pm" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/structure/chair/sofa/corp, +/obj/machinery/computer/security/telescreen{ + name = "Exhibition Suite"; + network = list("thunder","exhibition"); + pixel_y = 27 + }, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/hotel/bar) "Pq" = ( @@ -8664,7 +8718,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 1 }, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "Py" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible, @@ -8759,7 +8813,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "PY" = ( -/turf/open/floor/glass, +/turf/open/floor/glass/reinforced, /area/ruin/space/has_grav/hotel/bar) "PZ" = ( /obj/effect/turf_decal/tile/red, @@ -8814,8 +8868,9 @@ /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/bar) "Ql" = ( -/obj/machinery/vending/kink{ - onstation = 0 +/obj/structure/chair/comfy/brown{ + color = "#596479"; + dir = 4 }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel) @@ -8824,14 +8879,13 @@ pixel_x = 5; pixel_y = 30 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "Qq" = ( +/obj/machinery/door/airlock/public/glass, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ - dir = 4 - }, -/turf/open/floor/carpet/black, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/hotel/bar) "Qs" = ( /obj/machinery/atmospherics/components/binary/pump/on{ @@ -8901,6 +8955,7 @@ pixel_x = -27 }, /obj/effect/decal/cleanable/glass, +/obj/effect/spawner/lootdrop/keg, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "QL" = ( @@ -8919,11 +8974,15 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel) "QQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 5 + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance/glass{ + name = "Staff Only"; + req_access_txt = "200" }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/bar) @@ -8994,7 +9053,7 @@ /obj/machinery/button/door{ id = "hotelshopshutters"; name = "Commissary Shutters Control"; - pixel_y = -23; + pixel_x = 24; req_access_txt = null }, /turf/open/floor/plasteel/vaporwave, @@ -9175,13 +9234,7 @@ /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/hotel/guestroom) "Sh" = ( -/obj/machinery/airalarm/directional/west{ - req_access = null; - req_access_txt = "204" - }, -/obj/machinery/light{ - dir = 8 - }, +/obj/structure/table/wood/fancy/green, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/hotel/bar) "Si" = ( @@ -9303,41 +9356,32 @@ name = "Hotel Maintenance"; req_access_txt = "200,201" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 8 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/visible/layer1{ + dir = 4 + }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "SF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel) "SL" = ( -/obj/machinery/button/door{ - id = "a5"; - name = "privacy button"; - normaldoorcontrol = 1; - pixel_y = -24; - specialfunctions = 4 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel/guestroom) "SM" = ( @@ -9645,6 +9689,7 @@ "TW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/hydroponics/constructable, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/bar) "TY" = ( @@ -9679,6 +9724,7 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "Uf" = ( @@ -9700,7 +9746,7 @@ pixel_y = 1 }, /obj/machinery/power/apc/away{ - dir = 3; + dir = 8; name = "Reception APC"; pixel_x = -25 }, @@ -9748,14 +9794,14 @@ }, /obj/machinery/computer/security/telescreen{ name = "Exhibition Suite"; - network = list("thunder,exhibition"); + network = list("thunder","exhibition"); pixel_y = 27 }, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/guestroom) "Uo" = ( /obj/machinery/light, -/turf/open/floor/plasteel/dark, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "Up" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -9800,12 +9846,14 @@ /turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel/workroom) "Uv" = ( -/obj/structure/dresser, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/light{ dir = 8 }, +/obj/structure/chair/comfy/black{ + dir = 4 + }, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/hotel/guestroom) "Uz" = ( @@ -9888,16 +9936,10 @@ /turf/open/pool, /area/ruin/space/has_grav/hotel) "Va" = ( -/obj/machinery/button/door{ - id = "a1"; - name = "privacy button"; - normaldoorcontrol = 1; - pixel_y = 24; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/carpet/red, /area/ruin/space/has_grav/hotel/guestroom) "Vb" = ( @@ -9914,10 +9956,8 @@ /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/workroom) "Vd" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/wood/wood_tiled, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/bar) "Vg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -9926,12 +9966,9 @@ /turf/closed/wall, /area/ruin/space/has_grav/hotel/bar) "Vi" = ( -/obj/structure/chair/sofa/corp/left{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/hotel/bar) +/obj/effect/spawner/lootdrop/keg, +/turf/open/floor/plating, +/area/ruin/space/has_grav/hotel) "Vk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 9 @@ -9995,24 +10032,27 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/guestroom) "Vy" = ( -/obj/structure/bed/double, -/obj/item/bedsheet/cosmos/double, -/obj/item/toy/plush/mothplushie, -/turf/open/floor/wood/wood_tiled, -/area/ruin/space/has_grav/hotel/guestroom) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/turf/open/floor/carpet/black, +/area/ruin/space/has_grav/hotel/workroom) "Vz" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/guestroom) "VA" = ( +/obj/machinery/door/airlock/grunge{ + name = "Hotel Staff Room"; + req_access_txt = "200" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/turf/open/floor/carpet/black, -/area/ruin/space/has_grav/hotel/bar) +/turf/open/floor/plating, +/area/ruin/space/has_grav/hotel) "VD" = ( /obj/structure/table/glass, /turf/open/floor/plasteel/showroomfloor, @@ -10022,8 +10062,8 @@ /area/ruin/space/has_grav/hotel/bar) "VH" = ( /obj/machinery/door/airlock/vault{ - req_access_txt = "205"; - req_access = 205 + req_access = 205; + req_access_txt = "205" }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) @@ -10236,6 +10276,10 @@ /obj/effect/decal/cleanable/cobweb{ icon_state = "cobweb2" }, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" + }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "WK" = ( @@ -10360,7 +10404,6 @@ /area/ruin/space/has_grav/hotel) "Xh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) @@ -10402,7 +10445,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 8 }, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "Xs" = ( /obj/structure/table, @@ -10450,15 +10493,6 @@ }, /turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel) -"XH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 - }, -/turf/open/floor/carpet/black, -/area/ruin/space/has_grav/hotel/bar) "XJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 8 @@ -10477,24 +10511,6 @@ }, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/hotel/bar) -"XN" = ( -/obj/machinery/door/airlock{ - id_tag = "a5"; - name = "Guest Room A5" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/hotel/guestroom) -"XQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 9 - }, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/hotel/bar) "XR" = ( /obj/machinery/vending/cola{ onstation = 0 @@ -10621,8 +10637,8 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "Yu" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/carpet/black, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/ruin/space/has_grav/hotel/bar) "Yw" = ( /obj/structure/chair/sofa/corp/right{ @@ -10634,20 +10650,12 @@ /obj/structure/table/plasmaglass, /turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel/workroom) -"YA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 6 - }, -/turf/open/floor/carpet/black, -/area/ruin/space/has_grav/hotel/bar) "YC" = ( /obj/machinery/light/small{ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel) "YD" = ( @@ -10660,7 +10668,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ dir = 1 }, -/turf/open/floor/carpet/royalblack, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "YE" = ( /obj/structure/cable/yellow{ @@ -10729,6 +10737,7 @@ req_access_txt = "204" }, /obj/machinery/light, +/obj/machinery/hydroponics/constructable, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/hotel/bar) "YW" = ( @@ -10815,12 +10824,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/hotel/workroom) -"Zs" = ( -/obj/structure/chair/stool/bar, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/turf/open/floor/carpet/black, -/area/ruin/space/has_grav/hotel/bar) "Zt" = ( /obj/machinery/door/airlock/engineering{ name = "Power Storage"; @@ -10852,7 +10855,7 @@ dir = 1; network = list("hotel") }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel/guestroom) "ZD" = ( /turf/open/space/basic, @@ -10870,6 +10873,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel/bar) "ZL" = ( @@ -10911,17 +10917,13 @@ /turf/open/floor/wood/wood_tiled, /area/ruin/space/has_grav/hotel/bar) "ZQ" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/computer/security/telescreen{ + name = "Exhibition Suite"; + network = list("thunder","exhibition"); + pixel_y = 27 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 8 - }, -/turf/open/floor/carpet/royalblack, -/area/ruin/space/has_grav/hotel/guestroom) +/turf/open/floor/carpet/black, +/area/ruin/space/has_grav/hotel/bar) "ZY" = ( /obj/machinery/door/airlock/grunge{ name = "Hotel Staff Room"; @@ -11372,10 +11374,10 @@ RS ao Oj Oj -Oj +Vi QI Oj -Oj +ux sv Oj hH @@ -11463,7 +11465,7 @@ Tg Mv Np Tg -tH +UR VU UR VU @@ -11591,7 +11593,7 @@ zd sd Wj Pz -mv +BT RQ Jj NW @@ -11731,7 +11733,7 @@ sB uP jF nf -VE +Ho rx Je VD @@ -11781,7 +11783,7 @@ Mk xz RA zn -ZQ +wm Uo Mk aS @@ -11801,7 +11803,7 @@ pC ir WU EF -VE +Ho VE Di NI @@ -11850,9 +11852,9 @@ ln Mk pg RA -RA +xq dH -pO +Wt vR wR hx @@ -11872,10 +11874,10 @@ gQ jF nf ZK -be +VE HP FG -ty +DL xr ty wv @@ -11922,7 +11924,7 @@ Mk Mk Og mN -RA +xq Mk Wm SY @@ -11941,7 +11943,7 @@ wA PV XJ nf -EF +Cz rV qO nf @@ -11990,9 +11992,9 @@ Mk zR lV Mk -vD -ZQ -RA +nh +wm +xq Mk vi Mk @@ -12011,7 +12013,7 @@ pZ JR jF nf -VE +Ho VE EU ZP @@ -12060,9 +12062,9 @@ gn rL Kn Mk -RA -ZQ -RA +xq +wm +xq Mk lx Mk @@ -12081,11 +12083,11 @@ Hx dA LF xK -Vd -Mj -EI -AH -AH +Ho +VE +VE +VE +VE fh yr nC @@ -12124,13 +12126,13 @@ Ek jy mG oc -Mk +be sr Rh Rh Uz mW -pO +Wt jk iX Mk @@ -12153,10 +12155,10 @@ xF db Ho VE -DL VE VE -AE +VE +VE VE nf cH @@ -12200,8 +12202,8 @@ kn rL rp Mk -RA -ZQ +xq +wm Zz Mk Mk @@ -12271,33 +12273,33 @@ Mk Mk Mk bF -dH -pO -iG +Xr +xq +Mk tv gP Mk vi Mk -Xj +nY nf MT Xo -Xo +mz bw -Xo +vb Lo Xo ER nf mg -vG +AQ HD HD HD HD HD -mz +AQ Ts BZ Jw @@ -12340,10 +12342,10 @@ Eb yU GM Mk -RA -ZQ -RA -Mk +xq +ht +Wt +jJ Va EH Uv @@ -12353,9 +12355,9 @@ rC nf WA Xo -OR -OR -OR +Xo +Xo +Xo NV Lb YU @@ -12363,14 +12365,14 @@ nf AQ AQ AQ -YA -VA -VA -VA -Qq -Zs +AQ +AQ +AQ +AQ +AQ +Ts Aj -gz +rH kJ rk HF @@ -12410,9 +12412,9 @@ JG Jt yU Mk -RA -ZQ -RA +xq +wm +xq Mk GP ry @@ -12428,19 +12430,19 @@ TW TW lq Xo -Xo +mz Yu AQ AQ AQ -XH +AQ AQ AQ AQ AQ AQ Ts -iA +Ts Fy nf Oz @@ -12482,7 +12484,7 @@ Wv wY Lt ID -RA +xq Mk wl JW @@ -12493,24 +12495,24 @@ VN hg xH Lo -OR -OR -OR -NN Xo Xo +Xo +Lo +Xo +mz Yu AQ tS xe -Ii +vG tF bS AQ PY PY AQ -XH +AQ Fy nf MO @@ -12550,9 +12552,9 @@ sj vf SM Mk -RA -ZQ -RA +xq +wm +xq Mk mB nS @@ -12563,24 +12565,24 @@ yZ Qv Ea Lo -Xo -Xo -Xo -Lo -Xo +mz +mz +mz +AE +AH IM nf -AQ +ZQ Kg Qg -BT +Wh Qg qQ AQ PY PY Ts -tQ +Aj Io nf Ta @@ -12618,10 +12620,10 @@ Mk Tp fP Pc -yU +cq Mk Qn -ZQ +wm Uo Mk Mk @@ -12635,22 +12637,22 @@ nf Lo Xo nf -KW -em +nf +RM QQ -fD +nf nf iM -yS -Vi -XQ +cn +Fz +vG Ib ec AQ PY PY Ts -rm +Aj fK nf Zq @@ -12690,30 +12692,30 @@ aD Pc sb Mk -vD -ZQ -RA +nh +wm +xq Vz ZD ZD ZD ZD Mk -VN +yS nf Ec Lo VO nf -nf -RM +vD +Zx +bZ Bq nf -nf ug AQ AQ -ux +AQ AQ AQ AQ @@ -12756,13 +12758,13 @@ Ek oc Mk Mk -cq +Mk iv -ht +Mk Mk Og mN -RA +xq Vz ZD ZD @@ -12778,9 +12780,9 @@ nf bH Zx bZ -Gw -nf -Cz +Zx +bO +AQ AQ cO Dl @@ -12790,7 +12792,7 @@ AQ PY PY AQ -ux +AQ Tq nf nB @@ -12830,9 +12832,9 @@ NJ iz ln Mk -RA -ZQ -RA +xq +wm +xq Vz ZD ZD @@ -12849,7 +12851,7 @@ aY kI ep Ri -nf +bO AQ AQ AQ @@ -12860,7 +12862,7 @@ AQ PY PY AQ -ux +AQ AQ nf uZ @@ -12880,7 +12882,7 @@ uq uq va ez -uq +va uq uq mG @@ -12900,7 +12902,7 @@ Mk Mk Mk Mk -RA +xq Px jv Vz @@ -12918,7 +12920,7 @@ nf nf HU bO -bO +nf nf AQ tS @@ -12930,7 +12932,7 @@ AQ PY PY AQ -ux +AQ ee nf nB @@ -12945,7 +12947,7 @@ YJ MC Gu ly -nh +Sa ts uq Yc @@ -12970,14 +12972,14 @@ IX Ks en Mk +xq +wm +xq +RA RA -ZQ -gk -gk -gk xW -gk -gk +RA +RA LM Dx iC @@ -12990,7 +12992,7 @@ ku ku ku nf -AQ +ZQ Kg Qg Wh @@ -12999,11 +13001,11 @@ qQ AQ PY PY -vG -vb +AQ +AQ oM nf -Ur +KW Bv Ur yJ @@ -13040,9 +13042,9 @@ UU UU yA Mk -RA +xq YD -RR +iG RR RR nQ @@ -13067,13 +13069,13 @@ vG Ib ec AQ +PY +PY AQ -AQ -vG Os qQ cl -Ur +Mj KN rc er @@ -13085,7 +13087,7 @@ Sa CN Ef mQ -nh +Sa JX uq XY @@ -13110,14 +13112,14 @@ yB UU ol KC -pO +Wt gV -gk -gk -gk -gk -gk -gk +xq +RA +RA +RA +RA +RA LM Dx oz @@ -13149,15 +13151,15 @@ fd fd fd fd -qG +pl Oz Sa JF Qa RL -nh +Sa LK -va +uq AG DV DV @@ -13180,9 +13182,9 @@ UU UU gu Mk -RA -ZQ -RA +xq +wm +xq Vz Vz Vz @@ -13204,19 +13206,19 @@ AQ AQ AQ AQ +tq AQ AQ AQ vG vG vG -vG -nf -nf -vG +tF +ru +NN nf do -cP +kp Ww fd Oj @@ -13225,7 +13227,7 @@ Sa Sa Sa Sa -nh +Sa Uk Uk jf @@ -13250,9 +13252,9 @@ xc oK zT Mk -vD +nh Xr -RA +xq Vz ZD ZD @@ -13274,19 +13276,19 @@ oz oz oz oz -oz -oz +rD +EI nf tS xe vG -vG +aU Sh -vG -vG -JE +Sh +OR +Qq BG -jJ +fd fd fd Oj @@ -13320,9 +13322,9 @@ Mk ls ls Mk -RA -ZQ -RA +xq +wm +xq Vz ZD ZD @@ -13355,7 +13357,7 @@ AQ AQ vG nf -BG +Vy kp Nr fd @@ -13390,7 +13392,7 @@ Mk Un yh Mk -RA +xq Px jv Vz @@ -13417,7 +13419,7 @@ oz cK NS nf -nY +cn Fz AQ Ts @@ -13427,10 +13429,10 @@ AQ nf fd fd -jJ +fd fd Oj -rC +aZ fd AO td @@ -13460,9 +13462,9 @@ Mk EL eP Vx -pO +Wt gV -RA +xq Mk Mk Mk @@ -13494,10 +13496,10 @@ Ya Ya Ya AQ -AQ -BG +Vd +VA +DJ DJ -he Xh eg Ig @@ -13530,9 +13532,9 @@ Mk mP kW Mk -RA +xq dH -pO +Wt Fx pO ES @@ -13602,7 +13604,7 @@ Mk Mk yD mN -RA +xq Mk Lp Gl @@ -13670,9 +13672,9 @@ ln Mk xA Mk -vD -ZQ -RA +nh +wm +xq Mk Nu dW @@ -13741,7 +13743,7 @@ Mk Mk Mk Qn -ZQ +wm rZ Mk gk @@ -13808,11 +13810,11 @@ Mk vi Mk HI -Uf -XN -pO -gV -RA +em +Mk +xq +wm +xq Mk uE ey @@ -13823,7 +13825,7 @@ uz eT qg eX -Zi +UW Zi UW qD @@ -13879,9 +13881,9 @@ cA IR th SL -Mk -RA -ZQ +fD +Wt +iA Uo Mk Mk @@ -13947,12 +13949,12 @@ iY Mk JI TY -Vy +JI CK Mk -RA -ZQ -RA +xq +wm +xq Mk rr dI @@ -14185,7 +14187,7 @@ af af oz cK -NS +Gw ib aw bD @@ -14255,7 +14257,7 @@ wX wX wX JQ -NS +Ii nf cn Fz diff --git a/modular_splurt/code/game/objects/items/cards_ids.dm b/modular_splurt/code/game/objects/items/cards_ids.dm index 69debcec83..c119d5ce64 100644 --- a/modular_splurt/code/game/objects/items/cards_ids.dm +++ b/modular_splurt/code/game/objects/items/cards_ids.dm @@ -26,7 +26,7 @@ assignment = "Hotel Security" access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MAINT, ACCESS_AWAY_SEC, ACCESS_AWAY_ENGINE) -/obj/item/card/id/away/hotel/manager +/obj/item/card/id/away/hotel/splurt/manager name = "Manager ID" assignment = "Hotel Manager" access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MAINT, ACCESS_AWAY_ENGINE, ACCESS_AWAY_SEC, ACCESS_AWAY_GENERIC1) diff --git a/modular_splurt/code/game/objects/structures/ghost_role_spawners.dm b/modular_splurt/code/game/objects/structures/ghost_role_spawners.dm index f3d7e95a2a..ff6a81269e 100644 --- a/modular_splurt/code/game/objects/structures/ghost_role_spawners.dm +++ b/modular_splurt/code/game/objects/structures/ghost_role_spawners.dm @@ -64,7 +64,7 @@ objectives = "Cater to visiting guests with your fellow staff. Don't abandon the hotel - you can advertise and link up with potential guests, but always remember who signs your cheques! The customer is always right!" short_desc = "You are a staff member of a top-of-the-line space hotel!" flavour_text = "You are a staff member of a top-of-the-line space hotel! Cater to guests and make sure the manager doesn't fire you." - important_info = "DON'T abandon the hotel" + important_info = "Don't abandon the hotel! Brief excursions to pick up guests or set up transit links are permitted, but remember where you work!" assignedrole = "Hotel Staff" death = FALSE roundstart = FALSE @@ -77,7 +77,7 @@ head = /obj/item/clothing/head/hotel r_pocket = /obj/item/pda back = /obj/item/storage/backpack/satchel - ears = /obj/item/radio/headset + ears = /obj/item/radio/headset/headset_srv/hotel /obj/effect/mob_spawn/human/hotel_staff/splurt/security name = "hotel security sleeper" @@ -86,7 +86,7 @@ short_desc = "You are a peacekeeper." flavour_text = "You have been assigned to this hotel to protect the interests of the company while keeping the peace between \ guests and the staff." - important_info = "Do NOT abandon the hotel, as that is grounds for contract termination." + important_info = "Don't abandon the hotel! Brief excursions to pick up guests or set up transit links are permitted, but remember where you work!" objectives = "Do not abandon your assigned hotel. Try and keep the peace between staff and guests, non-lethal force heavily advised if possible." id_job = "Hotel Security" uniform = /obj/item/clothing/under/rank/security/officer/blueshirt @@ -103,11 +103,11 @@ job_description = "Hotel Manager" short_desc = "You are the manager of a space hotel" flavour_text = "You manage one site of a successful chain of space hotels. Your parent company has recently been bought out by Nanotrasen and tasked with servicing some of their stations; you have recieved a selection of fancy tech as a result! Protect the interests of your parent company, ensure your staff are performing to standard and make sure to keep your guests happy!" - important_info = "Staff, including you, are NOT to abandon the hotel." + important_info = "Don't abandon the hotel! Brief excursions to pick up guests or set up transit links are permitted, but remember where you work!" objectives = "Don't abandon your assigned hotel. Cater to visiting guests. Maintain good corporate relations and remember: The customer is always right!" id_job = "Hotel Manager" uniform = /obj/item/clothing/under/suit/black suit = /obj/item/clothing/suit/toggle/lawyer/black head = /obj/item/clothing/head/beret/black - id = /obj/item/card/id/away/hotel/manager - + id = /obj/item/card/id/away/hotel/splurt/manager + ears = /obj/item/radio/headset/headset_srv/hotel/manager diff --git a/modular_splurt/code/modules/ruins/objects_and_mobs/radio.dm b/modular_splurt/code/modules/ruins/objects_and_mobs/radio.dm new file mode 100644 index 0000000000..ea0abd191a --- /dev/null +++ b/modular_splurt/code/modules/ruins/objects_and_mobs/radio.dm @@ -0,0 +1,14 @@ +/obj/item/encryptionkey/headset_service/hotel + name = "hotel staff radio encryption key" + channels = list(RADIO_CHANNEL_HOTEL = 1) + independent = TRUE + + +/obj/item/radio/headset/headset_srv/hotel + keyslot = new /obj/item/encryptionkey/headset_service/hotel + name = "hotel staff headset" + +/obj/item/radio/headset/headset_srv/hotel/manager + name = "hotel manager headset" + desc = "The local manager's headset. It has loudmode!" + command = TRUE diff --git a/tgstation.dme b/tgstation.dme index 0165558c72..def0fe7b61 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -280,6 +280,7 @@ #include "code\__SPLURTCODE\DEFINES\pregnancy.dm" #include "code\__SPLURTCODE\DEFINES\quirks.dm" #include "code\__SPLURTCODE\DEFINES\radiation.dm" +#include "code\__SPLURTCODE\DEFINES\radio.dm" #include "code\__SPLURTCODE\DEFINES\rope.dm" #include "code\__SPLURTCODE\DEFINES\say.dm" #include "code\__SPLURTCODE\DEFINES\signals.dm" @@ -4855,6 +4856,7 @@ #include "modular_splurt\code\modules\research\techweb\nodes\robotic_nodes.dm" #include "modular_splurt\code\modules\resize\smallsprite_action.dm" #include "modular_splurt\code\modules\ruins\objects_and_mobs\ash_walker_den.dm" +#include "modular_splurt\code\modules\ruins\objects_and_mobs\radio.dm" #include "modular_splurt\code\modules\ruins\spaceruin_code\hilbertshotel.dm" #include "modular_splurt\code\modules\shuttle\slaver.dm" #include "modular_splurt\code\modules\smithing\anvil.dm"