SinTwo 6bb5409349 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade ...

Conflicts:
	code/modules/admin/holder2.dm

2016-08-15 12:26:53 -04:00

..

Accounts_DB.dm

world time fix

2016-07-30 03:19:47 -04:00

Accounts.dm

world time fix

2016-07-30 03:19:47 -04:00

ATM.dm

stationtime fix

2016-08-10 18:34:00 -04:00

cash_register.dm

world time fix

2016-07-30 03:19:47 -04:00

cash.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

economy_misc.dm

Generic Station & System Name

2016-05-16 15:34:03 -04:00

EFTPOS.dm

world time fix

2016-07-30 03:19:47 -04:00

Events_Mundane.dm

Cleans up the code to match recent Tajaran rewrite

2016-08-13 23:07:00 -05:00

Events.dm

Generic Station & System Name

2016-05-16 15:34:03 -04:00

price_list.dm

Adds new non-alcoholic drinks

2016-07-07 21:51:30 +01:00

retail_scanner.dm

world time fix

2016-07-30 03:19:47 -04:00

TradeDestinations.dm

Generic Station & System Name

2016-05-16 15:34:03 -04:00