cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-10 06:34:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Earmuffs providing immunity to Changeling shriek (#14033)

Browse Source 
* Adds Earmuff immunity to shriek

* Refactors hearing protection and adds deafness

* Update human.dm

* Removed implicit src
This commit is contained in:
Ryal
2020-09-20 15:32:27 -07:00
committed by GitHub
parent 01da8413de
commit 08c05a4814
6 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+11 -5
View File
@@ -254,7 +254,7 @@
limbs_affected -= 1
else valid_limbs -= processing_dismember
if(!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
if(check_ear_prot() < HEARING_PROTECTION_TOTAL)
AdjustEarDamage(30, 120)
if(prob(70) && !shielded)
Paralyse(10)
@@ -278,7 +278,7 @@
limbs_affected -= 1
else valid_limbs -= processing_dismember
if(!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
if(check_ear_prot() < HEARING_PROTECTION_TOTAL)
AdjustEarDamage(15, 60)
if(prob(50) && !shielded)
Paralyse(10)
@@ -931,12 +931,18 @@
return number
/mob/living/carbon/human/check_ear_prot()
if(!can_hear())
return HEARING_PROTECTION_TOTAL
if(istype(l_ear, /obj/item/clothing/ears/earmuffs))
return HEARING_PROTECTION_TOTAL
if(istype(r_ear, /obj/item/clothing/ears/earmuffs))
return HEARING_PROTECTION_TOTAL
if(head && (head.flags & HEADBANGPROTECT))
return 1
return HEARING_PROTECTION_MINOR
if(l_ear && (l_ear.flags & EARBANGPROTECT))
return 1
return HEARING_PROTECTION_MINOR
if(r_ear && (r_ear.flags & EARBANGPROTECT))
return 1
return HEARING_PROTECTION_MINOR
///tintcheck()
///Checks eye covering items for visually impairing tinting, such as welding masks
code/modules/surgery/organs/vocal_cords.dm
+1 -1
View File
@@ -157,7 +157,7 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby"))
if(L.can_hear() && !L.null_rod_check() && L != owner && L.stat != DEAD)
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs))
if(H.check_ear_prot() >= HEARING_PROTECTION_TOTAL)
continue
listeners += L