Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/modules/projectiles/guns/projectile.dm

@@ -92,6 +92,7 @@
 				loaded -= AC
 			AM.loc = get_turf(src)
 			empty_mag = null
+			update_icon()
 			user << "\blue You unload magazine from \the [src]!"
 	else
 		user << "\red Nothing loaded in \the [src]!"

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

@@ -19,7 +19,7 @@
 	icon_state = "mini-uzi"
 	w_class = 3.0
 	max_shells = 16
-	caliber = "			.45"
+	caliber = ".45"
 	origin_tech = "combat=5;materials=2;syndicate=8"
 	ammo_type = "/obj/item/ammo_casing/c45"