Resprites areas, fixes areas covering more rooms than needed [MAP EDIT] (#18348)

* so much area

* oops forgot to remove unused sprites

* okay thats way better

* restores storage wing

code/game/area/areas/ruins/lavaland.dm

@@ -2,40 +2,40 @@
 
 /area/ruin/powered/beach
 	name = "Beach Bar"
-	icon_state = "dk_yellow"
+	icon_state = "beach"
 
 /area/ruin/powered/clownplanet
-	icon_state = "dk_yellow"
+	icon_state = "yellow"
 	ambientsounds = list('sound/music/clown.ogg')
 
 /area/ruin/powered/animal_hospital
-	icon_state = "dk_yellow"
+	icon_state = "yellow"
 
 /area/ruin/powered/snow_biodome
-	icon_state = "dk_yellow"
+	icon_state = "yellow"
 
 /area/ruin/powered/snow_cabin
 	icon_state = "bar"
 
 /area/ruin/powered/gluttony
-	icon_state = "dk_yellow"
+	icon_state = "yellow"
 
 /area/ruin/powered/golem_ship
 	name = "Free Golem Landing"
-	icon_state = "dk_yellow"
+	icon_state = "yellow"
 
 /area/ruin/powered/greed
-	icon_state = "dk_yellow"
+	icon_state = "yellow"
 
 /area/ruin/unpowered/hierophant
 	name = "Hierophant's Arena"
-	icon_state = "dk_yellow"
+	icon_state = "yellow"
 
 /area/ruin/powered/pride
-	icon_state = "dk_yellow"
+	icon_state = "yellow"
 
 /area/ruin/powered/seedvault
-	icon_state = "dk_yellow"
+	icon_state = "yellow"
 
 
 //Xeno Nest

code/game/area/areas/ruins/space.dm

@@ -24,7 +24,7 @@
 // Old tcommsat
 /area/ruin/space/tcommsat
 	name = "Telecommunications Satellite"
-	icon_state = "tcomsatcham"
+	icon_state = "tcomms"
 
 // Ruins of "onehalf" ship
 /area/ruin/space/onehalf/hallway
@@ -104,11 +104,11 @@
 
 /area/ruin/space/derelict/solar_control
 	name = "\improper Derelict Solar Control"
-	icon_state = "engine"
+	icon_state = "GENsolar"
 
 /area/ruin/space/derelict/se_solar
 	name = "South East Solars"
-	icon_state = "engine"
+	icon_state = "GENsolar"
 
 /area/ruin/space/derelict/crew_quarters
 	name = "\improper Derelict Crew Quarters"

code/game/area/areas/ruins/syndicate_space_base.dm

@@ -1,6 +1,6 @@
 /area/ruin/unpowered/syndicate_space_base
 	name = "Secret Base"
-	icon_state = "dk_yellow"
+	icon_state = "yellow"
 	ambientsounds = HIGHSEC_SOUNDS
 	report_alerts = FALSE
 	hide_attacklogs = TRUE
@@ -11,7 +11,7 @@
 
 /area/ruin/unpowered/syndicate_space_base/medbay
 	name = "Syndicate Space Base Medbay"
-	icon_state = "medbay2"
+	icon_state = "medbay"
 
 /area/ruin/unpowered/syndicate_space_base/arrivals
 	name = "Syndicate Space Base Arrivals"
@@ -47,4 +47,4 @@
 
 /area/ruin/unpowered/syndicate_space_base/telecomms
 	name = "Syndicate Space Base Telecommunications"
-	icon_state = "tcomsatcham"
+	icon_state = "tcomms"

code/game/area/ss13_areas.dm

@@ -570,7 +570,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/atmos/control
  	name = "Atmospherics Control Room"
- 	icon_state = "atmos"
+ 	icon_state = "atmosctrl"
 
 /area/atmos/distribution
  	name = "Atmospherics Distribution Loop"
@@ -664,30 +664,30 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/maintenance/port2
 	name = "Port Secondary Maintenance"
 	icon_state = "pmaint"
+
 /area/maintenance/storage
 	name = "Atmospherics Maintenance"
-	icon_state = "green"
+	icon_state = "atmosmaint"
 
 /area/maintenance/incinerator
 	name = "\improper Incinerator"
-	icon_state = "disposal"
+	icon_state = "incin"
 
 /area/maintenance/turbine
 	name = "\improper Turbine"
-	icon_state = "disposal"
+	icon_state = "turbine"
 
 /area/maintenance/disposal
 	name = "Waste Disposal"
-	icon_state = "disposal"
+	icon_state = "disposals"
 
 /area/maintenance/genetics
 	name = "Genetics Maintenance"
 	icon_state = "asmaint"
 
-
 /area/maintenance/electrical
 	name = "Electrical Maintenance"
-	icon_state = "elec"
+	icon_state = "elect"
 
 /area/maintenance/abandonedbar
 	name = "Maintenance Bar"
@@ -705,7 +705,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/maintenance/electrical_shop
 	name ="Electronics Den"
-	icon_state = "elec"
+	icon_state = "elect"
 
 /area/maintenance/gambling_den
 	name = "Gambling Den"
@@ -769,6 +769,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "\improper Construction Area"
 	icon_state = "construction"
 
+/area/hallway/secondary/garden
+	name = "\improper Garden"
+	icon_state = "garden"
+
 /area/hallway/secondary/entry
 	name = "\improper Arrival Shuttle Hallway"
 	icon_state = "entry"
@@ -796,7 +800,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/crew_quarters/captain
 	name = "\improper Captain's Office"
-	icon_state = "captain"
+	icon_state = "captainoffice"
 	sound_environment = SOUND_AREA_WOODFLOOR
 
 /area/crew_quarters/captain/bedroom
@@ -809,23 +813,23 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/crew_quarters/heads/hop
 	name = "\improper Head of Personnel's Quarters"
-	icon_state = "head_quarters"
+	icon_state = "hop"
 
 /area/crew_quarters/heads/hor
 	name = "\improper Research Director's Quarters"
-	icon_state = "head_quarters"
+	icon_state = "rd"
 
 /area/crew_quarters/heads/chief
 	name = "\improper Chief Engineer's Quarters"
-	icon_state = "head_quarters"
+	icon_state = "ce"
 
 /area/crew_quarters/heads/hos
 	name = "\improper Head of Security's Quarters"
-	icon_state = "head_quarters"
+	icon_state = "hos"
 
 /area/crew_quarters/heads/cmo
 	name = "\improper Chief Medical Officer's Quarters"
-	icon_state = "head_quarters"
+	icon_state = "cmo"
 
 /area/crew_quarters/courtroom
 	name = "\improper Courtroom"
@@ -833,19 +837,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/crew_quarters/heads
 	name = "\improper Head of Personnel's Office"
-	icon_state = "head_quarters"
+	icon_state = "hop"
 
 /area/crew_quarters/hor
 	name = "\improper Research Director's Office"
-	icon_state = "head_quarters"
+	icon_state = "rd"
 
 /area/crew_quarters/hos
 	name = "\improper Head of Security's Office"
-	icon_state = "head_quarters"
+	icon_state = "hos"
 
 /area/crew_quarters/chief
 	name = "\improper Chief Engineer's Office"
-	icon_state = "head_quarters"
+	icon_state = "ce"
 
 /area/mint
 	name = "\improper Mint"
@@ -877,7 +881,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/crew_quarters
 	name = "\improper Dormitories"
-	icon_state = "Sleep"
+	icon_state = "dorms"
 	sound_environment = SOUND_AREA_STANDARD_STATION
 
 /area/crew_quarters/toilet
@@ -936,7 +940,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/crew_quarters/bar
 	name = "\improper Bar"
-	icon_state = "barstation"
+	icon_state = "bar"
 	sound_environment = SOUND_AREA_WOODFLOOR
 
 /area/crew_quarters/bar/atrium
@@ -950,7 +954,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/crew_quarters/mrchangs
 	name = "\improper Mr Chang's"
-	icon_state = "Theatre"
+	icon_state = "changs"
 
 /area/library
 	name = "\improper Library"
@@ -1074,33 +1078,33 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/engine/engineering
 	name = "Engineering"
-	icon_state = "engine_smes"
+	icon_state = "engine_control"
 
 /area/engine/break_room
 	name = "\improper Engineering Foyer"
-	icon_state = "engine"
+	icon_state = "engibreak"
 	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/engine/equipmentstorage
 	name = "Engineering Equipment Storage"
-	icon_state = "storage"
+	icon_state = "engilocker"
 	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/engine/hardsuitstorage
 	name = "\improper Engineering Hardsuit Storage"
-	icon_state = "storage"
+	icon_state = "engi"
 
 /area/engine/controlroom
 	name = "\improper Engineering Control Room"
-	icon_state = "engine_control"
+	icon_state = "engine_monitoring"
 
 /area/engine/gravitygenerator
 	name = "\improper Gravity Generator"
-	icon_state = "engine"
+	icon_state = "gravgen"
 
 /area/engine/chiefs_office
 	name = "\improper Chief Engineer's office"
-	icon_state = "engine_control"
+	icon_state = "ce"
 
 /area/engine/supermatter
 	name = "\improper Supermatter Engine"
@@ -1118,11 +1122,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/solar/auxport
 	name = "\improper Fore Port Solar Array"
-	icon_state = "panelsA"
+	icon_state = "FPsolars"
 
 /area/solar/auxstarboard
 	name = "\improper Fore Starboard Solar Array"
-	icon_state = "panelsA"
+	icon_state = "FSsolars"
 
 /area/solar/fore
 	name = "\improper Fore Solar Array"
@@ -1134,27 +1138,27 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/solar/starboard
 	name = "\improper Aft Starboard Solar Array"
-	icon_state = "panelsS"
+	icon_state = "ASsolars"
 
 /area/solar/port
 	name = "\improper Aft Port Solar Array"
-	icon_state = "panelsP"
+	icon_state = "APsolars"
 
 /area/maintenance/auxsolarport
 	name = "\improper Fore Port Solar Maintenance"
-	icon_state = "SolarcontrolA"
+	icon_state = "FPctrl"
 
 /area/maintenance/starboardsolar
 	name = "\improper Aft Starboard Solar Maintenance"
-	icon_state = "SolarcontrolS"
+	icon_state = "ASctrl"
 
 /area/maintenance/portsolar
 	name = "\improper Aft Port Solar Maintenance"
-	icon_state = "SolarcontrolP"
+	icon_state = "APctrl"
 
 /area/maintenance/auxsolarstarboard
 	name = "\improper Fore Starboard Solar Maintenance"
-	icon_state = "SolarcontrolA"
+	icon_state = "FSctrl"
 
 
 /area/assembly/chargebay
@@ -1167,7 +1171,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/assembly/robotics
 	name = "\improper Robotics Lab"
-	icon_state = "ass_line"
+	icon_state = "robo"
 
 /area/assembly/assembly_line //Derelict Assembly Line
 	name = "\improper Assembly Line"
@@ -1185,7 +1189,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/gateway
 	name = "\improper Gateway"
-	icon_state = "teleporter"
+	icon_state = "gateway"
 	ambientsounds = ENGINEERING_SOUNDS
 	sound_environment = SOUND_AREA_STANDARD_STATION
 
@@ -1195,7 +1199,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/toxins/explab_chamber
 	name = "\improper E.X.P.E.R.I-MENTOR Chamber"
-	icon_state = "toxmisc"
+	icon_state = "scitest"
 
 //MedBay
 
@@ -1212,20 +1216,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 //Medbay is a large area, these additional areas help level out APC load.
 /area/medical/medbay2
 	name = "\improper Medbay"
-	icon_state = "medbay2"
+	icon_state = "medbay"
 
 /area/medical/medbay3
 	name = "\improper Medbay"
-	icon_state = "medbay3"
-
+	icon_state = "medbay"
 
 /area/medical/biostorage
 	name = "Medical Storage"
-	icon_state = "medbaysecstorage"
+	icon_state = "medbaystorage"
 
 /area/medical/reception
 	name = "\improper Medbay Reception"
-	icon_state = "medbay"
+	icon_state = "medbaylobby"
 
 /area/medical/psych
 	name = "\improper Psych Room"
@@ -1274,11 +1277,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/medical/robotics
 	name = "Robotics"
-	icon_state = "research"
+	icon_state = "robo"
 
 /area/medical/research
 	name = "Research Division"
-	icon_state = "research"
+	icon_state = "sci"
 
 /area/medical/scibreak
 	name = "\improper Science Break Room"
@@ -1341,7 +1344,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/medical/paramedic
 	name = "Paramedic"
-	icon_state = "medbay"
+	icon_state = "paramedic"
 
 //Security
 
@@ -1467,7 +1470,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/security/hos
 	name = "\improper Head of Security's Office"
-	icon_state = "sec_hos"
+	icon_state = "hos"
 
 /area/security/detectives_office
 	name = "\improper Detective's Office"
@@ -1496,7 +1499,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/security/checkpoint2
 	name = "\improper Security Checkpoint"
-	icon_state = "security"
+	icon_state = "checkpoint1"
 
 /area/security/checkpoint/supply
 	name = "Security Post - Cargo Bay"
@@ -1516,11 +1519,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/security/vacantoffice
 	name = "\improper Vacant Office"
-	icon_state = "security"
+	icon_state = "vacantoffice"
 
 /area/security/vacantoffice2
 	name = "\improper Vacant Office"
-	icon_state = "security"
+	icon_state = "vacantoffice"
 
 /area/security/permasolitary
 	name = "Solitary Confinement"
@@ -1535,23 +1538,23 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/quartermaster/sorting
 	name = "\improper Delivery Office"
-	icon_state = "quartstorage"
+	icon_state = "cargobay"
 	sound_environment = SOUND_AREA_STANDARD_STATION
 
 ////////////WORK IN PROGRESS//////////
 
 /area/quartermaster/office
 	name = "\improper Cargo Office"
-	icon_state = "quartoffice"
+	icon_state = "cargooffice"
 
 /area/quartermaster/storage
 	name = "\improper Cargo Bay"
-	icon_state = "quartstorage"
+	icon_state = "cargobay"
 	sound_environment = SOUND_AREA_LARGE_ENCLOSED
 
 /area/quartermaster/qm
 	name = "\improper Quartermaster's Office"
-	icon_state = "quart"
+	icon_state = "qm"
 
 /area/quartermaster/miningdock
 	name = "\improper Mining Dock"
@@ -1587,11 +1590,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/toxins/lab
 	name = "Research and Development"
-	icon_state = "toxlab"
+	icon_state = "rnd"
 
 /area/toxins/hallway
 	name = "\improper Research Lab"
-	icon_state = "toxlab"
+	icon_state = "sci"
 
 /area/toxins/rdoffice
 	name = "\improper Research Director's Office"
@@ -1599,20 +1602,20 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/toxins/supermatter
 	name = "\improper Supermatter Lab"
-	icon_state = "toxlab"
+	icon_state = "scilab"
 
 /area/toxins/xenobiology
 	name = "\improper Xenobiology Lab"
-	icon_state = "toxmix"
+	icon_state = "xenobio"
 	xenobiology_compatible = TRUE
 
 /area/toxins/xenobiology/xenoflora_storage
 	name = "Xenoflora Storage"
-	icon_state = "toxlab"
+	icon_state = "scilab"
 
 /area/toxins/xenobiology/xenoflora
 	name = "\improper Xenoflora Lab"
-	icon_state = "toxlab"
+	icon_state = "scilab"
 
 /area/toxins/storage
 	name = "Toxins Storage"
@@ -1633,11 +1636,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/toxins/misc_lab
 	name = "\improper Research Testing Lab"
-	icon_state = "toxmisc"
+	icon_state = "scichem"
 
 /area/toxins/test_chamber
 	name = "\improper Research Testing Chamber"
-	icon_state = "toxtest"
+	icon_state = "scitest"
 
 /area/toxins/server
 	name = "\improper Server Room"
@@ -1649,7 +1652,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/toxins/explab
 	name = "\improper Experimentation Lab"
-	icon_state = "toxmisc"
+	icon_state = "scilab"
 
 //Storage
 /area/storage
@@ -1657,7 +1660,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/storage/tools
 	name = "Auxiliary Tool Storage"
-	icon_state = "storage"
+	icon_state = "auxstorage"
 
 /area/storage/primary
 	name = "Primary Tool Storage"
@@ -1680,8 +1683,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "eva"
 
 /area/storage/secure
-	name = "Secure Storage"
-	icon_state = "storage"
+	name = "Engineering Secure Storage"
+	icon_state = "engine_storage"
 
 /area/storage/emergency
 	name = "Starboard Emergency Storage"
@@ -1693,7 +1696,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/storage/tech
 	name = "Technical Storage"
-	icon_state = "auxstorage"
+	icon_state = "techstorage"
 
 /area/storage/office
 	name = "Office Supplies"
@@ -1707,7 +1710,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/engiestation/solars
 	name = "\improper Engineering Outpost Solars"
-	icon_state = "panelsP"
+	icon_state = "GENsolar"
 /area/shuttle/derelict/ship/start
 	name = "\improper Abandoned Ship"
 	icon_state = "yellow"
@@ -1726,11 +1729,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/solar/derelict_starboard
 	name = "\improper Derelict Starboard Solar Array"
-	icon_state = "panelsS"
+	icon_state = "GENsolar"
 
 /area/solar/derelict_aft
 	name = "\improper Derelict Aft Solar Array"
-	icon_state = "aft"
+	icon_state = "GENsolar"
 
 /area/derelict/singularity_engine
 	name = "\improper Derelict Singularity Engine"
@@ -1748,7 +1751,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/construction
 	name = "\improper Construction Area"
-	icon_state = "yellow"
+	icon_state = "construction"
 	ambientsounds = ENGINEERING_SOUNDS
 	sound_environment = SOUND_AREA_STANDARD_STATION
 
@@ -1774,11 +1777,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/construction/solars
 	name = "\improper Solar Panels"
-	icon_state = "yellow"
+	icon_state = "GENsolar"
 
 /area/construction/solarscontrol
 	name = "\improper Solar Panel Control"
-	icon_state = "yellow"
+	icon_state = "GENctrl"
 
 /area/construction/Storage
 	name = "Construction Site Storage"
@@ -1879,15 +1882,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/aisat
 	name = "\improper AI Satellite Exterior"
-	icon_state = "yellow"
+	icon_state = "ai"
 
 /area/aisat/entrance
 	name = "\improper AI Satellite Entrance"
-	icon_state = "ai_foyer"
+	icon_state = "ai"
 
 /area/aisat/maintenance
 	name = "\improper AI Satellite Maintenance"
-	icon_state = "storage"
+	icon_state = "ai"
 
 /area/turret_protected/aisat_interior
 	name = "\improper AI Satellite Antechamber"

code/modules/awaymissions/mission_code/ruins/oldstation.dm

@@ -357,11 +357,11 @@
 
 /area/ruin/ancientstation/proto
 	name = "Theta Station Prototype Lab"
-	icon_state = "toxlab"
+	icon_state = "scilab"
 
 /area/ruin/ancientstation/rnd
 	name = "Theta Station Research and Development"
-	icon_state = "toxlab"
+	icon_state = "rnd"
 
 /area/ruin/ancientstation/hivebot
 	name = "Hivebot Mothership"