From 9e7e2de35a1c5da34bceffd896b6bfdea1cceda2 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 3 Dec 2021 02:30:41 +0100 Subject: [PATCH] [MIRROR] Fix sec hailer oversight with tint changes [MDB IGNORE] (#9843) * Fix sec hailer oversight with tint changes (#63211) About The Pull Request Sec hailers should've been changed to not have a tint but also to not have eye protection and so pepper immunity. Why It's Good For The Game Fix an oversight on the original PR #62947 Changelog cl fix: fix an oversight where sec hailer shouldn't have the tint changes, the eye protection and the pepper immunity. All other sec masks (the swat and spacepol) are unchanged /cl * Fix sec hailer oversight with tint changes Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com> --- code/modules/clothing/masks/hailer.dm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index 9699ef6152c..e0167d035cd 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -53,8 +53,9 @@ GLOBAL_LIST_INIT(hailer_phrases, list( w_class = WEIGHT_CLASS_SMALL visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS visor_flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT - flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF - visor_flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF + flags_cover = MASKCOVERSMOUTH + visor_flags_cover = MASKCOVERSMOUTH + tint = 0 var/aggressiveness = AGGR_BAD_COP var/overuse_cooldown = FALSE var/recent_uses = 0 @@ -70,12 +71,18 @@ GLOBAL_LIST_INIT(hailer_phrases, list( aggressiveness = AGGR_SHIT_COP flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDEEYES | HIDEEARS | HIDEHAIR | HIDESNOUT visor_flags_inv = 0 + tint = 1.5 + flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF + visor_flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF /obj/item/clothing/mask/gas/sechailer/swat/spacepol name = "spacepol mask" desc = "A close-fitting tactical mask created in cooperation with a certain megacorporation, comes with an especially aggressive Compli-o-nator 3000." icon_state = "spacepol" inhand_icon_state = "spacepol" + tint = 1.5 + flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF + visor_flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF /obj/item/clothing/mask/gas/sechailer/cyborg name = "security hailer"