From b292726a645e8ead12f7848b563d11033c4e050a Mon Sep 17 00:00:00 2001
From: Chiirno <GeniusChiruno@gmail.com>
Date: Sat, 30 Jan 2021 14:59:25 -0400
Subject: [PATCH 01/19] I think this will correct the merge

---
 html/changelog.html | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index bf38e39d2e..642e8ba155 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -5,7 +5,7 @@
   <link rel="stylesheet" type="text/css" href="changelog.css">
   <base target="_blank" />
   <script type='text/javascript'>
-  
+
 	function changeText(tagID, newText, linkTagID){
 		var tag = document.getElementById(tagID);
 		tag.innerHTML = newText;
@@ -13,8 +13,8 @@
 		linkTag.removeAttribute("href");
 		linkTag.removeAttribute("onclick");
 	}
-	
-  </script>  
+
+  </script>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
@@ -24,7 +24,7 @@
 	<tr>
 		<td valign='top'>
 			<div align='center'><font size='3'><b>Traditional Games Space Station 13</b></font></div>
-			
+
 			<p><div align='center'><font size='3'><a href="https://citadel-station.net/forum/index.php">Forum</a> | <a href="https://citadel-station.net/wiki/index.php?title=Main_Page">Wiki</a> | <a href="https://github.com/Citadel-Station-13/Citadel-Station-13">Source</a></font></div></p>
 			</td>
 	</tr>
@@ -42,11 +42,11 @@
 </table>
 
 		<!--
-		
-		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE. 
-		
+
+		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE.
+
 		*** DO NOT FUCK WITH THIS FILE OR YOU WILL CAUSE MERGE CONFLICTS. ***
-		
+
 		-->
 		<div class="commit sansserif">
 
@@ -157,6 +157,7 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">The drop circuit can no longer drop things that are not inside it.</li>
 			</ul>
+			<h2 class="date">27 January 2021</h2>
 			<h3 class="author">raspy-on-osu updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">bespoke ventcrawling element not detaching due to malformed call</li>

From dd540c29fb0971e8e9085e1a2d6ce90e6be6fe8a Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Wed, 27 Jan 2021 00:46:54 +0000
Subject: [PATCH 02/19] Automatic changelog compile [ci skip]

---
 html/changelogs/.all_changelog.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 6db77b0bb0..40bd739711 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -28271,6 +28271,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   silicons:
   - tweak: you can now shove yourself up in any intent, not just help.
 2021-01-27:
+<<<<<<< HEAD
   ArcaneMusic, ported by Hatterhat:
   - rscadd: Strike a hydroponics tray with a fully-charged floral somatoray to lock
       in a mutation.
@@ -28368,3 +28369,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2021-02-03:
   Hatterhat:
   - bugfix: The green energy sabre's sprite now respects proper handedness.
+=======
+  raspy-on-osu:
+  - bugfix: bespoke ventcrawling element not detaching due to malformed call
+>>>>>>> a704286c2d... Automatic changelog compile [ci skip]

From 3ae79ce43367911af5b4f7cd77b01a7e6a84eec3 Mon Sep 17 00:00:00 2001
From: Chiirno <GeniusChiruno@gmail.com>
Date: Sat, 30 Jan 2021 14:54:45 -0400
Subject: [PATCH 03/19] yesss?

---
 html/changelogs/.all_changelog.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 40bd739711..d5e2b1be4c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -28271,7 +28271,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   silicons:
   - tweak: you can now shove yourself up in any intent, not just help.
 2021-01-27:
-<<<<<<< HEAD
   ArcaneMusic, ported by Hatterhat:
   - rscadd: Strike a hydroponics tray with a fully-charged floral somatoray to lock
       in a mutation.
@@ -28370,6 +28369,4 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Hatterhat:
   - bugfix: The green energy sabre's sprite now respects proper handedness.
 =======
-  raspy-on-osu:
-  - bugfix: bespoke ventcrawling element not detaching due to malformed call
->>>>>>> a704286c2d... Automatic changelog compile [ci skip]
+>>>>>>> 5ad3b97dc1... yesss?

From 398d8cc9c4c4e553935cc4cee125e0cb12a94a0f Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sun, 31 Jan 2021 00:50:04 +0000
Subject: [PATCH 04/19] Automatic changelog compile [ci skip]

---
 html/changelog.html                | 15 +++++++--------
 html/changelogs/.all_changelog.yml |  3 +++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index 642e8ba155..30bf775e19 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -5,7 +5,7 @@
   <link rel="stylesheet" type="text/css" href="changelog.css">
   <base target="_blank" />
   <script type='text/javascript'>
-
+  
 	function changeText(tagID, newText, linkTagID){
 		var tag = document.getElementById(tagID);
 		tag.innerHTML = newText;
@@ -13,8 +13,8 @@
 		linkTag.removeAttribute("href");
 		linkTag.removeAttribute("onclick");
 	}
-
-  </script>
+	
+  </script>  
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
@@ -42,11 +42,11 @@
 </table>
 
 		<!--
-
-		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE.
-
+		
+		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE. 
+		
 		*** DO NOT FUCK WITH THIS FILE OR YOU WILL CAUSE MERGE CONFLICTS. ***
-
+		
 		-->
 		<div class="commit sansserif">
 
@@ -157,7 +157,6 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">The drop circuit can no longer drop things that are not inside it.</li>
 			</ul>
-			<h2 class="date">27 January 2021</h2>
 			<h3 class="author">raspy-on-osu updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">bespoke ventcrawling element not detaching due to malformed call</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d5e2b1be4c..3d2937bf1f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -28361,6 +28361,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2021-01-31:
   Putnam3145:
   - balance: fermichem explosion EMPs don't cover the entire station
+<<<<<<< HEAD
 2021-02-02:
   silicons:
   - rscadd: pais can now be carried around piggybacking/fireman
@@ -28370,3 +28371,5 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: The green energy sabre's sprite now respects proper handedness.
 =======
 >>>>>>> 5ad3b97dc1... yesss?
+=======
+>>>>>>> 80a0033e5f... Automatic changelog compile [ci skip]

From c85e381169b6230f8384f23610b5baea6d19e13b Mon Sep 17 00:00:00 2001
From: Chiirno <GeniusChiruno@gmail.com>
Date: Thu, 4 Feb 2021 18:25:37 -0400
Subject: [PATCH 05/19] Waddlers rise upgit add *

---
 code/modules/clothing/shoes/miscellaneous.dm | 23 ++++++++++++++++++--
 tgstation.dme                                |  1 +
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index d99d52666b..523732dbac 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -103,6 +103,8 @@
 	slowdown = SHOES_SLOWDOWN+1
 	pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes/clown
 	lace_time = 20 SECONDS // how the hell do these laces even work??
+	var/datum/component/waddle
+	var/enabled_waddle = TRUE
 
 /obj/item/clothing/shoes/clown_shoes/Initialize()
 	. = ..()
@@ -110,14 +112,31 @@
 
 /obj/item/clothing/shoes/clown_shoes/equipped(mob/user, slot)
 	. = ..()
-	if(user.mind && HAS_TRAIT(user.mind, TRAIT_CLOWN_MENTALITY))
-		SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "noshoes")
+	if(slot == SLOT_SHOES)
+		if(enabled_waddle)
+			waddle = user.AddComponent(/datum/component/waddling)
+		if(user.mind && HAS_TRAIT(user.mind, TRAIT_CLOWN_MENTALITY))
+			SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "noshoes")
 
 /obj/item/clothing/shoes/clown_shoes/dropped(mob/user)
 	. = ..()
+	QDEL_NULL(waddle)
 	if(user.mind && HAS_TRAIT(user.mind, TRAIT_CLOWN_MENTALITY))
 		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "noshoes", /datum/mood_event/noshoes)
 
+/obj/item/clothing/shoes/clown_shoes/CtrlClick(mob/living/user)
+	if(!isliving(user))
+		return
+	if(user.get_active_held_item() != src)
+		to_chat(user, "<span class='warning'>You must hold the [src] in your hand to do this!</span>")
+		return
+	if (!enabled_waddle)
+		to_chat(user, "<span class='notice'>You switch off the waddle dampeners!</span>")
+		enabled_waddle = TRUE
+	else
+		to_chat(user, "<span class='notice'>You switch on the waddle dampeners!</span>")
+		enabled_waddle = FALSE
+
 /obj/item/clothing/shoes/clown_shoes/jester
 	name = "jester shoes"
 	desc = "A court jester's shoes, updated with modern squeaking technology."
diff --git a/tgstation.dme b/tgstation.dme
index 5ea3b652e7..bf9d0f112f 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -504,6 +504,7 @@
 #include "code\datums\components\twohanded.dm"
 #include "code\datums\components\uplink.dm"
 #include "code\datums\components\virtual_reality.dm"
+#include "code\datums\components\waddling.dm"
 #include "code\datums\components\wearertargeting.dm"
 #include "code\datums\components\wet_floor.dm"
 #include "code\datums\components\crafting\crafting.dm"

From e58f1700574eda4f476c1d155ca564560baadb76 Mon Sep 17 00:00:00 2001
From: Chiirno <GeniusChiruno@gmail.com>
Date: Thu, 4 Feb 2021 19:37:34 -0400
Subject: [PATCH 06/19] begrudgingly added ctrl+click to the examine info.

---
 code/modules/clothing/shoes/miscellaneous.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 523732dbac..cc14424980 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -97,7 +97,7 @@
 	SEND_SIGNAL(t_loc, COMSIG_TURF_MAKE_DRY, TURF_WET_WATER, TRUE, INFINITY)
 
 /obj/item/clothing/shoes/clown_shoes
-	desc = "The prankster's standard-issue clowning shoes. Damn, they're huge!"
+	desc = "The prankster's standard-issue clowning shoes. Damn, they're huge! Ctrl-click to toggle waddle dampeners."
 	name = "clown shoes"
 	icon_state = "clown_shoes"
 	slowdown = SHOES_SLOWDOWN+1

From 02c6f94fb3576734a7f5f62c43c5e6b866dc1fa3 Mon Sep 17 00:00:00 2001
From: Chiirno <GeniusChiruno@gmail.com>
Date: Thu, 4 Feb 2021 20:04:39 -0400
Subject: [PATCH 07/19] why was the changelog changed

---
 html/changelogs/.all_changelog.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 3d2937bf1f..6db77b0bb0 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -28361,7 +28361,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2021-01-31:
   Putnam3145:
   - balance: fermichem explosion EMPs don't cover the entire station
-<<<<<<< HEAD
 2021-02-02:
   silicons:
   - rscadd: pais can now be carried around piggybacking/fireman
@@ -28369,7 +28368,3 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2021-02-03:
   Hatterhat:
   - bugfix: The green energy sabre's sprite now respects proper handedness.
-=======
->>>>>>> 5ad3b97dc1... yesss?
-=======
->>>>>>> 80a0033e5f... Automatic changelog compile [ci skip]

From 1c8b6e784210b82173231a0ef25b225d66a114a5 Mon Sep 17 00:00:00 2001
From: Chiirno <GeniusChiruno@gmail.com>
Date: Thu, 4 Feb 2021 20:06:17 -0400
Subject: [PATCH 08/19] Now it is pristine

---
 html/changelog.html | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index 30bf775e19..68f3b8e170 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -5,7 +5,7 @@
   <link rel="stylesheet" type="text/css" href="changelog.css">
   <base target="_blank" />
   <script type='text/javascript'>
-  
+
 	function changeText(tagID, newText, linkTagID){
 		var tag = document.getElementById(tagID);
 		tag.innerHTML = newText;
@@ -13,8 +13,8 @@
 		linkTag.removeAttribute("href");
 		linkTag.removeAttribute("onclick");
 	}
-	
-  </script>  
+
+  </script>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
@@ -24,7 +24,6 @@
 	<tr>
 		<td valign='top'>
 			<div align='center'><font size='3'><b>Traditional Games Space Station 13</b></font></div>
-
 			<p><div align='center'><font size='3'><a href="https://citadel-station.net/forum/index.php">Forum</a> | <a href="https://citadel-station.net/wiki/index.php?title=Main_Page">Wiki</a> | <a href="https://github.com/Citadel-Station-13/Citadel-Station-13">Source</a></font></div></p>
 			</td>
 	</tr>
@@ -42,11 +41,11 @@
 </table>
 
 		<!--
-		
-		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE. 
-		
+
+		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE.
+
 		*** DO NOT FUCK WITH THIS FILE OR YOU WILL CAUSE MERGE CONFLICTS. ***
-		
+
 		-->
 		<div class="commit sansserif">
 

From da7f6cfb5149c42994c0cb2051bab8d4e1c9402b Mon Sep 17 00:00:00 2001
From: Chiirno <GeniusChiruno@gmail.com>
Date: Thu, 4 Feb 2021 20:11:01 -0400
Subject: [PATCH 09/19] nevermind

---
 html/changelog.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index 30bf775e19..435d0a19d3 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -5,7 +5,7 @@
   <link rel="stylesheet" type="text/css" href="changelog.css">
   <base target="_blank" />
   <script type='text/javascript'>
-  
+
 	function changeText(tagID, newText, linkTagID){
 		var tag = document.getElementById(tagID);
 		tag.innerHTML = newText;
@@ -13,8 +13,8 @@
 		linkTag.removeAttribute("href");
 		linkTag.removeAttribute("onclick");
 	}
-	
-  </script>  
+
+  </script>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
@@ -42,11 +42,11 @@
 </table>
 
 		<!--
-		
-		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE. 
-		
+
+		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE.
+
 		*** DO NOT FUCK WITH THIS FILE OR YOU WILL CAUSE MERGE CONFLICTS. ***
-		
+
 		-->
 		<div class="commit sansserif">
 

From 36635a7d237624ccb87bf8d5338ea3f615290aaa Mon Sep 17 00:00:00 2001
From: Chiirno <43803700+Chiirno@users.noreply.github.com>
Date: Thu, 4 Feb 2021 20:13:51 -0400
Subject: [PATCH 10/19] Update changelog.html

---
 html/changelog.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/html/changelog.html b/html/changelog.html
index 68f3b8e170..e7dd6dc8d2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -41,7 +41,6 @@
 </table>
 
 		<!--
-
 		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE.
 
 		*** DO NOT FUCK WITH THIS FILE OR YOU WILL CAUSE MERGE CONFLICTS. ***

From ec8b154495e007f7536174a688e4f37cdb168012 Mon Sep 17 00:00:00 2001
From: Chiirno <GeniusChiruno@gmail.com>
Date: Thu, 4 Feb 2021 20:27:44 -0400
Subject: [PATCH 11/19] just gonna replace the whole darn thing

---
 html/changelog.html | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/html/changelog.html b/html/changelog.html
index e7dd6dc8d2..71e146dae2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -24,6 +24,7 @@
 	<tr>
 		<td valign='top'>
 			<div align='center'><font size='3'><b>Traditional Games Space Station 13</b></font></div>
+
 			<p><div align='center'><font size='3'><a href="https://citadel-station.net/forum/index.php">Forum</a> | <a href="https://citadel-station.net/wiki/index.php?title=Main_Page">Wiki</a> | <a href="https://github.com/Citadel-Station-13/Citadel-Station-13">Source</a></font></div></p>
 			</td>
 	</tr>
@@ -41,6 +42,7 @@
 </table>
 
 		<!--
+
 		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE.
 
 		*** DO NOT FUCK WITH THIS FILE OR YOU WILL CAUSE MERGE CONFLICTS. ***
@@ -48,6 +50,32 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">05 February 2021</h2>
+			<h3 class="author">SmArtKar updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">The orbit menu now has an Auto-Observe button! No more sifting through the lame observe menu to snoop in people's backpacks! Also, orbit menu now refreshes.</li>
+				<li class="bugfix">KAs are no longer getting broken when fired by a circuit</li>
+			</ul>
+			<h3 class="author">keronshb updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">Force and damage > 15 from 18/25</li>
+				<li class="balance">Knockdown put down to 5 from 30</li>
+				<li class="balance">Armor pen down to 10 from 100.</li>
+				<li class="balance">Makes cell chargers, charge faster.</li>
+			</ul>
+			<h3 class="author">raspy-on-osu updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">alien royals can no longer ventcrawl</li>
+			</ul>
+			<h3 class="author">shellspeed1 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">There actually needs to be people for zombies to happen now.</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">dwarf facial hair is no longer randomised</li>
+			</ul>
+
 			<h2 class="date">03 February 2021</h2>
 			<h3 class="author">Hatterhat updated:</h3>
 			<ul class="changes bgimages16">

From 161f1bae4b469c7f3b7bca0d080f5999eb8741bf Mon Sep 17 00:00:00 2001
From: Chiirno <GeniusChiruno@gmail.com>
Date: Thu, 4 Feb 2021 23:42:43 -0400
Subject: [PATCH 12/19] changelog please

---
 html/changelog.html | 40 +++++++---------------------------------
 1 file changed, 7 insertions(+), 33 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index 71e146dae2..30bf775e19 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -5,7 +5,7 @@
   <link rel="stylesheet" type="text/css" href="changelog.css">
   <base target="_blank" />
   <script type='text/javascript'>
-
+  
 	function changeText(tagID, newText, linkTagID){
 		var tag = document.getElementById(tagID);
 		tag.innerHTML = newText;
@@ -13,8 +13,8 @@
 		linkTag.removeAttribute("href");
 		linkTag.removeAttribute("onclick");
 	}
-
-  </script>
+	
+  </script>  
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
@@ -42,40 +42,14 @@
 </table>
 
 		<!--
-
-		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE.
-
+		
+		TO ADD AN ENTRY, ADD AND MAINTAIN YOUR OWN changelog/USERNAME.yml FILE. 
+		
 		*** DO NOT FUCK WITH THIS FILE OR YOU WILL CAUSE MERGE CONFLICTS. ***
-
+		
 		-->
 		<div class="commit sansserif">
 
-			<h2 class="date">05 February 2021</h2>
-			<h3 class="author">SmArtKar updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">The orbit menu now has an Auto-Observe button! No more sifting through the lame observe menu to snoop in people's backpacks! Also, orbit menu now refreshes.</li>
-				<li class="bugfix">KAs are no longer getting broken when fired by a circuit</li>
-			</ul>
-			<h3 class="author">keronshb updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">Force and damage > 15 from 18/25</li>
-				<li class="balance">Knockdown put down to 5 from 30</li>
-				<li class="balance">Armor pen down to 10 from 100.</li>
-				<li class="balance">Makes cell chargers, charge faster.</li>
-			</ul>
-			<h3 class="author">raspy-on-osu updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">alien royals can no longer ventcrawl</li>
-			</ul>
-			<h3 class="author">shellspeed1 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">There actually needs to be people for zombies to happen now.</li>
-			</ul>
-			<h3 class="author">timothyteakettle updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">dwarf facial hair is no longer randomised</li>
-			</ul>
-
 			<h2 class="date">03 February 2021</h2>
 			<h3 class="author">Hatterhat updated:</h3>
 			<ul class="changes bgimages16">

From 4b5117471737bfcb7e111ad402888b1d302d12e5 Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Fri, 5 Feb 2021 16:43:18 +0000
Subject: [PATCH 13/19] Update disease_disease.dm

---
 code/modules/antagonists/disease/disease_disease.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/antagonists/disease/disease_disease.dm b/code/modules/antagonists/disease/disease_disease.dm
index c37abefab0..5e98962740 100644
--- a/code/modules/antagonists/disease/disease_disease.dm
+++ b/code/modules/antagonists/disease/disease_disease.dm
@@ -5,6 +5,7 @@
 	viable_mobtypes = list(/mob/living/carbon/human)
 	mutable = FALSE
 	var/mob/camera/disease/overmind
+	infectable_biotypes = MOB_ORGANIC|MOB_ROBOTIC
 
 /datum/disease/advance/sentient_disease/New()
 	..()

From c7f6c037f50955a464f55f4b90e5dc0d0163dd73 Mon Sep 17 00:00:00 2001
From: MrJWhit <48370570+MrJWhit@users.noreply.github.com>
Date: Sat, 6 Feb 2021 16:31:30 -0500
Subject: [PATCH 14/19] Boxstation disposals update

---
 _maps/map_files/BoxStation/BoxStation.dmm | 40 ++++++++++++++++++-----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 612d4b757c..82cad53845 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -13605,13 +13605,10 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/disposalpipe/sorting/mail{
-	dir = 2;
-	sortType = 18
-	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	dir = 4
 	},
+/obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
 "aEB" = (
@@ -56987,6 +56984,17 @@
 	icon_state = "wood-broken6"
 	},
 /area/maintenance/bar)
+"lqO" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/disposalpipe/sorting/mail/flip{
+	dir = 1;
+	sortType = 18
+	},
+/turf/open/floor/plating,
+/area/maintenance/fore)
 "lre" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/table/wood/poker,
@@ -57108,6 +57116,12 @@
 	},
 /turf/closed/wall,
 /area/maintenance/disposal/incinerator)
+"lLf" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/closed/wall/r_wall,
+/area/maintenance/fore)
 "lMg" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
@@ -58822,6 +58836,14 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/disposal)
+"pMQ" = (
+/obj/structure/window/reinforced,
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/crew_quarters/theatre)
 "pPi" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -60860,11 +60882,13 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/structure/disposalpipe/junction,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/neutral,
+/obj/structure/disposalpipe/sorting/mail{
+	sortType = 26
+	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/dorms)
 "uys" = (
@@ -84618,7 +84642,7 @@ ayD
 nez
 ngV
 xPY
-aOH
+pMQ
 hcb
 hcb
 syJ
@@ -84875,7 +84899,7 @@ ayE
 ayE
 ayE
 ayE
-ayE
+lLf
 ayE
 ayE
 ayE
@@ -85132,7 +85156,7 @@ ayH
 ayH
 ayH
 ayH
-ayH
+lqO
 ayH
 aFV
 ayH

From 7fff6a75c04ef938f39d308930f6bec01e4620f4 Mon Sep 17 00:00:00 2001
From: TyrianTyrell <55641224+TyrianTyrell@users.noreply.github.com>
Date: Sun, 7 Feb 2021 04:29:19 -0500
Subject: [PATCH 15/19] Update tongue.dm

---
 code/modules/surgery/organs/tongue.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index a3edfc2887..7cba3d358a 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -25,6 +25,7 @@
 		/datum/language/slime,
 		/datum/language/vampiric,
 		/datum/language/dwarf,
+		/datum/language/signlanguage,
 	))
 	healing_factor = STANDARD_ORGAN_HEALING*5 //Fast!!
 	decay_factor = STANDARD_ORGAN_DECAY/2

From 6563980c7edb8894487e96d36fe33b5a997a55df Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Mon, 8 Feb 2021 04:02:34 -0600
Subject: [PATCH 16/19] Automatic changelog generation for PR #14196 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-14196.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-14196.yml

diff --git a/html/changelogs/AutoChangeLog-pr-14196.yml b/html/changelogs/AutoChangeLog-pr-14196.yml
new file mode 100644
index 0000000000..482e1ceb42
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-14196.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes: 
+  - balance: "sentient viruses can now infect synths and ipcs"

From e1e9c1d628f5a861f14569c4f41220f148c7320c Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Mon, 8 Feb 2021 04:02:43 -0600
Subject: [PATCH 17/19] Automatic changelog generation for PR #14194 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-14194.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-14194.yml

diff --git a/html/changelogs/AutoChangeLog-pr-14194.yml b/html/changelogs/AutoChangeLog-pr-14194.yml
new file mode 100644
index 0000000000..bdecd1ca89
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-14194.yml
@@ -0,0 +1,5 @@
+author: "Chiirno"
+delete-after: True
+changes: 
+  - rscadd: "Adds clown waddle to clown shoes.
+Enhanced Clown Waddle Dampeners can be engaged in-hand with ctrl+click, _but why would you?_"

From 2791e9ad83f2e46cec42cb6578074674dbe8e247 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Mon, 8 Feb 2021 04:03:02 -0600
Subject: [PATCH 18/19] Automatic changelog generation for PR #14199 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-14199.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-14199.yml

diff --git a/html/changelogs/AutoChangeLog-pr-14199.yml b/html/changelogs/AutoChangeLog-pr-14199.yml
new file mode 100644
index 0000000000..1b74122223
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-14199.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes: 
+  - rscadd: "Re-adds theater disposal outlet, and makes dorms disposal able to have things sent to it on boxstation."

From b139723a523dc82bd07582b5686e2806098a4e83 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Mon, 8 Feb 2021 04:03:18 -0600
Subject: [PATCH 19/19] Automatic changelog generation for PR #14200 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-14200.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-14200.yml

diff --git a/html/changelogs/AutoChangeLog-pr-14200.yml b/html/changelogs/AutoChangeLog-pr-14200.yml
new file mode 100644
index 0000000000..2a32475366
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-14200.yml
@@ -0,0 +1,4 @@
+author: "TyrianTyrell"
+delete-after: True
+changes: 
+  - bugfix: "made default tongue able to speak signed language."