Finishing touches

code/modules/admin/verbs/striketeam_syndicate.dm

@@ -160,7 +160,7 @@ var/global/sent_syndicate_strike_team = 0
 	equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword/saber(src), slot_l_store)
 	equip_to_slot_or_del(new /obj/item/weapon/grenade/empgrenade(src), slot_r_store)
 	equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double/full(src), slot_s_store)
-	equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/pistol/m2411(src), slot_belt)
+	equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/pistol/m1911(src), slot_belt)
 
 	equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/l6_saw(src), slot_r_hand)
 

code/modules/projectiles/ammunition/magazines.dm

@@ -230,7 +230,7 @@
 	icon_state = "smg9mm"
 	ammo_type = /obj/item/ammo_casing/c9mm
 	caliber = "9mm"
-	max_ammo = 30
+	max_ammo = 21
 	materials = list(MAT_METAL = 2000)
 
 /obj/item/ammo_box/magazine/smgm9mm/ap

code/modules/projectiles/guns/alien.dm

@@ -22,9 +22,7 @@
 	return ..()
 
 /obj/item/weapon/gun/projectile/automatic/spikethrower/update_icon()
-	..()
-	overlays.Cut()
-	icon_state = "spikethrower-[Ceiling(get_ammo(0)/5)]"
+	return
 
 /obj/item/weapon/gun/projectile/automatic/spikethrower/process()
 	charge_tick++
@@ -85,16 +83,6 @@
 	cell_type = "/obj/item/weapon/stock_parts/cell/super"
 	restricted_species = list("Vox Armalis")
 
-/obj/item/weapon/gun/energy/noisecannon/attack_hand(mob/user as mob)
-	if(loc != user)
-		var/mob/living/carbon/human/H = user
-		if(istype(H))
-			if(H.species.name == "Vox Armalis")
-				..()
-				return
-		to_chat(user, "<span class='warning'>\The [src] is far too large for you to pick up.</span>")
-		return
-
 /obj/item/weapon/gun/energy/noisecannon/update_icon()
 	return
 

code/modules/projectiles/guns/dartgun.dm

@@ -33,9 +33,8 @@
 	var/list/starting_chems = null
 
 /obj/item/weapon/gun/dartgun/update_icon()
-
 	if(!cartridge)
-		icon_state = "dartgun-empty"
+		icon_state = "dartgun-e"
 		return 1
 
 	if(!cartridge.darts)
@@ -47,7 +46,6 @@
 	return 1
 
 /obj/item/weapon/gun/dartgun/New()
-
 	..()
 	if(starting_chems)
 		for(var/chem in starting_chems)
@@ -205,12 +203,12 @@
 
 		return
 
-/obj/item/weapon/gun/dartgun/afterattack(obj/target, mob/user , flag)
-	if(!isturf(target.loc) || target == user) return
+/obj/item/weapon/gun/dartgun/afterattack(atom/target, mob/living/user, flag, params)
+	if(!isturf(target.loc) || target == user)
+		return
 	..()
 
 /obj/item/weapon/gun/dartgun/attack_self(mob/user)
-
 	user.set_machine(src)
 	var/dat = "<b>[src] mixing control:</b><br><br>"
 
@@ -279,7 +277,8 @@
 
 /obj/item/weapon/gun/dartgun/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override)
 	if(cartridge)
-		spawn(0) fire_dart(target,user)
+		spawn(0)
+			fire_dart(target,user)
 	else
 		to_chat(usr, "<span class='warning'>[src] is empty.</span>")
 
@@ -302,7 +301,7 @@
 	anchored = 1
 	density = 0
 
-	New()
-		var/datum/reagents/R = new/datum/reagents(15)
-		reagents = R
-		R.my_atom = src
+/obj/effect/syringe_gun_dummy/New()
+	var/datum/reagents/R = new/datum/reagents(15)
+	reagents = R
+	R.my_atom = src

code/modules/projectiles/guns/energy/laser.dm

@@ -40,6 +40,7 @@
 	desc = "An industrial-grade heavy-duty laser rifle with a modified laser lense to scatter its shot into multiple smaller lasers. The inner-core can self-charge for theorically infinite use."
 	origin_tech = "combat=5;materials=4;powerstorage=4"
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
+	shaded_charge = 0
 
 /obj/item/weapon/gun/energy/laser/cyborg
 	can_charge = 0

code/modules/projectiles/guns/mounted.dm

@@ -2,7 +2,6 @@
 	name = "mounted taser"
 	desc = "An arm mounted dual-mode weapon that fires electrodes and disabler shots."
 	icon_state = "armcannon"
-	item_state = "armcannon"
 	force = 5
 	flags = NODROP
 	w_class = 5

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

@@ -208,7 +208,7 @@
 	item_state = "arg"
 	slot_flags = 0
 	origin_tech = "combat=5;materials=1"
-	mag_type = "/obj/item/ammo_box/magazine/m556"
+	mag_type = /obj/item/ammo_box/magazine/m556
 	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
 	can_suppress = 0
 	burst_size = 3

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

@@ -18,12 +18,11 @@
 	icon_state = "[initial(icon_state)][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
 	return
 
-/obj/item/weapon/gun/projectile/automatic/pistol/m2411
-	name = "M2411"
-	desc = "John Browning's classic updated for the modern day. Uses .45 rounds."
-	icon_state = "m2411"
-	w_class = 3.0
-	origin_tech = "combat=3;materials=2"
+/obj/item/weapon/gun/projectile/automatic/pistol/m1911
+	name = "\improper M1911"
+	desc = "A classic .45 handgun with a small magazine capacity."
+	icon_state = "m1911"
+	w_class = 3
 	mag_type = /obj/item/ammo_box/magazine/m45
 	can_suppress = 0
 

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

@@ -371,6 +371,8 @@
 	name = "cane"
 	desc = "A cane used by a true gentleman. Or a clown."
 	icon = 'icons/obj/weapons.dmi'
+	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
 	icon_state = "cane"
 	item_state = "stick"
 	sawn_state = SAWN_OFF
@@ -386,6 +388,9 @@
 	suppressed = 1
 	needs_permit = 0 //its just a cane beepsky.....
 
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/cane/update_icon()
+	return
+
 /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/cane/attackby(obj/item/A, mob/user, params)
 	..()
 	if(istype(A, /obj/item/stack/cable_coil))