shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • dd521ef009 i swear it compiled locally ancientpower 2020-02-04 17:18:13 -06:00
  • 5fb82a2e6b fixes for the requested changes' fixes ancientpower 2020-02-04 17:10:02 -06:00
  • 038f78bbcd Automatic changelog generation for PR #10893 [ci skip] CitadelStationBot 2020-02-04 17:04:24 -06:00
  • 642a8c4217 Merge pull request #10893 from Arturlang/TGUI_Next_Crafting Ghom 2020-02-05 00:04:21 +01:00
  • 335c28ff25 fixes for the requested changes ancientpower 2020-02-04 17:02:13 -06:00
  • 6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags kevinz000 2020-02-04 16:01:25 -07:00
  • a85f05a628 requested changes ancientpower 2020-02-04 16:58:24 -06:00
  • ee2ab7c9f0 Update defibrillator_mount.dm Ghom 2020-02-04 23:51:55 +01:00
  • 3cd6cfb7d5 Update defibrillator_mount.dm Ghom 2020-02-04 23:50:33 +01:00
  • 205c38a7c5 edits 4-5 things, gets 40000 lines of code edits TrilbySpaceClone 2020-02-04 17:40:25 -05:00
  • 0d6ffbc432 fixed it for real this time ancientpower 2020-02-04 16:38:20 -06:00
  • d2f1069764 Ported atmos reaction priority fix Putnam 2020-02-04 14:32:39 -08:00
  • 6342116168 forgot to remove this bit ancientpower 2020-02-04 16:13:28 -06:00
  • 9dd411f11b fixes the restoration for reals ancientpower 2020-02-04 16:02:15 -06:00
  • f3d955f397 Merge branch 'master' into staves kevinz000 2020-02-04 14:54:35 -07:00
  • 524836c2b2 restores drink flinging ancientpower 2020-02-04 15:48:03 -06:00
  • b7613a43ae corrects this missing sprite Trilbyspaceclone 2020-02-04 16:23:36 -05:00
  • 06fd6645b3 And it wokrs TrilbySpaceClone 2020-02-04 16:01:22 -05:00
  • a67902ee32 Also added instant runoff and renamed schulze. Putnam 2020-02-04 12:43:59 -08:00
  • 66638a39b7 Merge pull request #10851 from Citadel-Station-13/Ghommie-patch-3 Lin 2020-02-04 20:36:28 +00:00
  • dbe144f961 Automatic changelog generation for PR #10874 [ci skip] CitadelStationBot 2020-02-04 14:35:02 -06:00
  • e8ea16c3f2 Merge pull request #10874 from Citadel-Station-13/Ghommie-patch-6 Lin 2020-02-04 20:34:59 +00:00
  • 8c25277913 Add files via upload EmeraldSundisk 2020-02-04 12:17:28 -08:00
  • 5e1cbd7174 Automatic changelog generation for PR #10840 [ci skip] CitadelStationBot 2020-02-04 14:15:40 -06:00
  • c24ffa8f1c Merge pull request #10840 from Putnam3145/easier_bunker Ghom 2020-02-04 21:15:37 +01:00
  • fc7c900cde Update death.dm Ghom 2020-02-04 20:51:01 +01:00
  • 56ef22f472 Update death.dm Ghom 2020-02-04 20:49:49 +01:00
  • c503208081 Merge pull request #18 from EmeraldSundisk/EmeraldSundisk-patch-2 EmeraldSundisk 2020-02-04 11:39:02 -08:00
  • ab1730ad1f Add files via upload EmeraldSundisk 2020-02-04 11:38:36 -08:00
  • 8458340541 Update science.dm Trilbyspaceclone 2020-02-04 14:38:24 -05:00
  • 4dfb002d00 Update code/modules/research/techweb/all_nodes.dm Trilbyspaceclone 2020-02-04 14:24:37 -05:00
  • 6bdf5edeb3 Merge pull request #17 from Citadel-Station-13/master EmeraldSundisk 2020-02-04 10:22:14 -08:00
  • f66d401516 forgot to move the var TrilbySpaceClone 2020-02-04 07:16:15 -05:00
  • 72f4df82b6 Recompile for tgui next Artur 2020-02-04 13:11:55 +01:00
  • 614a44ea18 Merge remote-tracking branch 'upstream/master' into TGUI_Next_Crafting Artur 2020-02-04 13:11:02 +01:00
  • 4842e29c2e buffs carps again TrilbySpaceClone 2020-02-04 07:09:50 -05:00
  • e237fefbf4 Update science.dm Trilbyspaceclone 2020-02-04 06:45:37 -05:00
  • ed60724a8e Whoops Artur 2020-02-04 12:13:14 +01:00
  • 0391513220 Works now Artur 2020-02-04 12:05:15 +01:00
  • 8e44f98a83 Automatic changelog generation for PR #10867 [ci skip] CitadelStationBot 2020-02-04 04:55:24 -06:00
  • 13df3dbb05 Merge pull request #10867 from Ghommie/Ghommie-cit551 kevinz000 2020-02-04 03:55:22 -07:00
  • 8db3fbdf88 modularize out taser rework kevinz000 2020-02-04 03:49:09 -07:00
  • 8556a6188f Merge remote-tracking branch 'citadel/master' into small_guncode_refactor kevinz000 2020-02-04 03:47:01 -07:00
  • aa129b9539 Update species.dm kevinz000 2020-02-04 03:46:13 -07:00
  • 275b1f73e0 Merge pull request #10849 from Ghommie/Ghommie-cit547 kevinz000 2020-02-04 03:39:14 -07:00
  • 7924be2534 Automatic changelog generation for PR #10873 [ci skip] CitadelStationBot 2020-02-04 04:38:34 -06:00
  • 55dafaa5db Merge pull request #10873 from Putnam3145/fix-relief-valve-ui kevinz000 2020-02-04 03:38:31 -07:00
  • 0367691bf9 Automatic changelog generation for PR #10865 [ci skip] CitadelStationBot 2020-02-04 04:35:36 -06:00
  • 66fc2e77f0 Merge pull request #10865 from Ghommie/Ghommie-cit550 kevinz000 2020-02-04 03:35:33 -07:00
  • be09322f8e Merge pull request #10882 from Citadel-Station-13/Ghommie-patch-8 kevinz000 2020-02-04 03:34:52 -07:00
  • 68589e1294 Automatic changelog generation for PR #10872 [ci skip] CitadelStationBot 2020-02-04 04:34:19 -06:00
  • f5cd0cf48f Merge pull request #10872 from Arturlang/reflective_ornot kevinz000 2020-02-04 03:34:16 -07:00
  • 8ed0683975 Automatic changelog generation for PR #10847 [ci skip] CitadelStationBot 2020-02-04 04:33:58 -06:00
  • ab696ac50a Merge pull request #10847 from Citadel-Station-13/Ghommie-patch-2 kevinz000 2020-02-04 03:33:55 -07:00
  • b34d6cba0c Merge pull request #10864 from Citadel-Station-13/Ghommie-patch-1 kevinz000 2020-02-04 03:33:14 -07:00
  • f78a75e15c Automatic changelog generation for PR #10862 [ci skip] CitadelStationBot 2020-02-04 04:33:00 -06:00
  • d5a44097a3 Merge pull request #10862 from Hatterhat/boy-i-fucked-up-that-examine kevinz000 2020-02-04 03:32:57 -07:00
  • bea97d94b3 Automatic changelog generation for PR #10860 [ci skip] CitadelStationBot 2020-02-04 04:32:42 -06:00
  • 8f83e8c107 Merge pull request #10860 from deathride58/combatmodeclickdrag kevinz000 2020-02-04 03:32:39 -07:00
  • 0452286468 Fixes no thrall bloodcost Artur 2020-02-04 11:21:47 +01:00
  • 97583bd98f Merge pull request #10853 from Ghommie/Ghommie-cit549 kevinz000 2020-02-04 03:20:34 -07:00
  • 4bd916d08a Adds the initial crafting UI stuff. Artur 2020-02-04 10:28:53 +01:00
  • 49f80d52a8 bug fixes Seris02 2020-02-04 17:18:45 +08:00
  • c8dff8fbc5 it just works TrilbySpaceClone 2020-02-04 04:18:44 -05:00
  • c458c243a7 Automatic changelog generation for PR #10854 [ci skip] CitadelStationBot 2020-02-04 01:15:34 -06:00
  • d451115bf1 Merge pull request #10854 from Seris02/meteoralertchange Ghom 2020-02-04 08:15:32 +01:00
  • a0caada859 runtime drifting Ghommie 2020-02-04 08:05:27 +01:00
  • dd4e1d8f57 Update flowers.dm Ghom 2020-02-04 06:57:07 +01:00
  • 4e4b0d718a Update mushrooms.dm Ghom 2020-02-04 06:52:54 +01:00
  • dcb3447c12 Update misc.dm Ghom 2020-02-04 06:51:50 +01:00
  • b6509d25e6 Ports "Cleans up plante gene mutability." Ghommie 2020-02-04 06:34:42 +01:00
  • 0e13afc10f yeet Seris02 2020-02-04 13:25:14 +08:00
  • 1dfd149ab6 Merge pull request #10887 from Citadel-Station-13/Ghommie-patch-7 kevinz000 2020-02-03 22:25:04 -07:00
  • 8f70bd304d yee Seris02 2020-02-04 13:24:30 +08:00
  • cc3955ecc7 Fixes pitch black characters Ghom 2020-02-04 06:04:43 +01:00
  • d315110eac Automatic changelog generation for PR #10852 [ci skip] CitadelStationBot 2020-02-03 22:26:28 -06:00
  • bb3505c184 Merge pull request #10852 from MrJWhit/Comments-out-meteor-defense-tech-node Ghom 2020-02-04 05:26:25 +01:00
  • 33ef9b4619 Update all_nodes.dm Ghom 2020-02-04 05:15:52 +01:00
  • 86e59808f1 Automatic changelog generation for PR #10801 [ci skip] CitadelStationBot 2020-02-03 22:14:10 -06:00
  • 6a88e37ff2 Merge pull request #10801 from Seris02/risingbasschanges Ghom 2020-02-04 05:14:07 +01:00
  • 26d8d9387a ok Ghommie 2020-02-04 05:06:59 +01:00
  • 3245424356 Merge pull request #10884 from Citadel-Station-13/Ghommie-patch-7 kevinz000 2020-02-03 21:02:45 -07:00
  • 0eb5aa0a2a Removing a couple troublesome NSFW unused prefs. Ghommie 2020-02-04 04:58:09 +01:00
  • 6de00c21f0 Update dna_console.dm Ghom 2020-02-04 04:11:21 +01:00
  • a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 Ghommie 2020-02-04 03:54:52 +01:00
  • 5aecdb6a4d initial commit ancientpower 2020-02-03 11:51:18 -06:00
  • b898be92f3 Update say_vr.dm Ghom 2020-02-04 02:36:46 +01:00
  • 54d70cd9fe Update gun.dm kevinz000 2020-02-03 18:33:24 -07:00
  • 89466de29e Good catch linter. Ghommie 2020-02-04 02:30:14 +01:00
  • 0f708cb856 pAI shenanigeans Ghommie 2020-02-04 02:26:42 +01:00
  • 7723450d11 welp. Ghommie 2020-02-04 02:21:23 +01:00
  • d13d8dd953 Less hacky. Ghommie 2020-02-04 02:13:11 +01:00
  • 63c8612ccd Refactoring mob holders into an element. Ghommie 2020-02-04 01:42:59 +01:00
  • 09bb223af0 eh fine kevinz000 2020-02-03 15:49:41 -07:00
  • 9b4e40e3a7 on second thought, fitting on OCLOTHING slot is a bad idea kevinz000 2020-02-03 13:48:03 -07:00
  • c69446d2d1 woops miscalculated kevinz000 2020-02-03 13:46:54 -07:00
  • dd113f5c71 L kevinz000 2020-02-03 13:39:36 -07:00
  • e1ed34dcde s kevinz000 2020-02-03 13:38:18 -07:00
  • 8556bcf2b3 compile kevinz000 2020-02-03 13:36:10 -07:00
  • 70beec5985 woops kevinz000 2020-02-03 13:30:41 -07:00