Commit Graph

3 Commits

Author SHA1 Message Date
Zuhayr
ed5d041395 Added ceil() macro, replaced n_ceil() as GN said. 2016-02-01 04:12:11 +10:30
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