diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm
index cd8320b571..d886a0faf1 100644
--- a/code/game/machinery/biogenerator.dm
+++ b/code/game/machinery/biogenerator.dm
@@ -1,6 +1,6 @@
/obj/machinery/biogenerator
name = "biogenerator"
- desc = ""
+ desc = "Converts plants into biomass, which can be used for fertilizer and sort-of-synthetic products."
icon = 'icons/obj/biogenerator.dmi'
icon_state = "biogen-stand"
density = 1
@@ -50,7 +50,7 @@
return
if(istype(O, /obj/item/weapon/reagent_containers/glass))
if(beaker)
- to_chat(user, "]The [src] is already loaded.")
+ to_chat(user, "\The [src] is already loaded.")
else
user.remove_from_mob(O)
O.loc = src
@@ -104,23 +104,25 @@
if(beaker)
dat += "Activate Biogenerator!
"
dat += "Detach Container
"
- dat += "Food
"
- dat += "10 milk ([round(20/build_eff)])
"
- dat += "Slab of meat ([round(50/build_eff)])
"
- dat += "Nutrient
"
+ dat += "Food:
"
+ dat += "10 milk ([round(20/build_eff)]) | x5
"
+ dat += "10 cream ([round(20/build_eff)]) | x5
"
+ dat += "Slab of meat ([round(50/build_eff)]) | x5
"
+ dat += "Nutrient:
"
dat += "E-Z-Nutrient ([round(60/build_eff)]) | x5
"
dat += "Left 4 Zed ([round(120/build_eff)]) | x5
"
dat += "Robust Harvest ([round(150/build_eff)]) | x5
"
- dat += "Leather
"
+ dat += "Leather:
"
dat += "Wallet ([round(100/build_eff)])
"
dat += "Botanical gloves ([round(250/build_eff)])
"
+ dat += "Plant bag ([round(250/build_eff)])
"
+ dat += "Large plant bag ([round(250/build_eff)])
"
dat += "Utility belt ([round(300/build_eff)])
"
dat += "Leather Satchel ([round(400/build_eff)])
"
dat += "Cash Bag ([round(400/build_eff)])
"
dat += "Chemistry Bag ([round(400/build_eff)])
"
dat += "Workboots ([round(400/build_eff)])
"
dat += "Leather Shoes ([round(400/build_eff)])
"
-
dat += "Leather Chaps ([round(400/build_eff)])
"
dat += "Leather Coat ([round(500/build_eff)])
"
dat += "Leather Jacket ([round(500/build_eff)])
"
@@ -165,10 +167,11 @@
processing = 1
update_icon()
updateUsrDialog()
- playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
+ playsound(src.loc, 'sound/machines/blender.ogg', 40, 1)
use_power(S * 30)
sleep((S + 15) / eat_eff)
processing = 0
+ playsound(src.loc, 'sound/machines/biogenerator_end.ogg', 40, 1)
update_icon()
else
menustat = "void"
@@ -187,8 +190,20 @@
switch(item)
if("milk")
beaker.reagents.add_reagent("milk", 10)
+ if("milk5")
+ beaker.reagents.add_reagent("milk", 50)
+ if("cream")
+ beaker.reagents.add_reagent("cream", 10)
+ if("cream5")
+ beaker.reagents.add_reagent("cream", 50)
if("meat")
new/obj/item/weapon/reagent_containers/food/snacks/meat(loc)
+ if("meat5")
+ new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) //This is ugly.
+ new/obj/item/weapon/reagent_containers/food/snacks/meat(loc)
+ new/obj/item/weapon/reagent_containers/food/snacks/meat(loc)
+ new/obj/item/weapon/reagent_containers/food/snacks/meat(loc)
+ new/obj/item/weapon/reagent_containers/food/snacks/meat(loc)
if("ez")
new/obj/item/weapon/reagent_containers/glass/bottle/eznutrient(loc)
if("l4z")
@@ -217,6 +232,10 @@
new/obj/item/weapon/storage/wallet(loc)
if("gloves")
new/obj/item/clothing/gloves/botanic_leather(loc)
+ if("plantbag")
+ new/obj/item/weapon/storage/bag/plants(loc)
+ if("plantbaglarge")
+ new/obj/item/weapon/storage/bag/plants/large(loc)
if("tbelt")
new/obj/item/weapon/storage/belt/utility(loc)
if("satchel")
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index 2c4fa65abf..9d1365290c 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -170,6 +170,10 @@
w_class = ITEMSIZE_SMALL
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/weapon/grown)
+/obj/item/weapon/storage/bag/plants/large
+ name = "large plant bag"
+ w_class = ITEMSIZE_SMALL
+ max_storage_space = ITEMSIZE_COST_NORMAL * 45
// -----------------------------
// Sheet Snatcher
diff --git a/html/changelogs/Lbnesquik - Botany improvements #5662.yml b/html/changelogs/Lbnesquik - Botany improvements #5662.yml
new file mode 100644
index 0000000000..980a849850
--- /dev/null
+++ b/html/changelogs/Lbnesquik - Botany improvements #5662.yml
@@ -0,0 +1,44 @@
+################################
+# 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: Lbnesquik
+
+# 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: "General biogenerator improvements:"
+ - rscadd: "Added feedback noise to the processing."
+ - rscadd: "Allow for cream dispensing."
+ - rscadd: "Allow for plant bag creation."
+ - rscadd: "Allow for 5 units of meat to be dispensed at once."
+ - rscadd: "Allow for 5 units of liquids to be dispensed at once totalling 50u."
+ - rscadd: "Add and allow the creation of larger plant bags for easier ferrying of plants.."
+ - rscadd: "Add a description to the machine itself."
+ - bugfix: "Fix a typo."
diff --git a/sound/machines/biogenerator_end.ogg b/sound/machines/biogenerator_end.ogg
new file mode 100644
index 0000000000..91ec8313fe
Binary files /dev/null and b/sound/machines/biogenerator_end.ogg differ