Commit Graph

18273 Commits

Author SHA1 Message Date
kappa-sama 38015d0d02 moves this 2020-01-08 16:45:52 -05:00
kappa-sama 341e076d40 refill 2 2020-01-08 16:43:47 -05:00
kappa-sama 18b78e7671 refill 2020-01-08 16:43:33 -05:00
kappa-sama ebf8d048fd perhaps? 2020-01-08 16:42:16 -05:00
kappa-sama c88f58bb67 hm 2020-01-08 16:41:44 -05:00
kevinz000 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
kevinz000 6a350d5d58 Merge pull request #10442 from Trilbyspaceclone/patch-264
Halfs the nutriments in sugar
2020-01-08 13:40:39 -08:00
kappa-sama 35353996bd lazy copypaste 2020-01-08 16:36:53 -05:00
kevinz000 2944a902c6 Merge pull request #10447 from Arturlang/Bloodsucker_tweaks
[READY] Bloodsucker tweaks
2020-01-08 13:36:24 -08:00
kevinz000 5360f85e21 Merge pull request #10459 from Putnam3145/cold-blooded
Adds cold-blooded neutral quirk
2020-01-08 13:34:27 -08:00
kevinz000 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
kevinz000 dbd2cb6195 Merge pull request #10467 from Seris02/boxfix
stops lightspeed spessmen in boxes
2020-01-08 13:31:55 -08:00
kevinz000 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
kevinz000 b68f81f4e6 Merge pull request #10452 from Ghommie/Ghommie-cit499
Fixes lattice's examine.
2020-01-08 13:30:37 -08:00
kevinz000 1e6d05dc59 Merge pull request #10470 from deathride58/deletesminers
[s] adds a cooldown to area creation attempts
2020-01-08 13:29:36 -08:00
Arturlang 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
kappa-sama 933916a386 e 2020-01-08 09:46:58 -05:00
kappa-sama b3e916cc68 e 2020-01-08 09:44:16 -05:00
Unknown 4773a3e374 Fuggin Cowboy Clothes 2020-01-08 07:15:42 -07:00
Ghom 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
Seris02 83eff39063 nope 2020-01-08 17:20:58 +08:00
Putnam 12a04da2d2 Added second flavor text, not copied on save. 2020-01-08 00:57:42 -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
deathride58 89fcde9927 im like 3 iq dont bulli 2020-01-07 20:24:08 -05:00
deathride58 f0af57d7d6 wrong question mark place aaa 2020-01-07 20:22:06 -05:00
deathride58 633294c590 adds a basic sanity check to server_hop 2020-01-07 20:03:44 -05:00
Putnam cd35e516ac back by popular demand: maso/nympho 2020-01-07 17:01:14 -08:00
Putnam3145 b09ef97ae3 Merge pull request #10305 from BlackMajor/Yeehaw
Various Mining borg changes. And some extras.
2020-01-07 16:50:21 -08: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
Artur cff6a094d7 Aaand buffs stakes 2020-01-07 21:21:12 +01:00
Lin 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
r4d6 7c757900f2 Fix the category 2020-01-07 13:27:44 -05: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
r4d6 f6fef84984 Make the RCD effect not right-clickable. 2020-01-07 11:23:25 -05:00
r4d6 a91f31d9e6 Fix a typo 2020-01-07 11:21:00 -05:00
deathride58 6f2cf0b636 [s] adds a cooldown to area creation attempts 2020-01-07 10:04:09 -05:00
deathride58 cde9946e25 is this why wrench refuses to work 2020-01-07 09:00:30 -05:00
deathride58 686601334e suggested changes 2020-01-07 08:52:13 -05:00
kevinz000 0114f9e223 whitelist 2020-01-07 04:54:32 -08:00
kevinz000 fa7dcad49a compile 2020-01-07 04:54:11 -08:00
kevinz000 ab2292dfd5 Fail2Topic 2020-01-07 04:48:39 -08:00
Putnam 19887691f3 added deadchat toggle to dojo mobs too 2020-01-07 04:39:04 -08:00