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 b2fb153e07d..00000000000 Binary files a/icons/obj/handrail_vr.dmi and /dev/null differ 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"