cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allows admins to 'animalize' a player into a parrot

Browse Source 
Added in a message for player-parrots trying to use the 'sit' verb when no perch is in range.

Removed the 'Warning, this is unfinished!' message when trying to spawn parrots.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4925 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
johnsonmt88@gmail.com
2012-10-21 01:16:36 +00:00
parent e99c70722f
commit 6c3686aa96
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/simple_animal/parrot.dm
View File

@@ -93,7 +93,6 @@
/mob/living/simple_animal/parrot/New() /mob/living/simple_animal/parrot/New()
usr << "\red Parrots are still a work in progress, use at your own risk."
..() ..()
parrot_sleep_dur = parrot_sleep_max //In case someone decides to change the max without changing the duration var parrot_sleep_dur = parrot_sleep_max //In case someone decides to change the max without changing the duration var
verbs.Add(/mob/living/simple_animal/parrot/proc/steal_from_ground, \ verbs.Add(/mob/living/simple_animal/parrot/proc/steal_from_ground, \
@@ -678,6 +677,7 @@
src.loc = AM.loc src.loc = AM.loc
icon_state = "parrot_sit" icon_state = "parrot_sit"
return return
src << "\red There is no perch nearby to sit on."
return return
/* /*

5
code/modules/mob/transform_procs.dm
View File

@@ -335,9 +335,6 @@
if(!MP) if(!MP)
return 0 //Sanity, this should never happen. return 0 //Sanity, this should never happen.
if(ispath(MP, /mob/living/simple_animal/parrot))
return 0 //Parrots are unfinished, they have no sprite, movement, ect...(Working on this - Nodrak)
if(ispath(MP, /mob/living/simple_animal/space_worm)) if(ispath(MP, /mob/living/simple_animal/space_worm))
return 0 //Unfinished. Very buggy, they seem to just spawn additional space worms everywhere and eating your own tail results in new worms spawning. return 0 //Unfinished. Very buggy, they seem to just spawn additional space worms everywhere and eating your own tail results in new worms spawning.
@@ -372,6 +369,8 @@
return 1 //It is impossible to pull up the player panel for mice (Fixed! - Nodrak) return 1 //It is impossible to pull up the player panel for mice (Fixed! - Nodrak)
if(ispath(MP, /mob/living/simple_animal/bear)) if(ispath(MP, /mob/living/simple_animal/bear))
return 1 //Bears will auto-attack mobs, even if they're player controlled (Fixed! - Nodrak) return 1 //Bears will auto-attack mobs, even if they're player controlled (Fixed! - Nodrak)
if(ispath(MP, /mob/living/simple_animal/parrot))
return 1 //Parrots are no longer unfinished! -Nodrak
//Not in here? Must be untested! //Not in here? Must be untested!
return 0 return 0