cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

new flags_cover var for clothes, adjust existing flags

Browse Source
This commit is contained in:
uraniummeltdown
2017-03-10 11:33:42 +04:00
parent 2c23ee82d8
commit dd12fbe13a
31 changed files with 142 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/special/facehugger.dm
+4 -3
View File
@@ -17,7 +17,8 @@ var/const/MAX_ACTIVE_TIME = 400
w_class = 1 //note: can be picked up by aliens unlike most other items of w_class below 4
throw_range = 5
tint = 3
flags = MASKCOVERSMOUTH | MASKCOVERSEYES | AIRTIGHT
flags = AIRTIGHT
flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES
layer = MOB_LAYER
var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case
@@ -126,7 +127,7 @@ var/const/MAX_ACTIVE_TIME = 400
"<span class='userdanger'>[src] leaps at [M]'s face!</span>")
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.head && H.head.flags & HEADCOVERSMOUTH)
if(H.head && H.head.flags_cover & HEADCOVERSMOUTH)
H.visible_message("<span class='danger'>[src] smashes against [H]'s [H.head]!</span>", \
"<span class='userdanger'>[src] smashes against [H]'s [H.head]!</span>")
Die()
@@ -236,7 +237,7 @@ var/const/MAX_ACTIVE_TIME = 400
var/mob/living/carbon/C = M
if(ishuman(C))
var/mob/living/carbon/human/H = C
if(H.head && H.head.flags & HEADCOVERSMOUTH)
if(H.head && H.head.flags_cover & HEADCOVERSMOUTH)
return 0
return 1
return 0
code/modules/mob/living/carbon/human/human_attackhand.dm
+2 -2
View File
@@ -75,10 +75,10 @@
if(!check_has_mouth())
to_chat(H, "<span class='danger'>They don't have a mouth, you cannot perform CPR!</span>")
return
if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH) && !M.wear_mask.mask_adjusted))
if((M.head && (M.head.flags_cover & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags_cover & MASKCOVERSMOUTH) && !M.wear_mask.mask_adjusted))
to_chat(M, "<span class='warning'>Remove your mask!</span>")
return 0
if((head && (head.flags & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags & MASKCOVERSMOUTH) && !wear_mask.mask_adjusted))
if((head && (head.flags_cover & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH) && !wear_mask.mask_adjusted))
to_chat(M, "<span class='warning'>Remove his mask!</span>")
return 0
code/modules/mob/living/carbon/human/life.dm
+1 -1
View File
@@ -1102,7 +1102,7 @@
if(istype(loc,/obj/item/bodybag))
return
var/obj/item/clothing/mask/M = H.wear_mask
if(M && (M.flags & MASKCOVERSMOUTH))
if(M && (M.flags_cover & MASKCOVERSMOUTH))
return
if(H.species && H.species.flags & NO_BREATHE)
return //no puking if you can't smell!
code/modules/mob/mob_grab.dm
+3 -3
View File
@@ -347,9 +347,9 @@
if(state < GRAB_NECK)
to_chat(assailant, "<span class='warning'>You require a better grab to do this.</span>")
return
if((affected.head && affected.head.flags & HEADCOVERSEYES) || \
(affected.wear_mask && affected.wear_mask.flags & MASKCOVERSEYES) || \
(affected.glasses && affected.glasses.flags & GLASSESCOVERSEYES))
if((affected.head && affected.head.flags_cover & HEADCOVERSEYES) || \
(affected.wear_mask && affected.wear_mask.flags_cover & MASKCOVERSEYES) || \
(affected.glasses && affected.glasses.flags_cover & GLASSESCOVERSEYES))
to_chat(assailant, "<span class='danger'>You're going to need to remove the eye covering first.</span>")
return
if(!affected.internal_organs_by_name["eyes"])