From fcb7d44eb3a9be0af27729d85e965e2b600efd39 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Thu, 16 Jul 2020 00:35:54 +0000
Subject: [PATCH 1/3] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 16 ++++++++++++++++
 html/changelogs/.all_changelog.yml         | 11 +++++++++++
 html/changelogs/AutoChangeLog-pr-12738.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-12774.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-12782.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-12783.yml |  4 ----
 6 files changed, 27 insertions(+), 17 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12738.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12774.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12782.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12783.yml

diff --git a/html/changelog.html b/html/changelog.html
index e5b5c98aa1..ccfb04740f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,22 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">16 July 2020</h2>
+			<h3 class="author">DeltaFire15 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes a zeolite runtime caused by a missing check.</li>
+			</ul>
+			<h3 class="author">Sneakyrat6 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes being able to meta people real name with OOC Notes</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">travelling traders from another dimension can now visit the station in search of something specific, and reward you for giving it to them</li>
+				<li class="bugfix">small error with pet carrier logic fixed and also making sure simple mobs are catered for properly inside bluespace jars</li>
+				<li class="bugfix">fixes coin related issue</li>
+			</ul>
+
 			<h2 class="date">15 July 2020</h2>
 			<h3 class="author">Sonic121x updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index dd0a479114..662e458972 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26361,3 +26361,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2020-07-15:
   Sonic121x:
   - bugfix: Paramedic jumpsuit
+2020-07-16:
+  DeltaFire15:
+  - bugfix: Fixes a zeolite runtime caused by a missing check.
+  Sneakyrat6:
+  - bugfix: Fixes being able to meta people real name with OOC Notes
+  timothyteakettle:
+  - rscadd: travelling traders from another dimension can now visit the station in
+      search of something specific, and reward you for giving it to them
+  - bugfix: small error with pet carrier logic fixed and also making sure simple mobs
+      are catered for properly inside bluespace jars
+  - bugfix: fixes coin related issue
diff --git a/html/changelogs/AutoChangeLog-pr-12738.yml b/html/changelogs/AutoChangeLog-pr-12738.yml
deleted file mode 100644
index 883e4a10ac..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12738.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - rscadd: "travelling traders from another dimension can now visit the station in search of something specific, and reward you for giving it to them"
-  - bugfix: "small error with pet carrier logic fixed and also making sure simple mobs are catered for properly inside bluespace jars"
diff --git a/html/changelogs/AutoChangeLog-pr-12774.yml b/html/changelogs/AutoChangeLog-pr-12774.yml
deleted file mode 100644
index 85373e1b9a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12774.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes: 
-  - bugfix: "Fixes a zeolite runtime caused by a missing check."
diff --git a/html/changelogs/AutoChangeLog-pr-12782.yml b/html/changelogs/AutoChangeLog-pr-12782.yml
deleted file mode 100644
index 07200e4345..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12782.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - bugfix: "fixes coin related issue"
diff --git a/html/changelogs/AutoChangeLog-pr-12783.yml b/html/changelogs/AutoChangeLog-pr-12783.yml
deleted file mode 100644
index b9641493c6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12783.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Sneakyrat6"
-delete-after: True
-changes: 
-  - bugfix: "Fixes being able to meta people real name with OOC Notes"

From 9a9993c7be4e5acc3e8b2e1876a38aaa98cccac7 Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Wed, 29 Jul 2020 19:00:06 +0100
Subject: [PATCH 2/3] yep

---
 code/modules/research/designs/tool_designs.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm
index 0a278602c1..4fe07cb02f 100644
--- a/code/modules/research/designs/tool_designs.dm
+++ b/code/modules/research/designs/tool_designs.dm
@@ -91,8 +91,8 @@
 	build_path = /obj/item/construction/rld/mini
 	category = list("Tool Designs")
 	departmental_flags =  DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO
-	
-	/datum/design/ranged_analyzer
+
+/datum/design/ranged_analyzer
 	name = "Long-range Analyzer"
 	desc = "A new advanced atmospheric analyzer design, capable of performing scans at long range."
 	id = "ranged_analyzer"

From 097327b4f386788c2f5a115e8fda55e56a5b74ab Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Wed, 29 Jul 2020 19:02:18 +0100
Subject: [PATCH 3/3] Revert "Merge branch 'master' into travis-patch-1"

This reverts commit de3d6310b2345e52dfbfbe5b2c36f7d864afe020, reversing
changes made to f8f29826f511d3f46be3d8bc3be33a8facb0243b.
---
 html/changelogs/.all_changelog.yml | 232 +++++++++++++++++++++++++++++
 1 file changed, 232 insertions(+)

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 662e458972..cd3f5c04bc 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26372,3 +26372,235 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: small error with pet carrier logic fixed and also making sure simple mobs
       are catered for properly inside bluespace jars
   - bugfix: fixes coin related issue
+2020-07-17:
+  ShizCalev, Fikou:
+  - bugfix: Added some sanity checking for varedit values.
+  - bugfix: Fixed an exploit involving coins and mints that could crash the server.
+  - bugfix: Fixed an exploit that would allow you to destroy round-critical / indestructible
+      items with folders.
+  - bugfix: Swarmers can no longer cut power lines by deconstructing catwalks underneath
+      them.
+  - bugfix: Fixed a scenario that allowed infinite resource generation via ore machines.
+  - bugfix: you can no longer inject html in ahelps
+  - admin: you cant either, jannies
+  timothyteakettle:
+  - bugfix: fixes a small pickle related issue
+  - rscadd: recent culinary and scientific advancements have brought forth new pickle
+      related technologies
+2020-07-19:
+  Arturlang:
+  - rscadd: TGUI 3.0 and enables all the UIs, plus the smart asset cache, and all
+      the things required for them
+  EmeraldSundisk:
+  - rscadd: Adds a pool to Delta Station
+  - rscadd: Adds light fixtures to specified areas
+  - tweak: Relocates objects in impacted areas of Delta's starboard maintenance
+  MrJWhit:
+  - rscadd: Adds a small light next to the kitchen counter
+  Putnam3145:
+  - bugfix: Pen uplinks no longer broken
+  TheObserver-sys:
+  - rscadd: 'Adds a new reaction: Slime Extractification. Take 30u Slime Jelly, 5u
+      Frost Oil, and 5u plasma to generate a fresh grey slime extract.'
+  Yakumo Chen:
+  - tweak: Hierophant club now checks for friendly fire by default.
+  b1tt3r1n0:
+  - rscadd: Added the updated circle game
+  silicons:
+  - rscadd: Unarmed parry is now a thing.
+  timothyteakettle:
+  - rscadd: plushies in the loadout have been replaced with a box that lets you choose
+      one instead
+  - bugfix: wrestling should no longer have the ability to permanently rotate people
+  - rscadd: you can now select to wear a snail shell as your backpack in the customization
+      menu
+  zeroisthebiggay:
+  - tweak: martial arts twenty minpop
+  - bugfix: records
+2020-07-20:
+  lolman360:
+  - tweak: Service borgs now have synthesizers instead of a violin and guitar.
+  - bugfix: borg RSF
+2020-07-21:
+  Arturlang:
+  - bugfix: Decal painter ui now works, yay?
+  CameronWoof:
+  - rscadd: Adds aloe, a new growable plant
+  - rscadd: Adds medicated sutures and advanced regenerative meshes
+  - bugfix: Polypyrylium oligomers and liquid electricity now correctly populate
+  Chiirno:
+  - rscadd: Alt-click pill bottles places top-most pill into active hand.
+  - tweak: Moved dice bags from pill_bottle/dice to box/dice to avoid dice bags being
+      affected from medical specific pill bottle changes.
+  DeltaFire15:
+  - bugfix: Swarmers can once again eat items as long as there's nothing living in
+      them.
+  Funce:
+  - bugfix: Genetics spiderwebs are no longer impassable walls
+  Kraseo:
+  - balance: Damp rags no longer instantly apply their chemicals onto someone.
+  SiliconMain:
+  - tweak: Geigers can no longer be contaminated
+  TheSpaghetti:
+  - rscadd: new snowflake trait
+  kappa-sama:
+  - balance: advanced surgery duffel bag no longer comes with a nukie medkit. it costs
+      4 less telecrystals to make up for this colossal nerf.
+  - tweak: quartered the weight of the stray cargo pod event from 2x normal to 1/2
+      normal
+  silicons:
+  - tweak: survivalists (from summon guns/magic) are proper objective'd pseudoantagonists
+      again
+  - tweak: summon guns/magic can only be used once each
+  - tweak: summon guns/magic now only cost one point each
+  - imageadd: ':dsmile: :dfrown: :dhsmile: :dpog: :dneutral:'
+  - bugfix: gravity should update for mobs a fair bit faster
+  - rscadd: voting can now be done from the stat panel if the system is plurality
+      and approval
+  timothyteakettle:
+  - rscadd: new fried component used for frying objects
+  - bugfix: various frying bugs fixed such as being able to unfry items and frying
+      turfs with cold cooking oil
+2020-07-22:
+  Ludox:
+  - rscdel: You can no longer be brainwashed into giving birth to a fake baby
+  kappa-sama:
+  - balance: brainwashing disk has lost its cost buffs (3->5) and is role restricted
+      once more (medical doctor/roboticist)
+2020-07-23:
+  DeltaFire15:
+  - bugfix: Traits are no longer fucked
+  Putnam3145:
+  - tweak: Slight optimization in chat code.
+  kappa-sama:
+  - bugfix: tendril chests being empty
+  zeroisthebiggay:
+  - rscadd: fetish content
+2020-07-24:
+  EmeraldSundisk:
+  - rscadd: Adds a CMO office, along with Virology and Genetics labs to Omega Station
+  - rscadd: Adds a second chemistry station to the chemistry lab
+  - tweak: Adjusts the locations of some objects in medical to accommodate these new
+      additions
+  - tweak: Relocates the morgue
+  - tweak: Relocates items in impacted areas of maintenance as well as the library
+  - bugfix: Fixes an air line Bartholomew somehow knocked out
+  Linzolle:
+  - bugfix: wounds now have a description on examine
+  Owai-Seek:
+  - rscadd: Meatball Sub, Meatloaf + Meatloaf Slices, Bear Chili, Mashed Potatoes
+  - rscadd: Buttered Potatoes, Fancy Cracker Pack, Spiral Soup, Sweet and Sour Chicken
+  - tweak: Organised the Food DMI a bit.
+  - tweak: Deleted some stray pixels on some sprites.
+  - tweak: Nuggie boxes are now centered correctly.
+  - imageadd: Icons for the the food items in this PR.
+  Sneakyrat6:
+  - bugfix: Fixes dressers not giving you undies
+  - bugfix: Fixes Snaxi not loading properly because of typos
+  - rscadd: You can now burn photos
+  Zandario:
+  - spellcheck: Murdered **tipes** and gave birth to **is**.
+  silicons:
+  - tweak: sanitization now doesn't cut off 15.7 or something million possible colors
+      from character preferences (instead of only allowing 16 values for R G and B,
+      it now allows 256 each)
+  - balance: projectiles are by default 17.5 tiles per second instead of 12.5
+  timothyteakettle:
+  - rscadd: due to recent innovative research in the medical field, you now have bones
+  - tweak: zombie claws are now sharp and do less damage, but can destroy non-lifeforms
+      far faster
+  - tweak: zombies now take less stamina damage
+  - rscadd: beepsky can now wear hats
+  zeroisthebiggay:
+  - imageadd: rad and kravglove sprites
+2020-07-25:
+  CameronWoof:
+  - bugfix: Aloe now has an icon.
+  timothyteakettle:
+  - bugfix: beepsky replaces the word THREAT_LEVEL with the actual threat level
+2020-07-26:
+  DeltaFire15:
+  - bugfix: Organs now decay again.
+  Iatots:
+  - tweak: Licking wounds now may cause you to spit out a hairball once in a while!
+  - rscadd: You can now craft a catgirl plushie with 3 of a new ingredient occasionally
+      found in medbay!
+  dapnee:
+  - tweak: removed legacy public mining shuttle area and remade lounge
+2020-07-27:
+  Hatterhat:
+  - rscadd: Training bokkens! Make 'em from wood, use 'em in-hand to toggle between
+      harmful and not-so-harmful, practice your parrying with them!
+  - bugfix: Marker beacons should have a sprite again.
+  silicons:
+  - rscadd: clownops and clown mobs now share the same faction. HONK!
+  timothyteakettle:
+  - bugfix: modern pickle technology now allows people who have been turned into pickles,
+      to be retrieved through the medical course of dying
+2020-07-28:
+  Cacogen:
+  - rscadd: OSHA has more pull than anyone could have expected. All armor provided
+      by Nanotrasen and the syndicate now have tags that accurately lists defenses
+      and resistances of a piece of clothing.
+  CameronWoof:
+  - tweak: Exotic seed crates now contain a spaceman's trumpet seed packet.
+  EmeraldSundisk:
+  - rscadd: Renovates Snow Taxi's northeast bathroom to have multiple non-urinal toilets
+      and showers
+  - rscadd: Adds signage/labeling to improve map readability
+  - rscadd: Adds a bathroom to the northwest station
+  - rscadd: Adds a filing cabinet to the cargo department
+  - tweak: Area designation adjustments to account for the above changes
+  - bugfix: Adds a missing airlock cyclelink near medical
+  Ludox235:
+  - tweak: Makes the flavour text that appears when you become a zombie tell you to
+      act like one.
+  MrJWhit:
+  - tweak: Decluttered toxins and hid the yellow mix line in atmos, for metastation
+  SiliconMain:
+  - tweak: Paramedic heirloom is now a zippo
+  - tweak: Durathread belts now protect their contents from radiation, and can hold
+      full sized extinguishers
+  Sishen1542:
+  - rscdel: removed zoomba
+  dapnee:
+  - tweak: added a fan to the listening outpost
+  - bugfix: added two missing r-walls near the SM, removed random light and wire node
+      below the engine, and fixed the missing cable in the courtroom on Kilo
+  kappa-sama:
+  - balance: Stimpaks cost 5tc once more, up from 3tc.
+  silicons:
+  - rscadd: polychromatic cloaks to loadout
+  - rscdel: no more self healing with medibeam guns
+  - balance: oh no, taser buff. alt fire delay dropped to 0.4 seconds.
+  - rscadd: you can now shoot yourself by disarm-intenting yourself with a gun.
+  timothyteakettle:
+  - tweak: species code is now slightly less messy
+  - bugfix: slight tweak to how material crafting works
+  - bugfix: changed up pet carriers / bluespace jars a bit so you can't fit certain
+      things inside them and also the text shown for resist times is accurate
+  zeroisthebiggay:
+  - rscadd: Black Box theft objective
+2020-07-29:
+  DeltaFire15:
+  - bugfix: The 'Naked' outfit is no longer broken.
+  Ghommie:
+  - bugfix: fixed cremator trays, paleness examination strings, chat message for stamping
+      paper, looping sounds, load away missions/VR admin verb, access requirements
+      for using the sechuds.
+  - tweak: Alt-Clicking a cigarette packet should pull the lighter out first if present,
+      then cigarettes.
+  Hatterhat:
+  - bugfix: Directional windows can now be rotated counterclockwise properly again.
+  NecromancerAnne, Sirich96:
+  - rscadd: Stunbaton sprites by Sirich96.
+  - rscadd: New sprites for the stunsword.
+  necromanceranne:
+  - rscadd: Adds some in-hands for the rapier sheath.
+  timothyteakettle:
+  - bugfix: tail wagging should work in all cases now
+  - bugfix: bluespace jars work as intended now
+  - bugfix: aliens can remove embeds now
+  - bugfix: bloodsuckers are not affected by bloodloss
+  zeroisthebiggay:
+  - rscadd: Flannel jackets and bartender winter coat