Commit Graph

9021 Commits

Author SHA1 Message Date
LetterJay a8d6fa7fd7 Update runes.dm 2017-12-30 13:31:51 -06:00
LetterJay 6c59d4134a Update ritual.dm 2017-12-30 13:31:24 -06:00
LetterJay f0214dd06d Update overmind.dm 2017-12-30 13:31:13 -06:00
LetterJay c8f3fdfe38 Merge branch 'master' into upstream-merge-33663 2017-12-30 13:29:36 -06:00
LetterJay dda430131a Update roundend.dm 2017-12-30 13:28:58 -06:00
LetterJay dae3c3efb5 Merge branch 'master' into upstream-merge-33621 2017-12-30 13:23:39 -06:00
LetterJay 35574263b1 Update outlet_injector.dm 2017-12-30 13:23:02 -06:00
LetterJay 70fea88a39 Update cryo.dm 2017-12-30 13:22:54 -06:00
LetterJay 95714a0207 Update volume_pump.dm 2017-12-30 13:22:46 -06:00
LetterJay 8452cc74d0 Update newscaster.dm 2017-12-30 13:21:31 -06:00
LetterJay b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705
[MIRROR] Turns the baseturf var into a part time list
2017-12-30 13:19:00 -06:00
LetterJay d3f6cf4dd8 Merge branch 'master' into upstream-merge-33537 2017-12-30 13:14:48 -06:00
Jordan Brown cbb8d807f1 turfs changed to /space/basic are instead turned into /space 2017-12-30 13:14:04 -06:00
cebutris 8c6d660611 adds functional cebusoap 2017-12-30 10:04:03 -05:00
LetterJay f860fa0cd3 Update closed.dm 2017-12-30 05:12:10 -06:00
LetterJay 68b44e73f4 Merge pull request #4533 from Citadel-Station-13/upstream-merge-33734
[MIRROR] Makes cyclelinkeddir rotate with shuttle
2017-12-30 05:06:32 -06:00
LetterJay 0402595242 Merge pull request #4540 from Citadel-Station-13/upstream-merge-33835
[MIRROR] Adds coordinates to href logs
2017-12-30 05:06:19 -06:00
LetterJay 19c6db6a6e Merge pull request #4591 from Citadel-Station-13/upstream-merge-33905
[MIRROR] Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
2017-12-30 05:06:03 -06:00
LetterJay 61203ed9f6 Merge pull request #4588 from Citadel-Station-13/upstream-merge-33914
[MIRROR] Prevent infinite loops in orbit checks
2017-12-30 05:05:30 -06:00
LetterJay 72d0ca2f1a Merge pull request #4590 from Citadel-Station-13/upstream-merge-33796
[MIRROR] Monkeymode fixes
2017-12-30 05:05:20 -06:00
LetterJay de0ade801c Merge pull request #4589 from Citadel-Station-13/upstream-merge-33903
[MIRROR] Fixes mobs targeting from inside things.
2017-12-30 05:04:09 -06:00
LetterJay 4599680f68 Merge pull request #4580 from Citadel-Station-13/upstream-merge-33842
[MIRROR] Internal radio implant
2017-12-30 05:03:48 -06:00
Jordan Brown d306c8fa62 Removes suit sensors from bural garbs (#33915)
* Removes suit sensors from bural garbs

* Dew it right
2017-12-29 21:36:35 -06:00
LetterJay 2d9a70a487 Update uplink_kits.dm 2017-12-29 18:42:44 -06:00
LetterJay d820575f78 Update orbit.dm 2017-12-29 18:41:57 -06:00
LetterJay 6f8c2c1daf Update item_attack.dm 2017-12-29 18:40:58 -06:00
LetterJay 54b6eddebc Merge branch 'master' into upstream-merge-33660 2017-12-29 18:40:29 -06:00
LetterJay 86c5f3cb0b Update detective_work.dm 2017-12-29 18:39:28 -06:00
LetterJay a3ebaa5de8 Merge branch 'master' into upstream-merge-32311 2017-12-29 18:38:50 -06:00
LetterJay 010c1e17ad Update client_procs.dm 2017-12-29 18:38:32 -06:00
LetterJay ac7750202b Update shuttle_rotate.dm 2017-12-29 18:38:05 -06:00
oranges a958de3d96 Fixes assistants spawning naked 2017-12-29 17:11:05 -06:00
ShizCalev 0c84651ec4 white and rainbow 2017-12-29 13:45:25 -06:00
Tad Hardesty 0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
Jordan Brown d38a4a2aa5 Merge pull request #33905 from ShizCalev/jumpsuit-fix
Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
2017-12-29 10:10:30 -06:00
MoreRobustThanYou 459d4f35c7 Monkeymode fixes (#33796)
* Monkey fixes

* Update say.dm
2017-12-29 10:08:17 -06:00
Jordan Brown 8059894d7d Merge pull request #33903 from AnturK/pilot-fixes
Fixes mobs targeting from inside things.
2017-12-29 10:01:57 -06:00
Jordan Brown 0b9ffdd3e3 Prevent infinite loops in orbit checks 2017-12-29 10:00:44 -06:00
LetterJay a56882556b Update _eminence.dm 2017-12-29 07:36:03 -06:00
LetterJay a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
LetterJay 6d52395643 Merge pull request #4587 from Citadel-Station-13/upstream-merge-33899
[MIRROR] Fixes air alarm contaminated mode
2017-12-29 06:48:09 -06:00
LetterJay e17f9fdc07 Merge pull request #4586 from Citadel-Station-13/upstream-merge-33895
[MIRROR] Corrects abductor uncuffing message
2017-12-29 06:47:56 -06:00
LetterJay 464edc7699 Merge pull request #4585 from Citadel-Station-13/upstream-merge-33896
[MIRROR] Fixes apple/banana/potato juicing
2017-12-29 06:30:04 -06:00
LetterJay 0bfd05e668 Merge pull request #4584 from Citadel-Station-13/upstream-merge-33857
[MIRROR] Increases research point income by 33% (APPROVED BY KORPHAERON)
2017-12-29 06:26:30 -06:00
LetterJay 80ce187d3d Merge pull request #4583 from Citadel-Station-13/upstream-merge-33873
[MIRROR] The Radiance (eminence after ratvar awakens) can now ignore chapel tiles
2017-12-29 06:26:06 -06:00
LetterJay b8370a7786 Merge pull request #4582 from Citadel-Station-13/upstream-merge-33882
[MIRROR] Spell action buttons finally fixed
2017-12-29 06:25:54 -06:00
LetterJay 71a51528c3 Merge pull request #4581 from Citadel-Station-13/upstream-merge-33847
[MIRROR] Adds colour shift to timestop
2017-12-29 06:25:41 -06:00
LetterJay 72ab9444c1 Merge pull request #4578 from Citadel-Station-13/upstream-merge-33876
[MIRROR] Cleans up survivor counting tiny bit
2017-12-29 06:25:11 -06:00
LetterJay 9d7dc29efc Merge pull request #4577 from Citadel-Station-13/upstream-merge-33874
[MIRROR] CTF flags are no longer locked to CTF.
2017-12-29 06:24:57 -06:00
LetterJay cbc43aeacf Merge pull request #4576 from Citadel-Station-13/upstream-merge-33875
[MIRROR] Makes default admin websound volume work again.
2017-12-29 06:24:42 -06:00