Commit Graph

  • 24b2bb06bf Update mecha_equipment.dm kevinz000 2020-02-03 13:17:50 -07:00
  • e9ec314cf6 yo this is a horrible idea kevinz000 2020-02-03 13:15:12 -07:00
  • 0c57a78851 Automatic changelog generation for PR #10876 [ci skip] CitadelStationBot 2020-02-03 14:13:13 -06:00
  • e9a4d863a8 Merge pull request #10876 from Citadel-Station-13/Ghommie-patch-7 kevinz000 2020-02-03 13:13:10 -07:00
  • 3e30c9409b riot staves kevinz000 2020-02-03 13:11:26 -07:00
  • 8910efadfa Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit kevinz000 2020-02-03 13:07:49 -07:00
  • 5df6566f01 Update clown_weapons.dm Ghom 2020-02-03 20:44:58 +01:00
  • 40f7a72e3c Update slippery.dm Ghom 2020-02-03 20:32:50 +01:00
  • 3cb1a0e9c8 Update slippery.dm Ghom 2020-02-03 20:31:57 +01:00
  • 0fd4527096 updated icon ancientpower 2020-02-03 12:28:53 -06:00
  • be0695e146 bunny ear style ancientpower 2020-02-03 12:05:00 -06:00
  • 73d865d0f3 Fixes the petting element. Ghom 2020-02-03 18:42:22 +01:00
  • aabd0b9e79 fixing quirk removal (whoops) Putnam 2020-02-03 08:18:49 -08:00
  • e4e5b651e6 making permassassin scale with dynamic Putnam 2020-02-03 08:11:03 -08:00
  • 88ce25a09b hopefully fixing the once-assassin Putnam 2020-02-03 08:10:45 -08:00
  • 72c1f60af7 and now the voting works Putnam 2020-02-03 08:10:34 -08:00
  • 52432ed0a7 too many dynamic changes for my sanity Putnam 2020-02-03 07:12:27 -08:00
  • bc52b99758 ok putnam Putnam 2020-02-03 03:27:06 -08:00
  • 53cad493a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul Putnam 2020-02-03 03:17:23 -08:00
  • 82fbef9920 Made it real time, added to config Putnam 2020-02-03 03:13:19 -08:00
  • 5bf1ebaa53 Initial Commit Artur 2020-02-03 12:01:17 +01:00
  • 8fa826ba1f Updated relief valve UI to tgui-next Putnam 2020-02-03 02:59:18 -08:00
  • d8038edfc8 Update pool_controller.dm kevinz000 2020-02-03 01:51:23 -07:00
  • f3b3053a8c Update pool_structures.dm kevinz000 2020-02-03 01:49:54 -07:00
  • 9156156696 Automatic changelog generation for PR #10866 [ci skip] CitadelStationBot 2020-02-03 01:57:42 -06:00
  • f8a2116d7d Merge pull request #10866 from ancientpower/skintone-match-fix Ghom 2020-02-03 08:57:39 +01:00
  • 9a1974e3b6 Update mecha.dm kevinz000 2020-02-03 00:50:57 -07:00
  • 76e34c7e0f Update update_icons.dm Ghom 2020-02-03 08:48:12 +01:00
  • 0a6e304ac2 s kevinz000 2020-02-03 00:47:51 -07:00
  • ccd557122c Update holosign.dm Ghom 2020-02-03 08:35:47 +01:00
  • f2fd48bfd9 Update holosign.dm Ghom 2020-02-03 08:31:12 +01:00
  • d5166322dc I can't believe I have done this. Ghom 2020-02-03 08:23:20 +01:00
  • 84d9430ee4 PC too slow for compile. Ghommie 2020-02-03 07:21:39 +01:00
  • 0428b05cff Oh snap Ghommie 2020-02-03 07:20:16 +01:00
  • 81b5fe2de3 Further buff and fix for clown ops tearstache nade. Ghommie 2020-02-03 07:08:47 +01:00
  • b55b375d17 fixes a bug with skintone in character creation ancientpower 2020-02-02 22:59:36 -06:00
  • 0779b67acc whoops necromanceranne 2020-02-03 15:51:07 +11:00
  • a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. Ghommie 2020-02-03 05:16:32 +01:00
  • 07a4515b23 Thankfully I didn't fuck it up this way necromanceranne 2020-02-03 15:03:16 +11:00
  • 4f4abadbb8 Merge pull request #1 from Citadel-Station-13/master Zellular 2020-02-02 19:16:11 -08:00
  • 2393dc26eb Merge pull request #10779 from Ghommie/Ghommie-cit538 kevinz000 2020-02-02 16:31:59 -07:00
  • aa41815119 Update logging.dm Ghom 2020-02-03 00:31:53 +01:00
  • c24c83c1bd Merge pull request #10835 from Ghommie/Ghommie-cit546 kevinz000 2020-02-02 16:31:15 -07:00
  • 497a691da2 Automatic changelog generation for PR #10836 [ci skip] CitadelStationBot 2020-02-02 17:31:01 -06:00
  • 341430eab5 Merge pull request #10836 from Hatterhat/rcd-carts-engifab kevinz000 2020-02-02 16:30:59 -07:00
  • fb0f12520c Update emergency.dm kevinz000 2020-02-02 16:23:54 -07:00
  • f1e3261566 Update _logging.dm Ghom 2020-02-02 23:26:03 +01:00
  • ff0f9b5de8 Update say_vr.dm Ghom 2020-02-02 23:24:02 +01:00
  • d4aa410af0 Update atoms.dm Ghom 2020-02-02 23:18:30 +01:00
  • ca8e40caea i mean its a stupid multiplier regardless Hatterhat 2020-02-02 14:33:45 -06:00
  • 9190b69ba3 double whoops Hatterhat 2020-02-02 13:40:23 -06:00
  • 937f6356ab vgstation drink sliding ancientpower 2020-02-01 22:13:40 -06:00
  • 5dc971f8e8 whoops Hatterhat 2020-02-02 13:20:43 -06:00
  • 10c95fa111 Makes quick item usage (click-dragging unequipped item) require combat mode to be enabled deathride58 2020-02-02 13:38:32 -05:00
  • 47b8df9e91 Automatic changelog generation for PR #10705 [ci skip] CitadelStationBot 2020-02-02 12:08:59 -06:00
  • 6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1 Ghom 2020-02-02 19:08:57 +01:00
  • 601f41b7f7 Automatic changelog generation for PR #10799 [ci skip] CitadelStationBot 2020-02-02 12:08:18 -06:00
  • 97be223b0b Merge pull request #10799 from Seris02/goldentoolboxfix Ghom 2020-02-02 19:08:16 +01:00
  • 8a81ba9efe Ok here we go. Ghom 2020-02-02 18:40:06 +01:00
  • ee533da3d7 Putting GLOB.blood_reagent_types at use. Ghom 2020-02-02 18:34:14 +01:00
  • 6366606553 Automatic changelog generation for PR #10837 [ci skip] CitadelStationBot 2020-02-02 11:07:27 -06:00
  • 96a38e6c18 Merge pull request #10837 from Owai-Seek/tinytweaks Ghom 2020-02-02 18:07:25 +01:00
  • 3cb16e083f Automatic changelog generation for PR #10838 [ci skip] CitadelStationBot 2020-02-02 11:07:03 -06:00
  • fb32b018ef Merge pull request #10838 from Owai-Seek/loadout Ghom 2020-02-02 18:07:00 +01:00
  • bb1f65813e Merge pull request #10858 from Citadel-Station-13/kevinz000-patch-4 Ghom 2020-02-02 18:06:44 +01:00
  • 0f76202f24 Automatic changelog generation for PR #10575 [ci skip] CitadelStationBot 2020-02-02 10:29:59 -06:00
  • 72afb709b5 Merge pull request #10575 from Arturlang/TGUIs_Nexties Ghom 2020-02-02 17:29:56 +01:00
  • 14d749bd76 Weh Artur 2020-02-02 16:23:26 +01:00
  • fe92573fc3 Forgot this Artur 2020-02-02 13:44:44 +01:00
  • e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties Artur 2020-02-02 13:31:54 +01:00
  • 8058ef5ac2 Automatic changelog generation for PR #10829 [ci skip] CitadelStationBot 2020-02-02 04:16:25 -06:00
  • 66a2216ef3 Merge pull request #10829 from Ghommie/Ghommie-cit544 kevinz000 2020-02-02 03:16:23 -07:00
  • 99dc1754af Automatic changelog generation for PR #10810 [ci skip] CitadelStationBot 2020-02-02 04:16:04 -06:00
  • c94b5688db Merge pull request #10810 from YakumoChen/ring kevinz000 2020-02-02 03:16:01 -07:00
  • 36b71164fd oops forgot to delete that Seris02 2020-02-02 18:10:41 +08:00
  • e0f967eaa2 Update apc.dm kevinz000 2020-02-02 02:57:14 -07:00
  • f4d7297450 Automatic changelog generation for PR #10850 [ci skip] CitadelStationBot 2020-02-02 03:54:56 -06:00
  • 3812d2d9fa Merge pull request #10850 from Ghommie/Ghommie-cit548 kevinz000 2020-02-02 02:54:53 -07:00
  • 33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540 kevinz000 2020-02-02 01:47:24 -07:00
  • 24e7ee820f Automatic changelog generation for PR #10784 [ci skip] CitadelStationBot 2020-02-02 02:47:01 -06:00
  • 2cdf7fa0bb Merge pull request #10784 from Seris02/polycoats kevinz000 2020-02-02 01:46:58 -07:00
  • dd0e78810e Merge pull request #10818 from Ghommie/Ghommie-cit543 kevinz000 2020-02-02 01:45:54 -07:00
  • 34d895e45d Automatic changelog generation for PR #10834 [ci skip] CitadelStationBot 2020-02-02 02:43:34 -06:00
  • 88c20b1ea5 Merge pull request #10834 from Trilbyspaceclone/patch-273 kevinz000 2020-02-02 01:43:32 -07:00
  • dd81691ce1 Automatic changelog generation for PR #10820 [ci skip] CitadelStationBot 2020-02-02 02:39:33 -06:00
  • aaa7733cec Merge pull request #10820 from Ghommie/Ghommie-cit542 kevinz000 2020-02-02 01:39:31 -07:00
  • c10c657222 Automatic changelog generation for PR #10819 [ci skip] CitadelStationBot 2020-02-02 02:39:10 -06:00
  • 3fc832fbe7 Merge pull request #10819 from Ghommie/Ghommie-cit541 kevinz000 2020-02-02 01:39:08 -07:00
  • 6be65ecf3a Automatic changelog generation for PR #10833 [ci skip] CitadelStationBot 2020-02-02 02:38:54 -06:00
  • c9de66857e Merge pull request #10833 from Ghommie/Ghommie-cit545 kevinz000 2020-02-02 01:38:52 -07:00
  • 4103adb2e9 Automatic changelog generation for PR #10831 [ci skip] CitadelStationBot 2020-02-02 02:38:36 -06:00
  • 664c4cdea9 Merge pull request #10831 from Citadel-Station-13/Ghommie-patch-1 kevinz000 2020-02-02 01:38:34 -07:00
  • e97af26236 ok ghom kevinz000 2020-02-02 01:37:11 -07:00
  • 38ec4f0e11 Update blood.dm kevinz000 2020-02-02 01:35:38 -07:00
  • b59dd11adc Update blood.dm kevinz000 2020-02-02 01:35:16 -07:00
  • 333c0dd201 Update modular_citadel/code/modules/reagents/reagents/cit_reagents.dm kevinz000 2020-02-02 01:32:54 -07:00
  • 6b2a8d49c9 Update science.dm Trilbyspaceclone 2020-02-02 01:39:25 -05:00
  • 659110ac8c yee again Seris02 2020-02-02 13:44:45 +08:00
  • 4c2e702d7a yee Seris02 2020-02-02 13:18:26 +08:00
  • dd63e8cf84 oofies Putnam 2020-02-01 21:07:21 -08:00