Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018

# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -330,3 +330,13 @@
 				icon_state = icon_closed
 		else
 			icon_state = icon_opened
+
+/obj/structure/closet/secure_closet/medical_wall/pills
+	name = "pill cabinet"
+
+	New()
+		..()
+		new /obj/item/weapon/storage/pill_bottle/tramadol(src)
+		new /obj/item/weapon/storage/pill_bottle/antitox(src)
+		new /obj/item/weapon/storage/pill_bottle/carbon(src)
+		new /obj/random/medical/pillbottle(src)

code/game/objects/structures/signs.dm

@@ -362,6 +362,11 @@
 	icon_state = "direction_elv"
 // VOREStation Edit End
 
+/obj/structure/sign/directions/cryo
+	name = "\improper Cryogenic Storage"
+	desc = "A direction sign, pointing out which way cryogenic storage is."
+	icon_state = "direction_cry"
+
 /obj/structure/sign/directions/roomnum
 	name = "room number"
 	desc = "A sign detailing the number of the room beside it."