Merge pull request #969 from NopemanMcHalt/gasmask_loadout_fix

A workaround to fix loadout masks getting removed due Bane Syndrome quirk
SPLURT-Station · Oct 5, 2023 · ce3d2af · ce3d2af
2 parents 99bbac7 + 7f2e13d
commit ce3d2af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -1,3 +1,3 @@
 /datum/gear/mask/gas
-  restricted_roles = list()
+	restricted_roles = list()