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

compile fix

Browse Source
This commit is contained in:
ZomgPonies
2014-02-05 22:53:46 -05:00
parent 27b4fa0001
commit 95a0c8f7e3
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_defense.dm
-3
View File
@@ -134,7 +134,6 @@
return 0
// End BS12 momentum-transfer code.
<<<<<<< HEAD
//Mobs on Fire
/mob/living/proc/IgniteMob()
@@ -173,5 +172,3 @@
IgniteMob()
//Mobs on Fire end
=======
>>>>>>> 9665e8c... Mouse Attack_Logs disabled. Admins rejoice.