LetterJay a17b4ff953 Merge branch 'master' into singerydonator

2019-07-05 14:31:31 -05:00

..

__HELPERS

modular_citadel

2018-05-20 23:04:13 -05:00

_globalvars/lists

…

_onclick

Make combat mode actually override the VM icon

2019-03-27 04:23:37 -05:00

controllers

Fixes Navy officer uniform re-ports #7515

2019-04-05 15:08:04 -05:00

datums

Ports "Reorganizes the uplink, adds grenades and explosives category." (#8669)

2019-06-23 06:00:27 -07:00

game

Merge pull request #8729 from Ghommie/Ghommie-cit79

2019-06-28 20:30:44 -07:00

modules

Merge branch 'master' into singerydonator

2019-07-05 14:31:31 -05:00

init.dm

Character Creation Overhaul (#7987)

2019-02-22 05:59:05 -08:00