Commit Graph

  • a6263621e7 Merge pull request #688 from Citadel-Station-13/upstream-merge-26729 LetterJay 2017-05-02 03:03:43 -05:00
  • fa888cc521 Fixes drakes continuing to swoop when killed (#713) CitadelStationBot 2017-05-02 02:49:41 -05:00
  • 036109de58 Changes a bunch of hrefs to the proper defines CitadelStationBot 2017-05-02 02:20:07 -05:00
  • 22f6aecdf7 Fixes cult and clockcult icons CitadelStationBot 2017-05-01 21:03:40 -05:00
  • 3fff6d4a1d Fixes cult datum giving the action button to the mind instead of mob CitadelStationBot 2017-05-01 20:27:03 -05:00
  • d29de62d69 Plants now react with turfs on squash() CitadelStationBot 2017-05-01 17:34:34 -05:00
  • b45d4ba668 Makes admin sound announcement use the right span CitadelStationBot 2017-05-01 17:32:29 -05:00
  • ea3ee7accc Adds persistent trophy cases CitadelStationBot 2017-05-01 17:31:24 -05:00
  • 8758791278 Fixes Biogenerator CitadelStationBot 2017-05-01 17:28:18 -05:00
  • cc0a9b87fb Changes /obj/machinery to have atom/movable occupants CitadelStationBot 2017-05-01 15:58:52 -05:00
  • 315f2b7738 Merge pull request #583 from Citadel-Station-13/upstream-merge-26386 LetterJay 2017-05-01 15:43:49 -05:00
  • 64fd72f1cf Update artefact.dm LetterJay 2017-05-01 15:31:51 -05:00
  • b57a4aa6b4 Merge branch 'master' into upstream-merge-26386 LetterJay 2017-05-01 15:27:25 -05:00
  • 161891e51b conflict res LetterJay 2017-05-01 15:26:17 -05:00
  • 00164a49a7 Subsystem change for the SM and TEG and slight QoL CitadelStationBot 2017-05-01 13:06:07 -05:00
  • 3e80105ffb Saline-glucose changes CitadelStationBot 2017-05-01 12:55:45 -05:00
  • 36dfc5a4db Holocalls CitadelStationBot 2017-05-01 12:53:40 -05:00
  • 5cb2c2152b Clockcult component generation will automatically focus on components needed to activate the Ark CitadelStationBot 2017-05-01 12:50:33 -05:00
  • 301ad1b0fc Belligerent now prevents you from running even between chants CitadelStationBot 2017-05-01 12:49:28 -05:00
  • 7afd85e3fc PR announcement spam prevention CitadelStationBot 2017-05-01 12:47:22 -05:00
  • e2a95703de Ore redemption machine cleanup CitadelStationBot 2017-05-01 11:54:33 -05:00
  • 529125d3dd Moves tips from config to strings tree CitadelStationBot 2017-05-01 11:51:27 -05:00
  • faaf0c17ba Small fixes to spatial gateways CitadelStationBot 2017-05-01 11:39:13 -05:00
  • 185e077f33 Port SM shards to initialize CitadelStationBot 2017-05-01 11:38:08 -05:00
  • 34a701a1bc You can no longer queue up ahelps by queing up prompts CitadelStationBot 2017-05-01 11:38:04 -05:00
  • 1426a20834 Gaining Vanguard will remove existing stuns CitadelStationBot 2017-05-01 11:07:33 -05:00
  • 242cc65eac Gang Pen Is now Stealthy CitadelStationBot 2017-05-01 11:05:28 -05:00
  • 99754380b5 Makes surplus crates less likely to contain implants CitadelStationBot 2017-05-01 08:39:14 -05:00
  • 1842665af6 idjeet LetterJay 2017-05-01 08:38:03 -05:00
  • de997bba41 Fixes the 'stuffed legion' recipie CitadelStationBot 2017-05-01 08:37:09 -05:00
  • 55b9c06e63 A bunch of sparks to do_sparks CitadelStationBot 2017-05-01 08:36:04 -05:00
  • ace93b6cfd Buffs mercury and lithium CitadelStationBot 2017-05-01 08:34:51 -05:00
  • a3eec6c8f9 Merge pull request #670 from Citadel-Station-13/upstream-merge-26713 LetterJay 2017-05-01 08:11:36 -05:00
  • 31ea9cb309 Merge pull request #657 from Citadel-Station-13/upstream-merge-26689 LetterJay 2017-05-01 08:11:22 -05:00
  • d7624b5824 Merge pull request #678 from Citadel-Station-13/upstream-merge-26663 LetterJay 2017-05-01 08:10:23 -05:00
  • 4f614ba978 Automatic changelog generation for PR #679 [ci skip] CitadelStationBot 2017-05-01 08:10:14 -05:00
  • 3d6845675a Merge pull request #679 from Citadel-Station-13/upstream-merge-26709 LetterJay 2017-05-01 08:10:13 -05:00
  • 3c786aa8c0 Merge pull request #681 from Citadel-Station-13/upstream-merge-26719 LetterJay 2017-05-01 08:09:55 -05:00
  • 7261d61983 Merge pull request #672 from Citadel-Station-13/upstream-merge-26717 LetterJay 2017-05-01 08:09:22 -05:00
  • 03efaf3f13 Merge pull request #673 from Citadel-Station-13/upstream-merge-26718 LetterJay 2017-05-01 08:09:07 -05:00
  • 6102c25410 Merge pull request #669 from Citadel-Station-13/upstream-merge-26680 LetterJay 2017-05-01 08:06:52 -05:00
  • 7d263860fe Automatic changelog generation for PR #668 [ci skip] CitadelStationBot 2017-05-01 08:04:22 -05:00
  • be766d9539 Merge pull request #668 from Citadel-Station-13/upstream-merge-26691 LetterJay 2017-05-01 08:04:21 -05:00
  • 9b8ddc57b3 Merge pull request #667 from Citadel-Station-13/upstream-merge-26694 LetterJay 2017-05-01 08:04:10 -05:00
  • 888e729577 Automatic changelog generation for PR #666 [ci skip] CitadelStationBot 2017-05-01 08:03:51 -05:00
  • 03bae077e9 Merge pull request #666 from Citadel-Station-13/upstream-merge-26706 LetterJay 2017-05-01 08:03:50 -05:00
  • b016af2d63 Merge pull request #665 from Citadel-Station-13/upstream-merge-26712 LetterJay 2017-05-01 08:03:19 -05:00
  • 442fef549e Merge pull request #664 from Citadel-Station-13/upstream-merge-26698 LetterJay 2017-05-01 08:02:54 -05:00
  • dd904e3640 Merge pull request #663 from Citadel-Station-13/upstream-merge-26736 LetterJay 2017-05-01 08:02:44 -05:00
  • 73c1a83d62 Merge pull request #660 from Citadel-Station-13/upstream-merge-26692 LetterJay 2017-05-01 08:01:55 -05:00
  • 86ea3efeef Merge pull request #659 from Citadel-Station-13/upstream-merge-26687 LetterJay 2017-05-01 08:01:41 -05:00
  • 69df03ff9e Automatic changelog generation for PR #656 [ci skip] CitadelStationBot 2017-05-01 08:00:42 -05:00
  • 647a9967ba Merge pull request #656 from Citadel-Station-13/upstream-merge-26538 LetterJay 2017-05-01 08:00:41 -05:00
  • c93c5bf50f Merge pull request #655 from Citadel-Station-13/upstream-merge-26693 LetterJay 2017-05-01 08:00:07 -05:00
  • 061e49d651 Merge pull request #654 from Citadel-Station-13/upstream-merge-26662 LetterJay 2017-05-01 07:59:55 -05:00
  • d46b85e9ed Merge pull request #653 from Citadel-Station-13/upstream-merge-26676 LetterJay 2017-05-01 07:59:42 -05:00
  • 3955c7da7d Merge pull request #651 from Citadel-Station-13/upstream-merge-26681 LetterJay 2017-05-01 07:59:16 -05:00
  • 6c8467d473 Merge pull request #650 from Citadel-Station-13/upstream-merge-26648 LetterJay 2017-05-01 07:59:05 -05:00
  • 7c02c0ef6a Merge pull request #649 from Citadel-Station-13/upstream-merge-26678 LetterJay 2017-05-01 07:58:20 -05:00
  • 817b259192 Merge pull request #648 from kevinz000/patch-2 LetterJay 2017-05-01 07:58:09 -05:00
  • b2c1ff2bc2 Merge pull request #647 from Citadel-Station-13/upstream-merge-26398 LetterJay 2017-05-01 07:57:38 -05:00
  • e9dc5bcd95 Merge pull request #643 from Citadel-Station-13/upstream-merge-26643 LetterJay 2017-05-01 07:56:37 -05:00
  • 1bdd4e43c2 Automatic changelog generation for PR #644 [ci skip] CitadelStationBot 2017-05-01 07:56:18 -05:00
  • 954b035868 Merge pull request #644 from Citadel-Station-13/upstream-merge-26651 LetterJay 2017-05-01 07:56:17 -05:00
  • 1a5ab1d5be Merge pull request #639 from Citadel-Station-13/upstream-merge-26633 LetterJay 2017-05-01 07:44:25 -05:00
  • c3c8688cbd Automatic changelog generation for PR #638 [ci skip] CitadelStationBot 2017-05-01 07:44:16 -05:00
  • 5cab328632 Merge pull request #638 from Citadel-Station-13/upstream-merge-26536 LetterJay 2017-05-01 07:44:15 -05:00
  • bd2b4207e2 Merge pull request #637 from Citadel-Station-13/upstream-merge-26204 LetterJay 2017-05-01 07:43:59 -05:00
  • f553fbe4b3 Automatic changelog generation for PR #635 [ci skip] CitadelStationBot 2017-05-01 07:43:28 -05:00
  • f2af0cac91 Merge pull request #635 from Citadel-Station-13/upstream-merge-26602 LetterJay 2017-05-01 07:43:27 -05:00
  • c2b2b8c2a3 Merge pull request #634 from Citadel-Station-13/upstream-merge-26597 LetterJay 2017-05-01 07:43:17 -05:00
  • feef059cef Automatic changelog generation for PR #633 [ci skip] CitadelStationBot 2017-05-01 07:43:02 -05:00
  • 8adddd5916 Merge pull request #633 from Citadel-Station-13/upstream-merge-26626 LetterJay 2017-05-01 07:43:01 -05:00
  • 9b505d004b Automatic changelog generation for PR #632 [ci skip] CitadelStationBot 2017-05-01 07:42:52 -05:00
  • 56b3d36521 Merge pull request #632 from Citadel-Station-13/upstream-merge-26611 LetterJay 2017-05-01 07:42:51 -05:00
  • 98c3823327 Automatic changelog generation for PR #631 [ci skip] CitadelStationBot 2017-05-01 07:42:38 -05:00
  • 25f1a398fe Merge pull request #631 from Citadel-Station-13/upstream-merge-26622 LetterJay 2017-05-01 07:42:37 -05:00
  • 652f124f98 Merge pull request #630 from Citadel-Station-13/upstream-merge-26659 LetterJay 2017-05-01 07:42:17 -05:00
  • 7ec11b3ca1 Automatic changelog generation for PR #629 [ci skip] CitadelStationBot 2017-05-01 07:41:54 -05:00
  • 5b45983c4c Merge pull request #629 from Citadel-Station-13/upstream-merge-26654 LetterJay 2017-05-01 07:41:53 -05:00
  • a0f090b926 Automatic changelog generation for PR #625 [ci skip] CitadelStationBot 2017-05-01 07:41:18 -05:00
  • d5a4be2581 Merge pull request #625 from Citadel-Station-13/upstream-merge-26616 LetterJay 2017-05-01 07:41:16 -05:00
  • 780216d7f9 Merge pull request #623 from Citadel-Station-13/upstream-merge-26627 LetterJay 2017-05-01 07:40:55 -05:00
  • 542d1632bc Automatic changelog generation for PR #622 [ci skip] CitadelStationBot 2017-05-01 07:40:44 -05:00
  • 0292483e4b Merge pull request #622 from Citadel-Station-13/upstream-merge-26639 LetterJay 2017-05-01 07:40:43 -05:00
  • f50955dfd8 Merge pull request #612 from Citadel-Station-13/upstream-merge-26609 LetterJay 2017-05-01 07:39:46 -05:00
  • cd8e9399ae Automatic changelog generation for PR #609 [ci skip] CitadelStationBot 2017-05-01 07:39:36 -05:00
  • 2d9a497f31 Merge pull request #609 from Citadel-Station-13/upstream-merge-26625 LetterJay 2017-05-01 07:39:35 -05:00
  • 08497579d8 Fixes some null.add_reagents runtimes CitadelStationBot 2017-05-01 07:24:49 -05:00
  • 7a4f1496e9 Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted CitadelStationBot 2017-05-01 07:24:45 -05:00
  • 87e306851d Readds deepstorage w/ tweaks AND adds water bottles to vending machines CitadelStationBot 2017-05-01 07:24:41 -05:00
  • e4adf5d524 Buffs jump boot dash speed CitadelStationBot 2017-05-01 07:24:37 -05:00
  • fad23e97c3 Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass CitadelStationBot 2017-05-01 07:24:29 -05:00
  • fc9e2a46d6 fixes #618 (#675) TalkingCactus 2017-05-01 05:29:35 -04:00
  • d06d99bc14 Disablesthe broken jizz/milk production for the time being. -Cactus will fix eventually. -Hopefully. Verkister 2017-05-01 00:05:03 +03:00
  • 0ae4f76fb9 Winter Wonderland holodeck no longer has freon, and it's no longer restricted CitadelStationBot 2017-04-30 15:12:51 -05:00
  • 9be1a5db4f Moves antag datums to the mind CitadelStationBot 2017-04-30 14:32:15 -05:00
  • 724082121c [FUN REMOVAL] Makes fire not able to become ice. CitadelStationBot 2017-04-30 12:23:29 -05:00
  • fbe0803699 [s] SDQL security patches CitadelStationBot 2017-04-30 11:30:44 -05:00
  • c1bd59b7cb Mob directory CitadelStationBot 2017-04-30 11:26:38 -05:00