Merge remote-tracking branch 'remotes/upstream/dev' into definecrusade

code/_helpers/lists.dm

@@ -169,16 +169,15 @@ proc/listclearnulls(list/list)
 	return output
 
 //Randomize: Return the list in a random order
-/proc/shuffle(var/list/shufflelist)
-	if(!shufflelist)
+/proc/shuffle(var/list/L)
+	if(!L)
 		return
-	var/list/new_list = list()
-	var/list/old_list = shufflelist.Copy()
-	while(old_list.len)
-		var/item = pick(old_list)
-		new_list += item
-		old_list -= item
-	return new_list
+
+	L = L.Copy()
+
+	for(var/i=1; i<L.len; i++)
+		L.Swap(i, rand(i,L.len))
+	return L
 
 //Return a list with no duplicate entries
 /proc/uniquelist(var/list/L)

code/_helpers/names.dm

@@ -233,7 +233,7 @@ var/syndicate_code_response//Code response for traitors.
 	set name = "Generate Code Phrase"
 	set category = "Debug"
 
-	world << "\red Code Phrase is: \black [generate_code_phrase()]"
+	world << "<span class='warning'>Code Phrase is:</span> [generate_code_phrase()]"
 	return
 
 

code/_helpers/text.dm

@@ -34,7 +34,8 @@
 		input = replace_characters(input, list("\n"=" ","\t"=" "))
 
 	if(encode)
-		//In addition to processing html, html_encode removes byond formatting codes like "\red", "\i" and other.
+		// The below \ escapes have a space inserted to attempt to enable Travis auto-checking of span class usage. Please do not remove the space.
+		//In addition to processing html, html_encode removes byond formatting codes like "\ red", "\ i" and other.
 		//It is important to avoid double-encode text, it can "break" quotes and some other characters.
 		//Also, keep in mind that escaped characters don't work in the interface (window titles, lower left corner of the main window, etc.)
 		input = html_encode(input)
@@ -312,4 +313,4 @@ proc/TextPreview(var/string,var/len=40)
 /proc/create_text_tag(var/tagname, var/tagdesc = tagname, var/client/C = null)
 	if(C && (C.prefs.toggles & CHAT_NOICONS))
 		return tagdesc
-	return "<IMG src='\ref[text_tag_icons.icon]' class='text_tag' iconstate='[tagname]'" + (tagdesc ? " alt='[tagdesc]'" : "") + ">"
+	return "<IMG src='\ref[text_tag_icons.icon]' class='text_tag' iconstate='[tagname]'" + (tagdesc ? " alt='[tagdesc]'" : "") + ">"

code/_helpers/unsorted.dm

@@ -1363,3 +1363,8 @@ var/list/WALLITEMS = list(
 				temp_col  = "0[temp_col]"
 			colour += temp_col
 	return colour
+
+/atom/proc/get_light_and_color(var/atom/origin)
+	if(origin)
+		color = origin.color
+		set_light(origin.light_range, origin.light_power, origin.light_color)