moves some stuff around

2018-08-01 08:07:56 -05:00
parent ce4da89cf1
commit 77b3c46dbf
4 changed files with 9 additions and 7 deletions
@@ -397,10 +397,3 @@
 	desc = "Comfy Lucky Jackboots with the word Luck on them."
 	item_state = "luckyjack"
 	icon_state = "luckyjack"
-
-/obj/item/toy/gun/m41
-	name = "Toy M41A Pulse Rifle"
-	desc = "A toy replica of the Corporate Mercenaries' standard issue rifle. For Avtomat is inscribed on the side."
-	icon_state = "toym41"
-	icon = 'icons/obj/custom.dmi'
-	materials = list(MAT_METAL=2000, MAT_GLASS=250)
@@ -57,4 +57,13 @@
 	desc = "An authentic cap-firing reproduction of a F3 Justicar big-bore revolver! Pretend to blow your friend's brains out with this 100% safe toy! Satisfaction guaranteed!"
 	icon_state = "justicar"
 	icon = 'modular_citadel/icons/obj/guns/toys.dmi'
+	materials = list(MAT_METAL=2000, MAT_GLASS=250)
+
+
+/obj/item/toy/gun/m41
+	name = "Toy M41A Pulse Rifle"
+	desc = "A toy replica of the Corporate Mercenaries' standard issue rifle. For Avtomat is inscribed on the side."
+	icon_state = "toym41"
+	icon = 'modular_citadel/icons/obj/guns/toys.dmi'
+	fire_sound = 'sound/weapons/magrifle.ogg'
 	materials = list(MAT_METAL=2000, MAT_GLASS=250)