diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm index 4ac1b8cd42f..b0ea474bd3c 100644 --- a/code/game/objects/items/weapons/soap.dm +++ b/code/game/objects/items/weapons/soap.dm @@ -97,7 +97,7 @@ ..() /obj/item/soap/nanotrasen - desc = "A NanoTrasen-brand bar of soap. Smells of phoron." + desc = "A NanoTrasen-brand bar of soap. Smells of acai berries and white chocolate." icon_state = "soapnt" item_state = "soapnt" @@ -114,85 +114,85 @@ desc = "A deluxe Waffle Co. brand bar of soap. Smells of [pick("lavender", "vanilla", "strawberry", "chocolate" ,"space")]." /obj/item/soap/syndie - desc = "An untrustworthy bar of soap. Smells of fear." + desc = "A lackluster bar of soap. It smells like cranberries." icon_state = "soapsyndie" item_state = "soapsyndie" capacity = 20 /obj/item/soap/space_soap - desc = "Smells like burnt meat." + desc = "Smells like cedarwood and almonds." icon_state = "space_soap" /obj/item/soap/water_soap - desc = "Smells like chlorine." + desc = "Smells like rain water and vanilla." icon_state = "water_soap" /obj/item/soap/fire_soap - desc = "Smells like burnt charcoal." + desc = "Smells like charcoal and chestnuts." icon_state = "fire_soap" /obj/item/soap/rainbow_soap - desc = "Smells sweet." + desc = "Smells like carnations and honey." icon_state = "rainbow_soap" /obj/item/soap/diamond_soap - desc = "Smells like saffron." + desc = "Smells like saffron and vanilla." icon_state = "diamond_soap" /obj/item/soap/uranium_soap - desc = "Doesn't smell... it's glowing though." + desc = "Smells like lime." icon_state = "uranium_soap" /obj/item/soap/silver_soap - desc = "Smells bitter." + desc = "Smells like birch and amaranth." icon_state = "silver_soap" /obj/item/soap/brown_soap - desc = "Smells like chocolate." + desc = "Smells like cinnamon and cognac." icon_state = "brown_soap" /obj/item/soap/white_soap - desc = "Smells like vanilla." + desc = "Smells like nutmeg and oats." icon_state = "white_soap" /obj/item/soap/grey_soap - desc = "Smells acidic." + desc = "Smells like bergamot and lilies." icon_state = "grey_soap" /obj/item/soap/pink_soap - desc = "Smells like bubble gum" + desc = "Smells like cherry blossoms." icon_state = "pink_soap" /obj/item/soap/purple_soap - desc = "Smells like wisteria." + desc = "Smells like lavender." icon_state = "purple_soap" /obj/item/soap/blue_soap - desc = "Smells like lilies." + desc = "Smells like cardamom." icon_state = "blue_soap" /obj/item/soap/cyan_soap - desc = "Smells like bluebells." + desc = "Smells like bluebells and peaches." icon_state = "cyan_soap" /obj/item/soap/green_soap - desc = "Smells like a freshly mowed lawn." + desc = "Smells like rosemary and thyme." icon_state = "green_soap" /obj/item/soap/yellow_soap - desc = "Smells like sunflowers." + desc = "Smells like citron and ginger." icon_state = "yellow_soap" /obj/item/soap/orange_soap - desc = "Smells like oranges." + desc = "Smells like oranges and dark chocolate." icon_state = "orange_soap" /obj/item/soap/red_soap - desc = "Smells like cherries." + desc = "Smells like roses and oats." icon_state = "red_soap" /obj/item/soap/golden_soap - desc = "Smells like honey." + desc = "Smells like agave nectar." icon_state = "golden_soap" /obj/random/soap/ diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 3b147900feb..20004a0975b 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -1104,4 +1104,28 @@ icon_state = "vysoka_l" /obj/structure/sign/flag/vysoka/right - icon_state = "vysoka_r" \ No newline at end of file + icon_state = "vysoka_r" + +/obj/item/flag/konyang + name = "Konyang flag" + desc = "The flag of Konyang." + desc_fluff = "The white, blue and yellow flag of Konyang was adopted in 2462, having unofficially been used by pro-autonomy circles long before the declaration of independence. The traditional taitju represents peace and harmony as the highest values of \ + the new state, with the color blue representing the waterways the planet is known for and yellow, their aim of prosperity. The white background represents Konyang's purity." + flag_path = "konyang" + +/obj/structure/sign/flag/konyang + name = "Konyang flag" + desc = "The flag of Konyang." + desc_fluff = "The white, blue and yellow flag of Konyang was adopted in 2462, having unofficially been used by pro-autonomy circles long before the declaration of independence. The traditional taitju represents peace and harmony as the highest values of \ + the new state, with the color blue representing the waterways the planet is known for and yellow, their aim of prosperity. The white background represents Konyang's purity." + icon_state = "konyang" + +/obj/item/flag/konyang/l + name = "large Konyang flag" + flag_size = 1 + +/obj/structure/sign/flag/konyang/left + icon_state = "konyang_l" + +/obj/structure/sign/flag/konyang/right + icon_state = "konyang_r" \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index e66a692b1d5..6bd16ffb19a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -175,6 +175,7 @@ banners["banner, Confederate States of Fisanduh"] = /obj/item/flag/fisanduh banners["banner, Gadpathur"] = /obj/item/flag/gadpathur banners["banner, Vysoka"] = /obj/item/flag/vysoka + banners["banner, Konyang"] = /obj/item/flag/konyang gear_tweaks += new /datum/gear_tweak/path(banners) /datum/gear/standard @@ -224,6 +225,7 @@ flags["flag, Confederate States of Fisanduh"] = /obj/item/flag/fisanduh/l flags["flag, Gadpathur"] = /obj/item/flag/gadpathur/l flags["flag, Vysoka"] = /obj/item/flag/vysoka/l + flags["flag, Konyang"] = /obj/item/flag/konyang/l gear_tweaks += new /datum/gear_tweak/path(flags) /datum/gear/towel diff --git a/html/changelogs/niennab-soapandflags.yml b/html/changelogs/niennab-soapandflags.yml new file mode 100644 index 00000000000..2469077e292 --- /dev/null +++ b/html/changelogs/niennab-soapandflags.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: Niennab + +# 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 both a Konyang flag and banner." + - tweak: "Changed all the soap sprites as well as the descriptions of said soap to be less meme-like." + - tweak: "Tweaked all of the Dominian house banners, Elyra banner and flag and Zeng-hu banner and flag to be more in line with the wiki images." diff --git a/icons/obj/flags.dmi b/icons/obj/flags.dmi index 40f6bf7234b..550e12e27f0 100644 Binary files a/icons/obj/flags.dmi and b/icons/obj/flags.dmi differ diff --git a/icons/obj/soap.dmi b/icons/obj/soap.dmi index 0f54fa57830..54ca06584de 100644 Binary files a/icons/obj/soap.dmi and b/icons/obj/soap.dmi differ