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

code/datums/explosion.dm

@@ -397,7 +397,7 @@ GLOBAL_LIST_EMPTY(explosions)
 	var/choice = input("Bomb Size?") in choices
 	switch(choice)
 		if(null)
-			return 0
+			return FALSE
 		if("Small Bomb")
 			dev = 1
 			heavy = 2
@@ -436,13 +436,13 @@ GLOBAL_LIST_EMPTY(explosions)
 
 		if(dist < dev)
 			T.color = "red"
-			T.maptext = "Dev"
+			T.maptext = MAPTEXT("Dev")
 		else if (dist < heavy)
 			T.color = "yellow"
-			T.maptext = "Heavy"
+			T.maptext = MAPTEXT("Heavy")
 		else if (dist < light)
 			T.color = "blue"
-			T.maptext = "Light"
+			T.maptext = MAPTEXT("Light")
 		else
 			continue