Merge branch 'master' into w_class

Conflicts:
	code/game/objects/items/weapons/twohanded.dm

code/modules/projectiles/ammunition/ammo_casings.dm

@@ -208,7 +208,7 @@
 	variance = 25
 
 
-/obj/item/ammo_casing/shotgun/improvised/overload/
+/obj/item/ammo_casing/shotgun/improvised/overload
 	name = "overloaded improvised shell"
 	desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards. This one has been packed with even more \
 	propellant. It's like playing russian roulette, with a shotgun."

code/modules/projectiles/guns/ballistic/revolver.dm

@@ -32,10 +32,6 @@
 		update_icon()
 		chamber_round(0)
 
-	if(unique_rename)
-		if(istype(A, /obj/item/weapon/pen))
-			rename_weapon(user)
-
 /obj/item/weapon/gun/ballistic/revolver/attack_self(mob/living/user)
 	var/num_unloaded = 0
 	chambered = null

code/modules/projectiles/guns/magic/staff.dm

@@ -1,4 +1,4 @@
-/obj/item/weapon/gun/magic/staff/
+/obj/item/weapon/gun/magic/staff
 	slot_flags = SLOT_BACK
 
 /obj/item/weapon/gun/magic/staff/change

code/modules/projectiles/guns/magic/wand.dm

@@ -1,4 +1,4 @@
-/obj/item/weapon/gun/magic/wand/
+/obj/item/weapon/gun/magic/wand
 	name = "wand of nothing"
 	desc = "It's not just a stick, it's a MAGIC stick!"
 	ammo_type = /obj/item/ammo_casing/magic

code/modules/projectiles/projectile/reusable.dm

@@ -1,7 +1,7 @@
 /obj/item/projectile/bullet/reusable
 	name = "reusable bullet"
 	desc = "How do you even reuse a bullet?"
-	var/ammo_type = /obj/item/ammo_casing/caseless/
+	var/ammo_type = /obj/item/ammo_casing/caseless
 	var/dropped = 0
 	impact_effect_type = null