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

Fixes conflict..I also think i made a derp with the DME earlier

Browse Source 
so DME Fix too..i think....
This commit is contained in:
Aurorablade
2015-07-15 15:45:40 -04:00
parent 41e98f489f
commit 605ceee9e0
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
icons/mob/mob.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 196 KiB

After

Width:  |  Height:  |  Size: 219 KiB

paradise.dme
+1 -1
View File
@@ -1105,8 +1105,8 @@
#include "code\modules\events\prison_break.dm"
#include "code\modules\events\radiation_storm.dm"
#include "code\modules\events\rogue_drones.dm"
#include "code\modules\events\spacevine.dm"
#include "code\modules\events\slaughterevent.dm"
#include "code\modules\events\spacevine.dm"
#include "code\modules\events\spider_infestation.dm"
#include "code\modules\events\tear.dm"
#include "code\modules\events\viral_infection.dm"