Skip to content

Commit

Permalink
fixes the ears and brain, breaks screenshot tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Wollywoger committed Oct 28, 2024
1 parent 5da2d7f commit 94353cd
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
TRAIT_CHUNKYFINGERS
)
mutanttongue = /obj/item/organ/internal/tongue/werewolf
mutantears = /obj/item/organ/internal/ears/werewolf
mutantears = /obj/item/organ/internal/ears/cat/werewolf
mutanteyes = /obj/item/organ/internal/eyes/werewolf
mutantbrain = /obj/item/organ/internal/brain/werewolf
mutantliver = /obj/item/organ/internal/liver/werewolf
mutantheart = /obj/item/organ/internal/heart/werewolf
external_organs = list(
/obj/item/organ/external/tail/cat = "Cat",
/obj/item/organ/external/tail/cat = "Cat", // todo: add custom wolf tail
)
skinned_type = /obj/item/stack/sheet/animalhide/human
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
Expand All @@ -34,19 +34,23 @@
BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/werewolf,
)

/obj/item/organ/internal/brain/werewolf/get_attacking_limb(mob/living/carbon/human/target)
/obj/item/organ/internal/brain/werewolf
name = "werewolf brain"
desc = "a strange mixture of a human and wolf brain"
organ_traits = list(TRAIT_PRIMITIVE, TRAIT_CAN_STRIP)
organ_traits = list(TRAIT_ADVANCEDTOOLUSER, TRAIT_LITERATE, TRAIT_PRIMITIVE, TRAIT_CAN_STRIP) // you may be a raging monster, but you still retain traits of your normal self
// also you can just inject clever mutation and get the first two traits anyways *shrug

/obj/item/organ/internal/brain/werewolf/get_attacking_limb(mob/living/carbon/human/target)
if(target.body_position == LYING_DOWN)
return owner.get_bodypart(BODY_ZONE_HEAD)
return owner.get_bodypart(BODY_ZONE_HEAD) // performs a "maul" attack which does increased melee damage
return ..()

/datum/species/werewolf/prepare_human_for_preview(mob/living/carbon/human/human)
human.set_haircolor("#bb9966", update = FALSE) // brown
human.set_hairstyle("Business Hair", update = TRUE)

/* this shouldn't be a roundstart/base species players can choose, and is instead obtainable mid round
feel free to update this section if any of the three below can be accessed out of character set up. */
/datum/species/werewolf/get_species_description()
return "N/A"

Expand Down
27 changes: 24 additions & 3 deletions maplestation_modules/code/modules/surgery/organs/ears.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,35 @@
icon = 'maplestation_modules/icons/mob/mutant_bodyparts.dmi'
locked = TRUE

/obj/item/organ/internal/ears/werewolf
/obj/item/organ/internal/ears/cat/werewolf
name = "wolf ears"
icon = 'icons/obj/clothing/head/costume.dmi'
icon_state = "kitty"
desc = "Allows the user to more easily hear whispers. The user becomes extra vulnerable to loud noises, however"
// Same sensitivity as felinid ears
damage_multiplier = 2

/obj/item/organ/internal/ears/werewolf/on_mob_insert(mob/living/carbon/ear_owner)
/obj/item/organ/internal/ears/cat/werewolf/on_mob_insert(mob/living/carbon/human/ear_owner)
. = ..()
organ_traits = list(TRAIT_GOOD_HEARING)
if(istype(ear_owner))
color = ear_owner.hair_color
ear_owner.dna.features["ears"] = ear_owner.dna.species.mutant_bodyparts["ears"] = "Werewolf"
ear_owner.update_body()
ADD_TRAIT(ear_owner, TRAIT_GOOD_HEARING, ORGAN_TRAIT)

/obj/item/organ/internal/ears/cat/werewolf/on_mob_remove(mob/living/carbon/human/ear_owner)
. = ..()
if(istype(ear_owner))
color = ear_owner.hair_color
ear_owner.dna.features["ears"] = "None"
ear_owner.dna.species.mutant_bodyparts -= "ears"
ear_owner.update_body()
REMOVE_TRAIT(ear_owner, TRAIT_GOOD_HEARING, ORGAN_TRAIT)

/datum/sprite_accessory/ears/werewolf
name = "Werewolf"
icon_state = "werewolf"
icon = 'maplestation_modules/icons/mob/mutant_bodyparts.dmi'
locked = TRUE
hasinner = TRUE
color_src = HAIR_COLOR
Binary file modified maplestation_modules/icons/mob/mutant_bodyparts.dmi
Binary file not shown.
Binary file modified maplestation_modules/icons/mob/werewolf_parts_greyscale.dmi
Binary file not shown.

0 comments on commit 94353cd

Please sign in to comment.