From 58ae942f6a0a1bdb61cfd978ddb71b848fc2da2a Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Tue, 24 Mar 2020 17:41:58 -0700
Subject: [PATCH 1/2] changelog

---
 html/changelog.html                           | 100 ++++++++++++++++
 html/changelogs/.all_changelog.yml            | 108 ++++++++++++++++++
 html/changelogs/Aronai - wateriswet.yml       |  36 ------
 html/changelogs/Cerebulon - bigsounds.yml     |  37 ------
 .../Meghan Rossi - Language key tweaks.yml    |  39 -------
 ...eline - Response Team Channel Shortcut.yml |  36 ------
 html/changelogs/mechoid - antaguplink.yml     |  58 ----------
 html/changelogs/neerti-holsters.yml           |  36 ------
 html/changelogs/neerti-qol_notifications.yml  |  39 -------
 html/changelogs/neerti_projectile_qol.yml     |  39 -------
 .../prismaticgynoid - xenoarch_fix.yml        |   6 -
 .../changelogs/schnayy - hair adjustments.yml |   7 --
 12 files changed, 208 insertions(+), 333 deletions(-)
 delete mode 100644 html/changelogs/Aronai - wateriswet.yml
 delete mode 100644 html/changelogs/Cerebulon - bigsounds.yml
 delete mode 100644 html/changelogs/Meghan Rossi - Language key tweaks.yml
 delete mode 100644 html/changelogs/TheFurryFeline - Response Team Channel Shortcut.yml
 delete mode 100644 html/changelogs/mechoid - antaguplink.yml
 delete mode 100755 html/changelogs/neerti-holsters.yml
 delete mode 100644 html/changelogs/neerti-qol_notifications.yml
 delete mode 100644 html/changelogs/neerti_projectile_qol.yml
 delete mode 100644 html/changelogs/prismaticgynoid - xenoarch_fix.yml
 delete mode 100644 html/changelogs/schnayy - hair adjustments.yml

diff --git a/html/changelog.html b/html/changelog.html
index 5b60239c85d..d3183fc1691 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,106 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">20 March 2020</h2>
+			<h3 class="author">Aronai/Arokha updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">You can now fill buckets (, beakers, etc.,) from water tiles.</li>
+			</ul>
+			<h3 class="author">Cerebulon updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="soundadd">Added sounds when dropping/throwing items. Toggleable in preferences.</li>
+				<li class="soundadd">Added incidental sounds to several item interactions.</li>
+			</ul>
+			<h3 class="author">Mechoid updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Energy Daggerpens (20): Disguised energy-knives, which do 15 searing on melee, or 30 when thrown.</li>
+				<li class="rscadd">Thieves gloves (30): Special gloves that allow you to peep in others' backpacks and belts, and plant items in their bags / pockets.</li>
+				<li class="rscadd">Buzzer Ring (30): Makes your first two punches electrically charged, first with 25 damage in a shock, then approximately 12.5 damage in the second. If the charge is over 90%, you can force-defib a corpse, even if it's a mindless one. Damage rules still apply, however time-of-death does not.</li>
+				<li class="rscadd">Resource Crate (60): A crate of uranium, phoron, gold, silver, osmium, and plasteel.</li>
+				<li class="rscadd">Exotic Plantlife Crate (20): A crate of numerous random seeds.</li>
+				<li class="rscadd">Spare Organ Crate (20): A crate of bioprinted organs.</li>
+				<li class="rscadd">Graviton goggles (15): A pair of combined meson/material goggles.</li>
+				<li class="rscadd">Integrated Circuit Printer (10): An upgraded circuit printer used to make integrated machine.</li>
+				<li class="rscadd">Flamethrower (60): A large, flame-based weapon.</li>
+				<li class="rscadd">8 Concussion Grenades (30): A box of eight concussion grenades.</li>
+				<li class="rscadd">4 Hunting Traps (30): A box of four hunting-traps, similar to those found in the explorer vendor.</li>
+				<li class="rscadd">3 Virus Samples (40): A box of three unique virus samples.</li>
+				<li class="rscadd">Quickdraw Syringe Case (20): A case that can hold six syringes, and rapidly deploy them. Fits in your pocket.</li>
+				<li class="rscadd">Clotting Injector Case (20): A case that starts with 3 clotting med injectors instead.</li>
+				<li class="rscadd">Bonemed Injector Case (20): A case that starts with bonemeds.</li>
+				<li class="tweak">Announcement costs lowered to be more equivalent.</li>
+				<li class="tweak">Egun changed from 60 to 30 TC. It is nowhere near as powerful as a lascannon.</li>
+				<li class="tweak">Exosuit rigged laser from 60 to 30 TC.</li>
+				<li class="tweak">Xray gun from 85 to 60 TC.</li>
+				<li class="tweak">Augments can now be used by everyone, as robot-specific ones will require FBP organ revamp.</li>
+				<li class="tweak">Augment guns use slightly less blood / system instability to charge, so it doesn't kill you dead in moments.</li>
+				<li class="bugfix">Anti-Materiel Rifle can once again be used with thermals.</li>
+				<li class="bugfix">Energy Shields work again, and can be colored.</li>
+			</ul>
+			<h3 class="author">Meghan-Rossi updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Language keys are now case-sensitive.</li>
+				<li class="tweak">The language key for Chimpanzee has changed from 6 to C to resolve a conflict with EAL.</li>
+				<li class="tweak">The language key for Bird has changed from m to B to resolve a conflict with Mouse.</li>
+				<li class="tweak">All other language keys are now lowercase-only.</li>
+			</ul>
+			<h3 class="author">Neerti updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Holsters can now be worn alongside webbing vests.</li>
+				<li class="soundadd">Receiving an antag role will now play a sound to the new antagonist.</li>
+				<li class="soundadd">Having laws changed as a silicon (AI or Borg) will now play a sound and show the changed law in the chat.</li>
+				<li class="soundadd">Being offered a ghost role while a ghost will now play a sound.</li>
+				<li class="soundadd">Someone attempting to revive someone else will play a sound to the player being revived, if they are not in their body.</li>
+				<li class="rscadd">Most Non-hitscan projectiles now have a pixel-perfect visual effect when they impact something, or when they expire from moving too far without hitting anything.</li>
+				<li class="soundadd">Projectiles can now have sounds for when they hit someone. They can also have a different sound when they hit something solid like a wall.</li>
+				<li class="soundadd">A sound is now played when a projectile 'narrowly misses' someone.</li>
+				<li class="rsctweak">Getting hit with a projectile is now more noticeable in the chat log, with bigger text. Only the person who got hit will see the bigger text.</li>
+			</ul>
+			<h3 class="author">PrismaticGynoid updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes xenoarch artifacts breaking when performing excavation correctly.</li>
+			</ul>
+			<h3 class="author">TheFurryFeline updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes lack of easily accessible Response Team shortcut to type in. Type .k or :k to speak on the channel.</li>
+			</ul>
+			<h3 class="author">schnayy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds Sabitsuki and Bedhead Longest hairstyles.</li>
+				<li class="tweak">Adjusts pixels on the Jessica, Celeb Curls, and Beach Waves hairstyles.</li>
+			</ul>
+
+			<h2 class="date">11 March 2020</h2>
+			<h3 class="author">Cerebulon updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="soundadd">Added button sounds to various machines.</li>
+			</ul>
+			<h3 class="author">Mechoid updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added Hardpoint Actuator equipment for Exosuits, allowing them (And most effectively, Ripleys) to swap components on the fly, after a short delay.</li>
+				<li class="rscadd">Added Exosuit Inflatables Deployer, allowing exosuits to pick up and deploy inflatables.</li>
+				<li class="rscadd">Added Exosuit-mounted screwdriver, wirecutters, and welding laser, to help round-out the tool-based equipment types.</li>
+				<li class="tweak">Incendiary exo weapons now use fire modifiers instead of fire stacks.</li>
+				<li class="tweak">Ignition effects from weapons now use fire modifiers instead of fire stacks.</li>
+				<li class="bugfix">Exosuit shocker armor now retaliates properly against melee.</li>
+				<li class="rscadd">Add RIG components to robotics mechfab, plus incredibly basic belt-voidsuit RIG.</li>
+				<li class="rscadd">Add Graphite, made by compressing coal, presently only used heavily in RIG components.</li>
+			</ul>
+			<h3 class="author">Neerti updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The 'cut' and 'pulse' buttons in the hacking interface now check both hands for tools, instead of only the active hand.</li>
+				<li class="tweak">The textual indicators at the bottom of the hacking window will now go bold when they change, until the next window refresh.</li>
+				<li class="tweak">Hacking an Autolathe no longer requires you to hack it using the Autolathe's main window, but instead opens the hacking window like everything else.</li>
+			</ul>
+			<h3 class="author">schnayy updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds yeast as a reagent. It can be found in the kitchen vendor and in cargo kitchen supply crates.</li>
+				<li class="tweak">Bread now calls for 5 units yeast instead of an egg, and baguettes and croissants call for 5 units yeast in addition to former ingredients.</li>
+				<li class="rscadd">Corn oil added to the Dinnerware vendor and the Booze-o-Mat.</li>
+				<li class="imageadd">Sprites for peanut butter, mayo, and yeast condiments.</li>
+				<li class="bugfix">Boiled slime core now links to the proper sprite.</li>
+			</ul>
+
 			<h2 class="date">28 February 2020</h2>
 			<h3 class="author">Cerebulon updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index aec3a852339..ecdf286c9dc 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4931,3 +4931,111 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: You can now place defibs in rechargers.
   - imageadd: Adds Holographic PDA type.
   - soundadd: Skrell may now *warble.
+<<<<<<< HEAD
+=======
+2020-03-11:
+  Cerebulon:
+  - soundadd: Added button sounds to various machines.
+  Mechoid:
+  - rscadd: Added Hardpoint Actuator equipment for Exosuits, allowing them (And most
+      effectively, Ripleys) to swap components on the fly, after a short delay.
+  - rscadd: Added Exosuit Inflatables Deployer, allowing exosuits to pick up and deploy
+      inflatables.
+  - rscadd: Added Exosuit-mounted screwdriver, wirecutters, and welding laser, to
+      help round-out the tool-based equipment types.
+  - tweak: Incendiary exo weapons now use fire modifiers instead of fire stacks.
+  - tweak: Ignition effects from weapons now use fire modifiers instead of fire stacks.
+  - bugfix: Exosuit shocker armor now retaliates properly against melee.
+  - rscadd: Add RIG components to robotics mechfab, plus incredibly basic belt-voidsuit
+      RIG.
+  - rscadd: Add Graphite, made by compressing coal, presently only used heavily in
+      RIG components.
+  Neerti:
+  - tweak: The 'cut' and 'pulse' buttons in the hacking interface now check both hands
+      for tools, instead of only the active hand.
+  - tweak: The textual indicators at the bottom of the hacking window will now go
+      bold when they change, until the next window refresh.
+  - tweak: Hacking an Autolathe no longer requires you to hack it using the Autolathe's
+      main window, but instead opens the hacking window like everything else.
+  schnayy:
+  - rscadd: Adds yeast as a reagent. It can be found in the kitchen vendor and in
+      cargo kitchen supply crates.
+  - tweak: Bread now calls for 5 units yeast instead of an egg, and baguettes and
+      croissants call for 5 units yeast in addition to former ingredients.
+  - rscadd: Corn oil added to the Dinnerware vendor and the Booze-o-Mat.
+  - imageadd: Sprites for peanut butter, mayo, and yeast condiments.
+  - bugfix: Boiled slime core now links to the proper sprite.
+2020-03-20:
+  Aronai/Arokha:
+  - tweak: You can now fill buckets (, beakers, etc.,) from water tiles.
+  Cerebulon:
+  - soundadd: Added sounds when dropping/throwing items. Toggleable in preferences.
+  - soundadd: Added incidental sounds to several item interactions.
+  Mechoid:
+  - rscadd: 'Energy Daggerpens (20): Disguised energy-knives, which do 15 searing
+      on melee, or 30 when thrown.'
+  - rscadd: 'Thieves gloves (30): Special gloves that allow you to peep in others''
+      backpacks and belts, and plant items in their bags / pockets.'
+  - rscadd: 'Buzzer Ring (30): Makes your first two punches electrically charged,
+      first with 25 damage in a shock, then approximately 12.5 damage in the second.
+      If the charge is over 90%, you can force-defib a corpse, even if it''s a mindless
+      one. Damage rules still apply, however time-of-death does not.'
+  - rscadd: 'Resource Crate (60): A crate of uranium, phoron, gold, silver, osmium,
+      and plasteel.'
+  - rscadd: 'Exotic Plantlife Crate (20): A crate of numerous random seeds.'
+  - rscadd: 'Spare Organ Crate (20): A crate of bioprinted organs.'
+  - rscadd: 'Graviton goggles (15): A pair of combined meson/material goggles.'
+  - rscadd: 'Integrated Circuit Printer (10): An upgraded circuit printer used to
+      make integrated machine.'
+  - rscadd: 'Flamethrower (60): A large, flame-based weapon.'
+  - rscadd: '8 Concussion Grenades (30): A box of eight concussion grenades.'
+  - rscadd: '4 Hunting Traps (30): A box of four hunting-traps, similar to those found
+      in the explorer vendor.'
+  - rscadd: '3 Virus Samples (40): A box of three unique virus samples.'
+  - rscadd: 'Quickdraw Syringe Case (20): A case that can hold six syringes, and rapidly
+      deploy them. Fits in your pocket.'
+  - rscadd: 'Clotting Injector Case (20): A case that starts with 3 clotting med injectors
+      instead.'
+  - rscadd: 'Bonemed Injector Case (20): A case that starts with bonemeds.'
+  - tweak: Announcement costs lowered to be more equivalent.
+  - tweak: Egun changed from 60 to 30 TC. It is nowhere near as powerful as a lascannon.
+  - tweak: Exosuit rigged laser from 60 to 30 TC.
+  - tweak: Xray gun from 85 to 60 TC.
+  - tweak: Augments can now be used by everyone, as robot-specific ones will require
+      FBP organ revamp.
+  - tweak: Augment guns use slightly less blood / system instability to charge, so
+      it doesn't kill you dead in moments.
+  - bugfix: Anti-Materiel Rifle can once again be used with thermals.
+  - bugfix: Energy Shields work again, and can be colored.
+  Meghan-Rossi:
+  - tweak: Language keys are now case-sensitive.
+  - tweak: The language key for Chimpanzee has changed from 6 to C to resolve a conflict
+      with EAL.
+  - tweak: The language key for Bird has changed from m to B to resolve a conflict
+      with Mouse.
+  - tweak: All other language keys are now lowercase-only.
+  Neerti:
+  - tweak: Holsters can now be worn alongside webbing vests.
+  - soundadd: Receiving an antag role will now play a sound to the new antagonist.
+  - soundadd: Having laws changed as a silicon (AI or Borg) will now play a sound
+      and show the changed law in the chat.
+  - soundadd: Being offered a ghost role while a ghost will now play a sound.
+  - soundadd: Someone attempting to revive someone else will play a sound to the player
+      being revived, if they are not in their body.
+  - rscadd: Most Non-hitscan projectiles now have a pixel-perfect visual effect when
+      they impact something, or when they expire from moving too far without hitting
+      anything.
+  - soundadd: Projectiles can now have sounds for when they hit someone. They can
+      also have a different sound when they hit something solid like a wall.
+  - soundadd: A sound is now played when a projectile 'narrowly misses' someone.
+  - rsctweak: Getting hit with a projectile is now more noticeable in the chat log,
+      with bigger text. Only the person who got hit will see the bigger text.
+  PrismaticGynoid:
+  - bugfix: Fixes xenoarch artifacts breaking when performing excavation correctly.
+  TheFurryFeline:
+  - bugfix: Fixes lack of easily accessible Response Team shortcut to type in. Type
+      .k or :k to speak on the channel.
+  schnayy:
+  - rscadd: Adds Sabitsuki and Bedhead Longest hairstyles.
+  - tweak: Adjusts pixels on the Jessica, Celeb Curls, and Beach Waves hairstyles.
+>>>>>>> 90bc6a6... changelog (#6877)
diff --git a/html/changelogs/Aronai - wateriswet.yml b/html/changelogs/Aronai - wateriswet.yml
deleted file mode 100644
index ae523f716bd..00000000000
--- a/html/changelogs/Aronai - wateriswet.yml	
+++ /dev/null
@@ -1,36 +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
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Aronai/Arokha
-
-# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - tweak: "Allows getting water out of water turfs (or setting a different reagent to get)."
diff --git a/html/changelogs/Cerebulon - bigsounds.yml b/html/changelogs/Cerebulon - bigsounds.yml
deleted file mode 100644
index 0120dce1514..00000000000
--- a/html/changelogs/Cerebulon - bigsounds.yml	
+++ /dev/null
@@ -1,37 +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
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Cerebulon
-
-# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - soundadd: "Added sounds when dropping/throwing items. Toggleable in preferences."
-  - soundadd: "Added incidental sounds to several item interactions."
diff --git a/html/changelogs/Meghan Rossi - Language key tweaks.yml b/html/changelogs/Meghan Rossi - Language key tweaks.yml
deleted file mode 100644
index 6acbcece3aa..00000000000
--- a/html/changelogs/Meghan Rossi - Language key tweaks.yml	
+++ /dev/null
@@ -1,39 +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
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Meghan-Rossi
-
-# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - tweak: "Language keys are now case-sensitive."
-  - tweak: "The language key for Chimpanzee has changed from 6 to C to resolve a conflict with EAL."
-  - tweak: "The language key for Bird has changed from m to B to resolve a conflict with Mouse."
-  - tweak: "All other language keys are now lowercase-only."
\ No newline at end of file
diff --git a/html/changelogs/TheFurryFeline - Response Team Channel Shortcut.yml b/html/changelogs/TheFurryFeline - Response Team Channel Shortcut.yml
deleted file mode 100644
index e6be3f17deb..00000000000
--- a/html/changelogs/TheFurryFeline - Response Team Channel Shortcut.yml	
+++ /dev/null
@@ -1,36 +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
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: TheFurryFeline
-
-# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - bugfix: "Fixes lack of easily accessible Response Team shortcut to type in. Type .k or :k to speak on the channel."
diff --git a/html/changelogs/mechoid - antaguplink.yml b/html/changelogs/mechoid - antaguplink.yml
deleted file mode 100644
index 8018619f6e4..00000000000
--- a/html/changelogs/mechoid - antaguplink.yml	
+++ /dev/null
@@ -1,58 +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
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Mechoid
-
-# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - rscadd: "Energy Daggerpens (20): Disguised energy-knives, which do 15 searing on melee, or 30 when thrown."
-  - rscadd: "Thieves gloves (30): Special gloves that allow you to peep in others' backpacks and belts, and plant items in their bags / pockets."
-  - rscadd: "Buzzer Ring (30): Makes your first two punches electrically charged, first with 25 damage in a shock, then approximately 12.5 damage in the second. If the charge is over 90%, you can force-defib a corpse, even if it's a mindless one. Damage rules still apply, however time-of-death does not."
-  - rscadd: "Resource Crate (60): A crate of uranium, phoron, gold, silver, osmium, and plasteel."
-  - rscadd: "Exotic Plantlife Crate (20): A crate of numerous random seeds."
-  - rscadd: "Spare Organ Crate (20): A crate of bioprinted organs."
-  - rscadd: "Graviton goggles (15): A pair of combined meson/material goggles."
-  - rscadd: "Integrated Circuit Printer (10): An upgraded circuit printer used to make integrated machine."
-  - rscadd: "Flamethrower (60): A large, flame-based weapon."
-  - rscadd: "8 Concussion Grenades (30): A box of eight concussion grenades."
-  - rscadd: "4 Hunting Traps (30): A box of four hunting-traps, similar to those found in the explorer vendor."
-  - rscadd: "3 Virus Samples (40): A box of three unique virus samples."
-  - rscadd: "Quickdraw Syringe Case (20): A case that can hold six syringes, and rapidly deploy them. Fits in your pocket."
-  - rscadd: "Clotting Injector Case (20): A case like above which starts with 3 clotting med injectors instead."
-  - rscadd: "Bonemed Injector Case (20): The same as above, but with bonemeds."
-  - tweak: "Announcement costs lowered to be more equivalent."
-  - tweak: "Egun changed from 60 to 30 TC. It is nowhere near as powerful as a lascannon."
-  - tweak: "Exosuit rigged laser from 60 to 30 TC."
-  - tweak: "Xray gun from 85 to 60 TC."
-  - tweak: "Augments can now be used by everyone, as robot-specific ones will require FBP organ revamp."
-  - tweak: "Anti-Materiel Rifle can once again be used with thermals."
-  - tweak: "Augment guns use slightly less blood / system instability to charge, so it doesn't kill you dead in moments."
-  - bugfix: "Energy Shields work again, and can be colored."
diff --git a/html/changelogs/neerti-holsters.yml b/html/changelogs/neerti-holsters.yml
deleted file mode 100755
index f251d1d4a40..00000000000
--- a/html/changelogs/neerti-holsters.yml
+++ /dev/null
@@ -1,36 +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
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Neerti
-
-# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - tweak: "Holsters can now be worn alongside webbing vests."
diff --git a/html/changelogs/neerti-qol_notifications.yml b/html/changelogs/neerti-qol_notifications.yml
deleted file mode 100644
index 46e181bb88a..00000000000
--- a/html/changelogs/neerti-qol_notifications.yml
+++ /dev/null
@@ -1,39 +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
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Neerti
-
-# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - soundadd: "Receiving an antag role will now play a sound to the new antagonist."
-  - soundadd: "Having laws changed as a silicon (AI or Borg) will now play a sound and show the changed law in the chat."
-  - soundadd: "Being offered a ghost role while a ghost will now play a sound."
-  - soundadd: "Someone attempting to revive someone else will play a sound to the player being revived, if they are not in their body."
diff --git a/html/changelogs/neerti_projectile_qol.yml b/html/changelogs/neerti_projectile_qol.yml
deleted file mode 100644
index 1f8f7fbed2f..00000000000
--- a/html/changelogs/neerti_projectile_qol.yml
+++ /dev/null
@@ -1,39 +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
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Neerti
-
-# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - rscadd: "Most Non-hitscan projectiles now have a pixel-perfect visual effect when they impact something, or when they expire from moving too far without hitting anything."
-  - soundadd: "Projectiles can now have sounds for when they hit someone. They can also have a different sound when they hit something solid like a wall."
-  - soundadd: "A sound is now played when a projectile 'narrowly misses' someone."
-  - rsctweak: "Getting hit with a projectile is now more noticible in the chat log, with bigger text. Only the person who got hit will see the bigger text."
diff --git a/html/changelogs/prismaticgynoid - xenoarch_fix.yml b/html/changelogs/prismaticgynoid - xenoarch_fix.yml
deleted file mode 100644
index 2a3d8648131..00000000000
--- a/html/changelogs/prismaticgynoid - xenoarch_fix.yml	
+++ /dev/null
@@ -1,6 +0,0 @@
-author: PrismaticGynoid
-
-delete-after: True
-
-changes: 
-  - bugfix: "Fixes xenoarch artifacts breaking when performing excavation correctly."
diff --git a/html/changelogs/schnayy - hair adjustments.yml b/html/changelogs/schnayy - hair adjustments.yml
deleted file mode 100644
index 2a1f8a8d500..00000000000
--- a/html/changelogs/schnayy - hair adjustments.yml	
+++ /dev/null
@@ -1,7 +0,0 @@
-author: schnayy
-
-delete-after: True
-
-changes: 
-  - rscadd: "Adds Sabitsuki and Bedhead Longest hairstyles."
-  - tweak: "Adjusts pixels on the Jessica, Celeb Curls, and Beach Waves hairstyles."
\ No newline at end of file

From 5436bd4db1f1e39a22385faae519af78a4bff671 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 24 Mar 2020 20:44:18 -0400
Subject: [PATCH 2/2] Update .all_changelog.yml

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

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ecdf286c9dc..20bac212dd3 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4931,8 +4931,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: You can now place defibs in rechargers.
   - imageadd: Adds Holographic PDA type.
   - soundadd: Skrell may now *warble.
-<<<<<<< HEAD
-=======
 2020-03-11:
   Cerebulon:
   - soundadd: Added button sounds to various machines.
@@ -5038,4 +5036,3 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   schnayy:
   - rscadd: Adds Sabitsuki and Bedhead Longest hairstyles.
   - tweak: Adjusts pixels on the Jessica, Celeb Curls, and Beach Waves hairstyles.
->>>>>>> 90bc6a6... changelog (#6877)