Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560

2020-02-14 19:39:53 +01:00
parent 04261345dd c2c1c755cd
commit 4a621fb1aa
541 changed files with 5500 additions and 2832 deletions
@@ -61,7 +61,7 @@

 /obj/item/projectile/bullet/pellet/shotgun_buckshot
 	name = "buckshot pellet"
-	damage = 10
+	damage = 12.5

 /obj/item/projectile/bullet/pellet/shotgun_rubbershot
 	name = "rubbershot pellet"
@@ -7,6 +7,7 @@
 	knockdown = 100
 	dismemberment = 50
 	armour_penetration = 50
+	zone_accuracy_factor = 100		//guarunteed 100%
 	var/breakthings = TRUE

 /obj/item/projectile/bullet/p50/on_hit(atom/target, blocked = 0)