3/3 port done

This commit is contained in:
ZomgPonies
2015-05-25 20:16:34 -04:00
parent 1935a82afe
commit e056abfb82
100 changed files with 57 additions and 480 deletions
@@ -62,13 +62,6 @@ In all, this is a lot like the monkey code. /N
return 0
/mob/living/carbon/alien/attack_paw(mob/living/carbon/monkey/M as mob)
if(..())
if (stat != DEAD)
adjustBruteLoss(rand(1, 3))
updatehealth()
return
/mob/living/carbon/alien/attack_animal(mob/living/simple_animal/M as mob)
if(..())
@@ -1,18 +0,0 @@
/mob/living/carbon/human/attack_paw(mob/living/M as mob)
..()
if (M.a_intent == "help")
help_shake_act(M)
else
M.do_attack_animation(src)
if (M.is_muzzled())
return
visible_message("<span class='danger'>[M.name] bites [src]!</span>", \
"<span class='userdanger'>[M.name] bites [src]!</span>")
playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
var/damage = rand(1, 3)
var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg")
var/obj/item/organ/external/affecting = get_organ(ran_zone(dam_zone))
apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, "melee"))
return
@@ -14,10 +14,6 @@
/obj/machinery/computer/drone_control/attack_ai(var/mob/user as mob)
return src.attack_hand(user)
/obj/machinery/computer/drone_control/attack_paw(var/mob/user as mob)
return src.attack_hand(user)
return
/obj/machinery/computer/drone_control/attack_hand(var/mob/user as mob)
if(..())
@@ -1012,10 +1012,6 @@ var/list/robot_verbs_default = list(
user.visible_message("<span class='notice'>[user] pets [src]!</span>", \
"<span class='notice'>You pet [src]!</span>")
/mob/living/silicon/robot/attack_paw(mob/user)
return attack_hand(user)
/mob/living/silicon/robot/proc/allowed(mob/M)
//check if it doesn't require any access at all
if(check_access(null))
@@ -732,22 +732,4 @@
/mob/living/simple_animal/parrot/proc/parrot_hear(var/message="")
if(!message || stat)
return
speech_buffer.Add(message)
/mob/living/simple_animal/parrot/attack_paw(var/mob/user, var/damage, var/attack_message)
var/success = ..()
if(client)
return success
if(parrot_state == PARROT_PERCH)
parrot_sleep_dur = parrot_sleep_max //Reset it's sleep timer if it was perched
if(!success)
return 0
parrot_interest = user
parrot_state = PARROT_SWOOP | PARROT_ATTACK //Attack other animals regardless
icon_state = "parrot_fly"
return success
speech_buffer.Add(message)
@@ -197,8 +197,6 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
..()
return
/obj/structure/tribble_cage/attack_paw(mob/user as mob)
return src.attack_hand(user)
/obj/structure/tribble_cage/attack_hand(mob/user as mob)
if (src.destroyed)