Commit Graph

  • 65c0ef72c8 Automatic changelog generation for PR #9959 [ci skip] CitadelStationBot 2019-11-28 13:16:47 -06:00
  • a5b5fb729a Merge pull request #9959 from Ghommie/Ghommie-cit397 Lin 2019-11-28 19:16:44 +00:00
  • 5b16fc4868 Automatic changelog generation for PR #9948 [ci skip] CitadelStationBot 2019-11-28 13:12:28 -06:00
  • 46c02af86e Merge pull request #9948 from Ghommie/Ghommie-cit393 Lin 2019-11-28 19:12:25 +00:00
  • 9bef7edd0f Rags are no longer transparent reagent containers. Ghommie 2019-11-28 19:59:34 +01:00
  • 74baa00634 Ports "#44787" Ghommie 2019-11-28 19:37:46 +01:00
  • a5e5e20e00 Automatic changelog generation for PR #9943 [ci skip] CitadelStationBot 2019-11-28 07:37:39 -06:00
  • 09897b4ece Merge pull request #9943 from dapnee/Infiltrate-I-barely-know-her Putnam3145 2019-11-28 05:37:36 -08:00
  • 85a6d588a8 [fix] Extradimensional oranges now actually grow properly and give proper seeds. Useroth 2019-11-28 09:26:52 +01:00
  • 60b8688674 Ports "Fixes transit tube barricade spam" Ghommie 2019-11-28 07:10:00 +01:00
  • 5b6daa5aaa Merge pull request #19 from Citadel-Station-13/master kappa-sama 2019-11-28 00:19:19 -05:00
  • e884f606c4 wait, what the fuck! Ghommie 2019-11-28 05:41:49 +01:00
  • 6194dddf42 I'll hold on this until I port the conveyor_construct conversion to stacks. Ghommie 2019-11-28 05:40:26 +01:00
  • 0ad89bd9de Merging, tweaking or otherwise removing a few of the stupidest cargo packs. Ghommie 2019-11-28 05:34:56 +01:00
  • 4551a795e4 Update game_options.dm kevinz000 2019-11-27 21:20:33 -07:00
  • 9fef2343a7 Update game_options.dm kevinz000 2019-11-27 21:20:12 -07:00
  • 4719de2830 Update scripture_applications.dm kevinz000 2019-11-27 21:19:51 -07:00
  • f776db7ab1 Update game_options.dm kevinz000 2019-11-27 21:16:42 -07:00
  • b6df1126bb Can't I make a PR without having to make 2 commits to fix my mistakes oh my god GrayRachnid 2019-11-27 22:52:21 -05:00
  • b66832809e Fixing that tiny gap in human examine. Ghommie 2019-11-28 04:37:16 +01:00
  • 33854e8fd8 Adds a huge amount of Christmas clothes Unknown 2019-11-27 20:07:39 -07:00
  • 4a3a7c841a Removes literally atrocious polka dotted accessories. Ghommie 2019-11-28 03:54:38 +01:00
  • 829cc3d81c Revert "Merge pull request #9613 from Linzolle/hat-toss" Linzolle 2019-11-27 20:23:33 -06:00
  • 1795072f94 Mistakes were made. Ghommie 2019-11-28 02:47:09 +01:00
  • efcf79aab0 teachin' 🅱️ how to swim Ghommie 2019-11-28 02:32:43 +01:00
  • 13b9158a44 Ports "Plasmamen get plasma in their box" Ghommie 2019-11-28 02:30:03 +01:00
  • dd9116ee70 Ports elements: Lightweight shared/global components. Ghommie 2019-11-28 01:47:20 +01:00
  • ad6684380c You can now stack stuff pretty high GrayRachnid 2019-11-27 18:39:11 -05:00
  • 6a13801c1a I assume this is what ghommie meant GrayRachnid 2019-11-27 18:34:36 -05:00
  • 977340c641 ahaha yea nope. Ghommie 2019-11-27 22:50:11 +01:00
  • dc1c17226d Merge branch 'master' into HeadCorgi lolman360 2019-11-28 08:45:19 +11:00
  • eef3ec090d i wonder if chmod permissions are retained after resetting a branch. Ghommie 2019-11-27 22:43:15 +01:00
  • de43339d56 made it actually compile GrayRachnid 2019-11-27 16:42:28 -05:00
  • 47e3cd346f Fixes codewords and MKUltra enthrall hearing. GrayRachnid 2019-11-27 16:36:19 -05:00
  • a5298dac7e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310 Ghommie 2019-11-27 21:44:56 +01:00
  • af0110db40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 Ghommie 2019-11-27 21:16:20 +01:00
  • 792f1947a7 Fixes limbs' set_disabled. Ghommie 2019-11-27 19:45:27 +01:00
  • f9680130f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 Ghommie 2019-11-27 18:48:20 +01:00
  • 252c37f421 whops 2 Ghommie 2019-11-27 08:31:21 +01:00
  • b432ec4f33 Whops Ghommie 2019-11-27 08:25:13 +01:00
  • a89eccbac5 Ports custom reagent icecreams, plus some fixes. Ghommie 2019-11-27 08:16:17 +01:00
  • 3f077df500 redundant. Ghommie 2019-11-27 06:40:32 +01:00
  • d1d201ff26 Sanity check. Ghommie 2019-11-27 06:39:09 +01:00
  • d43d996c38 ouch Ghommie 2019-11-27 06:19:17 +01:00
  • c67f138d23 patching some combat mode edge cases and issues. Ghommie 2019-11-27 06:10:08 +01:00
  • 4640d8495d ) Ghommie 2019-11-27 05:14:08 +01:00
  • 1f69679cfb Ports a few telecomms updates and fixes. Ghommie 2019-11-27 04:58:05 +01:00
  • 3728173669 fixes missing hypereutactic left inhands. Ghommie 2019-11-27 03:56:11 +01:00
  • cc5d54fe24 fix Linzolle 2019-11-26 20:36:45 -06:00
  • 00bc22d375 Update clockwork_marauder.dm kevinz000 2019-11-26 19:27:05 -07:00
  • 8cec8fa506 Automatic changelog generation for PR #9906 [ci skip] CitadelStationBot 2019-11-26 20:26:21 -06:00
  • 2aa0211121 Merge pull request #9906 from Xantholne/xantholne-berets02 kevinz000 2019-11-26 19:26:18 -07:00
  • d3bce1bbcd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 Ghommie 2019-11-27 02:59:08 +01:00
  • 5988e4558c > to add injury to someone you just fragged Ghommie 2019-11-27 02:32:23 +01:00
  • 4e05c27cdb Updating supply pods code. Ghommie 2019-11-27 01:54:10 +01:00
  • e6ecabe54c Scanner Fermi 2019-11-26 23:23:29 +00:00
  • ca2467ff93 Thingie Fermi 2019-11-26 23:14:14 +00:00
  • 65bec77c5a Automatic changelog generation for PR #9882 [ci skip] CitadelStationBot 2019-11-26 17:02:45 -06:00
  • ccfdb74508 Merge pull request #9882 from FestiveBall/Fersi kevinz000 2019-11-26 16:02:42 -07:00
  • d79fba2838 Automatic changelog generation for PR #9268 [ci skip] CitadelStationBot 2019-11-26 17:01:51 -06:00
  • 6b53845f06 Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks kevinz000 2019-11-26 16:01:48 -07:00
  • 4c2a7597cc Automatic changelog generation for PR #9920 [ci skip] CitadelStationBot 2019-11-26 16:59:11 -06:00
  • 8b56e25d97 Merge pull request #9920 from YakumoChen/ai-sprites kevinz000 2019-11-26 15:59:09 -07:00
  • ff5e07ac67 Update clockwork_marauder.dm kevinz000 2019-11-26 15:54:15 -07:00
  • ea3985c296 Merge pull request #3 from Citadel-Station-13/master UristMcAstronaut 2019-11-26 22:49:26 +00:00
  • 2f58e4527a Update clockwork_marauder.dm kevinz000 2019-11-26 15:47:04 -07:00
  • cf141c3a92 Update game_options.dm kevinz000 2019-11-26 15:41:32 -07:00
  • 0187b88278 Update scripture_applications.dm kevinz000 2019-11-26 15:40:31 -07:00
  • d6d830b2ec Morgues no longer go "ammunition depleted" Ghommie 2019-11-26 22:20:52 +01:00
  • 0b9ea6c7f0 no pedoing the AI YakumoChen 2019-11-26 19:58:25 +00:00
  • 9a9c63bea3 Removes Clockie Surgical capabilities, including table, tools, and implanter/implant case. Iroquois Pliskin 2019-11-26 09:28:28 -05:00
  • 66d1b88725 Get Putnam 2019-11-25 22:23:50 -08:00
  • 1283149fb2 also allowed wallets Putnam 2019-11-25 22:22:16 -08:00
  • 2bb1e93d05 Update human_movement.dm kevinz000 2019-11-25 22:53:56 -07:00
  • 4ffe9cd464 Update traits.dm kevinz000 2019-11-25 22:53:22 -07:00
  • 804ee207e3 Update _status_effects.dm kevinz000 2019-11-25 22:52:19 -07:00
  • 70ec955ef3 Update _status_effects.dm kevinz000 2019-11-25 22:47:24 -07:00
  • c5e6cb8ac0 space Fermi 2019-11-26 04:08:10 +00:00
  • 69e0f6836a Adds a lil message so people don't spend 25 minutes trying everything Fermi 2019-11-26 04:05:43 +00:00
  • 65db2b2160 Merge conflicts Unknown 2019-11-25 20:19:57 -07:00
  • 4e20f576e6 Merge branch 'master' into xantholne-berets02 Unknown 2019-11-25 20:16:15 -07:00
  • 495b4b6ddc Fixes some issues Unknown 2019-11-25 20:13:07 -07:00
  • e686be55c5 prevent glands from spoiling Linzolle 2019-11-25 21:04:01 -06:00
  • cc54e5230f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update Linzolle 2019-11-25 21:01:25 -06:00
  • 281ddf73ba Ports AI console focus loss fix and fixes an error in my trimline code Dap 2019-11-25 14:48:26 -07:00
  • c1e3b07b2c Bugfixes KathrinBailey 2019-11-25 16:11:06 +00:00
  • 56bdb36058 Automatic changelog generation for PR #9942 [ci skip] CitadelStationBot 2019-11-25 06:39:22 -06:00
  • 8219d298a5 Merge pull request #9942 from Useroth/new-tg-plants Putnam3145 2019-11-25 04:39:20 -08:00
  • 99300229a1 Fixed the reagents in the new plants. Useroth 2019-11-25 13:35:26 +01:00
  • e7523862eb Added Newspaperr to Loadout Winter Flare 2019-11-25 06:02:50 -05:00
  • 639c07665d Personal closets can use PDAs/tablets now Putnam 2019-11-25 02:00:03 -08:00
  • d0a5c447ce and THIS is why you always double check your code Putnam 2019-11-24 22:04:05 -08:00
  • 0d58e78779 it's nice for things to compile Putnam 2019-11-24 21:54:28 -08:00
  • 4bfc7c262d minor comment fix Putnam 2019-11-24 21:46:15 -08:00
  • 79a64d9c63 Makes synthtissue a lil easier. Fermi 2019-11-25 03:36:39 +00:00
  • 0075037d0f Makes (most) dynamic rulesets lower weight if recently fired Putnam 2019-11-24 17:09:38 -08:00
  • f833112368 Merge pull request #10 from Citadel-Station-13/master EmeraldSundisk 2019-11-24 16:29:40 -08:00
  • 6a4c959b0a Added more crates. Winter Flare 2019-11-24 19:05:03 -05:00
  • e4dce88761 Automatic changelog generation for PR #9922 [ci skip] CitadelStationBot 2019-11-24 17:31:17 -06:00
  • 786d40032d Merge pull request #9922 from GrayRachnid/braintraumasport BlackMajor 2019-11-25 12:31:15 +13:00