Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

code/modules/paperwork/paperplane.dm

@@ -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")
 
@@ -122,6 +126,7 @@
 	. += "<span class='notice'>Alt-click [src] to fold it into a paper plane.</span>"
 
 /obj/item/paper/AltClick(mob/living/carbon/user, obj/item/I)
+	. = ..()
 	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user), NO_TK))
 		return
 	to_chat(user, "<span class='notice'>You fold [src] into the shape of a plane!</span>")
@@ -134,3 +139,4 @@
 
 	I = new plane_type(user, src)
 	user.put_in_hands(I)
+	return TRUE