skull132 a5848c2802 Merge branch 'development' into map-development ...

# Conflicts:
#	baystation12.dme
#	code/game/objects/random/random.dm
#	code/game/turfs/turf_changing.dm
#	code/modules/mining/ore.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm

2017-05-01 01:07:56 +03:00

..

animate.dm

…

beams.dm

Merge branch 'development' into map-development

2017-05-01 01:07:56 +03:00

bullets.dm

Shells and Periphery (#1327)

2016-12-28 02:23:26 +02:00

change.dm

…

energy.dm

Revert "Adds snake people (#2029)" (#2031)

2017-04-01 23:39:12 +03:00

force.dm

Wizard Item Side-effects (#650)

2016-08-02 22:07:59 +03:00

special.dm

Bay wizard port/rework (#1635)

2017-02-07 18:45:42 +02:00