Commit Graph

  • 051ca8c050 checks kevinz000 2020-01-20 03:45:40 -07:00
  • 67c2fdca52 more flavor objectives Putnam 2020-01-20 01:20:42 -08:00
  • 1a0e7de4c2 s kevinz000 2020-01-20 01:30:20 -07:00
  • 8e674817a9 errors Putnam 2020-01-20 00:30:18 -08:00
  • c37abab94e fix kevinz000 2020-01-20 01:22:52 -07:00
  • ab771d9505 I deleted an important thing Seris02 2020-01-20 15:48:55 +08:00
  • 3828c60367 Update CentCom.dmm Winter Flare 2020-01-20 02:07:33 -05:00
  • a100f9382e better, there, happy now github Seris02 2020-01-20 14:51:53 +08:00
  • 854f1bcbab fixes kevinz000 2020-01-19 23:51:09 -07:00
  • 7f17629404 O K kevinz000 2020-01-19 23:38:47 -07:00
  • c18571425f aa kevinz000 2020-01-19 23:36:57 -07:00
  • c0f8c1e68d ok kevinz000 2020-01-19 23:35:30 -07:00
  • 89e204b980 Merge remote-tracking branch 'citadel/master' into mobility_flags kevinz000 2020-01-19 23:12:17 -07:00
  • 0f4f07dc95 Automatic changelog generation for PR #10346 [ci skip] CitadelStationBot 2020-01-20 00:11:05 -06:00
  • 593e626233 Merge pull request #10346 from deathride58/limbstamlossnerf kevinz000 2020-01-19 23:11:02 -07:00
  • 710eaa7fc0 Lighting + Carpet Locker fixes. Winter Flare 2020-01-20 01:06:02 -05:00
  • fce8e18ccc fix kevinz000 2020-01-19 22:58:20 -07:00
  • ecddef2f21 compile kevinz000 2020-01-19 22:58:08 -07:00
  • 28a2cc4a3d .357 AP printable from illegal ballistics Hatterhat 2020-01-19 23:55:12 -06:00
  • 0b10b8cf89 Update code/game/objects/items/devices/PDA/PDA.dm kevinz000 2020-01-19 22:41:19 -07:00
  • 46376904e0 extra line kevinz000 2020-01-19 22:35:46 -07:00
  • a99406b46a oh fucking boy kevinz000 2020-01-19 22:33:16 -07:00
  • c8b5c6e3cd Ghost Cafe Beautification Winter Flare 2020-01-20 00:22:24 -05:00
  • 5524b0fa03 yes. Seris02 2020-01-20 13:00:24 +08:00
  • 5d485a95c3 Merge remote-tracking branch 'citadel/master' into the-p-o-o-l kevinz000 2020-01-19 20:25:51 -07:00
  • 5df97ace15 fix kevinz000 2020-01-19 20:24:44 -07:00
  • 06c66617e6 m o r e traitor objectives Putnam 2020-01-19 18:58:10 -08:00
  • 9b9c7c3018 exo nerf Hatterhat 2020-01-19 20:37:31 -06:00
  • afd848e45a weh Seris02 2020-01-20 10:29:09 +08:00
  • 8e30dd2282 Automatic changelog generation for PR #10597 [ci skip] CitadelStationBot 2020-01-19 20:24:49 -06:00
  • 77911f9009 Merge pull request #10597 from Putnam3145/player-panel-can-reenter Ghom 2020-01-20 03:24:46 +01:00
  • 194647a7f4 Automatic changelog generation for PR #10614 [ci skip] CitadelStationBot 2020-01-19 20:24:02 -06:00
  • 8a091c5140 Merge pull request #10614 from Putnam3145/suicide_option Ghom 2020-01-20 03:24:00 +01:00
  • 56e58e5c5e whoops Putnam3145 2020-01-19 18:14:33 -08:00
  • 16f9c1bf78 feedback, EORG allowed Putnam 2020-01-19 18:01:21 -08:00
  • 9ee18fc7f5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into conveyor Seris02 2020-01-20 09:52:24 +08:00
  • 8da447c678 start of stealthmode Seris02 2020-01-20 09:51:17 +08:00
  • ea088680e2 Fixed sprites keronshb 2020-01-19 19:25:14 -05:00
  • 705bb9c29e Automatic changelog generation for PR #10097 [ci skip] CitadelStationBot 2020-01-19 17:58:30 -06:00
  • 65eaf9787a Merge pull request #10097 from Ghommie/Ghommie-cit444 kevinz000 2020-01-19 16:58:27 -07:00
  • 55c0fffd69 dme kevinz000 2020-01-19 16:20:14 -07:00
  • c159521d95 dme kevinz000 2020-01-19 16:19:16 -07:00
  • f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags kevinz000 2020-01-19 16:18:12 -07:00
  • 90fcb4cc14 initial changes kevinz000 2020-01-19 16:13:05 -07:00
  • b1cd0f4ede Update grenade.dm kevinz000 2020-01-19 16:11:49 -07:00
  • 92ead7e65d Automatic changelog generation for PR #9601 [ci skip] CitadelStationBot 2020-01-19 17:10:59 -06:00
  • 088e586b47 Merge pull request #9601 from Ghommie/Ghommie-cit265 kevinz000 2020-01-19 16:10:56 -07:00
  • 374f4f143e Update PDA.dm kevinz000 2020-01-19 13:45:16 -07:00
  • 90fcedd188 Update grenade.dm kevinz000 2020-01-19 13:40:09 -07:00
  • 0b0a6429ea Update pyrotechnics.dm kevinz000 2020-01-19 13:31:11 -07:00
  • c273853cff Merge branch 'bountytweaks' of https://github.com/Owai-Seek/Citadel-Station-13 into bountytweaks Winter Flare 2020-01-19 15:25:23 -05:00
  • cf9d3977b8 Reward Fix Winter Flare 2020-01-19 15:25:20 -05:00
  • a4f35eed47 This should fix the icon keronshb 2020-01-19 14:33:41 -05:00
  • 6725e99661 icon fix pt1 keronshb 2020-01-19 14:26:16 -05:00
  • cf9c3a65fd Merge pull request #10587 from Arturlang/Bloodsucker_antag_bans Ghom 2020-01-19 16:38:45 +01:00
  • ecaff2ffe8 Automatic changelog generation for PR #10520 [ci skip] CitadelStationBot 2020-01-19 09:37:42 -06:00
  • 536900a7ac Merge pull request #10520 from Hatterhat/tg-40920 Ghom 2020-01-19 16:37:40 +01:00
  • 95cddfed27 Automatic changelog generation for PR #10307 [ci skip] CitadelStationBot 2020-01-19 09:35:50 -06:00
  • 812182230f Merge pull request #10307 from Seris02/stunglasses Ghom 2020-01-19 16:35:47 +01:00
  • 4a0c85e0c0 Merge pull request #10594 from chefferz/chefferz-abductor1 Ghom 2020-01-19 16:12:51 +01:00
  • cd47e81b18 Automatic changelog generation for PR #10547 [ci skip] CitadelStationBot 2020-01-19 08:33:33 -06:00
  • 637e26eec9 Merge pull request #10547 from Putnam3145/one-more-dojo-tweak Ghom 2020-01-19 15:33:30 +01:00
  • d098002623 Merge pull request #1 from Citadel-Station-13/master Heretical Lizard 2020-01-19 09:05:30 -05:00
  • cc1fcee4ac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak Putnam 2020-01-19 03:56:41 -08:00
  • 1bdb515592 made suicide a config flag Putnam 2020-01-19 03:44:45 -08:00
  • bb6fac4390 I shall actually compile it this time Seris02 2020-01-19 17:01:51 +08:00
  • bc5646f8b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul Putnam 2020-01-19 00:56:17 -08:00
  • 0ea3e275e3 yep Seris02 2020-01-19 16:54:46 +08:00
  • 45b844c231 more fixes + code improvements Seris02 2020-01-19 16:48:19 +08:00
  • afe7c15645 merge fixes Seris02 2020-01-19 16:40:45 +08:00
  • 25d7af31a5 merge fixes Seris02 2020-01-19 16:36:04 +08:00
  • 1ee7885392 re:woops Seris02 2020-01-19 16:28:12 +08:00
  • fd49c1302b woops Seris02 2020-01-19 15:55:24 +08:00
  • 47d1f46172 fixes and stuff Seris02 2020-01-19 15:53:32 +08:00
  • f54417f99e fixes Seris02 2020-01-19 15:50:48 +08:00
  • 379d5b9463 icon fixes Seris02 2020-01-19 15:27:10 +08:00
  • c9f11282af Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 Seris02 2020-01-19 15:21:12 +08:00
  • 718ff58e0b fixes + advanced injectors Seris02 2020-01-19 15:17:57 +08:00
  • 5eba760aa8 Reworked survivalist Putnam 2020-01-18 22:07:54 -08:00
  • 590d71ddc1 hey ghom i fixed it i think Hatterhat 2020-01-18 23:35:52 -06:00
  • e1cf63e0ac Greentext tweaked Putnam 2020-01-18 21:32:42 -08:00
  • d287835d14 Made quirk blacklisting antag-sided Putnam 2020-01-18 21:29:27 -08:00
  • 72e2961972 Update PDA.dm kevinz000 2020-01-18 21:34:24 -07:00
  • 5d4732ed30 Update assistant.dm Winter Flare 2020-01-18 22:36:20 -05:00
  • 703fe9399a Some more balance and a fix. Winter Flare 2020-01-18 22:29:21 -05:00
  • 2b3f00ed1e Fix Freezer overlay bug r4d6 2020-01-18 22:16:43 -05:00
  • bd30b44919 Bounty Reorganisation and Rebalance Winter Flare 2020-01-18 21:59:03 -05:00
  • 3dc3f28748 Moved cold-blooded to negative, made it cost -2 Putnam 2020-01-18 18:41:04 -08:00
  • 9619a6bf5d Update PDA.dm kevinz000 2020-01-18 19:37:12 -07:00
  • 7b8cb0dbfc Update PDA.dm kevinz000 2020-01-18 19:33:22 -07:00
  • bc18ba314a Update PDA.dm kevinz000 2020-01-18 19:21:47 -07:00
  • 0a5e2cf8ff Merge pull request #10601 from Putnam3145/dojo-hilbert Ghom 2020-01-19 03:02:32 +01:00
  • 1eec1b11dd Update passive_vent.dm r4d6 2020-01-18 20:00:07 -05:00
  • ae5e87d492 Apparently TG has more code than us r4d6 2020-01-18 19:12:00 -05:00
  • c4e0000c0c Forgot includes r4d6 2020-01-18 18:46:48 -05:00
  • 5084146400 Port r4d6 2020-01-18 18:46:22 -05:00
  • 072eca6ec0 fixes and more PRs Ghommie 2020-01-18 23:01:00 +01:00
  • 3ee855ab77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 Ghommie 2020-01-18 22:14:06 +01:00
  • 4d06c2d2d3 Automatic changelog generation for PR #10568 [ci skip] CitadelStationBot 2020-01-18 15:13:26 -06:00
  • 2147a2024f Merge pull request #10568 from r4d6/Passive-Vents Ghom 2020-01-18 22:13:23 +01:00