cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-21 12:17:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
This commit is contained in:
PsiOmegaDelta
2015-07-14 08:11:11 +02:00
parent f77c0789c1 e6481d4a2c
commit 8da7141af1
5 changed files with 90 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/simple_animal.dm
+1
View File
@@ -102,6 +102,7 @@
handle_stunned()
handle_weakened()
handle_paralysed()
update_canmove()
handle_supernatural()
//Movement