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/game/gamemodes/technomancer/assistance/golem.dm

@@ -30,7 +30,7 @@
 	melee_damage_lower = 30 // It has a built in esword.
 	melee_damage_upper = 30
 	attack_sound = 'sound/weapons/blade1.ogg'
-	attacktext = "slashed"
+	attacktext = list("slashed")
 	friendly = "hugs"
 	resistance = 0
 	melee_miss_chance = 0

code/game/gamemodes/technomancer/spell_objs.dm

@@ -31,6 +31,7 @@
 		)
 	throwforce = 0
 	force = 0
+	show_examine = FALSE
 //	var/mob/living/carbon/human/owner = null
 	var/mob/living/owner = null
 	var/obj/item/weapon/technomancer_core/core = null