fixes the merge conflicts

2020-06-15 23:29:49 +01:00
parent 7fbfb4ad0e
commit eba1e8f301
12 changed files with 136 additions and 64 deletions
@@ -36,7 +36,6 @@
 	ricochet_chance = 40
 	shrapnel_type = /obj/item/shrapnel
 	ricochet_incidence_leeway = 60
-	hit_stunned_targets = TRUE

 /obj/item/projectile/bullet/shrapnel/mega
 	name = "flying shrapnel hunk"
@@ -63,6 +62,3 @@
 	name = "megastingball pellet"
 	ricochets_max = 6
 	ricochet_chance = 110
-
-/obj/item/projectile/bullet/pellet/stingball/on_ricochet(atom/A)
-	hit_stunned_targets = TRUE // ducking will save you from the first wave, but not the rebounds