Merge branch 'master' into development

# Conflicts:
#	maps/aurora/aurora-1_centcomm.dmm

code/_onclick/hud/screen_objects.dm

@@ -558,12 +558,12 @@
 	if (user.max_stamina == -1 || user.stamina == user.max_stamina)
 		if (user.stamina_bar)
 			QDEL_NULL(user.stamina_bar)
-		return
+	else
+		if (!user.stamina_bar)
+			user.stamina_bar = new(user, user.max_stamina, src)
 
-	if (!user.stamina_bar)
-		user.stamina_bar = new(user, user.max_stamina, src)
+		user.stamina_bar.update(user.stamina)
 
-	user.stamina_bar.update(user.stamina)
 	if (user.m_intent == "run")
 		icon_state = "running"
 	else

code/controllers/subsystems/job.dm

@@ -775,14 +775,8 @@
 			else
 				permitted = TRUE
 
-			if (G.whitelisted)
-				var/found = FALSE
-				for (var/species in G.whitelisted)
-					if (is_alien_whitelisted(H, global.all_species[species]))
-						found = TRUE
-						break
-				 if (!found)
-				 	permitted = FALSE
+			if(G.whitelisted && (!(H.species.name in G.whitelisted)))
+				permitted = 0
 
 			if(!permitted)
 				H << "<span class='warning'>Your current job or whitelist status does not permit you to spawn with [thing]!</span>"

code/datums/trading/vox.dm

@@ -51,6 +51,7 @@
 		/obj/item/mecha_parts/mecha_equipment/tool                           = TRADER_SUBTYPES_ONLY,
 		/obj/item/mecha_parts/mecha_equipment/weapon                         = TRADER_SUBTYPES_ONLY,
 		/obj/item/mecha_parts/mecha_equipment/weapon/ballistic               = TRADER_BLACKLIST,
+		/obj/item/mecha_parts/mecha_equipment/weapon/energy                  = TRADER_BLACKLIST,
 		/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack  = TRADER_BLACKLIST,
 		/obj/item/trash                                                      = TRADER_SUBTYPES_ONLY,
 		/obj/item/clothing/accessory                                         = TRADER_ALL,

code/defines/obj/weapon.dm

@@ -437,7 +437,7 @@
 
 /obj/item/weapon/anomaly_core
 	name = "anomaly core"
-	desc = "An advanced bluespace device, little is know about its applications."
+	desc = "An advanced bluespace device, little is known about its applications, meriting research into its purpose."
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "anomaly_core"
 	origin_tech = list(TECH_MAGNET = 6, TECH_MATERIAL = 7, TECH_BLUESPACE = 8)

code/game/area/areas.dm

@@ -55,7 +55,7 @@
 	)
 	var/list/forced_ambience = null
 	var/sound_env = STANDARD_STATION
-	var/turf/base_turf//The base turf type of the area, which can be used to override the z-level's base turf
+	var/turf/base_turf //The base turf type of the area, which can be used to override the z-level's base turf
 	var/no_light_control = 0		// if 1, lights in area cannot be toggled with light controller
 	var/allow_nightmode = 0	// if 1, lights in area will be darkened by the night mode controller
 	var/station_area = 0
@@ -211,7 +211,7 @@
 #define DO_PARTY(COLOR) animate(color = COLOR, time = 0.5 SECONDS, easing = QUAD_EASING)
 
 /area/update_icon()
-	if ((fire || eject || party) && (!requires_power||power_environ) && !istype(src, /area/space))//If it doesn't require power, can still activate this proc.
+	if ((fire || eject || party) && (!requires_power||power_environ) && !istype(src, /area/space)) //If it doesn't require power, can still activate this proc.
 		if(fire && !eject && !party)		// FIRE
 			color = "#ff9292"
 			animate(src)	// stop any current animations.

code/game/gamemodes/cult/ritual.dm

@@ -324,6 +324,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
 
 	if(!cultwords["travel"])
 		runerandom()
+
 	if(iscultist(user))
 		var/C = 0
 		for(var/obj/effect/rune/N in rune_list)
@@ -443,7 +444,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
 	w_class = 2.0
 	var/cultistsonly = 1
 	attack_self(mob/user as mob)
-		if(src.cultistsonly && !iscultist(usr))
+		if(src.cultistsonly && !iscultist(user))
 			return
 		if(!cultwords["travel"])
 			runerandom()
@@ -468,7 +469,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
 				if("teleport")
 					var/list/words = list("ire", "ego", "nahlizet", "certum", "veri", "jatkaa", "balaq", "mgar", "karazet", "geeri")
 					var/beacon
-					if(usr)
+					if(user)
 						beacon = input("Select the last rune", "Rune Scribing") in words
 					R.word1=cultwords["travel"]
 					R.word2=cultwords["self"]
@@ -478,7 +479,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
 				if("itemport")
 					var/list/words = list("ire", "ego", "nahlizet", "certum", "veri", "jatkaa", "balaq", "mgar", "karazet", "geeri")
 					var/beacon
-					if(usr)
+					if(user)
 						beacon = input("Select the last rune", "Rune Scribing") in words
 					R.word1=cultwords["travel"]
 					R.word2=cultwords["other"]

code/game/gamemodes/cult/runes.dm

@@ -421,7 +421,6 @@ var/list/sacrificed = list()
 
 /obj/effect/rune/proc/manifest(var/mob/living/user)
 	var/obj/effect/rune/this_rune = src
-	src = null
 	if(user.loc!=this_rune.loc)
 		return this_rune.fizzle(user)
 	var/mob/dead/observer/ghost
@@ -441,7 +440,7 @@ var/list/sacrificed = list()
 	user.visible_message("<span class='warning'>A shape forms in the center of the rune. A shape of... a man.</span>", \
 	"<span class='warning'>A shape forms in the center of the rune. A shape of... a man.</span>", \
 	"<span class='warning'>You hear liquid flowing.</span>")
-	D.real_name = "Unknown"
+
 	var/chose_name = 0
 	for(var/obj/item/weapon/paper/P in this_rune.loc)
 		if(P.info)

code/game/gamemodes/cult/talisman.dm

@@ -47,7 +47,7 @@
 	if(iscultist(user))
 		if(imbue == "runestun")
 			user.take_organ_damage(5, 0)
-			call(/obj/effect/rune/proc/runestun)(T)
+			call(/obj/effect/rune/proc/runestun)(user, T)
 			qdel(src)
 		else
 			..()   ///If its some other talisman, use the generic attack code, is this supposed to work this way?

code/game/gamemodes/vampire/vampire_powers.dm

@@ -546,6 +546,26 @@
 			heal_organ_damage(50, 50)
 			blood_used += 12
 
+		for (var/A in organs)
+			var/healed = FALSE
+			var/obj/item/organ/external/E = A
+			for (var/X in E.wounds)
+				var/datum/wound/W = X
+				if (W && W.internal)
+					E.wounds -= W
+					blood_used += 12
+					healed = TRUE
+					break
+
+			if(E.status & ORGAN_BROKEN)
+				E.status &= ~ORGAN_BROKEN
+				E.stage = 0
+				blood_used += 12
+				healed = TRUE
+
+			if (healed)
+				break
+
 		var/list/emotes_lookers = list("[src]'s skin appears to liquefy for a moment, sealing up their wounds.",
 									"[src]'s veins turn black as their damaged flesh regenerates before your eyes!",
 									"[src]'s skin begins to split open. It turns to ash and falls away, revealing the wound to be fully healed.",

code/game/jobs/jobs.dm

@@ -107,7 +107,6 @@ var/list/civilian_positions = list(
 	"Janitor",
 	"Librarian",
 	"Chaplain",
-	"Merchant",
 	"Assistant"
 )
 
@@ -124,7 +123,8 @@ var/list/security_positions = list(
 var/list/nonhuman_positions = list(
 	"AI",
 	"Cyborg",
-	"pAI"
+	"pAI",
+	"Merchant"
 )
 
 /proc/guest_jobbans(var/job)

code/game/machinery/adv_med.dm

@@ -118,7 +118,7 @@
 				var/obj/structure/LB = L.buckled
 				LB.user_unbuckle_mob(user)
 			var/mob/M = G.affecting
-			if (M.client)
+			if (istype(M) && M.client)
 				M.client.perspective = EYE_PERSPECTIVE
 				M.client.eye = src
 			M.loc = src

code/game/machinery/computer/robot.dm

@@ -85,6 +85,9 @@
 			user << "Access Denied."
 			return
 
+		if(target.emagged)
+			return
+
 		var/choice = input("Really [target.lockcharge ? "unlock" : "lockdown"] [target.name] ?") in list ("Yes", "No")
 		if(choice != "Yes")
 			return

code/game/machinery/computer/sentencing.dm

@@ -626,6 +626,8 @@
 			if( incident_notes != null )
 				incident.notes = incident_notes
 		if( "render_guilty" )
+			if( !incident )
+				return
 			if( !incident.notes )
 				if( alert("No incident notes were added. Adding a short description of the incident is highly recommended. Do you still want to continue with the print?",,"Yes","No") == "No" )
 					return

code/game/machinery/hologram.dm

@@ -114,11 +114,16 @@ var/const/HOLOPAD_MODE = RANGE_BASED
 		activate_holocall(caller_id)
 
 /obj/machinery/hologram/holopad/proc/end_call(mob/user)
-	caller_id.unset_machine()
-	caller_id.reset_view() //Send the caller back to his body
-	clear_holo(null, caller_id) // destroy the hologram
-	caller_id = null
-
+	if(caller_id)
+		caller_id.unset_machine()
+		caller_id.reset_view() //Send the caller back to his body
+		clear_holo(null, caller_id) // destroy the hologram
+		caller_id = null
+	if(user)
+		user.unset_machine()
+		user.reset_view() //Send the caller back to his body
+		clear_holo(null, user) // destroy the hologram
+		user = null
 /obj/machinery/hologram/holopad/proc/activate_holocall(mob/living/carbon/caller_id)
 	if(caller_id)
 		create_holo(0,caller_id)//Create one.
@@ -173,9 +178,13 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 			master.show_message(rendered, 2)
 	var/name_used = M.GetVoice()
 	if(targetpad) //If this is the pad you're making the call from
-		var/message = "<i><span class='game say'>Holopad received, <span class='name'>[name_used]</span> [speaking.format_message(text, verb)]</span></i>"
-		targetpad.audible_message(message)
-		targetpad.last_message = message
+		var/message
+		if(speaking)
+			message = "<i><span class='game say'>Holopad received, <span class='name'>[name_used]</span> [speaking.format_message(text, verb)]</span></i>"
+			targetpad.audible_message(message)
+			targetpad.last_message = message
+		else
+			message = "<i><span class='game say'>Holopad received, <span class='name'>[name_used]</span> [verb], <span class='message'>\"[text]\"</span></span></i>"
 	if(sourcepad) //If this is a pad receiving a call
 		if(name_used==caller_id||text==last_message||findtext(text, "Holopad received")) //prevent echoes
 			return

code/game/objects/items/stacks/nanopaste.dm

@@ -37,7 +37,7 @@
 				S.heal_damage(15, 15, robo_repair = 1)
 				H.updatehealth()
 				use(1)
-				user.visible_message("<span class='notice'>\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.name] with \the [src].</span>",\
+				user.visible_message("<span class='notice'>\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the [user]"] [S.name] with \the [src].</span>",\
 				"<span class='notice'>You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.name].</span>")
 			else
 				user << "<span class='notice'>Nothing to fix here.</span>"

code/game/turfs/turf.dm

@@ -60,8 +60,6 @@
 
 	if (opacity)
 		has_opaque_atom = TRUE
-		if (!mapload)
-			regenerate_ao()
 
 	if (mapload && permit_ao)
 		queue_ao()

code/modules/admin/DB ban/ban_mirroring.dm

@@ -235,7 +235,14 @@
 		update_connection_data(C)
 		return
 
-	var/list/data_object = json_decode(data)
+	var/list/data_object
+
+	try
+		data_object = json_decode(data)
+
+	catch(var/exception/E)
+		data_object = list()
+		log_debug("CONN DATA: [E] encountered when loading data for [C.ckey].")
 
 	if (!data_object || !data_object.len)
 		log_debug("CONN DATA: [C.ckey] has no connection data to showcase.")

code/modules/admin/admin_verbs.dm

@@ -1046,7 +1046,7 @@ var/list/admin_verbs_cciaa = list(
 
 	var/mob/living/silicon/ai/target = input("Choose the AI to force-wipe:", "AI Termination") as null|anything in ai_list
 
-	if (alert("Are you sure you want to wipe [target.name]? They will be ghosted and their job slot freed.", "Confirm AI Termination", "No", "No", "Yes") != "Yes")
+	if (!target || alert("Are you sure you want to wipe [target.name]? They will be ghosted and their job slot freed.", "Confirm AI Termination", "No", "No", "Yes") != "Yes")
 		return
 
 	log_and_message_admins("admin-wiped [key_name_admin(target)]'s core.")

code/modules/client/preference_setup/loadout/gear_tweaks.dm

@@ -110,7 +110,8 @@ Content adjustment
 			continue
 		else
 			path = 	contents[metadata[i]]
-		new path(I)
+		if(path)
+			new path(I)
 
 /*
 Reagents adjustment

code/modules/client/preference_setup/loadout/loadout_xeno.dm

@@ -85,21 +85,21 @@
 	display_name = "vaurca blindfold (Vaurca)"
 	path = /obj/item/clothing/glasses/sunglasses/blinders
 	cost = 2
-	whitelisted = list("Vaurca Worker")
+	whitelisted = list("Vaurca Worker", "Vaurca Warrior")
 	sort_category = "Xenowear"
 
 /datum/gear/mask/vaurca
 	display_name = "mandible garment (Vaurca)"
 	path = /obj/item/clothing/mask/breath/vaurca
 	cost = 1
-	whitelisted = list("Vaurca Worker")
+	whitelisted = list("Vaurca Worker", "Vaurca Warrior",)
 	sort_category = "Xenowear"
 
 /datum/gear/cape
 	display_name = "tunnel cloak (Vaurca)"
 	path = /obj/item/weapon/storage/backpack/cloak
 	cost = 1
-	whitelisted = list("Vaurca Worker")
+	whitelisted = list("Vaurca Worker", "Vaurca Warrior",)
 	sort_category = "Xenowear"
 
 //tajara items
@@ -107,7 +107,7 @@
 /datum/gear/gloves/tajara
 	display_name = "gloves selection (Tajara)"
 	path = /obj/item/clothing/gloves/black/tajara
-	whitelisted = list("Tajara")
+	whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
 	sort_category = "Xenowear"
 
 /datum/gear/gloves/tajara/New()
@@ -126,13 +126,13 @@
 /datum/gear/suit/tajara_coat
 	display_name = "tajaran naval coat (Tajara)"
 	path = /obj/item/clothing/suit/storage/tajaran
-	whitelisted = list("Tajara")
+	whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
 	sort_category = "Xenowear"
 
 /datum/gear/suit/tajaran_labcoat
 	display_name = "PRA medical coat (Tajara)"
 	path = /obj/item/clothing/suit/storage/toggle/labcoat/tajaran
-	whitelisted = list("Tajara")
+	whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
 	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Medical Resident")
 	sort_category = "Xenowear"
 
@@ -142,22 +142,22 @@
 	display_name = "gear harness"
 	path = /obj/item/clothing/under/gearharness
 	sort_category = "Xenowear"
-	whitelisted = list("Vaurca Worker", "Diona", "Baseline Frame")
+	whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Diona", "Baseline Frame", "Industrial Frame")
 
 /datum/gear/shoes/footwraps
 	display_name = "cloth footwraps"
 	path = /obj/item/clothing/shoes/footwraps
 	sort_category = "Xenowear"
-	whitelisted = list("Vaurca Worker", "Unathi", "Tajara")
+	whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
 
 /datum/gear/shoes/toeless
 	display_name = "toe-less jackboots"
 	path = /obj/item/clothing/shoes/jackboots/unathi
 	sort_category = "Xenowear"
-	whitelisted = list("Vaurca Worker", "Unathi", "Tajara")
+	whitelisted = list("Vaurca Worker", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
 
 /datum/gear/shoes/workboots_toeless
 	display_name = "toeless workboots"
 	path = /obj/item/clothing/shoes/workboots/toeless
 	sort_category = "Xenowear"
-	whitelisted = list("Vaurca Worker", "Unathi", "Tajara")
+	whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")

code/modules/clothing/clothing_accessories.dm

@@ -45,6 +45,9 @@
 		if (!(src.loc == usr))
 			return
 
+		if(!over_object)
+			return
+
 		if (( usr.restrained() ) || ( usr.stat ))
 			return
 

code/modules/clothing/spacesuits/rig/rig.dm

@@ -591,7 +591,7 @@
 
 /obj/item/weapon/rig/proc/toggle_piece(var/piece, var/mob/initiator, var/deploy_mode)
 
-	if(sealing || !cell || !cell.charge)
+	if(!usr || sealing || !cell || !cell.charge)
 		return
 
 	if(!istype(wearer) || !wearer.back == src)

code/modules/hydroponics/spreading/spreading.dm

@@ -169,6 +169,8 @@
 			last_biolum = null
 
 /obj/effect/plant/proc/refresh_icon()
+	if(!growth_threshold)
+		growth_threshold = max_health/seed.growth_stages
 	var/growth = min(max_growth,round(health/growth_threshold))
 	var/at_fringe = get_dist(src,parent)
 	if(spread_distance > 5)

code/modules/hydroponics/spreading/spreading_growth.dm

@@ -17,7 +17,7 @@
 		if((locate(/obj/effect/plant) in floor.contents) || (locate(/obj/effect/dead_plant) in floor.contents) )
 			continue
 		if(floor.density)
-			if(seed.chems["pacid"])
+			if(seed && seed.chems["pacid"])
 				addtimer(CALLBACK(floor, /atom/.proc/ex_act, 3), rand(5, 25))
 			continue
 		if(!Adjacent(floor) || !floor.Enter(src))

code/modules/lighting/lighting_turf.dm

@@ -205,11 +205,13 @@
 	var/list/old_affecting_lights = affecting_lights
 	var/old_lighting_overlay = lighting_overlay
 	var/list/old_corners = corners
-	var/old_ao_neighbors = ao_neighbors
 
 	. = ..()
 
-	ao_neighbors = old_ao_neighbors
+#ifndef AO_USE_LIGHTING_OPACITY
+	if (permit_ao)
+		regenerate_ao()
+#endif
 
 	recalc_atom_opacity()
 	lighting_overlay = old_lighting_overlay

code/modules/mining/mine_turfs.dm

@@ -54,8 +54,6 @@
 		luminosity = 1
 
 	has_opaque_atom = TRUE
-	if (!mapload)
-		regenerate_ao()
 
 	if (smooth)
 		pixel_x = -4

code/modules/mob/living/carbon/brain/MMI.dm

@@ -127,7 +127,7 @@
 	if(user.stat || user.stunned)
 		return
 	var/obj/item/weapon/rig/rig = src.get_rig()
-	if(rig)
+	if(istype(rig))
 		rig.forced_move(direction, user)
 
 /obj/item/device/mmi/Destroy()

code/modules/mob/living/carbon/human/species/outsider/skeleton.dm

@@ -94,7 +94,7 @@
 
 	flesh_color = "#551A8B"
 
-	flags = NO_BLOOD | NO_SCAN | NO_SLIP | NO_POISON | NO_PAIN | NO_BREATHE
+	flags = NO_BLOOD | NO_SCAN | NO_SLIP | NO_POISON | NO_PAIN | NO_BREATHE | NO_EMBED
 	spawn_flags = IS_RESTRICTED
 
 	stamina	=	500			  //Tireless automatons

code/modules/organs/subtypes/machine.dm

@@ -34,6 +34,8 @@
 
 /obj/item/organ/external/leg/right/ipc
 	dislocated = -1
+	encased = "support frame"
+	robotize_type = PROSTHETIC_IPC
 
 /obj/item/organ/external/foot/ipc
 	dislocated = -1

code/modules/power/lighting.dm

@@ -135,6 +135,7 @@
 	idle_power_usage = 2
 	active_power_usage = 20
 	power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list
+	gfi_layer_rotation = GFI_ROTATION_DEFDIR
 	var/on = 0					// 1 if on, 0 if off
 	var/on_gs = 0
 	var/brightness_range = 8	// luminosity when on, also used in power calculation

code/modules/power/tesla/energy_ball.dm

@@ -58,6 +58,8 @@
 			tesla_zap(ball, range, TESLA_MINI_POWER/7*range, TRUE)
 	else
 		energy = 0 // ensure we dont have miniballs of miniballs
+	if(energy == 0)
+		qdel(src)
 
 /obj/singularity/energy_ball/examine(mob/user)
 	..()

code/modules/projectiles/guns/energy.dm

@@ -91,7 +91,7 @@
 	return
 
 /obj/item/weapon/gun/energy/update_icon()
-	if(charge_meter)
+	if(charge_meter && power_supply)
 		var/ratio = power_supply.charge / power_supply.maxcharge
 
 		//make sure that rounding down will not give us the empty state even if we have charge for a shot left.

code/modules/random_map/automata/diona.dm

@@ -24,6 +24,7 @@
 	name = "alien vines"
 	desc = "Thick, heavy vines of some sort."
 	icon_state = "vines3"
+	density = 0
 	var/growth = 0
 
 /obj/structure/diona/vines/proc/spread()

code/modules/reagents/reagent_containers/glass.dm

@@ -93,7 +93,7 @@
 	if(standard_pour_into(user, target))
 		return
 
-	if(reagents.total_volume)
+	if(reagents && reagents.total_volume)
 		user << "<span class='notice'>You splash the solution onto [target].</span>"
 		reagents.splash(target, reagents.total_volume)
 		return

code/modules/shieldgen/shield_gen.dm

@@ -238,8 +238,27 @@
 //grab the border tiles in a circle around this machine
 /obj/machinery/shield_gen/proc/get_shielded_turfs()
 	var/turf/gen_turf = get_turf(src)
+	. = list()
 
 	if (!gen_turf)
 		return
 
-	. = RANGE_TURFS(field_radius, gen_turf)
+	var/turf/T
+
+	for (var/x_offset = -field_radius; x_offset <= field_radius; x_offset++)
+		T = locate(gen_turf.x + x_offset, gen_turf.y - field_radius, gen_turf.z)
+		if (T)
+			. += T
+
+		T = locate(gen_turf.x + x_offset, gen_turf.y + field_radius, gen_turf.z)
+		if (T)
+			. += T
+
+	for (var/y_offset = -field_radius+1; y_offset < field_radius; y_offset++)
+		T = locate(gen_turf.x - field_radius, gen_turf.y + y_offset, gen_turf.z)
+		if (T)
+			. += T
+
+		T = locate(gen_turf.x + field_radius, gen_turf.y + y_offset, gen_turf.z)
+		if (T)
+			. += T

code/modules/shieldgen/shield_gen_external.dm

@@ -28,7 +28,7 @@
 					continue
 
 				if (the_station_areas[U.loc])
-					out += U
+					out += T
 					break
 
 	return out

html/changelog.html

@@ -56,6 +56,37 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">28 October 2017</h2>
+			<h3 class="author">Alberyk updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Blood heal should now fix broken bones and internal bleeding.</li>
+			</ul>
+			<h3 class="author">Chaoko99 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed Tesla Balls never deleting themselves.</li>
+				<li class="spellcheck">Corrected the Anomaly Core description, added some clarification of its use.</li>
+			</ul>
+			<h3 class="author">TheGreatJorge updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="maptweak">Blast doors should now be properly oriented.</li>
+				<li class="bugfix">Fixes APC overlays.</li>
+				<li class="rscadd">Xenoarcheology now has one portable ladder and hoist kit available at the excavation site rack.</li>
+			</ul>
+
+			<h2 class="date">24 October 2017</h2>
+			<h3 class="author">Lohikar updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Shadows no longer mysteriously hang around after building or destroying walls.</li>
+				<li class="bugfix">IPCs no longer have organic (right) legs. We're not really sure how they got them, and we don't want to know.</li>
+				<li class="bugfix">The sprint indicator now actually works for IPCs, as well as updating immediately when toggled by a species with stamina.</li>
+			</ul>
+
+			<h2 class="date">22 October 2017</h2>
+			<h3 class="author">Skull132 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Hull and bubble shields now work as expected once more.</li>
+			</ul>
+
 			<h2 class="date">20 October 2017</h2>
 			<h3 class="author">Lohikar updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -4751,3 +4751,26 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Locators and other scanning devices now properly push data to other devices.
   - bugfix: Basic pathfinders will now stop moving if they cannot see their target,
       instead of jamming.
+2017-10-22:
+  Skull132:
+  - bugfix: Hull and bubble shields now work as expected once more.
+2017-10-24:
+  Lohikar:
+  - bugfix: Shadows no longer mysteriously hang around after building or destroying
+      walls.
+  - bugfix: IPCs no longer have organic (right) legs. We're not really sure how they
+      got them, and we don't want to know.
+  - bugfix: The sprint indicator now actually works for IPCs, as well as updating
+      immediately when toggled by a species with stamina.
+2017-10-28:
+  Alberyk:
+  - bugfix: Blood heal should now fix broken bones and internal bleeding.
+  Chaoko99:
+  - bugfix: Fixed Tesla Balls never deleting themselves.
+  - spellcheck: Corrected the Anomaly Core description, added some clarification of
+      its use.
+  TheGreatJorge:
+  - maptweak: Blast doors should now be properly oriented.
+  - bugfix: Fixes APC overlays.
+  - rscadd: Xenoarcheology now has one portable ladder and hoist kit available at
+      the excavation site rack.

maps/aurora/aurora-3_sublevel.dmm

@@ -2308,8 +2308,8 @@
 /obj/random/tech_supply,
 /obj/random/tech_supply,
 /obj/item/weapon/pickaxe,
-/obj/machinery/firealarm/north,
 /obj/effect/floor_decal/corner/yellow/full,
+/obj/machinery/firealarm/south,
 /turf/simulated/floor/tiled,
 /area/outpost/engineering/meeting)
 "eT" = (
@@ -4254,7 +4254,7 @@
 /obj/machinery/portable_atmospherics/canister/empty,
 /obj/machinery/camera/network/engineering_outpost{
 	c_tag = "Engineering Sublevel - Atmospherics Distro";
-	dir = 5;
+	dir = 2;
 	icon_state = "camera"
 	},
 /turf/simulated/floor/plating,
@@ -5747,6 +5747,7 @@
 "lO" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "AICore";
 	name = "AI core maintenance hatch";
@@ -5859,13 +5860,6 @@
 	name = "AI SMES";
 	req_access = list(16)
 	},
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "AICore";
-	name = "AI core maintenance hatch";
-	opacity = 0
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	icon_state = "intact";
 	dir = 4
@@ -5873,6 +5867,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "AICore";
+	name = "AI core maintenance hatch";
+	opacity = 0
+	},
 /turf/simulated/floor/tiled/dark{
 	name = "cooled dark floor";
 	temperature = 278
@@ -6055,6 +6057,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "AICore";
 	name = "AI core maintenance hatch";
@@ -6417,6 +6420,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "AICore";
 	name = "AI core maintenance hatch";
@@ -6760,6 +6764,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "AICore";
 	name = "AI core maintenance hatch";
@@ -6956,13 +6961,6 @@
 	name = "AI SMES";
 	req_access = list(16)
 	},
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "AICore";
-	name = "AI core maintenance hatch";
-	opacity = 0
-	},
 /obj/machinery/power/terminal{
 	dir = 8
 	},
@@ -6970,6 +6968,14 @@
 	icon_state = "0-4";
 	d2 = 4
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "AICore";
+	name = "AI core maintenance hatch";
+	opacity = 0
+	},
 /turf/simulated/floor/tiled/dark{
 	name = "cooled dark floor";
 	temperature = 278
@@ -7190,6 +7196,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "AICore";
 	name = "AI core maintenance hatch";
@@ -7432,6 +7439,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "AICore";
 	name = "AI core maintenance hatch";
@@ -7700,6 +7708,7 @@
 "oy" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "AICore";
 	name = "AI core maintenance hatch";
@@ -7811,19 +7820,20 @@
 	name = "AI SMES";
 	req_access = list(16)
 	},
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "AICore";
-	name = "AI core maintenance hatch";
-	opacity = 0
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "AICore";
+	name = "AI core maintenance hatch";
+	opacity = 0
+	},
 /turf/simulated/floor/tiled/dark{
 	name = "cooled dark floor";
 	temperature = 278
@@ -9842,6 +9852,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -10139,6 +10150,7 @@
 /area/mine/unexplored)
 "sG" = (
 /obj/structure/table/rack,
+/obj/item/weapon/ladder_mobile,
 /turf/simulated/floor/asteroid,
 /area/mine/unexplored)
 "sH" = (
@@ -10153,6 +10165,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -11267,6 +11280,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -11613,6 +11627,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -11801,6 +11816,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -12749,6 +12765,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -12808,7 +12825,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/blast/regular{
 	density = 0;
-	dir = 4;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "virologyquar";
 	name = "Virology Emergency Quarantine Blast Doors";
@@ -12898,6 +12915,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -12911,6 +12929,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -13056,7 +13075,7 @@
 "xO" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
-	dir = 4;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "virologyquar";
 	name = "Virology Emergency Quarantine Blast Doors";
@@ -13430,7 +13449,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
-	dir = 4;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "virologyquar";
 	name = "Virology Emergency Quarantine Blast Doors";
@@ -13827,7 +13846,7 @@
 "zb" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
-	dir = 4;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "virologyquar";
 	name = "Virology Emergency Quarantine Blast Doors";
@@ -14130,6 +14149,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
+/obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -14138,19 +14158,10 @@
 	name = "Virology Emergency Quarantine Blast Doors";
 	opacity = 0
 	},
-/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/medical/virology)
 "zA" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	dir = 4;
-	icon_state = "pdoor0";
-	id = "virologyquar";
-	name = "Virology Emergency Quarantine Blast Doors";
-	opacity = 0
-	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -14161,10 +14172,6 @@
 /obj/effect/floor_decal/corner/lime{
 	dir = 6
 	},
-/turf/simulated/floor/tiled/white,
-/area/medical/virology)
-"zB" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -14173,6 +14180,10 @@
 	name = "Virology Emergency Quarantine Blast Doors";
 	opacity = 0
 	},
+/turf/simulated/floor/tiled/white,
+/area/medical/virology)
+"zB" = (
+/obj/machinery/door/firedoor,
 /obj/effect/floor_decal/corner/lime{
 	icon_state = "corner_white";
 	dir = 9
@@ -14180,11 +14191,6 @@
 /obj/effect/floor_decal/corner/lime{
 	dir = 6
 	},
-/turf/simulated/floor/tiled/white,
-/area/medical/virology)
-"zC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -14193,6 +14199,11 @@
 	name = "Virology Emergency Quarantine Blast Doors";
 	opacity = 0
 	},
+/turf/simulated/floor/tiled/white,
+/area/medical/virology)
+"zC" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/airlock/medical{
 	autoclose = 0;
@@ -14204,6 +14215,14 @@
 	req_access = list(39)
 	},
 /obj/machinery/door/firedoor,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "virologyquar";
+	name = "Virology Emergency Quarantine Blast Doors";
+	opacity = 0
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "zD" = (
@@ -14641,7 +14660,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
-	dir = 4;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "virologyquar";
 	name = "Virology Emergency Quarantine Blast Doors";
@@ -15007,7 +15026,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
-	dir = 4;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "virologyquar";
 	name = "Virology Emergency Quarantine Blast Doors";
@@ -15695,7 +15714,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
-	dir = 4;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "virologyquar";
 	name = "Virology Emergency Quarantine Blast Doors";
@@ -16833,7 +16852,7 @@
 /obj/structure/grille,
 /obj/machinery/door/blast/regular{
 	density = 0;
-	dir = 4;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "virologyquar";
 	name = "Virology Emergency Quarantine Blast Doors";
@@ -16852,6 +16871,10 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/machinery/door/firedoor,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -16860,10 +16883,6 @@
 	name = "Virology Emergency Quarantine Blast Doors";
 	opacity = 0
 	},
-/obj/machinery/door/firedoor,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
 /turf/simulated/floor/plating,
 /area/medical/virology)
 "Ef" = (
@@ -16874,7 +16893,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
-	dir = 4;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "virologyquar";
 	name = "Virology Emergency Quarantine Blast Doors";
@@ -17263,7 +17282,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
-	dir = 4;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "virologyquar";
 	name = "Virology Emergency Quarantine Blast Doors";
@@ -18031,6 +18050,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -18143,6 +18163,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "xenobio6";
 	name = "Containment Blast Doors";
@@ -18694,6 +18715,7 @@
 "GT" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "xenobio6";
 	name = "Containment Blast Doors";
@@ -19017,6 +19039,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "xenobio6";
 	name = "Containment Blast Doors";
@@ -19747,6 +19770,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "xenobio5";
 	name = "Containment Blast Doors";
@@ -20217,6 +20241,7 @@
 "JG" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "xenobio5";
 	name = "Containment Blast Doors";
@@ -20261,6 +20286,7 @@
 	dir = 8
 	},
 /obj/structure/grille,
+/obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -20269,7 +20295,6 @@
 	name = "Virology Emergency Quarantine Blast Doors";
 	opacity = 0
 	},
-/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/medical/virology)
 "JM" = (
@@ -20278,6 +20303,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -20286,7 +20312,6 @@
 	name = "Virology Emergency Quarantine Blast Doors";
 	opacity = 0
 	},
-/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/medical/virology)
 "JN" = (
@@ -20298,6 +20323,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -20306,7 +20332,6 @@
 	name = "Virology Emergency Quarantine Blast Doors";
 	opacity = 0
 	},
-/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/medical/virology)
 "JO" = (
@@ -20598,6 +20623,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "xenobio5";
 	name = "Containment Blast Doors";
@@ -20947,6 +20973,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "xenobio4";
 	name = "Containment Blast Doors";
@@ -21223,6 +21250,7 @@
 "LD" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "xenobio4";
 	name = "Containment Blast Doors";
@@ -21655,6 +21683,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "xenobio4";
 	name = "Containment Blast Doors";
@@ -21966,6 +21995,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "xenobio3";
 	name = "Containment Blast Doors";
@@ -21982,6 +22012,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "xenobio3";
 	name = "Containment Blast Doors";
@@ -22004,6 +22035,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "xenobio3";
 	name = "Containment Blast Doors";
@@ -22026,6 +22058,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "xenobio2";
 	name = "Containment Blast Doors";
@@ -22042,6 +22075,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "xenobio2";
 	name = "Containment Blast Doors";
@@ -22064,6 +22098,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "xenobio2";
 	name = "Containment Blast Doors";
@@ -22086,6 +22121,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "xenobio1";
 	name = "Containment Blast Doors";
@@ -22102,6 +22138,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "xenobio1";
 	name = "Containment Blast Doors";
@@ -22124,6 +22161,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "xenobio1";
 	name = "Containment Blast Doors";
@@ -23117,6 +23155,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -23135,6 +23174,7 @@
 /obj/machinery/meter,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -23151,6 +23191,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -23170,6 +23211,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -23462,6 +23504,7 @@
 /area/medical/medbay4)
 "Pv" = (
 /obj/machinery/door/blast/regular{
+	dir = 1;
 	id = "mixvent";
 	name = "Mixer Room Vent"
 	},
@@ -23499,6 +23542,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -23683,6 +23727,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 1;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -23856,6 +23901,7 @@
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -23872,6 +23918,7 @@
 /obj/structure/window/phoronreinforced,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -24253,13 +24300,6 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "Biohazard";
-	name = "Biohazard Shutter";
-	opacity = 0
-	},
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
 	icon_state = "door_locked";
@@ -24268,6 +24308,14 @@
 	name = "Toxins External Access";
 	req_access = list(10,13)
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Biohazard";
+	name = "Biohazard Shutter";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/rnd/mixing)
 "QZ" = (
@@ -24513,6 +24561,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -24534,6 +24583,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -24551,6 +24601,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "Biohazard";
 	name = "Biohazard Shutter";
@@ -25107,6 +25158,11 @@
 "Tj" = (
 /turf/simulated/wall,
 /area/maintenance/disposal)
+"Tk" = (
+/obj/structure/table/rack,
+/obj/item/hoist_kit,
+/turf/simulated/floor/asteroid,
+/area/mine/unexplored)
 
 (1,1,1) = {"
 aa
@@ -42972,7 +43028,7 @@ ac
 ac
 ac
 sG
-sG
+Tk
 tN
 ac
 ac

maps/aurora/aurora-6_surface.dmm

@@ -2886,6 +2886,7 @@
 	name = "KEEP CLEAR: DOCKING AREA";
 	pixel_y = 0
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/port)
 "fx" = (
@@ -3300,7 +3301,7 @@
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
 	icon_state = "door_locked";
-	id_tag = "admin_shuttle_bay_outer";
+	id_tag = "admin_shuttle_dock_airlock_outer";
 	locked = 1;
 	name = "Docking Port Airlock";
 	req_access = list(13)
@@ -3320,8 +3321,8 @@
 /obj/machinery/light/small,
 /obj/machinery/airlock_sensor{
 	frequency = 1380;
-	id_tag = "admin_shuttle_dock_sensor";
-	master_tag = "admin_shuttle_bay";
+	id_tag = "admin_shuttle_dock_airlock_sensor";
+	master_tag = "admin_shuttle_dock_airlock";
 	pixel_x = 0;
 	pixel_y = 26
 	},
@@ -3331,19 +3332,19 @@
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 4;
 	frequency = 1380;
-	id_tag = "admin_shuttle_bay_pump"
+	id_tag = "admin_shuttle_dock_airlock_pump"
 	},
 /obj/machinery/embedded_controller/radio/airlock/docking_port_multi{
 	frequency = 1380;
-	id_tag = "admin_shuttle_bay";
-	master_tag = "admin_shuttle_bay";
+	id_tag = "admin_shuttle_dock_airlock";
+	master_tag = "admin_shuttle_dock_airlock";
 	pixel_y = 30;
 	req_one_access = list(13);
 	tag_airlock_mech_sensor = null;
-	tag_airpump = "admin_shuttle_bay_sensor";
-	tag_chamber_sensor = "admin_shuttle_bay_sensor";
-	tag_exterior_door = "admin_shuttle_bay_outer";
-	tag_interior_door = "admin_shuttle_bay_inner";
+	tag_airpump = "admin_shuttle_dock_airlock_pump";
+	tag_chamber_sensor = "admin_shuttle_dock_airlock_sensor";
+	tag_exterior_door = "admin_shuttle_dock_airlock_outer";
+	tag_interior_door = "admin_shuttle_dock_airlock_inner";
 	tag_shuttle_mech_sensor = null
 	},
 /turf/simulated/floor/plating,
@@ -3356,7 +3357,7 @@
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
 	icon_state = "door_locked";
-	id_tag = "admin_shuttle_bay_inner";
+	id_tag = "admin_shuttle_dock_airlock_inner";
 	locked = 1;
 	name = "Docking Port Airlock";
 	req_access = list(13)
@@ -3675,11 +3676,11 @@
 	command = "cycle_interior";
 	frequency = 1379;
 	layer = 3.3;
-	master_tag = "brig_solar_inner";
+	master_tag = "brig_solar_airlock";
 	name = "interior access button";
 	pixel_x = -25;
 	pixel_y = -25;
-	req_access = list(13)
+	req_access = list(11,13)
 	},
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -3945,6 +3946,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/port)
 "hl" = (
@@ -3956,6 +3958,7 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/port)
 "hm" = (
@@ -4073,6 +4076,7 @@
 	dir = 8
 	},
 /obj/structure/window/reinforced,
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/exit)
 "hA" = (
@@ -5241,6 +5245,7 @@
 /obj/structure/window/reinforced,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "seccheckpointoffice";
 	name = "Checkpoint Lockdown";
@@ -5260,6 +5265,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "seccheckpointoffice";
 	name = "Checkpoint Lockdown";
@@ -5290,6 +5296,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "seccheckpointoffice";
 	name = "Checkpoint Lockdown";
@@ -5309,6 +5316,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "seccheckpointoffice";
 	name = "Checkpoint Lockdown";
@@ -5342,6 +5350,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/exit)
 "ka" = (
@@ -5392,8 +5401,8 @@
 	id_tag = "nuke_shuttle_dock_airlock";
 	pixel_x = 0;
 	pixel_y = 30;
-	req_access = list(13);
-	req_one_access = null;
+	req_access = null;
+	req_one_access = list(13);
 	tag_airpump = "nuke_shuttle_dock_pump";
 	tag_chamber_sensor = "nuke_shuttle_dock_sensor";
 	tag_exterior_door = "nuke_shuttle_dock_outer";
@@ -5474,6 +5483,7 @@
 "kj" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "seccheckpoint1";
 	name = "Checkpoint Lockdown";
@@ -5486,6 +5496,7 @@
 "kk" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "seccheckpoint1";
 	name = "Checkpoint Lockdown";
@@ -5570,6 +5581,7 @@
 "kq" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "seccheckpoint3";
 	name = "Checkpoint Lockdown";
@@ -5835,6 +5847,7 @@
 	icon_state = "rwindow";
 	dir = 4
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/port)
 "kM" = (
@@ -6444,6 +6457,7 @@
 "lP" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "seccheckpoint2";
 	name = "Checkpoint Lockdown";
@@ -6456,6 +6470,7 @@
 "lQ" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "seccheckpoint2";
 	name = "Checkpoint Lockdown";
@@ -6539,6 +6554,7 @@
 "lW" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "seccheckpoint4";
 	name = "Checkpoint Lockdown";
@@ -6632,7 +6648,9 @@
 	req_access = list(61)
 	},
 /turf/simulated/floor/tiled,
-/area/turret_protected/tcomfoyer)
+/area/turret_protected/tcomfoyer{
+	name = "Telecoms Foyer"
+	})
 "md" = (
 /obj/structure/sign/electricshock,
 /turf/simulated/wall/r_wall,
@@ -6723,6 +6741,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "seccheckpointoffice";
 	name = "Checkpoint Lockdown";
@@ -8502,7 +8521,7 @@
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
 	icon_state = "door_locked";
-	id_tag = "solar_roof_inner";
+	id_tag = "solar_aft_inner";
 	locked = 1;
 	name = "Engineering External Access";
 	req_access = list(11,13)
@@ -8597,7 +8616,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 1;
 	frequency = 1379;
-	id_tag = "solar_roof_pump"
+	id_tag = "solar_aft_pump"
 	},
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -8682,7 +8701,7 @@
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
 	icon_state = "door_locked";
-	id_tag = "solar_roof_outer";
+	id_tag = "solar_aft_outer";
 	locked = 1;
 	name = "Engineering External Access";
 	req_access = list(11,13)
@@ -10626,13 +10645,6 @@
 /area/crew_quarters/fitness)
 "tW" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "bridge blast";
-	name = "Bridge Blast Doors";
-	opacity = 0
-	},
 /obj/structure/grille,
 /obj/structure/window/reinforced{
 	icon_state = "rwindow";
@@ -10646,6 +10658,14 @@
 	icon_state = "rwindow";
 	dir = 4
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "bridge blast";
+	name = "Bridge Blast Doors";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/bridge/levela)
 "tX" = (
@@ -11423,6 +11443,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "bridge blast";
 	name = "Bridge Blast Doors";
@@ -11440,6 +11461,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "bridge blast";
 	name = "Bridge Blast Doors";
@@ -11461,6 +11483,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "bridge blast";
 	name = "Bridge Blast Doors";
@@ -11732,13 +11755,6 @@
 /turf/simulated/floor/plating,
 /area/bridge/levela)
 "wf" = (
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "bridge blast";
-	name = "Bridge Blast Doors";
-	opacity = 0
-	},
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
 	},
@@ -11750,6 +11766,14 @@
 	name = "Command Docking Exterior Access";
 	req_access = list(13)
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "bridge blast";
+	name = "Bridge Blast Doors";
+	opacity = 0
+	},
 /turf/simulated/floor/plating,
 /area/bridge/levela)
 "wg" = (
@@ -13692,6 +13716,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "bridge blast";
 	name = "Bridge Blast Doors";
@@ -13709,6 +13734,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "bridge blast";
 	name = "Bridge Blast Doors";
@@ -13730,6 +13756,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "bridge blast";
 	name = "Bridge Blast Doors";
@@ -41363,7 +41390,7 @@ aw
 aw
 fw
 gl
-hj
+ex
 aw
 aw
 aw
@@ -41618,9 +41645,9 @@ aa
 aw
 aa
 aa
-fx
+jI
 gm
-fx
+jI
 aw
 aw
 aw
@@ -41875,12 +41902,12 @@ aa
 aa
 aa
 aa
-fx
+jI
 gn
 hk
-hW
-hW
-hW
+fG
+fG
+fG
 jJ
 ke
 jI

maps/aurora/aurora-7_roof.dmm

@@ -1194,6 +1194,7 @@
 	dir = 4
 	},
 /obj/machinery/door/blast/regular{
+	dir = 4;
 	id = "seccheckpointup"
 	},
 /turf/simulated/floor/plating,
@@ -1212,6 +1213,7 @@
 	dir = 8
 	},
 /obj/machinery/door/blast/regular{
+	dir = 4;
 	id = "seccheckpointup"
 	},
 /turf/simulated/floor/plating,
@@ -1230,6 +1232,7 @@
 	dir = 8
 	},
 /obj/machinery/door/blast/regular{
+	dir = 4;
 	id = "seccheckpointup"
 	},
 /turf/simulated/floor/plating,
@@ -1283,6 +1286,7 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
+	dir = 1;
 	id = "seccheckpointup"
 	},
 /turf/simulated/floor/plating,
@@ -1361,6 +1365,7 @@
 /obj/machinery/door/firedoor,
 /obj/structure/window/reinforced,
 /obj/machinery/door/blast/regular{
+	dir = 1;
 	id = "seccheckpointup"
 	},
 /turf/simulated/floor/plating,
@@ -1456,6 +1461,7 @@
 	dir = 1
 	},
 /obj/machinery/door/blast/regular{
+	dir = 1;
 	id = "seccheckpointup"
 	},
 /turf/simulated/floor/plating,
@@ -1490,6 +1496,7 @@
 /obj/structure/window/reinforced,
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
+	dir = 1;
 	id = "seccheckpointup"
 	},
 /turf/simulated/floor/plating,
@@ -1544,6 +1551,7 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
+	dir = 4;
 	id = "seccheckpointup"
 	},
 /turf/simulated/floor/plating,
@@ -1559,6 +1567,7 @@
 	dir = 4
 	},
 /obj/machinery/door/blast/regular{
+	dir = 4;
 	id = "seccheckpointup"
 	},
 /turf/simulated/floor/plating,
@@ -1574,6 +1583,7 @@
 	dir = 8
 	},
 /obj/machinery/door/blast/regular{
+	dir = 4;
 	id = "seccheckpointup"
 	},
 /turf/simulated/floor/plating,
@@ -1589,6 +1599,7 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
+	dir = 4;
 	id = "seccheckpointup"
 	},
 /turf/simulated/floor/plating,