Commit Graph

  • 74e26f7a0c Merge pull request #14436 from Putnam3145/supermatter-surge-rebalance silicons 2021-03-20 14:29:40 -06:00
  • f41f69ccfa Automatic changelog generation for PR #14464 [ci skip] CitadelStationBot 2021-03-20 15:28:43 -05:00
  • e433aaf881 Merge pull request #14464 from GrayRachnid/filter silicons 2021-03-20 14:28:40 -06:00
  • 6fa99c22e6 Automatic changelog generation for PR #14461 [ci skip] CitadelStationBot 2021-03-20 15:28:35 -05:00
  • 6491615775 Merge pull request #14461 from Hatterhat/violent-cafe silicons 2021-03-20 14:28:33 -06:00
  • a94f304b52 Automatic changelog generation for PR #14458 [ci skip] CitadelStationBot 2021-03-20 15:28:28 -05:00
  • 7bd2727d58 Merge pull request #14458 from GrayRachnid/particle-defender silicons 2021-03-20 14:28:26 -06:00
  • e4f2e43701 Automatic changelog generation for PR #14457 [ci skip] CitadelStationBot 2021-03-20 15:28:10 -05:00
  • a1c4323653 Merge pull request #14457 from GrayRachnid/holopads silicons 2021-03-20 14:28:07 -06:00
  • 77178c7664 Fix silicons 2021-03-20 12:14:38 -07:00
  • d9a2316825 fix silicons 2021-03-20 12:13:28 -07:00
  • c02f35a7e5 Glowing goo be gone Blue Wildrose 2021-03-20 11:29:15 -07:00
  • bc36e73c7e maybe I should include this check Blue Wildrose 2021-03-20 06:52:13 -07:00
  • 3a37cc6325 Some sensory detail Blue Wildrose 2021-03-20 06:37:37 -07:00
  • 292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny LetterN 2021-03-20 20:36:56 +08:00
  • cd20cb85dc Automatic changelog generation for PR #14465 [ci skip] CitadelStationBot 2021-03-20 02:30:39 -05:00
  • 1b622af5e7 Merge pull request #14465 from The-Sun-In-Splendour/fix-post-absorb-revive silicons 2021-03-20 01:30:37 -06:00
  • d49f6e48ac Automatic changelog generation for PR #14400 [ci skip] CitadelStationBot 2021-03-20 02:08:50 -05:00
  • 013560c064 Merge pull request #14400 from LetterN/art-art-art silicons 2021-03-20 01:08:47 -06:00
  • a9a5bdc61a Merge pull request #14471 from Citadel-Station-13/silicons-patch-9 Lin 2021-03-19 21:08:39 -05:00
  • 9e06bafcfb Merge pull request #14470 from Citadel-Station-13/silicons-patch-8 Lin 2021-03-19 21:08:34 -05:00
  • 51b955d47e Merge pull request #14460 from Hatterhat/exp-sup-con Lin 2021-03-19 19:18:19 -05:00
  • d1cf054a0e Automatic changelog compile [ci skip] Changelogs 2021-03-20 00:14:29 +00:00
  • 4d1d3837cd Automatic changelog generation for PR #14462 [ci skip] CitadelStationBot 2021-03-19 18:52:19 -05:00
  • 9941b5288b Merge pull request #14462 from Hatterhat/bsbeaker Lin 2021-03-19 18:52:17 -05:00
  • 265af827b8 ah you pesky ambiguity qweq12yt 2021-03-19 17:58:30 -03:00
  • 418532e3a9 Merge pull request #14474 from Citadel-Station-13/dependabot/pip/tools/pillow-8.1.1 silicons 2021-03-19 14:32:31 -06:00
  • 381baf32af fixes size for the window qweq12yt 2021-03-19 17:01:57 -03:00
  • 4788a24184 oops, another typo qweq12yt 2021-03-19 16:32:41 -03:00
  • 60a720eead ok so now it works qweq12yt 2021-03-19 16:10:54 -03:00
  • 27774c4209 git is acting weird.jpg qweq12yt 2021-03-19 16:10:17 -03:00
  • 4838dd40de small typo qweq12yt 2021-03-19 16:06:23 -03:00
  • 153163b780 i loathe merge conflicts zerothebigboy 2021-03-19 14:39:40 -04:00
  • a3ba3c1928 fix ui not opening qweq12yt 2021-03-19 15:36:14 -03:00
  • 1f7b15d8f8 clonwops kappa-sama 2021-01-22 11:45:30 -05:00
  • 2e41925392 poggers kappa-sama 2021-01-21 10:10:01 -05:00
  • 524bb79f0e tgui machine broke kappa-sama 2021-01-19 16:17:43 -05:00
  • 8456b3f709 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum zerothebigboy 2021-03-19 14:30:05 -04:00
  • 6a752cfd5d Not quite right necromanceranne 2021-03-20 04:28:20 +11:00
  • a61ac1fc68 Applies off balance on right click, allowing you to shove a weapon out of someones hands necromanceranne 2021-03-20 04:23:23 +11:00
  • 8432f095f8 Bump pillow from 7.2.0 to 8.1.1 in /tools dependabot[bot] 2021-03-19 16:09:09 +00:00
  • 150f6f4328 cbt LetterN 2021-03-19 20:11:26 +08:00
  • 7121295935 finalfix??? ItzGabby 2021-03-19 03:08:10 -04:00
  • ea1cf6797e I'm literally going to die with these checks ItzGabby 2021-03-19 02:59:30 -04:00
  • 5c53b598b5 hopefully this fixes the conflict ItzGabby 2021-03-19 02:55:17 -04:00
  • 68bf156091 Merge branch 'master' into bark-box ItzGabby 2021-03-19 02:48:31 -04:00
  • b0abc6d726 Revert "fixes conflict" ItzGabby 2021-03-19 02:43:30 -04:00
  • 23d5b3377b fixes conflict ItzGabby 2021-03-19 02:42:17 -04:00
  • 3fed89b16d fixthedamnballs ItzGabby 2021-03-19 02:01:37 -04:00
  • 4a49f6eebe barked on ItzGabby 2021-03-19 01:38:17 -04:00
  • d7829db9ca let's make this more clear silicons 2021-03-18 21:55:21 -07:00
  • bff668b743 why silicons 2021-03-18 21:53:53 -07:00
  • 2c2e779aa6 Merge remote-tracking branch 'origin/master' into fixes-2 LetterN 2021-03-19 10:28:43 +08:00
  • 5e6122e554 Automatic changelog compile [ci skip] Changelogs 2021-03-19 00:14:43 +00:00
  • 1f58e1823e Update bodybag.dm silicons 2021-03-18 17:00:16 -07:00
  • d434f60cb3 Update closets.dm silicons 2021-03-18 16:59:03 -07:00
  • 71d5528959 fix Timothy Teakettle 2021-03-18 21:50:03 +00:00
  • cbaad4bde7 Update generate_documentation.yml Letter N 2021-03-18 22:39:05 +08:00
  • 3afd1bbf03 Automatic changelog generation for PR #14444 [ci skip] CitadelStationBot 2021-03-18 07:41:41 -05:00
  • 8c97297a47 Merge pull request #14444 from DeltaFire15/jar-removal silicons 2021-03-18 06:41:38 -06:00
  • 0dc00784a8 Automatic changelog generation for PR #14442 [ci skip] CitadelStationBot 2021-03-18 07:40:53 -05:00
  • f6f2c27e90 Merge pull request #14442 from SandPoot/master silicons 2021-03-18 06:40:51 -06:00
  • 3edcdf15db Automatic changelog generation for PR #14456 [ci skip] CitadelStationBot 2021-03-18 07:39:50 -05:00
  • 3e8fcfe72a Merge pull request #14456 from Putnam3145/antag_pref silicons 2021-03-18 06:39:48 -06:00
  • bb03d4ff41 Merge pull request #14446 from The-Sun-In-Splendour/secciejacket silicons 2021-03-18 06:39:24 -06:00
  • 0be7ad78ac Automatic changelog generation for PR #14451 [ci skip] CitadelStationBot 2021-03-18 07:39:17 -05:00
  • f39cac6a46 Merge pull request #14451 from zeroisthebiggay/patch-5 silicons 2021-03-18 06:39:15 -06:00
  • 8ae79c09d1 Automatic changelog generation for PR #14391 [ci skip] CitadelStationBot 2021-03-18 07:38:43 -05:00
  • e0cc6e3502 Merge pull request #14391 from kiwedespars/void-but-for-real silicons 2021-03-18 06:38:40 -06:00
  • 828cfaf58a Cellular Emporium is gone 🦀 Ludox 2021-03-18 04:32:33 +01:00
  • 5201cf6ac5 stops racism GrayRachnid 2021-03-17 21:58:41 -04:00
  • fca5ede923 Shitcode has arrived Ludox 2021-03-18 02:32:54 +01:00
  • 6a09b749b3 Merge pull request #1 from Citadel-Station-13/master The-Sun-In-Splendour 2021-03-18 01:24:28 +01:00
  • d64d0dad54 Automatic changelog compile [ci skip] Changelogs 2021-03-18 00:14:44 +00:00
  • 246546570c Automatic changelog generation for PR #14448 [ci skip] CitadelStationBot 2021-03-17 16:32:14 -05:00
  • f3fb22a2ab Merge pull request #14448 from Arturlang/give_fixes Lin 2021-03-17 16:32:11 -05:00
  • 361acfd904 beaker fix Hatterhat 2021-03-17 16:15:38 -05:00
  • dd44ebae46 peak funny Hatterhat 2021-03-17 16:10:32 -05:00
  • 5fa06109ac lemme get uh Hatterhat 2021-03-17 15:49:57 -05:00
  • 1f668a0473 lowers number of shots back to 8 from 10 GrayRachnid 2021-03-17 14:11:50 -04:00
  • 679d00f787 rebalances after further testing GrayRachnid 2021-03-17 13:48:21 -04:00
  • 508210e3ec buffs particle defender GrayRachnid 2021-03-17 13:01:49 -04:00
  • b4969c4770 Fixes auto-calling for non-heads and adds secure holopads GrayRachnid 2021-03-17 12:40:25 -04:00
  • fe9c36e069 Automatic changelog generation for PR #14406 [ci skip] CitadelStationBot 2021-03-17 11:01:54 -05:00
  • 45c3f2b222 Merge pull request #14406 from Hatterhat/hypoprints DeltaFire 2021-03-17 17:01:47 +01:00
  • 97e0e01265 ok Hatterhat 2021-03-17 03:25:06 -05:00
  • f3ea1b1a0c Relabeled to "Antag"; unambiguized in Putnam 2021-03-16 22:53:55 -07:00
  • d990328e29 Added a "no antags please" button Putnam 2021-03-16 22:37:39 -07:00
  • 69982f6315 fixes https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14452 and-might-have fi-x-ed https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14450 LetterN 2021-03-17 11:49:50 +08:00
  • 3aca657c1f Update uplink_kits.dm YakumoChen 2021-03-16 22:03:49 -04:00
  • 5f30c71321 Update uplink_kits.dm YakumoChen 2021-03-16 22:00:44 -04:00
  • 6bf711d7ec Update syndicate.dm SandPoot 2021-03-16 22:54:59 -03:00
  • 40fb1f2a0b Merge pull request #14445 from Citadel-Station-13/silicons-patch-7 Lin 2021-03-16 20:48:10 -05:00
  • 400485c527 Automatic changelog compile [ci skip] Changelogs 2021-03-17 00:14:31 +00:00
  • c64e7ee269 ffffffffff zerothebigboy 2021-03-16 19:52:00 -04:00
  • 01d92230a3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum zerothebigboy 2021-03-16 19:19:12 -04:00
  • 7f1b0e388c Update eldritch_book.dm zeroisthebiggay 2021-03-16 18:22:13 -04:00
  • 4053758828 Automatic changelog generation for PR #14347 [ci skip] CitadelStationBot 2021-03-16 14:32:01 -05:00
  • b105a3c831 Merge pull request #14347 from timothyteakettle/language-tab DeltaFire 2021-03-16 20:31:58 +01:00
  • 158008b80f maybe too big a buff kiwedespars 2021-03-16 11:05:49 -07:00