cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into buttbots2

Browse Source 
Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme
This commit is contained in:
Tastyfish
2016-03-31 13:33:46 -04:00
parent fb9c883b90 38692feb95
commit 6a8ea815b2
245 changed files with 6723 additions and 4456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spells/bloodcrawl.dm
+1 -1
View File
@@ -22,7 +22,7 @@
/obj/effect/proc_holder/spell/bloodcrawl/perform(obj/effect/decal/cleanable/target, recharge = 1, mob/living/user = usr)
if(istype(user))
if(phased == 1)
if(phased)
if(user.phasein(target))
phased = 0
else