Commit Graph

  • b2ae6ae521 Update github_webhook_processor.php CitadelStationBot 2020-04-09 09:11:47 -05:00
  • bfad661c1c Merge pull request #11737 from Trilbyspaceclone/patch-330 kevinz000 2020-04-09 06:57:13 -07:00
  • 97dcb9ed84 fried garbage is now better Timothy Teakettle 2020-04-09 14:50:11 +01:00
  • 7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 Ghommie 2020-04-09 15:46:19 +02:00
  • d2b624a908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667 Ghommie 2020-04-09 14:59:40 +02:00
  • 5078b5875a Fixes my oldish badcode. (#11781) Putnam3145 2020-04-09 05:48:58 -07:00
  • 7fba81f36e people are more picky about food Timothy Teakettle 2020-04-09 13:32:02 +01:00
  • 98312ec2c8 Update radiation.dm Ghom 2020-04-09 14:21:15 +02:00
  • 3433205130 Makes radioactive atoms actually still radiate other atoms within itself even if contained. Ghom 2020-04-09 13:56:19 +02:00
  • 7cb2057bb0 Merge pull request #11751 from Arturlang/kills_the_shitty_fix kevinz000 2020-04-09 03:53:08 -07:00
  • e3c6ebb81e compile kevinz000 2020-04-09 02:54:29 -07:00
  • a888c7c29a continue kevinz000 2020-04-09 02:52:32 -07:00
  • a08536b0ff Merge pull request #11778 from kappa-sama/patch-17 kevinz000 2020-04-09 02:41:40 -07:00
  • aee2f46b8d Merge pull request #11777 from Ghommie/Ghommie-cit670 kevinz000 2020-04-09 02:41:21 -07:00
  • f60cf32562 Merge pull request #11775 from Trilbyspaceclone/frail-crafting kevinz000 2020-04-09 02:41:01 -07:00
  • ba4585951e Merge pull request #11765 from Putnam3145/dynamic-chaos-weight kevinz000 2020-04-09 02:40:25 -07:00
  • 22bf4cdb83 Merge pull request #11760 from Trilbyspaceclone/10mmchanges kevinz000 2020-04-09 02:38:44 -07:00
  • 779766d1f6 Merge pull request #11759 from Trilbyspaceclone/telecoms kevinz000 2020-04-09 02:38:10 -07:00
  • ffa7f198a0 Merge pull request #11752 from EmeraldSundisk/cogfix1 kevinz000 2020-04-09 02:37:55 -07:00
  • b8548f521b Merge pull request #11746 from Trilbyspaceclone/found_and_hidden kevinz000 2020-04-09 02:11:43 -07:00
  • 956a85ab34 Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening kevinz000 2020-04-09 02:09:51 -07:00
  • 9208c42747 Merge pull request #11722 from timothyteakettle/bye-separated-chems kevinz000 2020-04-09 02:02:55 -07:00
  • 474d6a486d Merge pull request #11773 from Arturlang/cablefix Putnam3145 2020-04-09 01:28:30 -07:00
  • 0a234d5618 TABS NOT SPACES Artur 2020-04-09 09:32:23 +03:00
  • d985ea8c84 more quality timothyteakettle 2020-04-09 02:51:32 +01:00
  • 20d4172030 more quality timothyteakettle 2020-04-09 02:10:00 +01:00
  • a90f3d9d2b woops timothyteakettle 2020-04-09 01:46:47 +01:00
  • 792be6e146 more food quality timothyteakettle 2020-04-09 01:36:15 +01:00
  • d4fa563095 Automatic changelog compile [ci skip] Changelogs 2020-04-09 00:13:13 +00:00
  • bc6294baa9 i too, like food quality. timothyteakettle 2020-04-09 01:10:34 +01:00
  • 30157c6b69 Merge pull request #11782 from Citadel-Station-13/Linzolle-patch-1 Putnam3145 2020-04-08 12:33:25 -07:00
  • c2cbad81dd what the fuck Lin 2020-04-08 19:00:18 +00:00
  • 75a2dd6900 Finnishing touches, hopefully Artur 2020-04-08 18:32:45 +03:00
  • 3cf6524389 Makes it nicer, removes check_cable_amount Artur 2020-04-08 18:28:35 +03:00
  • cdd2f55cac Putnams suggestion Arturlang 2020-04-08 18:24:14 +03:00
  • 5fbe05f3c9 Cleaning up and finishing up Artur 2020-04-08 18:16:10 +03:00
  • 2becb6d74f not really relevant given I literally decided to axe the mod necromanceranne 2020-04-09 00:44:01 +10:00
  • ad09cb6790 This needs to go, there is just no way to reasonably have this mod as of the moment while it is basically giving a universal stamina discount. necromanceranne 2020-04-09 00:07:54 +10:00
  • f0a738ef21 I'm sneaking in a nerf to scarp here shush shush necromanceranne 2020-04-08 22:53:51 +10:00
  • 3c4c397c46 Merge remote-tracking branch 'citadel/master' into combat_rework kevinz000 2020-04-08 04:04:45 -07:00
  • f1deea99f7 adds back in the containment bag Trilbyspaceclone 2020-04-08 05:38:36 -04:00
  • a071a5f2f6 ok kevinz000 2020-04-08 01:05:09 -07:00
  • 33aa16bfcf ok kevinz000 2020-04-08 01:04:56 -07:00
  • 5c53314ee3 cancel kevinz000 2020-04-08 00:57:09 -07:00
  • a60257b0e2 o7 kappa-sama 2020-04-08 00:05:32 -04:00
  • fb22a04939 Makes RAD_PROTECT_CONTENTS protect both ways. Ghommie 2020-04-08 06:00:21 +02:00
  • f4ce4e07f7 i did the thing ZeroMan 2020-04-07 20:37:14 -04:00
  • 7ec669ecd4 bet kevinz000 2020-04-07 16:11:58 -07:00
  • 97dbd6ae7f Update parts.dm Trilbyspaceclone 2020-04-07 18:38:53 -04:00
  • b350436fbc working TrilbySpaceClone 2020-04-07 18:31:23 -04:00
  • e9d2e798a3 more glasswork TrilbySpaceClone 2020-04-07 17:58:23 -04:00
  • 8379169b81 Merge pull request #11476 from kevinz000/shield_refactor Lin 2020-04-07 20:47:15 +00:00
  • 395d33e54c Merge pull request #11766 from Ghommie/Ghommie-cit699 Lin 2020-04-07 19:59:48 +00:00
  • 3901049c0d Update shields.dm kevinz000 2020-04-07 12:50:01 -07:00
  • 353c6f1348 forgot this bit necromanceranne 2020-04-07 23:35:10 +10:00
  • 8b2132317b Ports a rewritten version of BAYSTRUMENTS (#11680) kevinz000 2020-04-07 06:21:50 -07:00
  • d6c819cad2 Update lootdrop.dm Trilbyspaceclone 2020-04-07 09:20:18 -04:00
  • 05582f567f ? TrilbySpaceClone 2020-04-07 09:11:20 -04:00
  • c9ab705c80 Ghommies suggestion Artur 2020-04-07 16:08:38 +03:00
  • 28f77af42e wow that's important Putnam 2020-04-07 05:50:00 -07:00
  • 1f51e73dd6 more rng TrilbySpaceClone 2020-04-07 08:43:18 -04:00
  • c4ff1cd322 Coding is hard, mkay? Artur 2020-04-07 14:39:00 +03:00
  • cb187dd944 corrections? TrilbySpaceClone 2020-04-07 07:36:20 -04:00
  • 3907a3739c Merge branch 'found_and_hidden' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into found_and_hidden TrilbySpaceClone 2020-04-07 07:35:31 -04:00
  • dad6ddb042 Merge pull request #11764 from Ghommie/Ghommie-cit668 Putnam3145 2020-04-07 02:50:24 -07:00
  • 536934d1e2 Merge pull request #11770 from Kraseo/i-hate-slimes Putnam3145 2020-04-07 02:43:33 -07:00
  • 557df9f21a Merge pull request #11755 from Trilbyspaceclone/patch-335 kevinz000 2020-04-07 02:00:35 -07:00
  • 9c0567027b Merge pull request #11768 from timothyteakettle/uplinks-population-update kevinz000 2020-04-07 01:59:58 -07:00
  • 029f8ff698 Merge pull request #11763 from necromanceranne/popcap_time kevinz000 2020-04-07 01:58:14 -07:00
  • ef2eaf2233 Merge pull request #11753 from KathrinBailey/Small-&-Snug-Changes kevinz000 2020-04-07 01:56:21 -07:00
  • b494aa3370 Fixed up how the proc is used, made northstar gloves give you no_softcrit instead of no_hardcrit, you altclick to change the warcry since they're no_drop now necromanceranne 2020-04-07 17:51:25 +10:00
  • 8e64664295 Update science.dm Trilbyspaceclone 2020-04-07 03:45:23 -04:00
  • def93f14fb Update watercloset.dm Trilbyspaceclone 2020-04-07 03:40:00 -04:00
  • a6e07e5427 Merge branch 'master' into found_and_hidden Trilbyspaceclone 2020-04-07 03:37:09 -04:00
  • 43169aa9d4 Made teamwork also use recent weight. Putnam 2020-04-06 23:53:59 -07:00
  • bf8b4134b7 Added latejoin changelings. Putnam 2020-04-06 23:01:19 -07:00
  • f78903a2e6 Update job_changes.dm EmeraldSundisk 2020-04-06 20:32:19 -07:00
  • 0d0ee1cd46 Merge remote-tracking branch 'citadel/master' into storage_rework kevinz000 2020-04-06 18:40:58 -07:00
  • 154e145e25 storage kevinz000 2020-04-06 18:40:20 -07:00
  • 3953e64d5b Revert "4/6" EmeraldSundisk 2020-04-06 18:39:57 -07:00
  • c28aa08c71 woops i didnt add it to the seed timothyteakettle 2020-04-07 00:16:28 +01:00
  • f88d36addf quirky ass slime roundstart races Kraseo 2020-04-07 01:12:21 +02:00
  • 0139a2543d 4/6 EmeraldSundisk 2020-04-06 16:07:21 -07:00
  • c633572344 Create compile_changelogs.yml (#11767) Trilbyspaceclone 2020-04-06 19:06:39 -04:00
  • 287fbba4b8 Merge pull request #11758 from Putnam3145/add-ai-facing-message kevinz000 2020-04-06 16:03:56 -07:00
  • 1b940a5464 space tobacco now has gaseous timothyteakettle 2020-04-07 00:01:27 +01:00
  • 378e188b3b goodbye slip prickles timothyteakettle 2020-04-06 23:57:00 +01:00
  • ec237331a4 Merge pull request #11743 from Citadel-Station-13/Ghommie-patch-2-1 kevinz000 2020-04-06 15:48:50 -07:00
  • ef0b81eabf Merge pull request #11744 from Citadel-Station-13/Ghommie-patch-4 kevinz000 2020-04-06 15:48:02 -07:00
  • a53096bdbf Merge pull request #11745 from Trilbyspaceclone/hide_and_seak kevinz000 2020-04-06 15:47:39 -07:00
  • d89170e441 Merge pull request #11748 from Trilbyspaceclone/patch-334 kevinz000 2020-04-06 15:47:00 -07:00
  • a80e6712b9 Merge pull request #11749 from Putnam3145/organ-conveyance kevinz000 2020-04-06 15:46:49 -07:00
  • 699f891166 Merge pull request #11750 from Putnam3145/pluoxium kevinz000 2020-04-06 15:46:09 -07:00
  • aabcfb580b discounts rerolling is bad Timothy Teakettle 2020-04-06 19:49:06 +01:00
  • 864f9b3244 except this times its in the right order Timothy Teakettle 2020-04-06 18:59:48 +01:00
  • e8002ee449 imagine if it compiled and was less bad Timothy Teakettle 2020-04-06 17:45:19 +01:00
  • 3b322b9f7c population locked uplink items use current population Timothy Teakettle 2020-04-06 17:34:34 +01:00
  • f6db5764e3 Bringing back accidentally reverted solar panel fixes. Ghommie 2020-04-06 18:20:34 +02:00
  • faf199fc35 Corrects Plasmamen sec jumpsuits not starting with MAXIUM tracking (#11747) Trilbyspaceclone 2020-04-06 11:53:43 -04:00
  • ee1cb5f8c5 yay fixes (#11756) Trilbyspaceclone 2020-04-06 11:51:07 -04:00