cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,582 Commits 5 Branches 0 Tags
55bc41241f2c7b18f627719dd43a797bee814d6d
Commit Graph

3 Commits

Author SHA1 Message Date
PsiOmegaDelta
55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/setup.dm
 2015-08-17 09:37:49 +02:00
PsiOmegaDelta
f420dd9f01 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defines.dm
	code/modules/mob/living/silicon/silicon.dm
	code/setup.dm
 2015-06-30 08:59:34 +02:00
Chinsky
bf53304fec Splits setup.dm into berjillion of smaller files vaguely named thematically. 
Also moved __HELPERS and _defines around so defines actually come first.
 2015-06-04 21:51:58 +03:00