diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 6c5701c1a3..b78709665d 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -385,6 +385,7 @@ storage_slots = 2 slowdown = SLOWDOWN_ARMOR_LIGHT flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS + flags_atom = NO_NAME_OVERRIDE allowed = list( /obj/item/tank/emergency_oxygen, /obj/item/device/flashlight, @@ -402,7 +403,7 @@ /obj/item/clothing/suit/storage/marine/smartgunner/Initialize() . = ..() - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD] && name == "M56 combat harness") + if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD] && name == "\improper M56 combat harness" && !(flags_atom & NO_SNOW_TYPE)) name = "M56 snow combat harness" /obj/item/clothing/suit/storage/marine/smartgunner/mob_can_equip(mob/equipping_mob, slot, disable_warning = FALSE) @@ -439,10 +440,10 @@ UnregisterSignal(user, COMSIG_HUMAN_ATTEMPTING_EQUIP) /obj/item/clothing/suit/storage/marine/smartgunner/standard - flags_atom = NO_SNOW_TYPE + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE /obj/item/clothing/suit/storage/marine/smartgunner/black - flags_atom = NO_SNOW_TYPE + flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE icon_state = "8fancy" /obj/item/clothing/suit/storage/marine/smartgunner/upp