vuonojenmustaturska 33f83e3274 Merge pull request #35152 from 81Denton/mining-vendor-conscript ...

Rearranges mining vendor items and code, adds conscription kit

2018-02-05 09:38:46 -06:00

..

__DEFINES

Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304)

2018-02-05 04:23:09 -06:00

__HELPERS

Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304)

2018-02-05 04:23:09 -06:00

_globalvars

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

_js

syncs defines

2018-01-03 23:15:49 -05:00

_onclick

Merge branch 'master' into TG-sync-testing

2018-02-03 01:52:44 +00:00

citadel

Mentor System (#5235)

2018-02-05 04:09:56 -06:00

controllers

[MIRROR] Fixes smugglers satchels being able to refresh items forever (#5313)

2018-02-05 00:48:12 -06:00

datums

Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304)

2018-02-05 04:23:09 -06:00

game

[MIRROR] Moves the spare ID inside the captain's locker (#5291)

2018-02-05 05:36:09 -06:00

modules

Merge pull request #35152 from 81Denton/mining-vendor-conscript

2018-02-05 09:38:46 -06:00

_compile_options.dm

Low memory mode

2018-01-19 09:12:37 -06:00

world.dm

Merge pull request #4742 from Citadel-Station-13/upstream-merge-34217

2018-01-10 19:59:51 +00:00