Merge pull request #3236 from Citadel-Station-13/upstream-merge-31425

[MIRROR] Fixes c20r damage

code/modules/projectiles/ammunition/ammo_casings.dm

@@ -101,7 +101,7 @@
 	desc = "A 4.6x30mm incendiary bullet casing."
 	projectile_type = /obj/item/projectile/bullet/incendiary/c46x30mm
 
-// .45 (M1911)
+// .45 (M1911 + C20r)
 
 /obj/item/ammo_casing/c45
 	name = ".45 bullet casing"

code/modules/projectiles/projectile/bullets.dm

@@ -122,7 +122,7 @@
 	damage = 10
 	fire_stacks = 1
 
-// .45 (M1911)
+// .45 (M1911 & C20r)
 
 /obj/item/projectile/bullet/c45
 	name = ".45 bullet"
@@ -131,7 +131,7 @@
 
 /obj/item/projectile/bullet/c45_nostamina
 	name = ".45 bullet"
-	damage = 20
+	damage = 30
 
 // 5.56mm (M-90gl Carbine)