cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 13:36:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm
This commit is contained in:
PsiOmega
2015-03-13 09:23:26 +01:00
parent 9c30024ca0 949d1fa5b8
commit ce30b00287
69 changed files with 3159 additions and 2935 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/landmarks.dm
+1 -1
View File
@@ -117,7 +117,7 @@
/obj/effect/landmark/start/ninja/New()
..()
ninjastart += loc
ninjastart += src
//Costume spawner landmarks