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/changeling/powers/bioelectrogenesis.dm

@@ -102,6 +102,8 @@
 	desc = "You could probably shock someone badly if you touched them, or recharge something."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "electric_hand"
+	show_examine = FALSE
+
 	var/shock_cost = 10
 	var/agony_amount = 60
 	var/electrocute_amount = 10

code/game/gamemodes/changeling/powers/electric_lockpick.dm

@@ -30,6 +30,7 @@
 	desc = "This finger appears to be an organic datajack."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "electric_hand"
+	show_examine = FALSE
 
 /obj/item/weapon/finger_lockpick/New()
 	if(ismob(loc))

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