Commit Graph

  • 78b6a60e80 oh silicons 2020-07-28 12:25:27 -07:00
  • fd738fd16a spelling silicons 2020-07-28 12:12:30 -07:00
  • 4ab175d812 sigh silicons 2020-07-28 12:10:34 -07:00
  • c720e800df whew! silicons 2020-07-28 12:08:02 -07:00
  • 1f508ef15d Adds Camo To AutoDrobe (fix) Adelphon 2020-07-28 15:04:58 -04:00
  • cf6c78985f icons silicons 2020-07-28 11:32:23 -07:00
  • 8313485632 fix silicons 2020-07-28 11:31:28 -07:00
  • 170afed3bc oops dapnee 2020-07-28 12:16:31 -06:00
  • 1540d66e88 Minor Fixes to Box dapnee 2020-07-28 12:00:35 -06:00
  • 469ea17063 Automatic changelog generation for PR #12938 [ci skip] CitadelStationBot 2020-07-28 12:46:38 -05:00
  • e9d1bcc899 Merge pull request #12938 from necromanceranne/sprite-fixes-rapier silicons 2020-07-28 10:46:34 -07:00
  • 60825a79b8 Automatic changelog generation for PR #12937 [ci skip] CitadelStationBot 2020-07-28 12:46:22 -05:00
  • 6c83beea02 Merge pull request #12937 from Ghommie/Ghommie-cit834 silicons 2020-07-28 10:46:17 -07:00
  • ff306b7005 Automatic changelog generation for PR #12936 [ci skip] CitadelStationBot 2020-07-28 12:45:58 -05:00
  • cac1627d26 Merge pull request #12936 from zeroisthebiggay/weenjoystealingfashion silicons 2020-07-28 10:45:54 -07:00
  • 4dce4521f4 Automatic changelog generation for PR #12941 [ci skip] CitadelStationBot 2020-07-28 12:45:35 -05:00
  • a5063a92b9 Merge pull request #12941 from timothyteakettle/alien-embeds-work silicons 2020-07-28 10:45:31 -07:00
  • c820efcaf1 Automatic changelog generation for PR #12940 [ci skip] CitadelStationBot 2020-07-28 12:45:20 -05:00
  • b17a191aeb Merge pull request #12940 from necromanceranne/stunbaton_sprite_new silicons 2020-07-28 10:45:16 -07:00
  • c8960624d3 sorry artur Timothy Teakettle 2020-07-28 18:37:01 +01:00
  • af02490739 still conflicts with clickdelays bluh whatever I'll fix it if its merged Keate Senior 2020-07-28 13:21:27 -04:00
  • 936fec5175 Automatic changelog generation for PR #12950 [ci skip] CitadelStationBot 2020-07-28 12:15:20 -05:00
  • 475d8ed6fb Merge pull request #12950 from timothyteakettle/species-are-dumb silicons 2020-07-28 10:15:17 -07:00
  • daed810c3a I didn't get to see if it'd still conflict with the clickdelay testmerge Keate Senior 2020-07-28 12:59:34 -04:00
  • 72972e1659 some species code fixes Timothy Teakettle 2020-07-28 17:56:50 +01:00
  • 8a32cac8db window rotation fix Hatterhat 2020-07-28 10:47:07 -05:00
  • 0d85f0553b bumps krav down to 25, only give martyr to syndie iaa Sishen 2020-07-28 09:30:26 -06:00
  • dcd2c11f4e yay indicator Seris02 2020-07-28 20:43:38 +08:00
  • 3f84d44510 fixed it up aaaah necromanceranne 2020-07-28 21:33:50 +10:00
  • 84e9f406c7 yay it fix time for indicator Seris02 2020-07-28 17:41:17 +08:00
  • e8d4d5b053 Revert "Revert "Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834""" Keate Senior 2020-07-28 04:07:01 -04:00
  • 0e6fe357da Revert "Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834"" Keate Senior 2020-07-28 04:07:01 -04:00
  • 4b876ef9fb Revert "THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834" Keate Senior 2020-07-28 04:07:01 -04:00
  • 7e1cab15ae THIS COMMIT IS PURELY SO IT WORKS WITH KEVINS CLICKDELAYS #12834 Keate Senior 2020-07-28 04:07:01 -04:00
  • ccca78a1ca Update spellcard.dm Trilbyspaceclone 2020-07-28 00:34:32 -04:00
  • 3a6d72af54 Update spellcard.dm Trilbyspaceclone 2020-07-28 00:20:14 -04:00
  • c8fff28395 Update spellcard.dm Trilbyspaceclone 2020-07-28 00:12:00 -04:00
  • b0f03eac12 ok silicons 2020-07-27 21:06:03 -07:00
  • 229c7d05b6 Automatic changelog generation for PR #12945 [ci skip] CitadelStationBot 2020-07-27 21:21:19 -05:00
  • 2ba01663e5 Merge pull request #12945 from timothyteakettle/jar-fixes silicons 2020-07-27 19:21:16 -07:00
  • f36071bb64 wouldnt it be cool if i tested the small logic change timothyteakettle 2020-07-28 03:09:07 +01:00
  • 99e4ec778c Automatic changelog compile [ci skip] Changelogs 2020-07-28 00:13:30 +00:00
  • 3bb61e5f53 Automatic changelog compile [ci skip] Changelogs 2020-07-28 00:11:02 +00:00
  • ffcfd21613 fix silicons 2020-07-27 14:24:10 -07:00
  • 5bf4afcade sigh silicons 2020-07-27 14:09:37 -07:00
  • dc14c02570 fix crates Timothy Teakettle 2020-07-27 21:55:51 +01:00
  • dc278d7b02 woops silicons 2020-07-27 13:11:26 -07:00
  • 67b518bf42 experimental silicons 2020-07-27 13:09:54 -07:00
  • cf7678c7d4 hey let's forget to add the filetype to this instead of making sure it would actually work GlitchyCore 2020-07-27 14:41:10 -05:00
  • 9f3e7755ae two line fix DeltaFire 2020-07-27 21:30:13 +02:00
  • b126ae01ee Merge remote-tracking branch 'upstream/master' DeltaFire 2020-07-27 21:15:59 +02:00
  • bbda8dbf79 make detective the same, remove blood and paraplegic Timothy Teakettle 2020-07-27 18:48:44 +01:00
  • 8d9c94c087 aliens can remove embeds now Timothy Teakettle 2020-07-27 17:59:05 +01:00
  • a4cc3d6030 Automatic changelog generation for PR #12862 [ci skip] CitadelStationBot 2020-07-27 11:46:40 -05:00
  • 87eac49bbf Merge pull request #12862 from Citadel-Station-13/silicons-patch-44 Lin 2020-07-27 11:46:37 -05:00
  • 2e63621de3 Automatic changelog generation for PR #12900 [ci skip] CitadelStationBot 2020-07-27 11:43:35 -05:00
  • 2514f4111d Merge pull request #12900 from Citadel-Station-13/silicons-patch-53 Lin 2020-07-27 11:43:31 -05:00
  • 533bf331e2 Automatic changelog generation for PR #12898 [ci skip] CitadelStationBot 2020-07-27 11:39:32 -05:00
  • f49b79db00 Merge pull request #12898 from Citadel-Station-13/silicons-patch-52 Lin 2020-07-27 11:39:28 -05:00
  • ea861148b9 Merge pull request #12822 from Citadel-Station-13/silicons-patch-37 Lin 2020-07-27 11:33:04 -05:00
  • e9cee24608 Updates the stunbaton sprites necromanceranne 2020-07-28 02:01:10 +10:00
  • 27aba092e0 aaaaaaaaaa Sishen 2020-07-27 08:20:03 -06:00
  • ef611995ed adds some in-hands for the rapier sheath necromanceranne 2020-07-28 00:19:47 +10:00
  • f9265c6b5e Automatic changelog generation for PR #12888 [ci skip] CitadelStationBot 2020-07-27 08:27:10 -05:00
  • 4fad4ad969 Merge pull request #12888 from Citadel-Station-13/silicons-patch-50 Ghom 2020-07-27 15:27:07 +02:00
  • f946a157f4 Update mapping.dm Ghom 2020-07-27 14:54:46 +02:00
  • 7e18e7a7a8 Update mapping.dm Ghom 2020-07-27 14:52:05 +02:00
  • f1c242aadc Fixing new bugs and stuff. Ghommie 2020-07-27 14:16:01 +02:00
  • 22efdbffcd woops silicons 2020-07-26 23:08:41 -07:00
  • 75f0daad06 Automatic changelog generation for PR #12934 [ci skip] CitadelStationBot 2020-07-27 01:01:11 -05:00
  • 785c2b6e0b Merge pull request #12934 from dapnee/a-fan silicons 2020-07-26 23:01:08 -07:00
  • 62bbd8f020 Automatic changelog generation for PR #12927 [ci skip] CitadelStationBot 2020-07-27 01:00:36 -05:00
  • e90671c846 Merge pull request #12927 from Ludox235/we-cant-have-nice-things silicons 2020-07-26 23:00:33 -07:00
  • 43ac210b83 Automatic changelog generation for PR #12923 [ci skip] CitadelStationBot 2020-07-27 01:00:20 -05:00
  • e083689b4b Merge pull request #12923 from EmeraldSundisk/snaxattack silicons 2020-07-26 23:00:16 -07:00
  • d395b84b14 Automatic changelog generation for PR #12921 [ci skip] CitadelStationBot 2020-07-27 00:59:58 -05:00
  • 32b8528b16 Merge pull request #12921 from TheObserver-sys/LOOKGORDONATAG! silicons 2020-07-26 22:59:55 -07:00
  • 3b4b90519d Automatic changelog generation for PR #12920 [ci skip] CitadelStationBot 2020-07-27 00:58:47 -05:00
  • 6f9c310ea8 Merge pull request #12920 from zeroisthebiggay/blackboxfatcox silicons 2020-07-26 22:58:43 -07:00
  • a17946232d Automatic changelog generation for PR #12919 [ci skip] CitadelStationBot 2020-07-27 00:58:34 -05:00
  • 850bc0dc33 Merge pull request #12919 from SiliconMain/patch-5 silicons 2020-07-26 22:58:31 -07:00
  • 0910ede761 Automatic changelog generation for PR #12918 [ci skip] CitadelStationBot 2020-07-27 00:58:01 -05:00
  • 16a77f9641 Merge pull request #12918 from SiliconMain/patch-3 silicons 2020-07-26 22:57:58 -07:00
  • 3a21af2050 Automatic changelog generation for PR #12916 [ci skip] CitadelStationBot 2020-07-27 00:57:40 -05:00
  • d9f9b2e974 Merge pull request #12916 from MrJWhit/meta-station-atmos-and-toxins-update silicons 2020-07-26 22:57:36 -07:00
  • 911761de17 Automatic changelog generation for PR #12901 [ci skip] CitadelStationBot 2020-07-27 00:57:03 -05:00
  • 401e8cf967 Merge pull request #12901 from CameronWoof/trumpet-cargo silicons 2020-07-26 22:56:59 -07:00
  • f75069a37a Merge pull request #12899 from Hatterhat/masks silicons 2020-07-26 22:56:39 -07:00
  • d47b553527 Merge pull request #12892 from Literallynotpickles/hi silicons 2020-07-26 22:56:22 -07:00
  • e02e737f16 Automatic changelog generation for PR #12884 [ci skip] CitadelStationBot 2020-07-27 00:52:34 -05:00
  • e240453044 Merge pull request #12884 from timothyteakettle/fix-a-bad-bug/exploit silicons 2020-07-26 22:52:30 -07:00
  • ca80f4221b Automatic changelog generation for PR #12876 [ci skip] CitadelStationBot 2020-07-27 00:52:04 -05:00
  • 20d9c74f9f Merge pull request #12876 from timothyteakettle/species-are-dumb silicons 2020-07-26 22:52:00 -07:00
  • 14cf45086f Automatic changelog generation for PR #12817 [ci skip] CitadelStationBot 2020-07-27 00:51:27 -05:00
  • 67c002de7a Merge pull request #12817 from kappa-sama/patch-34 silicons 2020-07-26 22:51:24 -07:00
  • ef720c3481 a zerothebigboy 2020-07-27 01:37:56 -04:00
  • df31d90c1b a zerothebigboy 2020-07-27 01:37:47 -04:00
  • 9fbcd21af6 a zerothebigboy 2020-07-27 00:36:38 -04:00
  • 1c8007cf78 a zerothebigboy 2020-07-27 00:34:28 -04:00
  • e30a60d0ba a zerothebigboy 2020-07-26 23:42:40 -04:00