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

2017-05-27 09:27:00 -05:00
parent 0e9f17b14a
commit c3d2dbe00a
8 changed files with 101 additions and 13 deletions
@@ -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
@@ -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