skull132 c0f22a1cdd Merge branch 'master' into development ...

# Conflicts:
#	maps/aurora/aurora-1_centcomm.dmm

2017-10-29 16:15:53 +02:00

..

modules

Runtime Map Loading (#3597)

2017-10-18 23:07:34 +03:00

suits

Hardsuit fixes and grenade launcher restrictions (#3536)

2017-10-07 00:45:07 -05:00

rig_attackby.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

rig_pieces.dm

…

rig_verbs.dm

…

rig_wiring.dm

…

rig.dm

Fixes some runtimes (#3727)

2017-10-22 02:37:44 +03:00