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

Merge pull request #388 from Tastyfish/master

Browse Source 
job title choices! lizards speak normal, can pour things down sink
This commit is contained in:
SkyMarshal
2012-02-08 18:17:30 -08:00
parent 4ed7360138 2dc3a5cc6e
commit e4d4173b97
21 changed files with 155 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/WorkInProgress/Tastyfish/livestock.dm
View File

@@ -6,9 +6,9 @@
speak_chance = 1
turns_per_move = 15
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
response_help = "pets "
response_disarm = "gently pushes aside "
response_harm = "kicks "
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
var/max_nutrition = 100 // different animals get hungry faster, basically number of 5-second steps from full to starving (60 == 5 minutes)
var/nutrition_step // cycle step in nutrition system
var/obj/movement_target // eating-ing target
@@ -17,6 +17,9 @@
if(!nutrition)
nutrition = max_nutrition * 0.33 // at 1/3 nutrition
reagents = new()
reagents.my_atom = src
Life()
..()
@@ -38,12 +41,14 @@
if(nutrition >= max_nutrition)
return
if((movement_target) && !(isturf(movement_target.loc) || ishuman(movement_target.loc) ))
if((movement_target) && !(isturf(movement_target.loc)))
movement_target = null
stop_automated_movement = 0
a_intent = "help"
turns_per_move = initial(turns_per_move)
if( !movement_target || !(movement_target.loc in oview(src, 3)) )
movement_target = null
stop_automated_movement = 0
a_intent = "help"
turns_per_move = initial(turns_per_move)
for(var/obj/item/weapon/reagent_containers/food/snacks/S in oview(src,3))
if(isturf(S.loc) || ishuman(S.loc))
movement_target = S