Commit Graph

  • 8e36d95005 Merge pull request #11 from Citadel-Station-13/master YakumoChen 2020-11-25 03:50:44 -05:00
  • 2de9b55703 uuuuuuuuuuuugh Hatterhat 2020-11-25 02:26:23 -06:00
  • 282a5d6ab2 aaactually lets just make robots immune in general DeltaFire 2020-11-24 20:32:42 +01:00
  • a3208d1ac8 synth alcohol immunity DeltaFire 2020-11-24 20:27:34 +01:00
  • ac20bb7d8c fixes up a tiiny cell charge oversight DeltaFire 2020-11-24 19:43:14 +01:00
  • a7fc05a1c7 Buffs rad collectors. Putnam 2020-11-24 06:43:17 -08:00
  • 4b8c9e6f85 Made not all emotes auto-italic'd. Putnam 2020-11-24 06:28:34 -08:00
  • b000ea6a25 Attempts to make emotes part of the local filter. Putnam 2020-11-24 06:02:34 -08:00
  • 17aa88fa8d Makes gear harness no longer cover chest/groin. Putnam 2020-11-24 01:14:38 -08:00
  • cdcba275d7 Makes dynamic no longer show none in the vote. Putnam 2020-11-24 01:13:41 -08:00
  • 8a2e996817 migration runtimes timothyteakettle 2020-11-24 01:55:36 +00:00
  • cf3c4d9d89 Update living.dm silicons 2020-11-23 00:28:17 -07:00
  • 8f36a1d2ec okay silicons 2020-11-22 15:20:52 -07:00
  • 89d18c681d buffed again silicons 2020-11-22 15:16:40 -07:00
  • 18bdda1273 fix silicons 2020-11-22 15:01:19 -07:00
  • 13ebceb670 why did i do this silicons 2020-11-22 14:56:02 -07:00
  • c7e60191df whew silicons 2020-11-22 14:44:05 -07:00
  • 5075aec151 webedit adds spaces for some reason Timothy Teakettle 2020-11-22 21:43:15 +00:00
  • a976d42305 Revert "webedit adds spaces for some reason" Timothy Teakettle 2020-11-22 21:42:36 +00:00
  • 8d41c15b75 webedit adds spaces for some reason Timothy Teakettle 2020-11-22 21:42:14 +00:00
  • 5ae410790b locking silicons 2020-11-22 14:40:57 -07:00
  • 285208ece3 Merge branch 'master' into communication-hotkeys Timothy Teakettle 2020-11-22 21:30:43 +00:00
  • 37e26833a6 wew silicons 2020-11-22 14:16:14 -07:00
  • 5de801ac40 communication hotkeys Timothy Teakettle 2020-11-22 21:08:58 +00:00
  • abdb0de19d Automatic changelog generation for PR #13582 [ci skip] CitadelStationBot 2020-11-22 14:33:32 -06:00
  • c7396632db Merge pull request #13582 from timothyteakettle/i-hate-mcolor silicons 2020-11-22 13:33:28 -07:00
  • 0554ccbba4 fix silicons 2020-11-22 13:32:48 -07:00
  • fbdc339653 Update living.dm silicons 2020-11-22 13:31:36 -07:00
  • 84b299912a Merge remote-tracking branch 'origin/master' into tgui_whitescreenfix_port Artur 2020-11-22 13:29:26 +02:00
  • 31fa58a9e9 fix silicons 2020-11-22 02:48:37 -07:00
  • c5e410c1bc Makes spontaneous brain trauma require min 5 players. Putnam 2020-11-22 00:12:54 -08:00
  • 65920283f5 Always remember to commit, lord. Putnam 2020-11-21 22:33:52 -08:00
  • 5a127f6cb5 sigh silicons 2020-11-21 23:32:10 -07:00
  • 86b584fab5 typos silicons 2020-11-21 21:08:55 -07:00
  • 4dc7e667a7 Merge pull request #13691 from Citadel-Station-13/dependabot/pip/tools/mapmerge2/pillow-7.1.0 silicons 2020-11-21 21:04:54 -07:00
  • 45d84ec7d4 Update living.dm silicons 2020-11-21 21:04:48 -07:00
  • 27c4dff507 ports silicons 2020-11-21 21:02:54 -07:00
  • 8f7289036d Automatic changelog generation for PR #13694 [ci skip] CitadelStationBot 2020-11-21 19:25:16 -06:00
  • 75d807df4e Merge pull request #13694 from TheObserver-sys/PublicMiningRevival silicons 2020-11-21 18:25:13 -07:00
  • 0c65359f42 functionality Timothy Teakettle 2020-11-22 00:00:24 +00:00
  • 5e9e984fd0 a few more crumbs we missed. Travis might be happy now. The0bserver 2020-11-20 18:45:32 -05:00
  • c8f8972027 Removes the ling dna limit shellspeed1 2020-11-20 03:03:38 -08:00
  • f900643922 h shellspeed1 2020-11-20 02:44:15 -08:00
  • 902cb94ee7 Whoo, we almost forgot this one. The0bserver 2020-11-20 05:19:54 -05:00
  • 6cc7f15743 Update changeling.dm shellspeed1 2020-11-20 01:41:14 -08:00
  • 56b6a42bb8 Tweaks, making sure code is right. Pain is infinite. The0bserver 2020-11-20 03:54:28 -05:00
  • d3b0ac882f HERE WE GOOOOOOOOOO! The0bserver 2020-11-20 03:05:44 -05:00
  • 580e3ec468 Merge remote-tracking branch 'Upstream/master' The0bserver 2020-11-20 01:23:04 -05:00
  • cfaa988217 Merge master and fix newline conflict. uomo91 2020-11-19 17:12:19 -06:00
  • 3cbec856a8 Update windowdoor.dm silicons 2020-11-19 02:41:55 -07:00
  • b786392e79 Bump pillow from 7.0.0 to 7.1.0 in /tools/mapmerge2 dependabot[bot] 2020-11-19 07:10:29 +00:00
  • c1cecb651d Automatic changelog generation for PR #13679 [ci skip] CitadelStationBot 2020-11-18 23:54:54 -06:00
  • f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption silicons 2020-11-18 22:54:51 -07:00
  • 84c90db0e7 Merge pull request #13559 from Citadel-Station-13/silicons-patch-21 Putnam3145 2020-11-18 17:51:18 -08:00
  • 0c0521105f Automatic changelog generation for PR #13662 [ci skip] CitadelStationBot 2020-11-18 19:51:05 -06:00
  • cd3b3e52ea Merge pull request #13662 from Citadel-Station-13/silicons-patch-3 Putnam3145 2020-11-18 17:51:02 -08:00
  • f7034818a4 Merge pull request #13672 from Citadel-Station-13/silicons-patch-4 Putnam3145 2020-11-18 17:50:50 -08:00
  • 9d300ade35 Merge pull request #13677 from silicons/newlines Putnam3145 2020-11-18 17:50:38 -08:00
  • adc2af2dde typo DeltaFire 2020-11-18 22:51:54 +01:00
  • e24b26c7e6 fixes APCs using nearly no power DeltaFire 2020-11-18 22:47:28 +01:00
  • 91ed35cc8a A lot of testing and fiddling. Not ready for primetime. Putnam 2020-11-18 04:58:31 -08:00
  • be009f2e54 Better labeling to differentiate log types. uomo91 2020-11-18 06:08:14 -06:00
  • b4d833ab1e Automatic changelog generation for PR #13688 [ci skip] CitadelStationBot 2020-11-18 04:06:07 -06:00
  • ab81a7e3ef oops! (#13688) DeltaFire15 2020-11-18 11:06:04 +01:00
  • 6d1ace27f7 Initial Commit: Mapping is painful The0bserver 2020-11-18 00:38:35 -05:00
  • a3fc6c4884 compiling for cit's cpu Putnam 2020-11-17 02:43:01 -08:00
  • bfaaecde49 whoops more sanity checking Putnam 2020-11-17 02:42:49 -08:00
  • 30fb673670 Superconductivity is gone. Only rustmos now. Putnam 2020-11-17 02:35:10 -08:00
  • 7a3a2db2d4 Automatic changelog generation for PR #13680 [ci skip] CitadelStationBot 2020-11-17 02:13:37 -06:00
  • 3df485ad94 Merge pull request #13680 from DeltaFire15/hallucination-runtime-fix silicons 2020-11-17 01:13:33 -07:00
  • da58667dac Automatic changelog generation for PR #13681 [ci skip] CitadelStationBot 2020-11-17 02:13:00 -06:00
  • 891d4ec76e Merge pull request #13681 from DeltaFire15/supplypod-shrapnel silicons 2020-11-17 01:12:56 -07:00
  • b35840031c Automatic changelog generation for PR #13676 [ci skip] CitadelStationBot 2020-11-17 02:12:31 -06:00
  • 1c915c2e6f Merge pull request #13676 from DeltaFire15/borg-slab-fix silicons 2020-11-17 01:12:28 -07:00
  • d6866c5bc2 Automatic changelog generation for PR #13675 [ci skip] CitadelStationBot 2020-11-17 02:11:04 -06:00
  • 6a7ab4de67 Merge pull request #13675 from DeltaFire15/sleeper-ui-fix silicons 2020-11-17 01:11:01 -07:00
  • 41575d2264 Automatic changelog generation for PR #13674 [ci skip] CitadelStationBot 2020-11-17 02:10:57 -06:00
  • f11b636727 Merge pull request #13674 from DeltaFire15/vtec-fixing silicons 2020-11-17 01:10:53 -07:00
  • 874687ea2d Automatic changelog generation for PR #13673 [ci skip] CitadelStationBot 2020-11-17 02:10:48 -06:00
  • b9b67f62a3 Merge pull request #13673 from Arturlang/sacrifice_tweaks silicons 2020-11-17 01:10:45 -07:00
  • ecc99f6daa Automatic changelog generation for PR #13671 [ci skip] CitadelStationBot 2020-11-17 02:10:30 -06:00
  • 1942e16a82 Merge pull request #13671 from DeltaFire15/clock-rite-neutering-support silicons 2020-11-17 01:10:26 -07:00
  • 157b2b6e2a Merge pull request #13665 from Citadel-Station-13/tgs-dmapi-update silicons 2020-11-17 01:10:03 -07:00
  • e2fe97e86a Automatic changelog generation for PR #13644 [ci skip] CitadelStationBot 2020-11-17 02:09:51 -06:00
  • a950bcb0fb Merge pull request #13644 from DeltaFire15/hybrid-limbs-wound-stuff silicons 2020-11-17 01:09:47 -07:00
  • c5d74b4fcc Merge remote-tracking branch 'Upstream/master' The0bserver 2020-11-16 20:55:21 -05:00
  • 60077f028e port timothyteakettle 2020-11-17 01:41:19 +00:00
  • 4a1dd4885b Merge remote-tracking branch 'origin/master' Dan-Neposh 2020-11-16 20:22:52 -05:00
  • 3a5e0e2467 Merge pull request #17 from Citadel-Station-13/master Heretical Lizard 2020-11-12 16:00:56 -05:00
  • 03b2f1ac2e Update TGS DMAPI tgstation-server 2020-11-17 00:37:11 +00:00
  • 05401800f3 splits clockwork guardians from marauders Dan-Neposh 2020-11-16 16:25:15 -05:00
  • cee17c3f65 Update living.dm silicons 2020-11-16 13:24:38 -07:00
  • 3f7bcb3d30 Update code/modules/mob/living/living.dm silicons 2020-11-16 13:17:17 -07:00
  • 24257de407 Update living.dm silicons 2020-11-16 09:50:05 -07:00
  • a7efaeb0e5 Update living.dm silicons 2020-11-16 09:35:03 -07:00
  • 6cdef62abb Ports https://github.com/tgstation/tgstation/pull/54895/ Artur 2020-11-16 15:19:31 +02:00
  • 82869f4aef Fix timestamp proc. uomo91 2020-11-16 01:48:48 -06:00
  • 6b85ab5c01 Individual logging code. uomo91 2020-11-16 01:40:48 -06:00
  • 9a6759efaa Remove unneeded linecount thing. uomo91 2020-11-16 01:39:08 -06:00
  • 01dccccb99 Whisper prefix. uomo91 2020-11-16 01:37:47 -06:00