From c59fac2e168d048fbf164dd338c988e3894383f3 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sun, 29 Mar 2015 02:40:57 -0400 Subject: [PATCH] Adds unloaded item state for the STS-35. --- code/game/objects/items.dm | 9 +++++++++ code/modules/projectiles/gun.dm | 5 +---- .../projectiles/guns/energy/nuclear.dm | 5 +---- .../projectiles/guns/energy/special.dm | 7 +------ .../projectiles/guns/projectile/automatic.dm | 3 ++- icons/mob/items/lefthand_guns.dmi | Bin 27736 -> 27736 bytes icons/mob/items/righthand_guns.dmi | Bin 29866 -> 29866 bytes 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 6c520ae189f..ccef76c0f14 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -63,6 +63,15 @@ /obj/item/device icon = 'icons/obj/device.dmi' +//Checks if the item is being held by a mob, and if so, updates the held icons +/obj/item/proc/update_held_icon() + if(ismob(src.loc)) + var/mob/M = src.loc + if(M.l_hand == src) + M.update_inv_l_hand() + if(M.r_hand == src) + M.update_inv_r_hand() + /obj/item/ex_act(severity) switch(severity) if(1.0) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 653d7c6b165..ce85604752e 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -138,10 +138,7 @@ handle_post_fire(user, target, pointblank, reflex) update_icon() - if(user.hand) - user.update_inv_l_hand() - else - user.update_inv_r_hand() + update_held_icon() //obtains the next projectile to fire diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index e2b97672c7f..be2995128b0 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -29,10 +29,7 @@ projectile_type = /obj/item/projectile/beam/stun modifystate = "energystun" update_icon() - if(user.l_hand == src) - user.update_inv_l_hand() - else - user.update_inv_r_hand() + update_held_icon() /obj/item/weapon/gun/energy/gun/mounted self_recharge = 1 diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 56c5867010c..0b25c82af12 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -60,12 +60,7 @@ projectile_type = /obj/item/projectile/energy/floramut modifystate = "floramut" update_icon() - - item_state = modifystate - if(user.l_hand == src) - user.update_inv_l_hand() - else - user.update_inv_r_hand() + update_held_icon() /obj/item/weapon/gun/energy/floragun/afterattack(obj/target, mob/user, adjacent_flag) //allow shooting into adjacent hydrotrays regardless of intent diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index c58f9a3da0e..75bbf810a80 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -51,7 +51,7 @@ name = "\improper STS-35 automatic rifle" desc = "A durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 7.62mm rounds. It is unmarked." icon_state = "arifle" - item_state = "arifle" + item_state = null w_class = 4 force = 10 caliber = "a762" @@ -63,6 +63,7 @@ /obj/item/weapon/gun/projectile/automatic/sts35/update_icon() ..() icon_state = (ammo_magazine)? "arifle-0" : "arifle" + update_held_icon() /obj/item/weapon/gun/projectile/automatic/wt550 name = "\improper W-T 550 Saber" diff --git a/icons/mob/items/lefthand_guns.dmi b/icons/mob/items/lefthand_guns.dmi index e7024519a0251294041c7bce708d288607bfd432..d564d9bafe3fefce7f5d6568cbe6834fa10b0913 100644 GIT binary patch delta 525 zcmV+o0`mRX*a6ts0gyX?Zrd;n2JmzI6heDlhWzbz@nuLc_}la+W14w z8@bj!g%l-xFg-Q1K8U*3ZJODK_%o?%-SS^Jr*pR3|M{w!^~C;v=32M@a`)ffiwz~t zx7DZol^a;DVY!0k5|#^Ce$uu(&0a}5A7hHkMZNeP|5k7Ao!&lFd-YK5dg)G&$%YcE z5OqBYb5Kh>*T57z63|!K)wV!K4_wInP<28*!t^E~4ur%OpF{tE?|f#jK!1cxQvLH# z$0-8kJ~)ZL1>zomqvv8(_)C0!->H=-bV+=HLW8hdE$YZ)^LJ#x!1?{X^KuBWUQ$wb zqIv^0hZEUR(iPb-g_Y_rnF}icV0=8BztOSg}Tv!R2thun(J7``>>cz|}36R#j zk^pJVD+!R+ypkYk4chFnbVC8g`{;nYBLo7E5J)^iB=RVKtBfMaa61L&ddbNG*(VI- zpD@sa2_t=&G)UEuH85GY7i!R2m@wQ6HEc~xx_;kz={PC%XW*dbmy{`Da;zE?UKg`D zQaO7I9WLkQg1j2*> P03ZNKL_t)uHv%DQa%Kh! delta 525 zcmV+o0`mRX*a6ts0gyX?jv6rx2JkcU6w&UrRQ%ocGM9=~#bNgy!i;x_FiB)PQ2O*e zjH*FuwfQ(A{V@7W?Bv<~c>TG5ce}TJb0N`?qHEpe>!O)mLvKgdy7j7=9VrY)8$YOd zBiFj8kfMYSrl)4s2T|9$O*8utedkJD=Gr&>ta_RR4RZ z;}n5%ADqPB0&$Oj(Q~mX{3X6VcWNaHT@qiQ&>-wqi#qby{`J-Edxw92@4OsBte2J4 zov7YK&EZ6LlypUgrm#|d9CBeLV727JO2ByK!b-pz%!QSZ?V1Z~y@TeJq+ZOtk^pJV zD+!R+ypjNE%_|9#)}Vopr5g&c;ztMM9U%~Sgh1jEB9TXbS!EPShTADH*Goos9|Sf()BmbOUFs6KLeLFzobkNlVjDG@Vc1I zk;>Uy=x{kVA5ZmrPLk>&U12!a#G!u2Bf|;4Q^Ke3!)N#UzH_^`ee(wkYuenBr@(Ij P03ZNKL_t)uHv%DQ9)=KU diff --git a/icons/mob/items/righthand_guns.dmi b/icons/mob/items/righthand_guns.dmi index be844f4711c964e48ad00e861ba7f76282bbdbe8..63c5c0ae01b1d4e93ab215b732963df1f35ab856 100644 GIT binary patch delta 525 zcmV+o0`mQ;=>e+g0gyX?Zrd;n2JmzI6heDlhWzbz@nuLc_}la+W14w z8@bj!g%l-xFg-Q1K8U*3ZJODK_%o?%-SS^Jr*pR3|M{w!^~C;v=32M@a`)ffiwz~t zx7DZol^a;DVY!0k5|#^Ce$uu(&0a}5A7hHkMZNeP|5k7Ao!&lFd-YK5dg)G&$%YcE z5OqBYb5Kh>*T57z63|!K)wV!Kg?jTtl^wVc;`AmV4ur%OpF{tE?|f#jK!1cxQvLH# z$0-8kJ~)ZL1>zomqvv8(_)C0!->H=-bV+=HLW8hdE$YZ)^LJ#x!1?{X^KuBWUQ$wb zqIv^0hZEUR(iPb-g_Y_rnF}icV0=8BztOSg}Tv!R2thun(J7``>>cz|}36R#j zk^pJVD+!R+ypkYk4chFnbVC8g`{;nYBLo7E5J)^iB=RVKtBfMaa61L&ddbNG*(VI- zpD@sa2_t=&G)UEuH85GY7i!R2m@wQ6HEc~xx_;kz={PC%XW*dbmy{`Da;zE?UKg`D zQaO7I9WLkQe+g0gyX?jv6rx2JkcU6w&UrRQ%ocGM9=~#bNgy!i;x_FiB)PQ2O*e zjH*FuwfQ(A{V@7W?Bv<~c>TG5ce}TJb0N`?qHEpe>!O)mLvKgdy7j7=9VrY)8$YOd zBiFj8kfMYSrl)4s2T|9$O*8utedkJD=Gr&>ta_RR4RZ z;}n5%ADqPB0&$Oj(Q~mX{3X6VcWNaHT@qiQ&>-wqi#qby{`J-Edxw92@4OsBte2J4 zov7YK&EZ6LlypUgrm#|d9CBeLV727JO2ByK!b-pz%!QSZ?V1Z~y@TeJq+ZOtk^pJV zD+!R+ypjNE%_|9#)}Vopr5g&c;ztMM9U%~Sgh1jEB9TXbS!EPShTADH*Goos9|Sf()BmbOUFs6KLeLFzobkNlVjDG@Vc1I zk;>Uy=x{kVA5ZmrPLk>&U12!a#G!u2Bf|;4Q^Ke3!)N#UzH_^`ee(we=-S*(Bex0w P03ZNKL_t)uHv)5V>246;