[MIRROR] Makes nightmares unable to be pepersprayed [MDB IGNORE] (#19119)

* Makes nightmares unable to be pepersprayed

* resolve conflict

---------

Co-authored-by: SuperSlayer <91609255+SuperSlayer0@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-02-12 02:34:55 -08:00
committed by GitHub
co-authored by SuperSlayer lessthanthree
parent 1bafb1de6c
commit 22dee84d90
3 changed files with 6 additions and 0 deletions
@@ -47,6 +47,9 @@
return null
/mob/living/carbon/is_pepper_proof(check_flags = ALL)
var/obj/item/organ/internal/eyes/eyes = getorgan(/obj/item/organ/internal/eyes)
if(eyes && eyes.pepperspray_protect)
return eyes
if((check_flags & ITEM_SLOT_HEAD) && head && (head.flags_cover & PEPPERPROOF))
return head
if((check_flags & ITEM_SLOT_MASK) && wear_mask && (wear_mask.flags_cover & PEPPERPROOF))
@@ -109,3 +109,4 @@
name = "burning red eyes"
desc = "Even without their shadowy owner, looking at these eyes gives you a sense of dread."
icon = 'icons/obj/medical/organs/shadow_organs.dmi'
pepperspray_protect = TRUE
+2
View File
@@ -32,6 +32,8 @@
var/flash_protect = FLASH_PROTECTION_NONE
/// What level of invisibility these eyes can see
var/see_invisible = SEE_INVISIBLE_LIVING
/// Are these eyes immune to pepperspray?
var/pepperspray_protect = FALSE
/// How much alpha lighting has (basically, night vision)
var/lighting_alpha