From 979b754f2f88b6255c4dbdeadce4391a8e76aaa1 Mon Sep 17 00:00:00 2001 From: aleksix Date: Wed, 9 Oct 2019 13:58:10 +0300 Subject: [PATCH] Farmbot UI now shows pest eradication status (#7134) --- code/modules/mob/living/bot/farmbot.dm | 2 +- html/changelogs/aleksix-farmbot_ui_fix.yml | 41 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/aleksix-farmbot_ui_fix.yml diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 2004acd59b2..f0e264b04f4 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -63,7 +63,7 @@ dat += "Refill watertank : [refills_water ? "Yes" : "No"]
" dat += "
Preventive measures:
" dat += "Weed plants: [uproots_weeds ? "Yes" : "No"]
" - dat += "Eradicate pests: [removes_dead ? "Yes" : "No"]
" + dat += "Eradicate pests: [eliminates_pests ? "Yes" : "No"]
" dat += "
Nutriment controls:
" dat += "Replace fertilizer: [replaces_nutriment ? "Yes" : "No"]
" dat += "
Plant controls:
" diff --git a/html/changelogs/aleksix-farmbot_ui_fix.yml b/html/changelogs/aleksix-farmbot_ui_fix.yml new file mode 100644 index 00000000000..575402aace8 --- /dev/null +++ b/html/changelogs/aleksix-farmbot_ui_fix.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: aleksix + +# 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: "Farmbot UI now properly shows pest eradication status"