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

proper ear damage proc

Browse Source
This commit is contained in:
Fox-McCloud
2016-07-21 04:24:12 -04:00
parent 00a470fd6d
commit 0a8dca713c
20 changed files with 35 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/changeling/powers/revive.dm
+1 -2
View File
@@ -19,8 +19,7 @@
user.radiation = 0
user.eye_blind = 0
user.eye_blurry = 0
user.ear_deaf = 0
user.ear_damage = 0
user.setEarDamage(0,0)
user.heal_overall_damage(user.getBruteLoss(), user.getFireLoss())
user.reagents.clear_reagents()
user.germ_level = 0
code/game/gamemodes/changeling/powers/shriek.dm
+1 -2
View File
@@ -11,8 +11,7 @@
for(var/mob/living/M in get_mobs_in_view(4, user))
if(iscarbon(M))
if(!M.mind || !M.mind.changeling)
M.ear_deaf = max(0, M.ear_deaf + 30)
M.ear_damage = max(0, M.ear_damage)
M.adjustEarDamage(0, 30)
M.confused += 20
M.Jitter(50)
else
code/game/gamemodes/cult/runes.dm
+2 -2
View File
@@ -840,7 +840,7 @@ var/list/sacrificed = list()
var/obj/item/weapon/nullrod/N = locate() in C
if(N)
continue
C.ear_deaf += 50
C.adjustEarDamage(0,50)
C.show_message("\red The world around you suddenly becomes quiet.", 3)
affected++
if(prob(1))
@@ -859,7 +859,7 @@ var/list/sacrificed = list()
var/obj/item/weapon/nullrod/N = locate() in C
if(N)
continue
C.ear_deaf += 30
C.adjustEarDamage(0,30)
//talismans is weaker.
C.show_message("\red The world around you suddenly becomes quiet.", 3)
affected++
code/game/gamemodes/shadowling/shadowling_abilities.dm
+1 -1
View File
@@ -557,7 +557,7 @@
var/mob/living/carbon/M = target
to_chat(M, "<span class='danger'><b>A spike of pain drives into your head and scrambles your thoughts!</b></span>")
M.confused += 10
M.ear_damage += 3
M.setEarDamage(M.ear_damage + 3)
else if(issilicon(target))
var/mob/living/silicon/S = target
to_chat(S, "<span class='warning'><b>ERROR $!(@ ERROR )#^! SENSORY OVERLOAD \[$(!@#</b></span>")
code/game/gamemodes/vampire/vampire_powers.dm
+1 -1
View File
@@ -259,7 +259,7 @@
continue
to_chat(C, "<span class='warning'><font size='3'><b>You hear a ear piercing shriek and your senses dull!</font></b></span>")
C.Weaken(4)
C.ear_deaf = 20
C.adjustEarDamage(0,20)
C.stuttering = 20
C.Stun(4)
C.Jitter(150)
code/game/gamemodes/wizard/artefact.dm
+1 -1
View File
@@ -778,7 +778,7 @@ var/global/list/multiverse = list()
else if(istype(I,/obj/item/weapon/bikehorn))
to_chat(target, "<span class='userdanger'>HONK</span>")
target << 'sound/items/AirHorn.ogg'
target.ear_damage += rand(0,3)
target.adjustEarDamage(0,3)
GiveHint(target)
cooldown = world.time +cooldown_time
return
code/game/mecha/equipment/weapons/weapons.dm
+1 -1
View File
@@ -166,7 +166,7 @@
to_chat(M, "<font color='red' size='7'>HONK</font>")
M.sleeping = 0
M.stuttering = 20
M.ear_deaf = 30
M.adjustEarDamage(0,30)
M.Weaken(3)
if(prob(30))
M.Stun(10)
code/game/objects/items/weapons/grenades/flashbang.dm
+1 -2
View File
@@ -51,8 +51,7 @@
if(!ear_safety)
M.Stun(max(10/distance, 3))
M.Weaken(max(10/distance, 3))
M.ear_damage += rand(0, 5)
M.ear_deaf = max(M.ear_deaf,15)
M.setEarDamage(M.ear_damage + rand(0, 5), max(M.ear_deaf,15))
if(M.ear_damage >= 15)
to_chat(M, "<span class='warning'>Your ears start to ring badly!</span>")
if(prob(M.ear_damage - 10 + 5))
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+2 -4
View File
@@ -96,15 +96,13 @@
f_loss += 60
ear_damage += 30
ear_deaf += 120
adjustEarDamage(30, 120)
if(3.0)
b_loss += 30
if(prob(50) && !shielded)
Paralyse(1)
ear_damage += 15
ear_deaf += 60
adjustEarDamage(15,60)
adjustBruteLoss(b_loss)
adjustFireLoss(f_loss)
code/modules/mob/living/carbon/alien/humanoid/life.dm
+3 -3
View File
@@ -105,11 +105,11 @@
//Ears
if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own
ear_deaf = max(ear_deaf, 1)
setEarDamage(-1, max(ear_deaf, 1))
else if(ear_deaf) //deafness, heals slowly over time
ear_deaf = max(ear_deaf-1, 0)
adjustEarDamage(0,-1)
else if(ear_damage < 25) //ear damage heals slowly under this threshold. otherwise you'll need earmuffs
ear_damage = max(ear_damage-0.05, 0)
adjustEarDamage(-0.05, 0)
//Other
if(stunned)
code/modules/mob/living/carbon/alien/larva/larva.dm
+2 -4
View File
@@ -87,15 +87,13 @@
f_loss += 60
ear_damage += 30
ear_deaf += 120
adjustEarDamage(30,120)
if(3.0)
b_loss += 30
if(prob(50))
Paralyse(1)
ear_damage += 15
ear_deaf += 60
adjustEarDamage(15,60)
adjustBruteLoss(b_loss)
adjustFireLoss(f_loss)
code/modules/mob/living/carbon/alien/larva/life.dm
+3 -3
View File
@@ -64,11 +64,11 @@
//Ears
if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own
ear_deaf = max(ear_deaf, 1)
setEarDamage(-1, max(ear_deaf, 1))
else if(ear_deaf) //deafness, heals slowly over time
ear_deaf = max(ear_deaf-1, 0)
adjustEarDamage(0,-1)
else if(ear_damage < 25) //ear damage heals slowly under this threshold.
ear_damage = max(ear_damage-0.05, 0)
adjustEarDamage(-0.05,0)
//Other
if(stunned)
code/modules/mob/living/carbon/brain/brain_item.dm
+1 -2
View File
@@ -21,8 +21,7 @@
/obj/item/organ/internal/brain/surgeryize()
if(!owner)
return
owner.ear_damage = 0 //Yeah, didn't you...hear? The ears are totally inside the brain.
owner.ear_deaf = 0
owner.setEarDamage(0,0) //Yeah, didn't you...hear? The ears are totally inside the brain.
/obj/item/organ/internal/brain/xeno
name = "xenomorph brain"
code/modules/mob/living/carbon/human/human.dm
+2 -4
View File
@@ -355,8 +355,7 @@
else valid_limbs -= processing_dismember
if(!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
ear_damage += 30
ear_deaf += 120
adjustEarDamage(30, 120)
if(prob(70) && !shielded)
Paralyse(10)
@@ -380,8 +379,7 @@
else valid_limbs -= processing_dismember
if(!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs))
ear_damage += 15
ear_deaf += 60
adjustEarDamage(15,60)
if(prob(50) && !shielded)
Paralyse(10)
code/modules/mob/living/carbon/human/life.dm
+5 -5
View File
@@ -882,17 +882,17 @@
//Ears
if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own
ear_deaf = max(ear_deaf, 1)
setEarDamage(-1, max(ear_deaf, 1))
else if(ear_deaf) //deafness, heals slowly over time
ear_deaf = max(ear_deaf - 1, 0)
adjustEarDamage(0,-1)
else if(istype(l_ear, /obj/item/clothing/ears/earmuffs) || istype(r_ear, /obj/item/clothing/ears/earmuffs)) //resting your ears with earmuffs heals ear damage faster
ear_damage = max(ear_damage - 0.15, 0)
ear_deaf = max(ear_deaf, 1)
adjustEarDamage(-0.15,0)
setEarDamage(-1, max(ear_deaf, 1))
else if(ear_damage < 25) //ear damage heals slowly under this threshold. otherwise you'll need earmuffs
ear_damage = max(ear_damage - 0.05, 0)
adjustEarDamage(-0.05,0)
if(flying)
animate(src, pixel_y = pixel_y + 5 , time = 10, loop = 1, easing = SINE_EASING)
code/modules/mob/living/living.dm
+2 -3
View File
@@ -346,7 +346,7 @@
dead_mob_list -= src
living_mob_list |= src
mob_list |= src
ear_deaf = 0
setEarDamage(-1,0)
timeofdeath = 0
/mob/living/proc/rejuvenate()
@@ -377,8 +377,7 @@
blinded = 0
eye_blind = 0
eye_blurry = 0
ear_deaf = 0
ear_damage = 0
setEarDamage(0,0)
heal_overall_damage(1000, 1000)
ExtinguishMob()
fire_stacks = 0
code/modules/mob/living/silicon/robot/life.dm
+1 -1
View File
@@ -18,7 +18,7 @@
SetParalysis(min(paralysis, 30))
SetWeakened(min(weakened, 20))
sleeping = 0
ear_deaf = 0
setEarDamage(-1,0)
/mob/living/silicon/robot/proc/handle_robot_cell()
if(stat != DEAD)
code/modules/reagents/newchem/medicine.dm
+2 -2
View File
@@ -478,7 +478,7 @@
if(istype(E))
E.damage = max(E.damage-1, 0)
M.eye_blurry = max(M.eye_blurry-1 , 0)
M.ear_damage = max(M.ear_damage-1, 0)
M.adjustEarDamage(-1,0)
if(prob(50))
M.disabilities &= ~NEARSIGHTED
if(prob(30))
@@ -486,7 +486,7 @@
M.eye_blind = 0
if(M.ear_damage <= 25)
if(prob(30))
M.ear_deaf = 0
M.setEarDamage(-1,0)
..()
/datum/chemical_reaction/oculine
code/modules/reagents/newchem/pyro.dm
+2 -4
View File
@@ -356,8 +356,7 @@
if(!ear_safety)
M.Stun(max(10/distance, 3))
M.Weaken(max(10/distance, 3))
M.ear_damage += rand(0, 5)
M.ear_deaf = max(M.ear_deaf,15)
M.setEarDamage(M.ear_damage + rand(0, 5), max(M.ear_deaf,15))
if(M.ear_damage >= 15)
to_chat(M, "<span class='warning'>Your ears start to ring badly!</span>")
if(prob(M.ear_damage - 10 + 5))
@@ -385,8 +384,7 @@
if(!ear_safety)
M.Stun(max(10/distance, 3))
M.Weaken(max(10/distance, 3))
M.ear_damage += rand(0, 5)
M.ear_deaf = max(M.ear_deaf,15)
M.setEarDamage(M.ear_damage + rand(0, 5), max(M.ear_deaf,15))
if(M.ear_damage >= 15)
to_chat(M, "<span class='warning'>Your ears start to ring badly!</span>")
if(prob(M.ear_damage - 10 + 5))
code/modules/surgery/organs/organ_internal.dm
+1 -1
View File
@@ -538,7 +538,7 @@
to_chat(owner, "<font color='red' size='7'>HONK</font>")
owner.sleeping = 0
owner.stuttering = 20
owner.ear_deaf = 30
owner.adjustEarDamage(0, 30)
owner.Weaken(3)
owner << 'sound/items/AirHorn.ogg'
if(prob(30))