diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index b1095c267ab..53bbcbe6377 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -18,6 +18,10 @@ var/visor_toggle_down_sound = null ///Sound this item makes when its visor is flipped up var/visor_toggle_up_sound = null + ///chat message when the visor is toggled down. + var/toggle_message + ///chat message when the visor is toggled up. + var/alt_toggle_message var/clothing_flags = NONE ///List of items that can be equipped in the suit storage slot while we're worn. @@ -540,7 +544,13 @@ BLIND // can't see anything visor_toggling() - to_chat(user, span_notice("You push [src] [up ? "out of the way" : "back into place"].")) + var/message + if(up) + message = src.alt_toggle_message || "You push [src] out of the way." + else + message = src.toggle_message || "You push [src] back into place." + + to_chat(user, span_notice("[message]")) //play sounds when toggling the visor up or down (if there is any) if(visor_toggle_up_sound && up) diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 9e13e601ea4..6d26701a387 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -118,6 +118,8 @@ name = "welding hard hat" desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight AND welding shield! The bulb seems a little smaller though." light_range = 3 //Needs a little bit of tradeoff + toggle_message = "You pull the visor down" + alt_toggle_message = "You push the visor up" dog_fashion = null actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_welding_screen) flash_protect = FLASH_PROTECTION_WELDER diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index c33960f8115..102fcdc6d61 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -213,10 +213,6 @@ /obj/item/clothing/head/helmet/toggleable visor_vars_to_toggle = NONE dog_fashion = null - ///chat message when the visor is toggled down. - var/toggle_message - ///chat message when the visor is toggled up. - var/alt_toggle_message /obj/item/clothing/head/helmet/toggleable/attack_self(mob/user) adjust_visor(user) @@ -230,8 +226,8 @@ desc = "It's a helmet specifically designed to protect against close range attacks." icon_state = "riot" inhand_icon_state = "riot_helmet" - toggle_message = "You pull the visor down on" - alt_toggle_message = "You push the visor up on" + toggle_message = "You pull the visor down" + alt_toggle_message = "You push the visor up" armor_type = /datum/armor/toggleable_riot flags_inv = HIDEHAIR|HIDEEARS|HIDEFACE|HIDESNOUT strip_delay = 8 SECONDS diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index ac41963bf49..35565f6cf78 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -215,6 +215,8 @@ GLOBAL_LIST_INIT(clown_mask_options, list( flash_protect = FLASH_PROTECTION_WELDER custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2, /datum/material/glass=SHEET_MATERIAL_AMOUNT) tint = 2 + toggle_message = "You pull the visor down" + alt_toggle_message = "You push the visor up" armor_type = /datum/armor/gas_welding actions_types = list(/datum/action/item_action/toggle) flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDESNOUT