Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP

Conflicts:
	code/modules/mob/mob.dm

code/game/objects/items/stacks/stack.dm

@@ -8,8 +8,8 @@
  * Stacks
  */
 /obj/item/stack
-	gender = PLURAL
 	origin_tech = "materials=1"
+	gender = PLURAL
 	var/list/datum/stack_recipe/recipes
 	var/singular_name
 	var/amount = 1
@@ -29,7 +29,15 @@
 /obj/item/stack/examine()
 	set src in view(1)
 	..()
-	usr << "There are [src.amount] [src.singular_name]\s in the stack."
+	if(src.singular_name)
+		if(src.amount>1)
+			usr << "There are [src.amount] [src.singular_name]\s in the stack."
+		else
+			usr << "There is [src.amount] [src.singular_name] in the stack."
+	else if(src.amount>1)
+		usr << "There are [src.amount] in the stack."
+	else
+		usr << "There is [src.amount] in the stack."
 	return
 
 /obj/item/stack/attack_self(mob/user as mob)