skull132 674cd94714 Merge branch 'master' into development ...

# Conflicts:
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-5_interstitial.dmm

2018-05-13 19:19:52 +03:00

..

_trading_defines.dm

Baystation12 merchant port (#3155)

2017-08-04 21:36:04 +03:00

ai.dm

Mental Medication Additions (#4648)

2018-05-13 17:39:56 +03:00

food.dm

Baystation12 merchant port (#3155)

2017-08-04 21:36:04 +03:00

goods.dm

Merge branch 'master' into development

2018-05-13 19:19:52 +03:00

misc.dm

Adds more ancient warfare to spessmen (#4325)

2018-03-10 17:18:15 +02:00

ship.dm

Baystation12 merchant port (#3155)

2017-08-04 21:36:04 +03:00

trade.dm

Bug Fixes (#4076)

2018-01-14 22:14:11 +02:00

unique.dm

The k'ois nerf to end all k'ois nerfs (#4304)

2018-03-03 00:34:48 +02:00

vox.dm

Some small fixes and tweaks (#3933)

2017-12-08 17:10:02 -06:00

weaponry.dm

Bolt-action refactor (#4667)

2018-05-02 21:24:32 +03:00