diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 37747a4605b..c2ea697068f 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -741,8 +741,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = "solzippo" /obj/item/flame/lighter/zippo/tcfl - name = "\improper Bieselite Zippo lighter" - desc = "A zippo lighter with a depiction of the Bieselite flag." + name = "\improper Biesellite Zippo lighter" + desc = "A zippo lighter with a depiction of the Biesellite flag." desc_extended = "In their rush to expand the Tau Ceti Foreign Legion, the Republic of Biesel manufactured thousands of Biesel-patterned zippo lighters to compliment the jackets and berets that were so often touted by recruiters. In the wake of Frost's Invasion, the popularity of such lighters has only increased and they serve as a small show of patriotism. A small NanoTrasen logo is stenciled on the base." icon_state = "tcflzippo" item_state = "tcflzippo" @@ -844,6 +844,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM flame_light_color = LIGHT_COLOR_WHITE flame_light_range = 2 +/obj/item/flame/lighter/zippo/sancolette + name = "\improper San Colette Zippo lighter" + desc = "A tricolor zippo lighter depicting the flag of San Colette." + desc_extended = "Among Solarian nations, it's popular to carry a lighter depicting the flag of the Sol Alliance as a proclaimation of \ + one's patriotism. After being recognised as the Sovereign Solarian Republic of San Colette, this tradition continued on with the Colettish, \ + now opting to pridefully bare their own tricolor flag instead." + icon_state = "sancolettezippo" + item_state = "sancolettezippo" + /obj/item/flame/lighter/random/Initialize() . = ..() icon_state = "lighter-[pick("r","c","y","g")]" diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 34fdb50f05d..edb71546c0d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -75,6 +75,8 @@ var/list/coffeecups = list() coffeecups["plain coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup coffeecups["sol coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/sol + coffeecups["San Colette coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/sancolette + coffeecups["Europa coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/europa coffeecups["dominian coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/dom coffeecups["NKA coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nka coffeecups["PRA coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/pra diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm index 448455c871e..ff1d88fe7ed 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm @@ -20,8 +20,9 @@ zippolighters["fisanduhian zippo"] = /obj/item/flame/lighter/zippo/fisanduh zippolighters["coalition zippo"] = /obj/item/flame/lighter/zippo/coalition zippolighters["solarian zippo"] = /obj/item/flame/lighter/zippo/sol - zippolighters["bieselite zippo"] = /obj/item/flame/lighter/zippo/tcfl + zippolighters["biesellite zippo"] = /obj/item/flame/lighter/zippo/tcfl zippolighters["himeo zippo"] = /obj/item/flame/lighter/zippo/himeo + zippolighters["san colettish zippo"] = /obj/item/flame/lighter/zippo/sancolette zippolighters["europan zippo"] = /obj/item/flame/lighter/zippo/europa zippolighters["gadpathurian zippo"] = /obj/item/flame/lighter/zippo/gadpathur zippolighters["luceian zippo"] = /obj/item/flame/lighter/zippo/luceian diff --git a/code/modules/reagents/reagent_containers/glass/coffeecup.dm b/code/modules/reagents/reagent_containers/glass/coffeecup.dm index aef2f39677b..91b61734c65 100644 --- a/code/modules/reagents/reagent_containers/glass/coffeecup.dm +++ b/code/modules/reagents/reagent_containers/glass/coffeecup.dm @@ -83,6 +83,16 @@ desc = "A purple coffee cup emblazoned with the flag of the Nralakk Federation." icon_state = "coffeecup_jarg" +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/sancolette + name = "\improper San Colette coffee cup" + desc = "A tricolor coffee cup bearing the flag of San Colette." + icon_state = "coffeecup_sancolette" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/europa + name = "\improper Europa coffee cup" + desc = "A tricolor coffee cup bearing the flag of Europa." + icon_state = "coffeecup_europa" + // Organisations /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt name = "\improper NT coffee cup" diff --git a/html/changelogs/llywelwyn-planet_merch.yml b/html/changelogs/llywelwyn-planet_merch.yml new file mode 100644 index 00000000000..c56318b893b --- /dev/null +++ b/html/changelogs/llywelwyn-planet_merch.yml @@ -0,0 +1,43 @@ +################################ +# 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: Llywelwyn + +# 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: "Added coffee cups for San Colette and Europa." + - rscadd: "Added a San Colette zippo lighter." + - spellcheck: "Fixed a typo in the name of the Biesellite zippo - you'll need to reselect it in the loadout to spawn with it again." diff --git a/icons/mob/items/lefthand_cigs_lighters.dmi b/icons/mob/items/lefthand_cigs_lighters.dmi index 6400bed9821..9ea15b0fafc 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 3a17559635f..bd31f1f4dd6 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/obj/cigs_lighters.dmi b/icons/obj/cigs_lighters.dmi index 1247df5b67d..0d46fc0bff2 100644 Binary files a/icons/obj/cigs_lighters.dmi and b/icons/obj/cigs_lighters.dmi differ diff --git a/icons/obj/drink_glasses/coffecup.dmi b/icons/obj/drink_glasses/coffecup.dmi index edc873a4945..83f7a12daee 100644 Binary files a/icons/obj/drink_glasses/coffecup.dmi and b/icons/obj/drink_glasses/coffecup.dmi differ