Merge pull request #7377 from Tayyyyyyy/skrell_hair

Skrell can hold stuff in their tentacles

code/game/objects/items/weapons/cosmetics.dm

@@ -136,6 +136,9 @@
 			if(C.h_style == "Bald" || C.h_style == "Balding Hair" || C.h_style == "Skinhead")
 				to_chat(user, "<span class='notice'>There is not enough hair left to shave...</span>")
 				return
+			if(M.get_species() == "Skrell")
+				to_chat(user, "<span class='warning'>Your razor isn't going to cut through tentacles.</span>")
+				return
 			if(H == user) //shaving yourself
 				user.visible_message("<span class='warning'>[user] starts to shave their head with \the [src].</span>", \
 				"<span class='warning'>You start to shave your head with \the [src].</span>")
@@ -160,4 +163,4 @@
 		else
 			..()
 	else
-		..()
+		..()

code/game/objects/items/weapons/storage/storage.dm

@@ -254,7 +254,7 @@
 
 	if(W.w_class > max_w_class)
 		if(!stop_messages)
-			to_chat(usr, "<span class='notice'>[W] is too big for this [src].</span>")
+			to_chat(usr, "<span class='notice'>[W] is too big for [src].</span>")
 		return 0
 
 	var/sum_w_class = W.w_class