Commit Graph

543 Commits

Author SHA1 Message Date
LetterJay b15f639621 Merge pull request #2985 from Citadel-Station-13/upstream-merge-30722
[MIRROR] Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas.
2017-10-01 02:51:56 -04:00
LetterJay 04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
LetterJay 825f05b3f9 Merge pull request #2962 from Citadel-Station-13/upstream-merge-31032
[MIRROR] Fixes doomsday not working with multiz stations
2017-09-30 15:17:14 -04:00
LetterJay 063a44281e Merge branch 'master' into upstream-merge-31044 2017-09-30 14:53:08 -04:00
LetterJay b810f30e10 Update clockwork_slab.dm 2017-09-30 12:48:49 -05:00
LetterJay 47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
LetterJay f1858a3a63 Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988
[MIRROR] Alt-clicking descriptions when examining
2017-09-30 12:57:52 -04:00
LetterJay e515151610 Update h_sandbox.dm 2017-09-29 23:39:34 -05:00
LetterJay 7f2d8bdaff Update Malf_Modules.dm 2017-09-29 11:18:58 -05:00
LetterJay d6a89948a2 Merge pull request #2991 from Citadel-Station-13/upstream-merge-31078
[MIRROR] Cleanup operative landmarks
2017-09-29 01:44:17 -04:00
LetterJay cef4ae4fd6 Merge pull request #2975 from Citadel-Station-13/upstream-merge-30661
[MIRROR] Advanced camera consoles use a list for z lock rather than a single z level
2017-09-29 01:41:32 -04:00
LetterJay 02a5c92233 Merge pull request #2974 from Citadel-Station-13/upstream-merge-31046
[MIRROR] AFK players count as dead for the assassinate objective
2017-09-29 01:41:16 -04:00
ShizCalev 9da41c3596 Stops revheads from being metagamed with healthscanners & medical HUDs. (#31110)
* Stops revheads metagaming

* Added comment.
2017-09-28 22:00:16 -05:00
kingofkosmos f0c684c15e Alt-clicking descriptions when examining 2017-09-28 21:51:53 -05:00
oranges 1a9d36b3f1 Merge pull request #31078 from pubby/opspawn
Cleanup operative landmarks
2017-09-28 21:48:11 -05:00
kevinz000 df16529ed3 Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas. (#30722)
* initial commit

* bugfix

* Update changeling.dm

* Update datum_traitor.dm

* Update datum_traitor.dm

* Update objective.dm

* compile
2017-09-28 21:44:42 -05:00
Jordan Brown e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
LetterJay 355b9af67e Merge pull request #2960 from Citadel-Station-13/upstream-merge-30957
[MIRROR] Revheads are now stealthier/harder to metagame
2017-09-28 12:21:53 -04:00
KorPhaeron 6fca708b33 Advanced camera consoles use a list for z lock rather than a single z level (#30661)
* Refactor Abductor Console

* Station lock
2017-09-28 10:44:12 -05:00
Y0SH1M4S73R 602e1e6bbf AFK players count as dead for the assassinate objective (#31046) 2017-09-28 10:43:58 -05:00
CitadelStationBot 2d48a0cf50 [MIRROR] Makes borg modules and human species easily spawnable by admins from the mob spawn menu. (#2967)
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.

* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
2017-09-28 05:59:57 -07:00
LetterJay 9309f1e3b4 Update clock_components.dm 2017-09-27 23:40:49 -05:00
LetterJay 3687ef2d33 Update ark_of_the_clockwork_justicar.dm 2017-09-27 22:43:32 -05:00
LetterJay 7a0ffb8a67 Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888
[MIRROR] Refactors cinematics.
2017-09-27 23:42:35 -04:00
LetterJay d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
KorPhaeron 723d54c8a8 Fixes doomsday not working with multiz stations 2017-09-27 15:45:12 -05:00
LetterJay 773897aca3 Update clockwork_slab.dm 2017-09-27 15:35:03 -05:00
LetterJay 18545eb41c Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893
[MIRROR] Datum abductors refactor
2017-09-27 16:31:53 -04:00
Robustin f71c3d6614 Revheads are now stealthier/harder to metagame (#30957)
* stealthier revs

* Stealthiest Revheads

* Update revolution.dm
2017-09-27 15:28:35 -05:00
LetterJay 53a902c615 Update clockwork_slab.dm 2017-09-27 15:14:53 -05:00
AnturK ebdea5382b Here it is. 2017-09-27 13:22:16 -05:00
Ashe Higgs 193d929e4b Clockwork cult rework: Post-merge micro-patch 2017-09-26 19:59:41 -05:00
vuonojenmustaturska 10bf80139c Fixes MMI to AI law transfer (#31017)
* Fixes MMI to AI law transfer

* Fixes issue with preloaded laws on AI core
2017-09-26 16:52:17 -05:00
Ashe Higgs e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
AnturK fd0bc465cc Refactors cinematics. 2017-09-26 04:20:59 -05:00
LetterJay 8fd6d9d883 Merge pull request #2933 from Citadel-Station-13/upstream-merge-30980
[MIRROR] Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart
2017-09-25 13:28:05 -04:00
LetterJay 45751464e0 Merge pull request #2930 from Citadel-Station-13/upstream-merge-30975
[MIRROR] Href tokens
2017-09-25 13:27:27 -04:00
ShizCalev 169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
pubby 34e186dadb Datum abductors refactor 2017-09-24 18:00:49 -05:00
vuonojenmustaturska 11a3395690 Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart 2017-09-24 17:42:13 -05:00
pubby 382d549c2f Allow AIs to greentext survive (#30959)
* Change AI objectives from survive to exist

* Cyberboss simplification
2017-09-24 17:38:00 -05:00
oranges 6278d49662 Href tokens 2017-09-24 17:34:37 -05:00
vuonojenmustaturska d111c582b4 Meteors can now qdel normally (#30970) 2017-09-23 23:35:14 -05:00
Robustin 894673ef97 Fixes revolutionary deconversion messages and logging 2017-09-23 11:07:05 -05:00
CitadelStationBot 222274d108 [MIRROR] Using a soulstone on somebody now transfers your languages to the shade (#2911)
* Merge pull request #30939 from MoreRobustThanYou/patch-8

Using a soulstone on somebody now transfers your languages to the shade

* Using a soulstone on somebody now transfers your languages to the shade
2017-09-23 05:53:56 -05:00
CitadelStationBot eb36f34267 [MIRROR] Specifies one format of variable declaration for the codebase. (#2895)
* Specifies one format of variable declaration for the codebase.

* dumb mirroring
2017-09-22 23:35:36 -05:00
CitadelStationBot c85e409872 [MIRROR] Removes the multiverse and its sword (#2573)
* Merge pull request #30283 from pubby/multiverse

Removes the multiverse and its sword

* Removes the multiverse and its sword
2017-09-22 20:23:56 -05:00
LetterJay 54bd982d6b Merge pull request #2787 from Citadel-Station-13/upstream-merge-30681
[MIRROR] Prevents the creation of Shadowzombiechangelings
2017-09-22 08:43:37 -04:00
pubby dae93856f5 Traitorbro fixes 2017-09-20 03:48:33 -05:00
CitadelStationBot accd92a676 [MIRROR] Fixes mode conversion runtime (#2855)
* Fixes mode conversion runtime (#30857)

* Fixes mode conversion runtime
2017-09-20 01:40:52 -05:00