cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Chimps no longer get grumpy when you hug them or throw things with no throw force at them. (#62685)

Browse Source 
* Chimps no longer get pissed when you hug them.

* Pun Pun no longer hates hat throwing.
This commit is contained in:
Ghom
2021-11-09 22:54:05 -05:00
committed by GitHub
parent 71c8f9129b
commit 7d3b98705f
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/other_mobs.dm
+1 -1
View File
@@ -137,7 +137,7 @@
///Attacked by monkey
/atom/proc/attack_paw(mob/user, list/modifiers)
if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_PAW, user) & COMPONENT_CANCEL_ATTACK_CHAIN)
if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_PAW, user, modifiers) & COMPONENT_CANCEL_ATTACK_CHAIN)
return TRUE
return FALSE
code/datums/ai/monkey/monkey_controller.dm
+7 -7
View File
@@ -132,14 +132,14 @@ have ways of interacting with a specific mob and control it.
if(I.force && I.damtype != STAMINA)
retaliate(user)
/datum/ai_controller/monkey/proc/on_attack_hand(datum/source, mob/living/user)
/datum/ai_controller/monkey/proc/on_attack_hand(datum/source, mob/living/user, list/modifiers)
SIGNAL_HANDLER
if(prob(MONKEY_RETALIATE_PROB))
if((user.combat_mode || LAZYACCESS(modifiers, RIGHT_CLICK)) && prob(MONKEY_RETALIATE_PROB))
retaliate(user)
/datum/ai_controller/monkey/proc/on_attack_paw(datum/source, mob/living/user)
/datum/ai_controller/monkey/proc/on_attack_paw(datum/source, mob/living/user, list/modifiers)
SIGNAL_HANDLER
if(prob(MONKEY_RETALIATE_PROB))
if((user.combat_mode || LAZYACCESS(modifiers, RIGHT_CLICK)) && prob(MONKEY_RETALIATE_PROB))
retaliate(user)
/datum/ai_controller/monkey/proc/on_attack_animal(datum/source, mob/living/user)
@@ -147,9 +147,9 @@ have ways of interacting with a specific mob and control it.
if(user.melee_damage_upper > 0 && prob(MONKEY_RETALIATE_PROB))
retaliate(user)
/datum/ai_controller/monkey/proc/on_attack_alien(datum/source, mob/living/user)
/datum/ai_controller/monkey/proc/on_attack_alien(datum/source, mob/living/user, list/modifiers)
SIGNAL_HANDLER
if(prob(MONKEY_RETALIATE_PROB))
if((user.combat_mode || LAZYACCESS(modifiers, RIGHT_CLICK)) && prob(MONKEY_RETALIATE_PROB))
retaliate(user)
/datum/ai_controller/monkey/proc/on_bullet_act(datum/source, obj/projectile/Proj)
@@ -166,7 +166,7 @@ have ways of interacting with a specific mob and control it.
var/mob/living/living_pawn = pawn
var/obj/item/I = AM
var/mob/thrown_by = I.thrownby?.resolve()
if(I.throwforce < living_pawn.health && ishuman(thrown_by))
if(I.throwforce && I.throwforce < living_pawn.health && ishuman(thrown_by))
var/mob/living/carbon/human/H = thrown_by
retaliate(H)
code/modules/mob/living/living_defense.dm
+1 -1
View File
@@ -329,7 +329,7 @@
return FALSE
/mob/living/attack_alien(mob/living/carbon/alien/humanoid/user, list/modifiers)
SEND_SIGNAL(src, COMSIG_MOB_ATTACK_ALIEN, user)
SEND_SIGNAL(src, COMSIG_MOB_ATTACK_ALIEN, user, modifiers)
if(LAZYACCESS(modifiers, RIGHT_CLICK))
user.do_attack_animation(src, ATTACK_EFFECT_DISARM)
return TRUE