mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-22 23:43:21 +00:00
023fc200bb
pAIs inherited UnarmedAttack from /mob/living, which caused them to attempt to attack_animal() things they clicked, which would generally runtime on account of not having the variables expected from a simple_animal.
126 lines
3.0 KiB
Plaintext
126 lines
3.0 KiB
Plaintext
/*
|
|
Humans:
|
|
Adds an exception for gloves, to allow special glove types like the ninja ones.
|
|
|
|
Otherwise pretty standard.
|
|
*/
|
|
/mob/living/carbon/human/UnarmedAttack(var/atom/A, var/proximity)
|
|
var/obj/item/clothing/gloves/G = gloves // not typecast specifically enough in defines
|
|
|
|
// Special glove functions:
|
|
// If the gloves do anything, have them return 1 to stop
|
|
// normal attack_hand() here.
|
|
if(proximity && istype(G) && G.Touch(A,1))
|
|
return
|
|
|
|
A.attack_hand(src)
|
|
/atom/proc/attack_hand(mob/user as mob)
|
|
return
|
|
|
|
/*
|
|
/mob/living/carbon/human/RestrainedClickOn(var/atom/A) -- Handled by carbons
|
|
return
|
|
*/
|
|
|
|
/mob/living/carbon/RestrainedClickOn(var/atom/A)
|
|
return 0
|
|
|
|
// Commented out to prevent overwriting RangedAttack in click.dm ~ Bone White
|
|
/*
|
|
/mob/living/carbon/human/RangedAttack(var/atom/A)
|
|
if(!gloves && !mutations.len) return
|
|
var/obj/item/clothing/gloves/G = gloves
|
|
if((LASER in mutations) && a_intent == "harm")
|
|
LaserEyes(A) // moved into a proc below
|
|
|
|
else if(istype(G) && G.Touch(A,0)) // for magic gloves
|
|
return
|
|
|
|
else if(TK in mutations)
|
|
A.attack_tk(src)
|
|
*/
|
|
|
|
/*
|
|
Animals & All Unspecified
|
|
*/
|
|
/mob/living/UnarmedAttack(var/atom/A)
|
|
A.attack_animal(src)
|
|
/atom/proc/attack_animal(mob/user as mob)
|
|
return
|
|
/mob/living/RestrainedClickOn(var/atom/A)
|
|
return
|
|
|
|
/*
|
|
Monkeys
|
|
*/
|
|
/mob/living/carbon/monkey/UnarmedAttack(var/atom/A)
|
|
A.attack_paw(src)
|
|
/atom/proc/attack_paw(mob/user as mob)
|
|
return
|
|
|
|
/*
|
|
Monkey RestrainedClickOn() was apparently the
|
|
one and only use of all of the restrained click code
|
|
(except to stop you from doing things while handcuffed);
|
|
moving it here instead of various hand_p's has simplified
|
|
things considerably
|
|
*/
|
|
/mob/living/carbon/monkey/RestrainedClickOn(var/atom/A)
|
|
if(..())
|
|
return
|
|
if(a_intent != "harm" || !ismob(A)) return
|
|
if(is_muzzled())
|
|
return
|
|
var/mob/living/carbon/ML = A
|
|
var/dam_zone = ran_zone(pick("chest", "l_hand", "r_hand", "l_leg", "r_leg"))
|
|
var/armor = ML.run_armor_check(dam_zone, "melee")
|
|
if(prob(75))
|
|
ML.apply_damage(rand(1,3), BRUTE, dam_zone, armor)
|
|
for(var/mob/O in viewers(ML, null))
|
|
O.show_message("\red <B>[name] has bit [ML]!</B>", 1)
|
|
if(armor >= 2) return
|
|
else
|
|
for(var/mob/O in viewers(ML, null))
|
|
O.show_message("\red <B>[src] has attempted to bite [ML]!</B>", 1)
|
|
|
|
/*
|
|
Aliens
|
|
Defaults to same as monkey in most places
|
|
*/
|
|
/mob/living/carbon/alien/UnarmedAttack(var/atom/A)
|
|
A.attack_alien(src)
|
|
/atom/proc/attack_alien(mob/user as mob)
|
|
attack_paw(user)
|
|
return
|
|
/mob/living/carbon/alien/RestrainedClickOn(var/atom/A)
|
|
return
|
|
|
|
// Babby aliens
|
|
/mob/living/carbon/alien/larva/UnarmedAttack(var/atom/A)
|
|
A.attack_larva(src)
|
|
/atom/proc/attack_larva(mob/user as mob)
|
|
return
|
|
|
|
|
|
/*
|
|
Slimes
|
|
Nothing happening here
|
|
*/
|
|
/mob/living/carbon/slime/UnarmedAttack(var/atom/A)
|
|
A.attack_slime(src)
|
|
/atom/proc/attack_slime(mob/user as mob)
|
|
return
|
|
/mob/living/carbon/slime/RestrainedClickOn(var/atom/A)
|
|
return
|
|
|
|
/*
|
|
New Players:
|
|
Have no reason to click on anything at all.
|
|
*/
|
|
/mob/new_player/ClickOn()
|
|
return
|
|
|
|
// pAIs are not intended to interact with anything in the world
|
|
/mob/living/silicon/pai/UnarmedAttack(var/atom/A)
|
|
return
|