cleanup

2017-06-05 22:39:51 -05:00
parent b4cd9de3e4
commit be38799933
3 changed files with 5 additions and 23 deletions
@@ -379,6 +379,11 @@
 	pin = /obj/item/device/firing_pin/implant/pindicate
 	origin_tech = "combat=7;syndicate=6"

+/obj/item/weapon/gun/ballistic/automatic/sniper_rifle/gang
+	name = "black market sniper rifle"
+	desc = "A long ranged weapon that does significant damage. It is well worn from years of service."
+	mag_type = /obj/item/ammo_box/magazine/sniper_rounds/gang
+
 // Old Semi-Auto Rifle //

 /obj/item/weapon/gun/ballistic/automatic/surplus
@@ -1,13 +0,0 @@
-diff a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm	(rejected hunks)
-@@ -375,7 +375,10 @@
- 	pin = /obj/item/device/firing_pin/implant/pindicate
- 	origin_tech = "combat=7;syndicate=6"
- 
-
-+/obj/item/weapon/gun/ballistic/automatic/sniper_rifle/gang
-+	name = "black market sniper rifle"
-+	desc = "A long ranged weapon that does significant damage. It is well worn from years of service."
-+	mag_type = /obj/item/ammo_box/magazine/sniper_rounds/gang
- 
- // Old Semi-Auto Rifle //
- 
@@ -1,10 +0,0 @@
-diff a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm	(rejected hunks)
-@@ -244,7 +244,7 @@
- 	name = "\improper DNA injector"
- 	icon_state = "syringeproj"
- 	var/obj/item/weapon/dnainjector/injector
-	
-+
- /obj/item/projectile/bullet/dnainjector/on_hit(atom/target, blocked = 0)
- 	if(iscarbon(target))
- 		var/mob/living/carbon/M = target