diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 3daf5ac085a..c81250b1bfc 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -73,7 +73,9 @@ /datum/gear/coffeecup/New() ..() var/list/coffeecups = list() + // plain/base coffeecups["plain coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup + // nations 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 @@ -88,13 +90,21 @@ coffeecups["Hegemony coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hegemony coffeecups["Port Antillia coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/portantillia coffeecups["Nralakk coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nralakk + coffeecups["All-Xanu Republic cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/xanu + coffeecups["Galatea cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/galatea + // orgs/corpos + coffeecups["SCC coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/scc + coffeecups["SCC coffee cup, alt"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/scc/alt coffeecups["NT coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt coffeecups["Hephaestus coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/hepht coffeecups["Idris coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/idris coffeecups["Zeng-Hu coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/zeng + coffeecups["Zavod coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/zavod + coffeecups["Orion coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/orion coffeecups["TCFL coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tcfl - coffeecups["All-Xanu Republic cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/xanu - coffeecups["Galatea cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/galatea + coffeecups["EE coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/einstein + coffeecups["EE coffee cup, alt"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/einstein/alt + // symbols, markings coffeecups["#1 coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/one coffeecups["#1 monkey coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/puni coffeecups["heart coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/heart @@ -109,6 +119,7 @@ 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 + // pure colors & other 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 6341e587f1a..b9f9eefdb87 100644 --- a/code/modules/reagents/reagent_containers/glass/coffeecup.dm +++ b/code/modules/reagents/reagent_containers/glass/coffeecup.dm @@ -1,3 +1,6 @@ + +// ------------------------ base + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup name = "coffee cup" desc = "A plain white coffee cup." @@ -23,7 +26,8 @@ filling.color = reagents.get_color() add_overlay(filling) -// Nations +// ------------------------ nations + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/sol name = "\improper sol coffee cup" desc = "A blue coffee cup emblazoned with the crest of the Sol Alliance." @@ -94,7 +98,26 @@ desc = "A tricolor coffee cup bearing the flag of Port Antillia." icon_state = "coffeecup_portantillia" -// Organisations +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/xanu + name = "\improper All-Xanu Republic coffee cup" + desc = "A coffee cup bearing the flag of the All-Xanu Republic." + icon_state = "coffeecup_xanu" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/galatea + name = "\improper Federal Technocracy of Galatea coffee cup" + desc = "A coffee cup bearing the flag of the Federal Technocracy of Galatea" + icon_state = "coffeecup_galatea" + +// ------------------------ orgs/corpos + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/scc + name = "\improper SCC coffee cup" + desc = "A coffee cup bearing the Stellar Corporate Conglomerate logo." + icon_state = "coffeecup_scc" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/scc/alt + icon_state = "coffeecup_scc_alt" + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt name = "\improper NT coffee cup" desc = "A blue NanoTrasen coffee cup." @@ -107,7 +130,7 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/hepht name = "\improper Hephaestus coffee cup" - desc = "A strong coffee cup with the hephaestus logo emblazoned on it." + desc = "A strong coffee cup with the Hephaestus Industries logo emblazoned on it." icon_state = "coffeecup_hepht" /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/idris @@ -120,17 +143,26 @@ desc = "A coffee cup bearing the Zeng-Hu logo." icon_state = "coffeecup_zeng" -/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/xanu - name = "\improper All-Xanu Republic coffee cup" - desc = "A coffee cup bearing the flag of the All-Xanu Republic." - icon_state = "coffeecup_xanu" +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/zavod + name = "\improper Zavodskoi coffee cup" + desc = "A coffee cup bearing the Zavodskoi Interstellar logo." + icon_state = "coffeecup_zavod" -/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/galatea - name = "\improper Federal Technocracy of Galatea coffee cup" - desc = "A coffee cup bearing the flag of the Federal Technocracy of Galatea" - icon_state = "coffeecup_galatea" +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/orion + name = "\improper Orion Express coffee cup" + desc = "A coffee cup bearing the Orion Express logo." + icon_state = "coffeecup_orion" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/einstein + name = "\improper Einstein Engines coffee cup" + desc = "A coffee cup bearing the Einstein Engines logo." + icon_state = "coffeecup_einstein" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/einstein/alt + icon_state = "coffeecup_einstein_alt" + +// ------------------------ symbols, markings -// Symbols, markings /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/one name = "#1 coffee cup" desc = "A white coffee cup, prominently featuring a #1." @@ -201,7 +233,8 @@ desc = "A coffee cup featuring the image of a Zhan miner." icon_state = "coffeecup_zhan" -// Pure colors & other +// ------------------------ pure colors & other + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/black name = "black coffee cup" desc = "A sleek black coffee cup." diff --git a/html/changelogs/DreamySkrell-coffeecups.yml b/html/changelogs/DreamySkrell-coffeecups.yml new file mode 100644 index 00000000000..91882138785 --- /dev/null +++ b/html/changelogs/DreamySkrell-coffeecups.yml @@ -0,0 +1,8 @@ + + +author: DreamySkrell + +delete-after: True + +changes: + - rscadd: "Adds more coffee cups: SCC, Zavod, Orion, EE." diff --git a/icons/obj/drink_glasses/coffecup.dmi b/icons/obj/drink_glasses/coffecup.dmi index b11a7ddcffb..e153ab858ce 100644 Binary files a/icons/obj/drink_glasses/coffecup.dmi and b/icons/obj/drink_glasses/coffecup.dmi differ