Merge branch 'master' into spike-loot-differentces

2020-06-17 02:36:52 -04:00
parent 51189d7a04 5e2d5c2b09
commit 51da7dfa71
374 changed files with 44895 additions and 39751 deletions
@@ -39,6 +39,9 @@
 /obj/item/projectile/beam/weak
 	damage = 15

+/obj/item/projectile/beam/weak/improvised
+	damage = 10
+
 /obj/item/projectile/beam/weak/penetrator
 	armour_penetration = 50

@@ -47,4 +47,16 @@
 		if(L.getStaminaLoss() >= 60)
 			L.Sleeping(300)
 		else
-			L.adjustStaminaLoss(25)
+			L.adjustStaminaLoss(25)
+
+// .32 ACP (Improvised Pistol)
+
+/obj/item/projectile/bullet/c32acp
+	name = ".32 bullet"
+	damage = 13
+
+/obj/item/projectile/bullet/r32acp
+	name = ".32 rubber bullet"
+	damage = 3
+	eyeblur = 1
+	stamina = 20