Commit Graph

  • c258941098 Update vending.dm Letter N 2018-07-06 17:26:55 +08:00
  • 5c79a794ec Update holy_weapons.dm Letter N 2018-07-06 17:20:30 +08:00
  • bff55cc362 Update handcuffs.dm Letter N 2018-07-06 17:19:56 +08:00
  • 15029f8034 Add files via upload Letter N 2018-07-06 17:18:55 +08:00
  • 7cc32db240 Delete weapons.dmi Letter N 2018-07-06 17:12:16 +08:00
  • 401cc20774 Merge pull request #2 from Citadel-Station-13/master Letter N 2018-07-06 17:05:02 +08:00
  • 981743a170 Update custom_items.dm LetterJay 2018-07-06 00:54:21 -05:00
  • 5ad7fc35fd Update __donator.dm LetterJay 2018-07-06 00:54:01 -05:00
  • a64dba6270 Merge branch 'flagcape' LetterJay 2018-07-06 00:51:42 -05:00
  • 3d7d862861 fuckoff LetterJay 2018-07-06 00:50:13 -05:00
  • b245b940a4 Update custom_items.dm LetterJay 2018-07-06 00:46:48 -05:00
  • 5cacbfbe2e Merge branch 'flagcape' of https://github.com/Citadel-Station-13/Citadel-Station-13 into flagcape LetterJay 2018-07-06 00:45:52 -05:00
  • 65e2d7695b Merge pull request #7152 from LetterN/patch-3 deathride58 2018-07-06 01:42:38 -04:00
  • 637c64f55b fuk LetterJay 2018-07-06 00:42:25 -05:00
  • 5f4e19000d Merge pull request #7308 from Citadel-Station-13/kevinz000-patch-9 deathride58 2018-07-06 01:40:20 -04:00
  • 034a7da744 Merge pull request #7029 from Citadel-Station-13/kitsundevilwings LetterJay 2018-07-06 00:40:00 -05:00
  • 924fcc29fb Merge branch 'master' into kevinz000-patch-13 deathride58 2018-07-06 01:39:25 -04:00
  • 891bdd718d Merge pull request #7083 from Citadel-Station-13/kevinz000-patch-8 deathride58 2018-07-06 01:38:42 -04:00
  • cee8da4fdb Merge pull request #7173 from Citadel-Station-13/kevinz000-patch-11 deathride58 2018-07-06 01:37:42 -04:00
  • cec2871db2 Merge pull request #7293 from LetterN/patch-4 deathride58 2018-07-06 01:36:15 -04:00
  • 4ae3bff79a Merge pull request #7266 from Citadel-Station-13/kevinz000-patch-7 deathride58 2018-07-06 01:35:51 -04:00
  • 3ed9e8b784 Automatic changelog generation for PR #7342 [ci skip] CitadelStationBot 2018-07-06 00:35:33 -05:00
  • 8173e11740 Merge pull request #7342 from Citadel-Station-13/upstream-merge-38909 deathride58 2018-07-06 01:35:29 -04:00
  • f7b2534292 Merge pull request #7341 from Citadel-Station-13/upstream-merge-38893 deathride58 2018-07-06 01:35:08 -04:00
  • 3773aa5498 Automatic changelog generation for PR #7340 [ci skip] CitadelStationBot 2018-07-06 00:34:52 -05:00
  • b97ed1d248 Merge pull request #7340 from Citadel-Station-13/upstream-merge-38908 deathride58 2018-07-06 01:34:50 -04:00
  • b3c28c36fa Merge branch 'master' into upstream-merge-38649 deathride58 2018-07-06 01:34:12 -04:00
  • 5924595c8d adds icon_override deathride58 2018-07-06 00:48:21 -04:00
  • 8e0a1a64af oops LetterJay 2018-07-05 23:44:44 -05:00
  • f8828db041 donator cape LetterJay 2018-07-05 23:43:47 -05:00
  • d75a9cf368 Merge pull request #7292 from deathride58/hopefullythefinalhardsync LetterJay 2018-07-05 21:10:08 -05:00
  • bdc787c302 Add medical HUD icon if the body has died recently enough to be defibbed letterjay 2018-07-05 18:55:54 -05:00
  • 8a269e3398 Add medical HUD icon if the body has died recently enough to be defibbed (#38909) Jared-Fogle 2018-07-05 16:56:02 -07:00
  • 69ca7391ff Adds comments to _globals.dm letterjay 2018-07-05 18:21:59 -05:00
  • 1a2f82bdb9 Adds comments to _globals.dm (#38893) Jordan Brown 2018-07-05 19:22:27 -04:00
  • eaa249d624 Adds a sprite for Glowcaps. letterjay 2018-07-05 13:40:46 -05:00
  • 0180039518 Adds a sprite for Glowcaps. (#38908) jegub 2018-07-05 19:40:06 +01:00
  • 624351076e Update autodrobe.dm Trilbyspaceclone 2018-07-05 09:49:07 -04:00
  • c8f5791557 Converts antimagic from GetComponent to a signal Emmett Gaines 2018-07-05 04:26:14 -04:00
  • 8d8035950e Fixes centcom titlescreen resolution, finally deathride58 2018-07-05 04:23:12 -04:00
  • 759dddb821 Fixes signals deathride58 2018-07-05 01:42:05 -04:00
  • 816257ae7d fuck deathride58 2018-07-05 01:38:46 -04:00
  • ff8a90b880 DME deathride58 2018-07-05 01:37:57 -04:00
  • b2ec8f89e0 missed files deathride58 2018-07-05 01:27:07 -04:00
  • 3e18d8208e Updates to tgstation commit 78e471d deathride58 2018-07-05 01:22:27 -04:00
  • ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync deathride58 2018-07-05 00:17:44 -04:00
  • e92379e360 Automatic changelog generation for PR #7327 [ci skip] CitadelStationBot 2018-07-04 20:38:56 -05:00
  • 06d08c67c3 [MIRROR] Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#7327) CitadelStationBot 2018-07-04 20:38:53 -05:00
  • 7673384890 [MIRROR] [s] Fixes announcement XSS (#7324) CitadelStationBot 2018-07-04 19:40:10 -05:00
  • cc628a905e two major fixes - fixes flavortext and right click exploit deathride58 2018-07-04 16:41:55 -04:00
  • abc32ed0df adds "cap's female formal outfit" (#7307) Letter N 2018-07-04 20:37:01 +08:00
  • 22e56253d0 [MIRROR] Fixes gravity gun runtimes. (#7310) CitadelStationBot 2018-07-03 11:14:26 -05:00
  • 7f0c82b0ba [MIRROR] SDQL where filter message is now correct (#7309) CitadelStationBot 2018-07-03 11:14:00 -05:00
  • 80f8f7e1b1 Update mentor.dm kevinz000 2018-07-03 06:33:33 -07:00
  • f986f9c9f2 makes it compile. should work. hopefully deathride58 2018-07-02 15:35:11 -04:00
  • 6873a7c065 DME and dockerfile deathride58 2018-07-02 13:04:33 -04:00
  • 0500be9b35 [MIRROR] Fixes some shard harddel stuff. (#7299) CitadelStationBot 2018-07-02 08:44:50 -05:00
  • 028c3105b9 Automatic changelog generation for PR #7294 [ci skip] CitadelStationBot 2018-07-02 05:23:54 -05:00
  • 6b0e597553 [MIRROR] Fix circuit printer printing finished TEG machinery (#7294) CitadelStationBot 2018-07-02 05:23:49 -05:00
  • 493a356338 Update machine_circuitboards.dm Letter N 2018-07-02 09:13:28 +00:00
  • b1688405d9 and finally, the modules folder. Now I can publish and take a break deathride58 2018-07-02 01:19:37 -04:00
  • 91805b8789 and that just leaves the modules folder deathride58 2018-07-02 00:28:51 -04:00
  • 63013f8964 everything to controllers deathride58 2018-07-02 00:10:31 -04:00
  • db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code deathride58 2018-07-01 23:54:31 -04:00
  • 74f7e56f4e Merge pull request #7284 from Citadel-Station-13/upstream-merge-38797 LetterJay 2018-07-01 09:41:03 -05:00
  • ee0bef443e Merge pull request #7283 from Citadel-Station-13/upstream-merge-38796 LetterJay 2018-07-01 09:39:43 -05:00
  • af5a250ce4 Merge pull request #7282 from Citadel-Station-13/upstream-merge-38779 LetterJay 2018-07-01 09:39:28 -05:00
  • 42c322ca2c Merge pull request #7281 from Citadel-Station-13/upstream-merge-38789 LetterJay 2018-07-01 09:39:08 -05:00
  • 0b33ea727f Automatic changelog generation for PR #7280 [ci skip] CitadelStationBot 2018-07-01 09:38:19 -05:00
  • b5b8ce5337 Merge pull request #7280 from Citadel-Station-13/upstream-merge-38751 LetterJay 2018-07-01 09:38:16 -05:00
  • 2b9aca8143 Merge pull request #7279 from Citadel-Station-13/upstream-merge-38795 LetterJay 2018-07-01 09:37:45 -05:00
  • 2303e23f2c Merge pull request #7278 from Citadel-Station-13/upstream-merge-38776 LetterJay 2018-07-01 09:37:24 -05:00
  • 3c6749d326 Automatic changelog generation for PR #7277 [ci skip] CitadelStationBot 2018-07-01 09:37:08 -05:00
  • be23ad6a06 Merge pull request #7277 from Citadel-Station-13/upstream-merge-38656 LetterJay 2018-07-01 09:36:57 -05:00
  • c7b830d2c6 Merge pull request #7276 from Citadel-Station-13/upstream-merge-38834 LetterJay 2018-07-01 09:36:33 -05:00
  • e1d6ee593b Merge pull request #7275 from Citadel-Station-13/upstream-merge-38800 LetterJay 2018-07-01 09:36:13 -05:00
  • 3b5264b2f7 Automatic changelog generation for PR #7273 [ci skip] CitadelStationBot 2018-07-01 09:35:56 -05:00
  • f7fef5f1ed Merge pull request #7273 from Citadel-Station-13/upstream-merge-38804 LetterJay 2018-07-01 09:35:51 -05:00
  • 172c8cab04 Merge pull request #7272 from Citadel-Station-13/upstream-merge-38816 LetterJay 2018-07-01 09:35:33 -05:00
  • 96fcd9275f Merge pull request #7268 from Citadel-Station-13/kevinz000-patch-9 LetterJay 2018-07-01 09:33:53 -05:00
  • 3090813add Automatic changelog generation for PR #7267 [ci skip] CitadelStationBot 2018-07-01 09:33:38 -05:00
  • 389faab2a5 Merge pull request #7267 from Citadel-Station-13/upstream-merge-38728 LetterJay 2018-07-01 09:33:36 -05:00
  • c970bc259e Automatic changelog generation for PR #7265 [ci skip] CitadelStationBot 2018-07-01 09:32:41 -05:00
  • 727aa6b2a9 Merge pull request #7265 from Citadel-Station-13/upstream-merge-38745 LetterJay 2018-07-01 09:32:39 -05:00
  • 5062fcd60e Automatic changelog generation for PR #7264 [ci skip] CitadelStationBot 2018-07-01 09:32:15 -05:00
  • 16eefdd1e6 Merge pull request #7264 from Citadel-Station-13/upstream-merge-38646 LetterJay 2018-07-01 09:32:08 -05:00
  • b58718625a Automatic changelog generation for PR #7262 [ci skip] CitadelStationBot 2018-07-01 09:31:15 -05:00
  • 18b8aad8cb Merge pull request #7262 from Citadel-Station-13/upstream-merge-38690 LetterJay 2018-07-01 09:31:12 -05:00
  • fc76c6c496 Automatic changelog generation for PR #7259 [ci skip] CitadelStationBot 2018-07-01 09:30:49 -05:00
  • 7100ae3a7b Merge pull request #7259 from Citadel-Station-13/upstream-merge-38727 LetterJay 2018-07-01 09:30:46 -05:00
  • 74730261b0 Merge pull request #7258 from Citadel-Station-13/upstream-merge-38689 LetterJay 2018-07-01 09:30:09 -05:00
  • 31f54fd50b Automatic changelog generation for PR #7254 [ci skip] CitadelStationBot 2018-07-01 09:29:12 -05:00
  • de6ae20f87 Merge pull request #7254 from Citadel-Station-13/upstream-merge-38644 LetterJay 2018-07-01 09:29:10 -05:00
  • fe0c43fea2 Merge pull request #7252 from Citadel-Station-13/upstream-merge-38708 LetterJay 2018-07-01 09:28:20 -05:00
  • 999f3c23d7 Automatic changelog generation for PR #7251 [ci skip] CitadelStationBot 2018-07-01 09:28:04 -05:00
  • 35b2338181 Merge pull request #7251 from Citadel-Station-13/upstream-merge-38709 LetterJay 2018-07-01 09:28:03 -05:00
  • f0296a5e89 Automatic changelog generation for PR #7250 [ci skip] CitadelStationBot 2018-07-01 09:27:47 -05:00
  • cd842fc20f Merge pull request #7250 from Citadel-Station-13/upstream-merge-38702 LetterJay 2018-07-01 09:27:45 -05:00
  • b1ac168609 Automatic changelog generation for PR #7249 [ci skip] CitadelStationBot 2018-07-01 09:27:13 -05:00
  • e54ed36415 Merge pull request #7249 from Citadel-Station-13/upstream-merge-38699 LetterJay 2018-07-01 09:27:07 -05:00