Merge remote-tracking branch 'tgstation/master' into upstream-2025-11-29

# Conflicts:
#	_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
#	_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm
#	_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
#	_maps/map_files/tramstation/tramstation.dmm
#	code/_onclick/hud/new_player.dm
#	code/datums/components/squashable.dm
#	code/datums/diseases/advance/symptoms/heal.dm
#	code/datums/diseases/chronic_illness.dm
#	code/datums/status_effects/buffs.dm
#	code/datums/status_effects/debuffs/drunk.dm
#	code/datums/status_effects/debuffs/stamcrit.dm
#	code/game/machinery/computer/crew.dm
#	code/game/objects/items/devices/scanners/health_analyzer.dm
#	code/game/objects/items/wall_mounted.dm
#	code/game/turfs/closed/indestructible.dm
#	code/modules/admin/view_variables/filterrific.dm
#	code/modules/antagonists/heretic/influences.dm
#	code/modules/cargo/orderconsole.dm
#	code/modules/client/preferences.dm
#	code/modules/events/space_vines/vine_mutations.dm
#	code/modules/mob/dead/new_player/new_player.dm
#	code/modules/mob/living/carbon/human/death.dm
#	code/modules/mob/living/carbon/human/species_types/jellypeople.dm
#	code/modules/mob/living/damage_procs.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob_spawn/ghost_roles/mining_roles.dm
#	code/modules/mob_spawn/mob_spawn.dm
#	code/modules/projectiles/ammunition/energy/laser.dm
#	code/modules/projectiles/guns/ballistic/launchers.dm
#	code/modules/projectiles/guns/energy/laser.dm
#	code/modules/reagents/chemistry/machinery/chem_dispenser.dm
#	code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
#	code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
#	code/modules/reagents/chemistry/reagents/medicine_reagents.dm
#	code/modules/surgery/healing.dm
#	code/modules/unit_tests/designs.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	tgui/packages/tgui/interfaces/ChemDispenser.tsx

code/game/area/areas.dm

@@ -24,7 +24,10 @@
 	/// This uses the same nested list format as turfs_by_zlevel
 	var/list/list/turf/turfs_to_uncontain_by_zlevel = list()
 
-	var/area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+	/// General flag for area properties
+	var/area_flags = VALID_TERRITORY | BLOBS_ALLOWED | CULT_PERMITTED
+	/// Flag for mapping related area properties (such as cavegen)
+	var/area_flags_mapping = UNIQUE_AREA
 
 	///Do we have an active fire alarm?
 	var/fire = FALSE
@@ -165,7 +168,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 /area/New()
 	// This interacts with the map loader, so it needs to be set immediately
 	// rather than waiting for atoms to initialize.
-	if (area_flags & UNIQUE_AREA)
+	if (area_flags_mapping & UNIQUE_AREA)
 		GLOB.areas_by_type[type] = src
 	GLOB.areas += src
 	energy_usage = new /list(AREA_USAGE_LEN) // Some atoms would like to use power in Initialize()

code/game/area/areas/away_content.dm

@@ -11,7 +11,6 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30"
 	default_gravity = STANDARD_GRAVITY
 	ambience_index = AMBIENCE_AWAY
 	sound_environment = SOUND_ENVIRONMENT_ROOM
-	area_flags = UNIQUE_AREA
 
 /area/awaymission/museum
 	name = "Nanotrasen Museum"
@@ -33,11 +32,11 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30"
 	name = "Super Secret Room"
 	static_lighting = FALSE
 	base_lighting_alpha = 255
-	area_flags = UNIQUE_AREA|NOTELEPORT
+	area_flags = NOTELEPORT
 	default_gravity = STANDARD_GRAVITY
 
 /area/awaymission/secret
-	area_flags = UNIQUE_AREA|NOTELEPORT|HIDDEN_AREA
+	area_flags = NOTELEPORT|HIDDEN_AREA
 
 /area/awaymission/secret/unpowered
 	always_unpowered = TRUE

code/game/area/areas/centcom.dm

@@ -8,7 +8,7 @@
 	static_lighting = TRUE
 	requires_power = FALSE
 	default_gravity = STANDARD_GRAVITY
-	area_flags = UNIQUE_AREA | NOTELEPORT
+	area_flags = NOTELEPORT
 	flags_1 = NONE
 
 // This is just to define the category
@@ -147,7 +147,6 @@
 	name = "Thunderdome Observation"
 	icon_state = "thunder_observe"
 
-
 // ENEMY
 
 // Wizard
@@ -157,16 +156,15 @@
 	static_lighting = TRUE
 	requires_power = FALSE
 	default_gravity = STANDARD_GRAVITY
-	area_flags = UNIQUE_AREA | NOTELEPORT
+	area_flags = NOTELEPORT
 	flags_1 = NONE
 
-
 //Abductors
 /area/centcom/abductor_ship
 	name = "Abductor Ship"
 	icon_state = "abductor_ship"
 	requires_power = FALSE
-	area_flags = UNIQUE_AREA | NOTELEPORT
+	area_flags = NOTELEPORT
 	static_lighting = FALSE
 	base_lighting_alpha = 255
 	default_gravity = STANDARD_GRAVITY
@@ -178,7 +176,7 @@
 	icon_state = "syndie-ship"
 	requires_power = FALSE
 	default_gravity = STANDARD_GRAVITY
-	area_flags = UNIQUE_AREA | NOTELEPORT
+	area_flags = NOTELEPORT
 	flags_1 = NONE
 	ambience_index = AMBIENCE_DANGER
 
@@ -223,12 +221,11 @@
 	name = "Mafia Minigame"
 	icon_state = "mafia"
 	static_lighting = FALSE
-
 	base_lighting_alpha = 255
 	requires_power = FALSE
 	default_gravity = STANDARD_GRAVITY
 	flags_1 = NONE
-	area_flags = BLOCK_SUICIDE | UNIQUE_AREA
+	area_flags = BLOCK_SUICIDE
 
 //CAPTURE THE FLAG
 /area/centcom/ctf
@@ -239,7 +236,7 @@
 	base_lighting_alpha = 255
 	default_gravity = STANDARD_GRAVITY
 	flags_1 = NONE
-	area_flags = UNIQUE_AREA | NOTELEPORT | NO_DEATH_MESSAGE | BLOCK_SUICIDE
+	area_flags = NOTELEPORT | NO_DEATH_MESSAGE | BLOCK_SUICIDE
 
 /area/centcom/ctf/control_room
 	name = "Control Room A"
@@ -283,7 +280,6 @@
 	icon_state = "asteroid"
 	requires_power = FALSE
 	default_gravity = STANDARD_GRAVITY
-	area_flags = UNIQUE_AREA
 	ambience_index = AMBIENCE_MINING
 	flags_1 = CAN_BE_DIRTY_1
 	sound_environment = SOUND_AREA_ASTEROID
@@ -293,7 +289,7 @@
 	ambience_index = AMBIENCE_RUINS
 	always_unpowered = FALSE
 	requires_power = TRUE
-	area_flags = UNIQUE_AREA | BLOBS_ALLOWED
+	area_flags = BLOBS_ALLOWED
 
 /area/centcom/asteroid/nearstation/bomb_site
 	name = "\improper Bomb Testing Asteroid"

code/game/area/areas/mining.dm

@@ -3,7 +3,8 @@
 	icon = 'icons/area/areas_station.dmi'
 	icon_state = "mining"
 	default_gravity = STANDARD_GRAVITY
-	area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED | CULT_PERMITTED
+	area_flags = VALID_TERRITORY | CULT_PERMITTED
+	area_flags_mapping = UNIQUE_AREA | FLORA_ALLOWED
 	ambient_buzz = 'sound/ambience/lavaland/magma.ogg'
 
 /area/mine/lobby
@@ -132,7 +133,7 @@
 	icon_state = "mining"
 	default_gravity = STANDARD_GRAVITY
 	flags_1 = NONE
-	area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED
+	area_flags = VALID_TERRITORY | FLORA_ALLOWED
 	sound_environment = SOUND_AREA_LAVALAND
 	ambient_buzz = 'sound/ambience/lavaland/magma.ogg'
 	allow_shuttle_docking = TRUE
@@ -146,7 +147,7 @@
 	power_light = FALSE
 	requires_power = TRUE
 	ambience_index = AMBIENCE_MINING
-	area_flags = VALID_TERRITORY | UNIQUE_AREA
+	area_flags = VALID_TERRITORY
 
 /area/lavaland/underground
 	name = "Lavaland Caves"
@@ -157,7 +158,6 @@
 	power_equip = FALSE
 	power_light = FALSE
 	ambience_index = AMBIENCE_MINING
-	area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED
 
 /area/lavaland/surface/outdoors
 	name = "Lavaland Wastes"
@@ -165,12 +165,14 @@
 
 /area/lavaland/surface/outdoors/unexplored //monsters and ruins spawn here
 	icon_state = "unexplored"
-	area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED
+	area_flags = VALID_TERRITORY
+	area_flags_mapping = UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED
 	map_generator = /datum/map_generator/cave_generator/lavaland
 
 /area/lavaland/surface/outdoors/unexplored/danger //megafauna will also spawn here
 	icon_state = "danger"
-	area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED
+	area_flags = VALID_TERRITORY
+	area_flags_mapping = parent_type::area_flags_mapping | MEGAFAUNA_SPAWN_ALLOWED
 
 /// Same thing as parent, but uses a different map generator for the icemoon ruin that needs it.
 /area/lavaland/surface/outdoors/unexplored/danger/no_ruins
@@ -178,9 +180,7 @@
 
 /area/lavaland/surface/outdoors/explored
 	name = "Lavaland Labor Camp"
-	area_flags = VALID_TERRITORY | UNIQUE_AREA
-
-
+	area_flags = VALID_TERRITORY
 
 /**********************Ice Moon Areas**************************/
 
@@ -189,7 +189,7 @@
 	icon_state = "mining"
 	default_gravity = STANDARD_GRAVITY
 	flags_1 = NONE
-	area_flags = UNIQUE_AREA | FLORA_ALLOWED
+	area_flags_mapping = UNIQUE_AREA | FLORA_ALLOWED
 	ambience_index = AMBIENCE_ICEMOON
 	sound_environment = SOUND_AREA_ICEMOON
 	ambient_buzz = 'sound/ambience/lavaland/magma.ogg'
@@ -203,7 +203,6 @@
 	power_equip = FALSE
 	power_light = FALSE
 	requires_power = TRUE
-	area_flags = UNIQUE_AREA | FLORA_ALLOWED
 
 /area/icemoon/surface/outdoors // parent that defines if something is on the exterior of the station.
 	name = "Icemoon Wastes"
@@ -227,33 +226,33 @@
 	if(HAS_TRAIT(SSstation, STATION_TRAIT_FORESTED))
 		map_generator = /datum/map_generator/cave_generator/icemoon/surface/forested
 		// flip this on, the generator has already disabled dangerous fauna
-		area_flags = MOB_SPAWN_ALLOWED | FLORA_ALLOWED
+		area_flags_mapping = MOB_SPAWN_ALLOWED | FLORA_ALLOWED
 
 /area/icemoon/surface/outdoors/always_forested
 	icon_state = "forest"
 	map_generator = /datum/map_generator/cave_generator/icemoon/surface/forested
-	area_flags = MOB_SPAWN_ALLOWED | FLORA_ALLOWED | CAVES_ALLOWED
+	area_flags_mapping = MOB_SPAWN_ALLOWED | FLORA_ALLOWED | CAVES_ALLOWED
 
 /area/icemoon/surface/outdoors/rocky
 	icon_state = "rocky"
 	map_generator = /datum/map_generator/cave_generator/icemoon/surface/rocky
-	area_flags = MOB_SPAWN_ALLOWED | FLORA_ALLOWED | CAVES_ALLOWED
+	area_flags_mapping = MOB_SPAWN_ALLOWED | FLORA_ALLOWED | CAVES_ALLOWED
 
 /area/icemoon/surface/outdoors/noteleport // for places like the cursed spring water
-	area_flags = UNIQUE_AREA | FLORA_ALLOWED | NOTELEPORT
+	area_flags_mapping = parent_type::area_flags_mapping | NOTELEPORT
 
 /area/icemoon/surface/outdoors/noruins // when you want random generation without the chance of getting ruins
 	icon_state = "noruins"
-	area_flags = UNIQUE_AREA | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | CAVES_ALLOWED
-	map_generator =  /datum/map_generator/cave_generator/icemoon/surface/noruins
+	area_flags_mapping = parent_type::area_flags_mapping | MOB_SPAWN_ALLOWED | CAVES_ALLOWED
+	map_generator = /datum/map_generator/cave_generator/icemoon/surface/noruins
 
 /area/icemoon/surface/outdoors/labor_camp
 	name = "Icemoon Labor Camp"
-	area_flags = UNIQUE_AREA
+	area_flags_mapping = /area::area_flags_mapping
 
 /area/icemoon/surface/outdoors/unexplored //monsters and ruins spawn here
 	icon_state = "unexplored"
-	area_flags = UNIQUE_AREA | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | CAVES_ALLOWED
+	area_flags_mapping = parent_type::area_flags_mapping | MOB_SPAWN_ALLOWED | CAVES_ALLOWED
 
 /area/icemoon/surface/outdoors/unexplored/rivers // rivers spawn here
 	icon_state = "danger"
@@ -263,10 +262,10 @@
 	. = ..()
 	if(HAS_TRAIT(SSstation, STATION_TRAIT_FORESTED))
 		map_generator = /datum/map_generator/cave_generator/icemoon/surface/forested
-		area_flags |= MOB_SPAWN_ALLOWED //flip this on, the generator has already disabled dangerous fauna
+		area_flags_mapping |= MOB_SPAWN_ALLOWED //flip this on, the generator has already disabled dangerous fauna
 
 /area/icemoon/surface/outdoors/unexplored/rivers/no_monsters
-	area_flags = UNIQUE_AREA | FLORA_ALLOWED | CAVES_ALLOWED
+	area_flags_mapping = /area/icemoon/::area_flags_mapping | CAVES_ALLOWED
 
 /area/icemoon/underground
 	name = "Icemoon Caves"
@@ -276,16 +275,15 @@
 	power_environ = FALSE
 	power_equip = FALSE
 	power_light = FALSE
-	area_flags = UNIQUE_AREA | FLORA_ALLOWED
 
 /area/icemoon/underground/unexplored // mobs and megafauna and ruins spawn here
 	name = "Icemoon Caves"
 	icon_state = "unexplored"
-	area_flags = CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED
+	area_flags_mapping = CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED
 
 /area/icemoon/underground/unexplored/no_rivers
 	icon_state = "norivers"
-	area_flags = CAVES_ALLOWED | FLORA_ALLOWED // same rules as "shoreline" turfs since we might need this to pull double-duty
+	area_flags_mapping = CAVES_ALLOWED | FLORA_ALLOWED // same rules as "shoreline" turfs since we might need this to pull double-duty
 	map_generator = /datum/map_generator/cave_generator/icemoon
 
 /area/icemoon/underground/unexplored/rivers // rivers spawn here
@@ -297,15 +295,15 @@
 
 /area/icemoon/underground/unexplored/rivers/deep/shoreline //use this for when you don't want mobs to spawn in certain areas in the "deep" portions. Think adjacent to rivers or station structures.
 	icon_state = "shore"
-	area_flags = UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED
+	area_flags_mapping = /area/icemoon/::area_flags_mapping | CAVES_ALLOWED
 
 /area/icemoon/underground/explored // ruins can't spawn here
 	name = "Icemoon Underground"
-	area_flags = UNIQUE_AREA
+	area_flags_mapping = /area::area_flags_mapping
 
 /area/icemoon/underground/explored/graveyard
 	name = "Graveyard"
-	area_flags = UNIQUE_AREA
+	area_flags_mapping = /area::area_flags_mapping
 	ambience_index = AMBIENCE_SPOOKY
 	icon = 'icons/area/areas_station.dmi'
 	icon_state = "graveyard"

code/game/area/areas/misc.dm

@@ -10,7 +10,7 @@
 	power_light = FALSE
 	power_equip = FALSE
 	power_environ = FALSE
-	area_flags = UNIQUE_AREA|NO_GRAVITY
+	area_flags = NO_GRAVITY
 	outdoors = TRUE
 	ambience_index = AMBIENCE_SPACE
 	flags_1 = CAN_BE_DIRTY_1

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

@@ -5,7 +5,7 @@
 	icon = 'icons/area/areas_ruins.dmi'
 	icon_state = "ruins"
 	default_gravity = STANDARD_GRAVITY
-	area_flags = HIDDEN_AREA | UNIQUE_AREA
+	area_flags = HIDDEN_AREA
 	ambience_index = AMBIENCE_RUINS
 	flags_1 = CAN_BE_DIRTY_1
 	sound_environment = SOUND_ENVIRONMENT_STONEROOM

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

@@ -59,10 +59,10 @@
 	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 	ambience_index = AMBIENCE_DANGER
 	area_flags = NOTELEPORT
+	area_flags_mapping = NONE
 	mood_bonus = -10
 	mood_message = "What the fuck."
 
-
 /area/ruin/planetengi
 	name = "\improper Engineering Outpost"
 
@@ -115,11 +115,13 @@
 /area/ruin/outpost31/lab
 	name = "\improper Outpost 31 Lab"
 	area_flags = NOTELEPORT //megafauna arena
+	area_flags_mapping = NONE
 	requires_power = FALSE
 
 /area/ruin/outpost31/lootroom
 	name = "\improper Outpost 31 Secondary Storage"
 	area_flags = NOTELEPORT //megafauna loot room
+	area_flags_mapping = NONE
 	requires_power = FALSE
 
 /area/ruin/outpost31/recroom

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

@@ -43,6 +43,7 @@
 /area/ruin/unpowered/cultaltar
 	name = "\improper Cult Altar"
 	area_flags = CULT_PERMITTED
+	area_flags_mapping = NONE
 	ambience_index = AMBIENCE_SPOOKY
 
 /area/ruin/thelizardsgas_lavaland

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

@@ -2,7 +2,8 @@
 
 /area/ruin/space
 	default_gravity = ZERO_GRAVITY
-	area_flags = UNIQUE_AREA
+	area_flags = NONE
+	area_flags_mapping = UNIQUE_AREA
 
 /area/ruin/space/unpowered
 	always_unpowered = TRUE
@@ -16,11 +17,10 @@
 /area/ruin/space/has_grav/powered
 	requires_power = FALSE
 
-
 // Ruin solars define, /area/solars was moved to /area/station/solars, causing the solars specific areas to lose their properties
 /area/ruin/space/solars
 	requires_power = FALSE
-	area_flags = UNIQUE_AREA
+	area_flags = NONE
 	flags_1 = NONE
 	ambience_index = AMBIENCE_ENGI
 	airlock_wires = /datum/wires/airlock/engineering
@@ -310,7 +310,7 @@
 	icon = 'icons/area/areas_ruins.dmi' // Solars inheriet areas_misc.dmi, not areas_ruin.dmi
 	icon_state = "os_charlie_solars"
 	requires_power = FALSE
-	area_flags = UNIQUE_AREA
+	area_flags = NONE
 	sound_environment = SOUND_AREA_SPACE
 
 /area/ruin/space/ancientstation/charlie/storage
@@ -534,7 +534,7 @@
 /area/ruin/space/djstation/solars
 	name = "\improper DJ Station Solars"
 	icon_state = "DJ"
-	area_flags = UNIQUE_AREA
+	area_flags = NONE
 	default_gravity = ZERO_GRAVITY
 
 /area/ruin/space/djstation/service
@@ -582,7 +582,7 @@
 
 /area/ruin/space/has_grav/hellfactoryoffice
 	name = "\improper Hell Factory Office"
-	area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | NOTELEPORT
+	area_flags = VALID_TERRITORY | BLOBS_ALLOWED | NOTELEPORT
 
 //Ruin of Spinward Smoothies
 
@@ -600,7 +600,7 @@
 
 /area/ruin/space/has_grav/powered/biooutpost
 	name = "\improper Bioresearch Outpost"
-	area_flags = UNIQUE_AREA | NOTELEPORT
+	area_flags = NOTELEPORT
 
 /area/ruin/space/has_grav/powered/biooutpost/vault
 	name = "\improper Bioresearch Outpost Secure Testing"

code/game/area/areas/shuttles.dm

@@ -10,6 +10,7 @@
 	always_unpowered = FALSE
 	// Loading the same shuttle map at a different time will produce distinct area instances.
 	area_flags = NONE
+	area_flags_mapping = NONE
 	icon = 'icons/area/areas_station.dmi'
 	icon_state = "shuttle"
 	flags_1 = CAN_BE_DIRTY_1
@@ -120,11 +121,9 @@
 	static_lighting = FALSE
 	base_lighting_alpha = 255
 
-
 /area/shuttle/arrival
 	name = "Arrival Shuttle"
-	area_flags = UNIQUE_AREA// SSjob refers to this area for latejoiners
-
+	area_flags_mapping = UNIQUE_AREA // SSjob refers to this area for latejoiners
 
 /area/shuttle/arrival/on_joining_game(mob/living/boarder)
 	if(SSshuttle.arrivals?.mode == SHUTTLE_CALL)
@@ -133,22 +132,17 @@
 		boarder.playsound_local(get_turf(boarder), 'sound/announcer/ApproachingTG.ogg', 25)
 	boarder.update_parallax_teleport()
 
-
 /area/shuttle/pod_1
 	name = "Escape Pod One"
-	area_flags = NONE
 
 /area/shuttle/pod_2
 	name = "Escape Pod Two"
-	area_flags = NONE
 
 /area/shuttle/pod_3
 	name = "Escape Pod Three"
-	area_flags = NONE
 
 /area/shuttle/pod_4
 	name = "Escape Pod Four"
-	area_flags = NONE
 
 /area/shuttle/mining
 	name = "Mining Shuttle"
@@ -166,10 +160,9 @@
 
 /area/shuttle/escape
 	name = "Emergency Shuttle"
-	area_flags = BLOBS_ALLOWED
+	area_flags = CULT_PERMITTED
 	area_limited_icon_smoothing = /area/shuttle/escape
 	flags_1 = CAN_BE_DIRTY_1
-	area_flags = CULT_PERMITTED
 
 /area/shuttle/escape/backup
 	name = "Backup Emergency Shuttle"

code/game/area/areas/station/common.dm

@@ -2,7 +2,7 @@
 	name = "\improper Crew Facilities"
 	icon_state = "commons"
 	sound_environment = SOUND_AREA_STANDARD_STATION
-	area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+	area_flags = BLOBS_ALLOWED | CULT_PERMITTED
 
 /*
 * Dorm Areas

code/game/area/areas/station/engineering.dm

@@ -26,7 +26,7 @@
 /*outside atmos*/
 /area/station/engineering/atmos/space_catwalk
 	name = "\improper Atmospherics Space Catwalk"
-	area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+	area_flags = BLOBS_ALLOWED | CULT_PERMITTED
 
 	sound_environment = SOUND_AREA_SPACE
 	ambience_index = AMBIENCE_SPACE
@@ -63,7 +63,7 @@
 /area/station/engineering/atmospherics_engine
 	name = "\improper Atmospherics Engine"
 	icon_state = "atmos_engine"
-	area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+	area_flags = BLOBS_ALLOWED | CULT_PERMITTED
 
 /area/station/engineering/lobby
 	name = "\improper Engineering Lobby"
@@ -72,7 +72,7 @@
 /area/station/engineering/supermatter
 	name = "\improper Supermatter Engine"
 	icon_state = "engine_sm"
-	area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+	area_flags = BLOBS_ALLOWED | CULT_PERMITTED
 	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/station/engineering/supermatter/waste
@@ -119,7 +119,7 @@
 /area/station/engineering/storage/tcomms
 	name = "Telecomms Storage"
 	icon_state = "tcom_storage"
-	area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+	area_flags = BLOBS_ALLOWED | CULT_PERMITTED
 
 /*
 * Construction Areas

code/game/area/areas/station/hallway.dm

@@ -83,7 +83,7 @@
 /area/station/hallway/secondary/entry
 	name = "\improper Arrival Shuttle Hallway"
 	icon_state = "entry"
-	area_flags = UNIQUE_AREA | EVENT_PROTECTED
+	area_flags = EVENT_PROTECTED
 
 /area/station/hallway/secondary/dock
 	name = "\improper Secondary Station Dock Hallway"

code/game/area/areas/station/maintenance.dm

@@ -1,7 +1,7 @@
 /area/station/maintenance
 	name = "Generic Maintenance"
 	ambience_index = AMBIENCE_MAINT
-	area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED | PERSISTENT_ENGRAVINGS
+	area_flags = BLOBS_ALLOWED | CULT_PERMITTED | PERSISTENT_ENGRAVINGS
 	airlock_wires = /datum/wires/airlock/maint
 	sound_environment = SOUND_AREA_TUNNEL_ENCLOSED
 	forced_ambience = TRUE
@@ -94,7 +94,7 @@
 /area/station/maintenance/department/science/xenobiology
 	name = "Xenobiology Maintenance"
 	icon_state = "xenomaint"
-	area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | XENOBIOLOGY_COMPATIBLE | CULT_PERMITTED
+	area_flags = VALID_TERRITORY | BLOBS_ALLOWED | XENOBIOLOGY_COMPATIBLE | CULT_PERMITTED
 
 /*
 * Generic Maintenance Tunnels

code/game/area/areas/station/misc.dm

@@ -30,6 +30,6 @@
 	power_light = FALSE
 	requires_power = TRUE
 	ambience_index = AMBIENCE_MINING
-	area_flags = UNIQUE_AREA
+	area_flags = NONE
 	outdoors = TRUE
 	allow_shuttle_docking = TRUE

code/game/area/areas/station/science.dm

@@ -114,23 +114,23 @@
 /area/station/science/ordnance/burnchamber
 	name = "\improper Ordnance Burn Chamber"
 	icon_state = "ord_burn"
-	area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+	area_flags = BLOBS_ALLOWED | CULT_PERMITTED
 
 /area/station/science/ordnance/freezerchamber
 	name = "\improper Ordnance Freezer Chamber"
 	icon_state = "ord_freeze"
-	area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+	area_flags = BLOBS_ALLOWED | CULT_PERMITTED
 
 // Room for equipments and such
 /area/station/science/ordnance/testlab
 	name = "\improper Ordnance Testing Lab"
 	icon_state = "ord_test"
-	area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+	area_flags = BLOBS_ALLOWED | CULT_PERMITTED
 
 /area/station/science/ordnance/bomb
 	name = "\improper Ordnance Bomb Site"
 	icon_state = "ord_boom"
-	area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED | NO_GRAVITY
+	area_flags = BLOBS_ALLOWED | CULT_PERMITTED | NO_GRAVITY
 
 /area/station/science/ordnance/bomb/planet
 	area_flags = /area/station/science/ordnance/bomb::area_flags & ~NO_GRAVITY

code/game/area/areas/station/security.dm

@@ -194,7 +194,7 @@
 /area/station/security/prison
 	name = "\improper Prison Wing"
 	icon_state = "sec_prison"
-	area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED | PERSISTENT_ENGRAVINGS
+	area_flags = VALID_TERRITORY | BLOBS_ALLOWED | CULT_PERMITTED | PERSISTENT_ENGRAVINGS
 
 //Rad proof
 /area/station/security/prison/toilet

code/game/area/areas/station/service.dm

@@ -77,7 +77,7 @@
 	mood_bonus = 5
 	mood_message = "I love being in the library!"
 	mood_trait = TRAIT_INTROVERT
-	area_flags = CULT_PERMITTED | BLOBS_ALLOWED | UNIQUE_AREA
+	area_flags = CULT_PERMITTED | BLOBS_ALLOWED
 	sound_environment = SOUND_AREA_LARGE_SOFTFLOOR
 
 /area/station/service/library/garden
@@ -180,7 +180,7 @@
 /area/station/service/janitor
 	name = "\improper Custodial Closet"
 	icon_state = "janitor"
-	area_flags = CULT_PERMITTED | BLOBS_ALLOWED | UNIQUE_AREA
+	area_flags = CULT_PERMITTED | BLOBS_ALLOWED
 	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
 /area/station/service/barber

code/game/area/areas/station/solars.dm

@@ -5,7 +5,7 @@
 /area/station/solars
 	icon_state = "panels"
 	requires_power = FALSE
-	area_flags = UNIQUE_AREA|NO_GRAVITY
+	area_flags = NO_GRAVITY
 	flags_1 = NONE
 	ambience_index = AMBIENCE_ENGI
 	airlock_wires = /datum/wires/airlock/engineering
@@ -44,7 +44,7 @@
 /area/station/solars/starboard/fore/asteriod
 	name = "\improper Starboard Bow Asteriod Solar Array"
 	icon_state = "panelsFS"
-	area_flags = UNIQUE_AREA // solar areas directly on asteriod have gravity
+	area_flags = NONE // solar areas directly on asteriod have gravity
 
 /area/station/solars/port
 	name = "\improper Port Solar Array"
@@ -53,7 +53,7 @@
 /area/station/solars/port/asteriod
 	name = "\improper Port Asteriod Solar Array"
 	icon_state = "panelsP"
-	area_flags = UNIQUE_AREA // solar areas directly on asteriod have gravity
+	area_flags = NONE // solar areas directly on asteriod have gravity
 
 /area/station/solars/port/aft
 	name = "\improper Port Quarter Solar Array"