Merge branch 'master' into tg-Organ-port

2019-09-19 01:33:15 +01:00
parent aabc2423a8 2c70bd097c
commit 587568bf88
178 changed files with 7478 additions and 6283 deletions
@@ -5,7 +5,7 @@
 /obj/item/projectile/bullet/shotgun_beanbag
 	name = "beanbag slug"
 	damage = 5
-	stamina = 80
+	stamina = 70

 /obj/item/projectile/bullet/incendiary/shotgun
 	name = "incendiary slug"
@@ -61,12 +61,12 @@

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

 /obj/item/projectile/bullet/pellet/shotgun_rubbershot
 	name = "rubbershot pellet"
-	damage = 3
-	stamina = 25
+	damage = 2
+	stamina = 15

 /obj/item/projectile/bullet/pellet/Range()
 	..()