From 45b4947d1efba6e97f7b4776be6ddc01127b02c7 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Wed, 25 Dec 2019 15:08:43 -0800
Subject: [PATCH] Merge pull request #6584 from
 TheFurryFeline/TFF-Print_Da_Sprayers

Printable Spray Bottles
---
 code/datums/autolathe/general.dm              |  5 +++
 .../reagents/reagent_containers/spray.dm      |  2 ++
 .../TheFurryFeline - Print_Da_Sprayers.yml    | 36 +++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 html/changelogs/TheFurryFeline - Print_Da_Sprayers.yml

diff --git a/code/datums/autolathe/general.dm b/code/datums/autolathe/general.dm
index 2f4436bf55..40bbbdc23f 100644
--- a/code/datums/autolathe/general.dm
+++ b/code/datums/autolathe/general.dm
@@ -94,6 +94,11 @@
 	is_stack = TRUE
 	no_scale = TRUE //prevents material duplication exploits
 
+//TFF 24/12/19 - Let people print more spray bottles if needed.
+/datum/category_item/autolathe/general/spraybottle
+	name = "spray bottle"
+	path = /obj/item/weapon/reagent_containers/spray
+
 /datum/category_item/autolathe/general/knife
 	name = "kitchen knife"
 	path =/obj/item/weapon/material/knife
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index cdc6983b35..e0926f47b3 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -5,6 +5,8 @@
 	icon_state = "cleaner"
 	item_state = "cleaner"
 	flags = OPENCONTAINER|NOBLUDGEON
+	//TFF 24/12/19 - Let people print more spray bottles if needed.
+	matter = list("glass" = 300, DEFAULT_WALL_MATERIAL = 300)
 	slot_flags = SLOT_BELT
 	throwforce = 3
 	w_class = ITEMSIZE_SMALL
diff --git a/html/changelogs/TheFurryFeline - Print_Da_Sprayers.yml b/html/changelogs/TheFurryFeline - Print_Da_Sprayers.yml
new file mode 100644
index 0000000000..338cf0d9e4
--- /dev/null
+++ b/html/changelogs/TheFurryFeline - Print_Da_Sprayers.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: TheFurryFeline
+
+# 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: "Allows printing of a spray bottle in the Autolathe."
\ No newline at end of file