diff --git a/code/modules/client/preference_setup/loadout/items/accessories.dm b/code/modules/client/preference_setup/loadout/items/accessories.dm index eca248d4958..6754a318b16 100644 --- a/code/modules/client/preference_setup/loadout/items/accessories.dm +++ b/code/modules/client/preference_setup/loadout/items/accessories.dm @@ -622,6 +622,7 @@ flagpatch_national["flagpatch, free council"] = /obj/item/clothing/accessory/flagpatch/freecouncil flagpatch_national["flagpatch, nralakk"] = /obj/item/clothing/accessory/flagpatch/nralakk flagpatch_national["flagpatch, hegemony"] = /obj/item/clothing/accessory/flagpatch/hegemony + flagpatch_national["flagpatch, port antillia"] = /obj/item/clothing/accessory/flagpatch/portantillia gear_tweaks += new /datum/gear_tweak/path(flagpatch_national) /datum/gear/accessory/aodai diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 809919549a9..bb7c26cfe23 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -86,6 +86,7 @@ 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["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["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 diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index 40694af8426..c4a6f97fd0d 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -679,6 +679,13 @@ icon_state = "flagpatch_hegemony" item_state = "flagpatch_hegemony" +/obj/item/clothing/accessory/flagpatch/portantillia + name = "port antillia flagpatch" + desc = "A patch bearing the flag of the Union of Port Antillia. Often associated with veterans of the \ + Antillian Provincial Naval Fleets, these patches are a mark of resilience through hard times on the planet." + icon_state = "flagpatch_portantillia" + item_state = "flagpatch_portantillia" + // Wildlands /obj/item/clothing/accessory/flagpatch/fsf diff --git a/code/modules/reagents/reagent_containers/glass/coffeecup.dm b/code/modules/reagents/reagent_containers/glass/coffeecup.dm index 0a19289e30e..21780cb9f6d 100644 --- a/code/modules/reagents/reagent_containers/glass/coffeecup.dm +++ b/code/modules/reagents/reagent_containers/glass/coffeecup.dm @@ -89,6 +89,11 @@ desc = "A tricolor coffee cup bearing the flag of Europa." icon_state = "coffeecup_europa" +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/portantillia + name = "\improper Port Antillia coffee cup" + 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/nt name = "\improper NT coffee cup" diff --git a/html/changelogs/SimpleMaroon-vivapuertoantillia.yml b/html/changelogs/SimpleMaroon-vivapuertoantillia.yml new file mode 100644 index 00000000000..21cb9fb1c31 --- /dev/null +++ b/html/changelogs/SimpleMaroon-vivapuertoantillia.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: SimpleMaroon + +# 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 a flagpatch and coffee cup for Port Antillia." diff --git a/icons/clothing/kit/modular_armor_accessories.dmi b/icons/clothing/kit/modular_armor_accessories.dmi index 791b86898f9..a21ea64f183 100644 Binary files a/icons/clothing/kit/modular_armor_accessories.dmi and b/icons/clothing/kit/modular_armor_accessories.dmi differ diff --git a/icons/obj/drink_glasses/coffecup.dmi b/icons/obj/drink_glasses/coffecup.dmi index 5cebeab17f4..171d03035ec 100644 Binary files a/icons/obj/drink_glasses/coffecup.dmi and b/icons/obj/drink_glasses/coffecup.dmi differ