Refactors ears into organs (#513)

* Refactors ear damage into ear organs

* Update human.dm

* Update species.dm

* Delete species.dm.rej

* Update tgstation.dme

* Delete tgstation.dme.rej

* Delete human.dm.rej

* Update tongue.dm

* Delete surgery.dmi

* upload fixed surgery.dmi
This commit is contained in:
CitadelStationBot
2017-04-26 09:52:35 -05:00
committed by Poojawa
parent a905c15dad
commit 84321916a5
40 changed files with 925 additions and 908 deletions
@@ -33,12 +33,5 @@ Bonus
if(3, 4)
to_chat(M, "<span class='warning'>[pick("You hear a ringing in your ear.", "Your ears pop.")]</span>")
if(5)
if(!(M.ear_deaf))
to_chat(M, "<span class='userdanger'>Your ears pop and begin ringing loudly!</span>")
M.setEarDamage(-1,INFINITY) //Shall be enough
addtimer(CALLBACK(src, .proc/Undeafen, M), 200)
/datum/symptom/deafness/proc/Undeafen(mob/living/M)
if(M)
to_chat(M, "<span class='warning'>The ringing in your ears fades...</span>")
M.setEarDamage(-1,0)
to_chat(M, "<span class='userdanger'>Your ears pop and begin ringing loudly!</span>")
M.minimumDeafTicks(20)
@@ -28,7 +28,7 @@ Bonus
..()
var/mob/living/M = A.affected_mob
if(A.stage >= 2)
M.setEarDamage(0,0)
M.restoreEars()
if(A.stage >= 3)
M.dizziness = 0
@@ -50,7 +50,6 @@ Bonus
if(A.stage >= 5)
M.adjustBrainLoss(-3)
return
/*
//////////////////////////////////////
@@ -127,5 +126,3 @@ Bonus
M.drowsyness += 1
if(24 to INFINITY)
M.Sleeping(2, 0)
return