Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

code/datums/components/storage/concrete/stack.dm

@@ -63,7 +63,7 @@
 		if(!istype(I) || QDELETED(I))				//We're specialized stack storage, just ignore non stacks.
 			continue
 		if(!.[I.merge_type])
-			.[I.merge_type] = new /datum/numbered_display(I, I.amount)
+			.[I.merge_type] = new /datum/numbered_display(I, I.amount, src)
 		else
 			var/datum/numbered_display/ND = .[I.merge_type]
 			ND.number += I.amount

code/datums/components/storage/storage.dm

@@ -486,7 +486,7 @@
 					var/atom/A = parent
 					A.do_squish()
 
-//This proc return 1 if the item can be picked up and 0 if it can't.
+//This proc return TRUE if the item can be picked up and 0 if it can't.
 //Set the stop_messages to stop it from printing messages
 /datum/component/storage/proc/can_be_inserted(obj/item/I, stop_messages = FALSE, mob/M)
 	if(!istype(I) || (I.item_flags & ABSTRACT))

code/datums/components/storage/ui.dm

@@ -48,7 +48,7 @@
 			var/datum/numbered_display/ND = numbered_contents[type]
 			ND.sample_object.mouse_opacity = MOUSE_OPACITY_OPAQUE
 			ND.sample_object.screen_loc = "[cx]:[screen_pixel_x],[cy]:[screen_pixel_y]"
-			ND.sample_object.maptext = "<font color='white'>[(ND.number > 1)? "[ND.number]" : ""]</font>"
+			ND.sample_object.maptext = MAPTEXT("<font color='white'>[(ND.number > 1)? "[ND.number]" : ""]</font>")
 			ND.sample_object.layer = ABOVE_HUD_LAYER
 			ND.sample_object.plane = ABOVE_HUD_PLANE
 			. += ND.sample_object