From 3aa5eccebd58e0fd7d9ac3ec4250ed1c2616b459 Mon Sep 17 00:00:00 2001
From: Unknown <RedKerensky@Gmail.com>
Date: Sat, 29 May 2021 15:01:07 -0400
Subject: [PATCH] Removes Duplicates

---
 code/game/objects/structures/handrail_vr.dm |   8 --------
 icons/obj/handrail_vr.dmi                   | Bin 385 -> 0 bytes
 vorestation.dme                             |   4 ----
 3 files changed, 12 deletions(-)
 delete mode 100644 code/game/objects/structures/handrail_vr.dm
 delete mode 100644 icons/obj/handrail_vr.dmi

diff --git a/code/game/objects/structures/handrail_vr.dm b/code/game/objects/structures/handrail_vr.dm
deleted file mode 100644
index 340d8dedd3d..00000000000
--- a/code/game/objects/structures/handrail_vr.dm
+++ /dev/null
@@ -1,8 +0,0 @@
-/obj/structure/handrail
-	name = "handrail"
-	icon = 'icons/obj/handrail_vr.dmi'
-	icon_state = "handrail"
-	desc = "A safety railing with buckles to secure yourself to when floor isn't stable enough."
-	density = 0
-	anchored = 1
-	can_buckle = 1
diff --git a/icons/obj/handrail_vr.dmi b/icons/obj/handrail_vr.dmi
deleted file mode 100644
index b2fb153e07d46ee2dd22e0ce61e8a06d32c86089..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 385
zcmV-{0e=38P)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000IP)t-sz`($3
zYiqKyvVnnt|Nk>H05ey;B9;IE00DGTPE!Ct=GbNc003=zR9JLGWpiV4X>fFDZ*Bkp
zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LY
zR3K9+BQY<fC^0ifiHkEOv#1!PkBc*{C^0t`#5UwoR&e!m0h<f}nFJeAU%fYp0001_
zNkl<ZNQv!~F%H8Z3`K2{>?O(p3`+M(y+AUsqcrzFOQDH6!S_-{k(wtw`OARKhlp5c
z$2_P6kL%(yA(RCag3S!;tDH|b-lB@RZE<n&$EY??jHFpnH8aciC>6J#k0(xBy2Goq
zp4x~6-IN!q5cLXXMgkYp*umV5l}}V*PJ$k7kt@ItmX8rwByjSBK6J1TgB&q#4=Xea
f!8WLG`Xsyoe5?`?j1;PC00000NkvXXu0mjf+%1^+

diff --git a/vorestation.dme b/vorestation.dme
index 363e6c33e1c..ce06a451e71 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1435,11 +1435,7 @@
 #include "code\game\objects\structures\girders.dm"
 #include "code\game\objects\structures\gravemarker.dm"
 #include "code\game\objects\structures\grille.dm"
-<<<<<<< HEAD:vorestation.dme
-#include "code\game\objects\structures\handrail_vr.dm"
-=======
 #include "code\game\objects\structures\handrail.dm"
->>>>>>> 5a4cf24... Merge pull request #8109 from Woodratt/05252021_Bitsnbobs:polaris.dme
 #include "code\game\objects\structures\holoplant.dm"
 #include "code\game\objects\structures\inflatable.dm"
 #include "code\game\objects\structures\janicart.dm"