Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ramatae 2: Fixing prefs & sprite names. #124

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion code/~doppler_earliest_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
name = DOPPLER_SPRITE_ACCESSORY_NOEARS
icon_state = /datum/sprite_accessory/ears/none::icon_state


/datum/sprite_accessory/ears_more/bug/none
icon = 'modular_doppler/modular_customization/accessories/code/~overrides/icons/fallbacks.dmi'
name = DOPPLER_SPRITE_ACCESSORY_NOEARS
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/datum/sprite_accessory/lizard_markings/ramatan
icon = 'modular_doppler/modular_customization/accessories/icons/ramatan/ramatan_markings.dmi'
name = "Ramatan Underbelly"
icon_state = "scug_lbelly"
icon_state = "ramatan_lbelly"
gender_specific = TRUE
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

/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/lizard/ramatan/tall
name = "Ramatan Tall"
icon_state = "ramatan_tall"

/datum/sprite_accessory/ears_more/lizard/ramatan/sharp
name = "Ramatan Sharp"
icon_state = "ramatan_sharp"

/datum/sprite_accessory/ears_more/lizard/ramatan/forward
name = "Ramatan Droopy"
icon_state = "ramatan_forward"

/datum/sprite_accessory/ears_more/lizard/ramatan/flopped
name = "Ramatan Long Flop"
icon_state = "ramatan_flopped"

/datum/sprite_accessory/ears_more/lizard/ramatan/fluffy
name = "Ramatan Fluffy"
icon_state = "ramatan_fluffy"

/datum/sprite_accessory/ears_more/lizard/ramatan/short
name = "Ramatan Short"
icon_state = "ramatan_short"
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/datum/sprite_accessory/frills/ramatan
icon = 'modular_doppler/modular_customization/accessories/icons/ramatan/ramatan_frills.dmi'
name = "Ramatan"
icon_state = "scug_aquatic"
icon_state = "ramatan_aquatic"

/datum/sprite_accessory/frills/ramatan/sharp
name = "Ramatan Sharp"
icon_state = "scug_sharp"
icon_state = "ramatan_sharp"

/datum/sprite_accessory/frills/ramatan/fluffy
name = "Ramatan Fluffy"
icon_state = "scug_fluffy"
icon_state = "ramatan_fluffy"

/datum/sprite_accessory/frills/ramatan/draconic
name = "Ramatan Draconic"
icon_state = "scug_dragon"
icon_state = "ramatan_dragon"

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/datum/sprite_accessory/snouts/ramatan
icon = 'modular_doppler/modular_customization/accessories/icons/ramatan/ramatan_snout.dmi'
name = "Ramatan"
icon_state = "scug_standard"
icon_state = "ramatan_standard"

/datum/sprite_accessory/snouts/ramatan/sharp
name = "Ramatan Sharp"
icon_state = "scug_sharp"
icon_state = "ramatan_sharp"

/datum/sprite_accessory/snouts/ramatan/round
name = "Ramatan Round"
icon_state = "scug_round"
icon_state = "ramatan_round"
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/datum/sprite_accessory/tails/lizard/ramatan
icon = 'modular_doppler/modular_customization/accessories/icons/ramatan/ramatan_tail.dmi'
name = "Ramatan"
icon_state = "scug_std"
icon_state = "ramatan_std"
icon = 'modular_doppler/modular_customization/accessories/icons/ramatan/ramatan_tail.dmi'

/datum/sprite_accessory/tails/lizard/ramatan/thick
name = "Ramatan Thick"
icon_state = "scug_thick"
icon_state = "ramatan_thick"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
65 changes: 33 additions & 32 deletions modular_doppler/modular_species/species_types/ramatae/ramatan.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
name = "\improper Ramatan"
plural_form = "Ramatae"
id = SPECIES_RAMATAN
preview_outfit = /datum/outfit/scug_preview
preview_outfit = /datum/outfit/ramatan_preview
inherent_traits = list(
TRAIT_MUTANT_COLORS,
TRAIT_TACKLING_TAILED_DEFENDER,
Expand All @@ -25,7 +25,7 @@
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID
body_markings = list(/datum/bodypart_overlay/simple/body_marking/lizard = "None")
mutant_organs = list(
/obj/item/organ/external/horns = "Ramatan",
/obj/item/organ/internal/ears = "Ramatan",
/obj/item/organ/external/frills = "None",
/obj/item/organ/external/snout = "Ramatan",
/obj/item/organ/external/tail/lizard = "Ramatan",
Expand Down Expand Up @@ -76,7 +76,7 @@

return to_add

/datum/outfit/scug_preview
/datum/outfit/ramatan_preview
name = "Ramatan (Species Preview)"
head = /obj/item/clothing/head/beret/doppler_command/science
neck = /obj/item/clothing/neck/doppler_mantle/science
Expand All @@ -85,32 +85,33 @@
. = ..()
new_ramatan.AddComponent(/datum/component/sign_language)

/datum/species/ramatan/prepare_human_for_preview(mob/living/carbon/human/scug_for_preview)
scug_for_preview.dna.features["lizard_markings"] = "Ramatan Underbelly"
scug_for_preview.dna.features["body_markings_color_1"] = "#ccecff"
scug_for_preview.dna.features["mcolor"] = "#FFFFFF"
scug_for_preview.dna.features["frills"] = "Ramatan"
scug_for_preview.dna.features["frills_color_1"] = "#ccecff"
scug_for_preview.dna.features["snout"] = "Ramatan"
scug_for_preview.dna.features["snout_color_1"] = "#ffffff"
scug_for_preview.dna.features["snout_color_2"] = "#dddddd"
scug_for_preview.dna.features["snout_color_3"] = "#9a9b9e"
scug_for_preview.dna.features["horns"] = "Ramatan"
scug_for_preview.dna.features["horns_color_1"] = "#ffffff"
scug_for_preview.dna.features["horns_color_2"] = "#dddddd"
scug_for_preview.eye_color_left = "#CCECFF"
scug_for_preview.eye_color_right = "#CCECFF"
regenerate_organs(scug_for_preview)
scug_for_preview.update_body(is_creating = TRUE)
/datum/species/ramatan/prepare_human_for_preview(mob/living/carbon/human/ramatan_for_preview)
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 = 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"
ramatan_for_preview.dna.features["frills_color_1"] = "#ccecff"
ramatan_for_preview.dna.features["snout"] = "Ramatan"
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.eye_color_left = "#CCECFF"
ramatan_for_preview.eye_color_right = "#CCECFF"
regenerate_organs(ramatan_for_preview)
ramatan_for_preview.update_body(is_creating = TRUE)

/// SOUNDS BREAKER
/datum/species/ramatan/get_scream_sound(mob/living/carbon/human/scug)
/datum/species/ramatan/get_scream_sound(mob/living/carbon/human/ramatan)
return pick(
'modular_doppler/modular_species/species_types/ramatae/sounds/scugscream_1.ogg',
)

/datum/species/ramatan/get_cough_sound(mob/living/carbon/human/scug)
if(scug.physique == FEMALE)
/datum/species/ramatan/get_cough_sound(mob/living/carbon/human/ramatan)
if(ramatan.physique == FEMALE)
return pick(
'sound/mobs/humanoids/human/cough/female_cough1.ogg',
'sound/mobs/humanoids/human/cough/female_cough2.ogg',
Expand All @@ -128,8 +129,8 @@
'sound/mobs/humanoids/human/cough/male_cough6.ogg',
)

/datum/species/ramatan/get_cry_sound(mob/living/carbon/human/scug)
if(scug.physique == FEMALE)
/datum/species/ramatan/get_cry_sound(mob/living/carbon/human/ramatan)
if(ramatan.physique == FEMALE)
return pick(
'sound/mobs/humanoids/human/cry/female_cry1.ogg',
'sound/mobs/humanoids/human/cry/female_cry2.ogg',
Expand All @@ -140,21 +141,21 @@
'sound/mobs/humanoids/human/cry/male_cry3.ogg',
)

/datum/species/ramatan/get_sneeze_sound(mob/living/carbon/human/scug)
if(scug.physique == FEMALE)
/datum/species/ramatan/get_sneeze_sound(mob/living/carbon/human/ramatan)
if(ramatan.physique == FEMALE)
return 'sound/mobs/humanoids/human/sneeze/female_sneeze1.ogg'
return 'sound/mobs/humanoids/human/sneeze/male_sneeze1.ogg'

/datum/species/ramatan/get_laugh_sound(mob/living/carbon/human/scug)
/datum/species/ramatan/get_laugh_sound(mob/living/carbon/human/ramatan)
return 'modular_doppler/modular_species/species_types/ramatae/sounds/scuglaugh_1.ogg'

/datum/species/ramatan/get_sigh_sound(mob/living/carbon/human/scug)
if(scug.physique == FEMALE)
/datum/species/ramatan/get_sigh_sound(mob/living/carbon/human/ramatan)
if(ramatan.physique == FEMALE)
return 'sound/mobs/humanoids/human/sigh/female_sigh.ogg'
return 'sound/mobs/humanoids/human/sigh/male_sigh.ogg'

/datum/species/ramatan/get_sniff_sound(mob/living/carbon/human/scug)
if(scug.physique == FEMALE)
/datum/species/ramatan/get_sniff_sound(mob/living/carbon/human/ramatan)
if(ramatan.physique == FEMALE)
return 'sound/mobs/humanoids/human/sniff/female_sniff.ogg'
return 'sound/mobs/humanoids/human/sniff/male_sniff.ogg'
/// SOUNDS BREAKER END
Expand Down
2 changes: 1 addition & 1 deletion tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6746,8 +6746,8 @@
#include "modular_doppler\modular_customization\accessories\code\non_species_specific\murid_accessories\murid_ears.dm"
#include "modular_doppler\modular_customization\accessories\code\non_species_specific\murid_accessories\murid_tail.dm"
#include "modular_doppler\modular_customization\accessories\code\ramatan_accessories\ramatan_body_markings.dm"
#include "modular_doppler\modular_customization\accessories\code\ramatan_accessories\ramatan_ears.dm"
#include "modular_doppler\modular_customization\accessories\code\ramatan_accessories\ramatan_frills.dm"
#include "modular_doppler\modular_customization\accessories\code\ramatan_accessories\ramatan_horns.dm"
#include "modular_doppler\modular_customization\accessories\code\ramatan_accessories\ramatan_snout.dm"
#include "modular_doppler\modular_customization\accessories\code\ramatan_accessories\ramatan_tail.dm"
#include "modular_doppler\modular_customization\accessories\code\synthetic_accessories\synth_ears.dm"
Expand Down
Loading