diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 61e1f137074..6bbe50ae58f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -495,4 +495,50 @@ /datum/gear/accessory/bandanna_colorable display_name = "neck bandanna (colorable)" path = /obj/item/clothing/accessory/bandanna/colorable - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION \ No newline at end of file + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/accessory/flagpatch_colorable + display_name = "generic flagpatch" + path = /obj/item/clothing/accessory/flagpatch + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + cost = 0 + + +/datum/gear/accessory/flagpatch_national + display_name = "flagpatch selection" + path = /obj/item/clothing/accessory/flagpatch/biesel + cost = 0 + +/datum/gear/accessory/flagpatch_national/New() + ..() + var/list/flagpatch_national = list() + flagpatch_national["flagpatch, biesel"] = /obj/item/clothing/accessory/flagpatch/biesel + flagpatch_national["flagpatch, mictlan"] = /obj/item/clothing/accessory/flagpatch/mictlan + flagpatch_national["flagpatch, new gibson"] = /obj/item/clothing/accessory/flagpatch/newgibson + flagpatch_national["flagpatch, valkyrie"] = /obj/item/clothing/accessory/flagpatch/valkyrie + flagpatch_national["flagpatch, sol"] = /obj/item/clothing/accessory/flagpatch/sol + flagpatch_national["flagpatch, mars"] = /obj/item/clothing/accessory/flagpatch/mars + flagpatch_national["flagpatch, gus"] = /obj/item/clothing/accessory/flagpatch/gus + flagpatch_national["flagpatch, eridani"] = /obj/item/clothing/accessory/flagpatch/eridani + flagpatch_national["flagpatch, europa"] = /obj/item/clothing/accessory/flagpatch/europa + flagpatch_national["flagpatch, new hai phong"] = /obj/item/clothing/accessory/flagpatch/newhaiphong + flagpatch_national["flagpatch, pluto"] = /obj/item/clothing/accessory/flagpatch/pluto + flagpatch_national["flagpatch, visegrad"] = /obj/item/clothing/accessory/flagpatch/visegrad + flagpatch_national["flagpatch, silversun"] = /obj/item/clothing/accessory/flagpatch/silversun + flagpatch_national["flagpatch, callisto"] = /obj/item/clothing/accessory/flagpatch/callisto + flagpatch_national["flagpatch, konyang"] = /obj/item/clothing/accessory/flagpatch/konyang + flagpatch_national["flagpatch, elyra"] = /obj/item/clothing/accessory/flagpatch/elyra + flagpatch_national["flagpatch, coalition"] = /obj/item/clothing/accessory/flagpatch/coalition + flagpatch_national["flagpatch, himeo"] = /obj/item/clothing/accessory/flagpatch/himeo + flagpatch_national["flagpatch, vysoka"] = /obj/item/clothing/accessory/flagpatch/vysoka + flagpatch_national["flagpatch, gadpathur"] = /obj/item/clothing/accessory/flagpatch/gadpathur + flagpatch_national["flagpatch, assunzione"] = /obj/item/clothing/accessory/flagpatch/assunzione + flagpatch_national["flagpatch, dominia"] = /obj/item/clothing/accessory/flagpatch/dominia + flagpatch_national["flagpatch, fisanduh"] = /obj/item/clothing/accessory/flagpatch/fisanduh + flagpatch_national["flagpatch, pra"] = /obj/item/clothing/accessory/flagpatch/pra + flagpatch_national["flagpatch, dpra"] = /obj/item/clothing/accessory/flagpatch/dpra + flagpatch_national["flagpatch, nka"] = /obj/item/clothing/accessory/flagpatch/nka + flagpatch_national["flagpatch, free council"] = /obj/item/clothing/accessory/flagpatch/freecouncil + flagpatch_national["flagpatch, jargon"] = /obj/item/clothing/accessory/flagpatch/jargon + flagpatch_national["flagpatch, hegemony"] = /obj/item/clothing/accessory/flagpatch/hegemony + gear_tweaks += new /datum/gear_tweak/path(flagpatch_national) \ No newline at end of file diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index 376fa70847e..9595872ef62 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -222,16 +222,6 @@ slot = ACCESSORY_SLOT_ARMOR_POCKETS flippable = FALSE -/obj/item/clothing/accessory/sec_commander_stripes - name = "head of security stripes" - desc = "A set of high visibility inserts for use in armour. This one declares the wearer as a Head of Security." - icon = 'icons/clothing/kit/modular_armor_accessories.dmi' - icon_state = "sec_commander_stripes" - item_state = "sec_commander_stripes" - contained_sprite = TRUE - slot = ACCESSORY_SLOT_GENERIC - flippable = FALSE - /obj/item/clothing/accessory/armor_plate/heavy/sec name = "heavy corporate armor plate" desc = "A heavy and stylish armor plate with blue highlights. That prevents teamkills, right?" @@ -288,3 +278,225 @@ bomb = ARMOR_BOMB_PADDED, ) + +//Cosmetic Accessories + +/obj/item/clothing/accessory/sec_commander_stripes + name = "head of security stripes" + desc = "A set of high visibility inserts for use in armour. This one declares the wearer as a Head of Security." + icon = 'icons/clothing/kit/modular_armor_accessories.dmi' + icon_state = "sec_commander_stripes" + item_state = "sec_commander_stripes" + contained_sprite = TRUE + slot = ACCESSORY_SLOT_GENERIC + flippable = FALSE + +/obj/item/clothing/accessory/flagpatch + name = "flagpatch" + desc = "A simple strip of fabric attached to a vest or helmet typically used to denote the wearer's \ + organization or nationality." + icon = 'icons/clothing/kit/modular_armor_accessories.dmi' + icon_state = "flagpatch_colorable" + item_state = "flagpatch_colorable" + contained_sprite = TRUE + slot = ACCESSORY_SLOT_GENERIC + flippable = FALSE + +/obj/item/clothing/accessory/flagpatch/biesel + name = "republic of biesel flagpatch" + desc = "A flagpatch representing the Republic of Biesel. A common sight in the CRZ, they became incredibly popular \ + after the formation of the Tau Ceti Foreign Legion as a cheap way to quickly identify people and equipment as belonging \ + to the organization." + icon_state = "flagpatch_biesel" + item_state = "flagpatch_biesel" + +/obj/item/clothing/accessory/flagpatch/valkyrie + name = "valkyrie flagpatch" + desc = "A flagpatch representing te Commonwealth of Valkyrie. Regarded as the gate to Tau Ceti, just as many foreigners as Valkyrians can be found wearing these patches." + icon_state = "flagpatch_valkyrie" + item_state = "flagpatch_valkyrie" + +/obj/item/clothing/accessory/flagpatch/mictlan + name = "mictlan flagpatch" + desc = "A flagpatch representing Mictlan. These patches are not commonly worn as they are viewed as a flag imposed by a colonial government." + icon_state = "flagpatch_mictlan" + item_state = "flagpatch_mictlan" + +/obj/item/clothing/accessory/flagpatch/newgibson + name = "new gibson flagpatch" + desc = "A flagpatch representing New Gibson. With the need for quick identification in the tunnels of the planet, these patches are often printed in reflective colors to be seen more \ + clearly." + icon_state = "flagpatch_newgibson" + item_state = "flagpatch_newgibson" + +/obj/item/clothing/accessory/flagpatch/sol + name = "sol alliance flagpatch" + desc = "A flagpatch representing the Alliance of Sovereign Solarian Nations. Until the collapse of Sol, this flag used to represent the greatest collection of people within the Spur and many \ + still wear it in hope for a return to the glory days of the past." + icon_state = "flagpatch_sol" + item_state = "flagpatch_sol" + +/obj/item/clothing/accessory/flagpatch/mars + name = "mars flagpatch" + desc = "A flagpatch representing the Provisional Government of Mars. The flag itself is wildly polarizing, with some viewing it as siding with those who destroyed the Martian people, \ + while others view it as the only choice left to save the planet." + icon_state = "flagpatch_mars" + item_state = "flagpatch_mars" + +/obj/item/clothing/accessory/flagpatch/gus + name = "/improper GUS! flagpatch" + desc = "A flagpatch with the face of Gus Maldarth, a famous Martian whistleblower who exposed the Solarian government abuses in the \ + phoron crisis. After his assassination, 'Justice for Gus!' became a rallying cry for anti-Sol protests on the red planet." + icon_state = "flagpatch_gus" + item_state = "flagpatch_gus" + +/obj/item/clothing/accessory/flagpatch/eridani + name = "eridani corporate federation flagpatch" + desc = "A flagpatch representing the Eridani Corporate Federation. These patches are often incredibly and usually overly resistant to corrosion as a consequence of the toxic atmosphere, \ + not that this has stopped resourceful dregs from desecrating those they can get their hands on." + icon_state = "flagpatch_eridani" + item_state = "flagpatch_eridani" + +/obj/item/clothing/accessory/flagpatch/europa + name = "europa flagpatch" + desc = "A flagpatch representing Europa. It is a common tradition that no one can place the origin of to make these patches out of waterproof fabric then carry \ + them on a dive before displaying them on one's clothes in order to gain good luck." + icon_state = "flagpatch_europa" + item_state = "flagpatch_europa" + +/obj/item/clothing/accessory/flagpatch/newhaiphong + name = "new hai phong flagpatch" + desc = "A flagpatch representing New Hai Phong. With the haggling culture of the planet, the price of these patches can range from free to a thousand credits." + icon_state = "flagpatch_newhaiphong" + item_state = "flagpatch_newhaiphong" + +/obj/item/clothing/accessory/flagpatch/pluto + name = "pluto flagpatch" + desc = "A flagpatch representing Pluto. As loyalty to the party is very important on the communist planet, \ + these patches have become a popular way for Plutonians to display their affiliation with their home." + icon_state = "flagpatch_pluto" + item_state = "flagpatch_pluto" + +/obj/item/clothing/accessory/flagpatch/visegrad + name = "visegrad flagpatch" + desc = "A flagpatch representing Visegrad. You swear you saw this in a trial on the main Solarian news network once." + icon_state = "flagpatch_visegrad" + item_state = "flagpatch_visegrad" + +/obj/item/clothing/accessory/flagpatch/silversun + name = "silversun flagpatch" + desc = "A flagpatch representing Silversun. As Silversun Expatriates are often more loyal to Idris, most wearers of these patches are Originals." + icon_state = "flagpatch_silversun" + item_state = "flagpatch_silversun" + +/obj/item/clothing/accessory/flagpatch/callisto + name = "callisto flagpatch" + desc = "A flagpatch representing the Commonwealth of Callisto for you to like put on your like coat or vest. From the loving detail and choice materials used \ + it is clear that the moon garners a lot of respect from its inhabitants." + icon_state = "flagpatch_callisto" + item_state = "flagpatch_callisto" + +/obj/item/clothing/accessory/flagpatch/coalition + name = "coalition flagpatch" + desc = "A flagpatch representing the Coalition of Colonies. Although used on many Coalition worlds, this flag has also come \ + to represent the Xanu Free League, the capital of the Coalition, in particular." + icon_state = "flagpatch_coalition" + item_state = "flagpatch_coalition" + +/obj/item/clothing/accessory/flagpatch/elyra + name = "elyran flagpatch" + desc = "A flagpatch representing the Serene Republic of Elyra. Although uncommon out of their space, some Elyrans have adopted \ + holographic patches made of hardlight to make their affiliation clear no matter the conditions." + icon_state = "flagpatch_elyra" + item_state = "flagpatch_elyra" + +/obj/item/clothing/accessory/flagpatch/konyang + name = "konyang flagpatch" + desc = "A flagpatch representing Konyang. In the wake of their independence, patches like these became very popular \ + across the planet, oftentimes accompanied by the burning of Solarian counterparts." + icon_state = "flagpatch_konyang" + item_state = "flagpatch_konyang" + +/obj/item/clothing/accessory/flagpatch/himeo + name = "himeo flagpatch" + desc = "A flagpatch representing the United Syndicates of Himeo. For an offworld Himean, it is often not \ + enough to wear the patch of the nation, but often times, many Himeans carry something indicating the specific \ + syndicate they belong to." + icon_state = "flagpatch_himeo" + item_state = "flagpatch_himeo" + +/obj/item/clothing/accessory/flagpatch/vysoka + name = "vysoka flagpatch" + desc = "A flagpatch from Vysoka. Commonly used in addition to the symbology of one's host or home city, \ + but typically only while offworld." + icon_state = "flagpatch_vysoka" + item_state = "flagpatch_vysoka" + +/obj/item/clothing/accessory/flagpatch/gadpathur + name = "gadpathur flagpatch" + desc = "A flagpatch representing the United Planetary Defense Council of Gadpathur. Wearing a cadre patch square on the \ + center of one's chest is often frowned upon as it is viewed as a way of placing group above country." + icon_state = "flagpatch_gadpathur" + item_state = "flagpatch_gadpathur" + +/obj/item/clothing/accessory/flagpatch/assunzione + name = "assunzione flagpatch" + desc = "A flagpatch representing the Republic of Assunzione. In keeping with their culture's love of light, \ + many of these patches are often inlaid with vine when concealment is not an issue to the wearer." + icon_state = "flagpatch_assunzione" + item_state = "flagpatch_assunzione" + +/obj/item/clothing/accessory/flagpatch/dominia + name = "dominia flagpatch" + desc = "A flagpatch bearing the standard of House Keeser, representing the Empire of Dominia. As most imperial \ + forces have sigils engraved on their armor instead, accessories like these are usually privately commissioned." + icon_state = "flagpatch_dominia" + item_state = "flagpatch_dominia" + +/obj/item/clothing/accessory/flagpatch/fisanduh + name = "fisanduh flagpatch" + desc = "A flagpatch representing the Confederated States of Fisanduh. As Fisanduh is also known as the Imperial Occupied Territory \ + of Fisanduh, possessing items like these is a major offense and is swiftly and harsly punished." + icon_state = "flagpatch_fisanduh" + item_state = "flagpatch_fisanduh" + +/obj/item/clothing/accessory/flagpatch/jargon + name = "jargon flagpatch" + desc = "A flagpatch represeting the Jargon Federation. The free use of these patches is a contentuous issue back home as \ + there is a fear that their wearers may misrepresent the nation." + icon_state = "flagpatch_jargon" + item_state = "flagpatch_jargon" + +/obj/item/clothing/accessory/flagpatch/pra + name = "pra flagpatch" + desc = "A flagpatch representing the People's Republic of Adhomai. As tajara abroad find themselves increasingly exposed \ + to human equipment, these patches have found themselves mass-produced by state-run corporations." + icon_state = "flagpatch_pra" + item_state = "flagpatch_pra" + +/obj/item/clothing/accessory/flagpatch/dpra + name = "dpra flagpatch" + desc = "A flagpatch representing the Democratic People's Republic of Adhomai. The craftsmanship appears \ + excellent despite the materials appearing rudimentary." + icon_state = "flagpatch_dpra" + item_state = "flagpatch_dpra" + +/obj/item/clothing/accessory/flagpatch/nka + name = "nka flagpatch" + desc = "A flagpatch representing the New Kingdom of Adhomai. In an attempt to proudly display their allegiance to \ + the monarchist state, these insignias are often marketed and cheaply sold to NKA tajara going abroad." + icon_state = "flagpatch_nka" + item_state = "flagpatch_nka" + +/obj/item/clothing/accessory/flagpatch/freecouncil + name = "free council flagpatch" + desc = "A patch bearing the flag of the Free Tajaran Council, imported straight from Himeo." + icon_state = "flagpatch_freecouncil" + item_state = "flagpatch_freecouncil" + +/obj/item/clothing/accessory/flagpatch/hegemony + name = "hegemony flagpatch" + desc = "A patch bearing the flag of the Izweski Hegemony. It is high-quality and appears to have the \ + insignia of a well known unathi drapers' guild stitched on the back." + icon_state = "flagpatch_hegemony" + item_state = "flagpatch_hegemony" diff --git a/html/changelogs/flagpatch-pr.yml b/html/changelogs/flagpatch-pr.yml new file mode 100644 index 00000000000..5417a7b67a7 --- /dev/null +++ b/html/changelogs/flagpatch-pr.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: Stryker + +# 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: "Adds a flagpatch selection and colorable flagpatches to the accessories tab." \ No newline at end of file diff --git a/icons/clothing/kit/modular_armor_accessories.dmi b/icons/clothing/kit/modular_armor_accessories.dmi index bd33e202cc4..109377b748e 100644 Binary files a/icons/clothing/kit/modular_armor_accessories.dmi and b/icons/clothing/kit/modular_armor_accessories.dmi differ