From 7c758dfbb157c22969e08c2d0421ed4b08577ee9 Mon Sep 17 00:00:00 2001
From: HarpyEagle <mwerezak@gmail.com>
Date: Fri, 9 Oct 2015 11:21:12 -0400
Subject: [PATCH] Updates changelog, fixes comment

---
 .../objects/effects/spawners/bombspawner.dm   |  2 +-
 html/changelogs/HarpyEagle-ttv.yml            | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/HarpyEagle-ttv.yml

diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm
index 05d1a41bf2..fb4716043f 100644
--- a/code/game/objects/effects/spawners/bombspawner.dm
+++ b/code/game/objects/effects/spawners/bombspawner.dm
@@ -132,7 +132,7 @@
 	
 	var/assembly_type = /obj/item/device/assembly/signaler
 	
-	//Note that the maximum amount of gas you can put in a 70L air tank at 1013.25 kPa is 16.44 mol.
+	//Note that the maximum amount of gas you can put in a 70L air tank at 1013.25 kPa and 519K is 16.44 mol.
 	var/phoron_amt = 10.96
 	var/oxygen_amt = 16.44
 	var/carbon_amt = 0.0
diff --git a/html/changelogs/HarpyEagle-ttv.yml b/html/changelogs/HarpyEagle-ttv.yml
new file mode 100644
index 0000000000..67d426e234
--- /dev/null
+++ b/html/changelogs/HarpyEagle-ttv.yml
@@ -0,0 +1,21 @@
+################################
+# 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
+#################################
+
+author: HarpyEagle
+delete-after: True
+changes: 
+  - bugfix: "Fixed a couple of bugs causing phoron gas fires to burn cooler and slower than they were supposed to."
+  - bugfix: "Merc bombs are now appropriately explosive again. Same goes for bombs made by toxins."