Offhand Sprite bugfix

This commit is contained in:
SoundScopes
2015-01-15 16:38:51 +00:00
parent c0dba4ae41
commit ceaf0740f4
3 changed files with 6 additions and 4 deletions
+2 -1
View File
@@ -133,10 +133,11 @@
/mob/living/carbon/proc/swap_hand()
var/obj/item/item_in_hand = src.get_active_hand()
if(item_in_hand) //this segment checks if the item in your hand is twohanded.
if(istype(item_in_hand,/obj/item/weapon/twohanded))
if(istype(item_in_hand,/obj/item/weapon/twohanded) || istype(item_in_hand,/obj/item/weapon/gun))
if(item_in_hand:wielded == 1)
usr << "<span class='warning'>Your other hand is too busy holding the [item_in_hand.name]</span>"
return
src.hand = !( src.hand )
if(hud_used.l_hand_hud_object && hud_used.r_hand_hud_object)
if(hand) //This being 1 means the left hand is in use
+2 -2
View File
@@ -387,8 +387,8 @@
user << "<span class='notice'>You are no-longer stabilizing the [name] with both hands.</span>"
O.unwield()
unwield()
if(src)
del(src)
if(src)
del(src)
/obj/item/weapon/gun/offhand/mob_can_equip(M as mob, slot)
return 0 //Because you can't equip your hand yet somehow you can