Commit Graph
39413 Commits
Author SHA1 Message Date
silicons 86b584fab5 typos 2020-11-21 21:08:55 -07:00
silicons 27c4dff507 ports 2020-11-21 21:02:54 -07:00
CitadelStationBot 8f7289036d Automatic changelog generation for PR #13694 [ci skip] 2020-11-21 19:25:16 -06:00
siliconsandGitHub 75d807df4e Merge pull request #13694 from TheObserver-sys/PublicMiningRevival
Local Assistant man can now bash rock again!*
2020-11-21 18:25:13 -07:00
The0bserver 5e9e984fd0 a few more crumbs we missed. Travis might be happy now. 2020-11-20 18:45:32 -05:00
The0bserver 902cb94ee7 Whoo, we almost forgot this one. 2020-11-20 05:19:54 -05:00
The0bserver 56b6a42bb8 Tweaks, making sure code is right. Pain is infinite.
Tin
2020-11-20 03:54:28 -05:00
The0bserver d3b0ac882f HERE WE GOOOOOOOOOO!
New maps, new meme.
2020-11-20 03:05:44 -05:00
CitadelStationBot c1cecb651d Automatic changelog generation for PR #13679 [ci skip] 2020-11-18 23:54:54 -06:00
siliconsandGitHub f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
Putnam3145andGitHub 84c90db0e7 Merge pull request #13559 from Citadel-Station-13/silicons-patch-21
typing indicator is no longer cleared on mob move
2020-11-18 17:51:18 -08:00
CitadelStationBot 0c0521105f Automatic changelog generation for PR #13662 [ci skip] 2020-11-18 19:51:05 -06:00
Putnam3145andGitHub cd3b3e52ea Merge pull request #13662 from Citadel-Station-13/silicons-patch-3
re-allows angel species on magic mirrors
2020-11-18 17:51:02 -08:00
Putnam3145andGitHub f7034818a4 Merge pull request #13672 from Citadel-Station-13/silicons-patch-4
chief sub
2020-11-18 17:50:50 -08:00
Putnam3145andGitHub 9d300ade35 Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
CitadelStationBot b4d833ab1e Automatic changelog generation for PR #13688 [ci skip] 2020-11-18 04:06:07 -06:00
DeltaFire15andGitHub ab81a7e3ef oops! (#13688) 2020-11-18 11:06:04 +01:00
The0bserver 6d1ace27f7 Initial Commit: Mapping is painful 2020-11-18 00:38:35 -05:00
CitadelStationBot 7a3a2db2d4 Automatic changelog generation for PR #13680 [ci skip] 2020-11-17 02:13:37 -06:00
siliconsandGitHub 3df485ad94 Merge pull request #13680 from DeltaFire15/hallucination-runtime-fix
Fixes a hallucination runtime
2020-11-17 01:13:33 -07:00
CitadelStationBot da58667dac Automatic changelog generation for PR #13681 [ci skip] 2020-11-17 02:13:00 -06:00
siliconsandGitHub 891d4ec76e Merge pull request #13681 from DeltaFire15/supplypod-shrapnel
Fixes a bunch of supplypod related stuff
2020-11-17 01:12:56 -07:00
CitadelStationBot b35840031c Automatic changelog generation for PR #13676 [ci skip] 2020-11-17 02:12:31 -06:00
siliconsandGitHub 1c915c2e6f Merge pull request #13676 from DeltaFire15/borg-slab-fix
Very minor fix to clockie borg slab ui
2020-11-17 01:12:28 -07:00
CitadelStationBot d6866c5bc2 Automatic changelog generation for PR #13675 [ci skip] 2020-11-17 02:11:04 -06:00
siliconsandGitHub 6a7ab4de67 Merge pull request #13675 from DeltaFire15/sleeper-ui-fix
Fixes sleeper UI Interactiveness
2020-11-17 01:11:01 -07:00
CitadelStationBot 41575d2264 Automatic changelog generation for PR #13674 [ci skip] 2020-11-17 02:10:57 -06:00
siliconsandGitHub f11b636727 Merge pull request #13674 from DeltaFire15/vtec-fixing
The borg VTEC ability no longer persists after the upgrade is removed
2020-11-17 01:10:53 -07:00
CitadelStationBot 874687ea2d Automatic changelog generation for PR #13673 [ci skip] 2020-11-17 02:10:48 -06:00
siliconsandGitHub b9b67f62a3 Merge pull request #13673 from Arturlang/sacrifice_tweaks
Makes construct mind saving reference the mind, fixing some issues
2020-11-17 01:10:45 -07:00
CitadelStationBot ecc99f6daa Automatic changelog generation for PR #13671 [ci skip] 2020-11-17 02:10:30 -06:00
siliconsandGitHub 1942e16a82 Merge pull request #13671 from DeltaFire15/clock-rite-neutering-support
Just some more clock rite code-wise support
2020-11-17 01:10:26 -07:00
siliconsandGitHub 157b2b6e2a Merge pull request #13665 from Citadel-Station-13/tgs-dmapi-update
Automatic TGS DMAPI Update
2020-11-17 01:10:03 -07:00
CitadelStationBot e2fe97e86a Automatic changelog generation for PR #13644 [ci skip] 2020-11-17 02:09:51 -06:00
siliconsandGitHub a950bcb0fb Merge pull request #13644 from DeltaFire15/hybrid-limbs-wound-stuff
[READY] Hybrid bodyparts - wound surgery edition
2020-11-17 01:09:47 -07:00
The0bserver c5d74b4fcc Merge remote-tracking branch 'Upstream/master' 2020-11-16 20:55:21 -05:00
tgstation-server 03b2f1ac2e Update TGS DMAPI 2020-11-17 00:37:11 +00:00
DeltaFire fb128e64b1 Merge remote-tracking branch 'upstream/master' into borg-slab-fix 2020-11-16 04:31:31 +01:00
DeltaFire c8719e18d8 Merge remote-tracking branch 'upstream/master' into sleeper-ui-fix 2020-11-16 04:31:02 +01:00
DeltaFire 44a49a7261 Merge remote-tracking branch 'upstream/master' into vtec-fixing 2020-11-16 04:30:45 +01:00
DeltaFire fbad172861 Merge remote-tracking branch 'upstream/master' into clock-rite-neutering-support 2020-11-16 04:30:15 +01:00
DeltaFire 8f04d7f0d1 Merge remote-tracking branch 'upstream/master' into system-corruption 2020-11-16 04:29:59 +01:00
DeltaFire 185c8929b0 Merge remote-tracking branch 'upstream/master' into supplypod-shrapnel 2020-11-16 04:29:43 +01:00
DeltaFire c225c29b45 Merge remote-tracking branch 'upstream/master' into hallucination-runtime-fix 2020-11-16 04:29:27 +01:00
CitadelStationBot bf69245a58 Automatic changelog generation for PR #13670 [ci skip] 2020-11-15 18:12:40 -06:00
siliconsandGitHub 9d7226cb4d Merge pull request #13670 from shellspeed1/master
Makes floor bots buildable with all toolboxes.
2020-11-15 17:12:37 -07:00
CitadelStationBot d2f978d9f3 Automatic changelog generation for PR #13678 [ci skip] 2020-11-15 18:11:55 -06:00
siliconsandGitHub 2a076da3b5 Merge pull request #13678 from Arturlang/Should_not_sleep_not
Comments out spacemandmm should not sleeps
2020-11-15 17:11:52 -07:00
CitadelStationBot e22e02e5ff Automatic changelog generation for PR #13683 [ci skip] 2020-11-15 18:11:23 -06:00
siliconsandGitHub 15bb6c96ec Merge pull request #13683 from SandPoot/master
Attempts to turn gift static blacklist into a global list
2020-11-15 17:11:21 -07:00