Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme

code/datums/ghost_query.dm

@@ -126,3 +126,9 @@
 	question = "A person suspended in cryosleep has been discovered by a crewmember \
 	and they are attempting to open the cryopod.  Would you like to play as the occupant?"
 	cutoff_number = 1
+
+/datum/ghost_query/corgi_rune
+	role_name = "Dark Creature"
+	question = "A curious explorer has touched a mysterious rune. \
+	Would you like to play as the creature it summons?"
+	cutoff_number = 1

code/datums/outfits/jobs/cargo.dm

@@ -20,6 +20,7 @@
 /decl/hierarchy/outfit/job/cargo/mining
 	name = OUTFIT_JOB_NAME("Shaft miner")
 	uniform = /obj/item/clothing/under/rank/miner
+	l_ear = /obj/item/device/radio/headset/headset_mine
 	backpack = /obj/item/weapon/storage/backpack/industrial
 	satchel_one  = /obj/item/weapon/storage/backpack/satchel/eng
 	id_type = /obj/item/weapon/card/id/cargo/mining

code/datums/supplypacks/materials.dm

@@ -49,7 +49,7 @@
 	cost = 15
 	contains = list(
 					/obj/fiftyspawner/carpet,
-					/obj/fiftyspawner/bluecarpet
+					/obj/fiftyspawner/tealcarpet
 					)
 
 

code/datums/supplypacks/security.dm

@@ -282,7 +282,7 @@
 			/obj/item/clothing/suit/storage/vest/hos,
 			/obj/item/clothing/under/rank/head_of_security/corp,
 			/obj/item/clothing/suit/storage/vest/hoscoat,
-			/obj/item/clothing/head/helmet/HoS/dermal,
+			/obj/item/clothing/head/helmet/dermal,
 			/obj/item/weapon/cartridge/hos,
 			/obj/item/device/radio/headset/heads/hos,
 			/obj/item/clothing/glasses/sunglasses/sechud,