shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • c178e53e2a Update syndicate.dm silicons 2020-07-30 17:25:39 -07:00
  • 1e58474433 Automatic changelog compile [ci skip] Changelogs 2020-07-31 00:14:25 +00:00
  • 2e3922d08e Merge remote-tracking branch 'origin/master' into bloodsucker_life Artur 2020-07-31 02:07:14 +03:00
  • b22ffd6b6e Makes it properly work Artur 2020-07-31 02:07:03 +03:00
  • 3fdd1654ad aaaaaaa dapnee 2020-07-30 16:44:24 -06:00
  • dcf3155b7f Map Edits Three: The Mappening dapnee 2020-07-30 16:29:04 -06:00
  • 03cff55017 Adds roboticist cartridge to the PDA vendor. Auris456852 2020-07-30 23:31:31 +03:00
  • e0e9166372 Merge pull request #1 from Citadel-Station-13/master Auris456852 2020-07-30 23:19:42 +03:00
  • 6dfdff34ef durathread armor kits Hatterhat 2020-07-30 13:38:04 -05:00
  • 2a23f88438 Whoopsie MrJWhit 2020-07-30 12:44:44 -04:00
  • 249cb136ef Reworks abducotr spawn text MrJWhit 2020-07-30 12:38:30 -04:00
  • beaf4b14aa Merge remote-tracking branch 'upstream/master' DeltaFire 2020-07-30 16:58:02 +02:00
  • e40470f553 h. Updates NTOS, and axes p2p filetransfer! Letter N 2020-07-30 20:54:13 +08:00
  • b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 Letter N 2020-07-30 14:43:52 +08:00
  • 894ea242b4 asset cache update. may fuck shit up Letter N 2020-07-30 14:28:01 +08:00
  • 782e3c2ffb copypaste phase complete, major:vendies Letter N 2020-07-30 14:17:35 +08:00
  • 10fefca674 another batch. MAJOR: chem_master, pandemic Letter N 2020-07-30 14:06:20 +08:00
  • 0805265412 yet another batch. MAJOR: APC Letter N 2020-07-30 12:54:53 +08:00
  • 6356084fe9 this kappa-sama 2020-07-29 23:36:27 -04:00
  • ba0c77a8bd fix silicons 2020-07-29 20:13:39 -07:00
  • b8522a2ae0 ok silicons 2020-07-29 20:04:47 -07:00
  • f02bc4a572 Update toy.dm silicons 2020-07-29 19:49:11 -07:00
  • 16722c47c3 CentCom Galactic Ban DB Unknown 2020-07-29 21:39:58 -05:00
  • caaedce6e2 end our suffering timothyteakettle 2020-07-30 02:33:39 +01:00
  • 55be55ce0f Revert "end our suffering" timothyteakettle 2020-07-30 02:29:13 +01:00
  • 4e1fcc4e08 end our suffering timothyteakettle 2020-07-30 02:28:53 +01:00
  • 940fe8240d monkey blood fix timothyteakettle 2020-07-30 01:57:09 +01:00
  • 0711e45d18 Automatic changelog compile [ci skip] Changelogs 2020-07-30 00:11:15 +00:00
  • 0772d6687f ghost chilis fixed Seris02 2020-07-30 08:01:25 +08:00
  • 7fa5ccbd0e fixes slapping uplinks with non uplink items giving runtimes Sishen 2020-07-29 16:14:01 -06:00
  • 62cbe95856 Automatic changelog generation for PR #12955 [ci skip] CitadelStationBot 2020-07-29 16:02:26 -05:00
  • c60e595d99 Merge pull request #12955 from Arturlang/bloodsucker_life silicons 2020-07-29 14:02:22 -07:00
  • c83aeb4fea Merge branch 'master' of github.com:Citadel-Station-13/Citadel-Station-13 into penlight Linzolle 2020-07-29 15:59:29 -05:00
  • 41a711ff01 Merge pull request #12959 from Citadel-Station-13/AAAAAAA Lin 2020-07-29 15:59:20 -05:00
  • f901aa9d42 travis work Timothy Teakettle 2020-07-29 21:48:47 +01:00
  • d4469b8db8 Automatic changelog generation for PR #12953 [ci skip] CitadelStationBot 2020-07-29 15:48:47 -05:00
  • a7fe7f1317 Merge pull request #12953 from Adelphon/pog Lin 2020-07-29 15:48:45 -05:00
  • 5a58cd6da0 Another pass over kilo dapnee 2020-07-29 14:35:17 -06:00
  • 90d3cff53f Merge remote-tracking branch 'citadel/master' into 12742 silicons 2020-07-29 11:53:59 -07:00
  • ad3092d883 Merge branch 'master' into AAAAAAA silicons 2020-07-29 11:13:33 -07:00
  • 446e0df667 Merge pull request #12961 from timothyteakettle/travis-patch-1 silicons 2020-07-29 11:12:35 -07:00
  • 097327b4f3 Revert "Merge branch 'master' into travis-patch-1" Timothy Teakettle 2020-07-29 19:02:18 +01:00
  • 9a9993c7be yep Timothy Teakettle 2020-07-29 19:00:06 +01:00
  • de3d6310b2 Merge branch 'master' into travis-patch-1 Timothy Teakettle 2020-07-29 18:59:21 +01:00
  • d5ac2dcd74 debug remove Timothy Teakettle 2020-07-29 18:26:35 +01:00
  • b5a16d8945 MORE CLOTHES Timothy Teakettle 2020-07-29 18:20:46 +01:00
  • 31963b32a4 subcategories cool Timothy Teakettle 2020-07-29 17:14:07 +01:00
  • 9721025582 Merge branch 'master' into wounds-part-2 Timothy Teakettle 2020-07-29 15:47:44 +01:00
  • 1bc2404bae revert cc silicons 2020-07-29 01:47:14 -07:00
  • a9e84df7f4 fix silicons 2020-07-29 01:17:39 -07:00
  • bc823b544f sigh silicons 2020-07-29 01:17:16 -07:00
  • e4148fe4ad Merge remote-tracking branch 'citadel/master' into 12742 silicons 2020-07-29 01:11:11 -07:00
  • f8f29826f5 Automatic changelog generation for PR #12924 [ci skip] CitadelStationBot 2020-07-29 03:09:51 -05:00
  • 9ff94e019b Merge pull request #12924 from SiliconMain/analyzer silicons 2020-07-29 01:09:48 -07:00
  • 5d4bb48628 another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator Letter N 2020-07-29 15:10:01 +08:00
  • b61edadd4a Merge pull request #10 from Citadel-Station-13/master Heretical Lizard 2020-07-29 02:37:44 -04:00
  • fbf81930c3 Merge pull request #12958 from silicons/fix_142 Lin 2020-07-29 00:20:45 -05:00
  • 1c2eefb8d6 . silicons 2020-07-28 22:11:51 -07:00
  • 78312c23bf sigh silicons 2020-07-28 21:53:07 -07:00
  • 1416fd08dc updates clockwork armor /what is magic defense even for i don't get it/ Keate Senior 2020-07-29 00:15:11 -04:00
  • 5284fbbec0 various fixes to make the PR not conflict with clickdelays probably Keate Senior 2020-07-28 23:52:13 -04:00
  • 9a129d8683 Merge pull request #9 from DeltaFire15/prolonging-prism-update Heretical Lizard 2020-07-28 23:20:58 -04:00
  • dbc766a7ca Automatic changelog generation for PR #12922 [ci skip] CitadelStationBot 2020-07-28 22:17:10 -05:00
  • a560920f3c Merge pull request #12922 from timothyteakettle/let-bots-wear-hats Lin 2020-07-28 22:17:06 -05:00
  • d53738a9a5 Merge branch 'master' of github.com:Citadel-Station-13/Citadel-Station-13 into penlight Linzolle 2020-07-28 22:13:49 -05:00
  • 481f29fc07 Automatic changelog generation for PR #12944 [ci skip] CitadelStationBot 2020-07-28 22:11:34 -05:00
  • 447a0b24bf Merge pull request #12944 from timothyteakettle/fixes-crates Lin 2020-07-28 22:11:30 -05:00
  • 105cc8dc70 Automatic changelog generation for PR #12883 [ci skip] CitadelStationBot 2020-07-28 22:05:42 -05:00
  • bbffd41d55 Merge pull request #12883 from Citadel-Station-13/silicons-patch-49 Lin 2020-07-28 22:05:39 -05:00
  • c15d0de20d subcategories work timothyteakettle 2020-07-29 03:57:16 +01:00
  • be20861294 Automatic changelog generation for PR #12734 [ci skip] CitadelStationBot 2020-07-28 21:51:46 -05:00
  • a5dd08a054 Merge pull request #12734 from silicons/shoelaces Lin 2020-07-28 21:51:43 -05:00
  • 2e63c17456 Automatic changelog generation for PR #12834 [ci skip] CitadelStationBot 2020-07-28 21:51:14 -05:00
  • 81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental Lin 2020-07-28 21:51:10 -05:00
  • 3371022275 Automatic changelog generation for PR #12929 [ci skip] CitadelStationBot 2020-07-28 21:48:17 -05:00
  • ae02a7348c Merge pull request #12929 from Citadel-Station-13/silicons-patch-59 Lin 2020-07-28 21:48:14 -05:00
  • 13e50ced55 Automatic changelog generation for PR #12928 [ci skip] CitadelStationBot 2020-07-28 21:48:07 -05:00
  • e8ab87c396 Merge pull request #12928 from Citadel-Station-13/silicons-patch-58 Lin 2020-07-28 21:48:03 -05:00
  • 9e07eeb84d Automatic changelog generation for PR #12932 [ci skip] CitadelStationBot 2020-07-28 21:45:58 -05:00
  • 91dc8b96d0 Merge pull request #12932 from silicons/ok_2 Lin 2020-07-28 21:45:53 -05:00
  • 18fa47e479 Merge pull request #12931 from Citadel-Station-13/silicons-patch-61 Lin 2020-07-28 21:45:36 -05:00
  • 3825bb73df Automatic changelog generation for PR #12930 [ci skip] CitadelStationBot 2020-07-28 21:45:14 -05:00
  • e93dddf5cc Merge pull request #12930 from Citadel-Station-13/silicons-patch-60 Lin 2020-07-28 21:45:10 -05:00
  • 72cb4fb920 honk kappa-sama 2020-07-28 21:56:39 -04:00
  • 7bc458b43e Automatic changelog compile [ci skip] Changelogs 2020-07-29 00:11:03 +00:00
  • ef39e62e39 Makes bloodsucker death not spam now actually working Artur 2020-07-29 02:11:14 +03:00
  • e0d9c7972d Makes it actually work Artur 2020-07-29 01:50:40 +03:00
  • 721e018aec loadout stuff Timothy Teakettle 2020-07-28 22:52:00 +01:00
  • 8c2e23e603 Automatic changelog generation for PR #12948 [ci skip] CitadelStationBot 2020-07-28 15:27:16 -05:00
  • 93da2515b6 Merge pull request #12948 from Hatterhat/windows silicons 2020-07-28 13:27:12 -07:00
  • 08a6d140aa Automatic changelog generation for PR #12942 [ci skip] CitadelStationBot 2020-07-28 15:26:26 -05:00
  • d8378e64be Merge pull request #12942 from DeltaFire15/outfit-fix silicons 2020-07-28 13:26:23 -07:00
  • 1ef086dffb Automatic changelog generation for PR #12951 [ci skip] CitadelStationBot 2020-07-28 15:26:11 -05:00
  • ab67ae3291 Merge pull request #12951 from timothyteakettle/haha-yes-blood silicons 2020-07-28 13:26:07 -07:00
  • 0152dcda65 fix silicons 2020-07-28 13:24:45 -07:00
  • 1fa691d569 ok silicons 2020-07-28 13:24:17 -07:00
  • 09f2594c37 Plugs bloodsucker LifeTick into BiologicalLife Artur 2020-07-28 22:58:13 +03:00
  • f53280c9b7 adds another atmos tech spawn dapnee 2020-07-28 13:46:10 -06:00
  • aa0670e34c Updates the clockie delay structure DeltaFire 2020-07-28 21:37:05 +02:00
  • c87c2bd850 smh silicons 2020-07-28 12:31:35 -07:00