From 5f2b7d7cd04430e67283901ad38397148ce5ccf4 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Thu, 20 Jun 2024 07:38:33 -0400 Subject: [PATCH] refactor: remove many unused areas. (#25893) * refactor: remove many unused areas. * correct pod number --- code/game/area/ai_monitored.dm | 4 - code/game/area/areas/mining_areas.dm | 31 ---- code/game/area/asteroid_areas.dm | 24 --- code/game/area/centcom_areas.dm | 8 - code/game/area/misc_areas.dm | 27 ---- code/game/area/shuttle_areas.dm | 147 ------------------ code/game/area/ss13_areas/ai_areas.dm | 22 --- code/game/area/ss13_areas/command_areas.dm | 6 - .../game/area/ss13_areas/engineering_areas.dm | 8 - .../game/area/ss13_areas/maintenance_areas.dm | 19 --- code/game/area/ss13_areas/medical_areas.dm | 4 - code/game/area/ss13_areas/public_areas.dm | 6 - code/game/area/ss13_areas/science_areas.dm | 12 -- code/game/area/ss13_areas/supply_areas.dm | 8 - code/game/gamemodes/game_mode.dm | 24 +-- code/game/objects/items/blueprints.dm | 1 - .../turfs/simulated/floor/asteroid_floors.dm | 6 +- .../mission_code/ruins/oldstation.dm | 9 -- code/modules/events/prison_break.dm | 4 +- code/modules/ruins/ruin_areas.dm | 3 - paradise.dme | 1 - 21 files changed, 19 insertions(+), 355 deletions(-) delete mode 100644 code/game/area/asteroid_areas.dm diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm index 269ae378f99a..93516308bd04 100644 --- a/code/game/area/ai_monitored.dm +++ b/code/game/area/ai_monitored.dm @@ -33,7 +33,3 @@ name = "EVA Storage" icon_state = "eva" ambientsounds = HIGHSEC_SOUNDS - -/area/station/ai_monitored/storage/secure - name = "Secure Storage" - icon_state = "storage" diff --git a/code/game/area/areas/mining_areas.dm b/code/game/area/areas/mining_areas.dm index aa4802ffabbc..2162e914109b 100644 --- a/code/game/area/areas/mining_areas.dm +++ b/code/game/area/areas/mining_areas.dm @@ -4,23 +4,6 @@ icon_state = "mining" has_gravity = TRUE -/area/mine/explored - name = "Mine" - icon_state = "explored" - always_unpowered = TRUE - requires_power = TRUE - poweralm = FALSE - apc_starts_off = TRUE - outdoors = TRUE - ambientsounds = MINING_SOUNDS - flags = NONE - sound_environment = SOUND_AREA_STANDARD_STATION - min_ambience_cooldown = 70 SECONDS - max_ambience_cooldown = 220 SECONDS - -/area/mine/dangerous/explored/golem - name = "Small Asteroid" - /area/mine/unexplored name = "Mine" icon_state = "unexplored" @@ -47,9 +30,6 @@ /area/mine/unexplored/cere/command name = "Command Asteroid" -/area/mine/unexplored/cere/docking - name = "Docking Asteroid" - /area/mine/unexplored/cere/engineering name = "Engineering Asteroid" @@ -171,17 +151,6 @@ min_ambience_cooldown = 70 SECONDS max_ambience_cooldown = 220 SECONDS -/area/lavaland/underground - name = "Lavaland Caves" - icon_state = "unexplored" - always_unpowered = TRUE - requires_power = TRUE - poweralm = FALSE - apc_starts_off = TRUE - ambientsounds = MINING_SOUNDS - min_ambience_cooldown = 70 SECONDS - max_ambience_cooldown = 220 SECONDS - /area/lavaland/surface/outdoors name = "Lavaland Wastes" outdoors = TRUE diff --git a/code/game/area/asteroid_areas.dm b/code/game/area/asteroid_areas.dm deleted file mode 100644 index 97935e23bc25..000000000000 --- a/code/game/area/asteroid_areas.dm +++ /dev/null @@ -1,24 +0,0 @@ -// Asteroids - -/// -- TLE -/area/asteroid - name = "\improper Asteroid" - icon_state = "asteroid" - requires_power = FALSE - valid_territory = FALSE - dynamic_lighting = DYNAMIC_LIGHTING_FORCED - ambientsounds = MINING_SOUNDS - sound_environment = SOUND_AREA_ASTEROID - min_ambience_cooldown = 70 SECONDS - max_ambience_cooldown = 220 SECONDS - -/// -- TLE -/area/asteroid/cave - name = "\improper Asteroid - Underground" - icon_state = "cave" - requires_power = FALSE - outdoors = TRUE - -/area/asteroid/artifactroom - name = "\improper Asteroid - Artifact" - icon_state = "cave" diff --git a/code/game/area/centcom_areas.dm b/code/game/area/centcom_areas.dm index 455911a1b118..98674bf344a8 100644 --- a/code/game/area/centcom_areas.dm +++ b/code/game/area/centcom_areas.dm @@ -85,14 +85,6 @@ name = "\improper Thunderdome Arena" icon_state = "thunder" -/area/tdome/tdome1 - name = "\improper Thunderdome (Team 1)" - icon_state = "green" - -/area/tdome/tdome2 - name = "\improper Thunderdome (Team 2)" - icon_state = "yellow" - /area/tdome/tdomeadmin name = "\improper Thunderdome (Admin.)" icon_state = "purple" diff --git a/code/game/area/misc_areas.dm b/code/game/area/misc_areas.dm index 64595545136a..b7239cda7ec6 100644 --- a/code/game/area/misc_areas.dm +++ b/code/game/area/misc_areas.dm @@ -1,8 +1,3 @@ - -/area/generic - name = "Unknown" - icon_state = "storage" - /// will be unused once kurper gets his login interface patch done /area/start name = "start area" @@ -55,27 +50,5 @@ nad_allowed = TRUE ambientsounds = HIGHSEC_SOUNDS -/area/syndicate_mothership/control - name = "\improper Syndicate Control Room" - icon_state = "syndie-control" - -/area/syndicate_mothership/elite_squad - name = "\improper Syndicate Elite Squad" - icon_state = "syndie-elite" - -/area/syndicate_mothership/infteam - name = "\improper Syndicate Infiltrators" - icon_state = "syndie-elite" - /area/syndicate_mothership/jail name = "\improper Syndicate Jail" - -// idk what this area is -/area/mint - name = "\improper Mint" - icon_state = "green" - -//GAYBAR -/area/secret/gaybar - name = "\improper Dance Bar" - icon_state = "dancebar" diff --git a/code/game/area/shuttle_areas.dm b/code/game/area/shuttle_areas.dm index 4ab5b70b3eca..52cf9ec79281 100644 --- a/code/game/area/shuttle_areas.dm +++ b/code/game/area/shuttle_areas.dm @@ -14,9 +14,6 @@ name = "\improper Arrival Shuttle" parallax_move_direction = EAST -/area/shuttle/arrival/pre_game - icon_state = "shuttle2" - /area/shuttle/arrival/station icon_state = "shuttle" @@ -50,59 +47,6 @@ nad_allowed = TRUE parallax_move_direction = EAST -/area/shuttle/escape_pod1 - name = "\improper Escape Pod One" - nad_allowed = TRUE - -/area/shuttle/escape_pod1/station - icon_state = "shuttle2" - -/area/shuttle/escape_pod1/centcom - icon_state = "shuttle" - -/area/shuttle/escape_pod1/transit - icon_state = "shuttle" - -/area/shuttle/escape_pod2 - name = "\improper Escape Pod Two" - nad_allowed = TRUE - -/area/shuttle/escape_pod2/station - icon_state = "shuttle2" - -/area/shuttle/escape_pod2/centcom - icon_state = "shuttle" - -/area/shuttle/escape_pod2/transit - icon_state = "shuttle" - -/area/shuttle/escape_pod3 - name = "\improper Escape Pod Three" - nad_allowed = TRUE - -/area/shuttle/escape_pod3/station - icon_state = "shuttle2" - -/area/shuttle/escape_pod3/centcom - icon_state = "shuttle" - -/area/shuttle/escape_pod3/transit - icon_state = "shuttle" - -/// Pod 4 was lost to meteors -/area/shuttle/escape_pod5 - name = "\improper Escape Pod Five" - nad_allowed = TRUE - -/area/shuttle/escape_pod5/station - icon_state = "shuttle2" - -/area/shuttle/escape_pod5/centcom - icon_state = "shuttle" - -/area/shuttle/escape_pod5/transit - icon_state = "shuttle" - /area/shuttle/mining name = "\improper Mining Shuttle" icon_state = "shuttle" @@ -112,20 +56,6 @@ name = "\improper Transport Shuttle" parallax_move_direction = EAST -/area/shuttle/transport1 - icon_state = "shuttle" - name = "\improper Transport Shuttle" - -/area/shuttle/alien/base - icon_state = "shuttle" - name = "\improper Alien Shuttle Base" - requires_power = 1 - -/area/shuttle/alien/mine - icon_state = "shuttle" - name = "\improper Alien Shuttle Mine" - requires_power = 1 - /area/shuttle/gamma/space icon_state = "shuttle" name = "\improper Gamma Armory" @@ -134,15 +64,6 @@ icon_state = "shuttle" name = "\improper Gamma Armory Station" -/area/shuttle/prison/ - name = "\improper Prison Shuttle" - -/area/shuttle/prison/station - icon_state = "shuttle" - -/area/shuttle/prison/prison - icon_state = "shuttle2" - /area/shuttle/siberia name = "\improper Labor Camp Shuttle" icon_state = "shuttle" @@ -152,28 +73,12 @@ icon_state = "shuttlered" parallax_move_direction = EAST -/area/shuttle/specops/centcom - name = "\improper Special Ops Shuttle" - icon_state = "shuttlered" - -/area/shuttle/specops/station - name = "\improper Special Ops Shuttle" - icon_state = "shuttlered2" - /area/shuttle/syndicate_elite name = "\improper Syndicate Elite Shuttle" icon_state = "shuttlered" nad_allowed = TRUE parallax_move_direction = SOUTH -/area/shuttle/syndicate_elite/mothership - name = "\improper Syndicate Elite Shuttle" - icon_state = "shuttlered" - -/area/shuttle/syndicate_elite/station - name = "\improper Syndicate Elite Shuttle" - icon_state = "shuttlered2" - /area/shuttle/syndicate_sit name = "\improper Syndicate SIT Shuttle" icon_state = "shuttlered" @@ -197,44 +102,8 @@ name = "\improper Nanotrasen Vessel" icon_state = "shuttlered2" -/area/shuttle/thunderdome - name = "honk" - -/area/shuttle/thunderdome/grnshuttle - name = "\improper Thunderdome GRN Shuttle" - icon_state = "green" - -/area/shuttle/thunderdome/grnshuttle/dome - name = "\improper GRN Shuttle" - icon_state = "shuttlegrn" - -/area/shuttle/thunderdome/grnshuttle/station - name = "\improper GRN Station" - icon_state = "shuttlegrn2" - -/area/shuttle/thunderdome/redshuttle - name = "\improper Thunderdome RED Shuttle" - icon_state = "red" - -/area/shuttle/thunderdome/redshuttle/dome - name = "\improper RED Shuttle" - icon_state = "shuttlered" - -/area/shuttle/thunderdome/redshuttle/station - name = "\improper RED Station" - icon_state = "shuttlered2" // === Trying to remove these areas: -/area/shuttle/research - name = "\improper Research Shuttle" - icon_state = "shuttle" - -/area/shuttle/research/station - icon_state = "shuttle2" - -/area/shuttle/research/outpost - icon_state = "shuttle" - /area/shuttle/supply name = "Supply Shuttle" icon_state = "shuttle3" @@ -260,19 +129,3 @@ name = "Free Golem Ship" icon_state = "purple" xenobiology_compatible = TRUE - -/area/shuttle/derelict/ship/start - name = "\improper Abandoned Ship" - icon_state = "yellow" - -/area/shuttle/derelict/ship/transit - name = "\improper Abandoned Ship" - icon_state = "yellow" - -/area/shuttle/derelict/ship/engipost - name = "\improper Engineering Outpost" - icon_state = "yellow" - -/area/shuttle/derelict/ship/station - name = "\improper North of SS13" - icon_state = "yellow" diff --git a/code/game/area/ss13_areas/ai_areas.dm b/code/game/area/ss13_areas/ai_areas.dm index a1a5177deada..dc745d0a4099 100644 --- a/code/game/area/ss13_areas/ai_areas.dm +++ b/code/game/area/ss13_areas/ai_areas.dm @@ -21,14 +21,6 @@ name = "\improper AI Satellite Exterior" icon_state = "ai" -/area/station/aisat/entrance - name = "\improper AI Satellite Entrance" - icon_state = "ai" - -/area/station/aisat/maintenance - name = "\improper AI Satellite Maintenance" - icon_state = "ai" - /area/station/aisat/atmos name = "\improper AI Satellite Atmospherics" @@ -57,21 +49,7 @@ icon_state = "tcomms" // These areas are needed for MetaStation's AI sat -/area/station/turret_protected/tcomfoyer - name = "\improper Telecoms Foyer" - icon_state = "tcomms" - ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') - -/area/station/turret_protected/tcomeast - name = "\improper Telecoms East Wing" - icon_state = "tcomms" - ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg') - /area/station/telecomms/computer name = "\improper Telecoms Control Room" icon_state = "tcomms" sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR - -/area/station/telecomms/server - name = "\improper Telecoms Server Room" - icon_state = "tcomms" diff --git a/code/game/area/ss13_areas/command_areas.dm b/code/game/area/ss13_areas/command_areas.dm index 1e63b839053e..ab9865943fc7 100644 --- a/code/game/area/ss13_areas/command_areas.dm +++ b/code/game/area/ss13_areas/command_areas.dm @@ -54,12 +54,6 @@ icon_state = "teleporter" ambientsounds = ENGINEERING_SOUNDS -/area/station/command/gateway - name = "\improper Gateway" - icon_state = "gateway" - ambientsounds = ENGINEERING_SOUNDS - sound_environment = SOUND_AREA_STANDARD_STATION - /area/station/command/vault name = "\improper Vault" icon_state = "nuke_storage" diff --git a/code/game/area/ss13_areas/engineering_areas.dm b/code/game/area/ss13_areas/engineering_areas.dm index aa68e2d90e61..dc3fe13d7ce2 100644 --- a/code/game/area/ss13_areas/engineering_areas.dm +++ b/code/game/area/ss13_areas/engineering_areas.dm @@ -82,14 +82,6 @@ name = "\improper Fore Starboard Solar Array" icon_state = "FSsolars" -/area/station/engineering/solar/fore - name = "\improper Fore Solar Array" - icon_state = "yellow" - -/area/station/engineering/solar/aft - name = "\improper Aft Solar Array" - icon_state = "Asolars" - /area/station/engineering/solar/starboard name = "\improper Starboard Solar Array" icon_state = "Ssolars" diff --git a/code/game/area/ss13_areas/maintenance_areas.dm b/code/game/area/ss13_areas/maintenance_areas.dm index 5cdf15bb5ee3..c2e3256b3a03 100644 --- a/code/game/area/ss13_areas/maintenance_areas.dm +++ b/code/game/area/ss13_areas/maintenance_areas.dm @@ -5,10 +5,6 @@ valid_territory = FALSE sound_environment = SOUND_AREA_TUNNEL_ENCLOSED -/area/station/maintenance/atmos_control - name = "Atmospherics Maintenance" - icon_state = "fpmaint" - /area/station/maintenance/engimaint name = "Engineering Maintenance" icon_state = "engimaint" @@ -53,10 +49,6 @@ name = "Central Maintenance" icon_state = "maintcentral" -/area/station/maintenance/maintcentral2 - name = "Central Secondary Maintenance" - icon_state = "maintcentral" - /area/station/maintenance/fore name = "Fore Maintenance" icon_state = "fmaint" @@ -105,10 +97,6 @@ name = "Waste Disposal" icon_state = "disposals" -/area/station/maintenance/genetics - name = "Genetics Maintenance" - icon_state = "asmaint" - /area/station/maintenance/electrical name = "Electrical Maintenance" icon_state = "elect" @@ -141,10 +129,6 @@ name = "Gambling Den" icon_state = "yellow" -/area/station/maintenance/consarea - name = "Alternate Construction Area" - icon_state = "construction" - /area/station/maintenance/auxsolarport name = "\improper Fore Port Solar Maintenance" icon_state = "FPctrl" @@ -217,8 +201,5 @@ /area/station/maintenance/disposal/external/southeast name = "South-Eastern External Waste Belt" -/area/station/maintenance/disposal/external/east - name="Eastern External Waste Belt" - /area/station/maintenance/disposal/external/north name = "Northern External Waste Belt" diff --git a/code/game/area/ss13_areas/medical_areas.dm b/code/game/area/ss13_areas/medical_areas.dm index 12c18beab250..f0d7f8c3cf1c 100644 --- a/code/game/area/ss13_areas/medical_areas.dm +++ b/code/game/area/ss13_areas/medical_areas.dm @@ -49,10 +49,6 @@ icon_state = "patients" sound_environment = SOUND_AREA_SMALL_SOFTFLOOR -/area/station/medical/ward - name = "\improper Medbay Patient Ward" - icon_state = "patientsward" - /area/station/medical/coldroom name = "Cold Room" icon_state = "coldroom" diff --git a/code/game/area/ss13_areas/public_areas.dm b/code/game/area/ss13_areas/public_areas.dm index 7fc9f2922630..0a06add2481b 100644 --- a/code/game/area/ss13_areas/public_areas.dm +++ b/code/game/area/ss13_areas/public_areas.dm @@ -150,10 +150,6 @@ icon_state = "dorms" sound_environment = SOUND_AREA_STANDARD_STATION - -/area/crew_quarters/toilet/aux - name = "\improper Auxiliary Toilets" - /area/station/public/sleep name = "\improper Primary Cryogenic Dormitories" icon_state = "Sleep" @@ -198,8 +194,6 @@ name = "\improper Vacant Office" icon_state = "vacantoffice" -/area/station/public/vacant_office/secondary - //Storage /area/station/public/storage sound_environment = SOUND_AREA_STANDARD_STATION diff --git a/code/game/area/ss13_areas/science_areas.dm b/code/game/area/ss13_areas/science_areas.dm index 2691f30a5b65..7702c345640c 100644 --- a/code/game/area/ss13_areas/science_areas.dm +++ b/code/game/area/ss13_areas/science_areas.dm @@ -50,23 +50,11 @@ name = "\improper Research Lab" icon_state = "sci" -/area/station/science/supermatter - name = "\improper Supermatter Lab" - icon_state = "scilab" - /area/station/science/xenobiology name = "\improper Xenobiology Lab" icon_state = "xenobio" xenobiology_compatible = TRUE -/area/station/science/xenobiology/xenoflora_storage - name = "Xenoflora Storage" - icon_state = "scilab" - -/area/station/science/xenobiology/xenoflora - name = "\improper Xenoflora Lab" - icon_state = "scilab" - /area/station/science/storage name = "\improper Science Toxins Storage" icon_state = "toxstorage" diff --git a/code/game/area/ss13_areas/supply_areas.dm b/code/game/area/ss13_areas/supply_areas.dm index 0266aebe7ab1..c198c44b31c4 100644 --- a/code/game/area/ss13_areas/supply_areas.dm +++ b/code/game/area/ss13_areas/supply_areas.dm @@ -30,14 +30,6 @@ name = "\improper Mining Dock" icon_state = "mining" -/area/station/supply/miningstorage - name = "Mining Storage" - icon_state = "green" - -/area/station/supply/mechbay - name = "\improper Mech Bay" - icon_state = "yellow" - /area/station/supply/expedition name = "\improper Expedition Room" icon_state = "expedition" diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index dcb97d7f1d93..416f7f9272d8 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -170,10 +170,16 @@ var/escaped_on_pod_1 = 0 var/escaped_on_pod_2 = 0 var/escaped_on_pod_3 = 0 - var/escaped_on_pod_5 = 0 + var/escaped_on_pod_4 = 0 var/escaped_on_shuttle = 0 - var/list/area/escape_locations = list(/area/shuttle/escape, /area/shuttle/escape_pod1/centcom, /area/shuttle/escape_pod2/centcom, /area/shuttle/escape_pod3/centcom, /area/shuttle/escape_pod5/centcom) + var/list/area/escape_locations = list( + /area/shuttle/escape, + /area/shuttle/pod_1, + /area/shuttle/pod_2, + /area/shuttle/pod_3, + /area/shuttle/pod_4 + ) if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME) //shuttle didn't get to centcom escape_locations -= /area/shuttle/escape @@ -194,14 +200,14 @@ if(M.loc && M.loc.loc && M.loc.loc.type == SSshuttle.emergency.areaInstance.type && SSshuttle.emergency.mode >= SHUTTLE_ENDGAME) escaped_on_shuttle++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod1/centcom) + if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/pod_1) escaped_on_pod_1++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod2/centcom) + if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/pod_2) escaped_on_pod_2++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod3/centcom) + if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/pod_3) escaped_on_pod_3++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod5/centcom) - escaped_on_pod_5++ + if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/pod_4) + escaped_on_pod_4++ if(isobserver(M)) ghosts++ @@ -226,8 +232,8 @@ SSblackbox.record_feedback("nested tally", "round_end_stats", escaped_on_pod_2, list("escapees", "on_pod_2")) if(escaped_on_pod_3) SSblackbox.record_feedback("nested tally", "round_end_stats", escaped_on_pod_3, list("escapees", "on_pod_3")) - if(escaped_on_pod_5) - SSblackbox.record_feedback("nested tally", "round_end_stats", escaped_on_pod_5, list("escapees", "on_pod_5")) + if(escaped_on_pod_4) + SSblackbox.record_feedback("nested tally", "round_end_stats", escaped_on_pod_4, list("escapees", "on_pod_4")) for(var/tech_id in SSeconomy.tech_levels) SSblackbox.record_feedback("tally", "cargo max tech level sold", SSeconomy.tech_levels[tech_id], tech_id) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 1a71c1d73ccb..55387f2711c6 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -175,7 +175,6 @@ /area/shuttle, /area/admin, /area/centcom, - /area/asteroid, /area/tdome, /area/wizard_station ) diff --git a/code/game/turfs/simulated/floor/asteroid_floors.dm b/code/game/turfs/simulated/floor/asteroid_floors.dm index 31d0aeb81f21..ed49637dec62 100644 --- a/code/game/turfs/simulated/floor/asteroid_floors.dm +++ b/code/game/turfs/simulated/floor/asteroid_floors.dm @@ -363,7 +363,7 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me for(var/S in RANGE_TURFS(1, src)) var/turf/NT = S - if(!NT || isspaceturf(NT) || istype(NT.loc, /area/mine/explored) || istype(NT.loc, /area/lavaland/surface/outdoors/explored)) + if(!NT || isspaceturf(NT) || istype(NT.loc, /area/lavaland/surface/outdoors/explored)) sanity = 0 break if(!sanity) @@ -378,7 +378,7 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me return if(prob(monsterprob)) - if(istype(loc, /area/mine/explored) || !istype(loc, /area/lavaland/surface/outdoors/unexplored)) + if(!istype(loc, /area/lavaland/surface/outdoors/unexplored)) return var/randumb = pickweight(mob_spawn_list) while(randumb == SPAWN_MEGAFAUNA) @@ -426,7 +426,7 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me if(BLOCKED_BURROWS) floraprob = 30 //Lots of folliage, lots of blockage if(prob(floraprob)) - if(istype(loc, /area/mine/explored) || istype(loc, /area/lavaland/surface/outdoors/explored)) + if(istype(loc, /area/lavaland/surface/outdoors/explored)) return var/randumb = pickweight(flora_spawn_list) for(var/obj/structure/flora/ash/F in range(4, T)) //Allows for growing patches, but not ridiculous stacks of flora diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm index 48dfa356f44f..b407d0624ad8 100644 --- a/code/modules/awaymissions/mission_code/ruins/oldstation.dm +++ b/code/modules/awaymissions/mission_code/ruins/oldstation.dm @@ -464,11 +464,6 @@ requires_power = FALSE dynamic_lighting = DYNAMIC_LIGHTING_FORCED -/area/ruin/ancientstation/space - name = "Exposed To Space" - icon_state = "teleporter" - has_gravity = FALSE - /area/ruin/ancientstation/atmo name = "Beta Station Atmospherics" icon_state = "red" @@ -479,10 +474,6 @@ name = "Beta Station North Corridor" icon_state = "purple" -/area/ruin/ancientstation/solar - name = "Station Solar Array" - icon_state = "panelsAP" - /area/ruin/ancientstation/engi name = "Charlie Station Engineering" icon_state = "engine" diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm index 097961d21588..b8835808ded6 100644 --- a/code/modules/events/prison_break.dm +++ b/code/modules/events/prison_break.dm @@ -13,19 +13,17 @@ /datum/event/prison_break/virology eventDept = "Medical" areaName = list("Virology") - areaType = list(/area/station/medical/virology, /area/station/medical/virology/lab) + areaType = list(/area/station/medical/virology) /datum/event/prison_break/xenobiology eventDept = "Science" areaName = list("Xenobiology") areaType = list(/area/station/science/xenobiology) - areaNotType = list(/area/station/science/xenobiology/xenoflora, /area/station/science/xenobiology/xenoflora_storage) /datum/event/prison_break/station eventDept = "Station" areaName = list("Brig","Virology","Xenobiology") areaType = list(/area/station/security/prison, /area/station/security/brig, /area/station/security/permabrig, /area/station/medical/virology, /area/station/medical/virology/lab, /area/station/science/xenobiology) - areaNotType = list(/area/station/science/xenobiology/xenoflora, /area/station/science/xenobiology/xenoflora_storage) /datum/event/prison_break/setup() diff --git a/code/modules/ruins/ruin_areas.dm b/code/modules/ruins/ruin_areas.dm index 66e036eae4c0..02cc3722e893 100644 --- a/code/modules/ruins/ruin_areas.dm +++ b/code/modules/ruins/ruin_areas.dm @@ -12,9 +12,6 @@ /area/ruin/unpowered always_unpowered = FALSE -/area/ruin/unpowered/no_grav - has_gravity = FALSE - /area/ruin/powered requires_power = FALSE diff --git a/paradise.dme b/paradise.dme index c5aa5234cd7e..fb76fc8abf56 100644 --- a/paradise.dme +++ b/paradise.dme @@ -658,7 +658,6 @@ #include "code\game\world.dm" #include "code\game\area\ai_monitored.dm" #include "code\game\area\areas.dm" -#include "code\game\area\asteroid_areas.dm" #include "code\game\area\away_content_areas.dm" #include "code\game\area\centcom_areas.dm" #include "code\game\area\holodeck_areas.dm"