From bc43cc2c673a03027c1bdebcc785048dacd31b7a Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 29 May 2021 15:10:27 -0400
Subject: [PATCH] Merge pull request #10489 from
 VOREStation/upstream-merge-8109

[MIRROR] Misc Bits
---
 .../{handrail_vr.dm => handrail.dm}           |   2 +-
 icons/obj/{handrail_vr.dmi => handrail.dmi}   | Bin
 icons/obj/statue.dmi                          | Bin 1579 -> 1843 bytes
 vorestation.dme                               |   2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename code/game/objects/structures/{handrail_vr.dm => handrail.dm} (85%)
 rename icons/obj/{handrail_vr.dmi => handrail.dmi} (100%)

diff --git a/code/game/objects/structures/handrail_vr.dm b/code/game/objects/structures/handrail.dm
similarity index 85%
rename from code/game/objects/structures/handrail_vr.dm
rename to code/game/objects/structures/handrail.dm
index 340d8dedd3..8519cb4e30 100644
--- a/code/game/objects/structures/handrail_vr.dm
+++ b/code/game/objects/structures/handrail.dm
@@ -1,6 +1,6 @@
 /obj/structure/handrail
 	name = "handrail"
-	icon = 'icons/obj/handrail_vr.dmi'
+	icon = 'icons/obj/handrail.dmi'
 	icon_state = "handrail"
 	desc = "A safety railing with buckles to secure yourself to when floor isn't stable enough."
 	density = 0
diff --git a/icons/obj/handrail_vr.dmi b/icons/obj/handrail.dmi
similarity index 100%
rename from icons/obj/handrail_vr.dmi
rename to icons/obj/handrail.dmi
diff --git a/icons/obj/statue.dmi b/icons/obj/statue.dmi
index 7407e123fa82e26b8bd573afd2e9b8aa959ca6d0..c6cdc780628292faf98a01cf267be07b8d1650d8 100644
GIT binary patch
delta 1597
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

delta 1307
zcmV+$1?2j(4yz21BmtI@C50;U^Yh@~-~a#s|NsBBwYAdH(vp&rHFh#r00001bW%=J
z06^y0W&i*Hi<1xmfPdpsqpaZS=K}UQ02+)*aN4F6bpQYatVu*cRA_<ineBGkNDPK8
zZ_~J)0&(1wlD5V$o2A|~f!zPiRnpiF2PBQL<30PML->k@_mMOj*@h(fGv0Opz$klE
zKTT6hA!hHRZz;s=J@o&=o2r2JcX%64fUEb{>Gk_76_BNT8-EeP)rXHCRDB}2E2rxB
z;X;;~{#ka2rw-6VhaRdDrX3R)AyAEc%08)eLUxQmu|pIPYA{tR(YAw&RWN>@oNw-e
z0=nPGXQ%er45)l#0Cs}!(t0)aRItz9&0D&)NgcSw0vs$B`08vX*&71CIJVE`^LZ1R
z1przohw31e9Dn_%1Dx6$g0}ug0t*~B=K?VRF2cNt!T_M_H!N^-nu5-*q^LmzE41TG
zAafnS;cLm>0t7pz33uU9C8s9{+9t0NoHqovcM+W1F-KWjh4O9z$}ACXDBD7rl08UB
zb_{?QnRj}-W5hfQ`8~F$iX8#eMzYMIc-F*m8Yj?yjDMCwcD3aM0s-j3WkUg~y#)k)
zmvJC(2|$8-)hB{jiX#Al;CLN@2=1)`$t<YzR3yx2mkPuIuRa5Aj8gz~0?H9BVn<0h
zesiWD>I&3jV#H4UNPE*b$Sq3jRDJA!M$ggX{NJ1qwZ~2^a(e=OKDX?*IN{bf@{@jA
z=*QI}HGc`gZV3>e_^jJM7dGJTmd2evArQ1AK^pXp6x^Bm7y($P9uTbNA{4iJf|52z
zc8(2wzzKM>Ld-4wKrogdEy#l}YK{|jz|26-9%}krLdHq(G8hdP^PsU*^oz8+iyBM(
zytx(Gh#ts*BE-i@kfTHZB`MD}K%P^AWB^e87Jux0LFFzHmU+Qb%qqeu3ILK0pj>i>
z2qG!cBj^wKIt;MlZBXz=Sjk6SB9Mf*i0A;}Nnbu>!>Vg`D|x#UAg40DmjU-wrnv?v
zID(Y7Dy+nXL;yD<Jpyh;GJwzT*#X)}a<>4WBt%*TCQ$#b0ZSYmu*#6u$ULIa467O8
zA%E4Fz;zZo=2{=;3bkDPF923E4efLspjaw38pi$7%y6Fwv`x?eV04N`0H6bWGXTTa
zfUas7;Lb0ex;fuzuc|TppsoB}Kk0~{-v^@#xc}c@9F$>9sK2hNYCRpHtkyKDDMQ$7
zH=_cG6oL1f&Bpt|@~-)T!D;$`Km0>~gMSIJ9~k`Z=fn2r!)^qi{Yp$F)c@AQ^+UJN
z`venqWAqdL9!Fi}(qjZQM&O6mQ3yZ_p+s^2`1t7Yc^CoDy;77<mES`AmI<W49hN3Y
zn=%yvev6|neOc3sAq3!y2gi>B!EYJSJPZTyMsxC4tG@OniI=2b;=2I=2iLsDzkfhj
zW_0?gY$7P128Dn%1ixs2R7YhQ0A&CS>3HaO1CS%Ad3`;v^ksF_c2G$8J5%g+;u`O2
z+6m#lyJQXcH<>`-5*2Hx@;hAHbx8*te87gWz68J*1n4_UOWUA&-h02VT0p(Vze_@Z
z@L&M;)f3+9!@(a82*7axpaXHE17N9$s+WDWe?|bhf2aoonm#HWHLK^BmuiiGWCXw*
zc)pTM3ZT&ecuWAO@Wd;@QmQ7<4gk_-%2fIdU?M{0z2_9+^CX0dNBh)!{01dPVLjiP
R!5{zt002ovPDHLkV1oW@W@7*V

diff --git a/vorestation.dme b/vorestation.dme
index 3bbf628b31..19fc3a5a17 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1522,7 +1522,7 @@
 #include "code\game\objects\structures\girders.dm"
 #include "code\game\objects\structures\gravemarker.dm"
 #include "code\game\objects\structures\grille.dm"
-#include "code\game\objects\structures\handrail_vr.dm"
+#include "code\game\objects\structures\handrail.dm"
 #include "code\game\objects\structures\holoplant.dm"
 #include "code\game\objects\structures\inflatable.dm"
 #include "code\game\objects\structures\janicart.dm"