Merge github.com:Baystation12/Baystation12

Conflicts:
	code/modules/mob/mob.dm
	code/modules/projectiles/projectile/change.dm

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

@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/projectile/detective
 	desc = "A cheap Martian knock-off of a Smith & Wesson Model 10. Uses .38-Special rounds."
-	name = "\improper Revolver"
+	name = "revolver"
 	icon_state = "detective"
 	caliber = "357"
 	origin_tech = "combat=2;materials=2"
@@ -18,7 +18,8 @@
 
 	verb/rename_gun()
 		set name = "Name Gun"
-		set desc = "Click to rename your gun."
+		set category = "Object"
+		set desc = "Click to rename your gun. If you're the detective."
 
 		var/mob/M = usr
 		if(!M.mind)	return 0
@@ -26,8 +27,7 @@
 			M << "\red You don't feel cool enough to name this gun, chump."
 			return 0
 
-		var/input = input("What do you want to name the gun?",,"")
-		input = sanitize(input)
+		var/input = copytext(sanitize(input("What do you want to name the gun?",,"")),1,MAX_NAME_LEN)
 
 		if(src && input && !M.stat && in_range(M,src))
 			name = input
@@ -38,7 +38,7 @@
 
 
 /obj/item/weapon/gun/projectile/mateba
-	name = "\improper Mateba"
+	name = "mateba"
 	desc = "When you absolutely, positively need a 10mm hole in the other guy. Uses .357 ammo."
 	icon_state = "mateba"
 	origin_tech = "combat=2;materials=2"

code/modules/projectiles/projectile/change.dm

@@ -48,6 +48,6 @@
 					M:Alienize()
 			if("human")
 				if (M.monkeyizing)
-					return
+					return
 		return