Merge pull request #4095 from DJSnapshot/dev-freeze

Misc Fixes to guns

code/modules/projectiles/guns/projectile.dm

@@ -51,6 +51,9 @@
 	if(istype(A, /obj/item/ammo_magazine))
 		if((load_method == MAGAZINE) && loaded.len)	return
 		var/obj/item/ammo_magazine/AM = A
+		if(AM.stored_ammo.len <= 0)
+			user << "<span class='warning'>The magazine is empty!</span>"
+			return
 		for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
 			if(loaded.len >= max_shells)
 				break
@@ -93,6 +96,7 @@
 			AM.loc = get_turf(src)
 			empty_mag = null
 			update_icon()
+			AM.update_icon()
 			user << "\blue You unload magazine from \the [src]!"
 	else
 		user << "\red Nothing loaded in \the [src]!"

code/modules/projectiles/guns/projectile/revolver.dm

@@ -89,6 +89,7 @@
 	if(!loaded.len && empty_mag)
 		empty_mag.loc = get_turf(src.loc)
 		empty_mag = null
+		user << "<span class='notice'>The Magazine falls out and clatters on the floor!</span>"
 	return