From 1540d66e881f7a3a69ef30c177a09708e260f868 Mon Sep 17 00:00:00 2001
From: dapnee <33661984+dapnee@users.noreply.github.com>
Date: Tue, 28 Jul 2020 12:00:35 -0600
Subject: [PATCH 01/26] Minor Fixes to Box

backwards sinks and such
---
 _maps/map_files/BoxStation/BoxStation.dmm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index d91dd5b7c8..fdab2dba32 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -13347,7 +13347,6 @@
 	pixel_y = 32
 	},
 /obj/structure/sink{
-	dir = 1;
 	pixel_y = 25
 	},
 /obj/machinery/button/door{
@@ -14233,7 +14232,6 @@
 	pixel_y = 32
 	},
 /obj/structure/sink{
-	dir = 1;
 	pixel_y = 25
 	},
 /obj/machinery/button/door{
@@ -53437,6 +53435,7 @@
 "dfh" = (
 /obj/machinery/power/apc{
 	areastring = "/area/science/circuit";
+	dir = 4;
 	name = "Circuitry Lab APC";
 	pixel_x = 30
 	},
@@ -57075,6 +57074,7 @@
 	dir = 4;
 	pixel_y = 5
 	},
+/obj/item/clothing/head/hardhat/cakehat,
 /turf/open/floor/wood,
 /area/crew_quarters/bar)
 "oby" = (
@@ -57847,7 +57847,6 @@
 	pixel_y = 32
 	},
 /obj/structure/sink{
-	dir = 1;
 	pixel_y = 25
 	},
 /turf/open/floor/mineral/titanium/blue,

From 170afed3bc3ceb778daf1aa1119544c235c0471e Mon Sep 17 00:00:00 2001
From: dapnee <33661984+dapnee@users.noreply.github.com>
Date: Tue, 28 Jul 2020 12:16:31 -0600
Subject: [PATCH 02/26] oops

forgot the sinks in the locker room
---
 _maps/map_files/BoxStation/BoxStation.dmm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index fdab2dba32..bfba41f80b 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -21716,7 +21716,6 @@
 	pixel_y = 32
 	},
 /obj/structure/sink{
-	dir = 1;
 	pixel_y = 25
 	},
 /obj/machinery/button/door{
@@ -54775,7 +54774,6 @@
 	dir = 8
 	},
 /obj/structure/sink{
-	dir = 1;
 	pixel_y = 25
 	},
 /obj/structure/mirror{
@@ -57198,7 +57196,6 @@
 	dir = 8
 	},
 /obj/structure/sink{
-	dir = 1;
 	pixel_y = 25
 	},
 /obj/structure/mirror{
@@ -60672,7 +60669,6 @@
 	pixel_y = 32
 	},
 /obj/structure/sink{
-	dir = 1;
 	pixel_y = 25
 	},
 /obj/machinery/button/door{

From 1f508ef15defb3193d1133cab48ec18e2bcee3f2 Mon Sep 17 00:00:00 2001
From: Adelphon <jeevesby@gmail.com>
Date: Tue, 28 Jul 2020 15:04:58 -0400
Subject: [PATCH 03/26] Adds Camo To AutoDrobe (fix)

Adds syndicate Camo to Autodrobe WITHOUT the armor bonuses.
---
 code/modules/clothing/under/syndicate.dm | 3 +++
 code/modules/vending/autodrobe.dm        | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index 8a88e99d05..6a6c38d26e 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -73,6 +73,9 @@
 	item_state = "g_suit"
 	can_adjust = FALSE
 
+/obj/item/clothing/under/syndicate/camo/cosmetic
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+
 /obj/item/clothing/under/syndicate/soviet
 	name = "Ratnik 5 tracksuit"
 	desc = "Badly translated labels tell you to clean this in Vodka. Great for squatting in."
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 260b124283..bc824cc994 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -116,7 +116,8 @@
 						/obj/item/gun/magic/wand = 2,
 						/obj/item/clothing/glasses/sunglasses/garb = 2,
 						/obj/item/clothing/glasses/sunglasses/blindfold = 1,
-						/obj/item/clothing/mask/muzzle = 2)
+						/obj/item/clothing/mask/muzzle = 2,
+						/obj/item/clothing/under/syndicate/camo/cosmetic = 3)
 	premium = list(/obj/item/clothing/suit/pirate/captain = 2,
 					/obj/item/clothing/head/pirate/captain = 2,
 					/obj/item/clothing/head/helmet/roman/fake = 1,

From f53280c9b77e76f8e1387cc337569a3d8871a876 Mon Sep 17 00:00:00 2001
From: dapnee <33661984+dapnee@users.noreply.github.com>
Date: Tue, 28 Jul 2020 13:46:10 -0600
Subject: [PATCH 04/26] adds another atmos tech spawn

treading on justin's pr by accident, oops
---
 _maps/map_files/BoxStation/BoxStation.dmm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index bfba41f80b..54ca3656d7 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -54385,6 +54385,7 @@
 /obj/structure/chair/office/dark{
 	dir = 1
 	},
+/obj/effect/landmark/start/atmospheric_technician,
 /turf/open/floor/plasteel,
 /area/engine/atmos)
 "fMp" = (

From 09f2594c37e6ba3648e71a9e19dd4558495273a9 Mon Sep 17 00:00:00 2001
From: Artur <arturpaavooskari.lang@gmail.com>
Date: Tue, 28 Jul 2020 22:58:13 +0300
Subject: [PATCH 05/26] Plugs bloodsucker LifeTick into BiologicalLife

---
 code/modules/antagonists/bloodsucker/bloodsucker_life.dm  | 1 -
 code/modules/antagonists/bloodsucker/datum_bloodsucker.dm | 1 -
 code/modules/mob/living/carbon/life.dm                    | 8 ++++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
index 47a98623db..cb6b2d8685 100644
--- a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
+++ b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
@@ -11,7 +11,6 @@
 // Show as dead when...
 
 /datum/antagonist/bloodsucker/proc/LifeTick()// Should probably run from life.dm, same as handle_changeling, but will be an utter pain to move
-	set waitfor = FALSE // Don't make on_gain() wait for this function to finish. This lets this code run on the side.
 	var/notice_healing
 	while(owner && !AmFinalDeath()) // owner.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) == src
 		if(owner.current.stat == CONSCIOUS && !poweron_feed && !HAS_TRAIT(owner.current, TRAIT_FAKEDEATH)) // Deduct Blood
diff --git a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
index 888db8193b..e111ca97ea 100644
--- a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
+++ b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
@@ -50,7 +50,6 @@
 	AssignStarterPowersAndStats()// Give Powers & Stats
 	forge_bloodsucker_objectives()// Objectives & Team
 	update_bloodsucker_icons_added(owner.current, "bloodsucker")	// Add Antag HUD
-	LifeTick()	// Run Life Function
 	. = ..()
 
 
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 725feb214c..000fcd59c2 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -1,6 +1,8 @@
 /mob/living/carbon/BiologicalLife(seconds, times_fired)
 	//Updates the number of stored chemicals for powers
 	handle_changeling()
+	//Handles the unique mentabolism of bloodsuckers, look at /datum/antagonist/bloodsucker/proc/LifeTick()
+	handle_bloodsucker()
 	//Reagent processing needs to come before breathing, to prevent edge cases.
 	handle_organs()
 	. = ..()		// if . is false, we are dead.
@@ -422,6 +424,12 @@
 			hud_used.lingchemdisplay.invisibility = INVISIBILITY_ABSTRACT
 
 
+/mob/living/carbon/proc/handle_bloodsucker()
+	if(mind && AmBloodsucker(src))
+		var/datum/antagonist/bloodsucker/B 
+		B.LifeTick
+	
+
 /mob/living/carbon/handle_mutations_and_radiation()
 	if(dna && dna.temporary_mutations.len)
 		for(var/mut in dna.temporary_mutations)

From e0d9c7972d27d1d561363d7ff804c8838e237b02 Mon Sep 17 00:00:00 2001
From: Artur <arturpaavooskari.lang@gmail.com>
Date: Wed, 29 Jul 2020 01:50:40 +0300
Subject: [PATCH 06/26] Makes it actually work

---
 code/modules/mob/living/carbon/life.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 000fcd59c2..e29c6b9ffe 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -426,8 +426,8 @@
 
 /mob/living/carbon/proc/handle_bloodsucker()
 	if(mind && AmBloodsucker(src))
-		var/datum/antagonist/bloodsucker/B 
-		B.LifeTick
+		var/datum/antagonist/bloodsucker/B = mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
+		B.LifeTick()
 	
 
 /mob/living/carbon/handle_mutations_and_radiation()

From bc823b544fc2cd4824fc854ca1790ddc33197f86 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Wed, 29 Jul 2020 01:17:16 -0700
Subject: [PATCH 07/26] sigh

---
 code/game/machinery/telecomms/machines/message_server.dm | 2 +-
 code/modules/clothing/shoes/_shoes.dm                    | 4 ++--
 code/modules/research/designs/tool_designs.dm            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm
index c6386241ee..04fd5f6af5 100644
--- a/code/game/machinery/telecomms/machines/message_server.dm
+++ b/code/game/machinery/telecomms/machines/message_server.dm
@@ -21,7 +21,7 @@
 	. = ..()
 	stored = new /obj/item/blackbox(src)
 
-/obj/machinery/blackbox_recorder/attack_hand(mob/living/user)
+/obj/machinery/blackbox_recorder/on_attack_hand(mob/living/user, act_intent, unarmed_attack_flags)
 	. = ..()
 	if(stored)
 		to_chat(user, "<span class='notice'>You start struggling to pry the [stored] from the [src]...</span>")
diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm
index c12702424b..746bd3458a 100644
--- a/code/modules/clothing/shoes/_shoes.dm
+++ b/code/modules/clothing/shoes/_shoes.dm
@@ -268,13 +268,13 @@
 			our_alert = our_guy.throw_alert("shoealert", /obj/screen/alert/shoes/untied)
 
 
-/obj/item/clothing/shoes/attack_hand(mob/living/carbon/human/user)
+/obj/item/clothing/shoes/on_attack_hand(mob/living/user, act_intent, unarmed_attack_flags)
 	if(!istype(user))
 		return ..()
 	if(loc == user && tied != SHOES_TIED && (user.mobility_flags & MOBILITY_USE))
 		handle_tying(user)
 		return
-	..()
+	return ..()
 
 /obj/item/clothing/shoes/attack_self(mob/user)
 	. = ..()
diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm
index 0a278602c1..dd7e130f17 100644
--- a/code/modules/research/designs/tool_designs.dm
+++ b/code/modules/research/designs/tool_designs.dm
@@ -92,7 +92,7 @@
 	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 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 08/26] 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 09/26] 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

From 5a58cd6da0f3384304a9d9a0edfbb6c6846bbc7b Mon Sep 17 00:00:00 2001
From: dapnee <33661984+dapnee@users.noreply.github.com>
Date: Wed, 29 Jul 2020 14:35:17 -0600
Subject: [PATCH 10/26] Another pass over kilo

Added an air alarm to science near the bepis, fixed the active tiles around the arrivals shuttle, and fixed the commissary APC being only renamed and not area stringed correctly
---
 _maps/map_files/KiloStation/KiloStation.dmm | 50 ++++++---------------
 1 file changed, 13 insertions(+), 37 deletions(-)

diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index bf8c332cf0..fbe5b954ff 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -30475,6 +30475,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/science/research)
 "aXx" = (
@@ -57345,9 +57346,7 @@
 	name = "landing marker";
 	picked_color = "Burgundy"
 	},
-/turf/open/floor/plating/airless{
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	},
+/turf/open/floor/plating/airless,
 /area/hallway/secondary/entry)
 "bOe" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{
@@ -58565,9 +58564,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	},
+/turf/open/floor/plating/airless,
 /area/hallway/secondary/entry)
 "bQb" = (
 /obj/structure/flora/rock,
@@ -58930,7 +58927,7 @@
 	dir = 8
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/janitor";
+	areastring = "/area/vacant_room/commissary";
 	dir = 4;
 	name = "Vacant Commissary APC";
 	pixel_x = 27;
@@ -61285,9 +61282,7 @@
 	name = "landing marker";
 	picked_color = "Burgundy"
 	},
-/turf/open/floor/plating/airless{
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	},
+/turf/open/floor/plating/airless,
 /area/hallway/secondary/entry)
 "bUk" = (
 /obj/effect/turf_decal/tile/red,
@@ -61567,9 +61562,7 @@
 /turf/closed/wall,
 /area/engine/atmos)
 "bUN" = (
-/turf/open/floor/plating/airless{
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	},
+/turf/open/floor/plating/airless,
 /area/hallway/secondary/entry)
 "bUP" = (
 /obj/machinery/door/airlock/external{
@@ -67994,9 +67987,7 @@
 	name = "landing marker";
 	picked_color = "Burgundy"
 	},
-/turf/open/floor/plating/airless{
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	},
+/turf/open/floor/plating/airless,
 /area/hallway/secondary/entry)
 "ceV" = (
 /obj/effect/turf_decal/tile/yellow{
@@ -68021,18 +68012,14 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	},
+/turf/open/floor/plating/airless,
 /area/hallway/secondary/entry)
 "ceX" = (
 /obj/machinery/light{
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	},
+/turf/open/floor/plating/airless,
 /area/hallway/secondary/entry)
 "ceY" = (
 /obj/machinery/airalarm{
@@ -68880,9 +68867,7 @@
 /area/engine/engineering)
 "cgI" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	},
+/turf/open/floor/plating/airless,
 /area/hallway/secondary/entry)
 "cgJ" = (
 /obj/machinery/door/poddoor/preopen,
@@ -80506,9 +80491,7 @@
 /area/maintenance/fore)
 "cDp" = (
 /obj/structure/lattice/catwalk,
-/turf/open/floor/plating/airless{
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	},
+/turf/open/floor/plating/airless,
 /area/hallway/secondary/entry)
 "cDq" = (
 /obj/machinery/door/airlock/maintenance{
@@ -80896,9 +80879,6 @@
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/obj/item/storage/pill_bottle/dice{
-	pixel_x = -4
-	},
 /obj/item/pen/red{
 	pixel_x = 4;
 	pixel_y = 4
@@ -84920,9 +84900,7 @@
 "jAT" = (
 /obj/structure/lattice/catwalk,
 /obj/machinery/light,
-/turf/open/floor/plating/airless{
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	},
+/turf/open/floor/plating/airless,
 /area/hallway/secondary/entry)
 "jHJ" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
@@ -85370,9 +85348,7 @@
 "rNm" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/lattice/catwalk,
-/turf/open/floor/plating/airless{
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	},
+/turf/open/floor/plating/airless,
 /area/hallway/secondary/entry)
 "swG" = (
 /obj/item/reagent_containers/food/drinks/drinkingglass{

From d4469b8db8ad714581230e61a521748401a61422 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Wed, 29 Jul 2020 15:48:47 -0500
Subject: [PATCH 11/26] Automatic changelog generation for PR #12953 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-12953.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-12953.yml

diff --git a/html/changelogs/AutoChangeLog-pr-12953.yml b/html/changelogs/AutoChangeLog-pr-12953.yml
new file mode 100644
index 0000000000..d99f66b45a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12953.yml
@@ -0,0 +1,4 @@
+author: "Adelphon"
+delete-after: True
+changes: 
+  - rscadd: "Created a Cosmetic version of the camo."

From 62cbe958565808e3d5af38c2d7be97252332ff32 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Wed, 29 Jul 2020 16:02:26 -0500
Subject: [PATCH 12/26] Automatic changelog generation for PR #12955 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-12955.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-12955.yml

diff --git a/html/changelogs/AutoChangeLog-pr-12955.yml b/html/changelogs/AutoChangeLog-pr-12955.yml
new file mode 100644
index 0000000000..16669e36cd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12955.yml
@@ -0,0 +1,4 @@
+author: "Arturlang"
+delete-after: True
+changes: 
+  - code_imp: "Bloodsucker LifeTick runs from BiologicalLife now"

From 0711e45d18801a7c4a71c1ae75e159ad53a334ac Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Thu, 30 Jul 2020 00:11:15 +0000
Subject: [PATCH 13/26] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 39 ++++++++++++++++++
 html/changelogs/.all_changelog.yml         | 46 ++++++++++++++++++++++
 html/changelogs/AutoChangeLog-pr-12734.yml |  6 ---
 html/changelogs/AutoChangeLog-pr-12834.yml | 10 -----
 html/changelogs/AutoChangeLog-pr-12883.yml |  4 --
 html/changelogs/AutoChangeLog-pr-12922.yml |  4 --
 html/changelogs/AutoChangeLog-pr-12924.yml |  4 --
 html/changelogs/AutoChangeLog-pr-12928.yml |  4 --
 html/changelogs/AutoChangeLog-pr-12929.yml |  4 --
 html/changelogs/AutoChangeLog-pr-12930.yml |  5 ---
 html/changelogs/AutoChangeLog-pr-12932.yml |  4 --
 html/changelogs/AutoChangeLog-pr-12944.yml |  4 --
 html/changelogs/AutoChangeLog-pr-12953.yml |  4 --
 html/changelogs/AutoChangeLog-pr-12955.yml |  4 --
 14 files changed, 85 insertions(+), 57 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12734.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12834.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12883.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12922.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12924.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12928.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12929.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12930.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12932.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12944.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12953.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12955.yml

diff --git a/html/changelog.html b/html/changelog.html
index 3248f6d729..8c93566692 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,45 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">30 July 2020</h2>
+			<h3 class="author">Adelphon updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Created a Cosmetic version of the camo.</li>
+			</ul>
+			<h3 class="author">Arturlang updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="code_imp">Bloodsucker LifeTick runs from BiologicalLife now</li>
+			</ul>
+			<h3 class="author">Ryll-Ryll ported by silicons updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Shoelaces are now a thing. You can untie them by laying down next to someone.</li>
+				<li class="tweak">shoes now have lace delays and some can't be laced at all</li>
+				<li class="refactor">do after now tracks who's interacting with who, meaning some actions now break when the target moves away.</li>
+			</ul>
+			<h3 class="author">SiliconMain updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Ported the long range atmos analyzer from sk*rat, credit to NotRanged</li>
+			</ul>
+			<h3 class="author">silicons updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">energy sword perfect parries now reflect projectiles back at their shooters.</li>
+				<li class="balance">any mob can now parry if they have the right item</li>
+				<li class="rscadd">beam rifles now go into emitters properly</li>
+				<li class="refactor">clickdelay has been refactored into an experimental hybrid system. Check code/modules/mob/clickdelay.dm for more information.</li>
+				<li class="balance">Resisting no longer checks clickdelay, but is standardized to a 2 second per resist system for most forms of resisting. It still sets clickdelay, though.</li>
+				<li class="rscadd">Meters have been added for estimating time until next attack/resist. Won't be that useful due to our clickdelay currently being very short, though. They're visible from your hand and resist HUD elements. experimental: Most attacks and forms of attacking (minus unarmed because it's too much of a pain to refactor how hugs/gloves of the north star works) now check for time-since-last-attack rather than making it so you can't attack for said time. This means you can very quickly switch to a gun from a melee weapon, whereas in the old system a melee weapon would put you on lockout for 0.8 seconds, in the new system all the gun cares about is that you did not attack for at least 0.4 seconds.</li>
+				<li class="code_imp">All clickdelay setting/reading are now procs, so it should be trivial to implement another system where drawing/switching to a weapon requires you to have it out for x seconds before using it. I am not personally doing it at this point in time though because it will likely just annoy everyone with no real gain unless we do something like putting a 0.8 second switch-to cooldown for guns (which I did not, yet)</li>
+				<li class="refactor">attack_hand has been refactored to on_attack_hand remove: sexchems no longer impact click delay</li>
+				<li class="rscadd">turrets now automatically stagger their shots. Happy parrying/blocking.</li>
+				<li class="bugfix">turrets now speed_process, they were shooting slower than they should be</li>
+				<li class="balance">anything can now block with the right items</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">some crafted crates won't contain items now, and thus have stopped breaking the laws of physics</li>
+				<li class="tweak">beepskys hats now follow the laws of gravity and move up/down when he bobs up and down</li>
+			</ul>
+
 			<h2 class="date">29 July 2020</h2>
 			<h3 class="author">DeltaFire15 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index cd3f5c04bc..6f8b79bb80 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26604,3 +26604,49 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: bloodsuckers are not affected by bloodloss
   zeroisthebiggay:
   - rscadd: Flannel jackets and bartender winter coat
+2020-07-30:
+  Adelphon:
+  - rscadd: Created a Cosmetic version of the camo.
+  Arturlang:
+  - code_imp: Bloodsucker LifeTick runs from BiologicalLife now
+  Ryll-Ryll ported by silicons:
+  - rscadd: Shoelaces are now a thing. You can untie them by laying down next to someone.
+  - tweak: shoes now have lace delays and some can't be laced at all
+  - refactor: do after now tracks who's interacting with who, meaning some actions
+      now break when the target moves away.
+  SiliconMain:
+  - rscadd: Ported the long range atmos analyzer from sk*rat, credit to NotRanged
+  silicons:
+  - rscadd: energy sword perfect parries now reflect projectiles back at their shooters.
+  - balance: any mob can now parry if they have the right item
+  - rscadd: beam rifles now go into emitters properly
+  - refactor: clickdelay has been refactored into an experimental hybrid system. Check
+      code/modules/mob/clickdelay.dm for more information.
+  - balance: Resisting no longer checks clickdelay, but is standardized to a 2 second
+      per resist system for most forms of resisting. It still sets clickdelay, though.
+  - rscadd: 'Meters have been added for estimating time until next attack/resist.
+      Won''t be that useful due to our clickdelay currently being very short, though.
+      They''re visible from your hand and resist HUD elements. experimental: Most
+      attacks and forms of attacking (minus unarmed because it''s too much of a pain
+      to refactor how hugs/gloves of the north star works) now check for time-since-last-attack
+      rather than making it so you can''t attack for said time. This means you can
+      very quickly switch to a gun from a melee weapon, whereas in the old system
+      a melee weapon would put you on lockout for 0.8 seconds, in the new system all
+      the gun cares about is that you did not attack for at least 0.4 seconds.'
+  - code_imp: All clickdelay setting/reading are now procs, so it should be trivial
+      to implement another system where drawing/switching to a weapon requires you
+      to have it out for x seconds before using it. I am not personally doing it at
+      this point in time though because it will likely just annoy everyone with no
+      real gain unless we do something like putting a 0.8 second switch-to cooldown
+      for guns (which I did not, yet)
+  - refactor: 'attack_hand has been refactored to on_attack_hand remove: sexchems
+      no longer impact click delay'
+  - rscadd: turrets now automatically stagger their shots. Happy parrying/blocking.
+  - bugfix: turrets now speed_process, they were shooting slower than they should
+      be
+  - balance: anything can now block with the right items
+  timothyteakettle:
+  - bugfix: some crafted crates won't contain items now, and thus have stopped breaking
+      the laws of physics
+  - tweak: beepskys hats now follow the laws of gravity and move up/down when he bobs
+      up and down
diff --git a/html/changelogs/AutoChangeLog-pr-12734.yml b/html/changelogs/AutoChangeLog-pr-12734.yml
deleted file mode 100644
index 952ee721e0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12734.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Ryll-Ryll ported by silicons"
-delete-after: True
-changes: 
-  - rscadd: "Shoelaces are now a thing. You can untie them by laying down next to someone."
-  - tweak: "shoes now have lace delays and some can't be laced at all"
-  - refactor: "do after now tracks who's interacting with who, meaning some actions now break when the target moves away."
diff --git a/html/changelogs/AutoChangeLog-pr-12834.yml b/html/changelogs/AutoChangeLog-pr-12834.yml
deleted file mode 100644
index c58a6b14ea..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12834.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: "silicons"
-delete-after: True
-changes: 
-  - refactor: "clickdelay has been refactored into an experimental hybrid system. Check code/modules/mob/clickdelay.dm for more information."
-  - balance: "Resisting no longer checks clickdelay, but is standardized to a 2 second per resist system for most forms of resisting. It still sets clickdelay, though."
-  - rscadd: "Meters have been added for estimating time until next attack/resist. Won't be that useful due to our clickdelay currently being very short, though. They're visible from your hand and resist HUD elements.
-experimental: Most attacks and forms of attacking (minus unarmed because it's too much of a pain to refactor how hugs/gloves of the north star works) now check for time-since-last-attack rather than making it so you can't attack for said time. This means you can very quickly switch to a gun from a melee weapon, whereas in the old system a melee weapon would put you on lockout for 0.8 seconds, in the new system all the gun cares about is that you did not attack for at least 0.4 seconds."
-  - code_imp: "All clickdelay setting/reading are now procs, so it should be trivial to implement another system where drawing/switching to a weapon requires you to have it out for x seconds before using it. I am not personally doing it at this point in time though because it will likely just annoy everyone with no real gain unless we do something like putting a 0.8 second switch-to cooldown for guns (which I did not, yet)"
-  - refactor: "attack_hand has been refactored to on_attack_hand
-remove: sexchems no longer impact click delay"
diff --git a/html/changelogs/AutoChangeLog-pr-12883.yml b/html/changelogs/AutoChangeLog-pr-12883.yml
deleted file mode 100644
index 53aa8c6b4e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12883.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes: 
-  - rscadd: "beam rifles now go into emitters properly"
diff --git a/html/changelogs/AutoChangeLog-pr-12922.yml b/html/changelogs/AutoChangeLog-pr-12922.yml
deleted file mode 100644
index ff2fac660f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12922.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - tweak: "beepskys hats now follow the laws of gravity and move up/down when he bobs up and down"
diff --git a/html/changelogs/AutoChangeLog-pr-12924.yml b/html/changelogs/AutoChangeLog-pr-12924.yml
deleted file mode 100644
index e106d42bef..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12924.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SiliconMain"
-delete-after: True
-changes: 
-  - rscadd: "Ported the long range atmos analyzer from sk*rat, credit to NotRanged"
diff --git a/html/changelogs/AutoChangeLog-pr-12928.yml b/html/changelogs/AutoChangeLog-pr-12928.yml
deleted file mode 100644
index 442b685b25..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12928.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes: 
-  - balance: "any mob can now parry if they have the right item"
diff --git a/html/changelogs/AutoChangeLog-pr-12929.yml b/html/changelogs/AutoChangeLog-pr-12929.yml
deleted file mode 100644
index bc238805a5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12929.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes: 
-  - balance: "anything can now block with the right items"
diff --git a/html/changelogs/AutoChangeLog-pr-12930.yml b/html/changelogs/AutoChangeLog-pr-12930.yml
deleted file mode 100644
index d3df829756..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12930.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "silicons"
-delete-after: True
-changes: 
-  - rscadd: "turrets now automatically stagger their shots. Happy parrying/blocking."
-  - bugfix: "turrets now speed_process, they were shooting slower than they should be"
diff --git a/html/changelogs/AutoChangeLog-pr-12932.yml b/html/changelogs/AutoChangeLog-pr-12932.yml
deleted file mode 100644
index 62af146dcc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12932.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes: 
-  - rscadd: "energy sword perfect parries now reflect projectiles back at their shooters."
diff --git a/html/changelogs/AutoChangeLog-pr-12944.yml b/html/changelogs/AutoChangeLog-pr-12944.yml
deleted file mode 100644
index b055145583..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12944.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - bugfix: "some crafted crates won't contain items now, and thus have stopped breaking the laws of physics"
diff --git a/html/changelogs/AutoChangeLog-pr-12953.yml b/html/changelogs/AutoChangeLog-pr-12953.yml
deleted file mode 100644
index d99f66b45a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12953.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Adelphon"
-delete-after: True
-changes: 
-  - rscadd: "Created a Cosmetic version of the camo."
diff --git a/html/changelogs/AutoChangeLog-pr-12955.yml b/html/changelogs/AutoChangeLog-pr-12955.yml
deleted file mode 100644
index 16669e36cd..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12955.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arturlang"
-delete-after: True
-changes: 
-  - code_imp: "Bloodsucker LifeTick runs from BiologicalLife now"

From 940fe8240d3cbad8157b2a81a6a4576196a5f56a Mon Sep 17 00:00:00 2001
From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Thu, 30 Jul 2020 01:57:09 +0100
Subject: [PATCH 14/26] monkey blood fix

---
 code/modules/mob/living/blood.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index 56582386f1..36a6f6296b 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -14,7 +14,8 @@
 		var/obj/item/bodypart/BP = X
 		temp_bleed += BP.get_bleed_rate()
 		BP.generic_bleedstacks = max(0, BP.generic_bleedstacks - 1)
-	bleed(temp_bleed)
+	if(temp_bleed)
+		bleed(temp_bleed)
 
 	//Blood regeneration if there is some space
 	if(blood_volume < BLOOD_VOLUME_NORMAL)

From 4e1fcc4e08a8b6edce504483087bb6a9a2185b4d Mon Sep 17 00:00:00 2001
From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Thu, 30 Jul 2020 02:28:53 +0100
Subject: [PATCH 15/26] end our suffering

---
 code/__DEFINES/combat.dm                        | 2 +-
 code/_onclick/item_attack.dm                    | 4 ++--
 code/datums/martial/_martial.dm                 | 6 +++---
 code/modules/mob/living/carbon/human/species.dm | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm
index dff52f4748..3b52c344aa 100644
--- a/code/__DEFINES/combat.dm
+++ b/code/__DEFINES/combat.dm
@@ -281,7 +281,7 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 /// changeNext_move penalty multiplier of the above.
 #define STAM_CRIT_ITEM_ATTACK_DELAY		1.75
 /// Damage penalty when fighting prone.
-#define LYING_DAMAGE_PENALTY			0.5
+#define LYING_DAMAGE_PENALTY			0.7
 /// Added delay when firing guns stam-softcritted. Summed with a hardset CLICK_CD_RANGE delay, similar to STAM_CRIT_DAMAGE_DELAY otherwise.
 #define STAM_CRIT_GUN_DELAY			2.75
 
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index bef06a69e9..efd523abbc 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -183,9 +183,9 @@
 		if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
 			bad_trait = SKILL_COMBAT_MODE //blacklist combat skills.
 			if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE))
-				. *= 0.5
+				. *= 0.8
 		else if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-			. *= 1.5
+			. *= 1.2
 
 	if(!user.mind || !I.used_skills)
 		return
diff --git a/code/datums/martial/_martial.dm b/code/datums/martial/_martial.dm
index 8241f685d7..d4ba182d42 100644
--- a/code/datums/martial/_martial.dm
+++ b/code/datums/martial/_martial.dm
@@ -44,11 +44,11 @@
 	//Here we roll for our damage to be added into the damage var in the various attack procs. This is changed depending on whether we are in combat mode, lying down, or if our target is in combat mode.
 	var/damage = rand(A.dna.species.punchdamagelow, A.dna.species.punchdamagehigh)
 	if(SEND_SIGNAL(D, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-		damage *= 1.5
+		damage *= 1.2
 	if(!CHECK_MOBILITY(A, MOBILITY_STAND))
-		damage *= 0.5
+		damage *= 0.8
 	if(SEND_SIGNAL(A, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-		damage *= 0.25
+		damage *= 0.8
 	return damage
 
 /datum/martial_art/proc/teach(mob/living/carbon/human/H, make_temporary = FALSE)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index b5e48e47c9..19b9355a95 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1492,11 +1492,11 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 
 		//CITADEL CHANGES - makes resting and disabled combat mode reduce punch damage, makes being out of combat mode result in you taking more damage
 		if(!SEND_SIGNAL(target, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-			damage *= 1.5
+			damage *= 1.2
 		if(!CHECK_MOBILITY(user, MOBILITY_STAND))
-			damage *= 0.5
+			damage *= 0.8
 		if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-			damage *= 0.25
+			damage *= 0.8
 		//END OF CITADEL CHANGES
 
 		var/obj/item/bodypart/affecting = target.get_bodypart(ran_zone(user.zone_selected))

From 55be55ce0f00f87cd829fd8c51ab948922869494 Mon Sep 17 00:00:00 2001
From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Thu, 30 Jul 2020 02:29:13 +0100
Subject: [PATCH 16/26] Revert "end our suffering"

This reverts commit 4e1fcc4e08a8b6edce504483087bb6a9a2185b4d.
---
 code/__DEFINES/combat.dm                        | 2 +-
 code/_onclick/item_attack.dm                    | 4 ++--
 code/datums/martial/_martial.dm                 | 6 +++---
 code/modules/mob/living/carbon/human/species.dm | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm
index 3b52c344aa..dff52f4748 100644
--- a/code/__DEFINES/combat.dm
+++ b/code/__DEFINES/combat.dm
@@ -281,7 +281,7 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 /// changeNext_move penalty multiplier of the above.
 #define STAM_CRIT_ITEM_ATTACK_DELAY		1.75
 /// Damage penalty when fighting prone.
-#define LYING_DAMAGE_PENALTY			0.7
+#define LYING_DAMAGE_PENALTY			0.5
 /// Added delay when firing guns stam-softcritted. Summed with a hardset CLICK_CD_RANGE delay, similar to STAM_CRIT_DAMAGE_DELAY otherwise.
 #define STAM_CRIT_GUN_DELAY			2.75
 
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index efd523abbc..bef06a69e9 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -183,9 +183,9 @@
 		if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
 			bad_trait = SKILL_COMBAT_MODE //blacklist combat skills.
 			if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE))
-				. *= 0.8
+				. *= 0.5
 		else if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-			. *= 1.2
+			. *= 1.5
 
 	if(!user.mind || !I.used_skills)
 		return
diff --git a/code/datums/martial/_martial.dm b/code/datums/martial/_martial.dm
index d4ba182d42..8241f685d7 100644
--- a/code/datums/martial/_martial.dm
+++ b/code/datums/martial/_martial.dm
@@ -44,11 +44,11 @@
 	//Here we roll for our damage to be added into the damage var in the various attack procs. This is changed depending on whether we are in combat mode, lying down, or if our target is in combat mode.
 	var/damage = rand(A.dna.species.punchdamagelow, A.dna.species.punchdamagehigh)
 	if(SEND_SIGNAL(D, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-		damage *= 1.2
+		damage *= 1.5
 	if(!CHECK_MOBILITY(A, MOBILITY_STAND))
-		damage *= 0.8
+		damage *= 0.5
 	if(SEND_SIGNAL(A, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-		damage *= 0.8
+		damage *= 0.25
 	return damage
 
 /datum/martial_art/proc/teach(mob/living/carbon/human/H, make_temporary = FALSE)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 19b9355a95..b5e48e47c9 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1492,11 +1492,11 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 
 		//CITADEL CHANGES - makes resting and disabled combat mode reduce punch damage, makes being out of combat mode result in you taking more damage
 		if(!SEND_SIGNAL(target, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-			damage *= 1.2
+			damage *= 1.5
 		if(!CHECK_MOBILITY(user, MOBILITY_STAND))
-			damage *= 0.8
+			damage *= 0.5
 		if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-			damage *= 0.8
+			damage *= 0.25
 		//END OF CITADEL CHANGES
 
 		var/obj/item/bodypart/affecting = target.get_bodypart(ran_zone(user.zone_selected))

From f02bc4a5728f302d84ebaff48df2a80a55b0498d Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Wed, 29 Jul 2020 19:49:11 -0700
Subject: [PATCH 17/26] Update toy.dm

---
 code/modules/projectiles/guns/ballistic/toy.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm
index 5cdd773894..1f66cfdf8a 100644
--- a/code/modules/projectiles/guns/ballistic/toy.dm
+++ b/code/modules/projectiles/guns/ballistic/toy.dm
@@ -56,6 +56,7 @@
 	item_flags = NONE
 	casing_ejector = FALSE
 	can_suppress = FALSE
+	weapon_weight = WEAPON_MEDIUM
 
 /obj/item/gun/ballistic/shotgun/toy/process_chamber(mob/living/user, empty_chamber = 0)
 	..()

From 3fdd1654ad7acde6163818f80b5fd56cc145c0f2 Mon Sep 17 00:00:00 2001
From: dapnee <33661984+dapnee@users.noreply.github.com>
Date: Thu, 30 Jul 2020 16:44:24 -0600
Subject: [PATCH 18/26] aaaaaaa

I missed a SINGLE SINK
---
 _maps/map_files/BoxStation/BoxStation.dmm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 54ca3656d7..9877f5b259 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -57907,7 +57907,6 @@
 	pixel_y = 32
 	},
 /obj/structure/sink{
-	dir = 1;
 	pixel_y = 25
 	},
 /obj/machinery/light/small{

From b22ffd6b6e5e282c6aa6a3bffe1909af0b9af36f Mon Sep 17 00:00:00 2001
From: Artur <arturpaavooskari.lang@gmail.com>
Date: Fri, 31 Jul 2020 02:07:03 +0300
Subject: [PATCH 19/26] Makes it properly work

---
 .../bloodsucker/bloodsucker_life.dm           | 37 +++++++++----------
 .../bloodsucker/datum_bloodsucker.dm          |  1 +
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
index cb6b2d8685..4273aa1cbc 100644
--- a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
+++ b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
@@ -10,25 +10,24 @@
 //
 // Show as dead when...
 
-/datum/antagonist/bloodsucker/proc/LifeTick()// Should probably run from life.dm, same as handle_changeling, but will be an utter pain to move
-	var/notice_healing
-	while(owner && !AmFinalDeath()) // owner.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) == src
-		if(owner.current.stat == CONSCIOUS && !poweron_feed && !HAS_TRAIT(owner.current, TRAIT_FAKEDEATH)) // Deduct Blood
-			AddBloodVolume(passive_blood_drain) // -.1 currently
-		if(HandleHealing(1)) 		// Heal
-			if(!notice_healing && owner.current.blood_volume > 0)
-				to_chat(owner, "<span class='notice'>The power of your blood begins knitting your wounds...</span>")
-				notice_healing = TRUE
-		else if(notice_healing == TRUE)
-			notice_healing = FALSE 	// Apply Low Blood Effects
-		HandleStarving()  // Death
-		HandleDeath() // Standard Update
-		update_hud()// Daytime Sleep in Coffin
-		if(SSticker.mode.is_daylight() && !HAS_TRAIT_FROM(owner.current, TRAIT_FAKEDEATH, "bloodsucker"))
-			if(istype(owner.current.loc, /obj/structure/closet/crate/coffin))
-				Torpor_Begin()
-					// Wait before next pass
-		sleep(10)
+/datum/antagonist/bloodsucker/proc/LifeTick()  //Runs from BiologicalLife, handles all the bloodsucker constant proccesses
+	if(!owner && AmFinalDeath())
+		return
+	if(owner.current.stat == CONSCIOUS && !poweron_feed && !HAS_TRAIT(owner.current, TRAIT_FAKEDEATH)) // Deduct Blood
+		AddBloodVolume(passive_blood_drain) // -.1 currently
+	if(HandleHealing(1)) 		// Heal
+		if(!notice_healing && owner.current.blood_volume > 0)
+			to_chat(owner, "<span class='notice'>The power of your blood begins knitting your wounds...</span>")
+			notice_healing = TRUE
+	else if(notice_healing)
+		notice_healing = FALSE 	// Apply Low Blood Effects
+	HandleStarving()  // Death
+	HandleDeath() // Standard Update
+	update_hud()// Daytime Sleep in Coffin
+	if(SSticker.mode.is_daylight() && !HAS_TRAIT_FROM(owner.current, TRAIT_FAKEDEATH, "bloodsucker"))
+		if(istype(owner.current.loc, /obj/structure/closet/crate/coffin))
+			Torpor_Begin()
+				// Wait before next pass
 	FreeAllVassals() 	// Free my Vassals! (if I haven't yet)
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
index e111ca97ea..715de0648d 100644
--- a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
+++ b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
@@ -37,6 +37,7 @@
 	var/had_toxlover
 	var/level_bloodcost
 	var/passive_blood_drain = -0.1        //The amount of blood we loose each bloodsucker life() tick
+	var/notice_healing                    //Var to see if you are healing for preventing spam of the chat message inform the user of such
 	// LISTS
 	var/static/list/defaultTraits = list (TRAIT_STABLEHEART, TRAIT_NOBREATH, TRAIT_SLEEPIMMUNE, TRAIT_NOCRITDAMAGE, TRAIT_RESISTCOLD, TRAIT_RADIMMUNE, TRAIT_NIGHT_VISION, \
 										  TRAIT_NOSOFTCRIT, TRAIT_NOHARDCRIT, TRAIT_AGEUSIA, TRAIT_COLDBLOODED, TRAIT_NONATURALHEAL, TRAIT_NOMARROW, TRAIT_NOPULSE, TRAIT_VIRUSIMMUNE, TRAIT_NODECAP, TRAIT_NOGUT)

From 9020e59aa0c007d017778049f71489d6bf3c564d Mon Sep 17 00:00:00 2001
From: Artur <arturpaavooskari.lang@gmail.com>
Date: Fri, 31 Jul 2020 04:32:46 +0300
Subject: [PATCH 20/26] kevinz fix

---
 code/modules/antagonists/bloodsucker/bloodsucker_life.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
index 4273aa1cbc..2d25ebb156 100644
--- a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
+++ b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm
@@ -11,7 +11,7 @@
 // Show as dead when...
 
 /datum/antagonist/bloodsucker/proc/LifeTick()  //Runs from BiologicalLife, handles all the bloodsucker constant proccesses
-	if(!owner && AmFinalDeath())
+	if(!owner || AmFinalDeath())
 		return
 	if(owner.current.stat == CONSCIOUS && !poweron_feed && !HAS_TRAIT(owner.current, TRAIT_FAKEDEATH)) // Deduct Blood
 		AddBloodVolume(passive_blood_drain) // -.1 currently

From ad75ac0c6dcdb6ad62068289a21ae65cb8d24f8d Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Fri, 31 Jul 2020 02:30:56 -0700
Subject: [PATCH 21/26] Update telekinesis.dm

---
 code/_onclick/telekinesis.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index 73d834dd64..f8a14b8c30 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -123,7 +123,7 @@
 	. = ..()
 	if(!target || !user)
 		return
-	if(!user.CheckActionCooldown())
+	if(!user.CheckActionCooldown(CLICK_CD_MELEE))
 		return
 	if(!focus)
 		focus_object(target)
@@ -146,7 +146,7 @@
 	else
 		apply_focus_overlay()
 		focus.throw_at(target, 10, 1,user)
-	user.DelayNextAction(immediate = FALSE)
+	user.DelayNextAction(considered_action = TRUE, flush = TRUE)
 	update_icon()
 
 /proc/tkMaxRangeCheck(mob/user, atom/target)

From 96b44709a71dd32764b4f94a3fb77abb4c90447a Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Fri, 31 Jul 2020 14:22:01 -0500
Subject: [PATCH 22/26] Automatic changelog generation for PR #12964 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-12964.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-12964.yml

diff --git a/html/changelogs/AutoChangeLog-pr-12964.yml b/html/changelogs/AutoChangeLog-pr-12964.yml
new file mode 100644
index 0000000000..ec4b8016d1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12964.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes: 
+  - bugfix: "monkeys no longer continuously bleed everywhere"

From 80c11fe9989b5b4eedda61d18183f9bdcdd8432f Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Fri, 31 Jul 2020 14:22:15 -0500
Subject: [PATCH 23/26] Automatic changelog generation for PR #12967 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-12967.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-12967.yml

diff --git a/html/changelogs/AutoChangeLog-pr-12967.yml b/html/changelogs/AutoChangeLog-pr-12967.yml
new file mode 100644
index 0000000000..3297232e76
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12967.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - tweak: "toy shotguns no longer need 2 hands to fire"

From 82170264f5c6989c4a39e51641baee54b2e6dd38 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Fri, 31 Jul 2020 14:24:51 -0500
Subject: [PATCH 24/26] Automatic changelog generation for PR #12952 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-12952.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-12952.yml

diff --git a/html/changelogs/AutoChangeLog-pr-12952.yml b/html/changelogs/AutoChangeLog-pr-12952.yml
new file mode 100644
index 0000000000..f8a26d739c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12952.yml
@@ -0,0 +1,5 @@
+author: "dapnee"
+delete-after: True
+changes: 
+  - tweak: "added cake hat to bar, adds another atmostech spawn"
+  - bugfix: "sinks point in the right direction, APC won't spawn off the wall in circuits"

From c7100d6e6656f50bd461d9ad48b9a82f9ead761d Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Fri, 31 Jul 2020 14:25:59 -0500
Subject: [PATCH 25/26] Automatic changelog generation for PR #12962 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-12962.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-12962.yml

diff --git a/html/changelogs/AutoChangeLog-pr-12962.yml b/html/changelogs/AutoChangeLog-pr-12962.yml
new file mode 100644
index 0000000000..ccb9512673
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12962.yml
@@ -0,0 +1,4 @@
+author: "dapnee"
+delete-after: True
+changes: 
+  - bugfix: "changes commissary APC so it actually powers the room, adds a missing AIR alarm, arrivals no longer has active atmos tiles."

From 79590f6dc9b57e7c74c1df86979132eb98bfffb6 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sat, 1 Aug 2020 00:40:55 +0000
Subject: [PATCH 26/26] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 16 ++++++++++++++++
 html/changelogs/.all_changelog.yml         | 10 ++++++++++
 html/changelogs/AutoChangeLog-pr-12952.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-12962.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-12964.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-12967.yml |  4 ----
 6 files changed, 26 insertions(+), 17 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12952.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12962.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12964.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12967.yml

diff --git a/html/changelog.html b/html/changelog.html
index 8c93566692..b87a49f7f2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,22 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">01 August 2020</h2>
+			<h3 class="author">dapnee updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">added cake hat to bar, adds another atmostech spawn</li>
+				<li class="bugfix">sinks point in the right direction, APC won't spawn off the wall in circuits</li>
+				<li class="bugfix">changes commissary APC so it actually powers the room, adds a missing AIR alarm, arrivals no longer has active atmos tiles.</li>
+			</ul>
+			<h3 class="author">silicons updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">toy shotguns no longer need 2 hands to fire</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">monkeys no longer continuously bleed everywhere</li>
+			</ul>
+
 			<h2 class="date">30 July 2020</h2>
 			<h3 class="author">Adelphon updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 6f8b79bb80..26f91f06ed 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26650,3 +26650,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       the laws of physics
   - tweak: beepskys hats now follow the laws of gravity and move up/down when he bobs
       up and down
+2020-08-01:
+  dapnee:
+  - tweak: added cake hat to bar, adds another atmostech spawn
+  - bugfix: sinks point in the right direction, APC won't spawn off the wall in circuits
+  - bugfix: changes commissary APC so it actually powers the room, adds a missing
+      AIR alarm, arrivals no longer has active atmos tiles.
+  silicons:
+  - tweak: toy shotguns no longer need 2 hands to fire
+  timothyteakettle:
+  - bugfix: monkeys no longer continuously bleed everywhere
diff --git a/html/changelogs/AutoChangeLog-pr-12952.yml b/html/changelogs/AutoChangeLog-pr-12952.yml
deleted file mode 100644
index f8a26d739c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12952.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "dapnee"
-delete-after: True
-changes: 
-  - tweak: "added cake hat to bar, adds another atmostech spawn"
-  - bugfix: "sinks point in the right direction, APC won't spawn off the wall in circuits"
diff --git a/html/changelogs/AutoChangeLog-pr-12962.yml b/html/changelogs/AutoChangeLog-pr-12962.yml
deleted file mode 100644
index ccb9512673..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12962.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "dapnee"
-delete-after: True
-changes: 
-  - bugfix: "changes commissary APC so it actually powers the room, adds a missing AIR alarm, arrivals no longer has active atmos tiles."
diff --git a/html/changelogs/AutoChangeLog-pr-12964.yml b/html/changelogs/AutoChangeLog-pr-12964.yml
deleted file mode 100644
index ec4b8016d1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12964.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - bugfix: "monkeys no longer continuously bleed everywhere"
diff --git a/html/changelogs/AutoChangeLog-pr-12967.yml b/html/changelogs/AutoChangeLog-pr-12967.yml
deleted file mode 100644
index 3297232e76..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12967.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes: 
-  - tweak: "toy shotguns no longer need 2 hands to fire"