Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm

code/modules/paperwork/paper.dm

@@ -4,13 +4,13 @@
  */
 
 /obj/item/weapon/paper
-	name = "paper"
-	gender = PLURAL
+	name = "sheet of paper"
+	gender = NEUTER
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "paper"
 	item_state = "paper"
 	throwforce = 0
-	w_class = 1.0
+	w_class = 1
 	throw_range = 1
 	throw_speed = 1
 	layer = 4

code/modules/paperwork/paper_bundle.dm

@@ -1,6 +1,6 @@
 /obj/item/weapon/paper_bundle
 	name = "paper bundle"
-	gender = PLURAL
+	gender = NEUTER
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "paper"
 	item_state = "paper"