cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 08:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into blobjob

Browse Source 
Conflicts:
	code/modules/mob/transform_procs.dm
This commit is contained in:
Incoming
2014-02-12 21:37:59 -05:00
parent 883ab28dde e602febd40
commit 458e955366
310 changed files with 25250 additions and 18423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/transform_procs.dm
+1 -1
View File
@@ -493,7 +493,7 @@
return 1
if(ispath(MP, /mob/living/simple_animal/hostile/carp))
return 1
if(ispath(MP, /mob/living/simple_animal/mushroom))
if(ispath(MP, /mob/living/simple_animal/hostile/mushroom))
return 1
if(ispath(MP, /mob/living/simple_animal/shade))
return 1