diff --git a/code/__DEFINES/~doppler_defines/mutant_variations.dm b/code/__DEFINES/~doppler_defines/mutant_variations.dm index 3abce437e6910..bf37e6d6dc00a 100644 --- a/code/__DEFINES/~doppler_defines/mutant_variations.dm +++ b/code/__DEFINES/~doppler_defines/mutant_variations.dm @@ -14,7 +14,6 @@ #define BUG "bug" #define SYNTHETIC "synthetic" #define HUMANOID "humanoid" -#define RAMATAN "ramatan" /// This list gets read by the dropdown pref when a player chooses what type of sprite accessory to access GLOBAL_LIST_INIT(mutant_variations, list( @@ -31,7 +30,6 @@ GLOBAL_LIST_INIT(mutant_variations, list( MONKEY, MOUSE, SYNTHETIC, - RAMATAN, )) /// This list gets read by the animalistic preference for genemod and anthros diff --git a/code/~doppler_earliest_defines.dm b/code/~doppler_earliest_defines.dm index b4bf1e2571992..fba03bd3ef6fe 100644 --- a/code/~doppler_earliest_defines.dm +++ b/code/~doppler_earliest_defines.dm @@ -172,11 +172,6 @@ name = DOPPLER_SPRITE_ACCESSORY_NOTAIL icon_state = /datum/sprite_accessory/tails/none::icon_state -/datum/sprite_accessory/tails/ramatan/none - icon = /datum/sprite_accessory/tails/none::icon - name = DOPPLER_SPRITE_ACCESSORY_NOTAIL - icon_state = /datum/sprite_accessory/tails/none::icon_state - /// Lizard exclusive 🦎 /datum/sprite_accessory/snouts/none icon = 'modular_doppler/modular_customization/accessories/code/~overrides/icons/fallbacks.dmi' diff --git a/modular_doppler/modular_customization/accessories/code/lizard_accessories/lizard_tail.dm b/modular_doppler/modular_customization/accessories/code/lizard_accessories/lizard_tail.dm index f638278203df5..ed35380cdbc9c 100644 --- a/modular_doppler/modular_customization/accessories/code/lizard_accessories/lizard_tail.dm +++ b/modular_doppler/modular_customization/accessories/code/lizard_accessories/lizard_tail.dm @@ -25,7 +25,6 @@ name = "Rattlesnake" icon_state = "rattlesnake" - /datum/sprite_accessory/tails/lizard/big icon = 'modular_doppler/modular_customization/accessories/icons/lizard/lizard_tail_big.dmi' name = "Shadekin (Big)" diff --git a/modular_doppler/modular_customization/accessories/code/ramatan_accessories/ramatan_ears.dm b/modular_doppler/modular_customization/accessories/code/ramatan_accessories/ramatan_ears.dm index dfbe87c85e62e..266e953c27252 100644 --- a/modular_doppler/modular_customization/accessories/code/ramatan_accessories/ramatan_ears.dm +++ b/modular_doppler/modular_customization/accessories/code/ramatan_accessories/ramatan_ears.dm @@ -1,30 +1,29 @@ -/datum/sprite_accessory/ears_more/ramatan - icon = 'modular_doppler/modular_customization/accessories/icons/ramatan/ramatan_ears.dmi' -/datum/sprite_accessory/ears_more/ramatan/standard +/datum/sprite_accessory/ears_more/lizard/ramatan name = "Ramatan" icon_state = "ramatan_standard" + icon = 'modular_doppler/modular_customization/accessories/icons/ramatan/ramatan_ears.dmi' -/datum/sprite_accessory/ears_more/ramatan/tall +/datum/sprite_accessory/ears_more/lizard/ramatan/tall name = "Ramatan Tall" icon_state = "ramatan_tall" -/datum/sprite_accessory/ears_more/ramatan/sharp +/datum/sprite_accessory/ears_more/lizard/ramatan/sharp name = "Ramatan Sharp" icon_state = "ramatan_sharp" -/datum/sprite_accessory/ears_more/ramatan/forward +/datum/sprite_accessory/ears_more/lizard/ramatan/forward name = "Ramatan Droopy" icon_state = "ramatan_forward" -/datum/sprite_accessory/ears_more/ramatan/flopped +/datum/sprite_accessory/ears_more/lizard/ramatan/flopped name = "Ramatan Long Flop" icon_state = "ramatan_flopped" -/datum/sprite_accessory/ears_more/ramatan/fluffy +/datum/sprite_accessory/ears_more/lizard/ramatan/fluffy name = "Ramatan Fluffy" icon_state = "ramatan_fluffy" -/datum/sprite_accessory/ears_more/ramatan/short +/datum/sprite_accessory/ears_more/lizard/ramatan/short name = "Ramatan Short" icon_state = "ramatan_short" diff --git a/modular_doppler/modular_customization/accessories/code/ramatan_accessories/ramatan_tail.dm b/modular_doppler/modular_customization/accessories/code/ramatan_accessories/ramatan_tail.dm index 24f667d7ba69f..5bb90d7432b99 100644 --- a/modular_doppler/modular_customization/accessories/code/ramatan_accessories/ramatan_tail.dm +++ b/modular_doppler/modular_customization/accessories/code/ramatan_accessories/ramatan_tail.dm @@ -1,10 +1,8 @@ -/datum/sprite_accessory/tails/ramatan - icon = 'modular_doppler/modular_customization/accessories/icons/ramatan/ramatan_tail.dmi' - -/datum/sprite_accessory/tails/ramatan/standard +/datum/sprite_accessory/tails/lizard/ramatan name = "Ramatan" icon_state = "ramatan_std" + icon = 'modular_doppler/modular_customization/accessories/icons/ramatan/ramatan_tail.dmi' -/datum/sprite_accessory/tails/ramatan/thick +/datum/sprite_accessory/tails/lizard/ramatan/thick name = "Ramatan Thick" icon_state = "ramatan_thick" diff --git a/modular_doppler/modular_customization/organs/external/tail.dm b/modular_doppler/modular_customization/organs/external/tail.dm index d377f30f9b78c..527b2854f4c83 100644 --- a/modular_doppler/modular_customization/organs/external/tail.dm +++ b/modular_doppler/modular_customization/organs/external/tail.dm @@ -199,16 +199,3 @@ /datum/bodypart_overlay/mutant/tail/humanoid/get_global_feature_list() return SSaccessories.tails_list_humanoid - -/// Ramatan tail -// -/obj/item/organ/external/tail/ramatan - preference = "feature_ramatan_tail" - dna_block = null - bodypart_overlay = /datum/bodypart_overlay/mutant/tail/ramatan - -/datum/bodypart_overlay/mutant/tail/ramatan - feature_key = "tail_other" - -/datum/bodypart_overlay/mutant/tail/ramatan/get_global_feature_list() - return SSaccessories.tails_list_ramatan diff --git a/modular_doppler/modular_customization/organs/internal/ears.dm b/modular_doppler/modular_customization/organs/internal/ears.dm index 1cd046eb67013..70b2a2e1153a8 100644 --- a/modular_doppler/modular_customization/organs/internal/ears.dm +++ b/modular_doppler/modular_customization/organs/internal/ears.dm @@ -113,14 +113,3 @@ /datum/bodypart_overlay/mutant/ears/synthetic_ears/get_global_feature_list() return SSaccessories.ears_list_synthetic - -/// Ramatan ears -// -/obj/item/organ/internal/ears/ramatan - preference = "feature_ramatan_ears" - bodypart_overlay = /datum/bodypart_overlay/mutant/ears/ramatan_ears - -/datum/bodypart_overlay/mutant/ears/ramatan_ears/get_global_feature_list() - return SSaccessories.ears_list_ramatan - - diff --git a/modular_doppler/modular_customization/preferences/ears.dm b/modular_doppler/modular_customization/preferences/ears.dm index 3ce07d635a2a3..144eeb309b53e 100644 --- a/modular_doppler/modular_customization/preferences/ears.dm +++ b/modular_doppler/modular_customization/preferences/ears.dm @@ -456,35 +456,6 @@ var/datum/sprite_accessory/chosen_ears = SSaccessories.ears_list_synthetic[value] return generate_ears_icon(chosen_ears) -// Ramatan -/datum/preference/choiced/ramatan_ears - savefile_key = "feature_ramatan_ears" - savefile_identifier = PREFERENCE_CHARACTER - category = PREFERENCE_CATEGORY_CLOTHING - relevant_external_organ = null - should_generate_icons = TRUE - main_feature_name = "Ears" - -/datum/preference/choiced/ramatan_ears/init_possible_values() - return assoc_to_keys_features(SSaccessories.ears_list_ramatan) - -/datum/preference/choiced/ramatan_ears/is_accessible(datum/preferences/preferences) - . = ..() - var/chosen_variation = preferences.read_preference(/datum/preference/choiced/ear_variation) - if(chosen_variation == RAMATAN) - return TRUE - return FALSE - -/datum/preference/choiced/ramatan_ears/create_default_value() - return /datum/sprite_accessory/ears_more/ramatan/none::name - -/datum/preference/choiced/ramatan_ears/apply_to_human(mob/living/carbon/human/target, value) - if(target.dna.ear_type == RAMATAN) - target.dna.features["ears"] = value - -/datum/preference/choiced/ramatan_ears/icon_for(value) - var/datum/sprite_accessory/chosen_ears = SSaccessories.ears_list_ramatan[value] - return generate_ears_icon(chosen_ears) /// Proc to gen that icon // We don't wanna copy paste this diff --git a/modular_doppler/modular_customization/preferences/tail.dm b/modular_doppler/modular_customization/preferences/tail.dm index 5cc91a7006922..68acee2e39ffe 100644 --- a/modular_doppler/modular_customization/preferences/tail.dm +++ b/modular_doppler/modular_customization/preferences/tail.dm @@ -24,7 +24,6 @@ tails_list_bug = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/bug)["default_sprites"] tails_list_synth = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/synthetic)["default_sprites"] tails_list_humanoid = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/humanoid)["default_sprites"] - tails_list_ramatan = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/ramatan)["default_sprites"] /datum/dna /// This variable is read by the regenerate_organs() proc to know what organ subtype to give @@ -476,35 +475,6 @@ var/datum/sprite_accessory/chosen_tail = SSaccessories.tails_list_humanoid[value] return generate_back_icon(chosen_tail, "tail") -// Ramatan -/datum/preference/choiced/ramatan_tail - savefile_key = "feature_ramatan_tail" - savefile_identifier = PREFERENCE_CHARACTER - category = PREFERENCE_CATEGORY_CLOTHING - relevant_external_organ = null - should_generate_icons = TRUE - main_feature_name = "Tail" - -/datum/preference/choiced/ramatan_tail/init_possible_values() - return assoc_to_keys_features(SSaccessories.tails_list_ramatan) - -/datum/preference/choiced/ramatan_tail/is_accessible(datum/preferences/preferences) - . = ..() - var/chosen_variation = preferences.read_preference(/datum/preference/choiced/tail_variation) - if(chosen_variation == RAMATAN) - return TRUE - return FALSE - -/datum/preference/choiced/ramatan_tail/create_default_value() - return /datum/sprite_accessory/tails/ramatan/none::name - -/datum/preference/choiced/ramatan_tail/apply_to_human(mob/living/carbon/human/target, value) - if(target.dna.tail_type == RAMATAN) - target.dna.features["tail_other"] = value - -/datum/preference/choiced/ramatan_tail/icon_for(value) - var/datum/sprite_accessory/chosen_tail = SSaccessories.tails_list_ramatan[value] - return generate_back_icon(chosen_tail, "tail") #define WIDTH_WINGS_FILE 45 #define HEIGHT_WINGS_FILE 34 diff --git a/modular_doppler/modular_customization/tri_color/ears.dm b/modular_doppler/modular_customization/tri_color/ears.dm index 7f28a8462a197..4cda12643b892 100644 --- a/modular_doppler/modular_customization/tri_color/ears.dm +++ b/modular_doppler/modular_customization/tri_color/ears.dm @@ -64,11 +64,6 @@ data[SUPPLEMENTAL_FEATURE_KEY] = /datum/preference/tri_color/ears_color::savefile_key return data -/datum/preference/choiced/ramatan_ears/compile_constant_data() - var/list/data = ..() - data[SUPPLEMENTAL_FEATURE_KEY] = /datum/preference/tri_color/ears_color::savefile_key - return data - /// Ears colors! /datum/preference/tri_color/ears_color diff --git a/modular_doppler/modular_customization/tri_color/tail.dm b/modular_doppler/modular_customization/tri_color/tail.dm index 7482365ac5a14..42052b60ba59b 100644 --- a/modular_doppler/modular_customization/tri_color/tail.dm +++ b/modular_doppler/modular_customization/tri_color/tail.dm @@ -65,11 +65,6 @@ data[SUPPLEMENTAL_FEATURE_KEY] = /datum/preference/tri_color/tail_color::savefile_key return data -/datum/preference/choiced/ramatan_tail/compile_constant_data() - var/list/data = ..() - data[SUPPLEMENTAL_FEATURE_KEY] = /datum/preference/tri_color/tail_color::savefile_key - return data - /// Tail colors! /datum/preference/tri_color/tail_color diff --git a/modular_doppler/modular_species/species_types/ramatae/ramatan.dm b/modular_doppler/modular_species/species_types/ramatae/ramatan.dm index 1f127f66bd86c..28a325fb7a01d 100644 --- a/modular_doppler/modular_species/species_types/ramatae/ramatan.dm +++ b/modular_doppler/modular_species/species_types/ramatae/ramatan.dm @@ -89,7 +89,8 @@ ramatan_for_preview.dna.features["lizard_markings"] = "Ramatan Underbelly" ramatan_for_preview.dna.features["body_markings_color_1"] = "#ccecff" ramatan_for_preview.dna.features["mcolor"] = "#FFFFFF" - ramatan_for_preview.dna.ear_type = RAMATAN + ramatan_for_preview.dna.ear_type = LIZARD + ramatan_for_preview.dna.features["ears"] = "Ramatan" ramatan_for_preview.dna.features["ears_color_1"] = "#ffffff" ramatan_for_preview.dna.features["ears_color_2"] = "#dddddd" ramatan_for_preview.dna.features["frills"] = "Ramatan" @@ -98,7 +99,6 @@ ramatan_for_preview.dna.features["snout_color_1"] = "#ffffff" ramatan_for_preview.dna.features["snout_color_2"] = "#dddddd" ramatan_for_preview.dna.features["snout_color_3"] = "#9a9b9e" - ramatan_for_preview.dna.tail_type = RAMATAN ramatan_for_preview.eye_color_left = "#CCECFF" ramatan_for_preview.eye_color_right = "#CCECFF" regenerate_organs(ramatan_for_preview)