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

Commit Graph

  • c77a1ada93 cringe zerothebigboy 2020-10-11 03:18:29 -04:00
  • ff937e249f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into crepe zerothebigboy 2020-10-11 03:14:02 -04:00
  • 3e61ccb31a Merge pull request #13545 from Citadel-Station-13/silicons-patch-10 BlackMajor 2020-10-11 19:45:23 +13:00
  • 313970000b Merge pull request #13522 from silicons/async BlackMajor 2020-10-11 18:48:37 +13:00
  • bcd4ddabec Automatic changelog generation for PR #13530 [ci skip] CitadelStationBot 2020-10-11 00:43:52 -05:00
  • 8be9e0aaad Merge pull request #13530 from Citadel-Station-13/silicons-patch-12 BlackMajor 2020-10-11 18:43:49 +13:00
  • 8a8b30a17a Automatic changelog generation for PR #13193 [ci skip] CitadelStationBot 2020-10-11 00:42:52 -05:00
  • d69e081b23 Merge pull request #13193 from Citadel-Station-13/silicons-patch-17 BlackMajor 2020-10-11 18:42:49 +13:00
  • 92b88925de Merge pull request #13542 from Citadel-Station-13/silicons-patch-15 BlackMajor 2020-10-11 18:42:06 +13:00
  • bf7d68884b Merge pull request #13510 from silicons/google BlackMajor 2020-10-11 18:39:10 +13:00
  • 9e909095a8 Merge pull request #13015 from silicons/combat_rework_experimental BlackMajor 2020-10-11 18:38:53 +13:00
  • 7f611a98e1 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental silicons 2020-10-10 22:23:22 -07:00
  • 9e04d5723c Merge branch 'crepe' of https://github.com/zeroisthebiggay/Citadel-Station-13 into crepe zerothebigboy 2020-10-11 01:20:34 -04:00
  • a8315a69e2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into crepe zerothebigboy 2020-10-11 01:19:18 -04:00
  • 671fbe19d0 Automatic changelog generation for PR #13544 [ci skip] CitadelStationBot 2020-10-11 00:16:52 -05:00
  • 283ce51bc2 Merge pull request #13544 from DeltaFire15/portal-wackyness-fix silicons 2020-10-10 22:16:49 -07:00
  • 376f59c8cd Automatic changelog generation for PR #13540 [ci skip] CitadelStationBot 2020-10-11 00:04:52 -05:00
  • d2ce6ca709 Merge pull request #13540 from TheObserver-sys/QoLPass silicons 2020-10-10 22:04:49 -07:00
  • 0457042872 Automatic changelog generation for PR #13535 [ci skip] CitadelStationBot 2020-10-11 00:04:20 -05:00
  • c3983ee55b Merge pull request #13535 from Hatterhat/energy-sabres silicons 2020-10-10 22:04:17 -07:00
  • 8f5242ade1 Automatic changelog generation for PR #13533 [ci skip] CitadelStationBot 2020-10-11 00:02:49 -05:00
  • 792080ca3f Merge pull request #13533 from shellspeed1/jambalya- silicons 2020-10-10 22:02:46 -07:00
  • 120536d448 Automatic changelog generation for PR #13527 [ci skip] CitadelStationBot 2020-10-11 00:01:22 -05:00
  • b2336f1140 Merge pull request #13527 from ArchieBeepBoop/rtg silicons 2020-10-10 22:01:20 -07:00
  • 3cf4874707 Automatic changelog generation for PR #13525 [ci skip] CitadelStationBot 2020-10-11 00:01:13 -05:00
  • 1bd715ffc6 Merge pull request #13525 from Detective-Google/hilberts-juke silicons 2020-10-10 22:01:09 -07:00
  • ef52d1272d Automatic changelog generation for PR #13497 [ci skip] CitadelStationBot 2020-10-11 00:00:52 -05:00
  • 737b6460af Merge pull request #13497 from Zandario/species-refactor silicons 2020-10-10 22:00:49 -07:00
  • e584c30cc3 Automatic changelog generation for PR #13233 [ci skip] CitadelStationBot 2020-10-10 23:59:08 -05:00
  • 8b48cab574 Merge pull request #13233 from Hatterhat/za-hando silicons 2020-10-10 21:59:05 -07:00
  • 63a8b8ed43 Automatic changelog generation for PR #13014 [ci skip] CitadelStationBot 2020-10-10 23:58:19 -05:00
  • 2919dfee2e Merge pull request #13014 from Hatterhat/tendril-minimum silicons 2020-10-10 21:58:15 -07:00
  • 36b1e0b613 uh zeroisthebiggay 2020-10-11 00:20:03 -04:00
  • b8e86dacf4 Merge pull request #5 from Citadel-Station-13/master BlueWildrose 2020-10-10 19:38:49 -07:00
  • c412358d4e another typo DeltaFire 2020-10-11 03:58:38 +02:00
  • 9d281a70ae oops zerothebigboy 2020-10-10 21:45:44 -04:00
  • ef073167df crepe zerothebigboy 2020-10-10 21:39:45 -04:00
  • 2b3d0c3c11 Automatic changelog compile [ci skip] Changelogs 2020-10-11 01:06:08 +00:00
  • 9e2a370ee6 Automatic changelog compile [ci skip] Changelogs 2020-10-11 01:01:19 +00:00
  • f4cfc6c1e0 Update holidays.dm silicons 2020-10-10 16:47:03 -07:00
  • 4aac4cfba9 cease DeltaFire 2020-10-11 00:55:16 +02:00
  • 4ccf40f775 Revert "Revert "Merge branch 'master' into robotic-limbs-PT2"" DeltaFire 2020-10-11 00:53:18 +02:00
  • 27a099c6bf Revert "Merge branch 'master' into robotic-limbs-PT2" DeltaFire 2020-10-11 00:51:39 +02:00
  • c5bb85d794 Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2 DeltaFire 2020-10-11 00:47:54 +02:00
  • 73b5267425 Merge branch 'master' into robotic-limbs-PT2 DeltaFire 2020-10-11 00:44:28 +02:00
  • 5d97b04a6f Automatic changelog generation for PR #13531 [ci skip] CitadelStationBot 2020-10-10 17:34:02 -05:00
  • 4f5f56e68f Merge pull request #13531 from DeltaFire15/quick-fix Putnam3145 2020-10-10 15:33:59 -07:00
  • 9990337f32 fixes a bunch of portal runtimes DeltaFire 2020-10-10 23:40:12 +02:00
  • 1bdbd97347 Merge remote-tracking branch 'upstream/master' DeltaFire 2020-10-10 23:16:05 +02:00
  • 2e780bfff2 Empty commit to get travis to actually run DeltaFire 2020-10-10 22:18:49 +02:00
  • 285b26d35e sex zerothebigboy 2020-10-10 15:08:22 -04:00
  • b9aea84330 Automatic changelog generation for PR #13472 [ci skip] CitadelStationBot 2020-10-10 13:14:28 -05:00
  • ad32b8f437 Merge pull request #13472 from timothyteakettle/slime-puddle silicons 2020-10-10 11:14:25 -07:00
  • 2f2cf75326 Automatic changelog generation for PR #13405 [ci skip] CitadelStationBot 2020-10-10 13:02:33 -05:00
  • d8b39bcc5f Merge pull request #13405 from silicons/tracer Putnam3145 2020-10-10 11:02:30 -07:00
  • a1ccc31877 fuck you travis Timothy Teakettle 2020-10-10 18:05:31 +01:00
  • 641970f2c0 fixes two typos DeltaFire 2020-10-10 16:48:25 +02:00
  • e40e4a79d3 Allows plantbags to hold plantdisks The0bserver 2020-10-10 08:58:54 -04:00
  • 19f1e99a8c mass ports like 15 tg prs + counting (#13386) silicons 2020-10-10 03:20:33 -07:00
  • 69ef1ed0e0 Automatic changelog generation for PR #13444 [ci skip] CitadelStationBot 2020-10-10 05:15:42 -05:00
  • 385bd57940 reworks family heirlooms, adds heirlooms that can be based off your species (#13444) Timothy Teakettle 2020-10-10 11:15:39 +01:00
  • 04db791004 Update human.dm (#13491) silicons 2020-10-10 02:57:35 -07:00
  • 7200f2b004 Update emote.dm silicons 2020-10-10 02:47:28 -07:00
  • e070ace8b1 Automatic changelog compile [ci skip] Changelogs 2020-10-10 01:03:36 +00:00
  • e223229eac Automatic changelog compile [ci skip] Changelogs 2020-10-10 00:58:28 +00:00
  • 10009a39d7 Review Change Request 1 The0bserver 2020-10-09 09:17:28 -04:00
  • 98f398338a belt fix and icons The0bserver 2020-10-09 02:34:42 -04:00
  • c9857996f4 sprites The0bserver 2020-10-09 01:38:46 -04:00
  • 0d1d94fd06 belt The0bserver 2020-10-09 01:17:46 -04:00
  • 0d8bea1c9b QoL: Adds BSB's to Service, adds R.Plunger design The0bserver 2020-10-08 23:27:17 -04:00
  • 96c6608d59 enabled plumbing on trays. The0bserver 2020-10-08 22:50:24 -04:00
  • 3f33968ee7 Merge remote-tracking branch 'Upstream/master' The0bserver 2020-10-08 21:43:19 -04:00
  • 47860f45fa Automatic changelog compile [ci skip] Changelogs 2020-10-09 01:02:42 +00:00
  • 84b7384f02 Automatic changelog compile [ci skip] Changelogs 2020-10-09 00:58:18 +00:00
  • 8d0f5c8380 saber inhands WOO Hatterhat 2020-10-08 19:38:10 -05:00
  • 8e4c64a24b Remove clothing shito as requested Zandario 2020-10-08 18:48:26 -05:00
  • aa28e65570 more tweaking for the reagent itself DeltaFire 2020-10-09 00:42:52 +02:00
  • 2d684c88be readds a accidentally removed thing DeltaFire 2020-10-09 00:06:01 +02:00
  • 15f7ce6731 Automatic changelog generation for PR #13539 [ci skip] CitadelStationBot 2020-10-08 12:05:34 -05:00
  • f561389970 Merge pull request #13539 from timothyteakettle/eye-sprites Putnam3145 2020-10-08 10:05:30 -07:00
  • 1fc7d9a21e cleanup Timothy Teakettle 2020-10-08 17:43:56 +01:00
  • d37d7bddae Update jellypeople.dm Timothy Teakettle 2020-10-08 04:20:42 +01:00
  • 39288d0815 Automatic changelog compile [ci skip] Changelogs 2020-10-08 00:51:56 +00:00
  • ea8cc3759a Automatic changelog compile [ci skip] Changelogs 2020-10-08 00:47:52 +00:00
  • 96e55d6233 the last bit Hatterhat 2020-10-07 17:50:21 -05:00
  • 9d99061ff5 what the fuck git timothyteakettle 2020-10-07 23:40:59 +01:00
  • e2c6a19da7 Merge branch 'master' into slime-puddle Timothy Teakettle 2020-10-07 23:37:30 +01:00
  • 64ee40b185 Merge pull request #13449 from Citadel-Station-13/silicons-patch-4 Putnam3145 2020-10-07 15:10:48 -07:00
  • 6b536c23c7 Merge pull request #13480 from Citadel-Station-13/silicons-patch-7 Putnam3145 2020-10-07 15:09:26 -07:00
  • ec091f9f99 Merge pull request #13453 from Citadel-Station-13/silicons-patch-5 Putnam3145 2020-10-07 15:08:32 -07:00
  • 4b700a3ff7 Merge pull request #13490 from Citadel-Station-13/silicons-patch-8 Putnam3145 2020-10-07 15:08:12 -07:00
  • c682da6152 Automatic changelog generation for PR #13517 [ci skip] CitadelStationBot 2020-10-07 17:07:56 -05:00
  • 3edc471012 Merge pull request #13517 from Citadel-Station-13/silicons-patch-11 Putnam3145 2020-10-07 15:07:52 -07:00
  • b0b3a1ea14 Merge pull request #13536 from Citadel-Station-13/silicons-patch-13 Putnam3145 2020-10-07 15:07:05 -07:00
  • 8e83dcd697 event permissions silicons 2020-10-07 14:43:53 -07:00
  • eda0eda754 Update movement.dm silicons 2020-10-07 10:46:00 -07:00
  • 9928a172d0 initial commit - sabres Hatterhat 2020-10-06 21:58:59 -05:00
  • 2c59a5b9f8 more spelling shellspeed1 2020-10-06 17:36:57 -07:00
  • 1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental silicons 2020-10-06 17:11:21 -07:00
  • 89cfde9c34 Automatic changelog generation for PR #13526 [ci skip] CitadelStationBot 2020-10-06 19:06:12 -05:00