From be3879993371920627061bf91b830b1c72e59d8f Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 5 Jun 2017 22:39:51 -0500 Subject: [PATCH] cleanup --- .../modules/projectiles/guns/ballistic/automatic.dm | 5 +++++ .../projectiles/guns/ballistic/automatic.dm.rej | 13 ------------- code/modules/projectiles/projectile/bullets.dm.rej | 10 ---------- 3 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 code/modules/projectiles/guns/ballistic/automatic.dm.rej delete mode 100644 code/modules/projectiles/projectile/bullets.dm.rej diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 70d399b107..dd789798c6 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -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 diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm.rej b/code/modules/projectiles/guns/ballistic/automatic.dm.rej deleted file mode 100644 index 9f4d4f92bd..0000000000 --- a/code/modules/projectiles/guns/ballistic/automatic.dm.rej +++ /dev/null @@ -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 // - diff --git a/code/modules/projectiles/projectile/bullets.dm.rej b/code/modules/projectiles/projectile/bullets.dm.rej deleted file mode 100644 index 8666f242ca..0000000000 --- a/code/modules/projectiles/projectile/bullets.dm.rej +++ /dev/null @@ -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