Merge branch 'master' into development

# Conflicts:
#	html/changelogs/sdtwbaj-skrellmoney.yml

code/modules/projectiles/guns/bang.dm

@@ -4,6 +4,7 @@
 	icon_state = "revolver"
 	item_state = "revolver"
 	fire_sound = 'sound/misc/sadtrombone.ogg'
+	needspin = FALSE
 	var/image/bang_flag
 	var/fired_gun = 0
 	var/pixel_offset_x = -2
@@ -40,7 +41,7 @@
 /obj/item/weapon/gun/bang/attack_hand(mob/user as mob)
 	if(user.get_inactive_hand() == src && fired_gun)
 		src.cut_overlay(bang_flag)
-		user.visible_message("<span class='notice'>You push the flag back into the barrel of \the [src.name].</span>")
+		user.visible_message("<span class='notice'>\The [user] pushes the flag back into the barrel of \the [src.name].</span>", "<span class='notice'>You push the flag back into the barrel of \the [src.name].</span>")
 		fired_gun = 0
 	else
 		return ..()

code/modules/projectiles/projectile/bullets.dm

@@ -135,9 +135,6 @@
 
 /obj/item/projectile/bullet/pistol/strong //revolvers and matebas
 	damage = 60
-	maiming = 1
-	maim_rate = 25
-	maim_type = DROPLIMB_BLUNT
 
 /obj/item/projectile/bullet/pistol/rubber //"rubber" bullets
 	name = "rubber bullet"
@@ -152,8 +149,6 @@
 /obj/item/projectile/bullet/shotgun
 	name = "slug"
 	damage = 60
-	maiming = 1 //To prevent rando headgibbing, it uses the special headgib damage model. Don't get me wrong, it'll still kill the man, but could be cloned.
-	maim_rate = 25
 
 /obj/item/projectile/bullet/shotgun/beanbag		//because beanbags are not bullets
 	name = "beanbag"
@@ -180,9 +175,6 @@
 	pellets = 6
 	range_step = 1
 	spread_step = 10
-	maiming = 1
-	maim_rate = 1 //6% base chance of gib if all pellets hit. Likely to blow limbs at point blank. (As it should be.)
-	maim_type = DROPLIMB_BLUNT
 
 /* "Rifle" rounds */