Commit Graph

  • 343420f343 Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 Ghommie 2019-12-06 21:37:11 +01:00
  • 27af7b271f qdeleted to qdeleting Ghommie 2019-12-06 20:12:30 +01:00
  • 542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 Ghommie 2019-12-06 20:09:35 +01:00
  • 72c093d14e Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 Ghommie 2019-12-06 19:05:50 +01:00
  • 91e628c73d Ports timestop and sepia extracts improvements/tweaks. Ghommie 2019-12-06 19:01:42 +01:00
  • 1158c03ed7 Added bamboo. Useroth 2019-12-06 19:00:10 +01:00
  • 2addcb4142 Fixes bubblegum's death not granting the arena shuttle because the medals subsystem is not hub enabled Ghommie 2019-12-06 16:37:46 +01:00
  • 85b58b3d15 Update scripture_applications.dm Sishen 2019-12-06 07:56:11 -07:00
  • 99f694c94a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit433 Ghommie 2019-12-06 15:31:40 +01:00
  • 622b3e5608 ddddddd Ghommie 2019-12-06 15:31:05 +01:00
  • f6a64b31b7 b Sishen 2019-12-06 07:02:57 -07:00
  • 8da7d1a021 b Sishen 2019-12-06 06:38:48 -07:00
  • 6377f1b3a9 Organisation Winter Flare 2019-12-06 03:42:57 -05:00
  • 968e9c099d Update silicon.dm kevinz000 2019-12-06 01:12:44 -07:00
  • 8bd6c58bcd Merge branch 'master' into cargocleanupv2boogaloo Winter Flare 2019-12-06 01:27:44 -05:00
  • b860c6e0bb Merge branch 'master' into cargocleanupv2boogaloo Winter Flare 2019-12-06 01:14:44 -05:00
  • 83b77650a8 Additional Cleanup Winter Flare 2019-12-06 01:13:54 -05:00
  • 0e25214cf9 Merge remote-tracking branch 'upstream/master' EmeraldSundisk 2019-12-05 21:34:32 -08:00
  • 5ee4457b78 Hopefully last run Ghommie 2019-12-06 06:22:03 +01:00
  • 0598c35d70 Automatic changelog generation for PR #10056 [ci skip] CitadelStationBot 2019-12-05 23:16:50 -06:00
  • 4e022af46f Merge pull request #10056 from Ghommie/Ghommie-cit430 Putnam3145 2019-12-05 21:16:47 -08:00
  • 08e1ab7b21 f lolman360 2019-12-06 16:11:41 +11:00
  • 58e9e6e928 Automatic changelog generation for PR #9947 [ci skip] CitadelStationBot 2019-12-05 23:02:40 -06:00
  • b05854ac98 Merge pull request #9947 from Iroquois-Pliskin/ClockieSurgeryNerf kevinz000 2019-12-05 22:02:38 -07:00
  • 3825657f5c Automatic changelog generation for PR #10034 [ci skip] CitadelStationBot 2019-12-05 23:00:40 -06:00
  • 8cb6ff10b8 Merge pull request #10034 from Ghommie/Ghommie-cit420 kevinz000 2019-12-05 22:00:38 -07:00
  • ad9bc36d1e Automatic changelog generation for PR #10043 [ci skip] CitadelStationBot 2019-12-05 22:58:36 -06:00
  • e16b61b865 Merge pull request #10043 from Arturlang/patch-1 kevinz000 2019-12-05 21:58:33 -07:00
  • b8bb0f2924 Merge pull request #10048 from Ghommie/Ghommie-cit426 kevinz000 2019-12-05 21:56:29 -07:00
  • dec79a9ba3 gg lolman360 2019-12-06 15:55:52 +11:00
  • 9066a36f3a Automatic changelog generation for PR #9955 [ci skip] CitadelStationBot 2019-12-05 22:54:45 -06:00
  • 6a305dfe4f Merge pull request #9955 from Ghommie/Ghommie-cit394 kevinz000 2019-12-05 21:54:42 -07:00
  • 6b2d3b116d Merge branch 'master' into Ghommie-cit430 Putnam3145 2019-12-05 20:53:14 -08:00
  • 90f31f5b2b Merge pull request #10023 from Sishen1542/i kevinz000 2019-12-05 21:52:32 -07:00
  • 8fc5d36911 Automatic changelog generation for PR #9919 [ci skip] CitadelStationBot 2019-12-05 22:52:17 -06:00
  • 878a2d65de Merge pull request #9919 from Ghommie/Ghommie-391 Lin 2019-12-06 04:52:14 +00:00
  • 1d02199911 Automatic changelog generation for PR #10038 [ci skip] CitadelStationBot 2019-12-05 22:51:33 -06:00
  • a65588009c Merge pull request #10038 from Trilbyspaceclone/patch-240 kevinz000 2019-12-05 21:51:30 -07:00
  • f937c4d877 Merge pull request #10046 from Ghommie/Ghommie-cit424 kevinz000 2019-12-05 21:50:19 -07:00
  • b4d20fc98f Automatic changelog generation for PR #10045 [ci skip] CitadelStationBot 2019-12-05 22:49:53 -06:00
  • 13f43eb783 Merge pull request #10045 from Trilbyspaceclone/patch-241 kevinz000 2019-12-05 21:49:50 -07:00
  • 54be35a243 Merge pull request #9997 from Sishen1542/nuked kevinz000 2019-12-05 21:48:34 -07:00
  • 3633c6936d Merge pull request #10052 from Ghommie/Ghommie-cit428 Putnam3145 2019-12-05 20:47:39 -08:00
  • c8bf77a848 Automatic changelog generation for PR #9975 [ci skip] CitadelStationBot 2019-12-05 22:47:32 -06:00
  • b932841adf Merge pull request #9975 from Ghommie/Ghommie-cit404 kevinz000 2019-12-05 21:47:29 -07:00
  • 1721fb6e7b Automatic changelog generation for PR #10008 [ci skip] CitadelStationBot 2019-12-05 22:46:29 -06:00
  • 62c0d59102 Merge pull request #10008 from Seris02/sleepingcarphallucination Putnam3145 2019-12-05 20:46:26 -08:00
  • 8126d08a7b Automatic changelog generation for PR #9990 [ci skip] CitadelStationBot 2019-12-05 22:45:12 -06:00
  • 176bde7829 Merge pull request #9990 from Linzolle/strange-reagent kevinz000 2019-12-05 21:45:09 -07:00
  • c9721a222a Automatic changelog generation for PR #9993 [ci skip] CitadelStationBot 2019-12-05 22:44:28 -06:00
  • 5048995a58 Merge pull request #9993 from Ghommie/Ghommie-cit412 kevinz000 2019-12-05 21:44:25 -07:00
  • e47f9007b6 Automatic changelog generation for PR #10049 [ci skip] CitadelStationBot 2019-12-05 22:43:27 -06:00
  • e2f9a68c2c Merge pull request #10049 from Useroth/new-tg-plants kevinz000 2019-12-05 21:43:24 -07:00
  • 0ba5e2ebf6 run Ghommie 2019-12-06 05:43:15 +01:00
  • f2ebf66d76 Automatic changelog generation for PR #9805 [ci skip] CitadelStationBot 2019-12-05 22:40:11 -06:00
  • b5595114c1 Merge pull request #9805 from Ghommie/Ghommie-cit352 kevinz000 2019-12-05 21:40:09 -07:00
  • aa31770360 Automatic changelog generation for PR #9575 [ci skip] CitadelStationBot 2019-12-05 22:38:33 -06:00
  • fbcdc4d330 Merge pull request #9575 from KathrinBailey/Kat'sBoxRework kevinz000 2019-12-05 21:38:30 -07:00
  • 4ceb0a25d0 undefined var. Ghommie 2019-12-06 05:38:03 +01:00
  • d217a9f445 Merge pull request #10032 from Ghommie/Ghommie-cit418 kevinz000 2019-12-05 21:33:12 -07:00
  • bd1b79b182 Merge pull request #10041 from kappa-sama/patch-8 kevinz000 2019-12-05 21:29:39 -07:00
  • b320c5cc70 Automatic changelog generation for PR #10019 [ci skip] CitadelStationBot 2019-12-05 22:29:11 -06:00
  • 2fcdb24fe3 Merge pull request #10019 from Seris02/wintercoattide kevinz000 2019-12-05 21:29:08 -07:00
  • 6daffc5080 Automatic changelog generation for PR #10042 [ci skip] CitadelStationBot 2019-12-05 22:28:26 -06:00
  • 70d305611c Merge pull request #10042 from Ghommie/Ghommie-cit422 kevinz000 2019-12-05 21:28:24 -07:00
  • 273c813545 Automatic changelog generation for PR #10033 [ci skip] CitadelStationBot 2019-12-05 22:28:06 -06:00
  • bbd482015c Merge pull request #10033 from Ghommie/Ghommie-cit419 kevinz000 2019-12-05 21:28:03 -07:00
  • 11c4425f65 Automatic changelog generation for PR #10025 [ci skip] CitadelStationBot 2019-12-05 22:20:00 -06:00
  • 29497320c1 Merge pull request #10025 from Linzolle/butchering kevinz000 2019-12-05 21:19:57 -07:00
  • a944ea9db1 considering the gun holds 2 rounds at a time and we have odd amounts in the box, players may become upset about it in the future. Ghommie 2019-12-06 05:07:34 +01:00
  • 0e3774d73f Spinfusor nerf, cause a 7k cost supply pack containing 32 explosive munitions that work just fine without the gun is just pure balance. Ghommie 2019-12-06 04:47:33 +01:00
  • d3d1116094 null = n_color, no. Ghommie 2019-12-06 03:59:51 +01:00
  • 2528714035 I have no liability about glowing robotic eyes not automatically updating right here. Ghommie 2019-12-06 03:56:48 +01:00
  • d6fe78f4a7 fixes on_mob eyes overlays not updating properly sometimes. Ghommie 2019-12-06 03:38:39 +01:00
  • 5024e900f7 Ooow fuck. Ghommie 2019-12-06 02:45:55 +01:00
  • f1ccccbf36 drake. Ghommie 2019-12-06 02:14:15 +01:00
  • 9ca7bb759c Ports "Slightly improves visible and audible messages." Ghommie 2019-12-06 02:02:12 +01:00
  • c1c2661b8c consistency kappa-sama 2019-12-05 19:54:58 -05:00
  • 994411cc4e metal kappa-sama 2019-12-05 19:49:48 -05:00
  • d78df2cc5d since they're gone from autos kappa-sama 2019-12-05 19:47:54 -05:00
  • b143a2d302 Right file. Ghommie 2019-12-06 00:31:32 +01:00
  • 7958cfa548 Right file Ghommie 2019-12-06 00:27:50 +01:00
  • 238655d599 Fixes eyes blindness a little. Ghommie 2019-12-06 00:10:50 +01:00
  • 9985be42f1 Automatic changelog generation for PR #9884 [ci skip] CitadelStationBot 2019-12-05 16:32:19 -06:00
  • b7d0cc6516 Merge pull request #9884 from Useroth/blackpowder-alternative BlackMajor 2019-12-06 11:32:17 +13:00
  • 95829f65a3 Automatic changelog generation for PR #9372 [ci skip] CitadelStationBot 2019-12-05 16:29:37 -06:00
  • a6f48ea74c Merge pull request #9372 from Weblure/Xenobio-Hotkeys BlackMajor 2019-12-06 11:29:34 +13:00
  • 53ff425f04 Banishes some magic numbers from this realm. Ghommie 2019-12-05 21:55:28 +01:00
  • c11a4cabda Merge pull request #4 from Ghommie/Ghommie-cit421 UristMcAstronaut 2019-12-05 18:26:03 +00:00
  • f4bffdc56d To make sure it doesn't runtime Useroth 2019-12-05 19:05:57 +01:00
  • 2e84c30e59 Tiny touch-ups Useroth 2019-12-05 16:29:50 +01:00
  • 82d1497ddc Fixes bad buds and toxin healing Artur 2019-12-05 17:29:00 +02:00
  • 676476726f i forgot to actually add the bullet kappa-sama 2019-12-05 09:50:34 -05:00
  • df0fa330bf bullet kappa-sama 2019-12-05 09:49:09 -05:00
  • 329e07b037 357 bullets and rifle clips kappa-sama 2019-12-05 09:46:13 -05:00
  • 0c5a1b900b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintercoattide Seris02 2019-12-05 21:09:38 +08:00
  • f74c1d835f removes thing Seris02 2019-12-05 20:53:55 +08:00
  • 2ce79828b8 ratvar coat updated Seris02 2019-12-05 20:46:59 +08:00
  • e9bc9fec60 Automatic changelog generation for PR #9913 [ci skip] CitadelStationBot 2019-12-04 20:50:24 -06:00
  • e3d09ccae8 Merge pull request #9913 from Trilbyspaceclone/crow Lin 2019-12-05 02:50:21 +00:00