Markolie 8086d61042 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into malf ...

Conflicts:
	code/game/objects/items/devices/aicard.dm

2015-08-18 20:24:10 +02:00

..

flavor_misc.dm

-tg- underware overhaul

2015-08-13 17:45:52 -07:00

misc.dm

Overhaul global defines and vars

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

mobs.dm

Admin jump overhaul, add watchlist functionality, other admin updates

2015-08-16 23:28:02 +02:00

names.dm

Overhaul global defines and vars

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

objects.dm

Malf AI update

2015-08-18 20:22:38 +02:00