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.

Sign up for GitHub

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

Jump to bottom

Fixes a few species code and bugs #4106

Merged
merged 9 commits into from
Nov 5, 2024
Merged

Fixes a few species code and bugs #4106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d4681c1
satyr cleanup
Shoddd Oct 31, 2024
8f2a9a5
monkehair translator start
Shoddd Nov 1, 2024
84f3354
no hair for ALL monkeys
Shoddd Nov 2, 2024
3cee304
Merge branch 'Monkestation:master' into satyrs-and-species-stuff
Shoddd Nov 2, 2024
df0a652
tundra limbs
Shoddd Nov 2, 2024
e8a1e67
Merge branch 'Monkestation:master' into satyrs-and-species-stuff
Shoddd Nov 4, 2024
6e8e5ba
for later
Shoddd Nov 4, 2024
0c45b9e
Merge branch 'satyrs-and-species-stuff' of https://github.com/Shoddd/…
Shoddd Nov 4, 2024
b3dec7a
tundra moth wings
Shoddd Nov 4, 2024
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
13 changes: 13 additions & 0 deletions monkestation/code/modules/mob/living/carbon/human/species_type/tundra_moths/tundramoths.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

//Body parts
/obj/item/bodypart/head/tundramoth
name = "Tundra Head"
desc = "It looks just like a moths, but its covered in black fur. Is that a bald sp-"
icon = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
icon_state = "tundra_moth_head"
icon_static = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
Expand All @@ -29,14 +31,19 @@
head_flags = /obj/item/bodypart/head/moth::head_flags

/obj/item/bodypart/chest/tundramoth
name = "Tundra chest"
desc = "It looks just like a moths, but its covered in black fur."
icon = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
icon_state = "tundra_moth_chest_m"
icon_static = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
limb_id = SPECIES_TUNDRA
is_dimorphic = TRUE
should_draw_greyscale = FALSE
wing_types = list(/obj/item/organ/external/wings/functional/moth/megamoth, /obj/item/organ/external/wings/functional/moth/mothra)

/obj/item/bodypart/arm/left/tundramoth
name = "Tundra left arm"
desc = "It looks just like a moths, but its covered in black fur."
icon = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
icon_state = "tundra_moth_l_arm"
icon_static = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
Expand All @@ -48,6 +55,8 @@
unarmed_miss_sound = 'sound/weapons/slashmiss.ogg'

/obj/item/bodypart/arm/right/tundramoth
name = "Tundra right arm"
desc = "It looks just like a moths, but its covered in black fur."
icon = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
icon_state = "tundra_moth_r_arm"
icon_static = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
Expand All @@ -59,13 +68,17 @@
unarmed_miss_sound = 'sound/weapons/slashmiss.ogg'

/obj/item/bodypart/leg/left/tundramoth
name = "Tundra left leg"
desc = "It looks just like a moths, but its covered in black fur."
icon = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
icon_state = "tundra_moth_l_leg"
icon_static = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
limb_id = SPECIES_TUNDRA
should_draw_greyscale = FALSE

/obj/item/bodypart/leg/right/tundramoth
name = "Tundra right leg"
desc = "It looks just like a moths, but its covered in black fur."
icon = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
icon_state = "tundra_moth_r_leg"
icon_static = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
Expand Down
2 changes: 1 addition & 1 deletion monkestation/code/modules/ranching/satyr/abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
if(iscarbon(mob))
var/mob/living/carbon/carbon = mob
carbon.stamina.adjust(-55)
log_combat(owner, mob, "headbutted (10 brute damage)")
log_combat(owner, mob, "headbutted (15 brute damage)")
if(!knocked)
var/mob/living/owner_mob = owner
owner_mob.AdjustKnockdown(0.2 SECONDS)
Expand Down
16 changes: 6 additions & 10 deletions monkestation/code/modules/ranching/satyr/external_organs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/obj/item/organ/external/satyr_fluff
name = "satyr fluff"
desc = "You shouldn't see this"
desc = "A goat's fur"
icon_state = ""
icon = 'monkestation/icons/obj/medical/organs/organs.dmi'

preference = "feature_satyr_fluff"
zone = BODY_ZONE_HEAD
zone = BODY_ZONE_PRECISE_GROIN
slot = ORGAN_SLOT_EXTERNAL_FLUFF

use_mob_sprite_as_obj_sprite = TRUE
Expand Down Expand Up @@ -38,15 +38,13 @@
return TRUE


/obj/item/organ/external/satyr_horns
/obj/item/organ/external/horns/satyr_horns
name = "satyr horns"
desc = "You shouldn't see this"
desc = "A goat's horns"
icon_state = ""
icon = 'monkestation/icons/obj/medical/organs/organs.dmi'

preference = "feature_satyr_horns"
zone = BODY_ZONE_HEAD
slot = ORGAN_SLOT_EXTERNAL_HORNS

use_mob_sprite_as_obj_sprite = TRUE
bodypart_overlay = /datum/bodypart_overlay/mutant/satyr_horns
Expand All @@ -65,15 +63,13 @@
return TRUE


/obj/item/organ/external/satyr_tail
/obj/item/organ/external/tail/satyr_tail
name = "satyr tail"
desc = "You shouldn't see this"
desc = "A goat's tail"
icon_state = ""
icon = 'monkestation/icons/obj/medical/organs/organs.dmi'

preference = "feature_satyr_tail"
zone = BODY_ZONE_HEAD
slot = ORGAN_SLOT_EXTERNAL_TAIL

use_mob_sprite_as_obj_sprite = TRUE
bodypart_overlay = /datum/bodypart_overlay/mutant/satyr_tail
Expand Down
4 changes: 2 additions & 2 deletions monkestation/code/modules/ranching/satyr/species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
inherent_biotypes = MOB_ORGANIC | MOB_HUMANOID
external_organs = list(
/obj/item/organ/external/satyr_fluff = "normal",
/obj/item/organ/external/satyr_tail = "short",
/obj/item/organ/external/satyr_horns = "back",
/obj/item/organ/external/tail/satyr_tail = "short",
/obj/item/organ/external/horns/satyr_horns = "back",
)
meat = /obj/item/food/meat/steak
mutanttongue = /obj/item/organ/internal/tongue/satyr
Expand Down
Loading