Commit Graph

  • 3e9de4d1ed Ill explain in comments AffectedArc07 2020-01-12 14:42:38 +00:00
  • 653b302d46 Forgot this AffectedArc07 2020-01-12 14:36:00 +00:00
  • 16a37e2769 Standardises all files from CRLF to LF AffectedArc07 2020-01-12 14:28:01 +00:00
  • 82d8900e5d aaand move this over Putnam 2020-01-12 03:36:47 -08:00
  • 3f5e68765e am i fucking stupid? Putnam 2020-01-12 03:10:42 -08:00
  • 295c134243 i'm so dumb dude Putnam 2020-01-12 03:06:17 -08:00
  • be6612fd48 oh my fucking GOD what was i THINKING Hatterhat 2020-01-12 02:55:54 -06:00
  • 0773f1b7fa sweet merciful FUCK what is this merge Hatterhat 2020-01-12 02:53:30 -06:00
  • 55c6e0d97e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 Hatterhat 2020-01-12 02:51:21 -06:00
  • 2842434d00 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 Hatterhat 2020-01-12 02:49:58 -06:00
  • ca848e547f Automatic changelog generation for PR #10492 [ci skip] CitadelStationBot 2020-01-12 02:49:42 -06:00
  • e1ae3f3c07 Merge pull request #10492 from Trilbyspaceclone/plastic__world kevinz000 2020-01-12 00:49:39 -08:00
  • f210971889 Merge pull request #10393 from chefferz/chefferz-forcefieldstostronk kevinz000 2020-01-12 00:47:17 -08:00
  • abd4754631 Automatic changelog generation for PR #10416 [ci skip] CitadelStationBot 2020-01-12 02:45:23 -06:00
  • 60524fb9c7 Merge pull request #10416 from r4d6/RCD-Updates kevinz000 2020-01-12 00:45:21 -08:00
  • d9d0e7c5e7 Automatic changelog generation for PR #10504 [ci skip] CitadelStationBot 2020-01-12 02:42:21 -06:00
  • 0b56e76b29 Merge pull request #10504 from Xantholne/xantholne-bees02 kevinz000 2020-01-12 00:42:19 -08:00
  • f13851704f Automatic changelog generation for PR #10480 [ci skip] CitadelStationBot 2020-01-12 02:41:50 -06:00
  • 6396c95bec Merge pull request #10480 from Putnam3145/more_flavor kevinz000 2020-01-12 00:41:47 -08:00
  • fe720dbb9c Merge pull request #10500 from rossark/robo kevinz000 2020-01-12 00:41:30 -08:00
  • 33a705e067 Automatic changelog generation for PR #10532 [ci skip] CitadelStationBot 2020-01-12 02:41:03 -06:00
  • 01db064038 Merge pull request #10532 from Ghommie/Ghommie-cit503 Putnam3145 2020-01-12 00:41:00 -08:00
  • c69d882943 Merge pull request #10521 from BlackMajor/master kevinz000 2020-01-12 00:40:48 -08:00
  • 58f41ffee2 Automatic changelog generation for PR #10522 [ci skip] CitadelStationBot 2020-01-12 02:40:20 -06:00
  • 4b4864740b Merge pull request #10522 from Hatterhat/syndi-sleeper kevinz000 2020-01-12 00:40:17 -08:00
  • 958abdc515 Automatic changelog generation for PR #10518 [ci skip] CitadelStationBot 2020-01-12 02:38:46 -06:00
  • ddff903532 Merge pull request #10518 from Seris02/explosionport kevinz000 2020-01-12 00:38:43 -08:00
  • ef00d1522c Automatic changelog generation for PR #10513 [ci skip] CitadelStationBot 2020-01-12 02:37:36 -06:00
  • ce1dabb585 Merge pull request #10513 from r4d6/open-message kevinz000 2020-01-12 00:37:33 -08:00
  • 555747df90 Automatic changelog generation for PR #10516 [ci skip] CitadelStationBot 2020-01-12 02:37:15 -06:00
  • 68d02de239 Merge pull request #10516 from BonniePandora/Proc-call-shit kevinz000 2020-01-12 00:37:12 -08:00
  • f5995cfaaa this is a massive security risk kevinz000 2020-01-12 00:36:52 -08:00
  • 5dc5ddaa76 daddy compiler please stop hating me Putnam 2020-01-11 22:17:18 -08:00
  • d5b227a0ca adds the POOL to box station Detective Google 2020-01-11 23:34:07 -06:00
  • 74ed49da46 string broke Letter N 2020-01-12 12:50:45 +08:00
  • b265959f2a ports hShark snout from hyper-station-13 Savotta 2020-01-12 04:23:08 +01:00
  • b22ec2ffd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into bowmanupgrade Seris02 2020-01-12 11:14:33 +08:00
  • 0c64ea1351 wow that was fucking dumb Putnam 2020-01-11 18:37:16 -08:00
  • 37c6119708 Sanity Putnam 2020-01-11 18:26:32 -08:00
  • 38dcb78625 chemistry fixes Putnam 2020-01-11 18:15:50 -08:00
  • ae46c1f63d Automatic changelog generation for PR #10509 [ci skip] CitadelStationBot 2020-01-11 16:16:29 -06:00
  • d6b28c59d4 Merge pull request #10509 from Ghommie/Ghommie-cit502 Lin 2020-01-11 22:16:27 +00:00
  • 7216ae545c how the hell did that fall out Hatterhat 2020-01-11 16:08:51 -06:00
  • 47fd3823e8 staff assistant jumpsuit gang Hatterhat 2020-01-11 15:58:24 -06:00
  • 16db38a08f Travis man good Ghommie 2020-01-11 20:51:15 +01:00
  • 0fc6d0e891 compile kevinz000 2020-01-11 11:28:03 -08:00
  • 6e07a6d005 compile kevinz000 2020-01-11 10:49:57 -08:00
  • 9fd9f60855 compile kevinz000 2020-01-11 10:49:44 -08:00
  • 16997433c9 Merge pull request #10528 from Citadel-Station-13/kevinz000-patch-12 Ghom 2020-01-11 19:16:46 +01:00
  • 29e7c49627 Pss got any of the good stuf Hydro? TrilbySpaceClone 2020-01-11 13:07:02 -05:00
  • c709a9e4a9 A few reagents related fixes. Ghommie 2020-01-11 18:45:54 +01:00
  • 5eb08e25c2 Merge pull request #32 from kappa-sama/moredular kappa-sama 2020-01-11 12:35:59 -05:00
  • 8a7e6d49a6 e kappa-sama 2020-01-11 12:35:49 -05:00
  • 8afef6b209 bye kappa-sama 2020-01-11 12:35:10 -05:00
  • eb93e3d1d3 hi kappa-sama 2020-01-11 12:35:04 -05:00
  • f752b41c99 what kappa-sama 2020-01-11 12:31:03 -05:00
  • e9f0740878 pain kappa-sama 2020-01-11 12:28:14 -05:00
  • 108e585cf1 shit kappa-sama 2020-01-11 12:25:38 -05:00
  • 1aee5e880a god kappa-sama 2020-01-11 12:24:23 -05:00
  • af562d1421 Update bloodsucker_life.dm kevinz000 2020-01-11 06:54:29 -08:00
  • 81fee7384d Automatic changelog generation for PR #10247 [ci skip] CitadelStationBot 2020-01-11 08:29:28 -06:00
  • 34502cab1d Merge pull request #10247 from Seris02/atmosfirelock Ghom 2020-01-11 15:29:25 +01:00
  • ec01d60b49 Automatic changelog generation for PR #10497 [ci skip] CitadelStationBot 2020-01-11 08:28:07 -06:00
  • 7fa3289013 Merge pull request #10497 from Trilbyspaceclone/uplink_redo Ghom 2020-01-11 15:28:04 +01:00
  • 894abc67c0 Merge pull request #10502 from Linzolle/big-boss Ghom 2020-01-11 15:24:21 +01:00
  • 7a41fc4ee8 Automatic changelog generation for PR #10505 [ci skip] CitadelStationBot 2020-01-11 08:21:11 -06:00
  • c2b3e7b0ec Merge pull request #10505 from LetterN/beep-boom Ghom 2020-01-11 15:21:08 +01:00
  • 1f9a7066f0 Merge pull request #10445 from Citadel-Station-13/kevinz000-patch-7 Ghom 2020-01-11 15:10:16 +01:00
  • bd53100e72 Automatic changelog generation for PR #10495 [ci skip] CitadelStationBot 2020-01-11 08:09:39 -06:00
  • 3a72d1f434 Merge pull request #10495 from Citadel-Station-13/kevinz000-patch-12 Ghom 2020-01-11 15:09:37 +01:00
  • 49bc21d906 Automatic changelog generation for PR #10511 [ci skip] CitadelStationBot 2020-01-11 08:07:57 -06:00
  • e12f5e9e44 Merge pull request #10511 from Citadel-Station-13/kevinz000-patch-15 Ghom 2020-01-11 15:07:55 +01:00
  • 6264e368f4 Automatic changelog generation for PR #10523 [ci skip] CitadelStationBot 2020-01-11 08:06:23 -06:00
  • e851939281 Merge pull request #10523 from Hatterhat/fuck-you-baltimore Ghom 2020-01-11 15:06:20 +01:00
  • 600732728a Automatic changelog generation for PR #10465 [ci skip] CitadelStationBot 2020-01-11 08:03:47 -06:00
  • 5dc598e2ea Merge pull request #10465 from Putnam3145/more-dojo-tweaks Ghom 2020-01-11 15:03:45 +01:00
  • 85f6367df5 weh Putnam 2020-01-11 03:50:19 -08:00
  • 9d3873f26f traitor always available Putnam 2020-01-11 03:32:14 -08:00
  • aaff36e9dc better now Seris02 2020-01-11 17:50:24 +08:00
  • 218c6bdc8f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into bowmanupgrade Seris02 2020-01-11 17:35:46 +08:00
  • 3ce8d2a61c adds bopwmanizing Seris02 2020-01-11 17:33:44 +08:00
  • 312da86424 Suggested changes Putnam 2020-01-11 01:28:49 -08:00
  • e0587aeac0 another dumb patch Putnam 2020-01-10 23:33:26 -08:00
  • 11676f9e79 fixed again Seris02 2020-01-11 15:23:59 +08:00
  • 18d234178b fixed again Seris02 2020-01-11 14:40:02 +08:00
  • 2006ccf4ef nicc you buffoon you never adjusted the hood type Hatterhat 2020-01-11 00:12:52 -06:00
  • ebf278fa0a fixed again Seris02 2020-01-11 14:11:56 +08:00
  • ec3f8a5085 Merge branch 'master' of https://github.com/Seris02/Citadel-Station-13 Seris02 2020-01-11 13:57:39 +08:00
  • ac4489c6a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics Seris02 2020-01-11 13:55:29 +08:00
  • b5f8e46941 this is blackmajors fault im not gonna lie Hatterhat 2020-01-10 23:41:30 -06:00
  • 30fc5b560b Couple of lingering fixes BlackMajor 2020-01-11 17:57:18 +13:00
  • 080cb74893 tgstation 40920 tweaked and tested for cit Hatterhat 2020-01-10 22:56:11 -06:00
  • 27f49972f5 Merge pull request #28 from Citadel-Station-13/master BlackMajor 2020-01-11 17:11:19 +13:00
  • c6507d47e2 bad patches, ugh Putnam 2020-01-10 20:06:35 -08:00
  • b6a187dc6d OOPS kappa-sama 2020-01-10 22:48:33 -05:00
  • 0a3daa211c items begone kappa-sama 2020-01-10 22:40:25 -05:00
  • ab5223cb20 this took longer than all the other items combined kappa-sama 2020-01-10 22:40:10 -05:00
  • bfedc80c64 idk what this even is lmao kappa-sama 2020-01-10 22:39:45 -05:00
  • 3281db6000 scream kappa-sama 2020-01-10 22:39:13 -05:00
  • 5857da02a5 cheeki breeki kappa-sama 2020-01-10 22:35:30 -05:00