diff --git a/code/modules/client/preference_setup/loadout/items/xeno/diona.dm b/code/modules/client/preference_setup/loadout/items/xeno/diona.dm index 629347e1fd0..808880d7943 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/diona.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/diona.dm @@ -127,8 +127,10 @@ whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Diona" culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/xrim) + /datum/gear/accessory/diona abstract_type = /datum/gear/accessory/diona + /datum/gear/accessory/diona/skrell_passport display_name = "dionae nralakk federation passport" path = /obj/item/clothing/accessory/badge/passport/nralakk @@ -138,6 +140,10 @@ flags = GEAR_NO_SELECTION culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/xrim) +/datum/gear/accessory/diona/skrell_passport/New() + . = ..() + gear_tweaks += list(social_credit_tweak) + /datum/gear/accessory/diona/skrell_passport/check_species_whitelist(mob/living/carbon/human/H) var/static/list/species_list = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) if(H.species.name in species_list) diff --git a/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm b/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm index a8bdcca5f21..707d282b322 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm @@ -257,7 +257,7 @@ var/datum/gear_tweak/social_credit/social_credit_tweak = new() return 5 /datum/gear_tweak/social_credit/get_metadata(var/user, var/metadata) - var/credit_score = tgui_input_number(user, "Set the credit score your passport will display, refer to the wiki to gauge it. (It will be slightly randomized to simulate Nralakk calculations.)", "Social Credit Score", round_value = FALSE) + var/credit_score = tgui_input_number(user, "Set the credit score your passport will display, refer to the wiki to gauge it. (It will be slightly randomized to simulate Nralakk calculations.)", "Social Credit Score", round_value = FALSE, max_value = 10) if(credit_score) return round(credit_score, 0.01) return metadata diff --git a/html/changelogs/SimpleMaroon-dionapassportfix.yml b/html/changelogs/SimpleMaroon-dionapassportfix.yml new file mode 100644 index 00000000000..d47dd529ad8 --- /dev/null +++ b/html/changelogs/SimpleMaroon-dionapassportfix.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: 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, 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 the Skrell Federation passport, and the Diona Federation passport by extension, allowing values above 10 for the Social Credit Score." + - bugfix: "Fixed the Diona Federation passport not letting you select your Social Credit Score." + - bugfix: "Fixed the Diona Gla'orr accent having too light of a yellow coloration, making it difficult to tell apart from the white from afar." diff --git a/icons/accent_tags.dmi b/icons/accent_tags.dmi index b88ddefcae8..f37df2e7e49 100644 Binary files a/icons/accent_tags.dmi and b/icons/accent_tags.dmi differ