diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm new file mode 100644 index 00000000000..5f938145714 --- /dev/null +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm @@ -0,0 +1,102 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/holopad, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/ruin/powered/icemoon_phone_booth) +"c" = ( +/obj/machinery/door/window{ + dir = 1 + }, +/obj/machinery/door/window, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/ruin/powered/icemoon_phone_booth) +"e" = ( +/turf/open/misc/asteroid/snow/icemoon, +/area/ruin/powered/icemoon_phone_booth) +"k" = ( +/obj/machinery/vending/coffee, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/plating/icemoon, +/area/ruin/powered/icemoon_phone_booth) +"q" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/components/tank/air{ + dir = 8; + piping_layer = 4 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating/icemoon, +/area/ruin/powered/icemoon_phone_booth) +"v" = ( +/obj/structure/lattice, +/obj/structure/billboard/Phone_booth, +/turf/open/misc/asteroid/snow/icemoon, +/area/ruin/powered/icemoon_phone_booth) +"z" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/ruin/powered/icemoon_phone_booth) +"J" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/item/gps/spaceruin{ + gpstag = "Public Holophone" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating/icemoon, +/area/ruin/powered/icemoon_phone_booth) +"M" = ( +/turf/closed/wall/ice, +/area/ruin/powered/icemoon_phone_booth) +"R" = ( +/obj/effect/spawner/structure/window/hollow/reinforced, +/turf/open/floor/plating/icemoon, +/area/ruin/powered/icemoon_phone_booth) +"V" = ( +/obj/structure/lattice, +/turf/open/misc/asteroid/snow/icemoon, +/area/ruin/powered/icemoon_phone_booth) +"W" = ( +/obj/machinery/vending/cigarette{ + onstation_override = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/plating/icemoon, +/area/ruin/powered/icemoon_phone_booth) + +(1,1,1) = {" +v +M +k +W +M +"} +(2,1,1) = {" +e +R +a +z +c +"} +(3,1,1) = {" +V +M +J +q +M +"} diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm new file mode 100644 index 00000000000..b3386c8bcf4 --- /dev/null +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm @@ -0,0 +1,98 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/holopad, +/turf/open/floor/iron/dark, +/area/ruin/powered/lavaland_phone_booth) +"c" = ( +/obj/machinery/door/window{ + dir = 1 + }, +/obj/machinery/door/window, +/turf/open/floor/iron/dark/smooth_edge, +/area/ruin/powered/lavaland_phone_booth) +"e" = ( +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/powered/lavaland_phone_booth) +"k" = ( +/obj/machinery/vending/snack/green{ + onstation_override = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/plating/lavaland_atmos, +/area/ruin/powered/lavaland_phone_booth) +"q" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/components/tank/air{ + dir = 8; + piping_layer = 4 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating/lavaland_atmos, +/area/ruin/powered/lavaland_phone_booth) +"v" = ( +/obj/structure/lattice, +/obj/structure/billboard/Phone_booth, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/powered/lavaland_phone_booth) +"z" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/powered/lavaland_phone_booth) +"J" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/item/gps/spaceruin{ + gpstag = "Public Holophone" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating/lavaland_atmos, +/area/ruin/powered/lavaland_phone_booth) +"M" = ( +/turf/closed/wall, +/area/ruin/powered/lavaland_phone_booth) +"R" = ( +/obj/effect/spawner/structure/window/hollow/reinforced, +/turf/open/floor/plating/lavaland_atmos, +/area/ruin/powered/lavaland_phone_booth) +"V" = ( +/obj/structure/lattice, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/powered/lavaland_phone_booth) +"W" = ( +/obj/machinery/vending/cigarette{ + onstation_override = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/plating/lavaland_atmos, +/area/ruin/powered/lavaland_phone_booth) + +(1,1,1) = {" +v +M +k +W +M +"} +(2,1,1) = {" +e +R +a +z +c +"} +(3,1,1) = {" +V +M +J +q +M +"} diff --git a/_maps/RandomRuins/SpaceRuins/phonebooth.dmm b/_maps/RandomRuins/SpaceRuins/phonebooth.dmm new file mode 100644 index 00000000000..ac43612d597 --- /dev/null +++ b/_maps/RandomRuins/SpaceRuins/phonebooth.dmm @@ -0,0 +1,98 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/holopad, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/powered/space_phone_booth) +"c" = ( +/obj/machinery/door/window{ + dir = 1 + }, +/obj/machinery/door/window, +/turf/open/floor/iron/dark/smooth_edge, +/area/ruin/space/has_grav/powered/space_phone_booth) +"e" = ( +/turf/open/space/basic, +/area/ruin/space/has_grav/powered/space_phone_booth) +"k" = ( +/obj/machinery/vending/snack/green{ + onstation_override = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/powered/space_phone_booth) +"q" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/components/tank/air{ + dir = 8; + piping_layer = 4 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/powered/space_phone_booth) +"v" = ( +/obj/structure/lattice, +/obj/structure/billboard/Phone_booth, +/turf/open/space/basic, +/area/ruin/space/has_grav/powered/space_phone_booth) +"z" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/ruin/space/has_grav/powered/space_phone_booth) +"J" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/item/gps/spaceruin{ + gpstag = "Public Holophone" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/powered/space_phone_booth) +"M" = ( +/turf/closed/wall, +/area/ruin/space/has_grav/powered/space_phone_booth) +"R" = ( +/obj/effect/spawner/structure/window/hollow/reinforced, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/powered/space_phone_booth) +"V" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/ruin/space/has_grav/powered/space_phone_booth) +"W" = ( +/obj/machinery/vending/cigarette{ + onstation_override = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/powered/space_phone_booth) + +(1,1,1) = {" +v +M +k +W +M +"} +(2,1,1) = {" +e +R +a +z +c +"} +(3,1,1) = {" +V +M +J +q +M +"} diff --git a/code/datums/ruins/icemoon.dm b/code/datums/ruins/icemoon.dm index 689a9696d14..cf5b84f8f81 100644 --- a/code/datums/ruins/icemoon.dm +++ b/code/datums/ruins/icemoon.dm @@ -55,6 +55,12 @@ description = "Moffuchi's Family Pizzeria chain has a reputation for providing affordable artisanal meals of questionable edibility. This particular pizzeria seems to have been abandoned for some time." suffix = "icemoon_surface_pizza.dmm" +/datum/map_template/ruin/icemoon/frozen_phonebooth + name = "Frozen Phonebooth" + id = "frozen_phonebooth" + description = "A venture by nanotrasen to help popularize the use of holopads. This one was sent to a icemoon." + suffix = "icemoon_surface_phonebooth.dmm" + /datum/map_template/ruin/icemoon/smoking_room name = "Smoking Room" id = "smoking_room" diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index 111c05c6599..69e2d10a67f 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -270,3 +270,11 @@ cost = 5 suffix = "lavaland_surface_bileworm_nest.dmm" allow_duplicates = FALSE + +/datum/map_template/ruin/lavaland/lava_phonebooth + name = "Phonebooth" + id = "lava_phonebooth" + description = "A venture by nanotrasen to help popularize the use of holopads. This one somehow made its way here." + suffix = "lavaland_surface_phonebooth.dmm" + allow_duplicates = FALSE + cost = 5 diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 77b5047a31f..aba3bdc03bb 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -456,6 +456,12 @@ suffix = "whiteshipruin_box.dmm"*/ name = "Transit Booth" description = "Make sure to check out the duty-free store!" +/datum/map_template/ruin/space/space_phonebooth + id = "Space_phonebooth" + suffix = "phonebooth.dmm" + name = "Space Phonebooth" + description = "A venture by nanotrasen to help popularize the use of holopads." + /datum/map_template/ruin/space/the_outlet id = "the_outlet" suffix = "the_outlet.dmm" diff --git a/code/game/area/areas/ruins/icemoon.dm b/code/game/area/areas/ruins/icemoon.dm index 3f41b75478b..f8808903ef4 100644 --- a/code/game/area/areas/ruins/icemoon.dm +++ b/code/game/area/areas/ruins/icemoon.dm @@ -57,5 +57,9 @@ mood_bonus = -8 mood_message = "I can feel my lifespan shortening with every breath." +/area/ruin/powered/icemoon_phone_booth + name = "\improper Phonebooth" + /area/ruin/powered/hermit name = "\improper Hermit's Cabin" + diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm index 0cb805e809a..c16d65059ff 100644 --- a/code/game/area/areas/ruins/lavaland.dm +++ b/code/game/area/areas/ruins/lavaland.dm @@ -3,6 +3,9 @@ /area/ruin/powered/beach +/area/ruin/powered/lavaland_phone_booth + name = "\improper Phone Booth" + /area/ruin/powered/clownplanet name = "\improper Clown Biodome" ambientsounds = list('sound/ambience/clown.ogg') diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 7bcd13624f6..0e4e09d9acd 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -590,6 +590,10 @@ /area/ruin/space/has_grav/travelers_rest name = "\improper Traveler's Rest" +// The Phonebooth +/area/ruin/space/has_grav/powered/space_phone_booth + name = "\improper Phonebooth" + // Botnanical Haven /area/ruin/space/has_grav/powered/botanical_haven name = "\improper Botanical Haven" diff --git a/code/game/objects/structures/billboard.dm b/code/game/objects/structures/billboard.dm index 711ec9b026e..2f580a67e08 100644 --- a/code/game/objects/structures/billboard.dm +++ b/code/game/objects/structures/billboard.dm @@ -95,6 +95,11 @@ desc = "A billboard advertising Fortune Telling. Apparently it's done by real psykers!" icon_state = "billboard_fortune_tell" +/obj/structure/billboard/Phone_booth + name = "\improper Holophone Billboard" + desc = "A billboard advertising Holophones. Interstellar calls for a affordable 49.99 credits with duty free snacks!" + icon_state = "billboard_phone" + /obj/structure/billboard/american_diner name = "\improper All-American Diner billboard" desc = "A billboard advertising an old-school 1950's themed restaurant franchise \"All-American Diner\"" diff --git a/config/iceruinblacklist.txt b/config/iceruinblacklist.txt index a720c3dc314..1871d2d643a 100644 --- a/config/iceruinblacklist.txt +++ b/config/iceruinblacklist.txt @@ -17,6 +17,7 @@ #_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm #_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm #_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm +#_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm #_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm #_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm #_maps/RandomRuins/IceRuins/icemoon_underground_puzzle.dmm diff --git a/config/lavaruinblacklist.txt b/config/lavaruinblacklist.txt index 88605f907b0..4332260d6be 100644 --- a/config/lavaruinblacklist.txt +++ b/config/lavaruinblacklist.txt @@ -39,3 +39,4 @@ #_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_library.dmm #_maps/RandomRuins/AnywhereRuins/fountain_hall.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm \ No newline at end of file diff --git a/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt index 81e06f9611b..a369c2caa77 100644 --- a/config/spaceruinblacklist.txt +++ b/config/spaceruinblacklist.txt @@ -79,7 +79,12 @@ #_maps/RandomRuins/SpaceRuins/atmosasteroidruin.dmm #_maps/RandomRuins/SpaceRuins/prey_pod.dmm #_maps/RandomRuins/SpaceRuins/travelers_rest.dmm +#_maps/RandomRuins/SpaceRuins/phonebooth.dmm #_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm +<<<<<<< HEAD #modular_skyrat/modules/mapping/_maps/RandomRuins/SpaceRuins/forgottenship_skyrat.dmm #modular_skyrat/modules/mapping/_maps/RandomRuins/SpaceRuins/shuttle8532.dmm #modular_skyrat/modules/ruins/maps/space/dangerous_research.dmm +======= +#_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm +>>>>>>> 77f4655efbe (Adds a phonebooth ruin to icebox, space, and lavaland (#74174)) diff --git a/icons/obj/billboard.dmi b/icons/obj/billboard.dmi index 6d9b845c856..7f8fa8f783e 100644 Binary files a/icons/obj/billboard.dmi and b/icons/obj/billboard.dmi differ