skull132 1e973b2d6a Merge branch 'master' into development ...

# Conflicts:
#	code/modules/multiz/movement.dm
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-6_surface.dmm

2018-01-21 23:51:44 +02:00

..

_trading_defines.dm

…

ai.dm

Some small fixes and tweaks (#3933)

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

food.dm

…

goods.dm

Merge branch 'master' into development

2018-01-21 23:51:44 +02:00

misc.dm

Adds pranks, jukes, and anal retentive bolt action rifles (#3664)

2017-11-10 23:53:01 -06:00

ship.dm

…

trade.dm

Bug Fixes (#4076)

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

unique.dm

Bug Fixes (#4076)

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

vox.dm

Some small fixes and tweaks (#3933)

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

weaponry.dm

Some small fixes and tweaks (#3933)

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