Merge pull request #9610 from dapocalypse/BugFixes

Bug Fixes

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

@@ -31,7 +31,10 @@
 
 /obj/item/stack/examine(mob/user)
 	if(..(user, 1))
-		to_chat(user, "There are [amount] [singular_name]\s in the stack.")
+		if(singular_name)
+			to_chat(user, "There are [amount] [singular_name]\s in the stack.")
+		else
+			to_chat(user, "There are [amount] [name]\s in the stack.")
 
 /obj/item/stack/attack_self(mob/user)
 	list_recipes(user)

code/game/objects/items/weapons/gift_wrappaper.dm

@@ -135,6 +135,7 @@
 	desc = "You can use this to wrap items in."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "wrap_paper"
+	singular_name = "wrapping paper"
 	flags = NOBLUDGEON
 	amount = 25
 	max_amount = 25

code/game/objects/items/weapons/tape.dm

@@ -3,6 +3,7 @@
 	desc = "A roll of sticky tape. Possibly for taping ducks... or was that ducts?"
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "taperoll"
+	singular_name = "tape roll"
 	w_class = WEIGHT_CLASS_TINY
 	amount = 10
 	max_amount = 10

code/modules/recycling/sortingmachinery.dm

@@ -134,6 +134,7 @@
 	name = "package wrapper"
 	icon = 'icons/obj/items.dmi'
 	icon_state = "deliveryPaper"
+	singular_name = "package wrapper"
 	flags = NOBLUDGEON
 	amount = 25
 	max_amount = 25