From 2ddc9d18e8751bbe038ed846e249e86568989c94 Mon Sep 17 00:00:00 2001
From: chel <64568243+iliyaxox@users.noreply.github.com>
Date: Mon, 15 Apr 2024 06:40:59 -0300
Subject: [PATCH] [MODULAR] Fixes primitive wooden fencing (and gate) dropping
 iron rods instead of wood (#1979)

* fixes primitive fencing drop

* Update modular_nova/modules/primitive_structures/code/fencing.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

---------

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
---
 .../modules/primitive_structures/code/fencing.dm      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modular_nova/modules/primitive_structures/code/fencing.dm b/modular_nova/modules/primitive_structures/code/fencing.dm
index fbc74dba923..347e7642fd6 100644
--- a/modular_nova/modules/primitive_structures/code/fencing.dm
+++ b/modular_nova/modules/primitive_structures/code/fencing.dm
@@ -21,6 +21,17 @@
 	)
 	update_appearance()
 
+<<<<<<< HEAD
+=======
+/obj/structure/railing/wooden_fencing/atom_deconstruct(disassembled)
+	var/obj/plank = new /obj/item/stack/sheet/mineral/wood(drop_location(), 5)
+	transfer_fingerprints_to(plank)
+  
+// formerly NO_DECONSTRUCTION
+/obj/structure/railing/wirecutter_act(mob/living/user, obj/item/I)
+	return NONE
+
+>>>>>>> 93bdd53553d ([MODULAR] Fixes primitive wooden fencing (and gate) dropping iron rods instead of wood (#1979))
 // Fence gates for the above mentioned fences
 
 /obj/structure/railing/wooden_fencing/gate