From 7214836012fd9299be4b54a5d443a21b1a2d1660 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Sat, 17 Feb 2018 17:38:57 +0200 Subject: [PATCH] Merge pull request #35734 from ShizCalev/path-cleanup Cleans up unused /area paths --- code/game/area/Space_Station_13_areas.dm | 186 ---------------------- code/game/area/areas/mining.dm | 6 - code/game/area/areas/misc.dm | 122 -------------- code/game/area/areas/space_content.dm | 98 ------------ code/game/objects/items/blueprints.dm | 3 +- code/game/turfs/simulated/dirtystation.dm | 3 - tgstation.dme | 2 - 7 files changed, 1 insertion(+), 419 deletions(-) delete mode 100644 code/game/area/areas/misc.dm delete mode 100644 code/game/area/areas/space_content.dm diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 15504ebab0..d65d28507c 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -95,16 +95,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station . = ..() set_dynamic_lighting() -/area/planet/clown - name = "Clown Planet" - icon_state = "honk" - requires_power = FALSE - -/area/telesciareas - name = "Cosmic Anomaly" - icon_state = "telesci" - requires_power = FALSE - //STATION13 @@ -258,105 +248,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station icon_state = "disposal" /area/maintenance/disposal/incinerator -// /area/maintenance/incinerator name = "Incinerator" icon_state = "disposal" -//Cere / Asteroid Specific - -/area/maintenance/asteroid/aft/science - name = "Aft Maintenance" - icon_state = "amaint" - -/area/maintenance/asteroid/aft/arrivals - name = "Aft Maintenance" - icon_state = "amaint" - -/area/maintenance/asteroid/central - name = "Central Asteroid Maintenance" - icon_state = "maintcentral" - -/area/maintenance/asteroid/disposal - icon_state = "disposal" - -/area/maintenance/asteroid/disposal/north - name = "Northern Disposal" - -/area/maintenance/asteroid/disposal/north/east - name = "North-Eastern Disposal" - -/area/maintenance/asteroid/disposal/north/west - name = "North-Western Disposal" - -/area/maintenance/asteroid/disposal/east - name = "Eastern Disposal" - -/area/maintenance/asteroid/disposal/west - name = "Western Disposal" - -/area/maintenance/asteroid/disposal/west/secondary - name = "Secondary Western Disposal" - -/area/maintenance/asteroid/disposal/south - name = "Southern Disposal" - -/area/maintenance/asteroid/disposal/south/west - name = "South-Western Disposal" - -/area/maintenance/asteroid/disposal/external/east - name = "Eastern External Waste Belt" - -/area/maintenance/asteroid/disposal/external/north - name = "Northern External Waste Belt" - -/area/maintenance/asteroid/disposal/external/southeast - name = "South-Eastern External Waste Belt" - -/area/maintenance/asteroid/disposal/external/southwest - name = "South-Western External Waste Belt" - -/area/maintenance/asteroid/fore/cargo_west - name = "Fore Asteroid Maintenance" - icon_state = "fmaint" - -/area/maintenance/asteroid/fore/cargo_south - name = "Fore Asteroid Maintenance" - icon_state = "fmaint" - -/area/maintenance/asteroid/fore/com_west - name = "Fore Asteroid Maintenance" - icon_state = "fmaint" - -/area/maintenance/asteroid/fore/com_north - name = "Fore Asteroid Maintenance" - icon_state = "fmaint" - -/area/maintenance/asteroid/fore/com_east - name = "Fore Asteroid Maintenance" - icon_state = "fmaint" - -/area/maintenance/asteroid/fore/com_south - name = "Fore Asteroid Maintenance" - icon_state = "fmaint" - -/area/maintenance/asteroid/port/neast - name = "Port Asteroid Maintenance" - icon_state = "pmaint" - -/area/maintenance/asteroid/port/east - name = "Port Asteroid Maintenance" - icon_state = "pmaint" - -/area/maintenance/asteroid/port/west - name = "Port Asteroid Maintenance" - icon_state = "pmaint" - -/area/maintenance/asteroid/starboard - name = "Starboard Asteroid Maintenance" - icon_state = "smaint" - - //Hallway /area/hallway/primary/aft @@ -419,42 +314,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Service Hallway" icon_state = "hall_service" -/area/hallway/secondary/bridges/cargo_ai - name = "Cargo-AI-Command Bridge" - icon_state = "yellow" - -/area/hallway/secondary/bridges/com_engi - name = "Command-Engineering Bridge" - icon_state = "yellow" - -/area/hallway/secondary/bridges/com_serv - name = "Command-Service Bridge" - icon_state = "yellow" - -/area/hallway/secondary/bridges/dock_med - name = "Docking-Medical Bridge" - icon_state = "yellow" - -/area/hallway/secondary/bridges/engi_med - name = "Engineering-Medical Bridge" - icon_state = "yellow" - -/area/hallway/secondary/bridges/med_cargo - name = "Medical-Cargo Bridge" - icon_state = "yellow" - -/area/hallway/secondary/bridges/sci_dock - name = "Science-Docking Bridge" - icon_state = "yellow" - -/area/hallway/secondary/bridges/serv_engi - name = "Service-Engineering Bridge" - icon_state = "yellow" - -/area/hallway/secondary/bridges/serv_sci - name = "Service-Science Bridge" - icon_state = "yellow" - //Command /area/bridge @@ -745,18 +604,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station flags_1 = NONE ambientsounds = ENGINEERING -/area/solar/asteroid/aft - name = "Aft Asteroid Solar" - icon_state = "panelsA" - -/area/solar/asteroid/command - name = "Command Asteroid Solar" - icon_state = "panelsA" - -/area/solar/asteroid/fore - name = "Fore Asteroid Solar" - icon_state = "panelsA" - /area/solar/fore name = "Fore Solar Array" icon_state = "yellow" @@ -804,18 +651,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Solar Maintenance" icon_state = "yellow" -/area/maintenance/solars/asteroid/aft - name = "Aft Asteroid Solar Maintenance" - icon_state = "SolarcontrolA" - -/area/maintenance/solars/asteroid/command - name = "Command Asteroid Solar Maintenance" - icon_state = "SolarcontrolP" - -/area/maintenance/solars/asteroid/fore - name = "Fore Asteroid Solar Maintenance" - icon_state = "SolarcontrolP" - /area/maintenance/solars/port name = "Port Solar Maintenance" icon_state = "SolarcontrolP" @@ -872,22 +707,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station music = "signal" ambientsounds = ENGINEERING -/area/teleporter/quantum/cargo - name = "Cargo Quantum Pad" - icon_state = "teleporter" - -/area/teleporter/quantum/docking - name = "Docking Quantum Pad" - icon_state = "teleporter" - -/area/teleporter/quantum/research - name = "Research Quantum Pad" - icon_state = "teleporter" - -/area/teleporter/quantum/security - name = "Security Quantum Pad" - icon_state = "teleporter" - /area/gateway name = "Gateway" icon_state = "gateway" @@ -1458,11 +1277,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "AI Sat Ext" icon_state = "storage" -/area/ai_monitored/turret_protected/NewAIMain - name = "AI Main New" - icon_state = "storage" - - // Telecommunications Satellite diff --git a/code/game/area/areas/mining.dm b/code/game/area/areas/mining.dm index bf5642b7af..493f36dd8d 100644 --- a/code/game/area/areas/mining.dm +++ b/code/game/area/areas/mining.dm @@ -65,12 +65,6 @@ /area/mine/sleeper name = "Mining Station Emergency Sleeper" -/area/mine/north_outpost - name = "North Mining Outpost" - -/area/mine/west_outpost - name = "West Mining Outpost" - /area/mine/laborcamp name = "Labor Camp" diff --git a/code/game/area/areas/misc.dm b/code/game/area/areas/misc.dm deleted file mode 100644 index 7faeb6b51a..0000000000 --- a/code/game/area/areas/misc.dm +++ /dev/null @@ -1,122 +0,0 @@ - -// Hell -/area/hell - name = "Hell Lobby" - //icon = "ICON FILENAME" - //icon_state = "NAME OF ICON" - requires_power = FALSE - ambientsounds = SPOOKY - -/area/hell/trial1 - name = "Hell Trial1" - //icon_state = "NAME OF ICON" (defaults to "unknown" (blank)) - -/area/hell/trial1 - name = "Hell Trial2" - //icon_state = "NAME OF ICON" (defaults to "unknown" (blank)) - -/area/hell/trial1 - name = "Hell Trial3" - //icon_state = "NAME OF ICON" (defaults to "unknown" (blank)) - - - -//Misc - -/area/generic - name = "Unknown" - icon_state = "storage" - - - -//PRISON -/area/prison - name = "Prison Station" - icon_state = "brig" - ambientsounds = HIGHSEC - -/area/prison/arrival_airlock - name = "Prison Station Airlock" - icon_state = "green" - requires_power = FALSE - -/area/prison/control - name = "Prison Security Checkpoint" - icon_state = "security" - -/area/prison/crew_quarters - name = "Prison Security Quarters" - icon_state = "security" - -/area/prison/rec_room - name = "Prison Rec Room" - icon_state = "green" - -/area/prison/closet - name = "Prison Supply Closet" - icon_state = "dk_yellow" - -/area/prison/hallway/fore - name = "Prison Fore Hallway" - icon_state = "yellow" - -/area/prison/hallway/aft - name = "Prison Aft Hallway" - icon_state = "yellow" - -/area/prison/hallway/port - name = "Prison Port Hallway" - icon_state = "yellow" - -/area/prison/hallway/starboard - name = "Prison Starboard Hallway" - icon_state = "yellow" - -/area/prison/morgue - name = "Prison Morgue" - icon_state = "morgue" - ambientsounds = SPOOKY - -/area/prison/medical_research - name = "Prison Genetic Research" - icon_state = "medresearch" - -/area/prison/medical - name = "Prison Medbay" - icon_state = "medbay" - -/area/prison/solar - name = "Prison Solar Array" - icon_state = "storage" - requires_power = FALSE - -/area/prison/podbay - name = "Prison Podbay" - icon_state = "dk_yellow" - -/area/prison/solar_control - name = "Prison Solar Array Control" - icon_state = "dk_yellow" - -/area/prison/solitary - name = "Solitary Confinement" - icon_state = "brig" - -/area/prison/execution_room - name = "Prisoner Education Chamber" - icon_state = "execution_room" - -/area/prison/cell_block/a -// /area/prison/cell_block/A - name = "Prison Cell Block A" - icon_state = "brig" - -/area/prison/cell_block/b -// /area/prison/cell_block/B - name = "Prison Cell Block B" - icon_state = "brig" - -/area/prison/cell_block/c -// /area/prison/cell_block/C - name = "Prison Cell Block C" - icon_state = "brig" diff --git a/code/game/area/areas/space_content.dm b/code/game/area/areas/space_content.dm deleted file mode 100644 index e605faa6e5..0000000000 --- a/code/game/area/areas/space_content.dm +++ /dev/null @@ -1,98 +0,0 @@ - - -/area/spacecontent - name = "space" - ambientsounds = AWAY_MISSION - -/area/spacecontent/a1 - icon_state = "spacecontent1" - -/area/spacecontent/a2 - icon_state = "spacecontent2" - -/area/spacecontent/a3 - icon_state = "spacecontent3" - -/area/spacecontent/a4 - icon_state = "spacecontent4" - -/area/spacecontent/a5 - icon_state = "spacecontent5" - -/area/spacecontent/a6 - icon_state = "spacecontent6" - -/area/spacecontent/a7 - icon_state = "spacecontent7" - -/area/spacecontent/a8 - icon_state = "spacecontent8" - -/area/spacecontent/a9 - icon_state = "spacecontent9" - -/area/spacecontent/a10 - icon_state = "spacecontent10" - -/area/spacecontent/a11 - icon_state = "spacecontent11" - -/area/spacecontent/a11 - icon_state = "spacecontent12" - -/area/spacecontent/a12 - icon_state = "spacecontent13" - -/area/spacecontent/a13 - icon_state = "spacecontent14" - -/area/spacecontent/a14 - icon_state = "spacecontent14" - -/area/spacecontent/a15 - icon_state = "spacecontent15" - -/area/spacecontent/a16 - icon_state = "spacecontent16" - -/area/spacecontent/a17 - icon_state = "spacecontent17" - -/area/spacecontent/a18 - icon_state = "spacecontent18" - -/area/spacecontent/a19 - icon_state = "spacecontent19" - -/area/spacecontent/a20 - icon_state = "spacecontent20" - -/area/spacecontent/a21 - icon_state = "spacecontent21" - -/area/spacecontent/a22 - icon_state = "spacecontent22" - -/area/spacecontent/a23 - icon_state = "spacecontent23" - -/area/spacecontent/a24 - icon_state = "spacecontent24" - -/area/spacecontent/a25 - icon_state = "spacecontent25" - -/area/spacecontent/a26 - icon_state = "spacecontent26" - -/area/spacecontent/a27 - icon_state = "spacecontent27" - -/area/spacecontent/a28 - icon_state = "spacecontent28" - -/area/spacecontent/a29 - icon_state = "spacecontent29" - -/area/spacecontent/a30 - icon_state = "spacecontent30" diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 958b9ff8b0..e3c74a4ddf 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -146,8 +146,7 @@ /area/centcom, /area/asteroid, /area/tdome, - /area/wizard_station, - /area/prison + /area/wizard_station ) for (var/type in SPECIALS) if ( istype(A,type) ) diff --git a/code/game/turfs/simulated/dirtystation.dm b/code/game/turfs/simulated/dirtystation.dm index c411d4b6b1..e29d75a248 100644 --- a/code/game/turfs/simulated/dirtystation.dm +++ b/code/game/turfs/simulated/dirtystation.dm @@ -28,8 +28,6 @@ var/static/list/high_dirt_areas = typecacheof(list(/area/science/test_area, /area/mine/production, /area/mine/living_quarters, - /area/mine/north_outpost, - /area/mine/west_outpost, /area/ruin/space)) if(is_type_in_typecache(A, high_dirt_areas)) new /obj/effect/decal/cleanable/dirt(src) //vanilla, but it works @@ -84,7 +82,6 @@ //Areas where gibs will be present. Robusting probably happened some time ago. var/static/list/gib_covered_areas = typecacheof(list(/area/ai_monitored/turret_protected, - /area/prison, /area/security, /area/crew_quarters/heads/hos)) if(is_type_in_typecache(A, gib_covered_areas)) diff --git a/tgstation.dme b/tgstation.dme index 2534f97c3e..cefa598147 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -482,9 +482,7 @@ #include "code\game\area\areas\centcom.dm" #include "code\game\area\areas\holodeck.dm" #include "code\game\area\areas\mining.dm" -#include "code\game\area\areas\misc.dm" #include "code\game\area\areas\shuttles.dm" -#include "code\game\area\areas\space_content.dm" #include "code\game\area\areas\ruins\_ruins.dm" #include "code\game\area\areas\ruins\lavaland.dm" #include "code\game\area\areas\ruins\space.dm"