From 10391e5f3b18719a541a6cd1ecc0e312083754fc Mon Sep 17 00:00:00 2001
From: Hubblenaut <aschnelle@web.de>
Date: Mon, 15 Aug 2016 15:32:28 +0200
Subject: [PATCH] Bottles will now sell for their set prices.

---
 .../reagent_containers/food/drinks/bottle.dm  |  1 +
 html/changelogs/Hubblenaut - bottles.yml      | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 html/changelogs/Hubblenaut - bottles.yml

diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
index 3114f12f558..a8a8bca6d3b 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -12,6 +12,7 @@
 
 	var/obj/item/weapon/reagent_containers/glass/rag/rag = null
 	var/rag_underlay = "rag"
+	on_reagent_change() return // To suppress price updating. Bottles have their own price tags.
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/New()
 	..()
diff --git a/html/changelogs/Hubblenaut - bottles.yml b/html/changelogs/Hubblenaut - bottles.yml
new file mode 100644
index 00000000000..b12e6cde371
--- /dev/null
+++ b/html/changelogs/Hubblenaut - bottles.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: Hubblenaut
+
+# 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: "Bottles will now actually sell for their set prices."
\ No newline at end of file