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/modules/xenobio2/mob/slime/slime.dm

@@ -22,7 +22,7 @@ Slime definitions, Life and New live here.
 	var/shiny = 0
 	move_to_delay = 17 //Slimes shouldn't be able to go faster than humans.
 	default_chems = list("slimejelly" = 5)
-	attacktext = "absorbed some of"
+	attacktext = list("absorbed some of")
 	response_help = "pats"
 	response_disarm = "tries to stop"
 	response_harm = "hits"

code/modules/xenobio2/mob/xeno.dm

@@ -12,7 +12,7 @@ Also includes Life and New
 	desc = "Something's broken, yell at someone."
 	melee_damage_lower = 0
 	melee_damage_upper = 0
-	attacktext = "hit"
+	attacktext = list("hit")
 	attack_sound = null
 	friendly = "touches"
 	environment_smash = 0