Commit Graph

  • f05a88d36f it compiles now ghom Hatterhat 2020-02-16 02:24:41 -06:00
  • 35a070fc57 oh shit oh jesus is this working Hatterhat 2020-02-16 01:29:06 -06:00
  • c00f797a4a extendies Hatterhat 2020-02-16 01:26:33 -06:00
  • f6afa28ce0 Update shields.dm Trilbyspaceclone 2020-02-16 02:03:48 -05:00
  • 3fde58434f Merge branch 'master' into more_implants Trilbyspaceclone 2020-02-16 01:55:19 -05:00
  • d4072e3e1a Automatic changelog generation for PR #11011 [ci skip] CitadelStationBot 2020-02-16 00:48:25 -06:00
  • 40f7069480 tgstation 42495 - the one that makes more mechs take stock parts (#11011) Hatterhat 2020-02-16 00:48:22 -06:00
  • d6b7e19ee8 Automatic changelog generation for PR #11028 [ci skip] CitadelStationBot 2020-02-16 00:46:48 -06:00
  • 21e2a0892d Update meat.dm (#11028) Trilbyspaceclone 2020-02-16 01:46:45 -05:00
  • 1ca3d75ebd Automatic changelog generation for PR #11105 [ci skip] CitadelStationBot 2020-02-16 00:39:59 -06:00
  • a8d45f8361 Update crab.dm (#11105) Trilbyspaceclone 2020-02-16 01:39:56 -05:00
  • 128eeefcaf Automatic changelog generation for PR #10970 [ci skip] CitadelStationBot 2020-02-16 00:37:27 -06:00
  • 14fdd90618 Nerfs public autolathes (#10970) kevinz000 2020-02-15 23:37:24 -07:00
  • 475fc0c913 Automatic changelog generation for PR #10949 [ci skip] CitadelStationBot 2020-02-16 00:36:53 -06:00
  • a5f06430e4 repulse armor sanity (#10949) kevinz000 2020-02-15 23:36:50 -07:00
  • af33ad1090 Automatic changelog generation for PR #10857 [ci skip] CitadelStationBot 2020-02-16 00:31:33 -06:00
  • c95bb9f8db FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES hallucination (#10857) Seris02 2020-02-16 14:31:30 +08:00
  • abf7d2423a Update death.dm Ghom 2020-02-16 07:17:53 +01:00
  • 18feba7fdd Defusal kits are now emag only and don't require a drop pod console. Persi 2020-02-16 00:14:15 -05:00
  • 23a9b9b438 Master got fixed while I was at work! Persi 2020-02-16 00:07:24 -05:00
  • fb4e4bcfce makes spraycans rely on HSL lightness instead of an addition of all the RGB values Seris02 2020-02-16 12:05:38 +08:00
  • 938d87cfba Update stunbaton.dm kevinz000 2020-02-15 17:28:04 -07:00
  • 828a339473 Merge pull request #11106 from Trilbyspaceclone/catfixesathing kevinz000 2020-02-15 17:21:56 -07:00
  • cba6667332 it could work TrilbySpaceClone 2020-02-15 18:42:50 -05:00
  • 3b9f9d7a16 Requested changes keronshb 2020-02-15 18:15:41 -05:00
  • 7eb93a1fa8 Update stunbaton.dm kevinz000 2020-02-15 15:36:08 -07:00
  • 470e786765 Update expressconsole.dm Trilbyspaceclone 2020-02-15 15:59:09 -05:00
  • 0f5ea361e7 bada bing bada boom Hatterhat 2020-02-15 14:07:35 -06:00
  • c9af8dc713 perhaps Hatterhat 2020-02-15 14:05:27 -06:00
  • 36cebc733c Merge pull request #11039 from Ghommie/Ghommie-cit572 kevinz000 2020-02-15 12:19:50 -07:00
  • 7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569 kevinz000 2020-02-15 12:17:37 -07:00
  • 0c9244f669 Clarifies comments and locks defusal kits behind an emag Persi 2020-02-15 14:17:22 -05:00
  • ee9b38017e Merge pull request #10995 from Ghommie/Ghommie-cit568 kevinz000 2020-02-15 12:17:02 -07:00
  • b46dd3246d Merge pull request #10968 from Citadel-Station-13/Ghommie-patch-4 kevinz000 2020-02-15 12:16:39 -07:00
  • 7a0f779a61 Automatic changelog generation for PR #10947 [ci skip] CitadelStationBot 2020-02-15 13:16:26 -06:00
  • f79148d549 Merge pull request #10947 from Ghommie/Ghommie-cit563 kevinz000 2020-02-15 12:16:23 -07:00
  • c7176b522f Automatic changelog generation for PR #10940 [ci skip] CitadelStationBot 2020-02-15 13:15:52 -06:00
  • b9e8be5784 Merge pull request #10940 from Ghommie/Ghommie-cit560 kevinz000 2020-02-15 12:15:50 -07:00
  • 274fac7576 Automatic changelog generation for PR #10923 [ci skip] CitadelStationBot 2020-02-15 13:15:33 -06:00
  • 56545d742d Merge pull request #10923 from Citadel-Station-13/Ghommie-patch-7 kevinz000 2020-02-15 12:15:31 -07:00
  • fc5eeeac00 Update gun.dm kevinz000 2020-02-15 12:14:51 -07:00
  • eb33901046 Merge pull request #11002 from BlackMajor/walkerbois kevinz000 2020-02-15 11:47:58 -07:00
  • 957c6168b6 Merge pull request #11006 from Ghommie/Ghommie-cit570 kevinz000 2020-02-15 11:47:30 -07:00
  • b057a36fb7 Automatic changelog generation for PR #11071 [ci skip] CitadelStationBot 2020-02-15 12:46:59 -06:00
  • e250fb0a57 Merge pull request #11071 from Citadel-Station-13/Ghommie-patch-1 kevinz000 2020-02-15 11:46:56 -07:00
  • b705e2fe37 Merge pull request #11069 from Ghommie/Ghommie-cit575 kevinz000 2020-02-15 11:46:18 -07:00
  • 638daad243 Automatic changelog generation for PR #11072 [ci skip] CitadelStationBot 2020-02-15 12:46:03 -06:00
  • 6e2e7e29d1 Merge pull request #11072 from Ghommie/Ghommie-cit576 kevinz000 2020-02-15 11:46:00 -07:00
  • 69a0fa6ca7 Automatic changelog generation for PR #11073 [ci skip] CitadelStationBot 2020-02-15 12:45:53 -06:00
  • 29c422a2e6 Merge pull request #11073 from Ghommie/Ghommie-cit577 kevinz000 2020-02-15 11:45:50 -07:00
  • 24bb8b330f Automatic changelog generation for PR #11075 [ci skip] CitadelStationBot 2020-02-15 12:45:41 -06:00
  • d2398f4584 Merge pull request #11075 from Citadel-Station-13/Ghommie-patch-2 kevinz000 2020-02-15 11:45:39 -07:00
  • 24b977f655 Merge branch 'master' into stuff kevinz000 2020-02-15 11:45:25 -07:00
  • 8162aad3e6 Automatic changelog generation for PR #11047 [ci skip] CitadelStationBot 2020-02-15 12:44:54 -06:00
  • fa015c93bf Merge pull request #11047 from Trilbyspaceclone/patch-282 kevinz000 2020-02-15 11:44:52 -07:00
  • 852dc40d3c Automatic changelog generation for PR #11040 [ci skip] CitadelStationBot 2020-02-15 12:44:27 -06:00
  • 76b5dec4bb Merge pull request #11040 from Ghommie/Ghommie-cit573 kevinz000 2020-02-15 11:44:25 -07:00
  • a33669aacd Automatic changelog generation for PR #11094 [ci skip] CitadelStationBot 2020-02-15 12:12:22 -06:00
  • 661e01ca0c Update miscellaneous.dm (#11094) Trilbyspaceclone 2020-02-15 13:12:19 -05:00
  • 72efdec3fb Porting pair pinpointers and fixing an edge case runtime. Ghommie 2020-02-15 19:12:07 +01:00
  • 3f9965a781 Some sprite fixes (#11089) Microvolnovka19 2020-02-15 17:30:00 +07:00
  • 95398af552 Automatic changelog generation for PR #11048 [ci skip] CitadelStationBot 2020-02-15 02:05:47 -06:00
  • 8e3673480f Merge pull request #11048 from Trilbyspaceclone/patch-283 Ghom 2020-02-15 09:05:45 +01:00
  • b5015f696f Automatic changelog generation for PR #11086 [ci skip] CitadelStationBot 2020-02-15 02:04:56 -06:00
  • 06d38eb3dc Merge pull request #11086 from YakumoChen/the-ring-2 Ghom 2020-02-15 09:04:54 +01:00
  • ad639d5f2f Merge pull request #11084 from Citadel-Station-13/kevinz000-patch-7 Ghom 2020-02-15 09:04:29 +01:00
  • acdc3cd2be Merge pull request #11095 from Citadel-Station-13/kevinz000-patch-4 Ghom 2020-02-15 09:00:21 +01:00
  • b811194d85 icon fixes Seris02 2020-02-15 15:46:04 +08:00
  • 2d9c8ce8fc fixing merge conflicts Seris02 2020-02-15 15:41:52 +08:00
  • 168a715462 well it takes a lot to make after all... Trilbyspaceclone 2020-02-15 01:15:46 -05:00
  • 46e97b3cdc Update arrow.dm Trilbyspaceclone 2020-02-15 01:15:09 -05:00
  • a1f1a01a81 grammer and quiver TrilbySpaceClone 2020-02-15 00:52:19 -05:00
  • bbe1ddc0cf silk, bows, and graytide! TrilbySpaceClone 2020-02-14 23:04:02 -05:00
  • f6cf5adb4c Update mech_fabricator.dm kevinz000 2020-02-14 15:33:47 -07:00
  • d97b1d4e80 Update mech_fabricator.dm kevinz000 2020-02-14 15:30:06 -07:00
  • 5a9208bc42 shit whoops Hatterhat 2020-02-14 16:29:17 -06:00
  • 3b873d4000 thanks ghommie Hatterhat 2020-02-14 16:28:39 -06:00
  • f16be3a93f Peak Shitcode. Artur 2020-02-14 22:04:55 +02:00
  • f36b89a6e3 Update misc.dm kevinz000 2020-02-14 11:53:50 -07:00
  • d3926d73ac Automatic changelog generation for PR #10792 [ci skip] CitadelStationBot 2020-02-14 12:44:18 -06:00
  • 245e3e0dfb Merge pull request #10792 from Ghommie/Ghommie-cit539 kevinz000 2020-02-14 11:44:15 -07:00
  • 0a1c3bd084 Merge branch 'master' into Ghommie-cit539 Ghom 2020-02-14 19:42:36 +01:00
  • 4a621fb1aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560 Ghommie 2020-02-14 19:39:53 +01:00
  • 02b7764e9b Merge pull request #11092 from Citadel-Station-13/Ghommie-patch-3-1 kevinz000 2020-02-14 11:38:32 -07:00
  • cb59a4c934 Automatic changelog generation for PR #11013 [ci skip] CitadelStationBot 2020-02-14 12:34:04 -06:00
  • 33931da018 Merge pull request #11013 from r4d6/pickaxe Ghom 2020-02-14 19:34:01 +01:00
  • c2c1c755cd Automatic changelog generation for PR #11070 [ci skip] CitadelStationBot 2020-02-14 12:22:07 -06:00
  • b0d85c4aea Merge pull request #11070 from Citadel-Station-13/kevinz000-patch-18 Ghom 2020-02-14 19:22:05 +01:00
  • d73003a330 Automatic changelog generation for PR #10934 [ci skip] CitadelStationBot 2020-02-14 12:21:52 -06:00
  • 1e57664a99 Merge pull request #10934 from kevinz000/actual_ghost_newscasters Ghom 2020-02-14 19:21:48 +01:00
  • e36a581889 Merge pull request #11065 from Citadel-Station-13/kevinz000-patch-17 Ghom 2020-02-14 19:21:11 +01:00
  • ed8f32d16f Automatic changelog generation for PR #11063 [ci skip] CitadelStationBot 2020-02-14 12:21:01 -06:00
  • 2654843862 Merge pull request #11063 from Zellular/Animations1 Ghom 2020-02-14 19:20:58 +01:00
  • ac0c1a3ccf Automatic changelog generation for PR #10916 [ci skip] CitadelStationBot 2020-02-14 12:20:35 -06:00
  • 78ace8e855 Merge pull request #10916 from Citadel-Station-13/kevinz000-patch-6 Ghom 2020-02-14 19:20:32 +01:00
  • 43d93c4a1b Automatic changelog generation for PR #11051 [ci skip] CitadelStationBot 2020-02-14 12:18:02 -06:00
  • b9ab0cebb3 Merge pull request #11051 from Citadel-Station-13/kevinz000-patch-2 Ghom 2020-02-14 19:17:59 +01:00
  • 57113a4146 Automatic changelog generation for PR #11061 [ci skip] CitadelStationBot 2020-02-14 12:17:07 -06:00
  • fe332571fd Merge pull request #11061 from Trilbyspaceclone/patch-285 Ghom 2020-02-14 19:17:04 +01:00
  • 8934f9b401 Update flypeople.dm Ghom 2020-02-14 17:24:50 +01:00