cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove many unused areas. (#25893)

Browse Source 
* refactor: remove many unused areas.

* correct pod number
This commit is contained in:
warriorstar-orion
2024-06-20 07:38:33 -04:00
committed by GitHub
parent c7d6e83d7e
commit 5f2b7d7cd0
21 changed files with 19 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/ai_monitored.dm
-4
View File
@@ -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"
code/game/area/areas/mining_areas.dm
-31
View File
@@ -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
code/game/area/asteroid_areas.dm
-24
View File
@@ -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"
code/game/area/centcom_areas.dm
-8
View File
@@ -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"
code/game/area/misc_areas.dm
-27
View File
@@ -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"
code/game/area/shuttle_areas.dm
-147
View File
@@ -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"
code/game/area/ss13_areas/ai_areas.dm
-22
View File
@@ -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"
code/game/area/ss13_areas/command_areas.dm
-6
View File
@@ -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"
code/game/area/ss13_areas/engineering_areas.dm
-8
View File
@@ -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"
code/game/area/ss13_areas/maintenance_areas.dm
-19
View File
@@ -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"
code/game/area/ss13_areas/medical_areas.dm
-4
View File
@@ -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"
code/game/area/ss13_areas/public_areas.dm
-6
View File
@@ -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
code/game/area/ss13_areas/science_areas.dm
-12
View File
@@ -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"
code/game/area/ss13_areas/supply_areas.dm
-8
View File
@@ -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"
code/game/gamemodes/game_mode.dm
+15 -9
View File
@@ -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)
code/game/objects/items/blueprints.dm
-1
View File
@@ -175,7 +175,6 @@
/area/shuttle,
/area/admin,
/area/centcom,
/area/asteroid,
/area/tdome,
/area/wizard_station
)
code/game/turfs/simulated/floor/asteroid_floors.dm
+3 -3
View File
@@ -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
code/modules/awaymissions/mission_code/ruins/oldstation.dm
-9
View File
@@ -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"
code/modules/events/prison_break.dm
+1 -3
View File
@@ -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()
code/modules/ruins/ruin_areas.dm
-3
View File
@@ -12,9 +12,6 @@
/area/ruin/unpowered
always_unpowered = FALSE
/area/ruin/unpowered/no_grav
has_gravity = FALSE
/area/ruin/powered
requires_power = FALSE
paradise.dme
-1
View File
@@ -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"