Commit Graph

  • 60a3b134a3 Should fix the rest of the requested changes keronshb 2020-02-09 17:30:22 -05:00
  • 3a2eb8c1ad Update experimental_dissection.dm Ghom 2020-02-09 22:50:43 +01:00
  • 4bc5ea60b5 Automatic changelog generation for PR #10937 [ci skip] CitadelStationBot 2020-02-09 15:49:24 -06:00
  • c7614958bc Merge pull request #10937 from Arturlang/debug_outfit_updates Ghom 2020-02-09 22:49:22 +01:00
  • 4e4346b8d4 Automatic changelog generation for PR #10277 [ci skip] CitadelStationBot 2020-02-09 14:47:34 -06:00
  • c2baad44d8 Merge pull request #10277 from kevinz000/god_wish_your_plushies_holy_shit Ghom 2020-02-09 21:47:30 +01:00
  • 9ee5a84ad6 Automatic changelog generation for PR #10936 [ci skip] CitadelStationBot 2020-02-09 14:38:53 -06:00
  • 0f2f5ab639 Merge pull request #10936 from Citadel-Station-13/kevinz000-patch-7 Ghom 2020-02-09 21:38:50 +01:00
  • 9609eb64e0 Fixes some files and pathings for this keronshb 2020-02-09 15:18:15 -05:00
  • 101640170b Merge pull request #10954 from Citadel-Station-13/kevinz000-patch-9 Ghom 2020-02-09 21:09:00 +01:00
  • 09501340ec Automatic changelog generation for PR #10972 [ci skip] CitadelStationBot 2020-02-09 14:08:18 -06:00
  • d991fa1252 Merge pull request #10972 from Trilbyspaceclone/so-then-I-started-nerfing Ghom 2020-02-09 21:08:16 +01:00
  • 29207b22fb Merge branch 'master' into debug_outfit_updates Arturlang 2020-02-09 22:05:26 +02:00
  • e4f2af2d77 compile r4d6 2020-02-09 07:34:21 -05:00
  • 9ba0a1b470 Code update r4d6 2020-02-09 07:21:47 -05:00
  • bcbaea4a7b CallMaterialName reagent fix Ghom 2020-02-09 10:46:29 +01:00
  • 83813d24c8 forgot that shit again Seris02 2020-02-09 17:07:39 +08:00
  • 577cfdc582 yay much better Seris02 2020-02-09 17:04:17 +08:00
  • 1c24797de1 revert 10486 YakumoChen 2020-02-09 06:41:13 +00:00
  • a136273191 Merge pull request #20 from Citadel-Station-13/master YakumoChen 2020-02-09 01:37:37 -05:00
  • c68c96373c Ok. Ghommie 2020-02-09 07:07:47 +01:00
  • f6adce72fb Something about missing private sprites and their bad code. Ghommie 2020-02-09 06:51:57 +01:00
  • 366075b38e yeet forgot this Seris02 2020-02-09 13:10:28 +08:00
  • 99147003ed wall walking boooooooooooooooots Seris02 2020-02-09 13:07:04 +08:00
  • e6398815b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Dwarf r4d6 2020-02-08 23:23:28 -05:00
  • a840b16c87 Automatic changelog generation for PR #10930 [ci skip] CitadelStationBot 2020-02-08 22:12:40 -06:00
  • 3264596bac Merge pull request #10930 from r4d6/meteor-alt-2 kevinz000 2020-02-08 21:12:38 -07:00
  • 49f2993c59 Correct timer r4d6 2020-02-08 23:09:51 -05:00
  • 5316cc3665 Make dwarves not have an accent when speaking dwarvish r4d6 2020-02-08 23:02:32 -05:00
  • a3f1ef19c7 Automatic changelog generation for PR #10918 [ci skip] CitadelStationBot 2020-02-08 22:01:28 -06:00
  • 1f959012c5 Merge pull request #10918 from r4d6/dwarf-config kevinz000 2020-02-08 21:01:26 -07:00
  • a8403cb072 Make Dwarves heal from Plump Helmet r4d6 2020-02-08 22:40:17 -05:00
  • d49a53e193 Update costumes_toys.dm Trilbyspaceclone 2020-02-08 22:17:58 -05:00
  • 506f1199ad I have a bad habit to edit people's (especially trilby) PRs out of the wild. Sorry Ghom 2020-02-09 02:56:17 +01:00
  • 2a0ba12896 Merge pull request #10952 from Citadel-Station-13/kevinz000-patch-11 Ghom 2020-02-09 02:53:38 +01:00
  • ea9bdcd087 Update gangs.dm Ghom 2020-02-09 02:49:20 +01:00
  • b8337a0523 Merge pull request #10959 from Arturlang/TGUI_Next_Autobuild kevinz000 2020-02-08 18:47:20 -07:00
  • 90a1b249f1 Update gangs.dm Trilbyspaceclone 2020-02-08 20:39:45 -05:00
  • 865a17e8e4 Fallback for linter. Ghom 2020-02-09 02:39:21 +01:00
  • 25848bf37e Merge pull request #4 from Ghommie/Ghommie-helpies Arturlang 2020-02-09 03:29:28 +02:00
  • 187d9fdb43 updating dependencies and #48122, #48241, #48673 Ghommie 2020-02-09 01:57:12 +01:00
  • 4cce3785a5 Merge pull request #3 from Ghommie/Ghommie-helpies Arturlang 2020-02-09 02:06:16 +02:00
  • 1e2562ed02 Update organic.dm Trilbyspaceclone 2020-02-08 18:59:00 -05:00
  • 6152ac9235 tgstation PR #48090 Ghommie 2020-02-09 00:56:31 +01:00
  • 9a2107bf1a This one too. Ghommie 2020-02-09 00:48:14 +01:00
  • 56bbf52f1e Merge pull request #2 from Ghommie/Ghommie-helpies Arturlang 2020-02-09 01:19:52 +02:00
  • c665ed7e36 Cecilia need helpies in maint, nya Ghommie 2020-02-09 00:05:17 +01:00
  • 94e3b17faf Merge branch 'TGUI_Next_Autobuild' of https://github.com/Arturlang/Citadel-Station-13 into Ghommie-helpies Ghommie 2020-02-09 00:03:39 +01:00
  • 98a525568f Ok. Ghommie 2020-02-08 23:59:20 +01:00
  • 3485d82dd0 salty digi man bad. Ghommie 2020-02-08 23:58:05 +01:00
  • e5236eebb1 hey lets do corrections TrilbySpaceClone 2020-02-08 17:39:00 -05:00
  • 3a9ac36286 Automatic changelog generation for PR #10942 [ci skip] CitadelStationBot 2020-02-08 16:31:36 -06:00
  • f27ce86769 Merge pull request #10942 from Putnam3145/map-vote-options Ghom 2020-02-08 23:31:33 +01:00
  • 0bbf1efa67 Merge pull request #10762 from kevinz000/one_last_taser_attempt Ghom 2020-02-08 23:30:41 +01:00
  • 860c8136df Lowers the movespeed provided by Stimulants, weakening Stimpacks and Adrenals. IHOPMommyLich 2020-02-08 17:01:12 -05:00
  • eaa6bc2db5 fixing another issue with the hear comsig proc. Ghommie 2020-02-08 19:37:18 +01:00
  • 3fe246ad45 Redo Artur 2020-02-08 13:47:25 +01:00
  • 65d1552208 Lets see if this works Artur 2020-02-08 13:46:58 +01:00
  • 9f3b22308f Merge pull request #29 from Citadel-Station-13/master BlackMajor 2020-02-09 00:36:45 +13:00
  • 1f506e2f28 Automatic changelog generation for PR #10974 [ci skip] CitadelStationBot 2020-02-08 02:36:13 -06:00
  • 682637ee67 Merge pull request #10974 from Putnam3145/antag-why-the-hell kevinz000 2020-02-08 01:36:11 -07:00
  • 611c850639 all you need to understand is everything you know is wrong Putnam 2020-02-08 00:31:46 -08:00
  • 612b5c5da3 better name TrilbySpaceClone 2020-02-08 03:27:43 -05:00
  • 5dbfc9a514 Yay TrilbySpaceClone 2020-02-08 03:25:09 -05:00
  • 30c78c5be2 Let their be lists TrilbySpaceClone 2020-02-08 02:37:37 -05:00
  • 0b1cb9db6d timer'd Seris02 2020-02-08 15:25:11 +08:00
  • 8643b0103e fucking MAGIC FLOATING LIGHTS AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA Detective Google 2020-02-08 01:23:08 -06:00
  • 76219e0188 Primortial TrilbySpaceClone 2020-02-08 02:21:14 -05:00
  • c434382d6d fixes map conflicts on this pr for the (3rd? 4th? I've lost count.) time. Detective Google 2020-02-08 01:20:50 -06:00
  • 6e969808f3 capitalization is FUN! Detective Google 2020-02-08 00:53:22 -06:00
  • c6c1cc484c slight buff kevinz000 2020-02-07 23:40:02 -07:00
  • 826ed7d4f2 o k. kevinz000 2020-02-07 23:39:09 -07:00
  • 79a72fac24 fix kevinz000 2020-02-07 23:32:36 -07:00
  • 7c16830e91 ok kevinz000 2020-02-07 23:31:38 -07:00
  • b2d2b00238 much better Seris02 2020-02-08 14:11:49 +08:00
  • 6d8bfd2a38 tru Seris02 2020-02-08 14:01:51 +08:00
  • 6af421994a yay Seris02 2020-02-08 13:53:43 +08:00
  • 82e36846bc /datum/element/cleaning cleans your face! Ghom 2020-02-08 06:18:00 +01:00
  • c45dab8ebd uhh? Putnam 2020-02-07 20:37:22 -08:00
  • 72a285bb4d Automatic changelog generation for PR #10960 [ci skip] CitadelStationBot 2020-02-07 22:12:22 -06:00
  • c6f9f7119e Merge pull request #10960 from kappa-sama/patch-11 Ghom 2020-02-08 05:12:19 +01:00
  • 890274ce87 Update ai.dm Ghom 2020-02-08 05:08:06 +01:00
  • c9852db022 Automatic changelog generation for PR #10966 [ci skip] CitadelStationBot 2020-02-07 22:06:25 -06:00
  • 278a9cf9ae Merge pull request #10966 from r4d6/mininge Ghom 2020-02-08 05:06:22 +01:00
  • f4c148d44f Fix mining base having holes to space r4d6 2020-02-07 22:58:47 -05:00
  • 84a9f2f058 make the fallback majority judgement Putnam 2020-02-07 19:54:15 -08:00
  • bb140df39c Fixing mob holders Ghom 2020-02-08 04:04:16 +01:00
  • f8d5eae0c3 Update gravity.dm kevinz000 2020-02-07 16:24:12 -07:00
  • 8365fec82e Update negative.dm Ghom 2020-02-08 00:05:23 +01:00
  • 8c2019fcbf probably fixes plant disk techdisk kappa-sama 2020-02-07 17:58:36 -05:00
  • f145b8c0b5 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l Detective Google 2020-02-07 16:28:47 -06:00
  • 949e8c4104 hate.. Detective Google 2020-02-07 16:27:53 -06:00
  • 853c66426b Automatic changelog generation for PR #10935 [ci skip] CitadelStationBot 2020-02-07 16:23:59 -06:00
  • 07535ff565 Merge pull request #10935 from KrabSpider/van-dyke Ghom 2020-02-07 23:23:56 +01:00
  • 1200628e35 Automatic changelog generation for PR #10892 [ci skip] CitadelStationBot 2020-02-07 16:13:24 -06:00
  • 71f44a7085 Merge pull request #10892 from kevinz000/small_guncode_refactor Ghom 2020-02-07 23:13:21 +01:00
  • 6f3bec3ba3 Automatic changelog generation for PR #10774 [ci skip] CitadelStationBot 2020-02-07 15:44:22 -06:00
  • 9c14d03051 Merge pull request #10774 from Citadel-Station-13/kevinz000-patch-2 Ghom 2020-02-07 22:44:20 +01:00
  • ea096a79ee Automatic changelog generation for PR #10957 [ci skip] CitadelStationBot 2020-02-07 15:41:51 -06:00
  • 1dfba9f416 Merge pull request #10957 from Putnam3145/fix-occasional-dynamic-runtime Ghom 2020-02-07 22:41:48 +01:00