Update cryo.dm

Sorry Aran I am bad
Aliens can now pick up facehuggers again. Fixes Issue #1044
Merge pull request #1245 from JJRcop/emotes-rework

Emote rework, invalid emotes are passed to ..(), slimes and cyborgs exem...
Removes the redundant alien check
Bunch of fixes

Cleans up the resist code for lockers
Adds both locked and broken vars to closets
Fixes secure lockers opening when welded, but not locked
Added empty line between "Update PDA Info" and time
adds ghost chilis, makes condensed capsicain actually do something when ingested

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
changelog update

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Final fixes.
Merge pull request #63 from Glloyd/Mapping

Mapping
Fixed brig doors counting down when timer is stopped
Merge pull request #1264 from caelaislinn/terbs_weekly_fun

Terbs Week of Fun: Day 1: Ghost Chilis
changelog update

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Fixed medal boxes being invisible by re-adding them into storage.dmi .
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge pull request #1247 from meushijyo/master

Further revised space hotel away map
Merge pull request #1257 from RobRichards1997/29/08/2013-Stechkin-Pistol-Buff

Buffs to the Stechkin Pistol
Merge pull request #1255 from Intigracy/WhatAGag

What a gag!
Merge pull request #1266 from Incoming5643/alienfix

Aliens can now pick up facehuggers again. Fixes Issue #1044
Merge pull request #1244 from Sabbat/Cult

Changes a few runes for ease of use and making useless runes useful.