diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 136e2728377..0f889adf366 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -630,6 +630,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_off = "cobpipeoff" chem_volume = 30 +/obj/item/clothing/mask/smokable/pipe/bonepipe + name = "Europan bone pipe" + desc = "A smoking pipe made out of the bones of the Europan bone whale." + desc_fluff = "While most commonly associated with bone charms, bones from various sea creatures on Europa are used in a variety of goods, such as this smoking pipe. While smoking in submarines is often an uncommon occurrence, due to a lack of available air or space, these pipes are a common sight in the many stations of Europa. Higher-quality pipes typically have scenes etched into their bones, and can tell the story of their owner's time on Europa." + icon_state = "bonepipeoff" + item_state = "bonepipeoff" + icon_on = "bonepipeon" + icon_off = "bonepipeoff" + chem_volume = 30 + ///////// //ZIPPO// ///////// diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm index 3b447148897..6670f9f47f3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm @@ -94,6 +94,11 @@ pipe["smoking pipe, corn"] = /obj/item/clothing/mask/smokable/pipe/cobpipe gear_tweaks += new/datum/gear_tweak/path(pipe) +/datum/gear/smoking/bonepipe + display_name = "Europan bone pipe" + path = /obj/item/clothing/mask/smokable/pipe/bonepipe + flags = GEAR_HAS_DESC_SELECTION + /datum/gear/smoking/cigfilters display_name = "cigarette filters" path = /obj/item/storage/cigfilters diff --git a/html/changelogs/snakebittenn-whalersonthemoon.yml b/html/changelogs/snakebittenn-whalersonthemoon.yml new file mode 100644 index 00000000000..594210e22ec --- /dev/null +++ b/html/changelogs/snakebittenn-whalersonthemoon.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Stryker & Snakebittenn + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds a Europan whale bone smoking pipe." diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 45ced0322aa..42737c08ae1 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index da2e222d78b..682651c08e0 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ