From 34de84e5ec4f344b6c0ca4b40ddc02be10de1b49 Mon Sep 17 00:00:00 2001
From: MarinaGryphon <ryfoxx93@gmail.com>
Date: Fri, 17 Jan 2020 00:57:18 -0600
Subject: [PATCH] Nitroglycerin Explosion Fix (#8028)

---
 .../Chemistry-Reagents-Other.dm               |  4 ++
 html/changelogs/MDP-nitrofix.yml              | 41 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 html/changelogs/MDP-nitrofix.yml

diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
index 029a09dc249..70c1b36c227 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
@@ -413,6 +413,7 @@
 	reagent_state = LIQUID
 	color = "#808080"
 	taste_description = "oil"
+	var/temp_set = FALSE
 
 /datum/reagent/nitroglycerin/proc/explode()
 	var/datum/effect/effect/system/reagents_explosion/e = new()
@@ -427,6 +428,9 @@
 
 /datum/reagent/nitroglycerin/add_thermal_energy(var/added_energy)
 	. = ..()
+	if(!temp_set) // so initial temperature-setting doesn't make stuff explode
+		temp_set = TRUE
+		return
 	if(abs(added_energy) > (specific_heat * 5 / volume)) // can explode via cold or heat shock
 		explode()
 
diff --git a/html/changelogs/MDP-nitrofix.yml b/html/changelogs/MDP-nitrofix.yml
new file mode 100644
index 00000000000..1d292c53394
--- /dev/null
+++ b/html/changelogs/MDP-nitrofix.yml
@@ -0,0 +1,41 @@
+################################
+# 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
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: MoondancerPony
+
+# 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: "Nitroglycerin should no longer instantly explode. Oops."