Automatic pistol, nutriment and sprites fixes (#1617)

-fix #1217
-fix being unable to put the tactical pistol into belts/holsters, also remove needless code from it
-fix the scout rifle not accepting other magazines
-fix the hardsuit nutriment being useless and just dealing minor toxin damage
-fix missing tactical masks and tapes from unathi and tajaran sprites
-fix tapes cuffs, blinders and etc not updating when equiped to said mob
-some extra tweaks to the hud code
This commit is contained in:
Alberyk
2017-01-21 17:23:11 +02:00
committed by skull132
parent 58dc6dde9e
commit 68dc556434
13 changed files with 35 additions and 21 deletions
+3
View File
@@ -32,6 +32,7 @@
user.visible_message("<span class='danger'>\The [user] has taped up \the [H]'s eyes!</span>")
H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/blindfold/tape(H), slot_glasses)
H.update_inv_glasses()
else if(target_zone == "mouth" || target_zone == "head")
if(!H.organs_by_name["head"])
@@ -57,12 +58,14 @@
user.visible_message("<span class='danger'>\The [user] has taped up \the [H]'s mouth!</span>")
H.equip_to_slot_or_del(new /obj/item/clothing/mask/muzzle/tape(H), slot_wear_mask)
H.update_inv_wear_mask()
else if(target_zone == "r_hand" || target_zone == "l_hand")
var/obj/item/weapon/handcuffs/cable/tape/T = new(user)
if(!T.place_handcuffs(H, user))
user.unEquip(T)
qdel(T)
H.update_inv_handcuffed()
else
return ..()
return 1