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

..

__defines

DEvent, Mk II (#3241)

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

_helpers

Closet & use_check() tweaks (#3346)

2017-08-29 23:25:19 +03:00

_onclick

Adds more cleric spells and more (#3348)

2017-08-30 21:38:31 +02:00

ATMOSPHERICS

Adds some things (#3357)

2017-09-02 18:16:22 +02:00

controllers

Merge branch 'master' into development

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

datums

Merge branch 'master' into development

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

defines

Makes some machines upgradeable (#3311)

2017-08-28 01:51:37 -05:00

game

Merge branch 'master' into development

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

js

…

modules

Merge branch 'master' into development

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

unit_tests

DEvent, Mk II (#3241)

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

ZAS

Misc Synthetic Code Cleanup & Minor Tweaks (#3307)

2017-08-29 23:21:29 +03:00

global.dm

Converts reagent containers to Initialize, fixes hand-chew cool down and moves suit sensor Z-level list (#3367)

2017-09-02 21:35:58 +03:00

hub.dm

…

names.dm

…

stylesheet.dm

Change DOsay color again (#2138)

2017-05-01 19:30:45 +03:00

world.dm

Fixes a bug with default values. (#3237)

2017-08-05 22:36:14 +03:00