diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 0eb06e9c904..e7d4a25f5e5 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -448,7 +448,7 @@ contraband = list( /obj/item/storage/box/fancy/cigarettes/blank = 5, /obj/item/storage/box/fancy/cigarettes/acmeco = 5, - /obj/item/clothing/mask/smokable/cigarette/rolled/sausage = 3 + /obj/item/clothing/mask/smokable/cigarette/cigar/sausage = 3 ) premium = list( /obj/item/flame/lighter/zippo = 4, diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 55c75b618ad..265a1ec524f 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -145,10 +145,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable name = "smokable item" desc = "You're not sure what this is. You should probably ahelp it." - item_icons = list( - slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi', - slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi', - ) + icon = 'icons/obj/smokables.dmi' + item_icons = null + sprite_sheets = null + contained_sprite = TRUE + icon_auto_adapt = TRUE + icon_supported_species_tags = list("una", "taj") body_parts_covered = 0 var/lit = 0 var/icon_on @@ -293,12 +295,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM name = "cigarette" desc = "A roll of tobacco and nicotine." icon_state = "cigoff" - throw_speed = 0.5 item_state = "cigoff" + throw_speed = 0.5 w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS | SLOT_MASK attack_verb = list("burnt", "singed") - icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi + icon_on = "cigon" icon_off = "cigoff" has_blood_overlay = FALSE type_butt = /obj/item/trash/cigbutt @@ -443,6 +445,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM name = "premium Havanian cigar" desc = "A cigar fit for only the best of the best." icon_state = "cigar2off" + item_state = "cigar2off" icon_on = "cigar2on" icon_off = "cigar2off" type_butt = /obj/item/trash/cigbutt/cigarbutt/alt @@ -457,6 +460,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM name = "\improper Cohiba robusto cigar" desc = "There's little more you could want from a cigar." icon_state = "cigar2off" + item_state = "cigar2off" icon_on = "cigar2on" icon_off = "cigar2off" type_butt = /obj/item/trash/cigbutt/cigarbutt/alt @@ -470,7 +474,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/trash/cigbutt name = "cigarette butt" desc = "A manky old cigarette butt." - icon = 'icons/obj/clothing/masks.dmi' + icon = 'icons/obj/smokables.dmi' icon_state = "cigbutt" randpixel = 10 w_class = ITEMSIZE_TINY @@ -498,12 +502,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM user.update_inv_l_hand(0) user.update_inv_r_hand(1) -/obj/item/clothing/mask/smokable/cigarette/rolled/sausage +/obj/item/clothing/mask/smokable/cigarette/cigar/sausage name = "sausage" desc = "A piece of mixed, long meat, with a smoky scent." icon_state = "sausageoff" item_state = "sausageoff" icon_on = "sausageon" + icon_off = "sausageoff" type_butt = /obj/item/trash/cigbutt/sausagebutt chem_volume = 6 reagents_to_add = list(/decl/reagent/nutriment/protein = 6) @@ -521,7 +526,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM desc = "A pipe, for smoking. Probably made of meerschaum or something." icon_state = "pipeoff" item_state = "pipeoff" - icon_on = "pipeon" //Note - these are in masks.dmi + icon_on = "pipeon" icon_off = "pipeoff" burn_rate = 0.015 w_class = ITEMSIZE_TINY @@ -613,7 +618,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM desc = "A nicotine delivery system popularized by folksy backwoodsmen, kept popular in the modern age and beyond by space hipsters." icon_state = "cobpipeoff" item_state = "cobpipeoff" - icon_on = "cobpipeon" //Note - these are in masks.dmi + icon_on = "cobpipeon" icon_off = "cobpipeoff" chem_volume = 30 diff --git a/html/changelogs/cigarette_ears.yml b/html/changelogs/cigarette_ears.yml new file mode 100644 index 00000000000..570ada6bd68 --- /dev/null +++ b/html/changelogs/cigarette_ears.yml @@ -0,0 +1,9 @@ +author: Vrow + +delete-after: True + +changes: + - refactor: "Organizes the smokables (cigarettes, cigars, rolled cigarettes, smoking pipes) sprites into a contained sprite, now contained in the smokables.dmi" + - tweak: "Cleans some stray pixels from the North Facing smokables." + - bugfix: "Fixed Unathi and Tajara cigarettes and cigars appearing in their mouth when they're actually in their ear slot." + - bugfix: "Fixed the smokable sausage into a proper cigar/sausage instead of rolled/sausage, which caused the sprite to not appear correctly." diff --git a/icons/mob/items/lefthand_cigs_lighters.dmi b/icons/mob/items/lefthand_cigs_lighters.dmi index a3fcb776a49..6400bed9821 100644 Binary files a/icons/mob/items/lefthand_cigs_lighters.dmi and b/icons/mob/items/lefthand_cigs_lighters.dmi differ diff --git a/icons/mob/items/righthand_cigs_lighters.dmi b/icons/mob/items/righthand_cigs_lighters.dmi index d94a15ab33d..3a17559635f 100644 Binary files a/icons/mob/items/righthand_cigs_lighters.dmi and b/icons/mob/items/righthand_cigs_lighters.dmi differ diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/mob/species/tajaran/mask.dmi index 853026c8ae7..9c8bd688011 100644 Binary files a/icons/mob/species/tajaran/mask.dmi and b/icons/mob/species/tajaran/mask.dmi differ diff --git a/icons/mob/species/unathi/mask.dmi b/icons/mob/species/unathi/mask.dmi index 38a1c954d07..d610856d15f 100644 Binary files a/icons/mob/species/unathi/mask.dmi and b/icons/mob/species/unathi/mask.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 676e87d5e4c..cd88d66d5d0 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/smokables.dmi b/icons/obj/smokables.dmi new file mode 100644 index 00000000000..d70c8c135c4 Binary files /dev/null and b/icons/obj/smokables.dmi differ