diff --git a/code/modules/client/preference_setup/loadout/items/accessories.dm b/code/modules/client/preference_setup/loadout/items/accessories.dm index 8b4ea60172c..e15a309b6e6 100644 --- a/code/modules/client/preference_setup/loadout/items/accessories.dm +++ b/code/modules/client/preference_setup/loadout/items/accessories.dm @@ -408,10 +408,7 @@ ABSTRACT_TYPE(/datum/gear/accessory) passcard["passcard, tau ceti"] = /obj/item/clothing/accessory/badge/passcard passcard["passcard, sol"] = /obj/item/clothing/accessory/badge/passcard/sol passcard["passcard, callisto"] = /obj/item/clothing/accessory/badge/passcard/sol/callisto - passcard["passcard, cytherean"] = /obj/item/clothing/accessory/badge/passcard/sol/cytherean passcard["passcard, europa"] = /obj/item/clothing/accessory/badge/passcard/sol/europa - passcard["passcard, jintarian"] = /obj/item/clothing/accessory/badge/passcard/sol/jintarian - passcard["passcard, jovian"] = /obj/item/clothing/accessory/badge/passcard/sol/jupiter passcard["passcard, solarian konyang"] = /obj/item/clothing/accessory/badge/passcard/sol/konyang passcard["passcard, luna"] = /obj/item/clothing/accessory/badge/passcard/sol/luna passcard["passcard, solarian mictlan"] = /obj/item/clothing/accessory/badge/passcard/sol/mictlan diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index 3cd10af4ee9..aacd93caefb 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -55,7 +55,8 @@ /datum/gear/faction/idris_passcard display_name = "idris silversun passcard" - path = /obj/item/clothing/accessory/badge/passcard/sol/silversun + description = "A passcard issued to Idris employees currently or formerly employed on the planet Silversun." + path = /obj/item/clothing/accessory/badge/passcard/sol/silversun/idris slot = slot_tie faction = "Idris Incorporated" diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 2ffe6dc11fd..007690d4853 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -337,14 +337,6 @@ icon_state = "passcard_callisto" item_state = "passcard_callisto" -/obj/item/clothing/accessory/badge/passcard/sol/cytherean - name = "cytherean passcard" - desc = "A passcard issued to citizens of the Alliance of Sovereign Solarian Nations from the Cytherean Venusian cloud-cities." - desc_extended = "The luxuriant Cytherean lifestyle is represented no better than in its identification cards; gaudy, with built-in neon flashing lights and doubling as a business card. The font is infamous for \ - its illegibility." - icon_state = "passcard_cytherean" - item_state = "passcard_cytherean" - /obj/item/clothing/accessory/badge/passcard/sol/europa name = "europan passcard" desc = "A passcard issued to the citizens of the Sovereign Solarian Confederation of Europa." @@ -354,22 +346,6 @@ icon_state = "passcard_europa" item_state = "passcard_europa" -/obj/item/clothing/accessory/badge/passcard/sol/jintarian - name = "jintarian passcard" - desc = "A... 'passcard' manufactured by a Venusian living on the surface of their hostile Solarian world." - desc_extended = "In sharp contrast to the passcards wielded in the skies of their world, the common Jintarian passcard is a cobbled-together mess of a stolen corporate identification card with an ID-strip \ - duct taped to the edge. Traditionally worn by free-runners on the back of their clothing, so that the people in their dust may know who it was that just outpaced them." - icon_state = "passcard_jintarian" - item_state = "passcard_jintarian" - -/obj/item/clothing/accessory/badge/passcard/sol/jupiter - name = "jovian passcard" - desc = "A passcard issued to citizens of Sol Alliance, hailing from Jupiter or its moons." - desc_extended = "Due to its status as a trading hub for the Jewel Worlds of the Sol system, Jovian Solarians are among the most populous type to exist outside Earth proper, numbering in the billions. \ - Originally given out as a celebration of fifty years of Jovian settlement, these passcards have since been introduced as a display of pride in their mutual orbit." - icon_state = "passcard_jovian" - item_state = "passcard_jovian" - /obj/item/clothing/accessory/badge/passcard/sol/konyang name = "konyang passcard" desc = "A passcard issued to inhabitants of Konyang who still claim citizenship with the Solarian Alliance." @@ -455,7 +431,7 @@ item_state = "passcard_sanktfrederick" /obj/item/clothing/accessory/badge/passcard/sol/silversun - name = "silversun commemorative passcard" + name = "silversun passcard" desc = "A passcard issued to citizens of the Sovereign Solarian Republic of Silversun." desc_extended = "This identification document is a standardized form adopted across the Alliance. \ Encrypted with detailed personal and biometric information, these cards verify identity and citizenship. \ @@ -464,6 +440,14 @@ icon_state = "passcard_silversun" item_state = "passcard_silversun" +/obj/item/clothing/accessory/badge/passcard/sol/silversun/idris + name = "silversun commemorative passcard" + desc = "A passcard issued to Idris employees currently or formerly employed or residing on the planet Silversun." + desc_extended = "While Silversun itself is a member of the Sol Alliance, Idris Incorporated has secured a number of obscure patents, permits, and bureaucratic channels that allows them to commemorate \ + faithful employees from the resort world with unique passcards that double as membership cards to some of the cheaper resorts on-world." + icon_state = "passcard_silversun_alt" + item_state = "passcard_silversun_alt" + /obj/item/clothing/accessory/badge/passcard/sol/venus name = "venus passcard" desc = "A passcard issued to the citizens of the Sovereign Solarian Republic of Venus." diff --git a/html/changelogs/HanSolo1519_passcard_fix.yml b/html/changelogs/HanSolo1519_passcard_fix.yml new file mode 100644 index 00000000000..2792bdfe531 --- /dev/null +++ b/html/changelogs/HanSolo1519_passcard_fix.yml @@ -0,0 +1,60 @@ +################################ +# 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: HanSolo1519 + +# 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: + - bugfix: "Fixed solarian passcard offset, courtesy of the_ill_fated" + - rscadd: "Re-added silversun commemorative passcard, found in the factions loadout list for Idris employees." + - rscdel: "Removed outdated/redundant Jintarian, Cytherian and Jovian passcards." diff --git a/icons/obj/item/clothing/accessory/passcards.dmi b/icons/obj/item/clothing/accessory/passcards.dmi index 20c8af69d73..6bed5ab61b2 100644 Binary files a/icons/obj/item/clothing/accessory/passcards.dmi and b/icons/obj/item/clothing/accessory/passcards.dmi differ