skull132 16d33365c2 Merge branch 'master' into development ...

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/customitems/item_defines.dm

2017-09-09 21:38:02 +03:00

..

antagonist

Adds messenger bags (#3289)

2017-08-20 14:02:55 +03:00

area

Performance tweaks (#3359)

2017-09-02 21:33:03 +03:00

datum_events

DEvent, Mk II (#3241)

2017-09-06 18:08:44 +02:00

dna

Machinery Component Initialization Refactor (#3258)

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

gamemodes

Minor vampire power changes (#3396)

2017-09-08 10:32:33 -05:00

jobs

Merge branch 'master' into development

2017-09-09 21:38:02 +03:00

machinery

Merge branch 'master' into development

2017-09-09 21:38:02 +03:00

magic

clean up some legacy code (#3211)

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

mecha

Merge branch 'master' into development

2017-09-09 21:38:02 +03:00

modifiers

…

objects

Merge branch 'master' into development

2017-09-09 21:38:02 +03:00

turfs

Fixes some walls and turf types (#3368)

2017-09-01 17:54:15 -05:00

verbs

Admin & Staff adjustments (#2529)

2017-06-13 01:37:44 +03:00

atoms_init.dm

…

atoms_movable.dm

DEvent, Mk II (#3241)

2017-09-06 18:08:44 +02:00

atoms.dm

Fashion update 2.0 (#3229)

2017-08-13 23:30:59 +03:00

base_turf.dm

Misc changes & Fixes (#2922)

2017-07-03 00:22:07 +03:00

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

sound.dm

Adds more sounds (#3327)

2017-08-27 16:58:34 -05:00

supplyshuttle.dm

More macros (#2955)

2017-07-06 23:37:58 +03:00