diff --git a/code/modules/client/verbs/looc.dm b/code/modules/client/verbs/looc.dm index 6f1bfab4..b97a184a 100644 --- a/code/modules/client/verbs/looc.dm +++ b/code/modules/client/verbs/looc.dm @@ -20,6 +20,9 @@ GLOBAL_VAR_INIT(normal_looc_colour, "#6699CC") if(!msg) return + if(!(prefs.toggles & CHAT_OOC)) + to_chat(src, " You have OOC muted.") + return if(jobban_isbanned(mob, "OOC")) to_chat(src, "You have been banned from OOC.") return diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 92d5b25a..9c6caf8c 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -102,6 +102,7 @@ /obj/item/clothing/suit/toggle/jacket_purple = 3, /obj/item/clothing/suit/toggle/jacket_white = 3, /obj/item/clothing/suit/jacket/letterman_red = 3, + /obj/item/clothing/suit/fluffyhalfcrop = 3, /obj/item/clothing/ears/headphones = 10, /obj/item/clothing/suit/apron/purple_bartender = 4, /obj/item/clothing/under/rank/bartender/purple = 4, diff --git a/hyperstation/code/obj/kinkyclothes.dm b/hyperstation/code/obj/kinkyclothes.dm index 8fd9c43d..4c9f61ea 100644 --- a/hyperstation/code/obj/kinkyclothes.dm +++ b/hyperstation/code/obj/kinkyclothes.dm @@ -39,7 +39,7 @@ //the classic click clack obj/item/clothing/neck/stole - name = "white stole" + name = "white boa" desc = "Fluffy neck wear to keep you warm, and attract others." icon = 'hyperstation/icons/obj/clothing/neck.dmi' w_class = WEIGHT_CLASS_SMALL @@ -48,11 +48,22 @@ obj/item/clothing/neck/stole price = 3 obj/item/clothing/neck/stole/black - name = "black stole" + name = "black boa" desc = "Fluffy neck wear to keep you warm, and attract others." icon = 'hyperstation/icons/obj/clothing/neck.dmi' w_class = WEIGHT_CLASS_SMALL icon_state = "stole" item_state = "" //no inhands color = "#3d3d3d" - price = 3 \ No newline at end of file + price = 3 + +/obj/item/clothing/suit/fluffyhalfcrop + name = "fluffy half-crop jacket" + desc = "A fluffy synthetic fur half-cropped jacket, less about warmth, more about style!" + icon_state = "fluffy" + item_state = "fluffy" + icon = 'hyperstation/icons/obj/clothing/suits.dmi' + alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi' + body_parts_covered = CHEST|LEGS|ARMS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + mutantrace_variation = NO_MUTANTRACE_VARIATION diff --git a/hyperstation/icons/mobs/suits.dmi b/hyperstation/icons/mobs/suits.dmi index 1fee3289..cd3335dd 100644 Binary files a/hyperstation/icons/mobs/suits.dmi and b/hyperstation/icons/mobs/suits.dmi differ diff --git a/hyperstation/icons/obj/clothing/suits.dmi b/hyperstation/icons/obj/clothing/suits.dmi index b3e25949..3c73887c 100644 Binary files a/hyperstation/icons/obj/clothing/suits.dmi and b/hyperstation/icons/obj/clothing/suits.dmi differ