LetterJay e494f5cc8b Merge pull request #3283 from Citadel-Station-13/upstream-merge-31504 ...

[MIRROR] Fixes Clock Cult ending with dead cultists

2017-10-10 22:28:36 -04:00

..

__DATASTRUCTURES

…

__DEFINES

Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser (#31399)

2017-10-10 03:11:50 -05:00

__HELPERS

Merge pull request #31440 from kevinz000/patch-319

2017-10-10 03:17:33 -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

Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser (#31399)

2017-10-10 03:11:50 -05:00

game

Fixes Clock Cult ending with dead cultists (#31504)

2017-10-10 12:38:31 -05:00

modules

Merge pull request #3282 from Citadel-Station-13/upstream-merge-31356

2017-10-10 22:28:29 -04:00

_compile_options.dm

Merge pull request #3028 from Raeschen/master

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

world.dm

…