From 09a8f37d6c086573601adb04ac41dc8dffa0fbaf Mon Sep 17 00:00:00 2001
From: GinjaNinja32 <ginjaninja32@gmail.com>
Date: Tue, 28 Jul 2015 10:59:51 +0100
Subject: [PATCH 1/3] Changes show_player_info_irc to properly escape '%'

---
 code/modules/admin/player_notes.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm
index 25f6638ee0..790b12b06b 100644
--- a/code/modules/admin/player_notes.dm
+++ b/code/modules/admin/player_notes.dm
@@ -134,7 +134,7 @@ datum/admins/proc/notes_gethtml(var/ckey)
 	del 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))

From aa899b832130b0969f5790cc556482028f02437f Mon Sep 17 00:00:00 2001
From: Karolis2011 <kundrotaskarolis3@gmail.com>
Date: Wed, 29 Jul 2015 10:20:29 +0300
Subject: [PATCH 2/3] Added changelog for #9673 and #9308.

---
 html/changelogs/Karolis2011-pipe-dipensers.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 html/changelogs/Karolis2011-pipe-dipensers.yml

diff --git a/html/changelogs/Karolis2011-pipe-dipensers.yml b/html/changelogs/Karolis2011-pipe-dipensers.yml
new file mode 100644
index 0000000000..f705d74c8d
--- /dev/null
+++ b/html/changelogs/Karolis2011-pipe-dipensers.yml
@@ -0,0 +1,5 @@
+author: Karolis2011
+delete-after: True
+changes: 
+  - rscadd: "Made tagger and sorting pipes dispensible."
+  - bugfix: "Unwelding and welding sorting/tagger pipes, no longer delete data about them."

From ee69db6ae9c8bd866660f86b983aeb6a2985e0cd Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Wed, 29 Jul 2015 11:57:55 +0200
Subject: [PATCH 3/3] Updates changelog.

---
 html/changelog.html                            | 7 +++++++
 html/changelogs/.all_changelog.yml             | 5 +++++
 html/changelogs/Karolis2011-pipe-dipensers.yml | 5 -----
 3 files changed, 12 insertions(+), 5 deletions(-)
 delete mode 100644 html/changelogs/Karolis2011-pipe-dipensers.yml

diff --git a/html/changelog.html b/html/changelog.html
index d6b531d013..08fec2e304 100644
--- a/html/changelog.html
+++ b/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">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c2fe49f111..748013489c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1980,3 +1980,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.
diff --git a/html/changelogs/Karolis2011-pipe-dipensers.yml b/html/changelogs/Karolis2011-pipe-dipensers.yml
deleted file mode 100644
index f705d74c8d..0000000000
--- a/html/changelogs/Karolis2011-pipe-dipensers.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Karolis2011
-delete-after: True
-changes: 
-  - rscadd: "Made tagger and sorting pipes dispensible."
-  - bugfix: "Unwelding and welding sorting/tagger pipes, no longer delete data about them."