diff --git a/code/modules/client/preference_setup/loadout/items/accessories.dm b/code/modules/client/preference_setup/loadout/items/accessories.dm index 25fb27e6dcb..ef57afa39bc 100644 --- a/code/modules/client/preference_setup/loadout/items/accessories.dm +++ b/code/modules/client/preference_setup/loadout/items/accessories.dm @@ -624,3 +624,19 @@ ABSTRACT_TYPE(/datum/gear/accessory) display_name = "visegradi patterned sweater" path = /obj/item/clothing/accessory/sweater/visegradi flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/accessory/sol_party_pin + display_name = "sol pin selection" + path = /obj/item/clothing/accessory/sol_pin + cost = 1 + +/datum/gear/accessory/sol_party_pin/New() + ..() + var/list/sol_party_pin = list() + sol_party_pin["sol pin"] = /obj/item/clothing/accessory/sol_pin + sol_party_pin["sol first party pin"] = /obj/item/clothing/accessory/sol_pin/sfp + sol_party_pin["sol socialist unity party pin"] = /obj/item/clothing/accessory/sol_pin/ssup + sol_party_pin["sol people's party pin"] = /obj/item/clothing/accessory/sol_pin/spp + sol_party_pin["sol popular democratic party pin"] = /obj/item/clothing/accessory/sol_pin/spdp + sol_party_pin["sol communist party pin"] = /obj/item/clothing/accessory/sol_pin/commie + gear_tweaks += new /datum/gear_tweak/path(sol_party_pin) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 739eb8a40c0..a5e6a270a2c 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -845,6 +845,41 @@ drop_sound = 'sound/items/drop/ring.ogg' pickup_sound = 'sound/items/pickup/ring.ogg' +/obj/item/clothing/accessory/sol_pin/sfp + name = "Sol First Party pin" + desc = "A small pin of the Sol Alliance, shaped like a sun and used to indicate party allegiances." + icon_state = "sfp-pin" + item_state = "sfp-pin" + overlay_state = "sfp-pin" + +/obj/item/clothing/accessory/sol_pin/ssup + name = "Solarian Socialist Unity Party pin" + desc = "A small pin of the Sol Alliance, shaped like a sun and used to indicate party allegiances." + icon_state = "ssup-pin" + item_state = "ssup-pin" + overlay_state = "ssup-pin" + +/obj/item/clothing/accessory/sol_pin/spp + name = "Solarian People's Party pin" + desc = "A small pin of the Sol Alliance, shaped like a sun and used to indicate party allegiances." + icon_state = "spp-pin" + item_state = "spp-pin" + overlay_state = "spp-pin" + +/obj/item/clothing/accessory/sol_pin/spdp + name = "Solarian Popular Democratic Party pin" + desc = "A small pin of the Sol Alliance, shaped like a sun and used to indicate party allegiances." + icon_state = "spdp-pin" + item_state = "spdp-pin" + overlay_state = "spdp-pin" + +/obj/item/clothing/accessory/sol_pin/commie + name = "Communist Party of the Sol Alliance pin" + desc = "A small pin of the Sol Alliance, shaped like a sun and used to indicate party allegiances." + icon_state = "commie-pin" + item_state = "commie-pin" + overlay_state = "commie-pin" + /obj/item/clothing/accessory/dogtags name = "dogtags" desc = "A pair of engraved metal identification tags." diff --git a/html/changelogs/kintsugi-patrioticpins.yml b/html/changelogs/kintsugi-patrioticpins.yml new file mode 100644 index 00000000000..494406165cd --- /dev/null +++ b/html/changelogs/kintsugi-patrioticpins.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Kintsugi + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a number of Sol pins as accessories, indicating either patriotic sentiment to Sol or political party allegiances." diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 67ffa654248..46229371f6f 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index a1dc4635e6a..7a4b8a3fb1a 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ