cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes *COVERSEYES

Browse Source 
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
This commit is contained in:
mwerezak
2015-07-10 22:12:24 -04:00
committed by HarpyEagle
parent d3a40f4269
commit b80c01ffbe
26 changed files with 74 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
View File

@@ -271,20 +271,20 @@
if(H.species && (H.species.flags & NO_PAIN))
return
if(H.head)
if(H.head.flags & MASKCOVERSEYES)
if(H.head.body_parts_covered & EYES)
eyes_covered = 1
safe_thing = H.head
if(H.head.flags & MASKCOVERSMOUTH)
mouth_covered = 1
safe_thing = H.head
if(H.wear_mask)
if(!eyes_covered && H.wear_mask.flags & MASKCOVERSEYES)
if(!eyes_covered && H.wear_mask.body_parts_covered & EYES)
eyes_covered = 1
safe_thing = H.wear_mask
if(!mouth_covered && H.wear_mask.flags & MASKCOVERSMOUTH)
mouth_covered = 1
safe_thing = H.wear_mask
if(H.glasses)
if(H.glasses && H.glasses.body_parts_covered & EYES)
if(!eyes_covered)
eyes_covered = 1
if(!safe_thing)

4
code/modules/reagents/reagent_containers/dropper.dm
View File

@@ -40,10 +40,10 @@
var/obj/item/safe_thing = null
if(victim.wear_mask)
if (victim.wear_mask.flags & MASKCOVERSEYES)
if (victim.wear_mask.body_parts_covered & EYES)
safe_thing = victim.wear_mask
if(victim.head)
if (victim.head.flags & MASKCOVERSEYES)
if (victim.head.body_parts_covered & EYES)
safe_thing = victim.head
if(victim.glasses)
if (!safe_thing)