cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6710 from uraniummeltdown/coverflags

Browse Source 
Cleaned up clothing flags
This commit is contained in:
Fox McCloud
2017-03-11 04:57:15 -05:00
committed by GitHub
parent 9e050c590e dd12fbe13a
commit 3c7d990061
31 changed files with 142 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/food.dm
+4 -4
View File
@@ -169,17 +169,17 @@
var/eyes_covered = 0
var/obj/item/safe_thing = null
if( victim.wear_mask )
if( victim.wear_mask.flags & MASKCOVERSEYES )
if(victim.wear_mask.flags_cover & MASKCOVERSEYES)
eyes_covered = 1
safe_thing = victim.wear_mask
if( victim.wear_mask.flags & MASKCOVERSMOUTH )
if(victim.wear_mask.flags_cover & MASKCOVERSMOUTH)
mouth_covered = 1
safe_thing = victim.wear_mask
if( victim.head )
if( victim.head.flags & MASKCOVERSEYES )
if(victim.head.flags_cover & MASKCOVERSEYES)
eyes_covered = 1
safe_thing = victim.head
if( victim.head.flags & MASKCOVERSMOUTH )
if(victim.head.flags_cover & MASKCOVERSMOUTH)
mouth_covered = 1
safe_thing = victim.head
if(victim.glasses)
code/modules/reagents/reagent_containers/dropper.dm
+2 -2
View File
@@ -33,10 +33,10 @@
var/obj/item/safe_thing = null
if( victim.wear_mask )
if( victim.wear_mask.flags & MASKCOVERSEYES )
if(victim.wear_mask.flags_cover & MASKCOVERSEYES)
safe_thing = victim.wear_mask
if( victim.head )
if( victim.head.flags & MASKCOVERSEYES )
if(victim.head.flags_cover & MASKCOVERSEYES)
safe_thing = victim.head
if(victim.glasses)
if( !safe_thing )