cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-05 23:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8762 from Spookerton/spkrtn/sys/flagging

Browse Source 
violently rearranges some flags and instance vars
This commit is contained in:
Atermonera
2022-10-20 20:57:52 -08:00
committed by GitHub
parent 413e6db281 4557f8573c
commit 56bf74c21f
165 changed files with 497 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/ZAS/Phoron.dm
View File

@@ -43,7 +43,7 @@ var/global/image/contamination_overlay = image('icons/effects/contamination.dmi'
/obj/item/proc/can_contaminate()
//Clothing and backpacks can be contaminated.
if(flags & PHORONGUARD)
if(item_flags & PHORONGUARD)
return 0
else if(istype(src,/obj/item/storage/backpack))
return 0 //Cannot be washed :(
@@ -96,7 +96,7 @@ var/global/image/contamination_overlay = image('icons/effects/contamination.dmi'
if(vsc.plc.SKIN_BURNS && (species.breath_type != "phoron"))
if(!pl_head_protected() || !pl_suit_protected())
burn_skin(0.75)
if(prob(20))
if(prob(20))
to_chat(src, "<span class='danger'>Your skin burns!</span>")
updatehealth()
@@ -142,7 +142,7 @@ var/global/image/contamination_overlay = image('icons/effects/contamination.dmi'
//Checks if the head is adequately sealed. //This is just odd. TODO: Make this respect the body_parts_covered stuff like thermal gear does.
if(head)
if(vsc.plc.PHORONGUARD_ONLY)
if(head.flags & PHORONGUARD)
if(head.item_flags & PHORONGUARD)
return 1
else if(head.body_parts_covered & EYES)
return 1
@@ -154,7 +154,7 @@ var/global/image/contamination_overlay = image('icons/effects/contamination.dmi'
for(var/obj/item/protection in list(wear_suit, gloves, shoes)) //This is why it's odd. If I'm in a full suit, but my shoes and gloves aren't phoron proof, damage.
if(!protection)
continue
if(vsc.plc.PHORONGUARD_ONLY && !(protection.flags & PHORONGUARD))
if(vsc.plc.PHORONGUARD_ONLY && !(protection.item_flags & PHORONGUARD))
return 0
coverage |= protection.body_parts_covered