diff --git a/html/changelog.html b/html/changelog.html
index 5f6a99c64f7..c1e74495c40 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,52 @@
-->
+
17 June 2017
+
Expletive updated:
+
+ - The Captain now starts with a deluxe fountain pen in their PDA.
+ - The quartermaster, curator, research director, lawyer, and bartender start with normal fountain pens in their PDAs.
+ - Cargo can order fountain pens via the Calligraphy Crate.
+
+
Joan updated:
+
+ - Cultists must be human to run for Cult Master status.
+
+
MrStonedOne and Lummox JR updated:
+
+ - Fixed icon scaling and size preferences not loading (Technically size preferences were loading because byond saves that locally, but that's not reliable because ss13 shares a hub)
+
+
QualityVan updated:
+
+ - The botany vending machine now has a stock of onion seeds
+
+
Steelpoint updated:
+
+ - Slightly reshuffles the Head of Security's, and Research Directors, locker to place fluff items below essential items.
+
+
Tacolizard updated:
+
+ - Flashes no longer have a tech requirement
+
+
That Really Good Soda Flavor updated:
+
+ - High luminosity eyes will have material science instead of an error research type
+
+
Thunder12345 and Improvedname updated:
+
+ - You can now turn severed cat tails and ears into genuine kitty ears
+ - Cat tails can now be used to make a cat o' nine tails, similarly to the liz o' nine tails.
+
+
Xhuis updated:
+
+ - The names of the hand drill, jaws of life, and emitter are now lowercase.
+ - The descriptions of the hand drill, jaws of life, and emitter have been changed to be more descriptive and less lengthy.
+
+
bandit updated:
+
+ - Default short/medium/long brig times are now, in order, 2, 3, and 5 minutes.
+
+
14 June 2017
Expletive updated:
@@ -1551,27 +1597,6 @@
- Since drones are allowed to interact with pAIs, pAIs in mobile chassis form are no longer distorted to drone viewpoints.
- The shuttle's arrival can no longer be delayed after Nar-Sie's arrival. The End cannot be delayed.
-
-
15 April 2017
-
Cyberboss updated:
-
- - Holopads can no longer be interacted with while unpowered
-
-
Davidj361 updated:
-
- - Monkeys won't pickup items or rob you while they are in your stomach, neither walk out of your stomach.
- - You can't cheat with eyewear/eye-implants when using advanced cameras
- - Mutant digitigrade legs re-added to the ashwalker species
-
-
Robustin updated:
-
- - The Prototype Emitter, will function like an ordinary emitter while also charging a secondary power supply that will allow a buckled user to manually fire the emitter. Returning to automatic fire will have the emitter continue to fire at the last target struck by manual fire.
- - The Engineering Dance Machine, along with assorted effects/sounds.
-
-
coiax updated:
-
- - Plasmamen no longer burn to death while inside a cloning pod.
-
GoonStation 13 Development Team
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 655c72494c4..63b8d0d279c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -11878,3 +11878,35 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
Tacolizard:
- bugfix: Flamethrowers no longer say they're being ignited when you extinguish
them
+2017-06-17:
+ Expletive:
+ - rscadd: The Captain now starts with a deluxe fountain pen in their PDA.
+ - rscadd: The quartermaster, curator, research director, lawyer, and bartender start
+ with normal fountain pens in their PDAs.
+ - rscadd: Cargo can order fountain pens via the Calligraphy Crate.
+ Joan:
+ - rscdel: Cultists must be human to run for Cult Master status.
+ MrStonedOne and Lummox JR:
+ - bugfix: Fixed icon scaling and size preferences not loading (Technically size
+ preferences were loading because byond saves that locally, but that's not reliable
+ because ss13 shares a hub)
+ QualityVan:
+ - rscadd: The botany vending machine now has a stock of onion seeds
+ Steelpoint:
+ - tweak: Slightly reshuffles the Head of Security's, and Research Directors, locker
+ to place fluff items below essential items.
+ Tacolizard:
+ - rscdel: Flashes no longer have a tech requirement
+ That Really Good Soda Flavor:
+ - bugfix: High luminosity eyes will have material science instead of an error research
+ type
+ Thunder12345 and Improvedname:
+ - rscadd: You can now turn severed cat tails and ears into genuine kitty ears
+ - rscadd: Cat tails can now be used to make a cat o' nine tails, similarly to the
+ liz o' nine tails.
+ Xhuis:
+ - spellcheck: The names of the hand drill, jaws of life, and emitter are now lowercase.
+ - spellcheck: The descriptions of the hand drill, jaws of life, and emitter have
+ been changed to be more descriptive and less lengthy.
+ bandit:
+ - tweak: Default short/medium/long brig times are now, in order, 2, 3, and 5 minutes.
diff --git a/html/changelogs/AutoChangeLog-pr-28382.yml b/html/changelogs/AutoChangeLog-pr-28382.yml
deleted file mode 100644
index 8e85daf413c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28382.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Expletive"
-delete-after: True
-changes:
- - rscadd: "The Captain now starts with a deluxe fountain pen in their PDA."
- - rscadd: "The quartermaster, curator, research director, lawyer, and bartender start with normal fountain pens in their PDAs."
- - rscadd: "Cargo can order fountain pens via the Calligraphy Crate."
diff --git a/html/changelogs/AutoChangeLog-pr-28395.yml b/html/changelogs/AutoChangeLog-pr-28395.yml
deleted file mode 100644
index 777a916a9d9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28395.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Thunder12345 and Improvedname"
-delete-after: True
-changes:
- - rscadd: "You can now turn severed cat tails and ears into genuine kitty ears"
- - rscadd: "Cat tails can now be used to make a cat o' nine tails, similarly to the liz o' nine tails."
diff --git a/html/changelogs/AutoChangeLog-pr-28414.yml b/html/changelogs/AutoChangeLog-pr-28414.yml
deleted file mode 100644
index a9aa70e1fcc..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28414.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "QualityVan"
-delete-after: True
-changes:
- - rscadd: "The botany vending machine now has a stock of onion seeds"
diff --git a/html/changelogs/AutoChangeLog-pr-28449.yml b/html/changelogs/AutoChangeLog-pr-28449.yml
deleted file mode 100644
index 93a43d25a2c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28449.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "That Really Good Soda Flavor"
-delete-after: True
-changes:
- - bugfix: "High luminosity eyes will have material science instead of an error research type"
diff --git a/html/changelogs/AutoChangeLog-pr-28451.yml b/html/changelogs/AutoChangeLog-pr-28451.yml
deleted file mode 100644
index 4e1745b0b5a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28451.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "bandit"
-delete-after: True
-changes:
- - tweak: "Default short/medium/long brig times are now, in order, 2, 3, and 5 minutes."
diff --git a/html/changelogs/AutoChangeLog-pr-28473.yml b/html/changelogs/AutoChangeLog-pr-28473.yml
deleted file mode 100644
index 83ff3839ef9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28473.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Joan"
-delete-after: True
-changes:
- - rscdel: "Cultists must be human to run for Cult Master status."
diff --git a/html/changelogs/AutoChangeLog-pr-28475.yml b/html/changelogs/AutoChangeLog-pr-28475.yml
deleted file mode 100644
index 7ba55f17849..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28475.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrStonedOne and Lummox JR"
-delete-after: True
-changes:
- - bugfix: "Fixed icon scaling and size preferences not loading (Technically size preferences were loading because byond saves that locally, but that's not reliable because ss13 shares a hub)"
diff --git a/html/changelogs/AutoChangeLog-pr-28487.yml b/html/changelogs/AutoChangeLog-pr-28487.yml
deleted file mode 100644
index 13e9adf32b1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28487.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Steelpoint"
-delete-after: True
-changes:
- - tweak: "Slightly reshuffles the Head of Security's, and Research Directors, locker to place fluff items below essential items."
diff --git a/html/changelogs/AutoChangeLog-pr-28493.yml b/html/changelogs/AutoChangeLog-pr-28493.yml
deleted file mode 100644
index 0e38b47fdf1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28493.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Xhuis"
-delete-after: True
-changes:
- - spellcheck: "The names of the hand drill, jaws of life, and emitter are now lowercase."
- - spellcheck: "The descriptions of the hand drill, jaws of life, and emitter have been changed to be more descriptive and less lengthy."
diff --git a/html/changelogs/AutoChangeLog-pr-28495.yml b/html/changelogs/AutoChangeLog-pr-28495.yml
deleted file mode 100644
index babfac7849b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28495.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tacolizard"
-delete-after: True
-changes:
- - rscdel: "Flashes no longer have a tech requirement"