Revert "12/21 modernizations from TG live"

code/modules/paperwork/paperplane.dm

@@ -6,10 +6,9 @@
 	throw_range = 7
 	throw_speed = 1
 	throwforce = 0
-	w_class = WEIGHT_CLASS_TINY
-	resistance_flags = FLAMMABLE
-	obj_integrity = 50
-	max_integrity = 50
+	w_class = 1
+	burn_state = FLAMMABLE
+	burntime = 4
 
 	var/obj/item/weapon/paper/internalPaper
 	var/list/stamped = list()
@@ -29,7 +28,7 @@
 
 /obj/item/weapon/paperplane/suicide_act(mob/user)
 	user.Stun(10)
-	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.visible_message("<span class='suicide'>[user] jams the [src] in their brains. It looks like \he's trying to commit suicide.</span>")
 	user.adjust_blurriness(6)
 	user.adjust_eye_damage(rand(6,8))
 	sleep(10)
@@ -80,6 +79,7 @@
 
 		if(!(in_range(user, src))) //to prevent issues as a result of telepathically lighting a paper
 			return
+		internalPaper.burntime = 1 //its already pretty burnt out
 		user.unEquip(src)
 		user.visible_message("<span class='danger'>[user] lights [src] ablaze with [P]!</span>", "<span class='danger'>You light [src] on fire!</span>")
 		fire_act()
@@ -87,8 +87,9 @@
 	add_fingerprint(user)
 
 
-/obj/item/weapon/paperplane/throw_at(atom/target, range, speed, mob/thrower, spin=FALSE, diagonals_first = FALSE)
-	. = ..(target, range, speed, thrower, FALSE, diagonals_first)
+/obj/item/weapon/paperplane/throw_at(atom/target, range, speed, mob/thrower, spin=0) //prevent the paper plane from spinning
+	if(!..())
+		return
 
 /obj/item/weapon/paperplane/throw_impact(atom/hit_atom)
 	if(..() || !ishuman(hit_atom))//if the plane is caught or it hits a nonhuman
@@ -103,7 +104,7 @@
 		H.Weaken(2)
 		H.emote("scream")
 
-/obj/item/weapon/paper/AltClick(mob/living/carbon/user, obj/item/I)
+/obj/item/weapon/paper/AltClick(mob/living/carbon/user, obj/item/I,)
 	if((!in_range(src, user)) || usr.stat || usr.restrained())
 		return
 	user << "<span class='notice'>You fold [src] into the shape of a plane!</span>"