6 Commits

Author	SHA1	Message	Date
Crazylemon64	ad1f67c9f9	Spaces to tabs	2016-07-09 11:57:56 -07:00
Crazylemon64	a779fc8663	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins ... All hail glorious leader tigercat	2016-07-08 00:16:28 -07:00
Crazylemon64	20eee9064c	Fixes init on various things, as well as allowing the ... map loader to safely load templates mid-run	2016-07-07 23:52:44 -07:00
Crazylemon64	f0bac4c179	Initialization deferral is now handled by the caller, but ... is now also seamless	2016-07-07 00:17:21 -07:00
Crazylemon64	1745c71474	Fixes a bug involving a map template resetting the map loader's ... progress	2016-07-06 22:51:48 -07:00
Crazylemon64	27ee3c7247	It's re-entrant now	2016-07-04 14:52:19 -07:00