Merge branch 'master' into GunsAndGunAccessories

# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm

code/modules/mining/coins.dm

@@ -18,7 +18,7 @@
 	pixel_x = rand(0,16)-8
 	pixel_y = rand(0,8)-8
 
-	icon_state = "coin_[cmineral]_heads"
+	icon_state = "coin_[cmineral]_[sideslist[1]]"
 	if(cmineral)
 		name = "[cmineral] coin"
 

code/modules/mining/equipment_locker.dm

@@ -335,6 +335,8 @@
 		var/datum/design/alloy = files.FindDesignByID(alloy_id)
 		if((check_access(inserted_id) || allowed(usr)) && alloy)
 			var/desired = input("How many sheets?", "How many sheets would you like to smelt?", 1) as null|num
+			if(desired < 1) // Stops an exploit that lets you build negative alloys and get free materials
+				return
 			var/smelt_amount = can_smelt_alloy(alloy)
 			var/amount = round(min(desired,50,smelt_amount))
 			materials.use_amount(alloy.materials, amount)
@@ -843,9 +845,10 @@
 			to_chat(user, "<span class='info'>[src] is only effective on lesser beings.</span>")
 			return
 
-/obj/item/lazarus_injector/emag_act()
+/obj/item/lazarus_injector/emag_act(mob/user)
 	if(!malfunctioning)
 		malfunctioning = 1
+		to_chat(user, "<span class='notice'>You override [src]'s safety protocols.</span>")
 
 /obj/item/lazarus_injector/emp_act()
 	if(!malfunctioning)

code/modules/mining/lavaland/loot/colossus_loot.dm

@@ -112,9 +112,9 @@
 	activation_method = pick("touch","laser","bullet","energy","bomb","mob_bump","weapon","speech") // "heat" removed due to lack of is_hot()
 	..()
 
-/obj/machinery/anomalous_crystal/hear_talk(mob/speaker, message)
+/obj/machinery/anomalous_crystal/hear_talk(mob/speaker, list/message_pieces)
 	..()
-	if(isliving(speaker) && message)
+	if(isliving(speaker) && LAZYLEN(message_pieces))
 		ActivationReaction(speaker, "speech")
 
 /obj/machinery/anomalous_crystal/attack_hand(mob/user)

code/modules/mining/minebot.dm

@@ -34,7 +34,7 @@
 	ranged_message = "shoots"
 	ranged_cooldown_time = 30
 	projectiletype = /obj/item/projectile/kinetic
-	projectilesound = 'sound/weapons/gunshots/Gunshot4.ogg'
+	projectilesound = 'sound/weapons/gunshots/gunshot4.ogg'
 	speak_emote = list("states")
 	wanted_objects = list(/obj/item/stack/ore/diamond, /obj/item/stack/ore/gold, /obj/item/stack/ore/silver,
 						  /obj/item/stack/ore/plasma,  /obj/item/stack/ore/uranium,    /obj/item/stack/ore/iron,