Skip to content

Return of the species size reaches #7623

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

Open
ta3754859-max wants to merge 7 commits into
base: main
Choose a base branch
from
+44 −7
Open

Return of the species size reaches #7623

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bbbfccd
Sets it up for kicking
ta3754859-max Aug 20, 2026
278710e
Changes attack and makes NPCs respect it
ta3754859-max Aug 20, 2026
18092cf
removes neck aiming
ta3754859-max Aug 20, 2026
3438430
goblins aim head against dwarfs
ta3754859-max Aug 20, 2026
ebbb878
Merge branch 'main' into shortheads-cant-aim-high
ta3754859-max Aug 20, 2026
b1b14fb
checks for tiny trait properly
ta3754859-max Aug 20, 2026
52df4b3
Merge branch 'shortheads-cant-aim-high' of https://github.com/ta37548…
ta3754859-max Aug 20, 2026
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
18 changes: 18 additions & 0 deletions code/__DEFINES/species/_species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@

#define SPEC_ID_ORC "orc"
#define SPEC_ID_GOBLIN "goblin"
#define SPEC_ID_GOBLIN_HELL "goblin_hell"
#define SPEC_ID_GOBLIN_CAVE "goblin_cave"
#define SPEC_ID_GOBLIN_SEA "goblin_sea"
#define SPEC_ID_GOBLIN_MOON "goblin_moon"
#define SPEC_ID_ROUSMAN "rousman"
#define SPEC_ID_ZIZOMBIE "zizombie"

Expand Down Expand Up @@ -372,3 +376,17 @@
#define SPECIES_CANNIBALISM_KOBOLD list(\
SPEC_ID_KOBOLD,\
)
//Used in aiming, yes it's awful how I used each and every species but I made it use normal id instead id_override
#define SPECIES_SHORTIES list(\
SPEC_ID_DWARF,\
SPEC_ID_HALFLING,\
SPEC_ID_KOBOLD,\
SPEC_ID_ROUSMAN,\
SPEC_ID_GOBLIN,\
SPEC_ID_GOBLIN_HELL,\
SPEC_ID_GOBLIN_CAVE,\
SPEC_ID_GOBLIN_SEA,\
SPEC_ID_GOBLIN_MOON,\
SPEC_ID_KOBOLD_FORMIKRAG,\
SPEC_ID_DWARF_SUBTERRAN,\
)
4 changes: 4 additions & 0 deletions code/datums/ai/subtrees/human_basic_attack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@
if(HAS_TRAIT(target, TRAIT_BLOODLOSS_IMMUNE) || !CAN_HAVE_BLOOD(target))
pawn.aimheight_change(rand(12, 19))
return
var/mob/living/carbon/human/attacked = target
if((pawn.dna?.species.id in SPECIES_SHORTIES) && !((attacked.dna?.species.id in SPECIES_SHORTIES) || attacked.age == AGE_CHILD)) // should still aim head against dwarfs or younglings
pawn.aimheight_change(pick(rand(1, 4), rand(5, 8), rand(9, 11)))
return
pawn.aimheight_change(pick(rand(5, 8), rand(9, 11), rand(12, 19)))

/datum/ai_behavior/basic_melee_attack/human_npc/proc/_try_weapon_special(datum/ai_controller/controller)
Expand Down
29 changes: 22 additions & 7 deletions code/modules/mob/living/living.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,16 @@
/mob/living/carbon/proc/kick_attack_check(mob/living/L)
if(L == src)
return FALSE
if(ishuman(src) && ishuman(L))
var/mob/living/carbon/human/kicked = src
var/mob/living/carbon/human/kicker = L
if(((kicked.dna?.species.id in SPECIES_SHORTIES) || kicked.age == AGE_CHILD) && !((kicker.dna?.species.id in SPECIES_SHORTIES) || kicker.age == AGE_CHILD))
return TRUE
if(body_position == LYING_DOWN)
return TRUE
if(HAS_TRAIT(L, TRAIT_CLOSECOMBAT))
return TRUE

var/list/acceptable = list(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_R_ARM, BODY_ZONE_CHEST, BODY_ZONE_L_ARM)
if( !(check_zone(L.zone_selected) in acceptable) )
to_chat(L, "<span class='warning'>I can't reach that.</span>")
Expand All @@ -422,21 +428,30 @@
/mob/living/carbon/proc/lying_attack_check(mob/living/L, obj/item/I)
if(L == src)
return TRUE
var/short_attacker = FALSE
var/short_victim = FALSE
if(ishuman(src) && ishuman(L))
var/mob/living/carbon/human/attacked = src
var/mob/living/carbon/human/attacker = L
if((attacked.dna?.species.id in SPECIES_SHORTIES) || attacked.age == AGE_CHILD)
short_victim = TRUE
if((attacker.dna?.species.id in SPECIES_SHORTIES) || attacker.age == AGE_CHILD)
short_attacker = TRUE

var/CZ = FALSE
var/list/acceptable = list(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_HEAD, BODY_ZONE_PRECISE_MOUTH, BODY_ZONE_R_ARM, BODY_ZONE_CHEST, BODY_ZONE_L_ARM)
if((L.body_position != LYING_DOWN) && (body_position != LYING_DOWN)) //we are both standing
if(I)
if(I.wlength > WLENGTH_NORMAL)
CZ = TRUE
else if(HAS_TRAIT(L, TRAIT_TINY) && !HAS_TRAIT(src, TRAIT_TINY)) //midget variant, allows neck no head
acceptable = list(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM,BODY_ZONE_PRECISE_R_HAND,BODY_ZONE_PRECISE_L_HAND,BODY_ZONE_PRECISE_GROIN, BODY_ZONE_PRECISE_STOMACH, BODY_ZONE_CHEST, BODY_ZONE_PRECISE_NECK, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG, BODY_ZONE_PRECISE_R_FOOT, BODY_ZONE_PRECISE_L_FOOT)
else if(!HAS_TRAIT(L, TRAIT_TINY)) //we have a short/medium weapon, so allow hitting legs
else if((HAS_TRAIT(L, TRAIT_TINY) || short_attacker) && !(HAS_TRAIT(src, TRAIT_TINY) || short_victim)) //midget variant, no neck as you any misses will hit head either way
acceptable = list(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM,BODY_ZONE_PRECISE_R_HAND,BODY_ZONE_PRECISE_L_HAND,BODY_ZONE_PRECISE_GROIN, BODY_ZONE_PRECISE_STOMACH, BODY_ZONE_CHEST, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG, BODY_ZONE_PRECISE_R_FOOT, BODY_ZONE_PRECISE_L_FOOT)
else if(!(HAS_TRAIT(L, TRAIT_TINY) || short_attacker)) //we have a short/medium weapon, so allow hitting legs
acceptable = list(BODY_ZONE_HEAD, BODY_ZONE_PRECISE_MOUTH, BODY_ZONE_R_ARM, BODY_ZONE_CHEST, BODY_ZONE_PRECISE_GROIN, BODY_ZONE_PRECISE_STOMACH, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_L_ARM, BODY_ZONE_PRECISE_NECK, BODY_ZONE_PRECISE_R_EYE,BODY_ZONE_PRECISE_L_EYE, BODY_ZONE_PRECISE_EARS, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG, BODY_ZONE_PRECISE_SKULL, BODY_ZONE_PRECISE_NOSE, BODY_ZONE_PRECISE_MOUTH)
else
if(HAS_TRAIT(L, TRAIT_TINY) && !HAS_TRAIT(src, TRAIT_TINY) && (!CZ)) //tiny punches
if((HAS_TRAIT(L, TRAIT_TINY) || short_attacker) && !(HAS_TRAIT(src, TRAIT_TINY) || short_victim) && (!CZ)) //tiny punches
acceptable = list(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM,BODY_ZONE_PRECISE_R_HAND,BODY_ZONE_PRECISE_L_HAND,BODY_ZONE_PRECISE_GROIN, BODY_ZONE_PRECISE_STOMACH, BODY_ZONE_CHEST, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG, BODY_ZONE_PRECISE_R_FOOT, BODY_ZONE_PRECISE_L_FOOT)
else if(!HAS_TRAIT(L, TRAIT_TINY) && (!CZ)) //we are punching, no legs
else if(!(HAS_TRAIT(L, TRAIT_TINY) || short_attacker) && (!CZ)) //we are punching, no legs
Comment thread
ta3754859-max marked this conversation as resolved.
Outdated
acceptable = list(BODY_ZONE_HEAD, BODY_ZONE_PRECISE_MOUTH, BODY_ZONE_R_ARM, BODY_ZONE_CHEST, BODY_ZONE_PRECISE_GROIN, BODY_ZONE_PRECISE_STOMACH, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_L_ARM, BODY_ZONE_PRECISE_NECK, BODY_ZONE_PRECISE_R_EYE,BODY_ZONE_PRECISE_L_EYE, BODY_ZONE_PRECISE_EARS, BODY_ZONE_PRECISE_SKULL, BODY_ZONE_PRECISE_NOSE, BODY_ZONE_PRECISE_MOUTH)
else if(L.body_position == LYING_DOWN && (body_position != LYING_DOWN)) //we are prone, victim is standing
if(I)
Expand All @@ -451,11 +466,11 @@
CZ = TRUE
if(CZ)
if( !(check_zone(L.zone_selected) in acceptable) )
to_chat(L, "<span class='warning'>I can't reach that.</span>")
to_chat(L, span_danger("I can't reach that."))
return FALSE
else
if( !(L.zone_selected in acceptable) )
to_chat(L, "<span class='warning'>I can't reach that.</span>")
to_chat(L, span_danger("I can't reach that."))
return FALSE
return TRUE

Expand Down
Loading