Merge remote-tracking branch 'upstream/master' into embed-changes

2020-06-15 22:48:26 +01:00
parent c1d966ca44 1d3cad02ef
commit 7fbfb4ad0e
180 changed files with 5227 additions and 1997 deletions
@@ -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