Merge pull request #6441 from Citadel-Station-13/upstream-merge-37223

[MIRROR] Fixes some defines and value

code/game/objects/items/storage/boxes.dm

@@ -704,7 +704,7 @@ obj/item/storage/box/clown
 #define NANOTRASEN "NanotrasenStandard"
 #define SYNDI "SyndiSnacks"
 #define HEART "Heart"
-#define SMILE "SmileyFace"
+#define SMILEY "SmileyFace"
 
 /obj/item/storage/box/papersack
 	name = "paper sack"
@@ -726,7 +726,7 @@ obj/item/storage/box/clown
 		if(contents.len)
 			to_chat(user, "<span class='warning'>You can't modify [src] with items still inside!</span>")
 			return
-		var/list/designs = list(NODESIGN, NANOTRASEN, SYNDI, HEART, SMILE, "Cancel")
+		var/list/designs = list(NODESIGN, NANOTRASEN, SYNDI, HEART, SMILEY, "Cancel")
 		var/switchDesign = input("Select a Design:", "Paper Sack Design", designs[1]) in designs
 		if(get_dist(usr, src) > 1)
 			to_chat(usr, "<span class='warning'>You have moved too far away!</span>")
@@ -747,7 +747,7 @@ obj/item/storage/box/clown
 				desc = "The design on this paper sack is a remnant of the notorious 'SyndieSnacks' program."
 			if(HEART)
 				desc = "A paper sack with a heart etched onto the side."
-			if(SMILE)
+			if(SMILEY)
 				desc = "A paper sack with a crude smile etched onto the side."
 		return 0
 	else if(W.is_sharp())
@@ -768,7 +768,7 @@ obj/item/storage/box/clown
 #undef NANOTRASEN
 #undef SYNDI
 #undef HEART
-#undef SMILE
+#undef SMILEY
 
 /obj/item/storage/box/ingredients //This box is for the randomely chosen version the chef spawns with, it shouldn't actually exist.
 	name = "ingredients box"