From 0e3a60e10cae3c25b572f12a0fb2fc1243376f65 Mon Sep 17 00:00:00 2001 From: Neerti Date: Tue, 30 Oct 2018 18:39:50 -0400 Subject: [PATCH] Merge pull request #5662 from lbnesquik/Kates-Botany-Tweak Biogenerator improvements. --- code/game/machinery/biogenerator.dm | 37 +++++++++++---- .../objects/items/weapons/storage/bags.dm | 4 ++ .../Lbnesquik - Botany improvements #5662.yml | 44 ++++++++++++++++++ sound/machines/biogenerator_end.ogg | Bin 0 -> 8388 bytes 4 files changed, 76 insertions(+), 9 deletions(-) create mode 100644 html/changelogs/Lbnesquik - Botany improvements #5662.yml create mode 100644 sound/machines/biogenerator_end.ogg 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 0000000000000000000000000000000000000000..91ec8313fec753fb44f3a880366882c052f0e158 GIT binary patch literal 8388 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 g{HDRDV