From 6f455141a57e832055082f458ae00b61a0961e32 Mon Sep 17 00:00:00 2001 From: goober3 <118859017+goober3@users.noreply.github.com> Date: Sat, 18 May 2024 00:40:10 +0100 Subject: [PATCH 1/2] Removes DJstation.dmm (#2996) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## About The Pull Request This pr finishes #2830. I'm KILLING retlaw. ## Why It's Good For The Game no mor ebad ruin only good ruin? ## Changelog 🆑 del: Djstation.dmm has been taken out back and shot. /🆑 --- _maps/RandomRuins/SpaceRuins/DJstation.dmm | 932 ------------------ _maps/map_catalogue.txt | 4 - code/datums/ruins/space.dm | 7 - code/game/area/areas/ruins/space.dm | 12 - .../modules/ruins/spaceruin_code/DJstation.dm | 5 - shiptest.dme | 1 - 6 files changed, 961 deletions(-) delete mode 100644 _maps/RandomRuins/SpaceRuins/DJstation.dmm delete mode 100644 code/modules/ruins/spaceruin_code/DJstation.dm diff --git a/_maps/RandomRuins/SpaceRuins/DJstation.dmm b/_maps/RandomRuins/SpaceRuins/DJstation.dmm deleted file mode 100644 index 63659db94417..000000000000 --- a/_maps/RandomRuins/SpaceRuins/DJstation.dmm +++ /dev/null @@ -1,932 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aa" = ( -/turf/template_noop, -/area/template_noop) -"ab" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/ruin/space/djstation/solars) -"ac" = ( -/obj/machinery/power/solar/fake, -/obj/effect/turf_decal/solarpanel, -/turf/open/floor/plasteel/airless, -/area/ruin/space/djstation/solars) -"ad" = ( -/turf/open/floor/plating/airless, -/area/ruin/space/djstation/solars) -"ae" = ( -/obj/structure/lattice, -/turf/template_noop, -/area/space/nearstation) -"af" = ( -/turf/closed/wall, -/area/ruin/space/djstation) -"ag" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/ruin/space/djstation) -"ah" = ( -/turf/open/floor/plating, -/area/ruin/space/djstation) -"ai" = ( -/obj/machinery/telecomms/relay/preset/ruskie, -/obj/machinery/light/directional/north, -/turf/open/floor/plating, -/area/ruin/space/djstation) -"aj" = ( -/obj/machinery/power/terminal, -/turf/open/floor/plating, -/area/ruin/space/djstation) -"ak" = ( -/obj/item/multitool, -/turf/open/floor/plating, -/area/ruin/space/djstation) -"al" = ( -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 - }, -/turf/open/floor/plating, -/area/ruin/space/djstation) -"am" = ( -/obj/item/extinguisher, -/turf/open/floor/plating, -/area/ruin/space/djstation) -"as" = ( -/obj/structure/rack, -/obj/item/clothing/suit/space/syndicate/orange, -/obj/item/clothing/head/helmet/space/syndicate/orange, -/obj/item/clothing/mask/breath, -/turf/open/floor/plating, -/area/ruin/space/djstation) -"at" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/turf/open/floor/plating, -/area/ruin/space/djstation) -"au" = ( -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"av" = ( -/obj/machinery/vending/snack, -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"aw" = ( -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"ax" = ( -/obj/machinery/light_switch{ - pixel_y = 28 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"ay" = ( -/obj/machinery/newscaster/directional/north{ - pixel_y = 32 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"az" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/effect/turf_decal/corner/transparent/bar, -/obj/effect/turf_decal/corner/transparent/bar{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"aA" = ( -/obj/effect/turf_decal/corner/transparent/bar, -/obj/effect/turf_decal/corner/transparent/bar{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"aB" = ( -/obj/effect/spawner/lootdrop/crate_spawner, -/turf/open/floor/plasteel/grimy, -/area/ruin/space/djstation) -"aC" = ( -/obj/machinery/light_switch{ - pixel_y = 28 - }, -/turf/open/floor/plasteel/grimy, -/area/ruin/space/djstation) -"aD" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/turf/open/floor/plasteel/grimy, -/area/ruin/space/djstation) -"aE" = ( -/obj/structure/table, -/obj/item/flashlight/lamp, -/turf/open/floor/plasteel/grimy, -/area/ruin/space/djstation) -"aF" = ( -/obj/structure/table, -/obj/machinery/microwave{ - pixel_y = 8 - }, -/obj/effect/turf_decal/corner/transparent/bar, -/obj/effect/turf_decal/corner/transparent/bar{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"aG" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Kitchen"; - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"aH" = ( -/obj/structure/table, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/obj/item/radio/intercom/table{ - dir = 8; - freerange = 1 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"aI" = ( -/obj/structure/chair/office/light, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"aJ" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Rest Room"; - dir = 8 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"aK" = ( -/turf/open/floor/plasteel/grimy, -/area/ruin/space/djstation) -"aL" = ( -/obj/machinery/sleeper{ - dir = 8 - }, -/turf/open/floor/plasteel/grimy, -/area/ruin/space/djstation) -"aM" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/corner/transparent/bar, -/obj/effect/turf_decal/corner/transparent/bar{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"aN" = ( -/obj/machinery/light/small/directional/south, -/obj/effect/turf_decal/corner/transparent/bar, -/obj/effect/turf_decal/corner/transparent/bar{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"aO" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/corner/transparent/bar, -/obj/effect/turf_decal/corner/transparent/bar{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"aP" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"aQ" = ( -/obj/structure/table, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/obj/item/radio/intercom/table{ - freerange = 1 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"aS" = ( -/obj/structure/frame/computer{ - anchored = 1 - }, -/turf/open/floor/plasteel/grimy, -/area/ruin/space/djstation) -"aT" = ( -/obj/structure/chair{ - dir = 8 - }, -/turf/open/floor/plasteel/grimy, -/area/ruin/space/djstation) -"aU" = ( -/obj/machinery/light/small/directional/south, -/turf/open/floor/plasteel/grimy, -/area/ruin/space/djstation) -"aV" = ( -/obj/structure/closet, -/turf/open/floor/plasteel/grimy, -/area/ruin/space/djstation) -"aW" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall, -/area/ruin/space/djstation) -"aX" = ( -/obj/machinery/door/airlock/hatch{ - name = "Washroom" - }, -/turf/open/floor/plasteel/freezer, -/area/ruin/space/djstation) -"aY" = ( -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"aZ" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"ba" = ( -/turf/open/floor/plasteel/freezer, -/area/ruin/space/djstation) -"bb" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"bc" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/space_heater, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"bd" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/rack, -/obj/item/clothing/under/costume/pirate, -/obj/item/clothing/head/bandana, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"be" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12; - pixel_y = 2 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plasteel/freezer, -/area/ruin/space/djstation) -"bf" = ( -/obj/structure/toilet{ - pixel_y = 8 - }, -/turf/open/floor/plasteel/freezer, -/area/ruin/space/djstation) -"bg" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = 1; - pixel_y = 9 - }, -/obj/item/pen, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"bh" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_y = -32 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"bi" = ( -/obj/machinery/door/airlock/external{ - name = "Ruskie DJ Station" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, -/area/ruin/space/djstation) -"bj" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/disposaloutlet, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"hc" = ( -/obj/machinery/power/smes/magical{ - desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; - name = "power storage unit" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/plating, -/area/ruin/space/djstation) -"lU" = ( -/obj/structure/table, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 1 - }, -/obj/effect/turf_decal/corner/opaque/white{ - dir = 2 - }, -/obj/item/paper/fluff/ruins/djstation, -/turf/open/floor/plasteel, -/area/ruin/space/djstation) -"nM" = ( -/obj/item/storage/box/lights/mixed, -/obj/structure/sign/warning/electricshock{ - pixel_y = -32 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/ruin/space/djstation) -"uK" = ( -/obj/machinery/power/apc{ - name = "Worn-out APC"; - pixel_y = -25 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/ruin/space/djstation) -"zO" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plating, -/area/ruin/space/djstation) -"Co" = ( -/obj/machinery/door/airlock/external{ - name = "Ruskie DJ Station" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/plating, -/area/ruin/space/djstation) -"Gg" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/ruin/space/djstation) - -(1,1,1) = {" -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -aa -af -ag -ag -ag -af -aa -ae -aa -aa -aa -"} -(2,1,1) = {" -aa -aa -aa -aa -aa -ab -ac -ad -ac -ad -ac -ab -aa -af -az -aF -aM -aW -aZ -aZ -aZ -bj -aa -"} -(3,1,1) = {" -aa -aa -aa -aa -aa -ab -ac -ad -ac -ad -ac -ab -aa -af -aA -aA -aN -af -ae -ae -aa -aa -aa -"} -(4,1,1) = {" -aa -aa -aa -aa -ae -ab -ac -ad -ac -ad -ac -ab -aa -af -aA -aA -aO -af -af -af -af -aa -aa -"} -(5,1,1) = {" -aa -aa -aa -ae -ae -ab -ac -ad -ac -ad -ac -ab -aa -af -aA -aA -aA -aX -ba -be -af -aa -aa -"} -(6,1,1) = {" -ab -ab -ab -ab -ab -af -ag -ag -af -ag -ag -af -af -af -ag -aG -ag -af -af -bf -af -aa -aa -"} -(7,1,1) = {" -ab -ac -ac -ac -ac -ag -ah -ah -ah -am -ah -uK -af -au -aw -aw -aw -aw -af -af -af -aa -aa -"} -(8,1,1) = {" -ab -ad -ad -ad -ad -ag -ah -ah -ah -ah -ah -nM -af -av -aw -aH -aP -aw -bb -bg -af -aa -aa -"} -(9,1,1) = {" -ab -ac -ac -ac -ac -af -ai -ah -aj -hc -Gg -zO -at -aw -aw -aI -aQ -aw -aw -aw -af -aa -aa -"} -(10,1,1) = {" -ab -ad -ad -ad -ad -ag -ah -ah -ak -ah -ah -ah -af -ax -aw -lU -aQ -aw -bc -bh -af -af -af -"} -(11,1,1) = {" -ab -ac -ac -ac -ac -ag -ah -ah -al -ah -ah -as -af -ay -aw -aw -aw -aY -bd -aw -bi -ah -Co -"} -(12,1,1) = {" -ab -ab -ab -ab -ab -af -ag -ag -af -ag -ag -af -af -af -ag -aJ -ag -af -af -af -af -af -af -"} -(13,1,1) = {" -aa -aa -ae -ae -ae -ab -ac -ad -ac -ad -ac -ab -aa -af -aB -aK -aS -af -aa -aa -aa -aa -aa -"} -(14,1,1) = {" -aa -aa -aa -aa -ae -ab -ac -ad -ac -ad -ac -ab -aa -af -aC -aK -aT -af -aa -aa -aa -aa -aa -"} -(15,1,1) = {" -aa -aa -aa -aa -ae -ab -ac -ad -ac -ad -ac -ab -aa -af -aD -aK -aU -af -ae -ae -aa -aa -aa -"} -(16,1,1) = {" -aa -aa -aa -aa -aa -ab -ac -ad -ac -ad -ac -ab -aa -af -aE -aL -aV -af -aa -aa -aa -aa -aa -"} -(17,1,1) = {" -aa -aa -aa -aa -aa -ab -ab -ab -ab -ab -ab -ab -aa -af -ag -ag -ag -af -aa -aa -aa -aa -aa -"} -(18,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ae -ae -aa -ae -aa -aa -ae -aa -aa -aa -aa -aa -aa -"} diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt index f3fbe957688c..a8538ae59aeb 100644 --- a/_maps/map_catalogue.txt +++ b/_maps/map_catalogue.txt @@ -302,10 +302,6 @@ Find the key for using this catalogue in "map_catalogue_key.txt" SpaceRuins: - File Name = "_maps\RandomRuins\SpaceRuins\.dmm" - Size = (x = 18)(y = 23)(z = 1) - Tags = "No Combat", "Minor Loot", "Shelter" - File Name = "_maps\RandomRuins\SpaceRuins\astraeus.dmm" Size = (x = 47)(y = 35)(z = 1) Tags = "Minor Combat Challenge", "Medium Loot", "Inhospitable" diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 7872ba58a3a4..fefb250a1208 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -39,13 +39,6 @@ description = "In the darkest times, we will find our way home." */ -/datum/map_template/ruin/space/djstation - id = "djstation" - suffix = "djstation.dmm" - name = "DJ Station" - description = "Until very recently this pirate radio station was used to harangue local space stations over a variety of perceived \"ethics violations\". \ - It seems like someone finally got sick of it, but the equipment still works." - /datum/map_template/ruin/space/crashedship id = "crashedship" suffix = "crashedship.dmm" diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index e6034e412198..de546d164c96 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -167,18 +167,6 @@ name = "Derelict Atmospherics" icon_state = "red" -//DJSTATION - -/area/ruin/space/djstation - name = "Ruskie DJ Station" - icon_state = "DJ" - has_gravity = STANDARD_GRAVITY - -/area/ruin/space/djstation/solars - name = "DJ Station Solars" - icon_state = "DJ" - has_gravity = STANDARD_GRAVITY - //OLD AI SAT /area/tcommsat/oldaisat diff --git a/code/modules/ruins/spaceruin_code/DJstation.dm b/code/modules/ruins/spaceruin_code/DJstation.dm deleted file mode 100644 index 3be98b064e3e..000000000000 --- a/code/modules/ruins/spaceruin_code/DJstation.dm +++ /dev/null @@ -1,5 +0,0 @@ -/////////// djstation items - -/obj/item/paper/fluff/ruins/djstation - name = "paper - 'DJ Listening Outpost'" - default_raw_text = "Welcome new owner!

You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio frequencies. Here is a step by step guide to start listening in on those saucy radio channels:
  1. Equip yourself with a multitool
  2. Use the multitool on the relay.
  3. Turn it on. It has already been configured for you to listen on.
Simple as that. Now to listen to the private channels, you'll have to configure the intercoms. They are located on the front desk. Here is a list of frequencies for you to listen on.