igalan 7e8ff266a1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ewallet ...

Conflicts:
	icons/obj/items.dmi

2014-04-21 06:07:02 +01:00

..

Accounts_DB.dm

Made modules/detectivework and economy lowercase

2013-09-30 00:22:32 -04:00

Accounts.dm

Removes pin necessity on vending machines.

2013-10-21 07:12:23 -04:00

ATM.dm

-Printable transaction logs.

2014-04-18 05:42:25 +01:00

cash.dm

-Added Malsquando's icon to items.dmi

2014-04-18 03:00:44 +01:00

economy_misc.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

EFTPOS.dm

-Added Malsquando's icon to items.dmi

2014-04-18 03:00:44 +01:00

Events_Mundane.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

Events.dm

Made modules/detectivework and economy lowercase

2013-09-30 00:22:32 -04:00

Job_Departments.dm

Made modules/detectivework and economy lowercase

2013-09-30 00:22:32 -04:00

TradeDestinations.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00