Commit Graph

17981 Commits

Author SHA1 Message Date
deathride58
580119f038 makes it account for key_valid 2020-01-08 19:17:09 -05:00
deathride58
33df154689 Caches the status topic to prevent low-effort DDoSes 2020-01-08 18:47:45 -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
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
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
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
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
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
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
kevinz000
4599abde4a Merge pull request #10420 from MrJWhit/radiation-plasma-usage
Increase radiation plasma usage in radiation collector
2020-01-06 19:46:42 -08:00
kevinz000
f6b9396096 Merge pull request #10439 from LetterN/tachelon-logs
doppler logs
2020-01-06 19:45:28 -08:00
BlackMajor
5a97259ba9 Fix a couple of bugs, add wrapping paper and destination tagger 2020-01-07 15:33:16 +13:00
Lin
2ce3b7fbf5 Merge pull request #10455 from Ghommie/Ghommie-cit501
Porting some runtime fixes.
2020-01-07 01:00:25 +00:00
Lin
da43d336c3 Merge pull request #10047 from Ghommie/Ghommie-cit425
Turns dog/cat petting into an element datum.
2020-01-07 00:55:19 +00:00
Lin
718d4a080d Merge pull request #9878 from Ghommie/Ghommie-cit382
Unmodularize several machinery and structures
2020-01-07 00:31:24 +00:00
Lin
46420a693d Merge branch 'master' into Ghommie-cit425 2020-01-07 00:28:37 +00:00
Ghom
d07d436ba2 Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo
cargo tweaks, new shit, why do digitigrade sprites exist
2020-01-06 21:47:15 +01:00
Artur
d283532d97 Removes tresspass handcuff removal 2020-01-06 20:49:14 +01:00
Artur
41f96c0dc9 Whoopsie 2020-01-06 20:31:55 +01:00
Artur
4fc6aa10be Adds a cooldown for revival 2020-01-06 20:29:10 +01:00
Artur
8a193304ee Buffs torpor without coffin 2020-01-06 20:22:39 +01:00
Artur
b0cb6aab5c Final commit hopefully 2020-01-06 17:26:36 +01:00
Artur
00d0d8c415 Whoops indentation 2020-01-06 12:31:54 +01:00
Putnam
2859e6e5ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cold-blooded 2020-01-06 02:07:09 -08:00
Putnam
72dded26f2 cold-blooded trait 2020-01-06 02:06:19 -08:00
Putnam3145
3b6cf8c952 Merge pull request #10401 from r4d6/SM
Add three more Supermatter Engine variation for Box
2020-01-05 23:08:49 -08:00
r4d6
f6099f341b Allow Voice Analyzers to recognize languages 2020-01-05 23:55:31 -05:00
r4d6
6d3345d166 Add the Playback Device 2020-01-05 23:32:44 -05:00
Putnam
da830d3449 Added scores for my own dastardly reasons 2020-01-05 19:49:54 -08:00