cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-23 00:22:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,372 Commits 2 Branches 1 Tag
f54dd94a66e5d94975d0b51ec20655c5e165ca22
Commit Graph

3 Commits

Author SHA1 Message Date
PsiOmegaDelta
34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm
 2015-07-14 08:21:12 +02:00
Chinsky
026500ea06 Merge remote-tracking branch 'remotes/upstream/dev' into definecrusade 2015-06-05 11:26:25 +03: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