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

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

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

..

antagonist

Runtime Map Loading (#3597)

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

area

Merge branch 'master' into development

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

dna

Machinery Component Initialization Refactor (#3258)

2017-08-09 20:33:14 +03:00

gamemodes

Merge branch 'master' into development

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

jobs

Fixes the merchant job showing up in the id's console (#3737)

2017-10-29 13:17:07 +02:00

machinery

Merge branch 'master' into development

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

magic

clean up some legacy code (#3211)

2017-08-02 19:53:23 +03:00

mecha

Runtime Map Loading (#3597)

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

modifiers

Adds the sarlaccs and some golden slime fixes (#3533)

2017-10-07 13:15:34 +03:00

objects

Merge branch 'master' into development

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

turfs

Merge branch 'master' into development

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

verbs

…

atoms_init.dm

Runtime Map Loading (#3597)

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

atoms_movable.dm

Merge branch 'master' into development

2017-10-20 13:30:03 -05:00

atoms.dm

Fixes to getFlatIcon and more. (#3353)

2017-09-19 15:43:01 +03:00

base_turf.dm

Runtime Map Loading (#3597)

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

periodic_news.dm

…

response_team.dm

Runtime Map Loading (#3597)

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

shuttle_engines.dm

…

sound.dm

Sound Tweaks (#3627)

2017-10-20 17:53:44 +03:00

supplyshuttle.dm

…