From f42cd78de366ded4ce0bf02ef496fcde178c5718 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 6 Dec 2019 19:14:35 -0500 Subject: [PATCH] Fixes Elven Weapons --- code/game/objects/items/devices/spy_bug.dm | 4 ++-- .../objects/items/weapons/melee/energy_vr.dm | 4 ++-- code/game/objects/items/weapons/shields_vr.dm | 2 +- icons/mob/items/lefthand_melee_vr.dmi | Bin 3882 -> 3887 bytes icons/mob/items/righthand_melee_vr.dmi | Bin 3829 -> 3834 bytes icons/obj/weapons_vr.dmi | Bin 2824 -> 2825 bytes 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm index e3392f33fe..1f15d36b12 100644 --- a/code/game/objects/items/devices/spy_bug.dm +++ b/code/game/objects/items/devices/spy_bug.dm @@ -60,7 +60,7 @@ name = "broken bug" desc = "" //Even when it's broken it's inconspicuous icon = 'icons/obj/weapons.dmi' - icon_state = "eshield0" + icon_state = "eshield" item_state = "nothing" layer = TURF_LAYER+0.2 w_class = ITEMSIZE_TINY @@ -75,7 +75,7 @@ name = "bug" desc = "" //Nothing to see here icon = 'icons/obj/weapons.dmi' - icon_state = "eshield0" + icon_state = "eshield" item_state = "nothing" layer = TURF_LAYER+0.2 w_class = ITEMSIZE_TINY diff --git a/code/game/objects/items/weapons/melee/energy_vr.dm b/code/game/objects/items/weapons/melee/energy_vr.dm index c4b819e25e..1d188d03ca 100644 --- a/code/game/objects/items/weapons/melee/energy_vr.dm +++ b/code/game/objects/items/weapons/melee/energy_vr.dm @@ -4,5 +4,5 @@ icon_state = "impsword" icon = 'icons/obj/weapons_vr.dmi' item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi') - colorable = FALSE - lcolor = "#FFFFFF" \ No newline at end of file + colorable = FALSE + lcolor = "#FFFFFF" \ No newline at end of file diff --git a/code/game/objects/items/weapons/shields_vr.dm b/code/game/objects/items/weapons/shields_vr.dm index 4d0440e564..ceab877d4a 100644 --- a/code/game/objects/items/weapons/shields_vr.dm +++ b/code/game/objects/items/weapons/shields_vr.dm @@ -2,7 +2,7 @@ name = "energy scutum" desc = "It's really easy to mispronounce the name of this shield if you've only read it in books." icon = 'icons/obj/weapons_vr.dmi' - icon_state = "eshield0" // eshield1 for expanded + icon_state = "impshield" // eshield1 for expanded item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi') /obj/item/weapon/shield/fluff/wolfgirlshield diff --git a/icons/mob/items/lefthand_melee_vr.dmi b/icons/mob/items/lefthand_melee_vr.dmi index 9605154645b1f1adee66324afa93abbbae60d9c3..dd43d4a50310836a0e7c58d4ce7655606d66bf89 100644 GIT binary patch delta 179 zcmV;k08Ia?9fFDZ*Bkpc$|%ny$Zu17)57&ic7MW{$zD2 z3B@6Kg<#Rd4@?c8QeVGAp-^bS@xr->)8abZ^n`xY^65BHd_bW)9Hl5^vxmavEQNQp z`urX#o9v*_(6%Q}F4#s2OPrw4NwKimT!O;s2RYw^v95|QktplLC33B|#IUTyp)&h} hSG9c6bMl7wf1eh^)T1A@d;v!@a&Y`xWMZ+#WDZqiT9^O; delta 174 zcmV;f08#(19;zOYB!8KDR9JLGWpiV4X>fFDZ*Bkpc$}5Zu?oU47zE%sd5WXmrPZ!k zq(w5cuONY>O(2@`|G~VzLq`$gc<|j_i|cgL3&vT?mm?1835DU*Nl}8$9txMU6yAl+ z=Ob`7*+HRk?1PK8YoxG&7z%?FE18F5DD)q&{|UJys@UU_s3T&nq_}Q@;_+V3OQJvZ coxP#`Tc^dej2LGv-{iw;HnO4=(6P&84&G8&ZU6uP diff --git a/icons/mob/items/righthand_melee_vr.dmi b/icons/mob/items/righthand_melee_vr.dmi index e669f0cc8456ab9563e11092be56f8a3abef4dd0..399c1d902d6c5992da769a4b68a92c3f7c8e0d2d 100644 GIT binary patch delta 179 zcmV;k08Ib&9r_)RB!8ZIR9JLGWpiV4X>fFDZ*Bkpc$|%ny$Zu17)57&ic7MW{$zD2 z3B@6Kg<#Rd4@?c8QeVGAp-^bS@xr->)8abZ^n`xY^65BHd_bW)9Hl5^vxmavEQNQp z`urX#o9v*_(6%Q}F4#s2OPrw4NwKimT!O;s2RYw^v95|QktplLC33B|#IUTyp)&h} hSG9c6bMl7wf1eh^)T1A@d;v!@a&Y`xWMZ+#FAlrpTK50| delta 174 zcmV;f08#(?9rYcMB!8KDR9JLGWpiV4X>fFDZ*Bkpc$}5Zu?oU47zE%sd5WXmrPZ!k zq(w5cuONY>O(2@`|G~VzLq`$gc<|j_i|cgL3&vT?mm?1835DU*Nl}8$9txMU6yAl+ z=Ob`7*+HRk?1PK8YoxG&7z%?FE18F5DD)q&{|UJys@UU_s3T&nq_}Q@;_+V3OQJvZ coxP#`Tc^dej2LGv-{iw;HnO4=(6P%e4nh4`%>V!Z diff --git a/icons/obj/weapons_vr.dmi b/icons/obj/weapons_vr.dmi index 5bf8071324e2f64940f3bb1a8f8706417f9a84be..d23b35851bad1d1db1615b910876c77510c405ad 100644 GIT binary patch delta 185 zcmV;q07n0a7Ks*+B!8rOR9JLGWpiV4X>fFDZ*Bkpc$|%pI|{=v5JYR~6pP)5{8}|Z zCaAElV3cTWEy$Kxi73ZU;VOiHx*2%$ifQ52-OT{HH}Zv?D6XL3dN@i^$Yl=-E@vq` z((LnIQnndEK|{-yJYjH+6plE7f|C>z+XeUhOOB6V9aixraxR^?M6UIg7^ayx)XBf- nF?q{d{ig1i#Xdb|bnky;3*DeW_eOpIUcr8>NinGmvCudQbQxCA delta 184 zcmV;p07w6c7Kj#*B!8oNR9JLGWpiV4X>fFDZ*Bkpc$}4u!3x4K5Jb<(S1j#aTJ@TX zv`7x^FGw)kW+64Q8;qatp*KNVZ!_@bO%0d+YDee>t6#`M=>Z1LheoSHJ_j&xI%*Y= z=8)GS*<}O+6-pqCzNxhG!~zCdttNI0uK62mH$f?hcle|v-YsD(DNZwSl#2i{{4%rp&vWw2CF}#Cw6ktlLNl7(Kree0#m&J