From 7f2e13dabe459ba3042af1dcda430fc1ec43081a Mon Sep 17 00:00:00 2001 From: Anonymous Date: Wed, 4 Oct 2023 20:28:52 +0300 Subject: [PATCH] Fixes loadout masks getting removed due Bane quirk Also corrects indentation for gasmask loadout change. Sorry K4rlox. --- modular_splurt/code/datums/traits/neutral.dm | 2 +- modular_splurt/code/modules/client/loadout/mask.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_splurt/code/datums/traits/neutral.dm b/modular_splurt/code/datums/traits/neutral.dm index 36b09557f796..af515414ba58 100644 --- a/modular_splurt/code/datums/traits/neutral.dm +++ b/modular_splurt/code/datums/traits/neutral.dm @@ -885,7 +885,7 @@ . = ..() var/mob/living/carbon/human/H = quirk_holder var/obj/item/clothing/mask/gas/cosmetic/gasmask = new(get_turf(quirk_holder)) // Uses a custom gas mask - H.equip_to_slot(gasmask, ITEM_SLOT_MASK) + H.equip_to_slot_if_possible(gasmask, ITEM_SLOT_MASK) // If character have a loadout mask, the custom one will not overwrite it but instead will be dropped on floor H.regenerate_icons() /datum/quirk/body_morpher diff --git a/modular_splurt/code/modules/client/loadout/mask.dm b/modular_splurt/code/modules/client/loadout/mask.dm index cc962968c312..dd95e3c0cc49 100644 --- a/modular_splurt/code/modules/client/loadout/mask.dm +++ b/modular_splurt/code/modules/client/loadout/mask.dm @@ -1,3 +1,3 @@ /datum/gear/mask/gas - restricted_roles = list() + restricted_roles = list()