diff --git a/html/changelog.html b/html/changelog.html
index 04f018f7ba..550e911e4a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,37 @@
-->
+
17 September 2020
+
DeltaFire15 updated:
+
+ - Failing the plushmium reaction can now create peculiar plushies, depending on reaction volume.
+ - The mood-buff from petting a plushie now works properly again.
+ - Fixed wacky necropolis loot chest behavior
+
+
EmeraldSundisk updated:
+
+ - Adds the Research Director's office to Omega Station
+ - Adds 2 new solar arrays (and control rooms)
+ - Adds some action figures that weren't there previously
+ - The CMO's office now has a light switch
+ - Slight readjustments to impacted areas
+ - Readjusts the toxins air supply line to (ideally) be easier to service
+ - Department camera consoles should now be able to actually check appropriate cameras
+ - Xenobiology can now be locked down (by the Research Director)
+
+
MrJWhit updated:
+
+ - Adds a brain damage line
+
+
Putnam3145 updated:
+
+ - Your balls finally feel full, again.
+
+
timothyteakettle updated:
+
+ - due to changes in policy, and several lawsuits, Nanotrasen has been forced to allow disabled people to sign up
+
+
16 September 2020
timothyteakettle updated:
@@ -1359,39 +1390,6 @@
- martial arts twenty minpop
- records
-
-
17 July 2020
-
ShizCalev, Fikou updated:
-
- - Added some sanity checking for varedit values.
- - Fixed an exploit involving coins and mints that could crash the server.
- - Fixed an exploit that would allow you to destroy round-critical / indestructible items with folders.
- - Swarmers can no longer cut power lines by deconstructing catwalks underneath them.
- - Fixed a scenario that allowed infinite resource generation via ore machines.
- - you can no longer inject html in ahelps
- - you cant either, jannies
-
-
timothyteakettle updated:
-
- - fixes a small pickle related issue
- - recent culinary and scientific advancements have brought forth new pickle related technologies
-
-
-
16 July 2020
-
DeltaFire15 updated:
-
- - Fixes a zeolite runtime caused by a missing check.
-
-
Sneakyrat6 updated:
-
- - Fixes being able to meta people real name with OOC Notes
-
-
timothyteakettle updated:
-
- - travelling traders from another dimension can now visit the station in search of something specific, and reward you for giving it to them
- - small error with pet carrier logic fixed and also making sure simple mobs are catered for properly inside bluespace jars
- - fixes coin related issue
-
GoonStation 13 Development Team
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 8c2e0680a6..d4197fd1aa 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -27321,3 +27321,26 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
2020-09-16:
timothyteakettle:
- tweak: fixed an icon path
+2020-09-17:
+ DeltaFire15:
+ - rscadd: Failing the plushmium reaction can now create peculiar plushies, depending
+ on reaction volume.
+ - bugfix: The mood-buff from petting a plushie now works properly again.
+ - bugfix: Fixed wacky necropolis loot chest behavior
+ EmeraldSundisk:
+ - rscadd: Adds the Research Director's office to Omega Station
+ - rscadd: Adds 2 new solar arrays (and control rooms)
+ - rscadd: Adds some action figures that weren't there previously
+ - rscadd: The CMO's office now has a light switch
+ - tweak: Slight readjustments to impacted areas
+ - tweak: Readjusts the toxins air supply line to (ideally) be easier to service
+ - bugfix: Department camera consoles should now be able to actually check appropriate
+ cameras
+ - bugfix: Xenobiology can now be locked down (by the Research Director)
+ MrJWhit:
+ - rscadd: Adds a brain damage line
+ Putnam3145:
+ - bugfix: Your balls finally feel full, again.
+ timothyteakettle:
+ - rscadd: due to changes in policy, and several lawsuits, Nanotrasen has been forced
+ to allow disabled people to sign up
diff --git a/html/changelogs/AutoChangeLog-pr-13255.yml b/html/changelogs/AutoChangeLog-pr-13255.yml
deleted file mode 100644
index 6f4c7a4b51..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13255.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "due to changes in policy, and several lawsuits, Nanotrasen has been forced to allow disabled people to sign up"
diff --git a/html/changelogs/AutoChangeLog-pr-13356.yml b/html/changelogs/AutoChangeLog-pr-13356.yml
deleted file mode 100644
index cb8769d0e3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13356.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-author: "EmeraldSundisk"
-delete-after: True
-changes:
- - rscadd: "Adds the Research Director's office to Omega Station"
- - rscadd: "Adds 2 new solar arrays (and control rooms)"
- - rscadd: "Adds some action figures that weren't there previously"
- - rscadd: "The CMO's office now has a light switch"
- - tweak: "Slight readjustments to impacted areas"
- - tweak: "Readjusts the toxins air supply line to (ideally) be easier to service"
- - bugfix: "Department camera consoles should now be able to actually check appropriate cameras"
- - bugfix: "Xenobiology can now be locked down (by the Research Director)"
diff --git a/html/changelogs/AutoChangeLog-pr-13362.yml b/html/changelogs/AutoChangeLog-pr-13362.yml
deleted file mode 100644
index b8fbfc3de2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13362.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "Your balls finally feel full, again."
diff --git a/html/changelogs/AutoChangeLog-pr-13365.yml b/html/changelogs/AutoChangeLog-pr-13365.yml
deleted file mode 100644
index af5974aa87..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13365.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Fixed wacky necropolis loot chest behavior"
diff --git a/html/changelogs/AutoChangeLog-pr-13387.yml b/html/changelogs/AutoChangeLog-pr-13387.yml
deleted file mode 100644
index 26a059e935..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13387.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - rscadd: "Adds a brain damage line"
diff --git a/html/changelogs/AutoChangeLog-pr-13388.yml b/html/changelogs/AutoChangeLog-pr-13388.yml
deleted file mode 100644
index f032d958c1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13388.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - rscadd: "Failing the plushmium reaction can now create peculiar plushies, depending on reaction volume."
- - bugfix: "The mood-buff from petting a plushie now works properly again."
diff --git a/icons/obj/custom.dmi b/icons/obj/custom.dmi
index 42c68149a5..50f536d1d3 100644
Binary files a/icons/obj/custom.dmi and b/icons/obj/custom.dmi differ
diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm
index e70653c61f..8dfb613594 100644
--- a/modular_citadel/code/modules/custom_loadout/custom_items.dm
+++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm
@@ -565,4 +565,4 @@
icon_state = "halo"
item_state = "halo"
icon = 'icons/mob/clothing/custom_w.dmi'
- mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
\ No newline at end of file