diff --git a/code/defines/obj/clothing/gimmick.dm b/code/defines/obj/clothing/gimmick.dm
index ca1f010a1c4..bd0aa4c763f 100644
--- a/code/defines/obj/clothing/gimmick.dm
+++ b/code/defines/obj/clothing/gimmick.dm
@@ -188,14 +188,14 @@
 	icon_state = "monocle"
 	item_state = "headset" // lol
 
-/obj/item/clothing/under/rank/captain/suit
+/obj/item/clothing/under/gimmick/rank/captain/suit
 	name = "Captain's Suit"
 	desc = "A green suit and yellow necktie. Exemplifies authority."
 	icon_state = "green_suit"
 	item_state = "dg_suit"
 	color = "green_suit"
 
-/obj/item/clothing/under/rank/head_of_personnel/suit
+/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit
 	name = "Head of Personnel's Suit"
 	desc = "A teal suit and yellow necktie. An authoritative yet tacky ensemble."
 	icon_state = "teal_suit"
@@ -216,7 +216,7 @@
 	item_state = "r_suit"
 	color = "red_suit"
 
-/obj/item/clothing/under/rank/police
+/obj/item/clothing/under/gimmick/rank/police
 	name = "Police Uniform"
 	desc = "Move along, nothing to see here."
 	icon_state = "police"
diff --git a/code/game/objects/items/clothing.dm b/code/game/objects/items/clothing.dm
index 075c0a56812..66746c54d5d 100644
--- a/code/game/objects/items/clothing.dm
+++ b/code/game/objects/items/clothing.dm
@@ -194,6 +194,17 @@ DEATH COMMANDO GAS MASK
 		var/obj/item/clothing/under/V = new U
 		src.clothing_choices += V
 
+	for(var/U in typesof(/obj/item/clothing/under/rank)-(/obj/item/clothing/under/rank))
+
+		var/obj/item/clothing/under/V = new U
+		src.clothing_choices += V
+
+	src.clothing_choices += new /obj/item/clothing/under/bartender
+	src.clothing_choices += new /obj/item/clothing/under/cargo
+	src.clothing_choices += new /obj/item/clothing/under/chef
+	src.clothing_choices += new /obj/item/clothing/under/clown
+	src.clothing_choices += new /obj/item/clothing/under/det
+	src.clothing_choices += new /obj/item/clothing/under/librarian
 
 	return
 
diff --git a/icons/changelog.html b/icons/changelog.html
index 2c0ac553a1a..9d8dcc9f249 100644
--- a/icons/changelog.html
+++ b/icons/changelog.html
@@ -41,6 +41,27 @@
 	<strong>Thanks to:</strong> CDK Station devs, GoonStation devs and original SpaceStation developers
 
 <h4>Changelog</h4>
+<h5>Tuesday, October 5, 01:41</h5>
+<ul>
+	<li>Fixes to various nonworking cocktails.</li>
+	<li>More map and runtime error fixes.</li>
+	<li>Nuke operative headsets should be on an unreachable frequency like department headsets.</li>
+	<li>Another AI Malfunction change:  Now once the AI thinks enough APCs have been hacked, it must press a button to start the timer, which alerts the station to its treachery.</li>
+	<li>Blob reskinned to magma and increased in power.</li>
+	<li>The HoS now has an armored greatcoat instead of a regular armor vest.</li>
+	<li>Admin logs now show who killswitched a cyborg.</li>
+	<li>The roboticist terminal now lets you see which AI a cyborg is linked to.</li>
+	<li>Malf AIs are no longer treated as inactive for the purpose of law updates and cyborg sync while hacking APCs.</li>
+	<li>Traitor AIs are now affected by Reset/Purge/Asimov modules, except law 0.</li>
+	<li>AI core construction sprites updated.</li>
+	<li>Securitrons removed from the Thunderdome.</li>
+	<li>An APC now supplies power to the bomb testing area, and has external cabling to supply it in turn.</li>
+	<li>A new variant freeform module has been added to the AI Upload room.</li>
+	<li>The changeling's neurotoxic dart has been made more powerful - this will likely be an optional upgrade from a set of choices, akin to wizard spells.</li>
+	<li>Some gimmick clothes moved to a different object path.</li>
+	<li><B>The chameleon jumpsuit should now be more useful - it includes job-specific jumpsuits as well as flat colours.</B></li>
+</ul>
+
 <h5>Wednesday, September 29, 15:40</h5>
 <ul>
 	<li><B>Bartender update!</b>  Bartender now has a Booze-O-Mat vending machine dispensing spirits and glasses, which he can use to mix cocktails.  Recipes for cocktails are available on the wiki.</li>