Kevak fb60efeacb Fixes shock collars getting stuck in pockets.

2017-10-09 22:45:02 -07:00

..

__DATASTRUCTURES

…

__DEFINES

Merge pull request #3225 from Citadel-Station-13/upstream-merge-31413

2017-10-08 16:22:10 -04:00

__HELPERS

Fixes being able to sell camera mobs to CentCom (#31306)

2017-10-07 19:13:28 -05:00

_globalvars

Merge pull request #31413 from vuonojenmustaturska/codejanitoring

2017-10-08 10:00:34 -05:00

_js

…

_onclick

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

citadel

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

2017-10-09 14:42:47 -04:00

controllers

Adds time dilation data to the feedback table (#31278)

2017-10-08 15:38:15 -05:00

datums

Merge pull request #3246 from Citadel-Station-13/upstream-merge-31434

2017-10-09 06:24:02 -04:00

game

Fixes shock collars getting stuck in pockets.

2017-10-09 22:45:02 -07:00

modules

Merge pull request #3254 from Citadel-Station-13/upstream-merge-31463

2017-10-09 23:02:06 -04:00

_compile_options.dm

…

world.dm

…