diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index c565847c18..6e534e76e8 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1281,8 +1281,19 @@ GLOBAL_LIST_EMPTY(preferences_datums) features["taur"] = "None" if("mam_tail") + // var/datum/gear/gear = GLOB.loadout_items[gear_tab][j] + // var/donoritem + // if(gear.ckeywhitelist && gear.ckeywhitelist.len) + // donoritem = TRUE + // if(!(user.ckey in gear.ckeywhitelist)) + + var/list/snowflake_tails_list = list("Normal" = null) + for(var/path in GLOB.mam_tails_list) + var/datum/sprite_accessory/mam_tails/instance = GLOB.mam_tails_list[path] + if((!instance.ckeys_allowed) || (user.client && instance.ckeys_allowed && instance.ckeys_allowed.len && instance.ckeys_allowed.Find(user.client.ckey))) + snowflake_tails_list[instance.name] = path var/new_tail - new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in GLOB.mam_tails_list + new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in snowflake_tails_list if(new_tail) features["mam_tail"] = new_tail if(new_tail != "None") @@ -1304,8 +1315,13 @@ GLOBAL_LIST_EMPTY(preferences_datums) features["snout"] = new_snout if("mam_ears") + var/list/snowflake_ears_list = list("Normal" = null) + for(var/path in GLOB.mam_ears_list) + var/datum/sprite_accessory/mam_ears/instance = GLOB.mam_ears_list[path] + if((!instance.ckeys_allowed) || (user.ckey in instance.ckeys_allowed)) + snowflake_ears_list[instance.name] = path var/new_ears - new_ears = input(user, "Choose your character's ears:", "Character Preference") as null|anything in GLOB.mam_ears_list + new_ears = input(user, "Choose your character's ears:", "Character Preference") as null|anything in snowflake_ears_list if(new_ears) features["mam_ears"] = new_ears @@ -1352,8 +1368,13 @@ GLOBAL_LIST_EMPTY(preferences_datums) features["body_markings"] = new_body_markings if("mam_body_markings") + var/list/snowflake_markings_list = list("Normal" = null) + for(var/path in GLOB.mam_body_markings_list) + var/datum/sprite_accessory/mam_body_markings/instance = GLOB.mam_body_markings_list[path] + if((!instance.ckeys_allowed) || (user.ckey in instance.ckeys_allowed)) + snowflake_markings_list[instance.name] = path var/new_mam_body_markings - new_mam_body_markings = input(user, "Choose your character's body markings:", "Character Preference") as null|anything in GLOB.mam_body_markings_list + new_mam_body_markings = input(user, "Choose your character's body markings:", "Character Preference") as null|anything in snowflake_markings_list if(new_mam_body_markings) features["mam_body_markings"] = new_mam_body_markings diff --git a/code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm b/code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm index 9d1bc80094..a09c5c30d3 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm @@ -5,7 +5,7 @@ var/extra2 = FALSE var/extra2_icon = 'icons/mob/mam_bodyparts.dmi' var/extra2_color_src = MUTCOLORS3 -// var/list/ckeys_allowed = null + var/list/ckeys_allowed /* tbi eventually idk /datum/sprite_accessory/legs/digitigrade_mam @@ -956,14 +956,14 @@ name = "DataShark" icon_state = "datashark" color_src = 0 -// ckeys_allowed = list("rubyflamewing") + ckeys_allowed = list("rubyflamewing") /datum/sprite_accessory/mam_tails_animated/shark/datashark name = "DataShark" icon_state = "datashark" color_src = 0 -/* + //Till I get my snowflake only ckey lock, these are locked-locked :D /datum/sprite_accessory/mam_ears/sabresune @@ -971,13 +971,14 @@ icon_state = "sabresune" extra = TRUE extra_color_src = MUTCOLORS3 - locked = TRUE + ckeys_allowed = list("Poojawa") /datum/sprite_accessory/mam_tails/sabresune name = "sabresune" icon_state = "sabresune" extra = TRUE - locked = TRUE + ckeys_allowed = list("Poojawa") + /datum/sprite_accessory/mam_tails_animated/sabresune name = "sabresune" @@ -990,5 +991,5 @@ color_src = MUTCOLORS2 extra = FALSE extra2 = FALSE - locked = TRUE -*/ + ckeys_allowed = list("Poojawa") + diff --git a/icons/mob/mam_body_markings.dmi b/icons/mob/mam_body_markings.dmi index be515b3459..728f6fac5e 100644 Binary files a/icons/mob/mam_body_markings.dmi and b/icons/mob/mam_body_markings.dmi differ diff --git a/icons/mob/mam_taur.dmi b/icons/mob/mam_taur.dmi index 8cce485c7a..8cd02f862e 100644 Binary files a/icons/mob/mam_taur.dmi and b/icons/mob/mam_taur.dmi differ