Commit Graph

  • e7684f5df7 whoops forgot to use sensitivity Putnam 2020-01-05 19:29:23 -08:00
  • fba7a8abb0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad Putnam 2020-01-05 19:12:28 -08:00
  • d75a525b3c let's fix arousal huh Putnam 2020-01-05 19:10:48 -08:00
  • dcb2ae77fa Porting some runtime fixes. Ghommie 2020-01-06 02:14:25 +01:00
  • 4cc0833b28 Fixing an edge case runtime with ore bags. Ghommie 2020-01-06 01:45:53 +01:00
  • de14073956 limit Letter N 2020-01-06 08:34:48 +08:00
  • 1afd3d76cb Fixes lattice's examine. Ghommie 2020-01-06 01:18:11 +01:00
  • 1f2597784f git commit death kevinz000 2020-01-05 15:40:23 -08:00
  • 39461e2806 Update beams.dm kevinz000 2020-01-05 15:16:04 -08:00
  • aca8c33149 Update beams.dm kevinz000 2020-01-05 15:08:12 -08:00
  • f26c02801a Update beams.dm kevinz000 2020-01-05 15:04:51 -08:00
  • 07885a399a Update muzzle.dm kevinz000 2020-01-05 15:04:13 -08:00
  • 6e1e1aac3e Update impact.dm kevinz000 2020-01-05 15:03:42 -08:00
  • eea8d353b6 Update tracer.dm kevinz000 2020-01-05 15:03:14 -08:00
  • 198b1d5bd4 Update emitter.dm kevinz000 2020-01-05 15:01:58 -08:00
  • ab23a934fc Update beams.dm kevinz000 2020-01-05 15:01:12 -08:00
  • 75d47c2a0d Improves the set_APTFT verb into a proc. Ghommie 2020-01-05 23:51:42 +01:00
  • 53747013ee Automatic changelog generation for PR #10427 [ci skip] CitadelStationBot 2020-01-05 16:08:26 -06:00
  • 869ed7a4aa Merge pull request #10427 from Hatterhat/beakers-but-quirky Ghom 2020-01-05 23:08:23 +01:00
  • 0b74f91268 Automatic changelog generation for PR #10350 [ci skip] CitadelStationBot 2020-01-05 16:05:15 -06:00
  • e18244671f Merge pull request #10350 from Putnam3145/dojo-ghostrole Ghom 2020-01-05 23:05:13 +01:00
  • a8741a8462 As you command. Ghom 2020-01-05 23:01:35 +01:00
  • 329eecb537 Merge pull request #10446 from Citadel-Station-13/revert-10246-kevinz000-patch-129 Ghom 2020-01-05 22:54:17 +01:00
  • 592422ee70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 Ghommie 2020-01-05 22:53:00 +01:00
  • c438d39eb3 Initial Commit Artur 2020-01-05 22:32:29 +01:00
  • 26e6172a53 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 r4d6 2020-01-05 16:22:41 -05:00
  • f1b1648c0f Merge remote-tracking branch 'origin/master' Artur 2020-01-05 21:57:38 +01:00
  • 0f909a1437 Update twohanded.dm kevinz000 2020-01-05 12:50:51 -08:00
  • 6e50bb9c03 Revert "Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag" kevinz000 2020-01-05 12:47:24 -08:00
  • bd896b4629 Automatic changelog generation for PR #10224 [ci skip] CitadelStationBot 2020-01-05 14:29:53 -06:00
  • 14ec7d963a Merge pull request #10224 from Seris02/traitblacklisting Ghom 2020-01-05 21:29:51 +01:00
  • 1a834edd5f f Ghom 2020-01-05 21:27:04 +01:00
  • 28ec50594c Merge pull request #10443 from Citadel-Station-13/kevinz000-patch-4 Ghom 2020-01-05 20:33:34 +01:00
  • 4d151b2a7c Update twohanded.dm kevinz000 2020-01-05 11:20:13 -08:00
  • 46cf029a28 Update twohanded.dm kevinz000 2020-01-05 11:19:18 -08:00
  • a8a5ff819d Update IsBanned.dm kevinz000 2020-01-05 10:06:09 -08:00
  • 4589c7c0c6 Update IsBanned.dm kevinz000 2020-01-05 08:52:00 -08:00
  • 8c7b648a4f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit425 Ghommie 2020-01-05 17:42:54 +01:00
  • c0f38aa27f Update food_reagents.dm Trilbyspaceclone 2020-01-05 11:40:58 -05:00
  • b0eed9410b Automatic changelog generation for PR #10317 [ci skip] CitadelStationBot 2020-01-05 09:24:49 -06:00
  • db13f748aa Merge pull request #10317 from Trilbyspaceclone/map_redo Ghom 2020-01-05 16:24:46 +01:00
  • db4db9a9c4 Automatic changelog generation for PR #10433 [ci skip] CitadelStationBot 2020-01-05 09:23:39 -06:00
  • 59279a7cd4 Merge pull request #10433 from Citadel-Station-13/kevinz000-patch-7 Ghom 2020-01-05 16:23:37 +01:00
  • 714022be83 Automatic changelog generation for PR #10435 [ci skip] CitadelStationBot 2020-01-05 09:22:47 -06:00
  • 516ec585d2 Merge pull request #10435 from Hatterhat/tg-40394 Ghom 2020-01-05 16:22:44 +01:00
  • 9d21a0e000 oil blood b gone Trilbyspaceclone 2020-01-05 09:57:11 -05:00
  • 69d5602dd7 Automatic changelog generation for PR #10430 [ci skip] CitadelStationBot 2020-01-05 08:51:34 -06:00
  • 5720afb169 Merge pull request #10430 from Citadel-Station-13/VIBE-CHECK Ghom 2020-01-05 15:51:32 +01:00
  • 8bf75be8ff Yea no, go away zoomer kevinz Ghom 2020-01-05 15:38:23 +01:00
  • 4655815c12 Merge pull request #10396 from Hatterhat/revert-8056-tegnerf Ghom 2020-01-05 15:36:02 +01:00
  • 77c09427ef Automatic changelog generation for PR #10428 [ci skip] CitadelStationBot 2020-01-05 08:33:56 -06:00
  • 0646a8557b Merge pull request #10428 from Putnam3145/bomb_fix Ghom 2020-01-05 15:33:54 +01:00
  • e62d18ac33 Automatic changelog generation for PR #10256 [ci skip] CitadelStationBot 2020-01-05 08:19:50 -06:00
  • fdff70b702 Merge pull request #10256 from Putnam3145/alcohol-intolerance Ghom 2020-01-05 15:19:48 +01:00
  • d181b87704 Automatic changelog generation for PR #10278 [ci skip] CitadelStationBot 2020-01-05 08:17:16 -06:00
  • 0e74c94d8c Merge pull request #10278 from Trilbyspaceclone/patch-248 Ghom 2020-01-05 15:17:14 +01:00
  • b9a8970508 Automatic changelog generation for PR #10380 [ci skip] CitadelStationBot 2020-01-05 08:12:09 -06:00
  • eeb9ec5f35 Merge pull request #10380 from Hatterhat/tg-43000-powerfists Ghom 2020-01-05 15:12:06 +01:00
  • 3786c88ffe Automatic changelog generation for PR #10429 [ci skip] CitadelStationBot 2020-01-05 08:09:08 -06:00
  • 2cbf2a2574 Merge pull request #10429 from Trilbyspaceclone/patch-262 Ghom 2020-01-05 15:09:05 +01:00
  • be98704abe weird super secret vote Putnam 2020-01-05 04:19:21 -08:00
  • ba7f0dab62 doppler logs! Letter N 2020-01-05 19:16:37 +08:00
  • 3d800f966e Automatic changelog generation for PR #10358 [ci skip] CitadelStationBot 2020-01-05 01:18:09 -06:00
  • be08c320a0 Merge pull request #10358 from Trilbyspaceclone/changelong_cleaning Putnam3145 2020-01-04 23:18:07 -08:00
  • 609f120c28 Update hardsuit.dm Trilbyspaceclone 2020-01-04 22:29:42 -05:00
  • f166586ca0 a comma Hatterhat 2020-01-04 21:05:55 -06:00
  • 5b0d20cf37 this one fucking tab Hatterhat 2020-01-04 19:52:01 -06:00
  • 46ced736ba what the fuck was that damage my guy Hatterhat 2020-01-04 19:51:06 -06:00
  • bd42f20047 Update organic.dm Trilbyspaceclone 2020-01-04 20:11:10 -05:00
  • 850f4ceef1 Update glassware.dm Trilbyspaceclone 2020-01-04 20:09:38 -05:00
  • 2d573c3f7a carpets are misc Trilbyspaceclone 2020-01-04 20:06:54 -05:00
  • 67afcc13db Update misc.dm Trilbyspaceclone 2020-01-04 20:01:44 -05:00
  • 4e528da5c2 Correct price and rpd r4d6 2020-01-04 19:06:56 -05:00
  • e0e3f1547c Update fermi.dm Trilbyspaceclone 2020-01-04 18:09:51 -05:00
  • c0e010c612 e Hatterhat 2020-01-04 16:44:11 -06:00
  • ca8d93ad17 Merge branch 'master' into alcohol-intolerance Ghom 2020-01-04 23:17:55 +01:00
  • b4ebf0a320 Automatic changelog generation for PR #10378 [ci skip] CitadelStationBot 2020-01-04 15:43:25 -06:00
  • 6f20ab520c Merge pull request #10378 from EmeraldSundisk/metacloset Ghom 2020-01-04 22:43:22 +01:00
  • b19929ee4d Automatic changelog generation for PR #10413 [ci skip] CitadelStationBot 2020-01-04 15:30:40 -06:00
  • 9e257599ab Merge pull request #10413 from nik707/master Ghom 2020-01-04 22:30:37 +01:00
  • 91b31b9c81 Automatic changelog generation for PR #10412 [ci skip] CitadelStationBot 2020-01-04 15:30:15 -06:00
  • 7bebd13c54 Merge pull request #10412 from Linzolle/matchbox-cars Ghom 2020-01-04 22:30:13 +01:00
  • b4736febcf uhh kevinz000 2020-01-04 13:02:23 -08:00
  • 17f09851ba Automatic changelog generation for PR #10399 [ci skip] CitadelStationBot 2020-01-04 14:48:51 -06:00
  • e85c710962 Merge pull request #10399 from Citadel-Station-13/kevinz000-patch-4 Ghom 2020-01-04 21:48:48 +01:00
  • 356304f68f Fixes roundstart mushpeople not having MUSH PUUUUUUUUUUUUNCH!! Ghommie 2020-01-04 20:34:31 +01:00
  • a75b8a387e ok Ghom 2020-01-04 18:30:37 +01:00
  • 07a5f052d3 Merge pull request #10400 from chefferz/chefferz-toiletshuttle Ghom 2020-01-04 14:25:54 +01:00
  • 3086b5eb38 boolean Ghom 2020-01-04 14:19:15 +01:00
  • 92f6fe129a tgstation 40394 port Hatterhat 2020-01-04 07:14:39 -06:00
  • 42d381ca5a Automatic changelog generation for PR #10191 [ci skip] CitadelStationBot 2020-01-04 07:07:27 -06:00
  • 499907f9b7 Merge pull request #10191 from Citadel-Station-13/michael_labs Ghom 2020-01-04 14:07:25 +01:00
  • 6db39c27d3 Automatic changelog generation for PR #10432 [ci skip] CitadelStationBot 2020-01-04 07:04:44 -06:00
  • 5ca6c6cd5b Merge pull request #10432 from Trilbyspaceclone/can-do Ghom 2020-01-04 14:04:41 +01:00
  • 39da7cc58e Merge pull request #10419 from Citadel-Station-13/kevinz000-patch-6 Ghom 2020-01-04 14:03:01 +01:00
  • 3d8c329223 Kevinz, pls Ghom 2020-01-04 13:52:17 +01:00
  • 686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 Ghommie 2020-01-04 13:35:05 +01:00
  • f06e20234b Hey guess who looked all over and got told were these files are Trilbyspaceclone 2020-01-04 06:17:49 -05:00
  • a930464f57 Update extra_drone_types.dm kevinz000 2020-01-04 00:54:06 -08:00
  • 97242050ec bad idea Hatterhat 2020-01-04 02:16:55 -06:00