Merge pull request #2612 from Aurorablade/Guardingthings

Fethas Carnival of Horrors part 4: I am in your greytide guarding ur newbs
This commit is contained in:
TheDZD
2015-12-02 21:21:22 -05:00
11 changed files with 943 additions and 17 deletions
+2
View File
@@ -201,6 +201,8 @@ datum/hud/New(mob/owner)
human_hud('icons/mob/screen1_Vampire.dmi')
else if(isswarmer(mymob))
swarmer_hud()
else if(isguardian(mymob))
guardian_hud()
//Triggered when F12 is pressed (Unless someone changed something in the DMF)
/mob/verb/button_pressed_F12(var/full = 0 as null)
+5
View File
@@ -45,6 +45,11 @@
*/
/mob/living/UnarmedAttack(var/atom/A)
A.attack_animal(src)
/mob/living/simple_animal/hostile/UnarmedAttack(var/atom/A)
target = A
AttackingTarget()
/atom/proc/attack_animal(mob/user as mob)
return
/mob/living/RestrainedClickOn(var/atom/A)