Tastyfish 6a8ea815b2 Merge branch 'master' into buttbots2 ...

Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme

2016-03-31 13:33:46 -04:00

..

lists

Merge branch 'master' into buttbots2

2016-03-31 13:33:46 -04:00

configuration.dm

Port of RemieRichard's infinite antag system

2015-12-25 22:51:02 -08:00

database.dm

SQL update

2015-09-23 06:13:42 +02:00

game_modes.dm

SQL update

2015-09-23 06:13:42 +02:00

genetics.dm

Overhaul global defines and vars

2015-05-12 20:48:38 -07:00

logging.dm

Overhaul global defines and vars

2015-05-12 20:48:38 -07:00

mapping.dm

Admin teleport update, further admin message fixes

2015-08-18 00:54:25 +02:00

misc.dm

Adds ice tiles to cold pressurized turfs

2015-12-08 01:24:38 -05:00

station.dm

Makes Cables GC Better

2015-07-08 09:30:03 -04:00

unused.dm

Kitchen Machine Refactor and Max Item fix

2015-07-10 09:46:30 -04:00