phil235
443a4501ec
* - I rearranged X_defense.dm mob files, more damage_procs.dm.Here's what's inside: * X_defense.dm: is for the procs of attacks onto the mob, all the XXX_act() proc (things happening to the mob), as well as protection check and get procs (armor, ear prot, projectile dismemberment) * damage_procs.dm: actual damage procs like adjustBruteLoss() getfireloss, any proc that handles damaging. - some bugfixes with gibspawner effects. - monkey's bodyparts can be dismembered and are used to create its icon. - brains are no longer carbons. - all carbon have bodyparts that can be dropped when the mob is gibbed. - adminspawned bodyparts now have a default icon. - robotic parts are now a child of bodyparts. - health analyzer on alien/monkey shows damage on each limb - added admin option to add/remove bodyparts for all carbon (instead of just remove on humans) - Fixes keycheck message spam for janicart and all when trying to move. - Fixes bug with buckling to a scooter while limbless. - removed arg "hit_zone" in proj's on_hit() because we can already use the def_zone var (where hit_zone got its value) - Fixes mob not getting any damage when hit by a projectile on their missing limb, despite a hit message shown). carbon/apply_damage() now when we specify a def_zone and the corresponding BP is missing we default to the chest instead of stopping the proc. Consistently with how human/attacked_by() default to its attack to chest if missing limb. - Fixes mini uzi icon when empty and no mag (typo). - I renamed and changed a bit check_eye_prot and ear prot - renamed flash_eyes to flash_act() - I made a soundbang_act() similar to flash_act but for loud bangs. - added a gib and dust animation to larva. - husked monkeys - no damage overlay for husk or skeleton. - damage overlay for robotic limb now. - no damage overlay when organic bodypart husked. - one handed human with a bloody hand still get a bloody single hand overlay. - fix admin heal being unable to heal robotic bodyparts. - slightly touched robotic bodypart sprites (head one pixel too high) - Fixes 18532 "beheaded husk has hair". - Fixes 18584 "Ling stasis appearance bug" - no more eyes or lipstick on husks. - can remove flashes/wires/cells from robot chest and head with crowbar. - Fixes not being able to surgically amputate robotic arm/leg. * More merge conflict fixes and adding the new files I forgot to add. * of course I forgot birdstation * More typos and stuff I forgot to undo. * Fixing a typo in examine.dm Removing an unnecessary check. Making admin heal regenerate limbs on all carbons. Monkey-human transformation now transfer missing limbs info and presence of a cavity implant. NODISMEMBER species can still lack a limb if the mob lacked a limb and changed into that new species. Changeling Regenerate ability now also regenerate limbs when in monkey form. (and remove some cryptic useless code) * Fixing more conflicts with remie's multihands PR. * Fixes runtime with hud when calling build_hand_slots(). Fixes lightgeist healing not working. Fixes null.handle_fall() runtimes with pirate mobs. Fixes typo in has_left_hadn() and has_right_hand(). * Derp, forgot to remove debug message.
205 lines
4.5 KiB
Plaintext
205 lines
4.5 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(atom/A, proximity)
|
|
|
|
if(!has_active_hand()) //can't attack without a hand.
|
|
src << "<span class='notice'>You look at your arm and sigh.</span>"
|
|
return
|
|
|
|
// Special glove functions:
|
|
// If the gloves do anything, have them return 1 to stop
|
|
// normal attack_hand() here.
|
|
var/obj/item/clothing/gloves/G = gloves // not typecast specifically enough in defines
|
|
if(proximity && istype(G) && G.Touch(A,1))
|
|
return
|
|
|
|
var/override = 0
|
|
|
|
for(var/datum/mutation/human/HM in dna.mutations)
|
|
override += HM.on_attack_hand(src, A)
|
|
|
|
if(override)
|
|
return
|
|
|
|
A.attack_hand(src)
|
|
|
|
/atom/proc/attack_hand(mob/user)
|
|
return
|
|
|
|
/atom/proc/interact(mob/user)
|
|
return
|
|
|
|
/*
|
|
/mob/living/carbon/human/RestrainedClickOn(var/atom/A) ---carbons will handle this
|
|
return
|
|
*/
|
|
|
|
/mob/living/carbon/RestrainedClickOn(atom/A)
|
|
return 0
|
|
|
|
/mob/living/carbon/human/RangedAttack(atom/A)
|
|
if(gloves)
|
|
var/obj/item/clothing/gloves/G = gloves
|
|
if(istype(G) && G.Touch(A,0)) // for magic gloves
|
|
return
|
|
|
|
for(var/datum/mutation/human/HM in dna.mutations)
|
|
HM.on_ranged_attack(src, A)
|
|
|
|
if(isturf(A) && get_dist(src,A) <= 1)
|
|
src.Move_Pulled(A)
|
|
|
|
/*
|
|
Animals & All Unspecified
|
|
*/
|
|
/mob/living/UnarmedAttack(atom/A)
|
|
A.attack_animal(src)
|
|
|
|
/atom/proc/attack_animal(mob/user)
|
|
return
|
|
/mob/living/RestrainedClickOn(atom/A)
|
|
return
|
|
|
|
/*
|
|
Monkeys
|
|
*/
|
|
/mob/living/carbon/monkey/UnarmedAttack(atom/A)
|
|
A.attack_paw(src)
|
|
/atom/proc/attack_paw(mob/user)
|
|
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(atom/A)
|
|
if(..())
|
|
return
|
|
if(a_intent != "harm" || !ismob(A))
|
|
return
|
|
if(is_muzzled())
|
|
return
|
|
var/mob/living/carbon/ML = A
|
|
var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg")
|
|
var/obj/item/bodypart/affecting = null
|
|
if(ishuman(ML))
|
|
var/mob/living/carbon/human/H = ML
|
|
affecting = H.get_bodypart(ran_zone(dam_zone))
|
|
var/armor = ML.run_armor_check(affecting, "melee")
|
|
if(prob(75))
|
|
ML.apply_damage(rand(1,3), BRUTE, affecting, armor)
|
|
ML.visible_message("<span class='danger'>[name] bites [ML]!</span>", \
|
|
"<span class='userdanger'>[name] bites [ML]!</span>")
|
|
if(armor >= 2)
|
|
return
|
|
for(var/datum/disease/D in viruses)
|
|
ML.ForceContractDisease(D)
|
|
else
|
|
ML.visible_message("<span class='danger'>[src] has attempted to bite [ML]!</span>")
|
|
|
|
/*
|
|
Aliens
|
|
Defaults to same as monkey in most places
|
|
*/
|
|
/mob/living/carbon/alien/UnarmedAttack(atom/A)
|
|
A.attack_alien(src)
|
|
/atom/proc/attack_alien(mob/living/carbon/alien/user)
|
|
attack_paw(user)
|
|
return
|
|
/mob/living/carbon/alien/RestrainedClickOn(atom/A)
|
|
return
|
|
|
|
// Babby aliens
|
|
/mob/living/carbon/alien/larva/UnarmedAttack(atom/A)
|
|
A.attack_larva(src)
|
|
/atom/proc/attack_larva(mob/user)
|
|
return
|
|
|
|
|
|
/*
|
|
Slimes
|
|
Nothing happening here
|
|
*/
|
|
/mob/living/simple_animal/slime/UnarmedAttack(atom/A)
|
|
A.attack_slime(src)
|
|
/atom/proc/attack_slime(mob/user)
|
|
return
|
|
/mob/living/simple_animal/slime/RestrainedClickOn(atom/A)
|
|
return
|
|
|
|
|
|
/*
|
|
Drones
|
|
*/
|
|
/mob/living/simple_animal/drone/UnarmedAttack(atom/A)
|
|
A.attack_drone(src)
|
|
|
|
/atom/proc/attack_drone(mob/living/simple_animal/drone/user)
|
|
attack_hand(user) //defaults to attack_hand. Override it when you don't want drones to do same stuff as humans.
|
|
|
|
/mob/living/simple_animal/slime/RestrainedClickOn(atom/A)
|
|
return
|
|
|
|
|
|
/*
|
|
True Devil
|
|
*/
|
|
|
|
/mob/living/carbon/true_devil/UnarmedAttack(atom/A, proximity)
|
|
A.attack_hand(src)
|
|
|
|
/*
|
|
Brain
|
|
*/
|
|
|
|
/mob/living/brain/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default
|
|
return
|
|
|
|
|
|
/*
|
|
pAI
|
|
*/
|
|
|
|
/mob/living/silicon/pai/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default
|
|
return
|
|
|
|
|
|
/*
|
|
Simple animals
|
|
*/
|
|
|
|
/mob/living/simple_animal/UnarmedAttack(atom/A, proximity)
|
|
if(!dextrous)
|
|
return ..()
|
|
if(!ismob(A))
|
|
A.attack_hand(src)
|
|
update_inv_hands()
|
|
|
|
|
|
/*
|
|
Hostile animals
|
|
*/
|
|
|
|
/mob/living/simple_animal/hostile/UnarmedAttack(atom/A)
|
|
target = A
|
|
if(dextrous && !is_type_in_typecache(A, environment_target_typecache) && !ismob(A))
|
|
..()
|
|
else
|
|
AttackingTarget()
|
|
|
|
|
|
|
|
/*
|
|
New Players:
|
|
Have no reason to click on anything at all.
|
|
*/
|
|
/mob/new_player/ClickOn()
|
|
return
|