Commit Graph

7050 Commits

Author SHA1 Message Date
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
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
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
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
LetterJay
c9e131883d Merge branch 'master' into ServerAPI 2017-12-18 17:22:10 -06:00
LetterJay
390c24b3fd Create server_tools.config.dm 2017-12-18 16:42:17 -06:00
LetterJay
5f237c595b Merge pull request #4436 from Citadel-Station-13/upstream-merge-33615
[MIRROR] Adds reloading sounds to guns
2017-12-18 15:51:06 -06:00
LetterJay
f8efa8fe9e Merge pull request #4432 from Citadel-Station-13/upstream-merge-33605
[MIRROR] Adds repeated message squashing to chat.
2017-12-18 15:28:17 -06:00
LetterJay
7f75b114b4 Merge pull request #4431 from Citadel-Station-13/upstream-merge-33613
[MIRROR] deep fryers are quieter now...
2017-12-18 15:27:57 -06:00
LetterJay
e933d69a22 Merge pull request #4429 from Citadel-Station-13/upstream-merge-33302
[MIRROR] Spinning resin or laying eggs on vents prompts the user if they're sure
2017-12-18 15:27:12 -06:00
LetterJay
06617159b7 Merge pull request #4428 from Citadel-Station-13/upstream-merge-33419
[MIRROR] Lollipop dispensers can push lollipops into people's hands
2017-12-18 15:27:03 -06:00
LetterJay
6e5bd180fa Merge pull request #4427 from Citadel-Station-13/upstream-merge-33598
[MIRROR] Microwave sound loops now stop in all cases where it should, such as being interrupted or breaking
2017-12-18 15:26:42 -06:00
LetterJay
da58957c23 Merge pull request #4425 from Citadel-Station-13/upstream-merge-33607
[MIRROR] Dance Machine now obeys instrument preference
2017-12-18 15:26:33 -06:00
LetterJay
4a835b47ce Merge pull request #4417 from Citadel-Station-13/upstream-merge-33586
[MIRROR] Disables clockcult power alerts to ghosts when it's not clockcult
2017-12-18 15:25:46 -06:00
LetterJay
7df9c3b5fc Merge pull request #4416 from Citadel-Station-13/upstream-merge-33566
[MIRROR] Fixes race swap ruining rounds
2017-12-18 15:25:33 -06:00
LetterJay
ba5306c8fe Merge pull request #4415 from Citadel-Station-13/upstream-merge-33568
[MIRROR] Fixes zombie stun immunity, more pep in their step
2017-12-18 15:25:13 -06:00
LetterJay
15adc5d0b0 Update st_interface.dm 2017-12-18 15:24:23 -06:00