Merge pull request #10352 from Baystation12/dev-freeze

Dev freeze

code/modules/admin/player_notes.dm

@@ -134,7 +134,7 @@ datum/admins/proc/notes_gethtml(var/ckey)
 	qdel(info)
 
 /proc/show_player_info_irc(var/key as text)
-	var/dat = "          Info on [key]%0D%0A"
+	var/dat = "          Info on [key]\n"
 	var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav")
 	var/list/infos
 	info >> infos
@@ -142,6 +142,6 @@ datum/admins/proc/notes_gethtml(var/ckey)
 		dat = "No information found on the given key."
 	else
 		for(var/datum/player_info/I in infos)
-			dat += "[I.content]%0D%0Aby [I.author] ([I.rank]) on [I.timestamp]%0D%0A%0D%0A"
+			dat += "[I.content]\nby [I.author] ([I.rank]) on [I.timestamp]\n\n"
 
-	return dat
+	return list2params(list(dat))

html/changelog.html

@@ -56,6 +56,13 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">29 July 2015</h2>
+			<h3 class="author">Karolis2011 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Made tagger and sorting pipes dispensible.</li>
+				<li class="bugfix">Unwelding and welding sorting/tagger pipes, no longer delete data about them.</li>
+			</ul>
+
 			<h2 class="date">27 July 2015</h2>
 			<h3 class="author">Kelenius updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -2090,3 +2090,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Borg shaker now works similarly to hypospray. It generates reagents that
       can be poured into glasses.
   - bugfix: Therefore, they can no longer duplicate rare reagents such as phoron.
+2015-07-29:
+  Karolis2011:
+  - rscadd: Made tagger and sorting pipes dispensible.
+  - bugfix: Unwelding and welding sorting/tagger pipes, no longer delete data about
+      them.