cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-05-23 23:27:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,136 Commits 66 Branches 25 Tags
fb6b94de8773e6855b362faf84ef8e0f427e608f
Commit Graph

2 Commits

Author SHA1 Message Date
PsiOmegaDelta 9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm
 2015-07-11 10:58:49 +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