July 5th TG sync (#1883)

July 5th TG sync
This commit is contained in:
Poojawa
2017-07-05 22:14:19 -05:00
committed by GitHub
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
+3 -3
View File
@@ -32,8 +32,8 @@
internalPaper = null
return ..()
/obj/item/weapon/paperplane/suicide_act(mob/user)
user.Stun(10)
/obj/item/weapon/paperplane/suicide_act(mob/living/user)
user.Stun(200)
user.visible_message("<span class='suicide'>[user] jams the [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))
@@ -96,7 +96,7 @@
visible_message("<span class='danger'>\The [src] hits [H] in the eye!</span>")
H.adjust_blurriness(6)
H.adjust_eye_damage(rand(6,8))
H.Weaken(2)
H.Knockdown(40)
H.emote("scream")
/obj/item/weapon/paper/AltClick(mob/living/carbon/user, obj/item/I)