diff --git a/code/modules/ext_scripts/irc.dm b/code/modules/ext_scripts/irc.dm
index 955f24400c..db01eec296 100644
--- a/code/modules/ext_scripts/irc.dm
+++ b/code/modules/ext_scripts/irc.dm
@@ -1,20 +1,19 @@
 /proc/send2irc(var/channel, var/msg)
-	if(config.use_irc_bot && config.irc_bot_host)
-		for(var/IP in config.irc_bot_host)
-			spawn(0)
-				log_debug("send2irc: Sending [msg] to [channel]")
-				paranoid_sanitize(msg)
-				ext_python("ircbot_message.py", "[config.comms_password] [IP] [channel] [dbcon.Quote(msg)]")
+	if(config.use_irc_bot)
+		log_debug("send2irc: Sending [msg] to [channel]")
+		paranoid_sanitize(msg)
+		ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [channel] [dbcon.Quote(msg)]")
 	return
 
 /proc/send2mainirc(var/msg)
 	if(config.main_irc)
+		log_debug("send2mainirc: Sending [msg] to send2irc")
 		send2irc(config.main_irc, msg)
 	return
 
 /proc/send2adminirc(var/msg)
 	var/queuedmsg = "ADMIN - [msg]"
-
+	log_debug("send2adminirc: Sending [queuedmsg] to send2irc")
 	send2irc(config.admin_irc, queuedmsg)
 	return
 
diff --git a/code/modules/ext_scripts/python.dm b/code/modules/ext_scripts/python.dm
index bdb25d6900..69384a0cfe 100644
--- a/code/modules/ext_scripts/python.dm
+++ b/code/modules/ext_scripts/python.dm
@@ -18,10 +18,10 @@
 
 /proc/ext_python(var/script, var/args, var/scriptsprefix = 1)
 	if(scriptsprefix) script = "scripts/" + script
-
 	if(world.system_type == MS_WINDOWS)
 		script = replacetext(script, "/", "\\")
 
 	var/command = config.python_path + " " + script + " " + args
+	log_debug("ext_python: Sending [command] to shell")
 	shell("[command]")
 	return
diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
index 994f0fd9d1..3e6592fd6e 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
@@ -650,7 +650,7 @@
 		var/list/choices = list()
 		for(var/mob/living/carbon/human/M in oviewers(1))
 			choices += M
-		
+
 		if(!choices.len)
 			to_chat(src,"<span class='warning'>There's nobody nearby to use this on.</span>")
 
@@ -698,7 +698,7 @@
 		if(can_shred(T) != T)
 			to_chat(src,"<span class='warning'>Looks like you lost your chance...</span>")
 			return
-		
+
 		//Removing an internal organ
 		if(T_int && T_int.damage >= 25) //Internal organ and it's been severely damaged
 			T.apply_damage(15, BRUTE, T_ext) //Damage the external organ they're going through.
@@ -713,7 +713,7 @@
 		//Removing an external organ
 		else if(!T_int && (T_ext.damage >= 25 || T_ext.brute_dam >= 25))
 			T_ext.droplimb(1,DROPLIMB_EDGE) //Clean cut so it doesn't kill the prey completely.
-			
+
 			//Is it groin/chest? You can't remove those.
 			if(T_ext.cannot_amputate)
 				T.apply_damage(25, BRUTE, T_ext)
@@ -726,12 +726,12 @@
 				visible_message("<span class='warning'>[src] tears off [T]'s [T_ext.name]!</span>","<span class='warning'>You tear off [T]'s [T_ext.name]!</span>")
 
 		//Not targeting an internal organ w/ > 25 damage , and the limb doesn't have < 25 damage.
-		else 
+		else
 			if(T_int)
 				T_int.damage = 25 //Internal organs can only take damage, not brute damage.
 			T.apply_damage(25, BRUTE, T_ext)
 			visible_message("<span class='danger'>[src] severely damages [T]'s [T_ext.name]!</span>")
-		
+
 		add_attack_logs(src,T,"Shredded (hardvore)")
 
 /mob/living/proc/flying_toggle()
@@ -839,20 +839,20 @@
 		if(choice == "Aphrodisiac")
 			src.show_message("<span class='warning'>You sink your fangs into [T] and inject your aphrodisiac!</span>")
 			src.visible_message("<font color='red'>[src] sinks their fangs into [T]!</font>")
-			T.bloodstr.add_reagent("succubi_aphrodisiac",200)
+			T.bloodstr.add_reagent("succubi_aphrodisiac",100)
 			return 0
 		else if(choice == "Numbing")
 			src.show_message("<span class='warning'>You sink your fangs into [T] and inject your poison!</span>")
 			src.visible_message("<font color='red'>[src] sinks their fangs into [T]!</font>")
-			T.bloodstr.add_reagent("numbing_enzyme",50) //Poisons should work when more units are injected
+			T.bloodstr.add_reagent("numbing_enzyme",20) //Poisons should work when more units are injected
 		else if(choice == "Paralyzing")
 			src.show_message("<span class='warning'>You sink your fangs into [T] and inject your poison!</span>")
 			src.visible_message("<font color='red'>[src] sinks their fangs into [T]!</font>")
-			T.bloodstr.add_reagent("succubi_paralize",50) //Poisons should work when more units are injected
+			T.bloodstr.add_reagent("succubi_paralize",20) //Poisons should work when more units are injected
 		else
 			return //Should never happen
 
-/*
+/* //will maybe add something one day
 mob/living/carbon/proc/charmed() //TODO
 	charmed = 1
 
@@ -867,6 +867,7 @@ mob/living/carbon/proc/charmed() //TODO
 	name = "Aphrodisiac"
 	id = "succubi_aphrodisiac"
 	description = "A unknown liquid, it smells sweet"
+	metabolism = REM * 0.8
 	color = "#8A0829"
 	scannable = 0
 
@@ -875,62 +876,42 @@ mob/living/carbon/proc/charmed() //TODO
 		M.show_message("<span class='warning'>You feel funny, and fall in love with the person in front of you</span>")
 		M.emote(pick("blush", "moans", "giggles", "turns visibly red"))
 		//M.charmed() //TODO
-		return
+	return
 
 /datum/reagent/succubi_numbing //Using numbing_enzyme instead.
 	name = "Numbing Fluid"
 	id = "succubi_numbing"
 	description = "A unknown liquid, it doesn't smell"
+	metabolism = REM * 0.5
 	color = "#41029B"
 	scannable = 0
 
 /datum/reagent/succubi_numbing/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	
+	var/effective_dose = dose
+	var/threshold = 1
+	
+	if(effective_dose < 1.5 * threshold)
+		M.eye_blurry = max(M.eye_blurry, 10)
+	else if(effective_dose < 5 * threshold)
+		M.Weaken(2)
+		M.drowsyness = max(M.drowsyness, 20)
 	if(prob(7))
 		M.show_message("<span class='warning'>You start to feel weakened, your body seems heavy.</span>")
-		M.eye_blurry = max(M.eye_blurry, 10)
-		return
+	return
 
 /datum/reagent/succubi_paralize
 	name = "Paralyzing Fluid"
 	id = "succubi_numbing"
 	description = "A unknown liquid, it doesn't smell"
+	metabolism= REM * 0.5
 	color = "#41029B"
 	scannable = 0
 
-/datum/reagent/succubi_paralize/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/succubi_paralize/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) //will first keep it like that.  lets see what it changes. if nothing, than I will rework the effect again
+	
 	if(prob(7))
-		M.show_message("<span class='warning'>You lose sensation of your body.</span>")
 		M.Weaken(20)
-		return
-
-/mob/living/carbon/human/proc/face_sit()
-    set name = "Face Sit"
-    set desc = "Sit on your Prey's Face"
-    set category = "Abilities"
-
-    if(last_special > world.time)
-        return
-
-    if(!ishuman(src))
-        return //If you're not a human you don't have permission to do this.
-
-    var/mob/living/carbon/human/C = src
-
-    var/obj/item/weapon/grab/G = src.get_active_hand()
-
-    if(!istype(G))
-        to_chat(C, "<span class='warning'>You must be grabbing a creature in your active hand to sit on them.</span>")
-        return
-
-    var/mob/living/carbon/human/T = G.affecting
-
-    if(!istype(T) || T.isSynthetic())
-        to_chat(src, "<span class='warning'>\The [T] is not able to be sit on.</span>")
-        return
-
-    if(G.state != GRAB_AGGRESSIVE)
-        to_chat(C, "<span class='warning'>You must have the creature pinned on the ground to sit on them </span>")
-        return
-
-    src.visible_message("<font color='red'><b>[src] moves their ass to [T]'s head, sitting down on them, making them unable to see anything else than [src]'s butt </b></font>")
-    return
+		M.eye_blurry = max(M.eye_blurry, 10)
+		M.show_message("<span class='warning'>You lose sensation of your body.</span>")
+	return
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
index 4ed17886be..8a364ca139 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
@@ -114,15 +114,6 @@
 	H.verbs |= /mob/living/proc/glow_toggle
 	H.verbs |= /mob/living/proc/glow_color
 
-/datum/trait/face_sit
-    name = "Face_Sitting"
-    desc = "Makes you able to sit on your prey"
-    cost = 0
-
-/datum/trait/face_sit/apply(var/datum/species/S,var/mob/living/carbon/human/H)
-    ..(S,H)
-    H.verbs |= /mob/living/carbon/human/proc/face_sit
-
 /datum/trait/succubus_bite
     name = "Succubus Bite"
     desc = "Makes you able to bite prey in your grasp and subject them to a variety of chemicals.."
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 58c530d06c..af4014ec27 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -144,6 +144,7 @@
 			else
 				affecting.Weaken(2)
 
+
 	if(state >= GRAB_NECK)
 		affecting.Stun(3)
 		if(isliving(affecting))
@@ -173,6 +174,15 @@
 				assailant.visible_message("<span class='warning'>[assailant] covers [affecting]'s eyes!</span>")
 			if(affecting.eye_blind < 3)
 				affecting.Blind(3)
+		if(BP_HEAD)
+			if(force_down)
+				if(announce)
+					assailant.visible_message("<span class='warning'>[assailant] moves their ass to [target]'s head, sitting down on them, making them unable to see anything else than [assailant]'s butt!</span>")
+				if(target.silent < 3)
+					target.silent = 3
+				if(target.eye_blind < 3)
+					target.Blind(3)
+
 
 /obj/item/weapon/grab/attack_self()
 	return s_click(hud)
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm
new file mode 100644
index 0000000000..b9099a30d7
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm
@@ -0,0 +1,50 @@
+/// Recipes
+
+/datum/chemical_reaction/aphrodisiac
+	name = "aphrodisiac"
+	id = "aphrodisiac"
+	result = "aphrodisiac"
+	required_reagents = list("carbon" = 2, "hydrogen" = 2, "oxygen" = 2, "water" = 1)
+	result_amount = 6
+
+/datum/reagent/aphrodisiac
+	name = "aphrodisiac"
+	id = "aphrodisiac"
+	description = "You so horny."
+	taste_description = "sweetness"
+	reagent_state = LIQUID
+	color = "#FF9999"
+	scannable = 1
+
+/datum/reagent/aphrodisiac/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	if(!M)	return
+
+	if(prob(3))
+		M.emote(pick("blush", "moan", "moan", "giggle"))
+
+	// Unsure if we want to allow cumming. I'm gonna disable it for now.
+/*
+	if(prob(1))
+		switch(M.gender)
+			if(MALE)
+				M.emote("mcum")
+			if(FEMALE)
+				M.emote("fcum")
+			if(PLURAL)
+				if(prob(50))
+					M.emote("mcum")
+				else
+					M.emote("fcum")
+*/
+// Disabled cause I'm unsure if we want to do this or not.
+/*
+/mob/living/proc/cum()
+	if(!check_has_mouth())
+		return
+	src.visible_message("<span class='warning'>[src] throws up!</span>","<span class='warning'>You throw up!</span>")
+
+	var/turf/simulated/T = get_turf(src)	//TODO: Make add_blood_floor remove blood from human mobs
+	if(istype(T))
+		T.add_vomit_floor(src, 1)
+*/
+
diff --git a/config/custom_items.txt b/config/custom_items.txt
index bc52ab5d3c..fa341714f4 100644
--- a/config/custom_items.txt
+++ b/config/custom_items.txt
@@ -208,6 +208,12 @@ item_path: /obj/item/weapon/storage/box/fluff/drake
 
 # ######## E CKEYS
 
+{
+ckey: erik_the_dog
+character_name: Erik
+item_path: /obj/item/clothing/accessory/medal/gold/heroism
+}
+
 # Permit Expired
 #{
 #ckey: eekasqueak
diff --git a/html/changelog.html b/html/changelog.html
index 1b54f6e327..574b22699b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,25 +53,37 @@
 		
 		-->
 		<div class="commit sansserif">
-			<h2 class="date">05 March 2018</h2>
-			<h3 class="author">Anewbe updated:</h3>
+			<h2 class="date">22 March 2018</h2>
+			<h3 class="author">Chaoko99 updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="rscdel">Removes Command Liaison, Bridge Secretary, Hydroponicist, Prospector, Sanitation Technician, Professor, and Historian alt-titles.</li>
-				<li class="rscdel">Removed universal translators from the loadout.</li>
-				<li class="rscadd">RnD can print earpiece translators.</li>
+				<li class="rscadd">Prometheans can now wear underwear.</li>
 			</ul>
-			<h3 class="author">Mechoid updated:</h3>
+			<h3 class="author">Hubblenaut updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="rscadd">Add a surgical operation for repairing the brainstem of a decapitated individual.</li>
-				<li class="rscadd">Add a permanent modifier for frankensteining individuals.</li>
+				<li class="tweak">If a cycling airlock is already near the target pressure, pressing the buttons will toggle the doors instead of making it reenter the cycle process.</li>
 			</ul>
-			<h3 class="author">Nerezza updated:</h3>
+			<h3 class="author">JonathanHybrid updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="rscadd">Package bomb detonators can be re-bound by hitting the new package bomb with them.</li>
+				<li class="tweak">Replaced the method of facesitting, you don't need to have a trait anymore! You instead use grab, pin them down and aim at head. (I recommend using subtles for them to read your messages~)</li>
+				<li class="tweak">Replaced the image of SS13 to chomper's logo! :D</li>
 			</ul>
-			<h3 class="author">PrismaticGynoid updated:</h3>
+			<h3 class="author">Leshana updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="bugfix">The succumb verb will now work on species that can't take oxyloss damage.</li>
+				<li class="rscadd">Enables round-to-round persistence of a few aspects of characters.  More accurately, it automates updating your character setup.  None of this code does anything you could not already do manually on the Character Setup screen, it simply does it automatically for you. ALL of these changes are optional, toggled on the VORE tab of character setup.</li>
+				<li class="rscadd">Your late-join spawn location is determined by which cryo/elevator/etc you used to leave last time.  Departing thru the elevators will set your spawn location to elevators etc.</li>
+				<li class="rscadd">Your weight is saved (also any extra or deficient nutrition is resolved into weight gain/loss)</li>
+				<li class="rscadd">Your limbs settings are updated based on your status at end of round (whether limbs are normal, missing, robotic, etc)</li>
+				<li class="rscadd">Your markings are saved so they will be the same as when they were at end of round.</li>
+				<li class="tweak">Replaced hard coded numbers for weight gain with constant defines.</li>
+				<li class="rscadd">Added admin verbs for debugging the scheduled process controllers.</li>
+			</ul>
+			<h3 class="author">Leshana and mustafakalash updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">A new 'planetary' mode for airlocks which makes them purge the chamber contents to the exterior atmosphere before filling with clean air, and vice versa.</li>
+			</ul>
+			<h3 class="author">chaoko99 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added mapmerge PY to the 	ools directory of the Vorestation repository.</li>
 			</ul>
 
 			<h2 class="date">28 February 2018</h2>
@@ -4361,4 +4373,4 @@
 <p class="lic">Some icons by <a href="http://p.yusukekamiyamane.com/">Yusuke Kamiyamane</a>. All rights reserved. Licensed under a <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 License</a>.</p>
 </td></tr></table>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a1820c932c..4625f808f5 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3980,18 +3980,37 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Added craftable joints. Dry something (ideally ambrosia) on the drying
       rack and apply it to a rolling paper to create a joint you can smoke.
   - rscadd: Added a box of rolling papers to the cigarette vending machine.
-2018-03-05:
-  Anewbe:
-  - rscdel: Removes Command Liaison, Bridge Secretary, Hydroponicist, Prospector,
-      Sanitation Technician, Professor, and Historian alt-titles.
-  - rscdel: Removed universal translators from the loadout.
-  - rscadd: RnD can print earpiece translators.
-  Mechoid:
-  - rscadd: Add a surgical operation for repairing the brainstem of a decapitated
-      individual.
-  - rscadd: Add a permanent modifier for frankensteining individuals.
-  Nerezza:
-  - rscadd: Package bomb detonators can be re-bound by hitting the new package bomb
-      with them.
-  PrismaticGynoid:
-  - bugfix: The succumb verb will now work on species that can't take oxyloss damage.
+2018-03-22:
+  Chaoko99:
+  - rscadd: Prometheans can now wear underwear.
+  Hubblenaut:
+  - tweak: If a cycling airlock is already near the target pressure, pressing the
+      buttons will toggle the doors instead of making it reenter the cycle process.
+  JonathanHybrid:
+  - tweak: Replaced the method of facesitting, you don't need to have a trait anymore!
+      You instead use grab, pin them down and aim at head. (I recommend using subtles
+      for them to read your messages~)
+  - tweak: Replaced the image of SS13 to chomper's logo! :D
+  Leshana:
+  - rscadd: Enables round-to-round persistence of a few aspects of characters.  More
+      accurately, it automates updating your character setup.  None of this code does
+      anything you could not already do manually on the Character Setup screen, it
+      simply does it automatically for you. ALL of these changes are optional, toggled
+      on the VORE tab of character setup.
+  - rscadd: Your late-join spawn location is determined by which cryo/elevator/etc
+      you used to leave last time.  Departing thru the elevators will set your spawn
+      location to elevators etc.
+  - rscadd: Your weight is saved (also any extra or deficient nutrition is resolved
+      into weight gain/loss)
+  - rscadd: Your limbs settings are updated based on your status at end of round (whether
+      limbs are normal, missing, robotic, etc)
+  - rscadd: Your markings are saved so they will be the same as when they were at
+      end of round.
+  - tweak: Replaced hard coded numbers for weight gain with constant defines.
+  - rscadd: Added admin verbs for debugging the scheduled process controllers.
+  Leshana and mustafakalash:
+  - rscadd: A new 'planetary' mode for airlocks which makes them purge the chamber
+      contents to the exterior atmosphere before filling with clean air, and vice
+      versa.
+  chaoko99:
+  - rscadd: "Added mapmerge PY to the \tools directory of the Vorestation repository."
\ No newline at end of file
diff --git a/html/changelogs/Hubblenaut - airlocks.yml b/html/changelogs/Hubblenaut - airlocks.yml
deleted file mode 100644
index 2091ab6596..0000000000
--- a/html/changelogs/Hubblenaut - airlocks.yml	
+++ /dev/null
@@ -1,36 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Hubblenaut
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - tweak: "If a cycling airlock is already near the target pressure, pressing the buttons will toggle the doors instead of making it reenter the cycle process."
diff --git a/html/changelogs/Leshana - vplk-airlocks-cycle-to-ext.yml b/html/changelogs/Leshana - vplk-airlocks-cycle-to-ext.yml
deleted file mode 100644
index 3f59f30fea..0000000000
--- a/html/changelogs/Leshana - vplk-airlocks-cycle-to-ext.yml	
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Leshana and mustafakalash
-delete-after: True
-changes: 
-  - rscadd: "A new 'planetary' mode for airlocks which makes them purge the chamber contents to the exterior atmosphere before filling with clean air, and vice versa."
diff --git a/html/changelogs/Leshana-vplk-persistence.yml b/html/changelogs/Leshana-vplk-persistence.yml
deleted file mode 100644
index 3e396d6634..0000000000
--- a/html/changelogs/Leshana-vplk-persistence.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: Leshana
-delete-after: True
-changes: 
-  - rscadd: "Enables round-to-round persistence of a few aspects of characters.  More accurately, it automates updating your character setup.  None of this code does anything you could not already do manually on the Character Setup screen, it simply does it automatically for you. ALL of these changes are optional, toggled on the VORE tab of character setup."
-  - rscadd: "Your late-join spawn location is determined by which cryo/elevator/etc you used to leave last time.  Departing thru the elevators will set your spawn location to elevators etc."
-  - rscadd: "Your weight is saved (also any extra or deficient nutrition is resolved into weight gain/loss)"
-  - rscadd: "Your limbs settings are updated based on your status at end of round (whether limbs are normal, missing, robotic, etc)"
-  - rscadd: "Your markings are saved so they will be the same as when they were at end of round."
-  - tweak: "Replaced hard coded numbers for weight gain with constant defines."
diff --git a/html/changelogs/Leshana-vplk-process-debug-verbs.yml b/html/changelogs/Leshana-vplk-process-debug-verbs.yml
deleted file mode 100644
index af0ffd3f9d..0000000000
--- a/html/changelogs/Leshana-vplk-process-debug-verbs.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Leshana
-delete-after: True
-changes:
-  - rscadd: "Added admin verbs for debugging the scheduled process controllers."
diff --git a/html/changelogs/chao-chainsawsinmyeyes.yml b/html/changelogs/chao-chainsawsinmyeyes.yml
deleted file mode 100644
index be5cc12789..0000000000
--- a/html/changelogs/chao-chainsawsinmyeyes.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Chaoko99
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - tweak: "Added some shading to the trashpile sprrites.
diff --git a/html/changelogs/chaoko99-OHGODHIDEYOURHUSBANDS.yml b/html/changelogs/chaoko99-OHGODHIDEYOURHUSBANDS.yml
deleted file mode 100644
index 95ddeb51e6..0000000000
--- a/html/changelogs/chaoko99-OHGODHIDEYOURHUSBANDS.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Chaoko99
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - rscadd: "Prometheans can now wear underwear."
diff --git a/html/changelogs/chaoko99-mapmergepy.yml b/html/changelogs/chaoko99-mapmergepy.yml
deleted file mode 100644
index 32e38564aa..0000000000
--- a/html/changelogs/chaoko99-mapmergepy.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: chaoko99
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - rscadd: "Added mapmerge PY to the \tools directory of the Vorestation repository."
-
diff --git a/icons/ss13_32.png b/icons/ss13_32.png
index 72bf4f0f97..0d8fcdd890 100644
Binary files a/icons/ss13_32.png and b/icons/ss13_32.png differ
diff --git a/icons/ss13_64.png b/icons/ss13_64.png
index 103ff0b264..d2d27bdafe 100644
Binary files a/icons/ss13_64.png and b/icons/ss13_64.png differ
diff --git a/maps/northern_star/polaris-1.dmm b/maps/northern_star/polaris-1.dmm
index cf4a8fd371..ad4c7bfbba 100644
--- a/maps/northern_star/polaris-1.dmm
+++ b/maps/northern_star/polaris-1.dmm
@@ -6642,7 +6642,7 @@
 "cxL" = (/obj/machinery/door/airlock/glass_mining{name = "Cargo Bay"; req_access = list(31)},/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/storage)
 "cxM" = (/turf/simulated/wall,/area/quartermaster/qm)
 "cxN" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/shutters{density = 0; dir = 1; icon_state = "shutter0"; id = "qmoffice"; name = "QM Office Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/quartermaster/qm)
-"cxO" = (/obj/machinery/door/airlock/glass_mining{name = "Quartermaster"; req_access = list(41)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/quartermaster/qm)
+"cxO" = (/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/airlock/mining{name = "Quartermaster"; req_access = list(41)},/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "cxP" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/shutters{density = 0; dir = 1; icon_state = "shutter0"; id = "qmoffice"; name = "QM Office Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/quartermaster/qm)
 "cxQ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/shutters{density = 0; dir = 1; icon_state = "shutter0"; id = "qmoffice"; name = "QM Office Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/quartermaster/qm)
 "cxR" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/cargo_hallway)
@@ -6870,7 +6870,7 @@
 "cCf" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/storage)
 "cCg" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/storage)
 "cCh" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/storage)
-"cCi" = (/obj/machinery/door/airlock/glass_mining{name = "Quartermaster"; req_access = list(41)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/qm)
+"cCi" = (/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/airlock/mining{name = "Quartermaster"; req_access = list(41)},/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "cCj" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "cCk" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/quartermaster/qm)
 "cCl" = (/obj/structure/table/standard,/obj/item/weapon/clipboard,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/weapon/stamp/qm,/turf/simulated/floor/tiled,/area/quartermaster/qm)
diff --git a/vorestation.dme b/vorestation.dme
index 605a6a42fc..2076b04b3d 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2484,6 +2484,7 @@
 #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Other.dm"
 #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Toxins.dm"
 #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Vore_vr.dm"
+#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents_chomp.dm"
 #include "code\modules\reagents\dispenser\_defines.dm"
 #include "code\modules\reagents\dispenser\cartridge.dm"
 #include "code\modules\reagents\dispenser\cartridge_presets.dm"