From c781e1c7ff6333a7c92d2518f02a5dfb34baf866 Mon Sep 17 00:00:00 2001
From: Xxxxyobdab <xxxxyobdab@yahoo.com>
Date: Fri, 4 Feb 2022 06:22:01 -0500
Subject: [PATCH] biogen/bush (#13029)

---
 code/game/machinery/biogenerator.dm   |  5 ++++
 code/game/objects/structures/flora.dm |  6 +++-
 html/changelogs/Markings.yml          |  3 --
 html/changelogs/PaperWorkLogos.yml    |  3 --
 html/changelogs/xxxxyobdab.yml        | 42 +++++++++++++++++++++++++++
 5 files changed, 52 insertions(+), 7 deletions(-)
 delete mode 100644 html/changelogs/Markings.yml
 delete mode 100644 html/changelogs/PaperWorkLogos.yml
 create mode 100644 html/changelogs/xxxxyobdab.yml

diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm
index feb38371d7d..ed815884250 100644
--- a/code/game/machinery/biogenerator.dm
+++ b/code/game/machinery/biogenerator.dm
@@ -133,6 +133,11 @@
 	name = "Hydroponic Belt"
 	object = /obj/item/storage/belt/hydro
 
+/decl/biorecipe/item/plantbag
+	name = "Plant Bag"
+	object = /obj/item/storage/bag/plants
+	cost = 500
+
 /decl/biorecipe/item/wallet
 	name = "Leather Wallet"
 	object = /obj/item/storage/wallet
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 24c8c63a1f9..7e1e20614e8 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -246,7 +246,7 @@
 	icon_state = "firstbush_[rand(1, 4)]"
 
 /obj/structure/flora/ausbushes/attackby(var/obj/item/W as obj, var/mob/user as mob)
-	if(istype(W,/obj/item/material/scythe/sickle))
+	if(istype(W,/obj/item/material/scythe))
 		if(prob(50))
 			new /obj/item/stack/material/wood(get_turf(src), 2)
 		if(prob(40))
@@ -259,6 +259,10 @@
 		to_chat(usr, "<span class='notice'>You slice at the bush!</span>")
 		qdel(src)
 		playsound(src.loc, 'sound/effects/woodcutting.ogg', 50, 1)
+	if(istype(W,/obj/item/material/hatchet))//no items
+		to_chat(usr, SPAN_NOTICE("You chop at the bush!"))
+		qdel(src)
+		playsound(src.loc, 'sound/effects/woodcutting.ogg', 50, 1)
 
 /obj/structure/flora/ausbushes/reedbush
 	icon_state = "reedbush_1"
diff --git a/html/changelogs/Markings.yml b/html/changelogs/Markings.yml
deleted file mode 100644
index 59bb46f4acf..00000000000
--- a/html/changelogs/Markings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-Delete-after: true
-author: listerla
-changes: []
diff --git a/html/changelogs/PaperWorkLogos.yml b/html/changelogs/PaperWorkLogos.yml
deleted file mode 100644
index d6e645d1dd0..00000000000
--- a/html/changelogs/PaperWorkLogos.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-Delete-after: true
-author: TheGreyWolf
-changes: []
diff --git a/html/changelogs/xxxxyobdab.yml b/html/changelogs/xxxxyobdab.yml
new file mode 100644
index 00000000000..29441c52b98
--- /dev/null
+++ b/html/changelogs/xxxxyobdab.yml
@@ -0,0 +1,42 @@
+################################
+# 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: xxxxyobdab
+
+# 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: "All hatchet and scythe type tools can destroy bushes."
+  - rscadd: "Biogenerators can make plant bags for 500 points."