From 580c41cf1f9de6783aea5386707925dcab0bc651 Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Wed, 6 Mar 2019 13:19:47 -0600
Subject: [PATCH 1/2] golegnahC setadpU

---
 html/changelog.html                | 122 +++++++++++++++++++++++++++++
 html/changelogs/.all_changelog.yml | 116 +++++++++++++++++++++++++++
 2 files changed, 238 insertions(+)

diff --git a/html/changelog.html b/html/changelog.html
index c8cee8ad580..a4353e43182 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,6 +53,128 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">04 March 2019</h2>
+			<h3 class="author">Anewbe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Vedahq is now properly locked behind a whitelist.</li>
+				<li class="tweak">Headgibbing is now determined by config</li>
+				<li class="tweak">Promethean regeneration has been toned down. It will no longer provide healing if the Promethean is wet, too hungry, too hot, or too cold.</li>
+				<li class="tweak">Prometheans are no longer shock resistant. It should now be more possible to catch them alive.</li>
+				<li class="tweak">Promethean body temperature is now the default room temperature. They also hit cold_level_2 at a higher temperature.</li>
+			</ul>
+			<h3 class="author">Atermonera updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Rigsuits have been resupplied following a mass-recall after a number of suits were reported to have defective pressure-sealant mechanisms. The new sealant mechanisms have been thoroughly tested and should be less prone to failure.</li>
+			</ul>
+			<h3 class="author">Mechoid updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Tweaked Respiro- Cordra- Gastiro- and Hepanephro- Daxons to be more effective with dealing with the side-effects of damaged organs.</li>
+			</ul>
+			<h3 class="author">kartagrafi updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds several clothing items to loadout such as: Nock masks, cowls and robes.</li>
+			</ul>
+
+			<h2 class="date">07 February 2019</h2>
+			<h3 class="author">Atermonera updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Stairs have been straightened and now connect to both the heavens and hells, formerly just the hells.</li>
+			</ul>
+			<h3 class="author">Elgeonmb updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added the Zaddat species, voidsuit-clad fragile bug people. Whitelist applications will be available at a later date.</li>
+				<li class="rscadd">Added glucose hypos to the SWEATMAX vendors and a few other places thoughout the station.</li>
+				<li class="rscadd">Zaddat equipment is now available through cargo.</li>
+				<li class="rscadd">Some new, very very chuuni accessories to play with; the half cape, the full cape, and the sash</li>
+				<li class="tweak">Most accessories can now fit on suits.</li>
+				<li class="rscdel">Dionaea and vox can no longer use station rigs.</li>
+			</ul>
+			<h3 class="author">Mechoid updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Flashes now actually run the risk of burning out.</li>
+				<li class="tweak">Flashes that burn out can be repaired after approximately 40 seconds and with some luck, via a screwdriver.</li>
+				<li class="tweak">Cyborg flashes use charge only, and do not have the 10 flash limit. They instead begin burning large amounts of charge.</li>
+				<li class="tweak">Flashes use miniscule charge in addition to their capacitor burn-out, totalling 12 uses, taking 4 to down a human. They can be charged within a standard charger.</li>
+			</ul>
+
+			<h2 class="date">01 February 2019</h2>
+			<h3 class="author">Anewbe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Pilot consoles now require pilot access to use.</li>
+			</ul>
+			<h3 class="author">Atermonera updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Powersink drains have been unclogged and work once more</li>
+			</ul>
+			<h3 class="author">Mechoid updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Oversight regarding Changeling revive not removing restraints fixed.</li>
+				<li class="tweak">Straight Jackets can now be resisted out of in 8 minutes, or as low as 5 depending on species attacks. Shredding or hulked humans will break out in 20 seconds, destroying the jacket.</li>
+				<li class="tweak">Xenomorph plasma vessels now regenerate phoron passively, at an incredibly slow rate. Can be accelerated by consuming liquid phoron.</li>
+				<li class="tweak">Xenomorph organs now give their respective abilities when implanted.</li>
+				<li class="tweak">Virtual Reality pods cleaned up.</li>
+				<li class="rscadd">Replicant organs added, versions of many organs that do not reject in their host. Two currently exist that give special passives.</li>
+			</ul>
+
+			<h2 class="date">25 January 2019</h2>
+			<h3 class="author">Anewbe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The hyphen (-) is no longer a default language key, as people use it to represent other things. If you are still having issues with Gibberish, reset your language keys, or at least make sure they don't include any characters you regularly start speech with.</li>
+			</ul>
+			<h3 class="author">Atermonera updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Stasis bags don't squish organics with high pressure when organics try to seek shelter from flesh wounds.</li>
+				<li class="tweak">Body- and stasis bags can be tread upon when open.</li>
+				<li class="bugfix">Suit coolers and rigsuit coolers now protect FBPs against vacuum again.</li>
+				<li class="bugfix">Bot sound files have been decrypted following a bizarre ransomware attack by Boiling Point remnants. Securitrons, cleanbots, et al should no longer spew gibberish.</li>
+			</ul>
+			<h3 class="author">Cerebulon updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added teshari hardsuit sprites.</li>
+			</ul>
+
+			<h2 class="date">16 January 2019</h2>
+			<h3 class="author">Anewbe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Adds a Gibberish language that gets used when you goof on a language key.</li>
+				<li class="bugfix">Voice changing masks no longer give up when you put on a hardsuit.</li>
+				<li class="tweak">Mask voice changers start on.</li>
+				<li class="tweak">Mask voice changers that do not have a set voice will now default to your worn ID's name.</li>
+				<li class="tweak">Mask voice changers now have a verb to reset their name.</li>
+				<li class="tweak">Eguns take 4 shots to stun, rather than 3.</li>
+			</ul>
+			<h3 class="author">Atermonera updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Clothing now has pressure protection variables, that set lower and upper pressure bounds within which they will protect you from pressure-based harm.</li>
+				<li class="rscadd">Protection falls off when exceeding the pressure limits from 100% protection at the boundary to 0% at 10% in excess (above the max or below the min) boundary.</li>
+				<li class="tweak">Currently, only hat and suit slots are checked for this protection (No change).</li>
+				<li class="tweak">Anomaly suits (The orange ones) now offer limited pressure protection in case anomalies start making or draining air.</li>
+				<li class="bugfix">Firesuits are no longer spaceproof, but still offer protection against the high pressures of fire.</li>
+			</ul>
+			<h3 class="author">Cerebulon updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added customizable religious icons to the chaplain's office.</li>
+				<li class="rscadd">Added black and white candles.</li>
+				<li class="tweak">Updated religion lists in character setup to be lore friendly.</li>
+			</ul>
+
+			<h2 class="date">06 January 2019</h2>
+			<h3 class="author">Mechoid updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Slimes now respect slime colors as their faction when dealing with other slimes.</li>
+				<li class="tweak">Taser and Security xeno-taser shot count dropped from 10 to 5.</li>
+			</ul>
+			<h3 class="author">Neerti updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="soundadd">Adds a lot of sounds, and the code to let them loop seemlessly. Things made audible now include the microwave, deep fryer, showers, the supermatter when it's active, the TEGs when active, geiger counters, and severe weather on Sif. The weather has different sounds for when indoors and when outdoors.</li>
+				<li class="tweak">Weather sounds and the supermatter hum can be disabled in your preferences.</li>
+				<li class="rscadd">Adds a few more weather types that can only be activated by admin powers, such as ash storms and fallout.</li>
+			</ul>
+			<h3 class="author">Novacat updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">All emergency air tanks now spawn at full capacity.</li>
+			</ul>
+
 			<h2 class="date">08 December 2018</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 6198da0661f..59813af11d5 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4303,4 +4303,120 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       circuit reference scanning. Antag multi-tools untouched for now.
   - bugfix: Integrated circuit printer now respects adjacency, if it is not set to
       debug.
+<<<<<<< HEAD
 >>>>>>> 8430fe5... Merge pull request #5768 from Atermonera/changelog
+=======
+2019-01-06:
+  Mechoid:
+  - bugfix: Slimes now respect slime colors as their faction when dealing with other
+      slimes.
+  - tweak: Taser and Security xeno-taser shot count dropped from 10 to 5.
+  Neerti:
+  - soundadd: Adds a lot of sounds, and the code to let them loop seemlessly. Things
+      made audible now include the microwave, deep fryer, showers, the supermatter
+      when it's active, the TEGs when active, geiger counters, and severe weather
+      on Sif. The weather has different sounds for when indoors and when outdoors.
+  - tweak: Weather sounds and the supermatter hum can be disabled in your preferences.
+  - rscadd: Adds a few more weather types that can only be activated by admin powers,
+      such as ash storms and fallout.
+  Novacat:
+  - tweak: All emergency air tanks now spawn at full capacity.
+2019-01-16:
+  Anewbe:
+  - tweak: Adds a Gibberish language that gets used when you goof on a language key.
+  - bugfix: Voice changing masks no longer give up when you put on a hardsuit.
+  - tweak: Mask voice changers start on.
+  - tweak: Mask voice changers that do not have a set voice will now default to your
+      worn ID's name.
+  - tweak: Mask voice changers now have a verb to reset their name.
+  - tweak: Eguns take 4 shots to stun, rather than 3.
+  Atermonera:
+  - rscadd: Clothing now has pressure protection variables, that set lower and upper
+      pressure bounds within which they will protect you from pressure-based harm.
+  - rscadd: Protection falls off when exceeding the pressure limits from 100% protection
+      at the boundary to 0% at 10% in excess (above the max or below the min) boundary.
+  - tweak: Currently, only hat and suit slots are checked for this protection (No
+      change).
+  - tweak: Anomaly suits (The orange ones) now offer limited pressure protection in
+      case anomalies start making or draining air.
+  - bugfix: Firesuits are no longer spaceproof, but still offer protection against
+      the high pressures of fire.
+  Cerebulon:
+  - rscadd: Added customizable religious icons to the chaplain's office.
+  - rscadd: Added black and white candles.
+  - tweak: Updated religion lists in character setup to be lore friendly.
+2019-01-25:
+  Anewbe:
+  - tweak: The hyphen (-) is no longer a default language key, as people use it to
+      represent other things. If you are still having issues with Gibberish, reset
+      your language keys, or at least make sure they don't include any characters
+      you regularly start speech with.
+  Atermonera:
+  - bugfix: Stasis bags don't squish organics with high pressure when organics try
+      to seek shelter from flesh wounds.
+  - tweak: Body- and stasis bags can be tread upon when open.
+  - bugfix: Suit coolers and rigsuit coolers now protect FBPs against vacuum again.
+  - bugfix: Bot sound files have been decrypted following a bizarre ransomware attack
+      by Boiling Point remnants. Securitrons, cleanbots, et al should no longer spew
+      gibberish.
+  Cerebulon:
+  - rscadd: Added teshari hardsuit sprites.
+2019-02-01:
+  Anewbe:
+  - tweak: Pilot consoles now require pilot access to use.
+  Atermonera:
+  - bugfix: Powersink drains have been unclogged and work once more
+  Mechoid:
+  - bugfix: Oversight regarding Changeling revive not removing restraints fixed.
+  - tweak: Straight Jackets can now be resisted out of in 8 minutes, or as low as
+      5 depending on species attacks. Shredding or hulked humans will break out in
+      20 seconds, destroying the jacket.
+  - tweak: Xenomorph plasma vessels now regenerate phoron passively, at an incredibly
+      slow rate. Can be accelerated by consuming liquid phoron.
+  - tweak: Xenomorph organs now give their respective abilities when implanted.
+  - tweak: Virtual Reality pods cleaned up.
+  - rscadd: Replicant organs added, versions of many organs that do not reject in
+      their host. Two currently exist that give special passives.
+2019-02-07:
+  Atermonera:
+  - bugfix: Stairs have been straightened and now connect to both the heavens and
+      hells, formerly just the hells.
+  Elgeonmb:
+  - rscadd: Added the Zaddat species, voidsuit-clad fragile bug people. Whitelist
+      applications will be available at a later date.
+  - rscadd: Added glucose hypos to the SWEATMAX vendors and a few other places thoughout
+      the station.
+  - rscadd: Zaddat equipment is now available through cargo.
+  - rscadd: Some new, very very chuuni accessories to play with; the half cape, the
+      full cape, and the sash
+  - tweak: Most accessories can now fit on suits.
+  - rscdel: Dionaea and vox can no longer use station rigs.
+  Mechoid:
+  - tweak: Flashes now actually run the risk of burning out.
+  - tweak: Flashes that burn out can be repaired after approximately 40 seconds and
+      with some luck, via a screwdriver.
+  - tweak: Cyborg flashes use charge only, and do not have the 10 flash limit. They
+      instead begin burning large amounts of charge.
+  - tweak: Flashes use miniscule charge in addition to their capacitor burn-out, totalling
+      12 uses, taking 4 to down a human. They can be charged within a standard charger.
+2019-03-04:
+  Anewbe:
+  - bugfix: Vedahq is now properly locked behind a whitelist.
+  - tweak: Headgibbing is now determined by config
+  - tweak: Promethean regeneration has been toned down. It will no longer provide
+      healing if the Promethean is wet, too hungry, too hot, or too cold.
+  - tweak: Prometheans are no longer shock resistant. It should now be more possible
+      to catch them alive.
+  - tweak: Promethean body temperature is now the default room temperature. They also
+      hit cold_level_2 at a higher temperature.
+  Atermonera:
+  - bugfix: Rigsuits have been resupplied following a mass-recall after a number of
+      suits were reported to have defective pressure-sealant mechanisms. The new sealant
+      mechanisms have been thoroughly tested and should be less prone to failure.
+  Mechoid:
+  - tweak: Tweaked Respiro- Cordra- Gastiro- and Hepanephro- Daxons to be more effective
+      with dealing with the side-effects of damaged organs.
+  kartagrafi:
+  - rscadd: 'Adds several clothing items to loadout such as: Nock masks, cowls and
+      robes.'
+>>>>>>> 1c7ceeb... Merge pull request #5989 from Atermonera/changelog

From e2b62f857d5e47a62de0bf73a2571ff1dccad4e1 Mon Sep 17 00:00:00 2001
From: Unknown <RedKerensky@Gmail.com>
Date: Thu, 28 Mar 2019 21:49:05 -0400
Subject: [PATCH 2/2] Conflict Resolution

---
 html/changelog.html                | 8 ++++----
 html/changelogs/.all_changelog.yml | 6 ------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index a4353e43182..757677d2ccc 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -282,7 +282,7 @@
 			</ul>
 			<h3 class="author">Mechoid updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="tweak">Hallucinations are no longer only Pun Pun.</li>
+				<li class="rsctweak">Hallucinations are no longer only Pun Pun.</li>
 			</ul>
 			<h3 class="author">Neerti updated:</h3>
 			<ul class="changes bgimages16">
@@ -384,8 +384,8 @@
 			</ul>
 			<h3 class="author">Mechoid updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="tweak">Promethean limbs store more damage.</li>
-				<li class="tweak">Promethean limbs, in addition to normal severing rules, have a higher chance to be splattered or ashed once they reach maximum damage.</li>
+				<li class="rsctweak">Promethean limbs store more damage.</li>
+				<li class="rsctweak">Promethean limbs, in addition to normal severing rules, have a higher chance to be splattered or ashed once they reach maximum damage.</li>
 				<li class="rscadd">Limbs can now spread their damage to neighbors with the spread_dam var, when reaching max damage.</li>
 			</ul>
 			<h3 class="author">PrismaticGynoid updated:</h3>
@@ -519,7 +519,7 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">Broken APCs can be bashed open with slightly smaller objects now. This means wrenches are acceptable, no need to hunt down a fire extinguisher.</li>
 				<li class="rscdel">EVA rigsuit/hardsuit no longer holds toolboxes in suit storage since those have been a volume inventory for some time now. RIP ghetto satchel.</li>
-				<li class="tweak">CE's rigsuit/hardsuit no longer holds pickaxes and ore satchels, but can now hold inflateables.</li>
+				<li class="rsctweak">CE's rigsuit/hardsuit no longer holds pickaxes and ore satchels, but can now hold inflateables.</li>
 				<li class="bugfix">Retracting rigsuit/hardsuit helmets with no valid mask equipped now disables internals.</li>
 				<li class="bugfix">Offline rigsuits/hardsuits are no longer considered valid air supplies by the internals button. Before, your internals would instantly shut off before you could get a breath out of the rigsuit. Now, the internals button will look for a different tank instead.</li>
 				<li class="rscadd">Tajaran now get to keep their tails when they wear the EVA, RD, or Industrial rigsuits/hardsuits. Unathi sprites to come soon!</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 59813af11d5..bfbd578cc37 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4228,8 +4228,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Adds two rig suits. Military Rig suit from Bay and PMC rigsuit
   - rscadd: Adds four exploration and pilot voidsuits (alternate sprites by Naidh)
   - rscadd: Adds exploration and pilot voidsuits
-<<<<<<< HEAD
-=======
 2018-10-13:
   Anewbe:
   - bugfix: You can no longer have ALL of your blood punched out.
@@ -4303,9 +4301,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       circuit reference scanning. Antag multi-tools untouched for now.
   - bugfix: Integrated circuit printer now respects adjacency, if it is not set to
       debug.
-<<<<<<< HEAD
->>>>>>> 8430fe5... Merge pull request #5768 from Atermonera/changelog
-=======
 2019-01-06:
   Mechoid:
   - bugfix: Slimes now respect slime colors as their faction when dealing with other
@@ -4419,4 +4414,3 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   kartagrafi:
   - rscadd: 'Adds several clothing items to loadout such as: Nock masks, cowls and
       robes.'
->>>>>>> 1c7ceeb... Merge pull request #5989 from Atermonera/changelog