Skip to content

Commit

Permalink
[MODULAR] Fixes primitive wooden fencing (and gate) dropping iron rod…
Browse files Browse the repository at this point in the history
…s instead of wood (#1979)

* fixes primitive fencing drop

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

Co-authored-by: Tom <[email protected]>

---------

Co-authored-by: Tom <[email protected]>
Co-authored-by: Bloop <[email protected]>
  • Loading branch information
3 people authored and StealsThePRs committed Apr 15, 2024
1 parent 453b13e commit 2ddc9d1
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions modular_nova/modules/primitive_structures/code/fencing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@
)
update_appearance()

<<<<<<< HEAD

Check failure on line 24 in modular_nova/modules/primitive_structures/code/fencing.dm

View workflow job for this annotation

GitHub Actions / Run Linters

got '<<', expected one of: newline, '/', identifier
=======
/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
Expand Down

0 comments on commit 2ddc9d1

Please sign in to comment.