From a318b9be4c5452dfcf43bd80a1d53e031ca02f8d Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 22 May 2022 14:32:05 -0400 Subject: [PATCH] Merge pull request #13004 from TheDavestDave/amor-stuffs custom item stuff ahead of explo removeal --- .../loadout/loadout_fluffitems_vr.dm | 3 ++- code/modules/vore/fluffstuff/custom_items_vr.dm | 13 ++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index e47364e9e4..0895ef50a0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -1255,7 +1255,8 @@ character_name = list("Nehi Maximus") /datum/gear/fluff/lucky_amour - path = /obj/item/device/modkit_conversion/crusader_luck + path = /obj/item/clothing/suit/armor/combat/crusader_costume/lucky display_name = "Lucky's amour" ckeywhitelist = list ("thedavestdave") character_name = list("Lucky") + allowed_roles = "Chaplain" \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index f4cbfc902e..2446c07424 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1447,7 +1447,7 @@ End CHOMP Removal*/ //thedavestdave Lucky ///I know this is pretty bodgey but if it stupid and it works it isn't stupid -/obj/item/clothing/suit/storage/hooded/explorer/lucky +/obj/item/clothing/suit/armor/combat/crusader_costume/lucky icon = 'icons/vore/custom_clothes_vr.dmi' icon_state = "luck" icon_override = 'icons/vore/custom_clothes_vr.dmi' @@ -1456,15 +1456,6 @@ End CHOMP Removal*/ desc = "A chain mail suit with a badly drawn one eared cat on the front." -/obj/item/device/modkit_conversion/crusader_luck - skip_content_check = TRUE - name = "Lucky's armor" - desc = "A chain mail suit with a badly drawn one eared cat on the front." - icon = 'icons/vore/custom_items_vr.dmi' - icon_state = "modkit" - from_suit = /obj/item/clothing/suit/storage/hooded/explorer - to_suit = /obj/item/clothing/suit/storage/hooded/explorer/lucky - //RevolverEloise - Revolver Eloise /obj/item/weapon/sword/fluff/revolver name = "Catnip" @@ -1494,7 +1485,7 @@ End CHOMP Removal*/ icon = 'icons/vore/custom_items_vr.dmi' icon_state = "lemonplush" attack_verb = list("blorbled", "slimed", "absorbed", "glomped") - + //Bricker98:Nettie Stough /obj/item/modular_computer/tablet/preset/custom_loadout/nettie name = "Remodeled Tablet"