Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530

[MIRROR] Area Refactor + Var-edit Cleanup

code/__DEFINES/wires.dm

@@ -3,8 +3,8 @@
 #define WIRE_AI "AI Connection"
 #define WIRE_ALARM "Alarm"
 #define WIRE_AVOIDANCE "Avoidance"
-#define WIRE_BACKUP1 "Auxillary Power 1"
-#define WIRE_BACKUP2 "Auxillary Power 2"
+#define WIRE_BACKUP1 "Auxiliary Power 1"
+#define WIRE_BACKUP2 "Auxiliary Power 2"
 #define WIRE_BEACON "Beacon"
 #define WIRE_BOLTS "Bolts"
 #define WIRE_BOOM "Boom"

code/controllers/subsystem/events.dm

@@ -105,7 +105,7 @@ SUBSYSTEM_DEF(events)
 	//These are needed because /area/engine has to be removed from the list, but we still want these areas to get fucked up.
 	var/list/danger_areas = list(
 	/area/engine/break_room,
-	/area/engine/chiefs_office)
+	/area/crew_quarters/heads/chief)
 
 	//Need to locate() as it's just a list of paths.
 	return locate(pick((GLOB.the_station_areas - safe_areas) + danger_areas))

code/datums/weather/weather_types.dm

@@ -134,7 +134,7 @@
 
 	area_type = /area
 	protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
-	/area/ai_monitored/turret_protected/ai, /area/storage/emergency, /area/storage/emergency2, /area/shuttle)
+	/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle)
 	target_z = ZLEVEL_STATION
 
 	immunity_type = "rad"

code/game/area/areas/misc.dm

@@ -120,14 +120,21 @@
 	name = "Prisoner Education Chamber"
 	icon_state = "armory"
 
-/area/prison/cell_block/A
+/area/prison/execution_room
+	name = "Prisoner Education Chamber"
+	icon_state = "armory"
+
+/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
+//	/area/prison/cell_block/B
 	name = "Prison Cell Block B"
 	icon_state = "brig"
 
-/area/prison/cell_block/C
+/area/prison/cell_block/c
+//	/area/prison/cell_block/C
 	name = "Prison Cell Block C"
 	icon_state = "brig"

code/game/turfs/simulated/dirtystation.dm

@@ -25,7 +25,7 @@
 	//The code below here isn't exactly optimal, but because of the individual decals that each area uses it's still applicable.
 
 				//high dirt - 1/3
-	if(istype(A, /area/toxins/test_area) || istype(A, /area/mine/production) || istype(A, /area/mine/living_quarters) || istype(A, /area/mine/north_outpost) || istype(A, /area/mine/west_outpost) || istype(A, /area/wreck) || istype(A, /area/derelict) || istype(A, /area/djstation))
+	if(istype(A, /area/science/test_area) || istype(A, /area/mine/production) || istype(A, /area/mine/living_quarters) || istype(A, /area/mine/north_outpost) || istype(A, /area/mine/west_outpost) || istype(A, /area/wreck) || istype(A, /area/derelict) || istype(A, /area/djstation))
 		new /obj/effect/decal/cleanable/dirt(src)	//vanilla, but it works
 		return
 
@@ -46,7 +46,7 @@
 				new /obj/effect/decal/cleanable/dirt(src)
 		return
 
-	if(istype(A, /area/crew_quarters/toilet) || istype(A, /area/crew_quarters/locker/locker_toilet))
+	if(istype(A, /area/crew_quarters/toilet) || istype(A, /area/crew_quarters/toilet/locker))
 		if(prob(40))
 			if(prob(90))
 				new /obj/effect/decal/cleanable/vomit/old(src)
@@ -79,7 +79,7 @@
 				new /obj/effect/decal/cleanable/flour(src)
 		return
 
-	if(istype(A, /area/medical))	//Kept clean, but chance of blood
+	if(istype(A, /area/medical) || !istype(A, /area/science/robotics))	//Kept clean, but chance of blood
 		if(prob(66))
 			if(prob(5))
 				new /obj/effect/decal/cleanable/blood/gibs/old(src)
@@ -92,7 +92,7 @@
 				new /obj/effect/decal/cleanable/vomit/old(src)
 		return
 
-	if(istype(A, /area/toxins))
+	if(istype(A, /area/science) || istype(A, /area/crew_quarters/heads/hor))
 		if(prob(20))
 			new /obj/effect/decal/cleanable/greenglow(src)	//this cleans itself up but it might startle you when you see it.
 		return

code/modules/events/prison_break.dm

@@ -8,13 +8,12 @@
 	announceWhen = 50
 	endWhen = 20
 	var/list/area/areasToOpen = list()
-	var/list/potential_areas = list(/area/atmos,
-									/area/bridge,
+	var/list/potential_areas = list(/area/bridge,
 									/area/engine,
 									/area/medical,
 									/area/security,
 									/area/quartermaster,
-									/area/toxins)
+									/area/science)
 	var/severity = 1
 
 

code/modules/mob/living/carbon/human/interactive.dm

@@ -809,13 +809,13 @@
 	if(T.title == "Chief Medical Officer" || T.title == "Medical Doctor" || T.title == "Chemist" || T.title == "Virologist" || T.title == "Geneticist")
 		return /area/medical
 	if(T.title == "Research Director" || T.title == "Scientist" || T.title == "Roboticist")
-		return /area/toxins
+		return /area/science
 	if(T.title == "Head of Security" || T.title == "Warden" || T.title == "Security Officer" || T.title == "Detective")
 		return /area/security
 	if(T.title == "Botanist")
 		return /area/hydroponics
 	else
-		return pick(/area/hallway,/area/crew_quarters)
+		return pick(/area/hallway,/area/crew_quarters/locker)
 
 /mob/living/carbon/human/interactive/proc/target_filter(target)
 	var/list/filtered_targets = list(/area, /turf, /obj/machinery/door, /atom/movable/light, /obj/structure/cable, /obj/machinery/atmospherics)

code/modules/research/xenobiology/xenobio_camera.dm

@@ -12,7 +12,7 @@
 
 /mob/camera/aiEye/remote/xenobio/setLoc(var/t)
 	var/area/new_area = get_area(t)
-	if(new_area && new_area.name == allowed_area || istype(new_area, /area/toxins/xenobiology ))
+	if(new_area && new_area.name == allowed_area || istype(new_area, /area/science/xenobiology ))
 		return ..()
 	else
 		return