LetterJay 295c509236 Merge pull request #3264 from Kevak/Shockcollarpocketfix ...

Fixes Shock Collars Getting Stuck In Pockets.

2017-10-10 02:46:45 -04:00

..

__DATASTRUCTURES

…

__DEFINES

Merge pull request #3248 from Citadel-Station-13/upstream-merge-31066

2017-10-10 02:46:04 -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

Merge pull request #31466 from tgstation/Cyberboss-patch-2

2017-10-09 16:03:47 -05:00

datums

Update transformation.dm

2017-10-09 21:27:12 -05:00

game

Merge pull request #3264 from Kevak/Shockcollarpocketfix

2017-10-10 02:46:45 -04:00

modules

Merge pull request #3248 from Citadel-Station-13/upstream-merge-31066

2017-10-10 02:46:04 -04:00

_compile_options.dm

Merge pull request #3028 from Raeschen/master

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

world.dm

…