cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

monkey attacks

Browse Source
This commit is contained in:
silicons
2020-07-23 16:30:27 -07:00
parent 53b3c6099b
commit b20e3bc2b6
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/events/spacevine.dm
View File

@@ -355,6 +355,7 @@
for(var/datum/spacevine_mutation/SM in mutations) for(var/datum/spacevine_mutation/SM in mutations)
SM.on_hit(src, user) SM.on_hit(src, user)
user_unbuckle_mob(user,user) user_unbuckle_mob(user,user)
return ..()
/obj/structure/spacevine/attack_alien(mob/living/user) /obj/structure/spacevine/attack_alien(mob/living/user)
eat(user) eat(user)

1
code/modules/mob/living/carbon/alien/alien_defense.dm
View File

@@ -74,7 +74,6 @@ In all, this is a lot like the monkey code. /N
var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
apply_damage(rand(1, 3), BRUTE, affecting) apply_damage(rand(1, 3), BRUTE, affecting)
/mob/living/carbon/alien/attack_animal(mob/living/simple_animal/M) /mob/living/carbon/alien/attack_animal(mob/living/simple_animal/M)
. = ..() . = ..()
if(.) if(.)

4
code/modules/mob/living/carbon/carbon_defense.dm
View File

@@ -150,15 +150,13 @@
if(M.a_intent == INTENT_HELP) if(M.a_intent == INTENT_HELP)
help_shake_act(M) help_shake_act(M)
return 0 return TRUE
. = ..() . = ..()
if(.) //successful monkey bite. if(.) //successful monkey bite.
for(var/thing in M.diseases) for(var/thing in M.diseases)
var/datum/disease/D = thing var/datum/disease/D = thing
ForceContractDisease(D) ForceContractDisease(D)
return 1
/mob/living/carbon/attack_slime(mob/living/simple_animal/slime/M) /mob/living/carbon/attack_slime(mob/living/simple_animal/slime/M)
. = ..() . = ..()

2
code/modules/mob/living/living_defense.dm
View File

@@ -357,6 +357,7 @@
if(mob_run_block(M, 0, "the [M.name]", ATTACK_TYPE_MELEE | ATTACK_TYPE_UNARMED, 0, M, check_zone(M.zone_selected), null) & BLOCK_SUCCESS) if(mob_run_block(M, 0, "the [M.name]", ATTACK_TYPE_MELEE | ATTACK_TYPE_UNARMED, 0, M, check_zone(M.zone_selected), null) & BLOCK_SUCCESS)
return FALSE return FALSE
M.do_attack_animation(src, ATTACK_EFFECT_BITE) M.do_attack_animation(src, ATTACK_EFFECT_BITE)
M.DelayNextAction()
if (prob(75)) if (prob(75))
log_combat(M, src, "attacked") log_combat(M, src, "attacked")
playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
@@ -368,6 +369,7 @@
visible_message("<span class='danger'>[M.name] has attempted to bite [src]!</span>", \ visible_message("<span class='danger'>[M.name] has attempted to bite [src]!</span>", \
"<span class='userdanger'>[M.name] has attempted to bite [src]!</span>", null, COMBAT_MESSAGE_RANGE, null, "<span class='userdanger'>[M.name] has attempted to bite [src]!</span>", null, COMBAT_MESSAGE_RANGE, null,
M, "<span class='danger'>You have attempted to bite [src]!</span>") M, "<span class='danger'>You have attempted to bite [src]!</span>")
return TRUE
return FALSE return FALSE
/mob/living/attack_larva(mob/living/carbon/alien/larva/L) /mob/living/attack_larva(mob/living/carbon/alien/larva/L)