Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

botanical nutrients are now reagents #12901

Closed
wants to merge 3 commits into from
Closed

botanical nutrients are now reagents #12901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4a3914
321
simb11 Feb 28, 2024
d45101c
Update Chemistry-Miscellaneous.dm
simb11 Feb 28, 2024
6ac437d
nazwania
simb11 Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions code/defines/obj/hydro.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1467,41 +1467,3 @@
icon_state = "bottle15"
toxicity = 8
WeedKillStr = 7

// *************************************
// Nutrient defines for hydroponics
// *************************************

/obj/item/nutrient
name = "bottle of nutrient"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
w_class = SIZE_TINY
var/mutmod = 0
var/yieldmod = 0

/obj/item/nutrient/atom_init()
. = ..()
pixel_x = rand(-5.0, 5)
pixel_y = rand(-5.0, 5)

/obj/item/nutrient/ez
name = "bottle of E-Z-Nutrient"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
mutmod = 1
yieldmod = 1

/obj/item/nutrient/l4z
name = "bottle of Left 4 Zed"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle18"
mutmod = 2
yieldmod = 0

/obj/item/nutrient/rh
name = "bottle of Robust Harvest"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle15"
mutmod = 0
yieldmod = 2
260 changes: 153 additions & 107 deletions code/game/machinery/biogenerator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@
dat += "</div>"
dat += "<h3>Nutrients:</h3>"
dat += "<div class='Section'>"
dat += "E-Z-Nutrient: <A href='?src=\ref[src];action=create;item=ez'>Make</A><A href='?src=\ref[src];action=create;item=ez5'>x5</A> ([10/efficiency])<BR>"
dat += "Left 4 Zed: <A href='?src=\ref[src];action=create;item=l4z'>Make</A><A href='?src=\ref[src];action=create;item=l4z5'>x5</A> ([20/efficiency])<BR>"
dat += "Robust Harvest: <A href='?src=\ref[src];action=create;item=rh'>Make</A><A href='?src=\ref[src];action=create;item=rh5'>x5</A> ([25/efficiency])<BR>"
dat += "60 E-Z-Nutrient: <A href='?src=\ref[src];action=create;item=ez'>Make</A>([60/efficiency])<BR>"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
dat += "60 E-Z-Nutrient: <A href='?src=\ref[src];action=create;item=ez'>Make</A>([60/efficiency])<BR>"
dat += "60 E-Z-Nutrient units: <A href='?src=\ref[src];action=create;item=ez'>Make</A>([60/efficiency])<BR>"

мб?

dat += "60 Left 4 Zed: <A href='?src=\ref[src];action=create;item=l4z'>Make</A>([120/efficiency])<BR>"
dat += "60 Robust Harvest: <A href='?src=\ref[src];action=create;item=rh'>Make</A>([150/efficiency])<BR>"
dat += "</div>"
dat += "<h3>Leather:</h3>"
dat += "<div class='Section'>"
Expand Down Expand Up @@ -224,150 +224,196 @@
update_icon()
updateUsrDialog()
sleep(30)
return 0
return FALSE

/obj/machinery/biogenerator/proc/create_product(create)
switch(create)
if("milk")
if (check_cost(20/efficiency)) return 0
else beaker.reagents.add_reagent("milk",10)
if (check_cost(20/efficiency))
return FALSE
else
beaker.reagents.add_reagent("milk",10)
if("cream")
if (check_cost(30/efficiency)) return 0
else beaker.reagents.add_reagent("cream",10)
if (check_cost(30/efficiency))
return FALSE
else
beaker.reagents.add_reagent("cream",10)
if("meat")
if (check_cost(80/efficiency)) return 0
else new/obj/item/weapon/reagent_containers/food/snacks/meat(src.loc)
if (check_cost(80/efficiency))
return FALSE
else
new /obj/item/weapon/reagent_containers/food/snacks/meat(src.loc)
if("monkey")
if(check_cost(250/efficiency)) return 0
else new/obj/item/weapon/reagent_containers/food/snacks/monkeycube(src.loc)
if(check_cost(250/efficiency))
return FALSE
else
new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(src.loc)
if("ez")
if (check_cost(10/efficiency)) return 0
else new/obj/item/nutrient/ez(src.loc)
if (check_cost(60/efficiency))
return FALSE
else
beaker.reagents.add_reagent("ez", 60)
if("l4z")
if (check_cost(20/efficiency)) return 0
else new/obj/item/nutrient/l4z(src.loc)
if("rh")
if (check_cost(25/efficiency)) return 0
else new/obj/item/nutrient/rh(src.loc)
if("ez5") //It's not an elegant method, but it's safe and easy. -Cheridan
if (check_cost(50/efficiency)) return 0
else
new/obj/item/nutrient/ez(src.loc)
new/obj/item/nutrient/ez(src.loc)
new/obj/item/nutrient/ez(src.loc)
new/obj/item/nutrient/ez(src.loc)
new/obj/item/nutrient/ez(src.loc)
if("l4z5")
if (check_cost(100/efficiency)) return 0
else
new/obj/item/nutrient/l4z(src.loc)
new/obj/item/nutrient/l4z(src.loc)
new/obj/item/nutrient/l4z(src.loc)
new/obj/item/nutrient/l4z(src.loc)
new/obj/item/nutrient/l4z(src.loc)
if("rh5")
if (check_cost(125/efficiency)) return 0
else
new/obj/item/nutrient/rh(src.loc)
new/obj/item/nutrient/rh(src.loc)
new/obj/item/nutrient/rh(src.loc)
new/obj/item/nutrient/rh(src.loc)
new/obj/item/nutrient/rh(src.loc)
if (check_cost(120/efficiency))
return FALSE
else
beaker.reagents.add_reagent("left4zed", 60)
if("robust_harvest")
if (check_cost(150/efficiency))
return FALSE
else
beaker.reagents.add_reagent("robust_harvest", 60)
if("meat5")
if (check_cost(400/efficiency)) return 0
if (check_cost(400/efficiency))
return FALSE
else
new/obj/item/weapon/reagent_containers/food/snacks/meat(src.loc)
new/obj/item/weapon/reagent_containers/food/snacks/meat(src.loc)
new/obj/item/weapon/reagent_containers/food/snacks/meat(src.loc)
new/obj/item/weapon/reagent_containers/food/snacks/meat(src.loc)
new/obj/item/weapon/reagent_containers/food/snacks/meat(src.loc)
new /obj/item/weapon/reagent_containers/food/snacks/meat(src.loc)
new /obj/item/weapon/reagent_containers/food/snacks/meat(src.loc)
new /obj/item/weapon/reagent_containers/food/snacks/meat(src.loc)
new /obj/item/weapon/reagent_containers/food/snacks/meat(src.loc)
new /obj/item/weapon/reagent_containers/food/snacks/meat(src.loc)
if("wallet")
if (check_cost(100/efficiency)) return 0
else new/obj/item/weapon/storage/wallet(src.loc)
if (check_cost(100/efficiency))
return FALSE
else
new /obj/item/weapon/storage/wallet(src.loc)
if("bkbag")
if (check_cost(200/efficiency)) return 0
else new/obj/item/weapon/storage/bag/bookbag(src.loc)
if (check_cost(200/efficiency))
return FALSE
else
new /obj/item/weapon/storage/bag/bookbag(src.loc)
if("bibag")
if (check_cost(200/efficiency)) return 0
else new/obj/item/weapon/storage/bag/bio(src.loc)
if (check_cost(200/efficiency)) return FALSE
else new /obj/item/weapon/storage/bag/bio(src.loc)
if("chbag")
if (check_cost(200/efficiency)) return 0
else new/obj/item/weapon/storage/bag/chemistry(src.loc)
if (check_cost(200/efficiency))
return FALSE
else
new /obj/item/weapon/storage/bag/chemistry(src.loc)
if("ptbag")
if (check_cost(200/efficiency)) return 0
else new/obj/item/weapon/storage/bag/plants(src.loc)
if (check_cost(200/efficiency))
return FALSE
else new /obj/item/weapon/storage/bag/plants(src.loc)
if("mnbag")
if (check_cost(200/efficiency)) return 0
else new/obj/item/weapon/storage/bag/ore(src.loc)
if (check_cost(200/efficiency))
return FALSE
else
new /obj/item/weapon/storage/bag/ore(src.loc)
if("gloves")
if (check_cost(250/efficiency)) return 0
else new/obj/item/clothing/gloves/botanic_leather(src.loc)
if (check_cost(250/efficiency))
return FALSE
else
new /obj/item/clothing/gloves/botanic_leather(src.loc)
if("bshoes")
if (check_cost(250/efficiency)) return 0
else new/obj/item/clothing/shoes/brown(src.loc)
if (check_cost(250/efficiency))
return FALSE
else
new /obj/item/clothing/shoes/brown(src.loc)
if("tbelt")
if (check_cost(300/efficiency)) return 0
else new/obj/item/weapon/storage/belt/utility(src.loc)
if (check_cost(300/efficiency))
return FALSE
else
new /obj/item/weapon/storage/belt/utility(src.loc)
if("sbelt")
if (check_cost(300/efficiency)) return 0
else new/obj/item/weapon/storage/belt/security(src.loc)
if (check_cost(300/efficiency))
return FALSE
else
new /obj/item/weapon/storage/belt/security(src.loc)
if("mbelt")
if (check_cost(300/efficiency)) return 0
else new/obj/item/weapon/storage/belt/medical(src.loc)
if (check_cost(300/efficiency))
return FALSE
else
new /obj/item/weapon/storage/belt/medical(src.loc)
if("satchel")
if (check_cost(400/efficiency)) return 0
else new/obj/item/weapon/storage/backpack/satchel(src.loc)
if (check_cost(400/efficiency))
return FALSE
else
new/obj/item/weapon/storage/backpack/satchel(src.loc)
if("cashbag")
if (check_cost(400/efficiency)) return 0
else new/obj/item/weapon/storage/bag/cash(src.loc)
if (check_cost(400/efficiency))
return FALSE
else
new/obj/item/weapon/storage/bag/cash(src.loc)
if("spounch")
if (check_cost(200/efficiency)) return 0
else new/obj/item/weapon/storage/pouch/small_generic(src.loc)
if (check_cost(200/efficiency))
return FALSE
else
new /obj/item/weapon/storage/pouch/small_generic(src.loc)
if("mpounch")
if (check_cost(500/efficiency)) return 0
else new/obj/item/weapon/storage/pouch/medium_generic(src.loc)
if (check_cost(500/efficiency))
return FALSE
else
new /obj/item/weapon/storage/pouch/medium_generic(src.loc)
if("lpounch")
if (check_cost(1000/efficiency)) return 0
else new/obj/item/weapon/storage/pouch/large_generic(src.loc)
if (check_cost(1000/efficiency))
return FALSE
else
new /obj/item/weapon/storage/pouch/large_generic(src.loc)
if("medpouch")
if (check_cost(300/efficiency)) return 0
else new/obj/item/weapon/storage/pouch/medical_supply(src.loc)
if (check_cost(300/efficiency))
return FALSE
else
new /obj/item/weapon/storage/pouch/medical_supply(src.loc)
if("vpounch")
if (check_cost(300/efficiency)) return 0
else new/obj/item/weapon/storage/pouch/flare/vial(src.loc)
if (check_cost(300/efficiency))
return FALSE
else
new /obj/item/weapon/storage/pouch/flare/vial(src.loc)
if("etpounch")
if (check_cost(300/efficiency)) return 0
else new/obj/item/weapon/storage/pouch/engineering_tools(src.loc)
if (check_cost(300/efficiency))
return FALSE
else
new /obj/item/weapon/storage/pouch/engineering_tools(src.loc)
if("espounch")
if (check_cost(300/efficiency)) return 0
else new/obj/item/weapon/storage/pouch/engineering_supply(src.loc)
if (check_cost(300/efficiency))
return FALSE
else
new /obj/item/weapon/storage/pouch/engineering_supply(src.loc)
if("apounch")
if (check_cost(350/efficiency)) return 0
else new/obj/item/weapon/storage/pouch/ammo(src.loc)
if (check_cost(350/efficiency))
return FALSE
else
new /obj/item/weapon/storage/pouch/ammo(src.loc)
if("ppounch")
if (check_cost(350/efficiency)) return 0
else new/obj/item/weapon/storage/pouch/pistol_holster(src.loc)
if (check_cost(350/efficiency))
return FALSE
else
new /obj/item/weapon/storage/pouch/pistol_holster(src.loc)
if("bpounch")
if (check_cost(350/efficiency)) return 0
else new/obj/item/weapon/storage/pouch/baton_holster(src.loc)
if (check_cost(350/efficiency))
return FALSE
else
new /obj/item/weapon/storage/pouch/baton_holster(src.loc)
if("jacket")
if (check_cost(500/efficiency)) return 0
else new/obj/item/clothing/suit/jacket/leather(src.loc)
if (check_cost(500/efficiency))
return FALSE
else
new /obj/item/clothing/suit/jacket/leather(src.loc)
if("overcoat")
if (check_cost(1000/efficiency)) return 0
else new/obj/item/clothing/suit/jacket/leather/overcoat(src.loc)
if (check_cost(1000/efficiency))
return FALSE
else
new /obj/item/clothing/suit/jacket/leather/overcoat(src.loc)
if("rags")
if (check_cost(40/efficiency)) return 0
else new/obj/item/stack/medical/bruise_pack/rags(src.loc, null, null, null, 0)
if (check_cost(40/efficiency))
return FALSE
else
new /obj/item/stack/medical/bruise_pack/rags(src.loc, null, null, null, 0)
if("cloth")
if (check_cost(200/efficiency)) return 0
else new/obj/item/stack/sheet/cloth(src.loc, null, null, null, 0)
if (check_cost(200/efficiency))
return FALSE
else
new /obj/item/stack/sheet/cloth(src.loc, null, null, null, 0)
if("rags5")
if (check_cost(200/efficiency)) return 0
else new/obj/item/stack/medical/bruise_pack/rags(src.loc, 5, null, null, 0)
if (check_cost(200/efficiency))
return FALSE
else
new /obj/item/stack/medical/bruise_pack/rags(src.loc, 5, null, null, 0)
if("cloth5")
if (check_cost(1000/efficiency)) return 0
else new/obj/item/stack/sheet/cloth(src.loc, 5, null, null, 0)
if (check_cost(1000/efficiency))
return FALSE
else
new /obj/item/stack/sheet/cloth(src.loc, 5, null, null, 0)
processing = 0
menustat = "complete"
update_icon()
Expand Down
Loading
Loading