From 0de4b320fa0dd8966f595aa0cb2f1be7efd4df9b Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Sun, 21 May 2017 22:04:05 -0700 Subject: [PATCH] Prevent Skrell tentacles from being shaved --- code/game/objects/items/weapons/cosmetics.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index f311d56d1ba..2845393c764 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -133,7 +133,7 @@ if((C.species && C.species.flags & ALL_RPARTS) && robohead.is_monitor) //If the target is of a species that can have prosthetic heads, but the head doesn't support human hair 'wigs'... to_chat(user, "You find yourself disappointed at the appalling lack of hair.") return - if(C.h_style == "Bald" || C.h_style == "Balding Hair" || C.h_style == "Skinhead") + if(C.h_style == "Bald" || C.h_style == "Balding Hair" || C.h_style == "Skinhead" || findtextEx(C.h_style, "Skrell")) to_chat(user, "There is not enough hair left to shave...") return if(H == user) //shaving yourself @@ -160,4 +160,4 @@ else ..() else - ..() \ No newline at end of file + ..()