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 4e6dcf7cd2..758513dafd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -61,9 +61,9 @@ character_name = list("Xander Bevin") /datum/gear/fluff/charlotte_cigarettes - path = /obj/item/weapon/storage/fancy/cigar/charlotte + path = /obj/item/weapon/storage/fancy/cigarettes/charlotte display_name = "Charlotte's cigarette case" - ckeywhitelist = list("AlFalah") + ckeywhitelist = list("alfalah") character_name = list("Charlotte Graves") /datum/gear/fluff/lynn_penlight diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 9138377b39..1e5b302272 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1362,12 +1362,13 @@ icon_state = "render" //AlFalah - Charlotte Graves -/obj/item/weapon/storage/fancy/cigar/charlotte +/obj/item/weapon/storage/fancy/cigarettes/charlotte name = "inconspicuous cigarette case" desc = "A SkyTron 3000 cigarette case with no additional functions. The buttons and CRT monitor are completely for show and have no functions. Seriously. " - icon_state = "charlottecigs" + icon_state = "charlotte" icon = 'icons/vore/custom_items_vr.dmi' - storage_slots = 8 - can_hold = list(/obj/item/clothing/mask/smokable/cigarette/cigar, /obj/item/trash/cigbutt/cigarbutt) - icon_type = "cigar" - starts_with = list(/obj/item/clothing/mask/smokable/cigarette = 8) \ No newline at end of file + storage_slots = 7 + can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/weapon/flame/lighter, /obj/item/trash/cigbutt) + icon_type = "cigarette" + brand = "\improper Professional 120 + starts_with = list(/obj/item/clothing/mask/smokable/cigarette = 7) \ No newline at end of file diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index a4db2fa626..e10ccc57ec 100644 Binary files a/icons/vore/custom_items_vr.dmi and b/icons/vore/custom_items_vr.dmi differ