Merge pull request #10659 from phil235/HandcuffOverlayFix

Handcuff, fire, overlays_standing fixes
This commit is contained in:
Jordie
2015-07-23 22:21:52 +10:00
27 changed files with 345 additions and 497 deletions
@@ -195,9 +195,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
//can't think of any other way to update the overlays :<
if(ismob(loc))
var/mob/M = loc
M.update_inv_wear_mask(0)
M.update_inv_l_hand(0)
M.update_inv_r_hand(0)
M.update_inv_wear_mask()
M.update_inv_l_hand()
M.update_inv_r_hand()
/obj/item/clothing/mask/cigarette/proc/handle_reagents()
@@ -365,7 +365,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
lit = 0
icon_state = icon_off
item_state = icon_off
M.update_inv_wear_mask(0)
M.update_inv_wear_mask()
packeditem = 0
name = "empty [initial(name)]"
SSobj.processing.Remove(src)
+1 -1
View File
@@ -193,7 +193,7 @@
if(!C.legcuffed) //beartrap can't cuff your leg if there's already a beartrap or legcuffs.
C.legcuffed = src
src.loc = C
C.update_inv_legcuffed(0)
C.update_inv_legcuffed()
feedback_add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart.
else if(isanimal(L))
var/mob/living/simple_animal/SA = L
+8 -8
View File
@@ -283,34 +283,34 @@
if(H.head)
if(H.head.clean_blood())
H.update_inv_head(0)
H.update_inv_head()
if(H.wear_suit)
if(H.wear_suit.clean_blood())
H.update_inv_wear_suit(0)
H.update_inv_wear_suit()
else if(H.w_uniform)
if(H.w_uniform.clean_blood())
H.update_inv_w_uniform(0)
H.update_inv_w_uniform()
if(washgloves)
clean_blood()
if(H.shoes && washshoes)
if(H.shoes.clean_blood())
H.update_inv_shoes(0)
H.update_inv_shoes()
if(H.wear_mask)
if(washmask)
if(H.wear_mask.clean_blood())
H.update_inv_wear_mask(0)
H.update_inv_wear_mask()
else
H.lip_style = null
H.update_body()
if(H.glasses && washglasses)
if(H.glasses.clean_blood())
H.update_inv_glasses(0)
H.update_inv_glasses()
if(H.ears && washears)
if(H.ears.clean_blood())
H.update_inv_ears(0)
H.update_inv_ears()
if(H.belt)
if(H.belt.clean_blood())
H.update_inv_belt(0)
H.update_inv_belt()
else
if(M.wear_mask) //if the mob is not human, it cleans the mask without asking for bitflags
if(M.wear_mask.clean_blood())