diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 0f13d3db284..3fb54f76571 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -100,6 +100,9 @@ ..() new /obj/item/device/flashlight/seclite(src) +/obj/item/weapon/storage/belt/security/empty/New() + ..() + /obj/item/weapon/storage/belt/soulstone name = "soul stone belt" desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away" diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 511c5807572..721d2fb9929 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -135,15 +135,19 @@ dat += "ActivateDetach Container" dat += "

Food:

" dat += "
" - dat += "10 milk: Make ([20/efficiency])
" - dat += "10 cream: Make ([30/efficiency])
" - dat += "Monkey cube: Make ([250/efficiency])" + dat += "10 milk: Makex5 ([20/efficiency])
" + dat += "10 cream: Makex5 ([30/efficiency])
" + dat += "Milk Carton: Makex5 ([100/efficiency])
" + dat += "Cream Carton: Makex5 ([150/efficiency])
" + dat += "Monkey cube: Makex5 ([250/efficiency])" dat += "
" - dat += "

Nutrients:

" + dat += "

Botany Chemicles:

" dat += "
" dat += "E-Z-Nutrient: Makex5 ([10/efficiency])
" dat += "Left 4 Zed: Makex5 ([20/efficiency])
" dat += "Robust Harvest: Makex5 ([25/efficiency])
" + dat += "Weed Killer: Makex5 ([25/efficiency])
" + dat += "Pest Killer: Makex5 ([25/efficiency])
" dat += "
" dat += "

Leather:

" dat += "
" @@ -153,6 +157,10 @@ dat += "Mining satchel: Make ([200/efficiency])
" dat += "Botanical gloves: Make ([250/efficiency])
" dat += "Utility belt: Make ([300/efficiency])
" + dat += "Security belt: Make ([300/efficiency])
" + dat += "Medical belt: Make ([300/efficiency])
" + dat += "Janitorial belt: Make ([300/efficiency])
" + dat += "Bandolier belt: Make ([300/efficiency])
" dat += "Leather Satchel: Make ([400/efficiency])
" dat += "Leather Jacket: Make ([500/efficiency])
" dat += "
" @@ -221,6 +229,12 @@ if(check_container_volume(10)) return 0 else if (check_cost(30/efficiency)) return 0 else beaker.reagents.add_reagent("cream",10) + if("cmilk") + if (check_cost(100/efficiency)) return 0 + else new/obj/item/weapon/reagent_containers/food/drinks/milk(src.loc) + if("ccream") + if (check_cost(150/efficiency)) return 0 + else new/obj/item/weapon/reagent_containers/food/drinks/bottle/cream(src.loc) if("meat") if (check_cost(250/efficiency)) return 0 else new/obj/item/weapon/reagent_containers/food/snacks/monkeycube(src.loc) @@ -233,6 +247,12 @@ if("rh") if (check_cost(25/efficiency)) return 0 else new/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh(src.loc) + if("wk") + if (check_cost(50/efficiency)) return 0 + else new/obj/item/weapon/reagent_containers/glass/bottle/weedkiller(src.loc) + if("pk") + if (check_cost(50/efficiency)) return 0 + else new/obj/item/weapon/reagent_containers/glass/bottle/pestkiller(src.loc) if("wallet") if (check_cost(100/efficiency)) return 0 else new/obj/item/weapon/storage/wallet(src.loc) @@ -251,6 +271,18 @@ if("tbelt") if (check_cost(300/efficiency)) return 0 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/empty(src.loc) + if("mbelt") + if (check_cost(300/efficiency)) return 0 + else new/obj/item/weapon/storage/belt/medical(src.loc) + if("jbelt") + if (check_cost(300/efficiency)) return 0 + else new/obj/item/weapon/storage/belt/janitor(src.loc) + if("bbelt") + if (check_cost(300/efficiency)) return 0 + else new/obj/item/weapon/storage/belt/bandolier(src.loc) if("satchel") if (check_cost(400/efficiency)) return 0 else new/obj/item/weapon/storage/backpack/satchel(src.loc) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index ad113e110ba..98e669c7399 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -17,7 +17,7 @@ /obj/item/weapon/reagent_containers/spray/weedspray // -- Skie desc = "It's a toxic mixture, in spray form, to kill small weeds." icon = 'icons/obj/hydroponics.dmi' - name = "weed-spray" + name = "weed spray" icon_state = "weedspray" item_state = "spray" volume = 100 @@ -39,7 +39,7 @@ /obj/item/weapon/reagent_containers/spray/pestspray // -- Skie desc = "It's some pest eliminator spray! Do not inhale!" icon = 'icons/obj/hydroponics.dmi' - name = "pest-spray" + name = "pest spray" icon_state = "pestspray" item_state = "spray" volume = 100 @@ -118,3 +118,21 @@ /obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh/New() ..() reagents.add_reagent("robustharvestnutriment", 50) + +/obj/item/weapon/reagent_containers/glass/bottle/weedkiller + name = "bottle of weed killer" + icon = 'icons/obj/chemical.dmi' + icon_state = "bottle19" + +/obj/item/weapon/reagent_containers/glass/bottle/weedkiller/New() + ..() + reagents.add_reagent("weedkiller", 50) + +/obj/item/weapon/reagent_containers/glass/bottle/pestkiller + name = "bottle of pest spray" + icon = 'icons/obj/chemical.dmi' + icon_state = "bottle20" + +/obj/item/weapon/reagent_containers/glass/bottle/pestkiller/New() + ..() + reagents.add_reagent("pestkiller", 50)