diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index ae6941a4122..bd7e4736ea7 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -96,6 +96,14 @@ coffeecups["pawn coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/pawn coffeecups["diona coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/diona coffeecups["british coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/britcup + coffeecups["shumaila coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/shumaila + coffeecups["nated coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nated + coffeecups["vahzirthaamro coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/kingazunja + coffeecups["hadii coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hadii + coffeecups["njarir coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/njarir + coffeecups["m'sai coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/msai + coffeecups["hharar coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hharar + coffeecups["zhan coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/zhan coffeecups["black coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/black coffeecups["green coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/green coffeecups["dark green coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/green/dark diff --git a/code/modules/reagents/reagent_containers/glass/coffeecup.dm b/code/modules/reagents/reagent_containers/glass/coffeecup.dm index c01c812fbf6..aef2f39677b 100644 --- a/code/modules/reagents/reagent_containers/glass/coffeecup.dm +++ b/code/modules/reagents/reagent_containers/glass/coffeecup.dm @@ -140,6 +140,46 @@ desc = "A coffee cup with the British flag emblazoned on it." icon_state = "coffeecup_brit" +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/shumaila + name = "shumaila coffee cup" + desc = "A coffee cup with a portrait of Shumaila, the current monarch of the New Kingdom of Adhomai." + icon_state = "coffeecup_shumaila" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nated + name = "nated coffee cup" + desc = "A coffee cup with a portrait of Supreme Commander Nated'Hakhan, the leader of the Adhomian Liberation Army." + icon_state = "coffeecup_nated" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/kingazunja + name = "vahzirthaamro coffee cup" + desc = "A coffee cup with a portrait of the late King Vahzirthaamro Azunja, the previous monarch of the New Kingdom of Adhomai." + icon_state = "coffeecup_kingazunja" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hadii + name = "hadii coffee cup" + desc = "A coffee cup with a portrait of Njadrasanukii Hadii, the president of the People's Republic of Adhomai." + icon_state = "coffeecup_hadii" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/njarir + name = "njarir coffee cup" + desc = "A coffee cup featuring the image of a Njarir Priest of S'rendarr." + icon_state = "coffeecup_njarir" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/msai + name = "m'sai coffee cup" + desc = "A coffee cup featuring the image of a M'sai hunter." + icon_state = "coffeecup_msai" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hharar + name = "hharar coffee cup" + desc = "A coffee cup featuring the image of a Hharar janitor." + icon_state = "coffeecup_hharar" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/zhan + name = "zhan coffee cup" + desc = "A coffee cup featuring the image of a Zhan miner." + icon_state = "coffeecup_zhan" + // Pure colors & other /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/black name = "black coffee cup" diff --git a/html/changelogs/ramke - tajcups.yml b/html/changelogs/ramke - tajcups.yml new file mode 100644 index 00000000000..3adaa0cf788 --- /dev/null +++ b/html/changelogs/ramke - tajcups.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: Ramke + +# 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 8 new Tajara-themed cups into loadout." diff --git a/icons/obj/drink_glasses/coffecup.dmi b/icons/obj/drink_glasses/coffecup.dmi index 4b4dc73cd13..edc873a4945 100644 Binary files a/icons/obj/drink_glasses/coffecup.dmi and b/icons/obj/drink_glasses/coffecup.dmi differ