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

Merge branch 'master' into upstream-merge-14957

Browse Source
This commit is contained in:
Nadyr
2023-06-09 22:27:00 -04:00
committed by GitHub
parent 1ccc27a6d3 87a6616138
commit c036c32091
91 changed files with 30785 additions and 4474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,12 +3,9 @@
/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"