Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions code/game/objects/items/cigs_lighters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Comment thread
Spitegremlin marked this conversation as resolved.

/obj/item/cigbutt/zigar
name = "zigar butt"

/////////////////
//SMOKING PIPES//
/////////////////
Expand Down
13 changes: 13 additions & 0 deletions code/game/objects/items/storage/fancy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions code/modules/clothing/face/spectacle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
4 changes: 4 additions & 0 deletions code/modules/crafting/anvil_recipes/tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 15 additions & 0 deletions code/modules/crafting/quality_of_crafting/generic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions code/modules/crafting/quality_of_crafting/sewing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified icons/obj/cigarettes.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/masks.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/onmob/masks.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/onmob/mouth_items.dmi
Binary file not shown.
Binary file modified icons/roguetown/items/lighting.dmi
Binary file not shown.
Loading