diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index c7f0d27b6b2..ef4b599c47e 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -162,13 +162,21 @@ dat += "Plant bag: Make ([200/efficiency])
" dat += "Mining satchel: Make ([200/efficiency])
" dat += "Botanical gloves: Make ([250/efficiency])
" - dat += "Utility belt: Make ([300/efficiency])
" dat += "Leather Satchel: Make ([400/efficiency])
" dat += "Cash Bag: Make ([400/efficiency])
" dat += "Leather Jacket: Make ([500/efficiency])
" + dat += "" + dat += "

Belts

" + dat += "
" + dat += "Utility belt: Make ([300/efficiency])
" + dat += "Botanist belt: Make ([300/efficiency])
" + dat += "Security belt: Make ([300/efficiency])
" + dat += "Medical belt: Make ([300/efficiency])
" + dat += "Janitor belt: Make ([300/efficiency])
" + dat += "Bandolier: Make ([300/efficiency])
" + dat += "
" //dat += "

Other:

" //dat += "Monkey: Make ([400/efficiency])
" - dat += "" else dat += "
No container inside. Please insert a container.
" @@ -229,6 +237,7 @@ /obj/machinery/biogenerator/proc/create_product(var/create) switch(create) + //Food if("milk") if(check_container_volume(10)) return 0 else if (check_cost(20/efficiency)) return 0 @@ -240,6 +249,7 @@ if("meat") if (check_cost(250/efficiency)) return 0 else new/obj/item/weapon/reagent_containers/food/snacks/monkeycube(src.loc) + //Nutrients if("ez") if (check_cost(10/efficiency, 1)) return 0 if(in_beaker) @@ -264,6 +274,7 @@ else new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(src.loc) if (check_cost(25/efficiency)) return 0 + //Leather if("wallet") if (check_cost(100/efficiency)) return 0 else new/obj/item/weapon/storage/wallet(src.loc) @@ -279,9 +290,6 @@ if("gloves") if (check_cost(250/efficiency)) return 0 else new/obj/item/clothing/gloves/botanic_leather(src.loc) - if("tbelt") - if (check_cost(300/efficiency)) return 0 - else new/obj/item/weapon/storage/belt/utility(src.loc) if("satchel") if (check_cost(400/efficiency)) return 0 else new/obj/item/weapon/storage/backpack/satchel(src.loc) @@ -291,6 +299,25 @@ if("jacket") if (check_cost(500/efficiency)) return 0 else new/obj/item/clothing/suit/jacket/leather(src.loc) + //Belts + if("tbelt") + if (check_cost(300/efficiency)) return 0 + else new/obj/item/weapon/storage/belt/utility(src.loc) + if("bbelt") + if (check_cost(300/efficiency)) return 0 + else new/obj/item/weapon/storage/belt/botany(src.loc) + if("sbelt") + if (check_cost(300/efficiency)) return 0 + 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("jbelt") + if (check_cost(300/efficiency)) return 0 + else new/obj/item/weapon/storage/belt/janitor(src.loc) + if("band") + if (check_cost(300/efficiency)) return 0 + else new/obj/item/weapon/storage/belt/bandolier(src.loc) //if("monkey") // if (check_cost(500)) return 0 // else new/mob/living/carbon/monkey(src.loc) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 06b6dccaaea..b28f1ea4144 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -101,6 +101,31 @@ "/obj/item/device/sensor_device" ) +/obj/item/weapon/storage/belt/botany + name = "botanist belt" + desc = "Can hold various botanical supplies." + icon_state = "botanybelt" + item_state = "botany" + can_hold = list( + "/obj/item/device/analyzer/plant_analyzer", + "/obj/item/weapon/minihoe", + "/obj/item/weapon/hatchet", + "/obj/item/weapon/reagent_containers/glass/fertilizer", + "/obj/item/weapon/reagent_containers/glass/bottle", + "/obj/item/weapon/plantspray", + "/obj/item/weapon/reagent_containers/syringe", + "/obj/item/weapon/reagent_containers/glass/beaker", + "/obj/item/weapon/lighter/zippo", + "/obj/item/weapon/storage/fancy/cigarettes", + "obj/item/weapon/rollingpaperpack", + "/obj/item/weapon/shovel/spade", + "/obj/item/device/flashlight/pen", + "/obj/item/seeds", + "/obj/item/weapon/wirecutters", + "/obj/item/weapon/wrench", + "/obj/item/weapon/disk/botany", + ) + /obj/item/weapon/storage/belt/security name = "security belt" @@ -127,13 +152,12 @@ "/obj/item/weapon/melee/telebaton" ) -/obj/item/weapon/storage/belt/security/New() +/obj/item/weapon/storage/belt/security/sec/New() ..() new /obj/item/device/flashlight/seclite(src) /obj/item/weapon/storage/belt/security/response_team/New() ..() - contents.Cut() new /obj/item/weapon/kitchenknife/combat(src) new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/device/flash(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index a9aa70ae1fd..58cf919b1e7 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -115,7 +115,7 @@ new /obj/item/clothing/mask/gas/sechailer/swat(src) new /obj/item/weapon/shield/riot/tele(src) new /obj/item/weapon/melee/baton/loaded(src) - new /obj/item/weapon/storage/belt/security(src) + new /obj/item/weapon/storage/belt/security/sec(src) new /obj/item/taperoll/police(src) new /obj/item/weapon/gun/energy/hos(src) return @@ -155,7 +155,7 @@ new /obj/item/weapon/reagent_containers/spray/pepper(src) new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/weapon/gun/energy/advtaser(src) - new /obj/item/weapon/storage/belt/security(src) + new /obj/item/weapon/storage/belt/security/sec(src) new /obj/item/weapon/storage/box/holobadge(src) return @@ -184,7 +184,7 @@ new /obj/item/weapon/reagent_containers/spray/pepper(src) new /obj/item/device/flash(src) new /obj/item/weapon/grenade/flashbang(src) - new /obj/item/weapon/storage/belt/security(src) + new /obj/item/weapon/storage/belt/security/sec(src) new /obj/item/clothing/mask/gas/sechailer(src) new /obj/item/clothing/glasses/sunglasses/sechud(src) new /obj/item/weapon/melee/baton/loaded(src) @@ -237,7 +237,7 @@ new /obj/item/weapon/storage/briefcase(src) new /obj/item/weapon/storage/firstaid/adv(src) new /obj/item/weapon/gun/projectile/revolver/detective(src) - new /obj/item/weapon/storage/belt/security(src) + new /obj/item/weapon/storage/belt/security/sec(src) new /obj/item/weapon/grenade/flashbang(src) new /obj/item/device/flash(src) new /obj/item/weapon/restraints/handcuffs(src) diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index f989cb1ab34..d1c3df77409 100644 Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 1dbc7fc6642..35c02e194dd 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ