Merge pull request #10053 from Ghommie/Ghommie-cit429

Fixes some means of eyes blindness not working, removes legacy code.
This commit is contained in:
Putnam3145
2019-12-09 12:40:37 -08:00
committed by GitHub
15 changed files with 50 additions and 90 deletions
+6 -2
View File
@@ -44,10 +44,12 @@
return ..()
/obj/item/paperplane/suicide_act(mob/living/user)
var/obj/item/organ/eyes/eyes = user.getorganslot(ORGAN_SLOT_EYES)
user.Stun(200)
user.visible_message("<span class='suicide'>[user] jams [src] in [user.p_their()] nose. It looks like [user.p_theyre()] trying to commit suicide!</span>")
user.adjust_blurriness(6)
user.adjust_eye_damage(rand(6,8))
if(eyes)
eyes.applyOrganDamage(rand(6,8))
sleep(10)
return (BRUTELOSS)
@@ -111,9 +113,11 @@
if(prob(hit_probability))
if(H.is_eyes_covered())
return
var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES)
visible_message("<span class='danger'>\The [src] hits [H] in the eye!</span>")
H.adjust_blurriness(6)
H.adjust_eye_damage(rand(6,8))
if(eyes)
eyes.applyOrganDamage(rand(6,8))
H.Knockdown(40)
H.emote("scream")