CitadelStationBot e1823e1a40 [MIRROR] You can now non-violently place people on tables (#5891) ...

* You can now non-violently place people on tables (#36150)

* You can now non-violently place people on tables

2018-03-10 07:43:14 -06:00

..

__DEFINES

Merge branch 'master' into upstream-merge-36242

2018-03-09 20:38:39 +00:00

__HELPERS

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

_globalvars

Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858

2018-03-09 18:37:29 +00:00

_js

…

_onclick

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

controllers

[MIRROR] NAMEOFs some things (#5877)

2018-03-10 07:38:37 -06:00

datums

[MIRROR] Fixes bodies responding to phobias (#5887)

2018-03-10 07:33:48 -06:00

game

[MIRROR] You can now non-violently place people on tables (#5891)

2018-03-10 07:43:14 -06:00

modules

[MIRROR] Fixes shuttles breaking when the turf the mobile dock is on is removed (#5880)

2018-03-10 07:37:58 -06:00

_compile_options.dm

Merge pull request #36190 from MrStonedOne/patch-489

2018-03-07 01:32:41 -06:00

world.dm

…