Joan LungandCitadelStationBot 02987715b0 Fixes Vanguard never stunning for more than 2 seconds

2017-10-01 19:29:34 -05:00

..

__DATASTRUCTURES

…

__DEFINES

Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138

2017-10-01 16:20:56 -04:00

__HELPERS

Fixes paper writing (#31203)

2017-10-01 08:41:16 -05:00

_globalvars

Merge branch 'master' into upstream-merge-30763

2017-09-30 15:30:46 -04:00

_js

…

_onclick

Merge branch 'master' into upstream-merge-31069

2017-10-01 02:56:28 -04:00

citadel

Merge pull request #2958 from Michiyamenotehifunana/wave3guns

2017-09-29 12:45:52 -04:00

controllers

Merge pull request #31082 from Incoming5643/Satchel_Fix

2017-10-01 15:02:23 -05:00

datums

Fixes Vanguard never stunning for more than 2 seconds

2017-10-01 19:29:34 -05:00

game

Merge pull request #3050 from Citadel-Station-13/upstream-merge-31162

2017-10-01 16:32:24 -04:00

modules

Merge pull request #3061 from Citadel-Station-13/upstream-merge-31114

2017-10-01 16:56:24 -04:00

_compile_options.dm

Merge pull request #3028 from Raeschen/master

2017-09-30 12:56:20 -04:00

world.dm

…