cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-04-15 08:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,454 Commits 10 Branches 26 Tags
1a94dea2ea53b535965a2919bcf6b622fb9cb2db
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