cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #14956

Browse Source
This commit is contained in:
Heroman3003
2023-06-04 05:13:10 +10:00
committed by CHOMPStation2
parent 515d0e49ba
commit 1ccc27a6d3
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
code/game/objects/items/weapons/storage/belt_vr.dm
View File

@@ -153,3 +153,30 @@
/obj/item/weapon/anobattery,
/obj/item/weapon/pickaxe
)
<<<<<<< HEAD
=======
/obj/item/weapon/storage/belt/hydro
name = "hydroponics belt"
desc = "A belt used to hold most hydroponics supplies. Suprisingly, not green."
icon = 'icons/inventory/belt/item_vr.dmi'
icon_override = 'icons/inventory/belt/mob_vr.dmi'
icon_state = "plantbelt"
item_state = "plantbelt"
storage_slots = 5
max_w_class = ITEMSIZE_LARGE
max_storage_space = ITEMSIZE_COST_NORMAL * 5
can_hold = list(
/obj/item/device/analyzer/plant_analyzer,
/obj/item/weapon/reagent_containers/glass/beaker,
/obj/item/weapon/reagent_containers/glass/bottle,
/obj/item/weapon/shovel/spade,
/obj/item/weapon/tool/wirecutters,
/obj/item/weapon/material/minihoe,
/obj/item/weapon/material/knife/machete/hatchet,
/obj/item/weapon/reagent_containers/spray/plantbgone,
/obj/item/weapon/plantspray,
/obj/item/weapon/gun/energy/floragun,
/obj/item/seeds
)
>>>>>>> 78a8ef9563... Merge pull request #14957 from Youtubeboy139/hedge-trimmers

6
code/modules/hydroponics/trays/tray_tools.dm
View File

@@ -3,6 +3,12 @@
/obj/item/weapon/tool/wirecutters/clippers
name = "plant clippers"
desc = "A tool used to take samples from plants."
<<<<<<< HEAD
=======
icon = 'icons/obj/weapons.dmi'
icon_state = "clippers"
random_color = FALSE
>>>>>>> 78a8ef9563... Merge pull request #14957 from Youtubeboy139/hedge-trimmers
/obj/item/weapon/tool/wirecutters/clippers/trimmers
name = "hedgetrimmers"