Commit Graph

  • 926f64e13d Merge pull request #12722 from kappa-sama/patch-31 silicons 2020-07-11 00:49:29 -07:00
  • 12965cb49c Automatic changelog generation for PR #12715 [ci skip] CitadelStationBot 2020-07-11 02:49:17 -05:00
  • 00867c064c Merge pull request #12715 from HeroWithYay/Drinkable_Telecrystals silicons 2020-07-11 00:49:15 -07:00
  • 2095e0aaf9 Automatic changelog generation for PR #12714 [ci skip] CitadelStationBot 2020-07-11 02:48:40 -05:00
  • feddd14176 Merge pull request #12714 from DeltaFire15/sents-compromise-aug silicons 2020-07-11 00:48:37 -07:00
  • 5ccad3bc40 Automatic changelog generation for PR #12713 [ci skip] CitadelStationBot 2020-07-11 02:48:25 -05:00
  • f5974ab531 Merge pull request #12713 from MrJWhit/popping-the-monastery-tunnel silicons 2020-07-11 00:48:22 -07:00
  • e4612a7c32 Merge pull request #12726 from Detective-Google/lambda silicons 2020-07-11 00:46:50 -07:00
  • 923d614d46 Automatic changelog generation for PR #12711 [ci skip] CitadelStationBot 2020-07-11 02:46:35 -05:00
  • 08a6ef88e3 Merge pull request #12711 from LetterN/nerfs-cats silicons 2020-07-11 00:46:32 -07:00
  • 0c425b19ca Automatic changelog generation for PR #12725 [ci skip] CitadelStationBot 2020-07-11 02:46:04 -05:00
  • c5a5adca5a Merge pull request #12725 from EmeraldSundisk/cogsecsci silicons 2020-07-11 00:46:00 -07:00
  • 97e3fac551 Automatic changelog generation for PR #12716 [ci skip] CitadelStationBot 2020-07-11 02:45:41 -05:00
  • f33782aa38 Merge pull request #12716 from LetterN/d-w- silicons 2020-07-11 00:45:39 -07:00
  • 77b3f8356d Automatic changelog generation for PR #12717 [ci skip] CitadelStationBot 2020-07-11 02:44:53 -05:00
  • 36ba62652b Merge pull request #12717 from YakumoChen/wedding-crate silicons 2020-07-11 00:44:50 -07:00
  • cc2e9530b1 fix silicons 2020-07-11 00:44:17 -07:00
  • ed847b1a58 compile silicons 2020-07-11 00:42:13 -07:00
  • 3d80792e79 more silicons 2020-07-11 00:37:56 -07:00
  • 8d5d194a26 hahahahaha silicons 2020-07-11 00:30:56 -07:00
  • 11eab51b5d Automatic changelog generation for PR #12720 [ci skip] CitadelStationBot 2020-07-11 02:14:50 -05:00
  • 4f4c6b85bf Merge pull request #12720 from timothyteakettle/eye-contact silicons 2020-07-11 00:14:47 -07:00
  • 1dde0b67bf Automatic changelog generation for PR #12732 [ci skip] CitadelStationBot 2020-07-11 02:14:17 -05:00
  • 6ba38424fe Merge pull request #12732 from zeroisthebiggay/benisXXDD silicons 2020-07-11 00:14:14 -07:00
  • f43bdff603 bet? BlackMajor 2020-07-11 16:58:05 +12:00
  • 12819fb5bd Merge pull request #35 from Citadel-Station-13/master BlackMajor 2020-07-11 15:15:33 +12:00
  • db625eb93f Initial Commit: Adds slimeball recipe The0bserver 2020-07-10 23:04:25 -04:00
  • e571400b1b lots of bug fixes timothyteakettle 2020-07-11 03:35:15 +01:00
  • 13d85a4e0c penis zerothebigboy 2020-07-10 22:13:40 -04:00
  • 6e9c11ac8f Merge remote-tracking branch 'Upstream/master' The0bserver 2020-07-10 21:34:28 -04:00
  • 72c122f9fa Automatic changelog compile [ci skip] Changelogs 2020-07-11 00:31:35 +00:00
  • 2d84df4917 Automatic changelog compile [ci skip] Changelogs 2020-07-11 00:10:04 +00:00
  • 75b9eef74e bug fixes Timothy Teakettle 2020-07-10 22:52:08 +01:00
  • 045169e1ee actual trader subtypes Timothy Teakettle 2020-07-10 22:50:22 +01:00
  • 60b9e9dafe trader event/mob Timothy Teakettle 2020-07-10 21:06:53 +01:00
  • 49ae116bac Merge pull request #12705 from Citadel-Station-13/silicons-patch-16 Lin 2020-07-10 14:56:31 -05:00
  • 6fb729d69c Merge pull request #12718 from Citadel-Station-13/silicons-patch-17 Lin 2020-07-10 14:55:51 -05:00
  • 0867f92c4a Fixes APC Interface locks Artur 2020-07-10 19:52:49 +03:00
  • 9c1c0fef84 Add files via upload EmeraldSundisk 2020-07-10 06:35:57 -07:00
  • 630d65dfec done silicons 2020-07-10 00:08:53 -07:00
  • 214b95445e status panel silicons 2020-07-09 23:59:51 -07:00
  • dc1de02b74 Update human_movement.dm silicons 2020-07-09 23:44:17 -07:00
  • 2940f0efa5 Update code/game/objects/items/storage/firstaid.dm Chiirno 2020-07-10 02:35:42 -04:00
  • 9c9c611285 ok silicons 2020-07-09 23:34:35 -07:00
  • 8686029009 Update turnstile.dm silicons 2020-07-09 23:04:58 -07:00
  • 6af7519727 Update turnstile.dm silicons 2020-07-09 23:04:06 -07:00
  • 1faa8915f8 gateway center Detective Google 2020-07-09 23:28:45 -05:00
  • 475a546033 adds wedding crate YakumoChen 2020-07-10 04:06:55 +00:00
  • bf97828e5e Add files via upload EmeraldSundisk 2020-07-09 21:06:27 -07:00
  • 9d6003b920 ok silicons 2020-07-09 21:06:03 -07:00
  • 224f564e62 Automatic changelog generation for PR #12217 [ci skip] CitadelStationBot 2020-07-09 22:37:23 -05:00
  • 31da81aff4 Merge pull request #12217 from Putnam3145/putnamos-for-real silicons 2020-07-09 20:37:18 -07:00
  • 4f17e7ab1d Update CogStation.dmm EmeraldSundisk 2020-07-09 18:34:29 -07:00
  • b22f73e27f Update CogStation.dmm EmeraldSundisk 2020-07-09 18:17:42 -07:00
  • 25ea41c4a4 Automatic changelog compile [ci skip] Changelogs 2020-07-10 00:09:48 +00:00
  • a798061f71 also this kappa-sama 2020-07-09 16:14:38 -05:00
  • af106b7628 10 kappa-sama 2020-07-09 16:12:07 -05:00
  • 7422e86c1b fucking forgot the defines Keate Senior 2020-07-09 16:41:23 -04:00
  • 928a7a956f Adds things to help the cult become station based Keate Senior 2020-07-09 16:30:52 -04:00
  • 84a22a9f49 Fixes cloning species transfer Artur 2020-07-09 23:06:57 +03:00
  • e0428e946e Update CogStation.dmm EmeraldSundisk 2020-07-09 12:46:29 -07:00
  • 9de8483bcf Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 Artur 2020-07-09 22:14:20 +03:00
  • 02f46322ad port examine Timothy Teakettle 2020-07-09 18:32:45 +01:00
  • da5104b3a1 Merge pull request #49 from Citadel-Station-13/master EmeraldSundisk 2020-07-09 10:12:49 -07:00
  • 0c7b06baf4 Merge pull request #12719 from Citadel-Station-13/silicons-patch-18 BlackMajor 2020-07-09 22:25:22 +12:00
  • 9b955e5d03 gotta replace all of them actually Putnam 2020-07-09 03:19:52 -07:00
  • 26d384e65b fix silicons 2020-07-09 03:17:17 -07:00
  • 93e0ceded7 Update canister.dm silicons 2020-07-09 03:01:56 -07:00
  • 835dd722e5 monster told me this would fix it Putnam 2020-07-09 02:31:38 -07:00
  • b104241a5f Automatic changelog generation for PR #12708 [ci skip] CitadelStationBot 2020-07-09 04:26:42 -05:00
  • af9348c443 Merge pull request #12708 from EmeraldSundisk/poolby silicons 2020-07-09 02:26:39 -07:00
  • 3c0219e599 Automatic changelog generation for PR #12707 [ci skip] CitadelStationBot 2020-07-09 04:26:30 -05:00
  • bf4936cb02 Merge pull request #12707 from Chiirno/slimebrain silicons 2020-07-09 02:26:27 -07:00
  • aae496492f Update revenant.dm silicons 2020-07-09 02:22:30 -07:00
  • 7cf4a55496 at least it'll fail better this time Putnam 2020-07-09 02:18:08 -07:00
  • 196261296e probably fixes travis Putnam 2020-07-09 01:40:39 -07:00
  • aefdf9eef7 duplicate REVERSE_DIR Putnam 2020-07-09 01:38:17 -07:00
  • 2a04ab19fd windoors :b:roke Putnam 2020-07-09 01:36:57 -07:00
  • bfa672b091 adds some rings to the wedding crate YakumoChen 2020-07-09 07:49:11 +00:00
  • 1a82955f32 adds a wedding crate YakumoChen 2020-07-09 07:22:33 +00:00
  • 927c0ca364 Merge pull request #5 from Citadel-Station-13/master YakumoChen 2020-07-09 02:36:47 -04:00
  • eeedad21de ^w^ Letter N 2020-07-09 14:32:23 +08:00
  • 75c0b01c86 Updated to july 2020. Putnam 2020-07-08 23:13:26 -07:00
  • 2c94dc5d41 Automatic changelog generation for PR #12712 [ci skip] CitadelStationBot 2020-07-09 00:54:56 -05:00
  • 1b97c9954f Merge pull request #12712 from TheObserver-sys/Imadeanoops silicons 2020-07-08 22:54:53 -07:00
  • c1a985d154 Automatic changelog generation for PR #12710 [ci skip] CitadelStationBot 2020-07-09 00:52:22 -05:00
  • be49be022b Merge pull request #12710 from Sneakyrat6/hoodieFix silicons 2020-07-08 22:52:20 -07:00
  • 9828d6fe85 Merge pull request #12700 from KeRSedChaplain/POSTRATVAR silicons 2020-07-08 22:51:36 -07:00
  • a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real Putnam 2020-07-08 22:02:03 -07:00
  • bed6f4ac91 Adds "Telecrystal Dust" a useless, red waste of syndicate resources that can be obtained by grinding raw telecrystals in a blender. HeroWithYay 2020-07-09 16:32:14 +12:00
  • ef13ff4388 Automatic changelog compile [ci skip] Changelogs 2020-07-09 00:12:43 +00:00
  • d79e1cdb9d Automatic changelog compile [ci skip] Changelogs 2020-07-09 00:10:33 +00:00
  • 7aa160029f changes sent's healing a bit DeltaFire 2020-07-08 23:45:35 +02:00
  • e12d690d3f hopefulyl fixes cloning!?!? Artur 2020-07-08 23:54:00 +03:00
  • de32d6cae1 Merge remote-tracking branch 'upstream/master' DeltaFire 2020-07-08 22:43:44 +02:00
  • 0a9dc33ce1 Reverts cloning changes Artur 2020-07-08 23:42:47 +03:00
  • 886b196863 Lost decal MrJWhit 2020-07-08 13:49:10 -04:00
  • 22505097ec plz final update MrJWhit 2020-07-08 13:44:08 -04:00
  • bbc9b47eee Update PubbyStation.dmm MrJWhit 2020-07-08 13:41:45 -04:00
  • 27abb80953 Removing the ugly pubby monastery hallway MrJWhit 2020-07-08 13:34:31 -04:00