cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13004 from TheDavestDave/amor-stuffs

Browse Source 
custom item stuff ahead of explo removeal
This commit is contained in:
Casey
2022-05-22 14:32:05 -04:00
committed by CHOMPStation2
parent 7e9b5e592f
commit a318b9be4c
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
View File

@@ -1255,7 +1255,8 @@
character_name = list("Nehi Maximus") character_name = list("Nehi Maximus")
/datum/gear/fluff/lucky_amour /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" display_name = "Lucky's amour"
ckeywhitelist = list ("thedavestdave") ckeywhitelist = list ("thedavestdave")
character_name = list("Lucky") character_name = list("Lucky")
allowed_roles = "Chaplain"

11
code/modules/vore/fluffstuff/custom_items_vr.dm
View File

@@ -1447,7 +1447,7 @@ End CHOMP Removal*/
//thedavestdave Lucky //thedavestdave Lucky
///I know this is pretty bodgey but if it stupid and it works it isn't stupid ///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 = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "luck" icon_state = "luck"
icon_override = 'icons/vore/custom_clothes_vr.dmi' 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." 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 //RevolverEloise - Revolver Eloise
/obj/item/weapon/sword/fluff/revolver /obj/item/weapon/sword/fluff/revolver
name = "Catnip" name = "Catnip"