Commit Graph

7064 Commits

Author SHA1 Message Date
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
LetterJay
5f69eac050 Update mind.dm 2017-12-20 00:19:39 -06:00
LetterJay
8a1ed70888 Update roundend.dm 2017-12-20 00:08:37 -06:00
LetterJay
d6a5ee596b Update mind.dm 2017-12-19 23:55:36 -06:00
LetterJay
5bd61908a3 Update game_mode.dm 2017-12-19 23:53:36 -06:00
LetterJay
4d5c32ae56 Update game_mode.dm 2017-12-19 22:11:04 -06:00
LetterJay
7dec65ff85 fuck 2017-12-19 20:20:09 -06:00
LetterJay
36ad355f9d Update mind.dm 2017-12-19 20:08:49 -06:00
LetterJay
a8e36670e2 Update mind.dm 2017-12-19 20:02:03 -06:00
LetterJay
efc41a15d3 Update mob_helpers.dm 2017-12-19 19:36:03 -06:00
LetterJay
9ab75d37b7 Update operative.dm 2017-12-19 19:35:41 -06:00
LetterJay
2148eb021b Update randomverbs.dm 2017-12-19 19:34:44 -06:00
LetterJay
da2bf6293f Update one_click_antag.dm 2017-12-19 19:34:02 -06:00
LetterJay
80412ae3b9 Update player_panel.dm 2017-12-19 19:32:18 -06:00
LetterJay
74bba8aea7 Update cards_ids.dm 2017-12-19 19:31:44 -06:00
LetterJay
2b434438e0 Update telecrystalconsoles.dm 2017-12-19 19:31:17 -06:00
LetterJay
9d90a2bf5b Update pinpointer.dm 2017-12-19 19:30:54 -06:00
LetterJay
c545ef06cd Update nuclearbomb.dm 2017-12-19 19:30:23 -06:00
LetterJay
951a540882 Update nuclear.dm 2017-12-19 19:29:27 -06:00
LetterJay
992984388b Update game_mode.dm 2017-12-19 19:29:04 -06:00
LetterJay
5983d7b13d Update antag_spawner.dm 2017-12-19 19:27:36 -06:00
LetterJay
614e93b975 Update mind.dm 2017-12-19 19:26:28 -06:00
LetterJay
e6cab75e71 NukeDatum 2017-12-19 19:22:03 -06:00
LetterJay
dfa53390df Update nuclear.dm 2017-12-19 19:12:26 -06:00
LetterJay
bcbb4102bf Update disease_outbreak.dm 2017-12-19 18:50:43 -06:00
LetterJay
63b1b1df88 Update disease_outbreak.dm 2017-12-19 18:40:20 -06:00
LetterJay
f3e031fe2f Update telecrystalconsoles.dm 2017-12-19 18:02:16 -06:00
LetterJay
56737f32de Update disease_outbreak.dm 2017-12-19 17:59:55 -06:00
LetterJay
6c39e94bba Update observer.dm 2017-12-19 17:56:52 -06:00
LetterJay
30796ad342 Update cit_arousal.dm 2017-12-19 17:56:06 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJay
a0a4acbc2c Update nuclear.dm 2017-12-19 17:33:55 -06:00
LetterJay
a98178251d Merge pull request #4444 from Citadel-Station-13/upstream-merge-33531
[MIRROR] [READY]Cyborg jousting with spears!
2017-12-19 17:31:26 -06:00
LetterJay
516db4851f Update disease_outbreak.dm 2017-12-19 16:53:21 -06:00
LetterJay
16f1a07b92 diseases 2017-12-19 16:41:09 -06:00
LetterJay
5ed003a0f5 Update client_defines.dm 2017-12-19 15:36:07 -06:00
LetterJay
7d193a5303 Update wizard.dm 2017-12-19 15:35:57 -06:00
LetterJay
a30de42820 Update traitor.dm 2017-12-19 15:35:45 -06:00
LetterJay
2d65e0df49 Update nuclear.dm 2017-12-19 15:35:29 -06:00
LetterJay
61c7080c34 Update game_mode.dm 2017-12-19 15:34:59 -06:00
LetterJay
cb8c6cd5e2 Update changeling.dm 2017-12-19 15:34:38 -06:00
LetterJay
98d752fe21 Update traitor_bro.dm 2017-12-19 15:34:27 -06:00
LetterJay
678762209a Update ticker.dm 2017-12-19 15:33:31 -06:00
deathride58
d39b0204fa Merge pull request #4382 from Citadel-Station-13/upstream-merge-33307
[MIRROR] Adds config inclusion system
2017-12-19 19:49:32 +00:00
deathride58
65412db421 Update game_options.dm 2017-12-19 14:34:06 -05:00
kevinz000
8149f52777 Adds jousting (#33531) 2017-12-18 20:54:21 -06:00
XDTM
6b4099805f [Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209)
* Adds abductor Mind Interface Devices, and a gland HUD

* .
2017-12-18 20:29:37 -06:00
LetterJay
9710f0f842 Merge pull request #4439 from Citadel-Station-13/ServerAPI
Updates server API to preoper version
2017-12-18 19:30:26 -06:00
LetterJay
76e6cb4e48 Update server_tools.dm 2017-12-18 17:31:07 -06:00
LetterJay
c9a47bc6f4 Merge pull request #4437 from Citadel-Station-13/upstream-merge-33510
[MIRROR] Makes the chemical smoke machine use stock parts for things
2017-12-18 17:28:26 -06:00