cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolves merge conflicts

Browse Source 
Conflicts:
	code/game/machinery/computer/communications.dm
This commit is contained in:
Krausus
2015-08-18 04:14:14 -04:00
parent 6dc8b850ac e618f79418
commit f816b8672d
136 changed files with 942 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/transform_procs.dm
+1 -1
View File
@@ -482,7 +482,7 @@
return 1
//Friendly Creatures!
if(ispath(MP, /mob/living/carbon/primitive/diona) && !jobban_isbanned(src, "Dionaea"))
if(ispath(MP, /mob/living/simple_animal/diona) && !jobban_isbanned(src, "Dionaea"))
return 1
//Not in here? Must be untested!