8 Commits

Author	SHA1	Message	Date
Cael_Aislinn	ad75e6b352	merge with tgstation's r4618, removed some broken bs12 merges (organs, pain) ... Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>	2012-09-06 13:09:20 +10:00
Hawk-v3	fc2a7f3a81	More Breakroom things, and a second Json fix.	2012-05-11 18:47:00 +01:00
Hawk-v3	5a24d138b5	Trying to stop JSON -> WORLD dumps	2012-05-11 01:09:10 +01:00
Albert Iordache	159fd0bfc9	Fixed a runtime error related to the group_multiplier of an air mixture being 0 ... In certain cases, zones would be emptied completely of turfs, thereby causing division by zero errors in FEA due to operations involving group_multiplier.	2012-03-29 23:45:48 +03:00
Tastyfish	f6706ef333	retired admins don't get sent as admins in json	2012-01-04 22:01:24 -05:00
Miniature	da96fabe25	Fixed json thing	2011-12-12 01:33:47 +10:30
Head	e1df14b5c1	Forgot to call makejson()	2011-11-29 18:15:49 +01:00
Head	43d71282e0	Added back json support / restart notice ... should fix unnecessary restart after gamemode change before round start	2011-11-29 15:45:01 +01:00