From 73c094bc86c08f144e00b8b4eaf4030f55f2ce5e Mon Sep 17 00:00:00 2001
From: OneOneThreeEight <oneonethreeeight@outlook.com>
Date: Tue, 11 Dec 2018 06:11:43 -0500
Subject: [PATCH] Fixes an issue with firing pin boxes being filled incorrectly
 + fix to farmbots (#5747)

Fixes #5748
---
 .../objects/items/weapons/storage/boxes.dm    |  2 +-
 code/modules/mob/living/bot/farmbot.dm        |  2 +-
 html/changelogs/yikesschev.yml                | 38 +++++++++++++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/yikesschev.yml

diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index c8e08cc3f3b..d9e6fc9b05e 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -389,7 +389,7 @@
 	name = "box of assorted firing pins"
 	desc = "A box of varied assortment of firing pins. Appears to have R&D stickers on all sides of the box. Also seems to have a smiley face sticker on the top of it."
 
-/obj/item/weapon/storage/box/firingpins/fill()
+/obj/item/weapon/storage/box/firingpinsRD/fill()
 	..()
 	new /obj/item/device/firing_pin(src)
 	new /obj/item/device/firing_pin(src)
diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm
index 3bd466e23e3..d8c9d0f2d9b 100644
--- a/code/modules/mob/living/bot/farmbot.dm
+++ b/code/modules/mob/living/bot/farmbot.dm
@@ -300,7 +300,7 @@
 // Assembly
 
 /mob/living/bot/farmbot/proc/check_tank()
-	return ((!target && refills_water && tank && tank.reagents.total_volume < tank.reagents.maximum_volume) || ((tank.reagents.maximum_volume - tank.reagents.total_volume ) / reagents.maximum_volume) <= 0.3)
+	return ((!target && refills_water && tank && tank.reagents.total_volume < tank.reagents.maximum_volume) || ((tank.reagents.total_volume ) / reagents.maximum_volume) <= 0.3)
 
 /obj/item/weapon/farmbot_arm_assembly
 	name = "water tank/robot arm assembly"
diff --git a/html/changelogs/yikesschev.yml b/html/changelogs/yikesschev.yml
new file mode 100644
index 00000000000..12a7456973f
--- /dev/null
+++ b/html/changelogs/yikesschev.yml
@@ -0,0 +1,38 @@
+################################
+# 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
+#################################
+
+# Your name.  
+author: Scheveningen
+
+# 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: "Fixes an issue with pins not spawning in the RD's firing pin box."
+  - bugfix: "Adds in a fix PoZe made to the formula for farmbot behavior. You could say it was made by PoZepular request."