cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge examine refactor for vorestation

Browse Source
This commit is contained in:
Aronai Sieyes
2020-04-29 17:49:54 -04:00
parent 6ebd249748
commit 874baa1d2d
34 changed files with 179 additions and 932 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/trays/tray.dm
+1 -5
View File
@@ -1,11 +1,7 @@
/obj/machinery/portable_atmospherics/hydroponics
name = "hydroponics tray"
<<<<<<< HEAD
icon = 'icons/obj/hydroponics_machines_vr.dmi' //VOREStation Edit
=======
desc = "A tray usually full of fluid for growing plants."
icon = 'icons/obj/hydroponics_machines.dmi'
>>>>>>> 6c6644f... Rewrite examine() to pass a list around (#7038)
icon = 'icons/obj/hydroponics_machines_vr.dmi' //VOREStation Edit
icon_state = "hydrotray3"
density = 1
anchored = 1