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 5b75fb6291..c8c63754be 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -1216,3 +1216,9 @@ display_name = "Nehi's Radio" ckeywhitelist = list("zodiacshadow") character_name = list("Nehi Maximus") + +/datum/gear/fluff/lucky_amour + path = /obj/item/device/modkit_conversion/crusader_luck + display_name = "Lucky's amour" + ckeywhitelist = list ("thedavestdave") + character_name = list("Lucky") \ 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 de00e22893..26efbb03bf 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1416,4 +1416,29 @@ End CHOMP Removal*/ icon = 'icons/vore/custom_items_vr.dmi' icon_state = "stamp-midhorror" stamptext = "This paper has been certified by The Council of Mid Horror" +<<<<<<< HEAD +======= + +//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 + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "luck" + icon_override = 'icons/vore/custom_clothes_vr.dmi' + item_state = "luck" + name = "Lucky's armor" + 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 + + +>>>>>>> 32a7be9e566... Merge pull request #12149 from TheDavestDave/whitelist-update diff --git a/icons/obj/clothing/knights_vr.dmi b/icons/obj/clothing/knights_vr.dmi index 8dd98e9e49..969b7530bb 100644 Binary files a/icons/obj/clothing/knights_vr.dmi and b/icons/obj/clothing/knights_vr.dmi differ diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index 3269a00d08..12d65818b1 100644 Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ