Fixes an issue with firing pin boxes being filled incorrectly + fix to farmbots (#5747)

Fixes #5748
This commit is contained in:
OneOneThreeEight
2018-12-11 06:11:43 -05:00
committed by Erki
parent 9683d045fc
commit 73c094bc86
3 changed files with 40 additions and 2 deletions
@@ -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)
+1 -1
View File
@@ -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"
+38
View File
@@ -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."