From 9133ddff938d10dbb987a7f2c3a1db4e7d4b405f Mon Sep 17 00:00:00 2001 From: Casper3667 Date: Mon, 18 Oct 2021 01:44:41 +0200 Subject: [PATCH] adds several new coffee cups (#12627) --- .../loadout/loadout_general.dm | 10 ++++- .../reagent_containers/glass/coffeecup.dm | 40 ++++++++++++++++++ html/changelogs/CoffeeCupsAgain.yml | 6 +++ icons/obj/drink_glasses/coffecup.dmi | Bin 4765 -> 6273 bytes 4 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/CoffeeCupsAgain.yml diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 0519fffe024..ab73e033b33 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -107,8 +107,16 @@ 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 coffeecups["DPRA coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/dpra - coffeecups["sedantis coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/sedantis + coffeecups["Sedantis coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/sedantis + coffeecups["CoC coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/coc + coffeecups["Eridani coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/eridani + coffeecups["Elyra coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/elyra + coffeecups["Hegemony coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hegemony + coffeecups["Jargon coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/jargon 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["TCFL coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tcfl 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 diff --git a/code/modules/reagents/reagent_containers/glass/coffeecup.dm b/code/modules/reagents/reagent_containers/glass/coffeecup.dm index 2b9128a0d21..e11b4c8076f 100644 --- a/code/modules/reagents/reagent_containers/glass/coffeecup.dm +++ b/code/modules/reagents/reagent_containers/glass/coffeecup.dm @@ -58,6 +58,31 @@ desc = "A metal coffee cup bearing the flag of Sedantis." icon_state = "coffeecup_sedantis" +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/coc + name = "\improper CoC coffee cup" + desc = "A metallic coffee cup proudly bearing the flag of the Coalition of Colonies." + icon_state = "coffeecup_coc" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/eridani + name = "\improper Eridani coffee cup" + desc = "An expensive coffee cup bearing the flag of the Eridani Federation." + icon_state = "coffeecup_eridani" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/elyra + name = "\improper Elyra coffee cup" + desc = "A coffee cup bearing the flag of the Republic of Elyra." + icon_state = "coffeecup_elyra" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hegemony + name = "\improper Hegemony coffee cup" + desc = "A coffee cup bearing the flag of the Izweski Hegemony." + icon_state = "coffeecup_hegemony" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/jargon + name = "\improper Jargon coffee cup" + desc = "A purple coffee cup emblazoned with the flag of the Jargon Federation." + icon_state = "coffeecup_jarg" + // Organisations /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt name = "\improper NT coffee cup" @@ -69,6 +94,21 @@ desc = "A coffee cup with the TCFL emblem emblazoned on it." icon_state = "coffeecup_tcfl" +/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." + icon_state = "coffeecup_hepht" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/idris + name = "\improper Idris coffee cup" + desc = "An Idris Incorporated coffee cup." + icon_state = "coffeecup_idris" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/zeng + name = "\improper Zeng-Hu coffee cup" + desc = "A coffee cup bearing the Zeng-Hu logo." + icon_state = "coffeecup_zeng" + // Symbols, markings /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/one name = "#1 coffee cup" diff --git a/html/changelogs/CoffeeCupsAgain.yml b/html/changelogs/CoffeeCupsAgain.yml new file mode 100644 index 00000000000..e78c8b72439 --- /dev/null +++ b/html/changelogs/CoffeeCupsAgain.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf & Bunkyb + +delete-after: True + +changes: + - rscadd: "Added several new coffee cups: CoC, Eridani, Elyra, Hegemony, Jargon, Hepht, Idris & Zeng." diff --git a/icons/obj/drink_glasses/coffecup.dmi b/icons/obj/drink_glasses/coffecup.dmi index 4b45c035ffa71cda8b8a33d897cf50c1e9bb01b1..4b4dc73cd1353f88a743e78b79007d48d44af9c6 100644 GIT binary patch literal 6273 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