cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed it now.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2506 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rockdtben
2011-11-10 15:01:18 +00:00
parent ff84314ce6
commit c7d883a413
1 changed files with 4 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/mob/simple_animal/corgi.dm
+4 -91
View File
@@ -176,18 +176,6 @@
else
..()
/mob/living/simple_animal/corgi/attack_animal(var/mob/M)
health = health - 8
if(health > 0)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has bitten []!</B>", M, src), 1)
else
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] is gnawing on []'s bones!</B>", M, src), 1)
//IAN! SQUEEEEEEEEE~
/mob/living/simple_animal/corgi/Ian
name = "Ian"
@@ -202,78 +190,6 @@
/mob/living/simple_animal/corgi/Ian/Life()
..()
//Feeding, chasing food, FOOOOODDDD
if(alive && !resting && !buckled)
turns_since_scan++
if(turns_since_scan > 5)
turns_since_scan = 0
if((movement_target) && !(isturf(movement_target.loc) || ishuman(movement_target.loc) ))
movement_target = null
stop_automated_movement = 0
if( !movement_target || !(movement_target.loc in oview(src, 5)) )
movement_target = null
stop_automated_movement = 0
for(var/obj/item/weapon/reagent_containers/food/snacks/S in oview(src,5))
if(isturf(S.loc) || ishuman(S.loc))
movement_target = S
break
if(movement_target)
stop_automated_movement = 1
step_to(src,movement_target,1)
sleep(3)
step_to(src,movement_target,1)
sleep(3)
step_to(src,movement_target,1)
if(movement_target) //Not redundant due to sleeps, Item can be gone in 6 decisecomds
if (movement_target.loc.x < src.x)
dir = WEST
else if (movement_target.loc.x > src.x)
dir = EAST
else if (movement_target.loc.y < src.y)
dir = SOUTH
else if (movement_target.loc.y > src.y)
dir = NORTH
else
dir = SOUTH
if(isturf(movement_target.loc) )
movement_target.attack_animal(src)
else if(ishuman(movement_target.loc) )
if(prob(20))
emote("stares at the [movement_target] that [movement_target.loc] has with an angry dog-face")
if(prob(1))
emote("dances around")
spawn(0)
for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
dir = i
sleep(1)
/mob/living/simple_animal/corgi/AdmiralPoof
name = "Poof"
real_name = "Poof" //Intended to hold the name without altering it.
desc = "It's Poof, what else do you need to know?"
var/turns_since_scan = 0
var/obj/movement_target
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
icon_state = "poof"
icon_living = "poof"
icon_dead = "poof_dead"
speak = list("YAP","Woof!","Bark!","AUUUUUU")
speak_emote = list("barks", "woofs", "growls")
emote_hear = list("barks","woofs","yaps")
emote_see = list("shakes it's head", "shivers")
speak_chance = 1
turns_per_move = 5
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi/poof
meat_amount = 2
/mob/living/simple_animal/corgi/AdmiralPoof/Life()
..()
//Feeding, chasing food, FOOOOODDDD
if(alive && !resting && !buckled)
turns_since_scan++
@@ -285,9 +201,9 @@
if( !movement_target || !(movement_target.loc in oview(src, 3)) )
movement_target = null
stop_automated_movement = 0
for(var/mob/living/simple_animal/corgi/Ian/I in oview(src,3))
if(isturf(I.loc) || ishuman(I.loc))
movement_target = I
for(var/obj/item/weapon/reagent_containers/food/snacks/S in oview(src,3))
if(isturf(S.loc) || ishuman(S.loc))
movement_target = S
break
if(movement_target)
stop_automated_movement = 1
@@ -316,7 +232,7 @@
emote("stares at the [movement_target] that [movement_target.loc] has with a sad puppy-face")
if(prob(1))
emote("dances around authoritatively")
emote("dances around")
spawn(0)
for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
dir = i
@@ -324,7 +240,4 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/corgi
name = "Corgi meat"
desc = "Tastes like... well you know..."
/obj/item/weapon/reagent_containers/food/snacks/meat/corgi/poof
name = "Dachshund meat"
desc = "Tastes like... well you know..."