Makes All Guns Contained Sprites (#8105)

code/modules/projectiles/guns/launcher/crossbow.dm

@@ -52,8 +52,8 @@
 /obj/item/gun/launcher/crossbow
 	name = "powered crossbow"
 	desc = "A 2457AD twist on an old classic. Pick up that can."
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "crossbow"
+	icon = 'icons/obj/guns/crossbow.dmi'
+	icon_state = "powered_crossbow"
 	item_state = "crossbow-solid"
 	fire_sound = 'sound/weapons/crossbow.ogg'
 	fire_sound_text = "a solid thunk"
@@ -295,9 +295,9 @@
 /obj/item/gun/launcher/crossbow/RFD
 	name = "Rapid-Fabrication-Device Crossbow"
 	desc = "A hacked together RFD turns an innocent tool into the penultimate destruction tool. Flashforges bolts using matter units when the string is drawn back."
-	icon = 'icons/obj/weapons.dmi'
+	icon = 'icons/obj/guns/rxb.dmi'
 	icon_state = "rxb"
-	item_state = "rfd"
+	item_state = "rxb"
 	slot_flags = null
 	draw_time = 10
 	var/stored_matter = 0

code/modules/projectiles/guns/launcher/grenade_launcher.dm

@@ -1,8 +1,9 @@
 /obj/item/gun/launcher/grenade
 	name = "grenade launcher"
 	desc = "A bulky pump-action grenade launcher. Holds up to 6 grenades in a revolving magazine."
-	icon_state = "riotgun"
-	item_state = "riotgun"
+	icon = 'icons/obj/guns/grenade_launcher.dmi'
+	icon_state = "grenadelauncher"
+	item_state = "grenadelauncher"
 	w_class = 4
 	force = 10
 

code/modules/projectiles/guns/launcher/harpoon.dm

@@ -1,6 +1,7 @@
 /obj/item/gun/launcher/harpoon
 	name = "harpoon gun"
 	desc = "A harpoon cannon adapted into a portable firearm. Perfect for hunting space whales."
+	icon = 'icons/obj/guns/harpoon.dmi'
 	icon_state = "harpoon"
 	item_state = "harpoon"
 	release_force = 25

code/modules/projectiles/guns/launcher/pneumatic.dm

@@ -1,11 +1,12 @@
 /obj/item/gun/launcher/pneumatic
 	name = "pneumatic cannon"
 	desc = "A large gas-powered cannon."
+	icon = 'icons/obj/guns/pneumatic.dmi'
 	icon_state = "pneumatic"
 	item_state = "pneumatic"
 	slot_flags = SLOT_BELT
 	w_class = 5.0
-	flags =  CONDUCT
+	flags = CONDUCT
 	fire_sound_text = "a loud whoosh of moving air"
 	fire_delay = 50
 	fire_sound = 'sound/weapons/tablehit1.ogg'

code/modules/projectiles/guns/launcher/rocket.dm

@@ -1,6 +1,7 @@
 /obj/item/gun/launcher/rocket
 	name = "rocket launcher"
 	desc = "MAGGOT."
+	icon = 'icons/obj/guns/rocket.dmi'
 	icon_state = "rocket"
 	item_state = "rocket"
 	w_class = 4.0

code/modules/projectiles/guns/launcher/syringe_gun.dm

@@ -64,6 +64,7 @@
 /obj/item/gun/launcher/syringe
 	name = "syringe gun"
 	desc = "A spring loaded rifle designed to fit syringes, designed to incapacitate unruly patients from a distance."
+	icon = 'icons/obj/guns/syringegun.dmi'
 	icon_state = "syringegun"
 	item_state = "syringegun"
 	w_class = 3
@@ -136,6 +137,7 @@
 /obj/item/gun/launcher/syringe/rapid
 	name = "syringe gun revolver"
 	desc = "A modification of the syringe gun design, using a rotating cylinder to store up to five syringes. The spring still needs to be drawn between shots."
+	icon = 'icons/obj/guns/syringegun.dmi'
 	icon_state = "rapidsyringegun"
 	item_state = "rapidsyringegun"
-	max_darts = 5
+	max_darts = 5