From f4444f2dad01002e456cf9e9f2a5609ff6cb5275 Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Sat, 15 Apr 2017 20:35:17 -0500
Subject: [PATCH 01/14] Sorta fixes the syntax on the *halt emote

---
 code/modules/mob/living/silicon/robot/emote.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index a75a8f4bcc..84825559b0 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -230,7 +230,7 @@
 
 		if("halt")
 			if (istype(module,/obj/item/weapon/robot_module/robot/security))
-				message = "<B>[src]</B>'s speakers skreech, \"Halt! Security!\"."
+				message = "<B>'s</B> speakers skreech, \"Halt! Security!\"."
 
 				playsound(src.loc, 'sound/voice/halt.ogg', 50, 0)
 				m_type = 2

From 663e2b2d4cca46e1b71f0beaed5fd19d600fbe6d Mon Sep 17 00:00:00 2001
From: PsiOmegaDelta <git@psiomega.se>
Date: Sat, 18 Mar 2017 12:28:30 +0100
Subject: [PATCH 02/14] Can no longer move up/down from non-turf locations.

Port of https://github.com/Baystation12/Baystation12/pull/16653/
---
 code/modules/multiz/movement.dm | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm
index 586b624260..122e1aa4cd 100644
--- a/code/modules/multiz/movement.dm
+++ b/code/modules/multiz/movement.dm
@@ -3,34 +3,38 @@
 	set category = "IC"
 
 	if(zMove(UP))
-		to_chat(usr, "<span class='notice'>You move upwards.</span>")
+		to_chat(src, "<span class='notice'>You move upwards.</span>")
 
 /mob/verb/down()
 	set name = "Move Down"
 	set category = "IC"
 
 	if(zMove(DOWN))
-		to_chat(usr, "<span class='notice'>You move down.</span>")
+		to_chat(src, "<span class='notice'>You move down.</span>")
 
 /mob/proc/zMove(direction)
 	if(eyeobj)
 		return eyeobj.zMove(direction)
 	if(!can_ztravel())
-		to_chat(usr, "<span class='warning'>You lack means of travel in that direction.</span>")
+		to_chat(src, "<span class='warning'>You lack means of travel in that direction.</span>")
 		return
 
+	var/turf/start = loc
+	if(!istype(start))
+		to_chat(src, "<span class='notice'>You are unable to move from here.</span>")
+		return 0
+		
 	var/turf/destination = (direction == UP) ? GetAbove(src) : GetBelow(src)
-
 	if(!destination)
-		to_chat(usr, "<span class='notice'>There is nothing of interest in this direction.</span>")
+		to_chat(src, "<span class='notice'>There is nothing of interest in this direction.</span>")
+		return 0
+	
+	if(!start.CanZPass(src, direction))
+		to_chat(src, "<span class='warning'>\The [start] is in the way.</span>")
 		return 0
 
-	var/turf/start = get_turf(src)
-	if(!start.CanZPass(src, direction))
-		to_chat(usr, "<span class='warning'>\The [start] is in the way.</span>")
-		return 0
 	if(!destination.CanZPass(src, direction))
-		to_chat(usr, "<span class='warning'>\The [destination] blocks your way.</span>")
+		to_chat(src, "<span class='warning'>\The [destination] blocks your way.</span>")
 		return 0
 
 	var/area/area = get_area(src)
@@ -46,12 +50,12 @@
 				to_chat(src, "<span class='warning'>You gave up on pulling yourself up.</span>")
 				return 0
 		else
-			to_chat(usr, "<span class='warning'>Gravity stops you from moving upward.</span>")
+			to_chat(src, "<span class='warning'>Gravity stops you from moving upward.</span>")
 			return 0
 
 	for(var/atom/A in destination)
 		if(!A.CanPass(src, start, 1.5, 0))
-			to_chat(usr, "<span class='warning'>\The [A] blocks you.</span>")
+			to_chat(src, "<span class='warning'>\The [A] blocks you.</span>")
 			return 0
 	Move(destination)
 	return 1
@@ -61,14 +65,14 @@
 	if(destination)
 		forceMove(destination)
 	else
-		to_chat(usr, "<span class='notice'>There is nothing of interest in this direction.</span>")
+		to_chat(src, "<span class='notice'>There is nothing of interest in this direction.</span>")
 
 /mob/observer/eye/zMove(direction)
 	var/turf/destination = (direction == UP) ? GetAbove(src) : GetBelow(src)
 	if(destination)
 		setLoc(destination)
 	else
-		to_chat(usr, "<span class='notice'>There is nothing of interest in this direction.</span>")
+		to_chat(src, "<span class='notice'>There is nothing of interest in this direction.</span>")
 
 /mob/proc/can_ztravel()
 	return 0

From a118aad7b394f3c486646809fac0b37c49108de3 Mon Sep 17 00:00:00 2001
From: Leshana <Leshana@users.noreply.github.com>
Date: Mon, 17 Apr 2017 00:25:46 -0400
Subject: [PATCH 03/14] Fix lung rupture while drowning in water.

* When water returned null from return_air_for_internal_lifeform() the life code treats that as vacuum.  Instead we must return a mixture containing at least some gas.
* It will attempt to use the exhale type for the species, or fall back to carbon_dioxide if it can't find that info.
---
 code/game/turfs/simulated/water.dm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index 77eb419ed1..f25a152869 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -35,7 +35,16 @@
 			water_breath.temperature = above_air.temperature
 			return water_breath
 		else
-			return null // Lying down means they're submerged, which means no air.
+			var/gasid = "carbon_dioxide"
+			if(ishuman(L))
+				var/mob/living/carbon/human/H = L
+				if(H.species && H.species.exhale_type)
+					gasid = H.species.exhale_type
+			var/datum/gas_mixture/water_breath = new()
+			var/datum/gas_mixture/above_air = return_air()
+			water_breath.adjust_gas(gasid, BREATH_MOLES) // They have no oxygen, but non-zero moles and temp
+			water_breath.temperature = above_air.temperature
+			return water_breath
 	return return_air() // Otherwise their head is above the water, so get the air from the atmosphere instead.
 
 /turf/simulated/floor/water/Entered(atom/movable/AM, atom/oldloc)

From 1c000715ddf3c8fb183b2e2d76ff51a32b89bd25 Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Mon, 17 Apr 2017 15:29:08 +0100
Subject: [PATCH 04/14] No longer shall ye burn from water

---
 code/game/turfs/simulated/water.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index 77eb419ed1..ec784cb63d 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -44,7 +44,7 @@
 		L.update_water()
 		if(!istype(oldloc, /turf/simulated/floor/water))
 			to_chat(L, "<span class='warning'>You get drenched in water from entering \the [src]!</span>")
-	AM.water_act(5)
+	AM.water_act(-5)
 	..()
 
 /turf/simulated/floor/water/Exited(atom/movable/AM, atom/newloc)

From 95b9dde94a902b1c1c903956ff06a4ac8ee09831 Mon Sep 17 00:00:00 2001
From: Leshana <Leshana@users.noreply.github.com>
Date: Sun, 16 Apr 2017 21:47:34 -0400
Subject: [PATCH 05/14] Multi-Z code formatting and utilities.

* Global procs should start with /proc
* Use to_chat() macro
* Added utility to find all z-levels are connected (transitively adjacent) and utility to test if two levels are connected.
---
 code/_macros.dm                   |  2 ++
 code/modules/multiz/basic.dm      | 18 ++++++++++++++----
 code/modules/multiz/pipes.dm      |  3 +++
 code/modules/multiz/structures.dm |  4 ----
 code/modules/multiz/turf.dm       |  4 ++--
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/code/_macros.dm b/code/_macros.dm
index 1038b6a2e4..463a7da26d 100644
--- a/code/_macros.dm
+++ b/code/_macros.dm
@@ -42,6 +42,8 @@
 
 #define isxeno(A) istype(A, /mob/living/simple_animal/xeno)
 
+#define isopenspace(A) istype(A, /turf/simulated/open)
+
 #define isweakref(A) istype(A, /weakref)
 
 #define RANDOM_BLOOD_TYPE pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
diff --git a/code/modules/multiz/basic.dm b/code/modules/multiz/basic.dm
index e76c6516aa..24d24b1049 100644
--- a/code/modules/multiz/basic.dm
+++ b/code/modules/multiz/basic.dm
@@ -11,25 +11,35 @@ var/z_levels = 0 // Each bit represents a connection between adjacent levels.  S
 	qdel(src)
 
 // The storage of connections between adjacent levels means some bitwise magic is needed.
-proc/HasAbove(var/z)
+/proc/HasAbove(var/z)
 	if(z >= world.maxz || z > 16 || z < 1)
 		return 0
 	return z_levels & (1 << (z - 1))
 
-proc/HasBelow(var/z)
+/proc/HasBelow(var/z)
 	if(z > world.maxz || z > 17 || z < 2)
 		return 0
 	return z_levels & (1 << (z - 2))
 
 // Thankfully, no bitwise magic is needed here.
-proc/GetAbove(var/atom/atom)
+/proc/GetAbove(var/atom/atom)
 	var/turf/turf = get_turf(atom)
 	if(!turf)
 		return null
 	return HasAbove(turf.z) ? get_step(turf, UP) : null
 
-proc/GetBelow(var/atom/atom)
+/proc/GetBelow(var/atom/atom)
 	var/turf/turf = get_turf(atom)
 	if(!turf)
 		return null
 	return HasBelow(turf.z) ? get_step(turf, DOWN) : null
+
+/proc/GetConnectedZlevels(z)
+	. = list(z)
+	for(var/level = z, HasBelow(level), level--)
+		. |= level-1
+	for(var/level = z, HasAbove(level), level++)
+		. |= level+1
+
+proc/AreConnectedZLevels(var/zA, var/zB)
+	return zA == zB || (zB in GetConnectedZlevels(zA))
diff --git a/code/modules/multiz/pipes.dm b/code/modules/multiz/pipes.dm
index 1cb5b9b4da..6b6b24c470 100644
--- a/code/modules/multiz/pipes.dm
+++ b/code/modules/multiz/pipes.dm
@@ -13,6 +13,9 @@ obj/machinery/atmospherics/pipe/zpipe
 		dir = SOUTH
 		initialize_directions = SOUTH
 
+		// node1 is the connection on the same Z
+		// node2 is the connection on the other Z
+
 		var/minimum_temperature_difference = 300
 		var/thermal_conductivity = 0 //WALL_HEAT_TRANSFER_COEFFICIENT No
 
diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm
index 5727808276..18bb91a9e4 100644
--- a/code/modules/multiz/structures.dm
+++ b/code/modules/multiz/structures.dm
@@ -122,10 +122,6 @@
 	allowed_directions = UP|DOWN
 	icon_state = "ladder11"
 
-
-
-
-
 /obj/structure/stairs
 	name = "Stairs"
 	desc = "Stairs leading to another deck.  Not too useful if the gravity goes out."
diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm
index 8389df7112..caa859f369 100644
--- a/code/modules/multiz/turf.dm
+++ b/code/modules/multiz/turf.dm
@@ -82,7 +82,7 @@
 			return
 		var/obj/item/stack/rods/R = C
 		if (R.use(1))
-			user << "<span class='notice'>Constructing support lattice ...</span>"
+			to_chat(user, "<span class='notice'>Constructing support lattice ...</span>")
 			playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
 			ReplaceWithLattice()
 		return
@@ -99,7 +99,7 @@
 			ChangeTurf(/turf/simulated/floor/airless)
 			return
 		else
-			user << "<span class='warning'>The plating is going to need some support.</span>"
+			to_chat(user, "<span class='warning'>The plating is going to need some support.</span>")
 
 	//To lay cable.
 	if(istype(C, /obj/item/stack/cable_coil))

From cec43bf3d22014bc4abc238c3cca757afeaefc18 Mon Sep 17 00:00:00 2001
From: MagmaRam <drpepper42yes@gmail.com>
Date: Mon, 17 Apr 2017 11:19:39 -0500
Subject: [PATCH 06/14] Updates in-game EVA manual

---
 code/game/objects/items/weapons/manuals.dm | 74 ++++++++++++++++------
 html/changelogs/MagmaRam - evabook.yml     | 36 +++++++++++
 2 files changed, 92 insertions(+), 18 deletions(-)
 create mode 100644 html/changelogs/MagmaRam - evabook.yml

diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index c89f41056f..6ea812ad3a 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -1113,10 +1113,10 @@
 			"}
 
 /obj/item/weapon/book/manual/evaguide
-	name = "EVA Gear and You: Not Spending All Day Inside"
+	name = "EVA Gear and You: Not Spending All Day Inside, 2nd Edition"
 	icon_state = "evabook"
 	author = "Maria Crash, Senior Atmospherics Technician"
-	title = "EVA Gear and You: Not Spending All Day Inside"
+	title = "EVA Gear and You: Not Spending All Day Inside, 2nd Edition"
 	dat = {"<html>
 				<head>
 				<style>
@@ -1130,27 +1130,32 @@
 				</head>
 				<body>
 
-				<h1><a name="Foreword">EVA Gear and You: Not Spending All Day Inside</a></h1>
+				<h1><a name="Foreword">EVA Gear and You: Not Spending All Day Inside, 2nd Edition</a></h1>
 				<I>Or: How not to suffocate because there's a hole in your shoes</I><BR>
 
 				<h2><a name="Contents">Contents</a></h2>
 				<ol>
 					<li><a href="#Foreword">A foreword on using EVA gear</a></li>
-					<li><a href="#Civilian">Donning a Civilian Suit</a></li>
-					<li><a href="#Hardsuit">Putting on a Hardsuit</a></li>
+					<li><a href="#Softsuits">Use of Softsuits</a></li>
+					<li><a href="#Voidsuits">Putting on a Voidsuit</a></li>
+					<li><a href="#Hardsuits">Operation of Hardsuits</a></li>
 					<li><a href="#Equipment">Cyclers and Other Modification Equipment</a></li>
+					<li><a href="#Advice">Miscellaneous Advice</a></li>
 					<li><a href="#Final">Final Checks</a></li>
 				</ol>
 				<br>
 
 				EVA gear. Wonderful to use. It's useful for mining, engineering, and occasionally just surviving, if things are that bad. Most people have EVA training,
-				but apparently there are some on a space station who don't. This guide should give you a basic idea of how to use this gear, safely. It's split into two sections:
-				 Civilian suits and hardsuits.<BR><BR>
+				but apparently there are some on a space station who don't. This guide should give you a basic idea of how to use this gear, safely. It's split into three main sections:
+				softsuits, voidsuits, and hardsuits. General advice and instructions for modification are present as well.<BR><BR>
 
-				<h2><a name="Civilian">Civilian Suits</a></h2>
+				One important point for synthetics and people using full-body prosthetics: You obviously don't need oxygen, but you do run the risk of overheating in vacuum.
+				Rather than oxygen, use a suit cooling unit. Many emergency equipment stores don't hold them, unfortunately, but dedicated EVA stores will. Be aware of your heat tolerances.<BR><BR>
+
+				<h2><a name="Softsuits">Softsuits and Emergency Equipment</a></h2>
 				<I>The bulkiest things this side of Alpha Centauri</I><BR>
-				These suits are the grey ones that are stored in EVA. They're the more simple to get on, but are also a lot bulkier, and provide less protection from environmental hazards such as radiation or physical impact.
-				As Medical, Engineering, Security, and Mining all have hardsuits of their own, these don't see much use, but knowing how to put them on is quite useful anyways.<BR><BR>
+				These suits are the both grey ones that are stored in EVA and orange emergency suits in emergency lockers. They're the more simple to get on, but are also a lot bulkier, and provide less protection from environmental hazards such as radiation or physical impact.
+				As Medical, Engineering, Security, and Mining all have voidsuits of their own, these don't see much use outside of emergencies. In an emergency, knowing how to put one on can save your life.<BR><BR>
 
 				First, take the suit. It should be in three pieces: A top, a bottom, and a helmet. Put the bottom on first, shoes and the like will fit in it. If you have magnetic boots, however,
 				put them on on top of the suit's feet. Next, get the top on, as you would a shirt. It can be somewhat awkward putting these pieces on, due to the makeup of the suit,
@@ -1160,35 +1165,68 @@
 				There is a small slot on the side of the suit where an emergency oxygen tank or extended emergency oxygen tank will fit,
 				but it is recommended to have a full-sized tank on your back for EVA.<BR><BR>
 
+				Important note: When using these, especially in emergencies, be aware of your surroundings! These suits can tear or breach more easily than any other type, especially in an environment with broken glass and metal everywhere.
+				If your suit is breached, you will be in deep trouble. Pressure issues can inhibit breathing even with internals.<BR><BR>
+
 				These suits tend to be wearable by most species. They're large and flexible. They might be pretty uncomfortable for some, though, so keep that in mind.<BR><BR>
 
-				<h2><a name="Hardsuit">Hardsuits</a></h2>
+				<h2><a name="Voidsuits">Voidsuits</a></h2>
 				<I>Heavy, uncomfortable, still the best option.</I><BR>
-				These suits come in Engineering, Mining, and the Armory. There's also a couple Medical Hardsuits in EVA. These provide a lot more protection than the standard suits.<BR><BR>
+				These suits come in many specialized varieties. The most common are engineering, atmospherics, security, medical, and mining varieties.
+				These provide a lot more protection than the standard suits, and depending on the specialization, can offer different protections.
+				For example, security suits have armor plating, engineering suits have radiation protection, and atmospherics suits are rated for extremely high temperatures.<BR><BR>
 
-				Similarly to the other suits, these are split into three parts. Fastening the pant and top are mostly the same as the other spacesuits, with the exception that these are a bit heavier,
+				Similarly to the softsuits, these are split into three parts. Fastening the pant and top are mostly the same as the softsuits, with the exception that these are a bit heavier,
 				though not as bulky. The helmet goes on differently, with the air tube feeding into the suit and out a hole near the left shoulder, while the helmet goes on turned ninety degrees counter-clockwise,
-				and then is screwed in for one and a quarter full rotations clockwise, leaving the faceplate directly in front of you. There is a small button on the right side of the helmet that activates the helmet light.
+				and then is turned to face the front and sealed. There is a small button on the right side of the helmet that activates the helmet light.
 				The tanks that fasten onto the side slot are emergency tanks, as well as full-sized oxygen tanks, leaving your back free for a backpack or satchel.<BR><BR>
 
 				These suits generally only fit one species. NanoTrasen's are usually human-fitting by default, but there's equipment that can make modifications to the hardsuits to fit them to other species.<BR><BR>
 
+				Later-model voidsuits can have magboots and helmets installed into the suit and deployed when needed. Check the operator's manual for individual suits to see how the helmets are installed.
+				If a helmet is installed, you can skip it while putting the suit on, obviously. When deployed, it will deploy from the back of your neck, covering the head and sealing at the front.<BR><BR>
+
+				<h2><a name="Hardsuits">Hardsuits/Rigs</a></h2>
+				<I>The fancy stuff.</I><BR>
+				Proper hardsuits are the most complex sort of EVA equipment available, and blur the line between spacesuits and smaller exosuits. They're sometimes known as 'rigs' or 'powered armor'.
+				These are the suits with the widest variety of uses, owing to the wide variety of equipment that can be installed on them. Like voidsuits, they come in different, specialized varieties, each one offering different protections and different equipment.
+				Equipment that can be installed includes weapons, power tools, mining equipment, medical equipment, AI assistants, and more.<BR><BR>
+
+				Putting these on is relatively simple. They come as compact packs, worn like a backpack and secured with a harness. Activating them, though, is a more complex process. The suit deploys from the module similarly to helmets deploying from voidsuits.
+				After it covers the whole body, the suit can be started. The startup sequence takes some time. The suit will automatically fit itself to your body, sealing each section individually - boots, gloves, pants, torso, and helmet - then connecting them.<BR><BR>
+
+				Operating a hardsuit is a much more complicated proposal than operating other EVA equipment. While putting them on is relatively simple, and operating basic functions like oxygen and magboots is the same as other suits, the rest is far more complex.
+				Consult the operator's manual for invidual pieces of equipment that you plan to use. Use of these for heavy work is only reccomended for people who have specialized training and extensive EVA experience.
+				The potential of a suit breach is always there, and the use of powered equipment raises it significantly.<BR><BR>
+
+				<h2><a name="Advice">Miscellaneous Advice</a></h2>
+				<I>Pro tip: Safety first.</I><BR>
+				There's a lot of general advice that can be helpful for people who haven't taken a long-form instruction course. Much of this is going to be fairly obvious safety advice, but it's never bad to remind yourself of that.<BR><BR>
+
+				<ul>
+					<li>Magboots are important. They can be the difference between keeping your footing and needing a rescue team. A tie-off or a jetpack can substitute if necessary.</li>
+					<li>Be aware of breach hazards, especially in softsuits. Loss of suit pressure can be a fatal disaster.</li>
+					<li>Keep an eye on your internals. Having to make two trips outside is better than running out of air.</li>
+					<li>Similarly, keep an eye on the battery status of cooling units and other equipment.</li>
+					<li>In vacuum, sound doesn't carry. Use a radio or sign language for communication.</li><BR><BR>
+				</ul>
+
 				<h2><a name="Equipment">Modification Equipment</a></h2>
-				<I>How to actually make hardsuits fit you.</I><BR>
+				<I>How to actually make voidsuits fit you.</I><BR>
 				There's a variety of equipment that can modify hardsuits to fit species that can't fit into them, making life quite a bit easier.<BR><BR>
 
 				The first piece of equipment is a suit cycler. This is a large machine resembling the storage pods that are in place in some places. These are machines that will automatically tailor a suit to certain specifications.
-				The largest uses of them are for their cleaning functions and their ability to tailor suits for a species. Do not enter them physically. You will die from any of the functions being activated, and it will be painful.
+				The largest uses of them are for their cleaning functions and their ability to tailor suits for a species. Do not enter them physically. You will die from any of the functions being activated, and it will hurt the whole time you're dying.
 				These machines can both tailor a suit between species, and between types. This means you can convert engineering hardsuits to atmospherics, or the other way. This is useful. Use it if you can.<BR><BR>
 
-				There's also modification kits that let you modify suits yourself. These are extremely difficult to use unless you understand the actual construction of the suit. I do not reccomend using them unless no other option is available.
+				There's also modification kits that let you modify suits yourself. These are extremely difficult to use unless you understand the actual construction of the suit. I do not reccomend using them unless no other option is available.<BR><BR>
 
 				<h2><a name="Final">Final Checks</a></h2>
 				<ul>
 					<li>Are all seals fastened correctly?</li>
 					<li>If you have modified it manually, is absolutely everything sealed perfectly?</li>
 					<li>Do you either have shoes on under the suit, or magnetic boots on over it?</li>
-					<li>Do you have a mask on and internals on the suit or your back?</li>
+					<li>Do you have internals connected and activated?</li>
 					<li>Do you have a way to communicate with the station in case something goes wrong?</li>
 					<li>Do you have a second person watching if this is a training session?</li><BR>
 				</ul>
diff --git a/html/changelogs/MagmaRam - evabook.yml b/html/changelogs/MagmaRam - evabook.yml
new file mode 100644
index 0000000000..f94057e6a4
--- /dev/null
+++ b/html/changelogs/MagmaRam - evabook.yml	
@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: MagmaRam
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Updated in-game EVA manual."

From 40ea024cc514f5f26e19db5bb648c18dd8fc43d6 Mon Sep 17 00:00:00 2001
From: MagmaRam <drpepper42yes@gmail.com>
Date: Mon, 17 Apr 2017 11:45:28 -0500
Subject: [PATCH 07/14] Adds some instructions on How to update the changelogs
 It's mostly nicked from /tg/'s wiki page, but has some other stuff, too.

---
 .../MagmaRam - changelog_instructions.yml     | 36 +++++++++++++++++++
 .../How to update the changelogs.txt          | 15 ++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 html/changelogs/MagmaRam - changelog_instructions.yml
 create mode 100644 tools/GenerateChangelog/How to update the changelogs.txt

diff --git a/html/changelogs/MagmaRam - changelog_instructions.yml b/html/changelogs/MagmaRam - changelog_instructions.yml
new file mode 100644
index 0000000000..82235bc8f6
--- /dev/null
+++ b/html/changelogs/MagmaRam - changelog_instructions.yml	
@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: MagmaRam
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Added instructions on how to use the changelog updating scripts."
diff --git a/tools/GenerateChangelog/How to update the changelogs.txt b/tools/GenerateChangelog/How to update the changelogs.txt
new file mode 100644
index 0000000000..51cd9919c4
--- /dev/null
+++ b/tools/GenerateChangelog/How to update the changelogs.txt	
@@ -0,0 +1,15 @@
+Taken mostly from https://tgstation13.org/wiki/Guide_to_Changelogs#Updating_the_Changelog with a few changes.
+
+First, install Python 2.7. Yes, it's outdated, but that's what the script is made to work with.
+Make sure that Python 2.7 and its Scripts/ folder is in PATH
+Upgrade pip, as outlined here https://pip.pypa.io/en/stable/installing/
+Once pip is installed, you will need to run two commands from your terminal or command prompt to install packages
+1. 'pip install PyYaml'
+2. 'pip install beautifulsoup4'
+
+Once all this is done, you should just be able to run ss13_genchangelog.py and sit back.
+
+If you get errors running it, two things are possible.
+1. You installed something wrong.
+2. Someone formatted their changelog wrong.
+Check where the error was, do a bit of troubleshooting, see if it wasn't #2. Fixing the syntax in the yaml files is pretty simple.
\ No newline at end of file

From b5dbe8492c6ea5c3c06543d70039a98598e778a7 Mon Sep 17 00:00:00 2001
From: Leshana <Leshana@users.noreply.github.com>
Date: Sun, 16 Apr 2017 21:51:12 -0400
Subject: [PATCH 08/14] Fix crash in turbolifts built on any z-level other than
 "1"

Port of https://github.com/Baystation12/Baystation12/pull/16941
* Turbolift auto-mapping code assumed that all lift's first floor would be on z=1.  Fixed so it picks the first floor instead of the zth floor from the floor list.
---
 code/modules/turbolift/turbolift_map.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/turbolift/turbolift_map.dm b/code/modules/turbolift/turbolift_map.dm
index 2e2498f88d..8930bf34d6 100644
--- a/code/modules/turbolift/turbolift_map.dm
+++ b/code/modules/turbolift/turbolift_map.dm
@@ -221,7 +221,7 @@
 	var/turf/T = locate(int_panel_x, int_panel_y, uz)
 	lift.control_panel_interior = new(T, lift)
 	lift.control_panel_interior.set_dir(udir)
-	lift.current_floor = lift.floors[uz]
+	lift.current_floor = lift.floors[1]
 
 	lift.open_doors()
 

From ff3c5238aaa6c4139037cfdd9f62b1f366f3238a Mon Sep 17 00:00:00 2001
From: Leshana <Leshana@users.noreply.github.com>
Date: Thu, 13 Apr 2017 22:09:46 -0400
Subject: [PATCH 09/14] De-snowflake thrown objects hitting turfs.

* Port of https://github.com/Baystation12/Baystation12/pull/16942
* Actually tell turfs when a thrown object hits them, and let them decide what to do about it!
  * We do this by calling hitby(), which is how it already works for obj and mob, so this makes behavior consistent.
* This allows us to cleanly solve the problem of a thrown object landing on open space without falling.
---
 code/game/atoms_movable.dm  | 7 +------
 code/game/turfs/turf.dm     | 8 ++++++++
 code/modules/multiz/turf.dm | 5 +++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index b511c9befd..fe9f99b032 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -115,12 +115,7 @@
 	else if(isturf(hit_atom))
 		src.throwing = 0
 		var/turf/T = hit_atom
-		if(T.density)
-			spawn(2)
-				step(src, turn(src.last_move, 180))
-			if(istype(src,/mob/living))
-				var/mob/living/M = src
-				M.turf_collision(T, speed)
+		T.hitby(src,speed)
 
 //decided whether a movable atom being thrown can pass through the turf it is in.
 /atom/movable/proc/hit_check(var/speed)
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index c13b4606d3..028223ef26 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -243,3 +243,11 @@ var/const/enterloopsanity = 100
 /turf/proc/update_blood_overlays()
 	return
 
+// Called when turf is hit by a thrown object
+/turf/hitby(atom/movable/AM as mob|obj, var/speed)
+	if(src.density)
+		spawn(2)
+			step(AM, turn(AM.last_move, 180))
+		if(isliving(AM))
+			var/mob/living/M = AM
+			M.turf_collision(src, speed)
diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm
index caa859f369..b6845d076f 100644
--- a/code/modules/multiz/turf.dm
+++ b/code/modules/multiz/turf.dm
@@ -36,6 +36,11 @@
 	..()
 	mover.fall()
 
+// Called when thrown object lands on this turf.
+/turf/simulated/open/hitby(var/atom/movable/AM, var/speed)
+	. = ..()
+	AM.fall()
+
 /turf/simulated/open/proc/update()
 	below = GetBelow(src)
 	turf_changed_event.register(below, src, /turf/simulated/open/update_icon)

From 2f5dd77903ca9de169ec96645a7f0199f94db5ab Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Mon, 17 Apr 2017 18:20:47 +0100
Subject: [PATCH 10/14] Changelog

---
 html/changelogs/Yoshax-HumanTorch.yml | 36 +++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 html/changelogs/Yoshax-HumanTorch.yml

diff --git a/html/changelogs/Yoshax-HumanTorch.yml b/html/changelogs/Yoshax-HumanTorch.yml
new file mode 100644
index 0000000000..5ecdc4dd9a
--- /dev/null
+++ b/html/changelogs/Yoshax-HumanTorch.yml
@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Yoshax
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Water such as the pool will no longer apply fire stacks when you enter, meaning you will no longer be flammable from swimming."

From b6fb86cd95029480131c6c80de7fd71f7e32ead4 Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Mon, 17 Apr 2017 18:43:31 +0100
Subject: [PATCH 11/14] Does what ze captain wants

---
 code/game/turfs/simulated/water.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index ec784cb63d..0b9d3e6b74 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -44,7 +44,7 @@
 		L.update_water()
 		if(!istype(oldloc, /turf/simulated/floor/water))
 			to_chat(L, "<span class='warning'>You get drenched in water from entering \the [src]!</span>")
-	AM.water_act(-5)
+	AM.water_act(5)
 	..()
 
 /turf/simulated/floor/water/Exited(atom/movable/AM, atom/newloc)
@@ -94,7 +94,7 @@
 	return
 
 /mob/living/water_act(amount)
-	adjust_fire_stacks(amount * 5)
+	adjust_fire_stacks(-amount * 5)
 	for(var/atom/movable/AM in contents)
 		AM.water_act(amount)
 

From 843a59ca07137cd7c9b68bd5b0f4f0f9904b583e Mon Sep 17 00:00:00 2001
From: Cerebulon <tanhindmarsh@yahoo.com>
Date: Mon, 17 Apr 2017 19:31:01 +0100
Subject: [PATCH 12/14] Fixes improperly formatted tech_origins for hatchet,
 scythe, reinforced glass, mechanical trap, kitchen utensils and kitchen
 knife.

---
 code/game/objects/items/weapons/material/kitchen.dm | 2 +-
 code/game/objects/items/weapons/material/knives.dm  | 2 +-
 code/game/objects/items/weapons/material/misc.dm    | 4 ++--
 code/game/objects/items/weapons/traps.dm            | 2 +-
 code/modules/materials/materials.dm                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm
index b13b5e6ac2..87b635ce50 100644
--- a/code/game/objects/items/weapons/material/kitchen.dm
+++ b/code/game/objects/items/weapons/material/kitchen.dm
@@ -7,7 +7,7 @@
 /obj/item/weapon/material/kitchen/utensil
 	w_class = ITEMSIZE_TINY
 	thrown_force_divisor = 1
-	origin_tech = "materials=1"
+	origin_tech = list(TECH_MATERIAL = 1)
 	attack_verb = list("attacked", "stabbed", "poked")
 	sharp = 1
 	edge = 1
diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm
index 593b1d9237..9545504f84 100644
--- a/code/game/objects/items/weapons/material/knives.dm
+++ b/code/game/objects/items/weapons/material/knives.dm
@@ -64,7 +64,7 @@
 	edge = 1
 	force_divisor = 0.15 // 9 when wielded with hardness 60 (steel)
 	matter = list(DEFAULT_WALL_MATERIAL = 12000)
-	origin_tech = "materials=1"
+	origin_tech = list(TECH_MATERIAL = 1)
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
 /obj/item/weapon/material/knife/suicide_act(mob/user)
diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm
index 5edd1c77b5..2d85bc0a66 100644
--- a/code/game/objects/items/weapons/material/misc.dm
+++ b/code/game/objects/items/weapons/material/misc.dm
@@ -29,7 +29,7 @@
 	w_class = ITEMSIZE_SMALL
 	sharp = 1
 	edge = 1
-	origin_tech = "materials=2;combat=1"
+	origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1)
 	attack_verb = list("chopped", "torn", "cut")
 	applies_material_colour = 0
 
@@ -99,5 +99,5 @@
 	throw_range = 3
 	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
-	origin_tech = "materials=2;combat=2"
+	origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 2)
 	attack_verb = list("chopped", "sliced", "cut", "reaped")
diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm
index cd11af3400..e6abdcb366 100644
--- a/code/game/objects/items/weapons/traps.dm
+++ b/code/game/objects/items/weapons/traps.dm
@@ -8,7 +8,7 @@
 	desc = "A mechanically activated leg trap. Low-tech, but reliable. Looks like it could really hurt if you set it off."
 	throwforce = 0
 	w_class = ITEMSIZE_NORMAL
-	origin_tech = "materials=1"
+	origin_tech = list(TECH_MATERIAL = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 18750)
 	var/deployed = 0
 
diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm
index 4610b4e00f..66dde62a17 100644
--- a/code/modules/materials/materials.dm
+++ b/code/modules/materials/materials.dm
@@ -483,7 +483,7 @@ var/list/name_to_material
 	tableslam_noise = 'sound/effects/Glasshit.ogg'
 	hardness = 40
 	weight = 30
-	stack_origin_tech = "materials=2"
+	stack_origin_tech = list(TECH_MATERIAL = 2)
 	composite_material = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT / 2, "glass" = SHEET_MATERIAL_AMOUNT)
 	window_options = list("One Direction" = 1, "Full Window" = 4, "Windoor" = 2)
 	created_window = /obj/structure/window/reinforced

From e5e5c446a630e78b38692837ebf1333b5b24419e Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Mon, 17 Apr 2017 21:01:42 -0700
Subject: [PATCH 13/14] Fixes a runtime with borgs and translators

---
 code/game/objects/items/devices/translator.dm | 3 +++
 html/changelogs/Atermonera - Translators.yml  | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/devices/translator.dm b/code/game/objects/items/devices/translator.dm
index 90fb43724e..5de1ba1396 100644
--- a/code/game/objects/items/devices/translator.dm
+++ b/code/game/objects/items/devices/translator.dm
@@ -47,6 +47,9 @@
 
 	var/mob/living/L = loc
 
+	if(!language)
+		return //Borgs were causing runtimes when passing language=null
+
 	if (language && (language.flags & NONVERBAL))
 		return //Not gonna translate sign language
 
diff --git a/html/changelogs/Atermonera - Translators.yml b/html/changelogs/Atermonera - Translators.yml
index 278506535c..f330795d80 100644
--- a/html/changelogs/Atermonera - Translators.yml	
+++ b/html/changelogs/Atermonera - Translators.yml	
@@ -33,5 +33,4 @@ delete-after: True
 # Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
 # Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
 changes: 
-  - rscadd: "Common simple animals now have their own language, and as such are no longer understandable by humans."
-  - bugfix: "Translators can't understand the same languages that recorders can't, including the new animal languages."
+  - bugfix: "Translators no longer try to translate null languages."

From f6ee49c2a6f1a0d2382be37cf708fc6718fdceb8 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Mon, 17 Apr 2017 21:10:07 -0700
Subject: [PATCH 14/14] This is what I get for not renaming the changelog file

---
 ...Atermonera - Translators.yml => Atermonera - Translators2.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename html/changelogs/{Atermonera - Translators.yml => Atermonera - Translators2.yml} (100%)

diff --git a/html/changelogs/Atermonera - Translators.yml b/html/changelogs/Atermonera - Translators2.yml
similarity index 100%
rename from html/changelogs/Atermonera - Translators.yml
rename to html/changelogs/Atermonera - Translators2.yml