diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
index 07876d19850..69f5a0a28a0 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -32,10 +32,10 @@
 	primitive_form = "Stok"
 	darksight = 3
 	ambiguous_genders = TRUE
-	//gluttonous = 1 //VOREStation Edit - Redundant 
+	//gluttonous = 1 //VOREStation Edit - Redundant
 	slowdown = 0.5
-	brute_mod = 0.9
-	burn_mod = 0.9
+	brute_mod = 0.85
+	burn_mod = 0.85
 	metabolic_rate = 0.85
 	item_slowdown_halved = 1
 	num_alternate_languages = 3
@@ -43,12 +43,12 @@
 	name_language = LANGUAGE_UNATHI
 	health_hud_intensity = 2.5
 
-	min_age = 18
-	max_age = 60
+	min_age = 32
+	max_age = 260
 
 	blurb = "A heavily reptillian species, Unathi (or 'Sinta as they call themselves) hail from the \
-	Uuosa-Eso system, which roughly translates to 'burning mother'.<br/><br/>Coming from a harsh, radioactive \
-	desert planet, they mostly hold ideals of honesty, virtue, martial combat and bravery above all \
+	Uuosa-Eso system, which roughly translates to 'burning mother'.<br/><br/>Coming from a harsh, inhospitable \
+	planet, they mostly hold ideals of honesty, virtue, proficiency and bravery above all \
 	else, frequently even their own lives. They prefer warmer temperatures than most species and \
 	their native tongue is a heavy hissing laungage called Sinta'Unathi."
 /* VOREStation Removal
diff --git a/html/changelog.html b/html/changelog.html
index f4d1c782d53..b3ff3223e11 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -53,10 +53,53 @@
 		
 		-->
 		<div class="commit sansserif">
-			<h2 class="date">01 April 2017</h2>
+			<h2 class="date">25 April 2017</h2>
 			<h3 class="author">Anewbe updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="rscadd">Wooden circlets can now be worn on the head.</li>
+				<li class="rscadd">Cultist armor now has better protection from strange energies.</li>
+				<li class="rscadd">Adds the ion pistol to the uplink.</li>
+				<li class="tweak">The ion pistol can now be holstered.</li>
+				<li class="bugfix">Sprites on the smoking pipes should be fixed.</li>
+			</ul>
+			<h3 class="author">Atermonera updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Brain type (Organic, cyborg, posi, or drone) is now displayed in all records.</li>
+			</ul>
+			<h3 class="author">Belsima updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Changes relaymove() code in bodybags.</li>
+				<li class="bugfix">Above tweak used to allow exiting bodybag while in closed morgue tray.</li>
+			</ul>
+			<h3 class="author">Leshana updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Implements footstep sound system and adds sounds to various floor types including plating, tiles, wood, and carpet.</li>
+			</ul>
+			<h3 class="author">LorenLuke updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Allows people who are bucked to give/receive items.</li>
+				<li class="tweak">Can click-drag people onto chairs/beds from 1 tile away to buckle them.</li>
+				<li class="tweak">Allows you to place tape masks/restraints back on the roll (roll is still infinite).</li>
+				<li class="bugfix">Fixes ventcrawling for spiderbots/implants/etc.</li>
+			</ul>
+			<h3 class="author">Neerti updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Drones will now spawn with an EIO-mandated ID card alongside their NT ID.</li>
+				<li class="tweak">Fabricate Clothing for Changelings costs one point instead of two, and is fabricated twice as fast.</li>
+				<li class="tweak">Dead changelings can no longer hear deadchat or freely ghost.</li>
+				<li class="tweak">Shrieks now share a 10 second cooldown.</li>
+				<li class="tweak">Lings cannot transform or shriek inside containers such as closets and pipes.</li>
+				<li class="tweak">Regen. Stasis timer adjusted to be between 2 to 4 minutes.</li>
+				<li class="tweak">Visible Camo. should end if the user is stunned.</li>
+				<li class="rscadd">Visible Camo. now blocks AI tracking when active.</li>
+				<li class="rscdel">Recursive Visible Camo. no longer gives true invis.</li>
+				<li class="rscadd">Recursive Visible Camo. will allow the changeling to run while cloaked instead.</li>
+				<li class="rscadd">Ling chemical meter on HUD now has a blinking exclaimation mark if below 20 chemicals, to warn that they cannot revive if they should die while still below 20.</li>
+			</ul>
+			<h3 class="author">Yoshax updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Tape color is different now. Security tape is red rather than yellow, Engineering tape remains yellow and Atmos tape is a lighter cyan rather than blue.</li>
+			</ul>
+
 			<h2 class="date">19 April 2017</h2>
 			<h3 class="author">Anewbe updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 9ade78534ee..5c430b27aba 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3451,3 +3451,44 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Yoshax:
   - bugfix: Water such as the pool will no longer apply fire stacks when you enter,
       meaning you will no longer be flammable from swimming.
+2017-04-25:
+  Anewbe:
+  - rscadd: Cultist armor now has better protection from strange energies.
+  - rscadd: Adds the ion pistol to the uplink.
+  - tweak: The ion pistol can now be holstered.
+  - bugfix: Sprites on the smoking pipes should be fixed.
+  Atermonera:
+  - rscadd: Brain type (Organic, cyborg, posi, or drone) is now displayed in all records.
+  Belsima:
+  - tweak: Changes relaymove() code in bodybags.
+  - bugfix: Above tweak used to allow exiting bodybag while in closed morgue tray.
+  Leshana:
+  - rscadd: Implements footstep sound system and adds sounds to various floor types
+      including plating, tiles, wood, and carpet.
+  LorenLuke:
+  - bugfix: Allows people who are bucked to give/receive items.
+  - tweak: Can click-drag people onto chairs/beds from 1 tile away to buckle them.
+  - tweak: Allows you to place tape masks/restraints back on the roll (roll is still
+      infinite).
+  - bugfix: Fixes ventcrawling for spiderbots/implants/etc.
+  Neerti:
+  - rscadd: Drones will now spawn with an EIO-mandated ID card alongside their NT
+      ID.
+  - tweak: Fabricate Clothing for Changelings costs one point instead of two, and
+      is fabricated twice as fast.
+  - tweak: Dead changelings can no longer hear deadchat or freely ghost.
+  - tweak: Shrieks now share a 10 second cooldown.
+  - tweak: Lings cannot transform or shriek inside containers such as closets and
+      pipes.
+  - tweak: Regen. Stasis timer adjusted to be between 2 to 4 minutes.
+  - tweak: Visible Camo. should end if the user is stunned.
+  - rscadd: Visible Camo. now blocks AI tracking when active.
+  - rscdel: Recursive Visible Camo. no longer gives true invis.
+  - rscadd: Recursive Visible Camo. will allow the changeling to run while cloaked
+      instead.
+  - rscadd: Ling chemical meter on HUD now has a blinking exclaimation mark if below
+      20 chemicals, to warn that they cannot revive if they should die while still
+      below 20.
+  Yoshax:
+  - tweak: Tape color is different now. Security tape is red rather than yellow, Engineering
+      tape remains yellow and Atmos tape is a lighter cyan rather than blue.