Merge branch 'master' of https://github.com/Ghostkokos/RuTGMC-Reborn

PMC-Unga-Marines · Sep 12, 2024 · 9885485 · 9885485
2 parents 5ce55e2 + f50000a
commit 9885485
Show file tree

Hide file tree

Showing 146 changed files with 1,525 additions and 2,526 deletions.
diff --git a/_maps/map_files/Arachne/TGS_Arachne.dmm b/_maps/map_files/Arachne/TGS_Arachne.dmm
@@ -17319,7 +17319,7 @@
 /turf/open/floor/plating,
 /area/mainship/hallways/starboard_hallway)
 "ooG" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /turf/open/floor/plating,
 /area/mainship/hull/port_hull)
 "ooP" = (
@@ -21067,7 +21067,7 @@
 /turf/open/floor/mainship/sterile/dark,
 /area/mainship/medical/medical_science)
 "rtW" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /obj/item/seeds/goldappleseed,
 /turf/open/floor/wood,
 /area/mainship/command/corporateliaison)

diff --git a/_maps/map_files/BigRed_v2/BigRed_v2.dmm b/_maps/map_files/BigRed_v2/BigRed_v2.dmm
@@ -100,7 +100,7 @@
 /turf/open/floor/plating/ground/mars/random/cave,
 /area/bigredv2/caves/north)
 "acb" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /obj/machinery/power/apc/drained{
 	dir = 8
 	},
@@ -1336,16 +1336,16 @@
 	},
 /area/bigredv2/caves/lambda_lab)
 "alV" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /obj/item/grown/log,
 /turf/open/floor/tile/green/whitegreenfull,
 /area/bigredv2/caves/lambda_lab)
 "alW" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /turf/open/floor/tile/green/whitegreenfull,
 /area/bigredv2/caves/lambda_lab)
 "alY" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /obj/machinery/light{
 	dir = 4
 	},
@@ -1475,7 +1475,7 @@
 /turf/open/floor/tile/green/whitegreenfull,
 /area/bigredv2/caves/lambda_lab)
 "amU" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /turf/open/floor/tile/green/whitegreen{
 	dir = 4
 	},
@@ -1856,7 +1856,7 @@
 /turf/open/floor/tile/green/whitegreencorner,
 /area/bigredv2/caves/lambda_lab)
 "apB" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /turf/open/floor/tile/green/whitegreen{
 	dir = 6
 	},
@@ -1952,7 +1952,7 @@
 /turf/open/floor/tile/green/whitegreen,
 /area/bigredv2/caves/lambda_lab)
 "aqn" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /turf/open/floor/tile/green/whitegreen,
 /area/bigredv2/caves/lambda_lab)
 "aqo" = (
@@ -3074,7 +3074,7 @@
 /turf/open/floor/plating,
 /area/bigredv2/outside/hydroponics)
 "aCf" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /turf/open/floor/tile/green/whitegreenfull,
 /area/bigredv2/outside/hydroponics)
 "aCh" = (
@@ -7949,7 +7949,7 @@
 /area/bigredv2/outside/nw)
 "cqL" = (
 /obj/structure/window/reinforced,
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /turf/open/floor/tile/white,
 /area/bigredv2/outside/marshal_office)
 "cqT" = (
@@ -10667,7 +10667,7 @@
 /turf/open/floor/freezer,
 /area/bigredv2/outside/nanotrasen_lab/inside/garbledradio)
 "iCO" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/tile/green/whitegreenfull,
 /area/bigredv2/outside/hydroponics)
@@ -14232,7 +14232,7 @@
 /area/bigredv2/outside/nw)
 "qFS" = (
 /obj/structure/window/reinforced,
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /obj/effect/landmark/weed_node,
 /turf/open/floor/tile/white,
 /area/bigredv2/outside/marshal_office)
@@ -14600,7 +14600,7 @@
 /turf/open/floor/marking/asteroidwarning,
 /area/bigredv2/outside/e)
 "rrt" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /obj/effect/landmark/weed_node,
 /turf/open/floor/tile/green/whitegreen{
 	dir = 1
@@ -14887,7 +14887,7 @@
 	},
 /area/bigredv2/outside/space_port/two)
 "rVJ" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/tile/green/whitegreenfull,
@@ -15085,7 +15085,7 @@
 /turf/open/floor/asteroidfloor,
 /area/bigredv2/outside/nw)
 "sya" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /turf/open/floor/tile/green/whitegreen{
 	dir = 1
 	},

diff --git a/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm b/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm
@@ -1280,7 +1280,7 @@
 	},
 /area/campaign/jungle_outpost/outpost/living)
 "fy" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /turf/open/floor/tile/hydro,
 /area/campaign/jungle_outpost/outpost/living/hydro)
 "fz" = (
@@ -4223,7 +4223,7 @@
 /turf/open/floor/iron/smooth,
 /area/campaign/jungle_outpost/ground/jungle/south)
 "sc" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /obj/machinery/light{
 	dir = 8
 	},
@@ -5790,7 +5790,7 @@
 /turf/open/floor/freezer,
 /area/campaign/jungle_outpost/outpost/command/captain)
 "yP" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /obj/machinery/light{
 	dir = 1
 	},
@@ -8201,7 +8201,7 @@
 	},
 /area/campaign/jungle_outpost/ground/jungle)
 "Jp" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /obj/machinery/light,
 /turf/open/floor/tile/hydro,
 /area/campaign/jungle_outpost/outpost/living/hydro)
@@ -8785,7 +8785,7 @@
 /turf/open/floor/plating/ground/dirtgrassborder/autosmooth,
 /area/campaign/jungle_outpost/ground/jungle/north_west)
 "LV" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /obj/machinery/light{
 	dir = 4
 	},

diff --git a/_maps/map_files/Campaign maps/nt_base/nt_base.dmm b/_maps/map_files/Campaign maps/nt_base/nt_base.dmm
@@ -9859,7 +9859,7 @@
 	},
 /area/gelida/outdoors/colony_streets/north_east_street)
 "hmw" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /obj/machinery/light{
 	dir = 1;
 	pixel_x = 16
@@ -17797,7 +17797,7 @@
 /turf/open/floor/plating/ground/desertdam/asphalt/cement,
 /area/gelida/outdoors/colony_streets/north_east_street)
 "ner" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /turf/open/floor/plating/platebotc,
 /area/gelida/indoors/b_block/bridge)
 "neF" = (
@@ -24162,7 +24162,7 @@
 /turf/open/floor/mainship/stripesquare,
 /area/gelida/indoors/a_block/fitness)
 "rCP" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /obj/structure/window{
 	dir = 4
 	},
@@ -27193,7 +27193,7 @@
 /turf/open/floor/prison/whitegreenfull2,
 /area/gelida/indoors/b_block/hydro)
 "tPp" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /turf/open/floor/plating/platebotc,
 /area/gelida/indoors/b_block/hydro)
 "tPt" = (
@@ -28144,7 +28144,7 @@
 /turf/open/floor/mainship/stripesquare,
 /area/gelida/indoors/a_block/medical)
 "uDG" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /turf/open/floor/prison/cleanmarked,
 /area/gelida/landing_zone_2)
 "uDM" = (
@@ -29713,7 +29713,7 @@
 /turf/open/floor/plating,
 /area/gelida/landing_zone_1)
 "vIT" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /obj/structure/window{
 	dir = 8
 	},

diff --git a/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
@@ -19410,7 +19410,7 @@
 	},
 /area/ice_colony/underground/crew/chapel)
 "euQ" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /turf/open/ground/grass,
 /area/ice_colony/surface/hydroponics/south)
 "euV" = (
@@ -31136,7 +31136,7 @@
 /turf/open/floor/tile/dark2,
 /area/ice_colony/underground/hallway/south_east)
 "uJB" = (
-/obj/machinery/hydroponics,
+/obj/prop/hydroponics,
 /turf/open/ground/grass,
 /area/ice_colony/surface/hydroponics/north)
 "uJL" = (