Commit Graph

  • e812844c70 Revert "</span>" Putnam 2020-02-01 21:05:27 -08:00
  • fedb05b3be A PR about runtime errors Ghommie 2020-02-02 05:43:38 +01:00
  • d314619d0e Comments out meteor defense tech node MrJWhit 2020-02-01 23:34:33 -05:00
  • d3d4a9f05b Update code/modules/uplink/uplink_items/uplink_roles.dm Seris02 2020-02-02 12:21:32 +08:00
  • 8053e43838 Update code/modules/uplink/uplink_items/uplink_roles.dm Seris02 2020-02-02 12:21:26 +08:00
  • 18489e5b65 merge fixes Seris02 2020-02-02 11:51:26 +08:00
  • d89e0de32c yeehaw Seris02 2020-02-02 11:43:20 +08:00
  • 5b91908674 Fixing little blood bank gnerator examine runtime. Ghom 2020-02-02 04:27:17 +01:00
  • cbcb9f32ba Fixes maploaded APC terminals direction. Ghommie 2020-02-02 04:21:30 +01:00
  • 8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable Ghommie 2020-02-02 03:39:49 +01:00
  • e985d21ea3 fucking combifan Hatterhat 2020-02-01 20:23:01 -06:00
  • 5542684c8d Automatic changelog generation for PR #10796 [ci skip] CitadelStationBot 2020-02-01 18:51:10 -06:00
  • 2bb0a0311a Merge pull request #10796 from Tupinambis/StatusBugFix Ghom 2020-02-02 01:51:07 +01:00
  • 77024e4451 Automatic changelog generation for PR #10817 [ci skip] CitadelStationBot 2020-02-01 18:41:13 -06:00
  • d6c36f363e Merge pull request #10817 from IronEleven/ViroStatPort Ghom 2020-02-02 01:41:11 +01:00
  • 7c83477640 Automatic changelog generation for PR #10816 [ci skip] CitadelStationBot 2020-02-01 18:40:51 -06:00
  • c26c0cbe09 Merge pull request #10816 from ancientpower/ph-strip-fix Ghom 2020-02-02 01:40:49 +01:00
  • 55fa48737e Forgot about not versioned files. Ghommie 2020-02-02 01:28:16 +01:00
  • 95db5084ab Screw commit history. Ghommie 2020-02-02 01:26:04 +01:00
  • 79387149a0 Fixes Space Ninja "Nothing" Objective. Ghom 2020-02-01 23:23:17 +01:00
  • 471deba88c large rcd carts 5head Hatterhat 2020-02-01 13:26:43 -06:00
  • 81cf670729 shit whoops Hatterhat 2020-02-01 13:22:16 -06:00
  • c829d97418 whoops Putnam 2020-02-01 11:18:22 -08:00
  • b1a571bf2d Automatic changelog generation for PR #10841 [ci skip] CitadelStationBot 2020-02-01 12:13:33 -06:00
  • f6e30ee6aa Merge pull request #10841 from Kraseo/boxing Ghom 2020-02-01 19:13:30 +01:00
  • 4e7ebf7368 Automatic changelog generation for PR #10744 [ci skip] CitadelStationBot 2020-02-01 12:11:13 -06:00
  • d19b7a7695 Merge pull request #10744 from r4d6/Moar-Engines Ghom 2020-02-01 19:11:10 +01:00
  • d70665a0c3 got asked to do this Kraseo 2020-02-01 19:03:35 +01:00
  • 8d5839c2d2 up to 100 it is then Putnam 2020-02-01 10:01:49 -08:00
  • 4768c8f26e Automatic changelog generation for PR #10731 [ci skip] CitadelStationBot 2020-02-01 11:58:06 -06:00
  • 6ae5ffddb1 Merge pull request #10731 from necromanceranne/howdoiswitchhands Ghom 2020-02-01 18:58:03 +01:00
  • d523cfd95e Merge pull request #10806 from Feasel/master Ghom 2020-02-01 18:54:18 +01:00
  • 74ad10355c Merge pull request #10805 from Citadel-Station-13/i-hate-dueling Ghom 2020-02-01 18:52:47 +01:00
  • aa2e4299e2 my grug brain took more than 10 attempts to get this to work Kraseo 2020-02-01 18:51:18 +01:00
  • 5674e89eb5 Automatic changelog generation for PR #10352 [ci skip] CitadelStationBot 2020-02-01 11:46:13 -06:00
  • 3337181cac Merge pull request #10352 from Seris02/smchanges Ghom 2020-02-01 18:46:10 +01:00
  • 91cea9fd5b Automatic changelog generation for PR #10800 [ci skip] CitadelStationBot 2020-02-01 11:44:32 -06:00
  • a40d22fa45 Merge pull request #10800 from Seris02/moreslots Ghom 2020-02-01 18:44:29 +01:00
  • 051811ed46 Merge pull request #10811 from Arturlang/crafting_componitization Ghom 2020-02-01 18:36:51 +01:00
  • c9a1e106e8 Automatic changelog generation for PR #10808 [ci skip] CitadelStationBot 2020-02-01 11:23:00 -06:00
  • 45af9dc013 Merge pull request #10808 from Arturlang/macros_begone Ghom 2020-02-01 18:22:57 +01:00
  • 3dcce2b43a added some cleanup code Putnam 2020-02-01 09:10:02 -08:00
  • aba0379bfb also need these! Putnam 2020-02-01 08:53:19 -08:00
  • 463036a4f4 made panic bunker save in json Putnam 2020-02-01 08:44:05 -08:00
  • d6d01d848c </span> Putnam 2020-02-01 06:01:54 -08:00
  • 11fea908bd Fix and rebalance a lil Artur 2020-02-01 14:11:34 +01:00
  • 88b3b19a4f Automatic changelog generation for PR #10803 [ci skip] CitadelStationBot 2020-02-01 06:15:50 -06:00
  • 12f0c35660 Merge pull request #10803 from Seris02/highlightfix Putnam3145 2020-02-01 04:15:47 -08:00
  • 17e08280b1 Merge pull request #10804 from Citadel-Station-13/kevinz000-patch-9 Putnam3145 2020-02-01 04:15:32 -08:00
  • 59b5b0b9a6 A bunch of tiny tweaks. Winter Flare 2020-02-01 04:49:56 -05:00
  • b5506115fd Automatic changelog generation for PR #10830 [ci skip] CitadelStationBot 2020-02-01 03:07:00 -06:00
  • ed3ebd16a8 Merge pull request #10830 from Seris02/nomoreglitches Ghom 2020-02-01 10:06:58 +01:00
  • 33122d0d92 Merge branch 'master' into TGUIs_Nexties Putnam3145 2020-02-01 00:49:10 -08:00
  • 50a53c6558 aaand a formatting oddity Putnam 2020-02-01 00:47:44 -08:00
  • 7e3ea27ff4 dumb formatting. dumb dumb. Putnam 2020-02-01 00:42:25 -08:00
  • 847e6382c0 fixes some quirk stuff Putnam 2020-02-01 00:32:08 -08:00
  • 3d9e84a3f8 Tweaks and fixes Putnam 2020-02-01 00:23:45 -08:00
  • 3c8dcbbcd2 merp Seris02 2020-02-01 16:02:30 +08:00
  • 4625d4f25d Update sheet_types.dm Trilbyspaceclone 2020-02-01 01:56:41 -05:00
  • 8923810de2 Something about runtime errors. Ghommie 2020-02-01 07:19:49 +01:00
  • 4b7e5916bf Update crates.dm Trilbyspaceclone 2020-02-01 01:09:35 -05:00
  • fa40490915 Update sheet_types.dm Trilbyspaceclone 2020-02-01 01:08:14 -05:00
  • c75774e67a Actual var. Ghommie 2020-02-01 06:20:23 +01:00
  • ef3789eeb2 Playback device peeve. Ghommie 2020-02-01 06:18:22 +01:00
  • f9ccca9c8f Anti-Shitter mining update r4d6 2020-02-01 00:08:01 -05:00
  • e7589715a8 Fixing chap armaments beacon. Ghom 2020-02-01 05:13:29 +01:00
  • c3ca884273 Moved Nurse Stuff below Scrubs Winter Flare 2020-01-31 23:08:31 -05:00
  • 7ce0369e48 Oh man. Ghommie 2020-02-01 05:05:07 +01:00
  • 847946bfe3 Fix cause I'm dumb Winter Flare 2020-01-31 22:53:27 -05:00
  • fc70b88b06 actually we only need it here Seris02 2020-02-01 11:51:15 +08:00
  • 20308b54dd exploit fix Seris02 2020-02-01 11:48:55 +08:00
  • 07b6d278a1 fixed and brutalized clown op slippery weapons a little. Ghommie 2020-02-01 04:48:40 +01:00
  • 12c0e475d8 Add Nurse Stuff to Loadout, fixes. Winter Flare 2020-01-31 22:36:25 -05:00
  • 66862db7ab Last change to this, now the damage is respected by energy armor necromanceranne 2020-02-01 14:07:23 +11:00
  • 599185654f Rename, Add item to Loadout Winter Flare 2020-01-31 21:54:21 -05:00
  • 133da9bdef Automatic changelog generation for PR #10821 [ci skip] CitadelStationBot 2020-01-31 20:35:24 -06:00
  • 953c10c511 Merge pull request #10821 from ShadeAware/switchbladefix Ghom 2020-02-01 03:35:22 +01:00
  • c46c683664 FIXES FANCY SWITCHBLADES ShadeAware 2020-01-31 21:12:08 -05:00
  • be525e3f58 good ol twoliner prs Hatterhat 2020-01-31 20:05:27 -06:00
  • b4763d947e Kills macrotier Artur 2020-02-01 03:03:55 +01:00
  • 3519fbc909 F Ghom 2020-02-01 02:16:52 +01:00
  • 1745308cc5 Forgot about this. Ghom 2020-02-01 02:14:14 +01:00
  • 37c4565160 Whops. Two beacons, not one. Ghom 2020-02-01 02:06:56 +01:00
  • 4d1f0144ef Automatic changelog generation for PR #10781 [ci skip] CitadelStationBot 2020-01-31 18:49:02 -06:00
  • c9e315a9e6 Merge pull request #10781 from r4d6/RPD Ghom 2020-02-01 01:48:59 +01:00
  • c982369910 Automatic changelog generation for PR #10559 [ci skip] CitadelStationBot 2020-01-31 18:46:18 -06:00
  • 5257ab2e00 Merge pull request #10559 from Seris02/custompie Ghom 2020-02-01 01:46:15 +01:00
  • f5aa5f50f9 Automatic changelog generation for PR #10776 [ci skip] CitadelStationBot 2020-01-31 18:44:57 -06:00
  • 7fdabe81ab Merge pull request #10776 from Hatterhat/hecksuitgolres Ghom 2020-02-01 01:44:54 +01:00
  • bf4e07cc75 Automatic changelog generation for PR #10777 [ci skip] CitadelStationBot 2020-01-31 18:44:22 -06:00
  • fddd79b466 Merge pull request #10777 from Citadel-Station-13/kevinz000-patch-4 Ghom 2020-02-01 01:44:19 +01:00
  • d292b102b3 Automatic changelog generation for PR #10786 [ci skip] CitadelStationBot 2020-01-31 18:42:58 -06:00
  • 327bfcac2f Merge pull request #10786 from Commandersand/frick Ghom 2020-02-01 01:42:55 +01:00
  • 0925dc55c2 Merge pull request #10789 from Putnam3145/whoops-text Ghom 2020-02-01 01:42:08 +01:00
  • 396d712857 Automatic changelog generation for PR #10793 [ci skip] CitadelStationBot 2020-01-31 18:41:39 -06:00
  • 1c5fe85545 Merge pull request #10793 from Tupinambis/MaskBugFix Ghom 2020-02-01 01:41:36 +01:00
  • 51285022d0 Port "Add extensions.json for vscode" & co. Ghommie 2020-02-01 01:29:28 +01:00
  • 74fd722871 Update ring.dm YakumoChen 2020-02-01 00:28:04 +00:00
  • 0d1d90cc96 bigger rings YakumoChen 2020-01-31 19:23:59 -05:00
  • 60476560cf concatenation tweak ancientpower 2020-01-31 18:23:13 -06:00