Commit Graph
28090 Commits
Author SHA1 Message Date
CitadelStationBot d9783d2bba Automatic changelog generation for PR #10440 [ci skip] 2020-01-08 15:41:28 -06:00
kevinz000andGitHub 652cf6e60c Merge pull request #10440 from Putnam3145/weird-secret
Allows users to vote their least favorite game modes in secret/extended vote
2020-01-08 13:41:26 -08:00
CitadelStationBot ebf87a173b Automatic changelog generation for PR #10442 [ci skip] 2020-01-08 15:40:42 -06:00
kevinz000andGitHub 6a350d5d58 Merge pull request #10442 from Trilbyspaceclone/patch-264
Halfs the nutriments in sugar
2020-01-08 13:40:39 -08:00
kevinz000andGitHub 2944a902c6 Merge pull request #10447 from Arturlang/Bloodsucker_tweaks
[READY] Bloodsucker tweaks
2020-01-08 13:36:24 -08:00
CitadelStationBot 9ed90235ab Automatic changelog generation for PR #10472 [ci skip] 2020-01-08 15:34:45 -06:00
kevinz000andGitHub e6a061ee8f Merge pull request #10472 from keronshb/DermalFix
Dermal Button nanite icon fix
2020-01-08 13:34:42 -08:00
CitadelStationBot 3894d85c30 Automatic changelog generation for PR #10459 [ci skip] 2020-01-08 15:34:30 -06:00
kevinz000andGitHub 5360f85e21 Merge pull request #10459 from Putnam3145/cold-blooded
Adds cold-blooded neutral quirk
2020-01-08 13:34:27 -08:00
CitadelStationBot 146b8f898c Automatic changelog generation for PR #10457 [ci skip] 2020-01-08 15:33:56 -06:00
kevinz000andGitHub 5f03f5e3d8 Merge pull request #10457 from r4d6/Voice-Copy
Add a playback device and make the Voice Analyzer actually care about languages.
2020-01-08 13:33:54 -08:00
CitadelStationBot 4a5a89ffdc Automatic changelog generation for PR #10467 [ci skip] 2020-01-08 15:31:58 -06:00
kevinz000andGitHub dbd2cb6195 Merge pull request #10467 from Seris02/boxfix
stops lightspeed spessmen in boxes
2020-01-08 13:31:55 -08:00
CitadelStationBot 465145a0a3 Automatic changelog generation for PR #10285 [ci skip] 2020-01-08 15:31:33 -06:00
kevinz000andGitHub 68a0eddeaf Merge pull request #10285 from Ghommie/Ghommie-cit491
[s] Fixes singularity pulls duping rods out of engine floors.
2020-01-08 13:31:31 -08:00
CitadelStationBot 65d9f13abe Automatic changelog generation for PR #10452 [ci skip] 2020-01-08 15:30:39 -06:00
kevinz000andGitHub b68f81f4e6 Merge pull request #10452 from Ghommie/Ghommie-cit499
Fixes lattice's examine.
2020-01-08 13:30:37 -08:00
kevinz000andGitHub 1e6d05dc59 Merge pull request #10470 from deathride58/deletesminers
[s] adds a cooldown to area creation attempts
2020-01-08 13:29:36 -08:00
cc174d91ec Reviewer suggestion
Co-Authored-By: Lin <linzolle@gmail.com>
2020-01-08 22:02:50 +02:00
Artur e16f1d2f21 Makes regen coles not heal instead of affecting aheal 2020-01-08 21:01:37 +01:00
Artur 039248dac7 Kills legion core healing 2020-01-08 20:29:30 +01:00
CitadelStationBot e5220dbd29 Automatic changelog generation for PR #10474 [ci skip] 2020-01-08 06:48:15 -06:00
GhomandGitHub f263a3ea31 Merge pull request #10474 from Putnam3145/fix-traitor-again
[s] Fixes traitors
2020-01-08 13:48:12 +01:00
Putnam fdce8e2b69 dang 2020-01-08 03:55:23 -08:00
Putnam a97fa8f81a also made objectives deletable 2020-01-07 18:01:24 -08:00
Putnam 26064e0992 crap 2020-01-07 17:37:57 -08:00
Putnam3145andGitHub b09ef97ae3 Merge pull request #10305 from BlackMajor/Yeehaw
Various Mining borg changes. And some extras.
2020-01-07 16:50:21 -08:00
BlackMajor c4dd0a393a Revert "Test"
This reverts commit 5414f09b80.
2020-01-08 13:38:35 +13:00
BlackMajor 3424862746 Revert "Adds borg spawns to every map, and fixes a shit load of null vars on them."
This reverts commit cfb553b828.
2020-01-08 13:38:25 +13:00
BlackMajor 8aaa6db732 Revert "Test"
This reverts commit 8746e6091d.
2020-01-08 13:38:17 +13:00
BlackMajor 0520d3d9b9 Revert "Conflcits are pretty bothersome I tell ya hwat"
This reverts commit e6f11aa275.
2020-01-08 13:38:10 +13:00
BlackMajor e6f11aa275 Conflcits are pretty bothersome I tell ya hwat 2020-01-08 13:20:24 +13:00
BlackMajor 7ddc356a6f Revert "Test 2"
This reverts commit 6670de8e64.
2020-01-08 13:19:33 +13:00
BlackMajor 6670de8e64 Test 2 2020-01-08 13:19:07 +13:00
BlackMajor 8746e6091d Test 2020-01-08 13:17:49 +13:00
BlackMajor cfb553b828 Adds borg spawns to every map, and fixes a shit load of null vars on them. 2020-01-08 12:37:31 +13:00
BlackMajor 5414f09b80 Test 2020-01-08 12:29:45 +13:00
BlackMajor 05a644cc41 Revert "Merge branch 'master' into Yeehaw"
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
2020-01-08 12:26:45 +13:00
BlackMajor 972c03f79f Merge branch 'master' into Yeehaw 2020-01-08 12:25:50 +13:00
BlackMajor b41c9cd844 Sync with master 2020-01-08 12:25:22 +13:00
keronshb 1e5d6719ee Fixes Dermal Button Sprites
Should fix the missing sprite issue for the Dermal Button nanites
2020-01-07 15:52:29 -05:00
Artur cff6a094d7 Aaand buffs stakes 2020-01-07 21:21:12 +01:00
LinandGitHub c162e9bb5d Merge pull request #10453 from Ghommie/Ghommie-cit500
Fixing an edge case runtime with ore bags.
2020-01-07 19:37:49 +00:00
Artur 97a9ad4714 Nerfs cloak some more 2020-01-07 19:22:39 +01:00
Artur 81f1349cea Nerf Stamina and cloneloss 2020-01-07 18:41:17 +01:00
Artur 7141223f49 All ready now, forgot how stat worked 2020-01-07 18:39:13 +01:00
deathride58 6f2cf0b636 [s] adds a cooldown to area creation attempts 2020-01-07 10:04:09 -05:00
BlackMajor 8ebd698763 Give my lad Blade mining borg a rest sprite 2020-01-07 23:14:07 +13:00
Seris02 5fae814e42 did it thanks 2020-01-07 17:52:46 +08:00
Putnam 70a1a0a9c1 better way to do it tbh 2020-01-07 00:39:14 -08:00