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

[MIRROR] Smart monkeys now punch instead of bite #2165

Merged
merged 1 commit into from
Feb 29, 2024
Merged

[MIRROR] Smart monkeys now punch instead of bite #2165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions code/modules/mob/living/carbon/human/species_types/monkeys.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@
ai_controlled_species = TRUE

/datum/species/monkey/random_name(gender,unique,lastname)
var/randname = "monkey ([rand(1,999)])"

return randname
return "monkey ([rand(1, 999)])"

/datum/species/monkey/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
. = ..()
Expand Down Expand Up @@ -170,7 +168,7 @@

/obj/item/organ/internal/brain/primate/on_mob_insert(mob/living/carbon/primate)
. = ..()
RegisterSignal(primate, COMSIG_MOVABLE_CROSS, PROC_REF(on_crossed), TRUE)
RegisterSignal(primate, COMSIG_MOVABLE_CROSS, PROC_REF(on_crossed))

/obj/item/organ/internal/brain/primate/on_mob_remove(mob/living/carbon/primate)
. = ..()
Expand All @@ -185,11 +183,13 @@
var/mob/living/in_the_way_mob = crossed
if(iscarbon(in_the_way_mob) && !in_the_way_mob.combat_mode)
return
if(in_the_way_mob.pass_flags & PASSTABLE)
if(in_the_way_mob.pass_flags & PASSMOB)
return
in_the_way_mob.knockOver(owner)

/obj/item/organ/internal/brain/primate/get_attacking_limb(mob/living/carbon/human/target)
return owner.get_bodypart(BODY_ZONE_HEAD)
if(!HAS_TRAIT(owner, TRAIT_ADVANCEDTOOLUSER))
return owner.get_bodypart(BODY_ZONE_HEAD)
return ..()

#undef MONKEY_SPEC_ATTACK_BITE_MISS_CHANCE
18 changes: 9 additions & 9 deletions code/modules/surgery/bodyparts/parts.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,9 @@
px_x = -5
px_y = -3
dmg_overlay_type = SPECIES_MONKEY
unarmed_damage_low = 1 /// monkey punches must be really weak, considering they bite people instead and their bites are weak as hell.
unarmed_damage_high = 2
unarmed_effectiveness = 0
unarmed_damage_low = 3
unarmed_damage_high = 8
unarmed_effectiveness = 5
appendage_noun = "paw"

/obj/item/bodypart/arm/left/alien
Expand Down Expand Up @@ -347,8 +347,8 @@
px_x = 5
px_y = -3
dmg_overlay_type = SPECIES_MONKEY
unarmed_damage_low = 1
unarmed_damage_high = 2
unarmed_damage_low = 3
unarmed_damage_high = 8
unarmed_effectiveness = 0
appendage_noun = "paw"

Expand Down Expand Up @@ -463,8 +463,8 @@
dmg_overlay_type = SPECIES_MONKEY
unarmed_damage_low = 2
unarmed_damage_high = 3
unarmed_effectiveness = 0
footprint_sprite = FOOTPRINT_SPRITE_PAWS
unarmed_effectiveness = 5
footprint_sprite = FOOTPRINT_SPRITE_PAWS

/obj/item/bodypart/leg/left/alien
icon = 'icons/mob/human/species/alien/bodyparts.dmi'
Expand Down Expand Up @@ -553,8 +553,8 @@
dmg_overlay_type = SPECIES_MONKEY
unarmed_damage_low = 2
unarmed_damage_high = 3
unarmed_effectiveness = 0
footprint_sprite = FOOTPRINT_SPRITE_PAWS
unarmed_effectiveness = 5
footprint_sprite = FOOTPRINT_SPRITE_PAWS

/obj/item/bodypart/leg/right/alien
icon = 'icons/mob/human/species/alien/bodyparts.dmi'
Expand Down
Loading