From d41519dcb868dc6747b68cdc6d2f20ebffac9099 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Fri, 2 Jun 2023 10:33:01 +1000
Subject: [PATCH 1/2] Items for the Plant People (not the literal plant people)
---
.../objects/items/weapons/storage/belt_vr.dm | 26 +++++++++++++++++
.../closets/secure/hydroponics.dm | 4 ++-
code/modules/hydroponics/trays/tray_tools.dm | 2 ++
icons/inventory/belt/item_vr.dmi | Bin 814 -> 1968 bytes
icons/inventory/belt/mob_vr.dmi | Bin 2685 -> 3019 bytes
icons/obj/hydroponics_machines_vr.dmi | Bin 12826 -> 10990 bytes
icons/obj/items.dmi | Bin 72762 -> 72657 bytes
icons/obj/weapons.dmi | Bin 50520 -> 51263 bytes
maps/groundbase/gb-z2.dmm | 15 ++++++----
maps/stellar_delight/stellar_delight2.dmm | 8 ++----
maps/tether/tether-03-surface3.dmm | 27 +++++++++++++++---
11 files changed, 67 insertions(+), 15 deletions(-)
diff --git a/code/game/objects/items/weapons/storage/belt_vr.dm b/code/game/objects/items/weapons/storage/belt_vr.dm
index 58285af552..d968f0d17e 100644
--- a/code/game/objects/items/weapons/storage/belt_vr.dm
+++ b/code/game/objects/items/weapons/storage/belt_vr.dm
@@ -153,3 +153,29 @@
/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_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
+ )
+>>>>>>> 935b5c939c... Merge pull request #14931 from Youtubeboy139/hydro_changes
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
index af7092d9d6..5eec312418 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
@@ -10,13 +10,15 @@
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/radio/headset/headset_service,
/obj/item/clothing/head/greenbandana,
+ /obj/item/weapon/shovel/spade,
/obj/item/weapon/material/minihoe,
/obj/item/weapon/material/knife/machete/hatchet,
/obj/item/weapon/reagent_containers/glass/beaker = 2,
/obj/item/weapon/tool/wirecutters/clippers/trimmers,
/obj/item/weapon/reagent_containers/spray/plantbgone,
/obj/item/clothing/suit/storage/hooded/wintercoat/hydro,
- /obj/item/clothing/shoes/boots/winter/hydro)
+ /obj/item/clothing/shoes/boots/winter/hydro,
+ /obj/item/weapon/storage/belt/hydro)
/obj/structure/closet/secure_closet/hydroponics/Initialize()
if(prob(50))
diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm
index cf8fd8d581..6d6693aca5 100644
--- a/code/modules/hydroponics/trays/tray_tools.dm
+++ b/code/modules/hydroponics/trays/tray_tools.dm
@@ -3,6 +3,8 @@
/obj/item/weapon/tool/wirecutters/clippers
name = "plant clippers"
desc = "A tool used to take samples from plants."
+ icon = 'icons/obj/weapons.dmi'
+ icon_state = "clippers"
/obj/item/weapon/tool/wirecutters/clippers/trimmers
name = "hedgetrimmers"
diff --git a/icons/inventory/belt/item_vr.dmi b/icons/inventory/belt/item_vr.dmi
index b11bbec306a45e59d46794c4ae4611ac1876c660..679a4779fec9cf24b5c6c155ffd88117ccec40db 100644
GIT binary patch
literal 1968
zcmZ`)c{J3E7ylwdwu~)9p-IRKQ66Py#LQ%0Vkpa)GS4
_0Qhx<~?g~sMkn}
zRMts9a|kn;nyej%qKjTsgIFVKk-P-F=EOZ+$JL%z~0kqPo1#jb8_Y#h`h#Fzf9YWqZ4hXD0}czD2Lp9j98
z>`@gg^Dyj*U_67Tb;_+qbdYg}Er#QL4~S>{&`_5-c;i(8Sc?FSOiRUI)ALkMI@L>6
zhZ~Y3G?OqA#*uT*-hNCDhjgj5nYiuya%v_xgp-m++ZR@2E+gzps;Y*LDvggD4Hxt?
z>Y8MBQi11MkQAZ20Nm-~MY(T2U)HvzGhmh3pTXiGzyl_Lx)k_5%tfx$=6I9`1M#i!
z+5>r5V!I3JqQ)?bl^$e(ZH_QRPJ|mlAKDL}tDb6jLszt=+AzpdX;HwC>!|Ff8F05}
z_uG;xZQrb1ophx=sdW4p_;R>>5QcW-)|Nnjf4?z~zdbdjOlbZ^s8S|sQF*%$YwIE{
zdVnw7wQYNpi(F1^b8~*#SYp9ICW?{yZg`A9*>u3&I$)mz8$jk9cx>0*TW)f;m#S?g
zXIqJttg31sYd8SUS-msE8|fgHDU)MNr2x@;*6A0@`8IE7CFV$}vuLSv`lIVDY*A1$
zUs#kdWq1pF@f{UA^brz#vgj;SVRX5xoR(pte>HW?wxeAsFV1`r?}tL9KBI446C4RqG;-1yr~fquA-qrh*NR94YtQLoA$tHH1iaR&dj22g;0A
zpM}1@0BKMJNQXh?b!_^Nn8mvLY3k<0SEoX(A*ZVKrrPg`8^)=-Xu)cDhYw0ifIfVP
zG0nu$g&v4MkH{gFwuKGB?(I+%
zCoGqi(-tD)knCAKf(>&=lSGF&96h;C0rYloXm7x;Y>UFlScQfHddvykxt|EOInn30
zWurji7s1o1;%$n$0QxOJyj9vt@RFobsZYjd&-}kD`gKzB?1Njy^QE!g`00Nkt5+v6
zw@dE#>~AKQ>-F6y)eAl`VY4lny7>HDLcrqs@wl%&>jgcZS`;Y}9kEUubN@J!5)iXw
zr7PYVSj?4LRLaU-UG~J+_sp+7@_A(0yBlvxas(BNA{Ha@UE?lZ6-r>@fKl}M4GAqR
zw5DK)K*Hyl>=vZS+sgM+UX!f6*ZP*rllJUz&NNbKeoyESENXk8TiZ
z0HdYBf4+@m1s(^zdyf{^U<_8Z8Urj&{=#=B+OsQ-I?5PY*s@?H#|e!Pdw?1uU)xeJ
zE|T)y+dsA$6{^!BhR~UITv}ie*4r(f5IVTmJyk^-i_BQr$j;X_ht^vkBbNw5`x-!Q
zg5sX<$rdq`S2uSrdOTee6#b&uKj6+mfE((S9gO(1nC(+Hw$w4TESQ?`lrBnDZsR;EgxGBg`qcq40D4isgP-p!Io4Zmt(
z6P+RXM8blxTm*r+X;WK#hS=<+rg1+ZfJp4;rg1(hLJ9?d;CWM1$72y!hwAsZmAILk
zzsI9LBC|qF;((y|o&5pc;PP6{fcL4W+bN#2p)Qx@{o3&Do{6Pjs+Z$@xLXvU`{tax
zdTRVppJ5(&57x$cT1%Jl^1}+h`puZ1q#_<-t4b(J5mbV
zJKIfdmUzC3u1G&Vi;r${awC^LG&3K1o{&62a|>k7C#(w@?*HD9m#v1-=Z7E9vsScK
ttm<09K5MG8^$Lj=Sy%t(NBjq@>8ZPujCV1+TKpFbz-=92udV%){tX4MtvUbz
literal 814
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