Merge branch 'master' into spike-loot-differentces

code/modules/projectiles/projectile/bullets/revolver.dm

@@ -126,4 +126,15 @@
 	ricochet_auto_aim_angle = 50
 	ricochet_auto_aim_range = 6
 	ricochet_incidence_leeway = 80
-	ricochet_decay_chance = 1
+	ricochet_decay_chance = 1
+
+/obj/item/projectile/bullet/a357/dumdum
+	name = ".357 DumDum bullet" // the warcrime bullet
+	damage = 40
+	armour_penetration = -20
+	wound_bonus = 45
+	bare_wound_bonus = 45
+	sharpness = SHARP_EDGED
+	embedding = list(embed_chance=90, fall_chance=2, jostle_chance=5, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
+	wound_falloff_tile = -1
+	embed_falloff_tile = -5

code/modules/projectiles/projectile/special/plasma.dm

@@ -2,7 +2,7 @@
 	name = "plasma blast"
 	icon_state = "plasmacutter"
 	damage_type = BRUTE
-	damage = 20
+	damage = 10
 	range = 4
 	dismemberment = 20
 	impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
@@ -32,12 +32,12 @@
 			return BULLET_ACT_FORCE_PIERCE
 
 /obj/item/projectile/plasma/adv
-	damage = 28
+	damage = 14
 	range = 5
 	mine_range = 5
 
 /obj/item/projectile/plasma/adv/mech
-	damage = 40
+	damage = 20
 	range = 9
 	mine_range = 3
 
@@ -52,4 +52,4 @@
 	dismemberment = 0
 	damage = 10
 	range = 4
-	mine_range = 0
+	mine_range = 0