Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-smallsync

# Conflicts:
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm

Line ending changes?

code/game/objects/items/devices/translator.dm

@@ -16,7 +16,8 @@
 	if(!listening) //Turning ON
 		langset = input(user,"Translate to which of your languages?","Language Selection") as null|anything in user.languages
 		if(langset)
-			if(langset && ((langset.flags & NONVERBAL) || (langset.flags & HIVEMIND)))
+			if(langset && ((langset.flags & NONVERBAL) || (langset.flags & HIVEMIND) || (!langset.machine_understands)))
+				//Nonverbal means no spoken words to translate, so I didn't see the need to remove it.
 				to_chat(user, "<span class='warning'>\The [src] cannot output that language.</span>")
 				return
 			else
@@ -49,6 +50,9 @@
 	if (language && (language.flags & NONVERBAL))
 		return //Not gonna translate sign language
 
+	if (!language.machine_understands)
+		return //Any other languages that it can't translate.
+
 	if (visual && ((L.sdisabilities & BLIND) || L.eye_blind))
 		return //Can't see the screen, don't get the message
 

code/game/objects/items/stacks/nanopaste.dm

@@ -6,7 +6,7 @@
 	icon_state = "tube"
 	origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3)
 	amount = 10
-
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/stack/nanopaste/attack(mob/living/M as mob, mob/user as mob)
 	if (!istype(M) || !istype(user))