Commit Graph

  • f8188fd22b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update Linzolle 2019-10-30 00:14:11 -05:00
  • 4d4ff4239c unused Linzolle 2019-10-30 00:10:53 -05:00
  • 52b6e659c1 Merge branch 'abductor-update' of https://github.com/Linzolle/Citadel-Station-13 into abductor-update Linzolle 2019-10-29 23:59:16 -05:00
  • 266f1ff958 Merge remote-tracking branch 'upstream/master' into abductor-update Linzolle 2019-10-29 23:58:01 -05:00
  • d249a38489 Automatic changelog generation for PR #9532 [ci skip] CitadelStationBot 2019-10-29 23:46:41 -05:00
  • 18f1dc53cc Merge pull request #9532 from MrJWhit/stam-cost-reduction deathride58 2019-10-30 00:46:38 -04:00
  • 4ca5841828 Fixed an invalid variable call in a string Weblure 2019-10-29 21:45:36 -07:00
  • a728f3f577 Automatic changelog generation for PR #9531 [ci skip] CitadelStationBot 2019-10-29 23:43:47 -05:00
  • be752c1fb0 Merge pull request #9531 from Ghommie/Ghommie-cit246 kevinz000 2019-10-29 21:43:45 -07:00
  • 1a5a3dcd6b Automatic changelog generation for PR #9578 [ci skip] CitadelStationBot 2019-10-29 23:42:35 -05:00
  • 6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements kevinz000 2019-10-29 21:42:32 -07:00
  • b66b85e416 Automatic changelog generation for PR #9598 [ci skip] CitadelStationBot 2019-10-29 23:41:13 -05:00
  • fb936a5319 Merge pull request #9598 from deathride58/runtimefixpass kevinz000 2019-10-29 21:41:11 -07:00
  • e6046d62d6 Merge pull request #9528 from Ghommie/Ghommie-cit244 kevinz000 2019-10-29 21:38:24 -07:00
  • 631961121f Merge pull request #9521 from MrJWhit/cult-robe-change kevinz000 2019-10-29 21:38:00 -07:00
  • fbfceb2fce Automatic changelog generation for PR #9500 [ci skip] CitadelStationBot 2019-10-29 23:37:43 -05:00
  • a7039c2d89 Merge pull request #9500 from Ghommie/Ghommie-cit237 kevinz000 2019-10-29 21:37:41 -07:00
  • 0ebda43c79 Automatic changelog generation for PR #9494 [ci skip] CitadelStationBot 2019-10-29 23:37:13 -05:00
  • 5aee9b0142 Merge pull request #9494 from Ghommie/Ghommie-cit235 kevinz000 2019-10-29 21:37:11 -07:00
  • fff4cc9112 Automatic changelog generation for PR #9469 [ci skip] CitadelStationBot 2019-10-29 23:36:23 -05:00
  • 05a84985d4 Merge pull request #9469 from deathride58/vampyawn kevinz000 2019-10-29 21:36:21 -07:00
  • ee60b62574 Automatic changelog generation for PR #9423 [ci skip] CitadelStationBot 2019-10-29 23:35:19 -05:00
  • 5ba86d2fc3 Merge pull request #9423 from Poojawa/NPC-Run-levels kevinz000 2019-10-29 21:35:17 -07:00
  • 0ec2780a08 Automatic changelog generation for PR #9350 [ci skip] CitadelStationBot 2019-10-29 23:33:36 -05:00
  • 66faef41f8 Merge pull request #9350 from Tupinambis/UIChanges kevinz000 2019-10-29 21:33:34 -07:00
  • acf9638b9b Automatic changelog generation for PR #9501 [ci skip] CitadelStationBot 2019-10-29 23:29:14 -05:00
  • b172c5f691 Merge pull request #9501 from deathride58/stronksecborgs kevinz000 2019-10-29 21:29:12 -07:00
  • 15e87a10d0 Automatic changelog generation for PR #9533 [ci skip] CitadelStationBot 2019-10-29 23:28:12 -05:00
  • 754bb888dc Merge pull request #9533 from JTGSZ/rpd-fix kevinz000 2019-10-29 21:28:10 -07:00
  • ce7e675c08 Automatic changelog generation for PR #9592 [ci skip] CitadelStationBot 2019-10-29 23:27:55 -05:00
  • ae4aee794e Merge pull request #9592 from Ghommie/Ghommie-cit262 kevinz000 2019-10-29 21:27:53 -07:00
  • 8d1707f837 Merge pull request #9602 from Ghommie/Ghommie-cit266 kevinz000 2019-10-29 21:26:21 -07:00
  • 58702b8aa5 Automatic changelog generation for PR #9610 [ci skip] CitadelStationBot 2019-10-29 23:26:06 -05:00
  • 0064529362 Merge pull request #9610 from Ghommie/Ghommie-cit273 kevinz000 2019-10-29 21:26:03 -07:00
  • d012e792fd Automatic changelog generation for PR #9615 [ci skip] CitadelStationBot 2019-10-29 23:25:31 -05:00
  • 303175c1b8 Merge pull request #9615 from Ghommie/Ghommie-cit274 kevinz000 2019-10-29 21:25:29 -07:00
  • 201cd6f9b7 Automatic changelog generation for PR #9616 [ci skip] CitadelStationBot 2019-10-29 23:25:14 -05:00
  • d64d1752b4 Merge pull request #9616 from deathride58/post512jukeboxes kevinz000 2019-10-29 21:25:12 -07:00
  • bcbf2de7f7 Automatic changelog generation for PR #9652 [ci skip] CitadelStationBot 2019-10-29 23:24:09 -05:00
  • 86aafd016b Merge pull request #9652 from Ghommie/Ghommie-cit289 kevinz000 2019-10-29 21:24:07 -07:00
  • d410556df6 Automatic changelog generation for PR #9651 [ci skip] CitadelStationBot 2019-10-29 23:23:57 -05:00
  • 9998a2c898 Merge pull request #9651 from Thalpy/Thalpy-patch-1 kevinz000 2019-10-29 21:23:55 -07:00
  • df715d6cbc Merge pull request #9650 from Hatterhat/patch-3 kevinz000 2019-10-29 21:23:26 -07:00
  • 046d3aab62 Automatic changelog generation for PR #9648 [ci skip] CitadelStationBot 2019-10-29 23:22:48 -05:00
  • 2ca3cedaed Merge pull request #9648 from Ghommie/Ghommie-cit288 kevinz000 2019-10-29 21:22:46 -07:00
  • 022fbc09ab Automatic changelog generation for PR #9647 [ci skip] CitadelStationBot 2019-10-29 23:22:28 -05:00
  • cf89cfdd2d Merge pull request #9647 from Ghommie/Ghommie-cit287 kevinz000 2019-10-29 21:22:26 -07:00
  • e1954e3474 Automatic changelog generation for PR #9646 [ci skip] CitadelStationBot 2019-10-29 23:22:08 -05:00
  • 5cb19d9973 Merge pull request #9646 from Ghommie/Ghommie-cit286 kevinz000 2019-10-29 21:22:06 -07:00
  • e16c08f42a Automatic changelog generation for PR #9645 [ci skip] CitadelStationBot 2019-10-29 23:21:56 -05:00
  • 96364ea075 Merge pull request #9645 from Ghommie/Ghommie-cit285 kevinz000 2019-10-29 21:21:54 -07:00
  • f8c240aae2 Automatic changelog generation for PR #9644 [ci skip] CitadelStationBot 2019-10-29 23:21:44 -05:00
  • fc073748ec Merge pull request #9644 from Ghommie/Ghommie-cit284 kevinz000 2019-10-29 21:21:42 -07:00
  • bc3dd51db3 Merge pull request #9626 from Ghommie/Ghommie-cit278 kevinz000 2019-10-29 21:21:14 -07:00
  • 57f848ab01 Merge branch 'master' into kevinz000-patch-85 kevinz000 2019-10-29 21:19:49 -07:00
  • 9c30672bf0 nerfs miasma points from 120 to 6 kappa-sama 2019-10-29 23:03:47 -04:00
  • 852a405ab8 Merge pull request #9631 from Citadel-Station-13/kevinz000-patch-98 BlackMajor 2019-10-30 15:55:29 +13:00
  • eada856419 Merge pull request #9661 from Citadel-Station-13/kevinz000-patch-106 nik707 2019-10-29 21:39:34 -05:00
  • c6022518a7 Shameless late game crew nerf. Ghommie 2019-10-30 03:25:50 +01:00
  • bbd3c55fbc Update halloween.dm Trilbyspaceclone 2019-10-29 21:37:44 -04:00
  • 005c87bdf6 I'm making a joke title, don't ban me github. Ghommie 2019-10-30 01:31:29 +01:00
  • ec4b94c3c0 Update embalming.dm Trilbyspaceclone 2019-10-29 20:22:44 -04:00
  • 0fb5687a0a Update RCD.dm kevinz000 2019-10-29 16:53:15 -07:00
  • 1b8bda7040 Fixes some average runtimes, how null... Ghommie 2019-10-30 00:48:51 +01:00
  • 0746d782d7 Update RCD.dm kevinz000 2019-10-29 16:43:59 -07:00
  • 39030b8fb0 Update RCD.dm kevinz000 2019-10-29 16:37:36 -07:00
  • 30fb851abd damn Ghommie 2019-10-30 00:09:29 +01:00
  • 54f8c29005 Fixing riding component runtimes, how drifting... Ghommie 2019-10-29 23:33:35 +01:00
  • 9f00423bbd Fixing the deep space gorilla. Ghommie 2019-10-29 21:51:00 +01:00
  • 6a64647ee8 Fixing dogborg sleepers runtimes, how atrocious... Ghommie 2019-10-29 19:45:10 +01:00
  • 23202e8524 Merge branch 'master' into assu Anonymous 2019-10-29 17:53:16 +03:00
  • a5b37b658b Purging a lot of space indention in favor of tabs. Ghommie 2019-10-29 15:46:31 +01:00
  • 22c87b0791 Bump pillow from 5.1.0 to 6.2.0 in /tools/mapmerge2 dependabot[bot] 2019-10-29 14:09:47 +00:00
  • 5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 Ghommie 2019-10-29 13:38:16 +01:00
  • a5086d5813 3 seconds penalties fix Ghommie 2019-10-29 13:16:36 +01:00
  • d0bf24c7cc Automatic changelog generation for PR #9649 [ci skip] CitadelStationBot 2019-10-29 03:48:37 -05:00
  • edfa1d0bae Merge pull request #9649 from Thalpy/JacqFixes BlackMajor 2019-10-29 21:48:35 +13:00
  • be470c2d18 Oranges are high Fermi 2019-10-29 08:07:11 +00:00
  • 5356afa9e6 Barthhhh Fermi 2019-10-29 06:14:31 +00:00
  • df3d5ab51f always gotta be one, at least Putnam 2019-10-28 23:05:22 -07:00
  • cb88fd1a44 added dynamic antag injection to config Putnam 2019-10-28 22:58:35 -07:00
  • cbf74f63c8 Level Order listing Poojawa 2019-10-29 00:00:48 -05:00
  • 4716381918 Automatic changelog generation for PR #9641 [ci skip] CitadelStationBot 2019-10-28 23:44:38 -05:00
  • 1cfc477f36 Merge pull request #9641 from Citadel-Station-13/kevinz000-patch-100 BlackMajor 2019-10-29 17:44:35 +13:00
  • 85ba7943db Less visual issues. Ghommie 2019-10-29 04:58:24 +01:00
  • 9d17e63314 sofa sprites armrest improvements. Ghommie 2019-10-29 04:53:24 +01:00
  • 2636398e60 WEBEDITS Thalpy 2019-10-29 03:50:49 +00:00
  • ebd05a3fb1 today i will make a one line fix and steal it from sishen Hatterhat 2019-10-28 22:39:46 -05:00
  • e71dc54594 i-- Thalpy 2019-10-29 03:29:56 +00:00
  • a1e611e7aa Heck Thalpy 2019-10-29 03:23:46 +00:00
  • 39f7116353 Oops Thalpy 2019-10-29 03:22:21 +00:00
  • f42e835add tweak. Ghommie 2019-10-29 03:09:38 +01:00
  • 503af59b16 Automatic changelog generation for PR #9637 [ci skip] CitadelStationBot 2019-10-28 20:17:36 -05:00
  • 624d562995 Merge pull request #9637 from Citadel-Station-13/byond_513 deathride58 2019-10-28 21:17:33 -04:00
  • f725afae64 Random plush spawner tweaks and fixes. Ghommie 2019-10-29 02:06:22 +01:00
  • 502b02303b Arcade machine directional sprites. Ghommie 2019-10-28 23:31:39 +01:00
  • 0806b19a5d Automatic changelog generation for PR #9636 [ci skip] CitadelStationBot 2019-10-28 16:36:52 -05:00
  • 5894b148a8 Merge pull request #9636 from Ghommie/Ghommie-cit282 BlackMajor 2019-10-29 10:36:50 +13:00
  • ba9c99644d Merge pull request #9640 from Linzolle/hat-toss BlackMajor 2019-10-29 10:00:52 +13:00
  • e688d37390 Fixing nuke ops / adminspawn combat mechs having tracking beacons. Ghommie 2019-10-28 18:33:39 +01:00