Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value

code/modules/projectiles/ammunition/ammo_casings.dm

@@ -117,7 +117,7 @@
 	desc = "A .50 bullet casing, specialised in sending the target to sleep, instead of hell."
 	caliber = ".50"
 	projectile_type = /obj/item/projectile/bullet/sniper/soporific
-	icon_state = ".50"
+	icon_state = "sleeper"
 
 /obj/item/ammo_casing/haemorrhage
 	desc = "A .50 bullet casing, specialised in causing massive bloodloss"
@@ -131,7 +131,14 @@
 	projectile_type = /obj/item/projectile/bullet/sniper/penetrator
 	icon_state = ".50"
 
+/obj/item/ammo_casing/point50/gang
+	desc = "A black market .50 bullet casing."
+	projectile_type = /obj/item/projectile/bullet/sniper/gang
 
+/obj/item/ammo_casing/point50/gang/sleeper
+	desc = "Am illegally modified tranquilizer round."
+	projectile_type = /obj/item/projectile/bullet/sniper/gang/sleeper
+	icon_state = "sleeper"
 
 /// SAW ROUNDS
 

code/modules/projectiles/boxes_magazines/external_mag.dm

@@ -264,6 +264,17 @@
 	origin_tech = "combat=6;syndicate=3"
 	max_ammo = 5
 
+/obj/item/ammo_box/magazine/sniper_rounds/gang
+	name = "black market sniper rounds (.50)"
+	icon_state = ".50mag"
+	origin_tech = "combat=6"
+	ammo_type = /obj/item/ammo_casing/point50/gang
+
+/obj/item/ammo_box/magazine/sniper_rounds/gang/sleeper
+	name = "illegally modified tranquilizer round"
+	icon_state = "soporific"
+	origin_tech = "combat=6"
+	ammo_type = /obj/item/ammo_casing/point50/gang/sleeper
 
 //// SAW MAGAZINES
 
@@ -371,4 +382,4 @@
 	icon_state = "oldrifle-[round(ammo_count(),4)]"
 
 /obj/item/ammo_box/magazine/recharge/attack_self() //No popping out the "bullets"
- 	return
+ 	return

code/modules/projectiles/guns/ballistic/automatic.dm.rej

@@ -0,0 +1,13 @@
+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 //
+ 

code/modules/projectiles/projectile/bullets.dm

@@ -279,7 +279,30 @@
 		target.ex_act(rand(1,2))
 	return ..()
 
+/obj/item/projectile/bullet/sniper/gang
+	damage = 55
+	stun = 1
+	weaken = 1
+	dismemberment = 15
+	armour_penetration = 25
 
+/obj/item/projectile/bullet/sniper/gang/sleeper
+	nodamage = 1
+	stun = 0
+	weaken = 0
+	dismemberment = 0
+	breakthings = FALSE
+
+/obj/item/projectile/bullet/sniper/gang/sleeper/on_hit(atom/target, blocked = 0)
+	if((blocked != 100) && isliving(target))
+		var/mob/living/L = target
+		L.blur_eyes(8)
+		if(L.staminaloss >= 40)
+			L.Sleeping(20)
+		else
+			L.adjustStaminaLoss(55)
+	return 1
+
 /obj/item/projectile/bullet/sniper/soporific
 	armour_penetration = 0
 	nodamage = 1

code/modules/projectiles/projectile/bullets.dm.rej

@@ -0,0 +1,10 @@
+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