Jordan Brown 00c17ad6e5 Merge pull request #33263 from kevinz000/patch-402 ...

People pulling/grabbing a defib target now gets shocked harmfully when the defib goes off

2017-12-09 15:52:35 -06:00

..

__DATASTRUCTURES

…

__DEFINES

Revert "[MIRROR] [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets."

2017-12-08 19:16:49 -08:00

__HELPERS

Merge pull request #4266 from Citadel-Station-13/upstream-merge-33345

2017-12-08 18:47:22 +00:00

_globalvars

Merge pull request #33324 from deathride58/foreignfurryaddswidescreen

2017-12-08 10:35:23 -06:00

_js

Update byjax.dm

2017-11-20 22:27:58 -05:00

_onclick

Adds support for non-1:1 screen ratios (Doesn't add widescreen) (#32950)

2017-12-05 19:46:20 -06:00

citadel

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

2017-12-08 19:58:41 -05:00

controllers

Revert "[MIRROR] [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets."

2017-12-08 19:16:49 -08:00

datums

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

2017-12-08 19:58:41 -05:00

game

Merge pull request #33263 from kevinz000/patch-402

2017-12-09 15:52:35 -06:00

modules

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

2017-12-08 19:58:41 -05:00

_compile_options.dm

Update _compile_options.dm

2017-11-23 16:37:49 -08:00

world.dm

…