From 5859b28dbe243692285ce3c8cc2c2d0751c80c78 Mon Sep 17 00:00:00 2001
From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
Date: Sat, 15 Feb 2020 22:40:47 -0500
Subject: [PATCH] I Got No Wood

Changelog Notes:

- Prevents wood generation exploit for the holodeck that lets you get wood from holodeck generated dead/pine trees.

- Thus adding holodeck variation.
---
 code/game/objects/structures/flora/trees.dm | 12 ++++++++++++
 maps/southern_cross/southern_cross-6.dmm    |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/structures/flora/trees.dm b/code/game/objects/structures/flora/trees.dm
index 7cb1c3de3e..a710ea1531 100644
--- a/code/game/objects/structures/flora/trees.dm
+++ b/code/game/objects/structures/flora/trees.dm
@@ -154,6 +154,12 @@
 /obj/structure/flora/tree/pine/choose_icon_state()
 	return "[base_state]_[rand(1, 3)]"
 
+//CHOMPStation Addition Start 15/2/20 TFF - Holodeck variation trees, drop no wood.
+/obj/structure/flora/tree/pine/holo
+	product = null
+	product_amount = 0
+//CHOMPStation Addition End
+
 
 /obj/structure/flora/tree/pine/xmas
 	name = "xmas tree"
@@ -215,6 +221,12 @@
 /obj/structure/flora/tree/dead/choose_icon_state()
 	return "[base_state]_[rand(1, 6)]"
 
+//CHOMPStation Addition Start 15/2/20 TFF - Holodeck variation trees, drop no wood.
+/obj/structure/flora/tree/dead/holo
+	product = null
+	product_amount = 0
+//CHOMPStation Addition End
+
 // Small jungle trees
 
 /obj/structure/flora/tree/jungle_small
diff --git a/maps/southern_cross/southern_cross-6.dmm b/maps/southern_cross/southern_cross-6.dmm
index c2706d021a..a4e0421870 100644
--- a/maps/southern_cross/southern_cross-6.dmm
+++ b/maps/southern_cross/southern_cross-6.dmm
@@ -140,7 +140,7 @@
 "cJ" = (/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_thunderdomecourt)
 "cK" = (/obj/effect/floor_decal/corner/red{dir = 10},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_emptycourt)
 "cL" = (/obj/structure/holostool,/turf/simulated/floor/holofloor/tiled/dark,/area/holodeck/source_boxingcourt)
-"cM" = (/obj/structure/flora/tree/pine,/turf/simulated/floor/holofloor/snow,/area/holodeck/source_snowfield)
+"cM" = (/obj/structure/flora/tree/pine/holo,/turf/simulated/floor/holofloor/snow,/area/holodeck/source_snowfield)
 "cN" = (/obj/structure/table/woodentable/holotable,/turf/simulated/floor/holofloor/wood,/area/holodeck/source_meetinghall)
 "cO" = (/obj/effect/floor_decal/corner/red/full{dir = 4},/turf/simulated/floor/holofloor/tiled,/area/holodeck/source_emptycourt)
 "cP" = (/obj/item/clothing/glasses/sunglasses,/turf/simulated/floor/holofloor/beach/sand,/area/holodeck/source_beach)
@@ -148,7 +148,7 @@
 "cR" = (/obj/effect/floor_decal/spline/plain{dir = 8},/turf/simulated/floor/holofloor/lino,/area/holodeck/source_meetinghall)
 "cS" = (/obj/machinery/door/window/holowindoor{base_state = "right"; dir = 2; icon_state = "right"; name = "Red Corner"},/turf/simulated/floor/holofloor/tiled/dark,/area/holodeck/source_boxingcourt)
 "cT" = (/obj/structure/window/reinforced/holowindow,/turf/simulated/floor/holofloor/tiled/dark,/area/holodeck/source_boxingcourt)
-"cU" = (/obj/structure/flora/tree/dead,/turf/simulated/floor/holofloor/snow,/area/holodeck/source_snowfield)
+"cU" = (/obj/structure/flora/tree/dead/holo,/turf/simulated/floor/holofloor/snow,/area/holodeck/source_snowfield)
 "cV" = (/obj/effect/floor_decal/spline/plain{dir = 4},/turf/simulated/floor/holofloor/lino,/area/holodeck/source_meetinghall)
 "cW" = (/turf/simulated/floor/holofloor/lino,/area/holodeck/source_meetinghall)
 "cX" = (/obj/effect/floor_decal/carpet{dir = 5},/obj/effect/floor_decal/carpet{dir = 6},/obj/effect/floor_decal/carpet{dir = 9},/obj/effect/floor_decal/carpet{dir = 10},/turf/simulated/floor/holofloor/carpet,/area/holodeck/source_meetinghall)