diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 98d41453f4c..e61e6bf0ab0 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -369,6 +369,20 @@ CIGARETTE PACKETS ARE IN FANCY.DM pixel_x = base_pixel_x + rand(-5, 5) pixel_y = base_pixel_y + rand(-5, 5) +//Cigars + +/obj/item/clothing/face/cigarette/rollie/nicotine/zigar + name = "zigar" + desc = "A strong, manly verison of the common zig, this isnt your average smokers treat- No, this is for the humble, the wise, the ones 'in' on it. You know who you are." + icon_state = "zigaroff" + icon_on = "zigaron" + type_butt = /obj/item/cigbutt/zigar + chem_volume = 120 + list_reagents = list(/datum/reagent/drug/nicotine = 120) + +/obj/item/cigbutt/zigar + name = "zigar butt" + ///////////////// //SMOKING PIPES// ///////////////// diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index b47d64524c4..d9787890f46 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -198,3 +198,16 @@ /obj/item/storage/fancy/cigarettes/zig/empty spawn_type = null + +/obj/item/storage/fancy/cigarettes/tinzig + name = "metal zigbox" + desc = "" + icon_state = "tinzig" + base_icon_state = "tinzig" + contents_tag = "zig" + spawn_type = /obj/item/clothing/face/cigarette/rollie/nicotine/zigar + component_type = /datum/component/storage/concrete/grid/zigbox + item_weight = 84 GRAMS + +/obj/item/storage/fancy/cigarettes/tinzig/empty + spawn_type = null diff --git a/code/modules/clothing/face/spectacle.dm b/code/modules/clothing/face/spectacle.dm index 6a2f8a7622c..5ae2ba5d180 100644 --- a/code/modules/clothing/face/spectacle.dm +++ b/code/modules/clothing/face/spectacle.dm @@ -123,6 +123,11 @@ sewrepair = /datum/attribute/skill/misc/sewing/mending dyeable = TRUE +/obj/item/clothing/face/sack/surgsack + name = "physicker's masked sack" + desc = "A brown sack, with a physickers mask on top of it, likely for more coverage." + icon_state = "surgsackmask" + /obj/item/clothing/face/sack/psy name = "psydonian sack mask" desc = "An ordinary brown sack. This one has eyeholes cut into it, bearing a crude chalk drawing of Psydon's cross upon its visage. Unsettling for most." diff --git a/code/modules/crafting/anvil_recipes/tools.dm b/code/modules/crafting/anvil_recipes/tools.dm index 90f3902fbfa..b18a4772c75 100644 --- a/code/modules/crafting/anvil_recipes/tools.dm +++ b/code/modules/crafting/anvil_recipes/tools.dm @@ -31,6 +31,10 @@ created_item = /obj/item/reagent_containers/glass/bowl/pewter output_amount = 2 +/datum/anvil_recipe/tools/tin/zig + name = "tin zigbox" + created_item = /obj/item/storage/fancy/cigarettes/tinzig/empty + // --------- COPPER ----------- /datum/anvil_recipe/tools/copper diff --git a/code/modules/crafting/quality_of_crafting/generic.dm b/code/modules/crafting/quality_of_crafting/generic.dm index 8d63cc2455a..ab328c14bb4 100644 --- a/code/modules/crafting/quality_of_crafting/generic.dm +++ b/code/modules/crafting/quality_of_crafting/generic.dm @@ -26,6 +26,21 @@ craftdiff = 0 subtypes_allowed = TRUE +/datum/repeatable_crafting_recipe/zigarsmoke + name = "zigar" + output = /obj/item/clothing/face/cigarette/rollie/nicotine/zigar + starting_atom = /obj/item/reagent_containers/food/snacks/produce/dry_westleach + requirements = list( + /obj/item/reagent_containers/food/snacks/produce/dry_westleach = 1, + /obj/item/alch/tobaccodust = 1 + ) + attacked_atom = /obj/item/alch/tobaccodust + allow_inverse_start = TRUE + + craft_time = 10 SECONDS + crafting_message = "starts rolling up a strong zigar" + craftdiff = 3 + /datum/repeatable_crafting_recipe/canvas name = "canvas" output = /obj/item/canvas diff --git a/code/modules/crafting/quality_of_crafting/sewing.dm b/code/modules/crafting/quality_of_crafting/sewing.dm index b2d2d4de31d..ca6995acd78 100644 --- a/code/modules/crafting/quality_of_crafting/sewing.dm +++ b/code/modules/crafting/quality_of_crafting/sewing.dm @@ -1736,6 +1736,16 @@ craftdiff = 2 category = "Mask" +/datum/repeatable_crafting_recipe/sewing/surg_sack + name = "physicker's masked sack" + output = /obj/item/clothing/face/sack/surgsack + requirements = list( + /obj/item/natural/cloth = 3, + /obj/item/clothing/face/phys = 1, + ) + craftdiff = 1 + category = "Mask" + /datum/repeatable_crafting_recipe/sewing/bandaged_gloves name = "Bandaged Gloves" output = /obj/item/clothing/gloves/bandages diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi index 6ad7035d9fd..357e1e12476 100644 Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ diff --git a/icons/roguetown/clothing/masks.dmi b/icons/roguetown/clothing/masks.dmi index d8df38b2763..0d33ed3c253 100644 Binary files a/icons/roguetown/clothing/masks.dmi and b/icons/roguetown/clothing/masks.dmi differ diff --git a/icons/roguetown/clothing/onmob/masks.dmi b/icons/roguetown/clothing/onmob/masks.dmi index 566fbf43193..788466da18d 100644 Binary files a/icons/roguetown/clothing/onmob/masks.dmi and b/icons/roguetown/clothing/onmob/masks.dmi differ diff --git a/icons/roguetown/clothing/onmob/mouth_items.dmi b/icons/roguetown/clothing/onmob/mouth_items.dmi index c81f3c5da11..80cf3b8db83 100644 Binary files a/icons/roguetown/clothing/onmob/mouth_items.dmi and b/icons/roguetown/clothing/onmob/mouth_items.dmi differ diff --git a/icons/roguetown/items/lighting.dmi b/icons/roguetown/items/lighting.dmi index 8c10b496e47..2a51ab954e8 100644 Binary files a/icons/roguetown/items/lighting.dmi and b/icons/roguetown/items/lighting.dmi differ