Skip to content

Commit

Permalink
requested changes & sprite tweaks via imaginos
Browse files Browse the repository at this point in the history
  • Loading branch information
Skies-Of-Blue committed Jun 7, 2024
1 parent e4a46ae commit f10aa3b
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 28 deletions.
31 changes: 16 additions & 15 deletions code/modules/mob/dead/new_player/sprite_accessories/ears.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,60 +3,61 @@
/datum/sprite_accessory/ears
icon = 'icons/mob/mutant_bodyparts.dmi'

/datum/sprite_accessory/ears/none
/datum/sprite_accessory/ears/human/none
name = "None"
icon_state = "none"

/datum/sprite_accessory/ears/elf
/datum/sprite_accessory/ears/human/elf
icon = 'icons/mob/species/human/elf.dmi'
name = "Elf"
icon_state = "elf"
secondary_color = FALSE
color_src = SKINCOLORS

/datum/sprite_accessory/ears/cat
icon = 'icons/mob/species/misc/cat.dmi'
/datum/sprite_accessory/ears/human/cat
icon = 'icons/mob/species/human/cat.dmi'
name = "Cat"
icon_state = "cat"
secondary_color = TRUE
color_src = HAIR

/datum/sprite_accessory/ears/cat/slime
/datum/sprite_accessory/ears/human/cat/slime
name = "Slimecat"
icon_state = "cat"
secondary_color = FALSE
color_src = HAIR
image_alpha = 150

/datum/sprite_accessory/ears/dog
icon = 'icons/mob/species/misc/dog.dmi'
/datum/sprite_accessory/ears/human/dog
icon = 'icons/mob/species/human/dog.dmi'
name = "Dog"
icon_state = "dog"
secondary_color = FALSE
color_src = HAIR

/datum/sprite_accessory/ears/fox
icon = 'icons/mob/species/misc/fox.dmi'
/datum/sprite_accessory/ears/human/fox
icon = 'icons/mob/species/human/fox.dmi'
name = "Fox"
icon_state = "fox"
secondary_color = TRUE
color_src = HAIR

/datum/sprite_accessory/ears/rabbit
icon = 'icons/mob/species/misc/rabbit.dmi'
/datum/sprite_accessory/ears/human/rabbit
icon = 'icons/mob/species/human/rabbit.dmi'
name = "Rabbit"
icon_state = "bunny"
secondary_color = TRUE
color_src = HAIR

/datum/sprite_accessory/ears/rabbit/bent
icon = 'icons/mob/species/misc/rabbit.dmi'
/datum/sprite_accessory/ears/human/rabbit/bent
icon = 'icons/mob/species/human/rabbit.dmi'
name = "Bent Rabbit"
icon_state = "bunny_bent"
secondary_color = TRUE
color_src = HAIR

/datum/sprite_accessory/ears/rabbit/floppy
icon = 'icons/mob/species/misc/rabbit.dmi'
/datum/sprite_accessory/ears/human/rabbit/floppy
icon = 'icons/mob/species/human/rabbit.dmi'
name = "Floppy Rabbit"
icon_state = "bunny_floppy"
secondary_color = TRUE
Expand Down
18 changes: 9 additions & 9 deletions code/modules/mob/dead/new_player/sprite_accessories/tails.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
icon_state = "none"

/datum/sprite_accessory/tails/human/cat
icon = 'icons/mob/species/misc/cat.dmi'
icon = 'icons/mob/species/human/cat.dmi'
name = "Cat"
icon_state = "cat"
color_src = HAIR

/datum/sprite_accessory/tails_animated/human/cat
icon = 'icons/mob/species/misc/cat.dmi'
icon = 'icons/mob/species/human/cat.dmi'
name = "Cat"
icon_state = "cat"
color_src = HAIR
Expand All @@ -33,43 +33,43 @@
image_alpha = 150

/datum/sprite_accessory/tails/human/dog
icon = 'icons/mob/species/misc/dog.dmi'
icon = 'icons/mob/species/human/dog.dmi'
name = "Dog"
icon_state = "dog"
color_src = HAIR

/datum/sprite_accessory/tails_animated/human/dog
icon = 'icons/mob/species/misc/dog.dmi'
icon = 'icons/mob/species/human/dog.dmi'
name = "Dog"
icon_state = "dog"
color_src = HAIR

/datum/sprite_accessory/tails/human/fox
icon = 'icons/mob/species/misc/fox.dmi'
icon = 'icons/mob/species/human/fox.dmi'
name = "Fox"
icon_state = "fox"
color_src = HAIR

/datum/sprite_accessory/tails_animated/human/fox
icon = 'icons/mob/species/misc/fox.dmi'
icon = 'icons/mob/species/human/fox.dmi'
name = "Fox"
icon_state = "fox"
color_src = HAIR

/datum/sprite_accessory/tails/human/fox/alt
icon = 'icons/mob/species/misc/fox.dmi'
icon = 'icons/mob/species/human/fox.dmi'
name = "Fox 2"
icon_state = "fox2"
color_src = HAIR

/datum/sprite_accessory/tails_animated/human/fox/alt
icon = 'icons/mob/species/misc/fox.dmi'
icon = 'icons/mob/species/human/fox.dmi'
name = "Fox 2"
icon_state = "fox2"
color_src = HAIR

/datum/sprite_accessory/tails/human/rabbit
icon = 'icons/mob/species/misc/rabbit.dmi'
icon = 'icons/mob/species/human/rabbit.dmi'
name = "Rabbit"
icon_state = "bunny"
color_src = HAIR
8 changes: 4 additions & 4 deletions code/modules/surgery/organs/ears.dm
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@
ear_owner.dna.species.mutant_bodyparts -= "ears"
ear_owner.update_body()

/obj/item/organ/ears/fox
name = "fox ears"
damage_multiplier = 2
/obj/item/organ/ears/fox
name = "fox ears"
damage_multiplier = 2

/obj/item/organ/ears/fox/Insert(mob/living/carbon/human/ear_owner, special = 0, drop_if_replaced = TRUE)
..()
Expand All @@ -172,7 +172,7 @@

/obj/item/organ/ears/rabbit
name = "rabbit ears"
damage_multiplier = 3
damage_multiplier = 2

/obj/item/organ/ears/rabbit/Insert(mob/living/carbon/human/ear_owner, special = 0, drop_if_replaced = TRUE)
..()
Expand Down
Binary file modified icons/mob/mutant_bodyparts.dmi
Binary file not shown.
File renamed without changes.
Binary file added icons/mob/species/human/dog.dmi
Binary file not shown.
Binary file added icons/mob/species/human/elf.dmi
Binary file not shown.
File renamed without changes.
Binary file added icons/mob/species/human/rabbit.dmi
Binary file not shown.
Binary file removed icons/mob/species/misc/dog.dmi
Binary file not shown.
Binary file removed icons/mob/species/misc/rabbit.dmi
Binary file not shown.

0 comments on commit f10aa3b

Please sign in to comment.