diff --git a/html/changelog.html b/html/changelog.html
index fc869a9a0f4..69c3bf7818a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,40 @@
-->
+
12 June 2015
+
Ikarrus updated:
+
+ - Gang Updates
+ - New objective: To win, Gangs must now buy a Dominator machine (50 influence) and defend it for a varying time frame.
* The location of the dominator is broadcasted to the entire station the moment it is activated
* The more territories the gang controls, the less time it will take
* Gangs no longer win by capturing territories
+ - A choice of gang outfits are now purchasable for 1 influence each
+ - Thompson SMGs aka "tommy guns" are now purchasable for 50 influence
+ - Bulletproof armor vests are now purchasable for 10 influence
+ - Gang messages are now free to send
+ - Prices of pistols and pens reduced to 20 and 30, respectively
+ - Gang spraycans have been made a lot less obvious. They look nearly identical to regular ones, now.
+ - Gangs will no longer be notified how much territory the enemy controls
+
+
Incoming5643 updated:
+
+ - Growing tired of reports of slain members, the Wizard Federation has cautiously sactioned the dark path of lichdom. Beware of the powerful lich who hides his phylactery well, for he is immortal!
+ - The trick to defeating liches is to destroy either their body or their phylactery item before they can ressurect to it. The more a lich is slain the longer it will take him to make use of his phylactery and the more likely the crew is to catch him during a vunerable moment.
+ - Due to the addition of proper liching, skeletons as a choosable race from magic mirrors has been discontinued. My apologies to the powergamers. A special admin version of the mirror that allows for skeletons has also been added to the code.
+
+
Miauw updated:
+
+ - AIs have received several minor nerfs in order to increase antagonist counterplay:
+ - AI tracking is no longer instant, it takes an amount of time that increases with distance from the AI eye, up to 4 seconds. The AI detector item will light up when an AI begins tracking.
+ - A random camera failure event has been added, which will break one or two random cameras.
+ - You can no longer keep tracking people that are outside of your camera vision.
+ - Camera wires have been removed. Screwdriver a camera to open the panel, then use wirecutters to disable it or a multitool to change the focus.
+ - You can now hit cameras with items to break them. To repair a camera, simply open the panel and use wirecutters on it.
+ - Camera alerts now only happen after a camera is reactivated.
+
+
RemieRichards updated:
+
+ - New optional explosion effect ported from /vg/'s DeityLink, Explosions that are affected by Walls and Doors
+
+
11 June 2015
Cheridan updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c90596dca91..e7f6df25d6e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2705,3 +2705,49 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
2015-06-11:
Cheridan:
- rscdel: Removes the powerdrain for individiual active modules on cyborgs.
+2015-06-12:
+ Ikarrus:
+ - experiment: Gang Updates
+ - rscadd: 'New objective: To win, Gangs must now buy a Dominator machine (50 influence)
+ and defend it for a varying time frame.
* The location of the dominator is
+ broadcasted to the entire station the moment it is activated
* The more territories
+ the gang controls, the less time it will take
* Gangs no longer win by capturing
+ territories'
+ - rscadd: A choice of gang outfits are now purchasable for 1 influence each
+ - rscadd: Thompson SMGs aka "tommy guns" are now purchasable for 50 influence
+ - rscadd: Bulletproof armor vests are now purchasable for 10 influence
+ - tweak: Gang messages are now free to send
+ - tweak: Prices of pistols and pens reduced to 20 and 30, respectively
+ - tweak: Gang spraycans have been made a lot less obvious. They look nearly identical
+ to regular ones, now.
+ - rscdel: Gangs will no longer be notified how much territory the enemy controls
+ Incoming5643:
+ - rscadd: Growing tired of reports of slain members, the Wizard Federation has cautiously
+ sactioned the dark path of lichdom. Beware of the powerful lich who hides his
+ phylactery well, for he is immortal!
+ - rscadd: The trick to defeating liches is to destroy either their body or their
+ phylactery item before they can ressurect to it. The more a lich is slain the
+ longer it will take him to make use of his phylactery and the more likely the
+ crew is to catch him during a vunerable moment.
+ - rscremove: Due to the addition of proper liching, skeletons as a choosable race
+ from magic mirrors has been discontinued. My apologies to the powergamers. A
+ special admin version of the mirror that allows for skeletons has also been
+ added to the code.
+ Miauw:
+ - tweak: 'AIs have received several minor nerfs in order to increase antagonist
+ counterplay:'
+ - tweak: AI tracking is no longer instant, it takes an amount of time that increases
+ with distance from the AI eye, up to 4 seconds. The AI detector item will light
+ up when an AI begins tracking.
+ - tweak: A random camera failure event has been added, which will break one or two
+ random cameras.
+ - tweak: You can no longer keep tracking people that are outside of your camera
+ vision.
+ - tweak: Camera wires have been removed. Screwdriver a camera to open the panel,
+ then use wirecutters to disable it or a multitool to change the focus.
+ - tweak: You can now hit cameras with items to break them. To repair a camera, simply
+ open the panel and use wirecutters on it.
+ - tweak: Camera alerts now only happen after a camera is reactivated.
+ RemieRichards:
+ - rscadd: New optional explosion effect ported from /vg/'s DeityLink, Explosions
+ that are affected by Walls and Doors
diff --git a/html/changelogs/Ikarrus-gangupdoot.yml b/html/changelogs/Ikarrus-gangupdoot.yml
deleted file mode 100644
index 18663d867c5..00000000000
--- a/html/changelogs/Ikarrus-gangupdoot.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscadd (general adding of nice things)
-# rscdel (general deleting of nice things)
-# imageadd
-# imagedel
-# spellcheck (typo fixes)
-# experiment
-# tgs (TG-ported fixes?)
-#################################
-
-# Your name.
-author: Ikarrus
-
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made. See valid prefix list above.
-# INDENT WITH TWO SPACES. NOT TABS. SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
-# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes:
- - experiment: "Gang Updates"
- - rscadd: "New objective: To win, Gangs must now buy a Dominator machine (50 influence) and defend it for a varying time frame.
\
- * The location of the dominator is broadcasted to the entire station the moment it is activated
\
- * The more territories the gang controls, the less time it will take
\
- * Gangs no longer win by capturing territories"
- - rscadd: "A choice of gang outfits are now purchasable for 1 influence each"
- - rscadd: "Thompson SMGs aka \"tommy guns\" are now purchasable for 50 influence"
- - rscadd: "Bulletproof armor vests are now purchasable for 10 influence"
- - tweak: "Gang messages are now free to send"
- - tweak: "Prices of pistols and pens reduced to 20 and 30, respectively"
- - tweak: "Gang spraycans have been made a lot less obvious. They look nearly identical to regular ones, now."
- - rscdel: "Gangs will no longer be notified how much territory the enemy controls"
\ No newline at end of file
diff --git a/html/changelogs/Incoming5643-lich.yml b/html/changelogs/Incoming5643-lich.yml
deleted file mode 100644
index c0a78592a73..00000000000
--- a/html/changelogs/Incoming5643-lich.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: Incoming5643
-
-delete-after: True
-
-changes:
- - rscadd: "Growing tired of reports of slain members, the Wizard Federation has cautiously sactioned the dark path of lichdom. Beware of the powerful lich who hides his phylactery well, for he is immortal!"
-
- - rscadd: "The trick to defeating liches is to destroy either their body or their phylactery item before they can ressurect to it. The more a lich is slain the longer it will take him to make use of his phylactery and the more likely the crew is to catch him during a vunerable moment."
-
- - rscremove: "Due to the addition of proper liching, skeletons as a choosable race from magic mirrors has been discontinued. My apologies to the powergamers. A special admin version of the mirror that allows for skeletons has also been added to the code."
\ No newline at end of file
diff --git a/html/changelogs/Miauw-AInerf.yml b/html/changelogs/Miauw-AInerf.yml
deleted file mode 100644
index 63ff2ff55ed..00000000000
--- a/html/changelogs/Miauw-AInerf.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-author: Miauw
-
-delete-after: True
-
-changes:
- - tweak: "AIs have received several minor nerfs in order to increase antagonist counterplay:"
- - tweak: "AI tracking is no longer instant, it takes an amount of time that increases with distance from the AI eye, up to 4 seconds. The AI detector item will light up when an AI begins tracking."
- - tweak: "A random camera failure event has been added, which will break one or two random cameras."
- - tweak: "You can no longer keep tracking people that are outside of your camera vision."
- - tweak: "Camera wires have been removed. Screwdriver a camera to open the panel, then use wirecutters to disable it or a multitool to change the focus."
- - tweak: "You can now hit cameras with items to break them. To repair a camera, simply open the panel and use wirecutters on it."
- - tweak: "Camera alerts now only happen after a camera is reactivated."
\ No newline at end of file
diff --git a/html/changelogs/RemieRichards-ReactionaryExplosions.yml b/html/changelogs/RemieRichards-ReactionaryExplosions.yml
deleted file mode 100644
index 409a7fef2c1..00000000000
--- a/html/changelogs/RemieRichards-ReactionaryExplosions.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: RemieRichards
-
-delete-after: True
-
-changes:
- - rscadd: "New optional explosion effect ported from /vg/'s DeityLink, Explosions that are affected by Walls and Doors"
-