cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12

Browse Source 
Conflicts:
	maps/tgstation.2.0.8.dmm
This commit is contained in:
SkyMarshal
2012-01-28 02:03:42 -07:00
parent f623c4848e 416cec5da9
commit 3e9146f99a
39 changed files with 100 additions and 4389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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 \the"
response_disarm = "gently pushes aside \the"
response_harm = "kicks \the"
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