Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync

Conflicts:
	.travis.yml
	code/modules/clothing/spacesuits/rig/modules/combat.dm
	code/modules/clothing/spacesuits/rig/modules/utility.dm
	code/modules/mob/living/silicon/ai/ai.dm
	icons/mob/rig_back.dmi
	polaris.dme

code/modules/mining/abandonedcrates.dm

@@ -171,12 +171,14 @@
 			return
 	else
 		return ..()
+	
+/obj/structure/closet/crate/secure/loot/emag_act(var/remaining_charges, var/mob/user)	
+	if (locked)
+		user << "<span class='notice'>The crate unlocks!</span>"
+		locked = 0
 
 /obj/structure/closet/crate/secure/loot/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(locked)
-		if (istype(W, /obj/item/weapon/card/emag))
-			user << "<span class='notice'>The crate unlocks!</span>"
-			locked = 0
 		if (istype(W, /obj/item/device/multitool)) // Greetings Urist McProfessor, how about a nice game of cows and bulls?
 			user << "<span class='notice'>DECA-CODE LOCK REPORT:</span>"
 			if (attempts == 1)

code/modules/mining/coins.dm

@@ -8,6 +8,7 @@
 	force = 0.0
 	throwforce = 0.0
 	w_class = 1.0
+	slot_flags = SLOT_EARS
 	var/string_attached
 	var/sides = 2