cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 17:43:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

here we go with this shit again

Browse Source
This commit is contained in:
Aurorablade
2016-02-24 06:26:42 -05:00
parent c65b411e63
commit 7b1715f9df
4 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
-1
View File
@@ -1 +0,0 @@
*.dmm merge=merge-dmm
.gitconfig
-5
View File
@@ -1,5 +0,0 @@
[merge "merge-dmm"]
name = mapmerge driver
driver = ./mapmerge.sh %O %A %B
recursive = text
icons/obj/gun.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 78 KiB

icons/obj/storage.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB