Commit Graph

17813 Commits

Author SHA1 Message Date
Putnam 778747927c Con vey ance 2019-12-23 09:57:56 -08:00
r4d6 0a3e370a93 Move the config up to avoid conflict 2019-12-23 12:45:40 -05:00
r4d6 01a8fe1cd6 Add config options 2019-12-23 12:41:52 -05:00
r4d6 b909f54ba5 Revert "Revert "Add the option to restrict the Engine that spawn""
This reverts commit d851beea16.
2019-12-23 10:25:37 -05:00
r4d6 d851beea16 Revert "Add the option to restrict the Engine that spawn"
This reverts commit e3e1f91635.
2019-12-23 10:23:55 -05:00
r4d6 e3e1f91635 Add the option to restrict the Engine that spawn 2019-12-23 10:06:35 -05:00
Ghom 37a6abd889 Merge pull request #10274 from kappa-sama/kappa-sama-patch-1
no more 40% time dilation from broodmother
2019-12-23 13:41:10 +01:00
kevinz000 1b9b54b33d Merge pull request #10267 from Ghommie/Ghommie-cit486
Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.
2019-12-23 00:44:42 -08:00
Putnam 13a8efe616 no assassination at all (!!) on calm 2019-12-23 00:43:25 -08:00
Putnam 0392145900 linter u right 2019-12-22 22:42:56 -08:00
Putnam 309e1db1e2 more logging 2019-12-22 20:19:35 -08:00
Putnam 19c5bde3d0 WHOOP FUCK 2019-12-22 20:19:01 -08:00
Ghommie 187b9bb13a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit483 2019-12-23 05:10:38 +01:00
Seris02 382c5d057a updates ratvar coat 2019-12-23 12:02:05 +08:00
Putnam dec97a26d5 renamed the storytellers and added secret to voting 2019-12-22 18:44:09 -08:00
Putnam 817787100f haha WHOOPS 2019-12-22 18:30:02 -08:00
Ghom db2a108b4a Merge pull request #10246 from Citadel-Station-13/kevinz000-patch-129
Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag
2019-12-23 03:25:27 +01:00
Ghom 3635525c56 Merge pull request #10210 from Citadel-Station-13/kevinz000-patch-127
Cargo shuttle now silently leaves behind slaughter demons + revenants
2019-12-23 03:13:31 +01:00
Ghom f3936f2c81 Merge pull request #10093 from Trilbyspaceclone/donut
[Ready] Hey why dont I port that one donut pr? Ye just the one food related pr... Just the one... Oh no
2019-12-23 02:31:50 +01:00
Putnam f1b1910833 clarity 2019-12-22 14:58:11 -08:00
kevinz000 fcfdf5e253 Merge pull request #10240 from Ghommie/Ghommie-cit481
Converts the main timsorts file from relative pathing to absolute pathing.
2019-12-22 14:04:53 -08:00
kevinz000 6157cb0042 Merge pull request #10254 from r4d6/patch-1
Fix the nose boop
2019-12-22 14:03:02 -08:00
Putnam f4296bb02d fixed the logging 2019-12-22 13:56:05 -08:00
Putnam b257857fd3 nagging people is annoying 2019-12-22 13:17:58 -08:00
Putnam 801c789419 made toggle more indicative 2019-12-22 13:14:49 -08:00
Putnam 9e1f3b18b8 god i'm removing this extension completely 2019-12-22 13:14:42 -08:00
kappa-sama 994cd753d5 no more 40% time dilation 2019-12-22 14:39:36 -05:00
Putnam 3ebfe67613 fixed overrefunds (again) 2019-12-22 10:28:57 -08:00
Putnam 86059aeb10 better logging for why candidates aren't working 2019-12-22 09:59:57 -08:00
Ghommie 0b96e469dd Oh shit. 2019-12-22 13:07:37 +01:00
Ghommie 9034980871 randomized recipes fallback fix. 2019-12-22 12:58:11 +01:00
Ghommie 757af250cf Fix goose meat. 2019-12-22 12:21:11 +01:00
Ghommie 4fbd9fdca0 Effectively removes the long unrequired roboticist encryption key. 2019-12-22 12:02:15 +01:00
Ghommie 8bc277d38d Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf. 2019-12-22 11:40:25 +01:00
kevinz000 f39d12527d Update supply.dm 2019-12-21 23:50:59 -08:00
shellspeed1 1875ea3f58 new wings and fluff 2019-12-21 23:47:41 -08:00
TrilbySpaceClone c7dbdd73df Merge branch 'master' into donut 2019-12-22 02:36:57 -05:00
Putnam 1c2fe646a4 better stats 2019-12-21 20:52:03 -08:00
Seris02 d6727bce64 woops 2019-12-22 12:26:42 +08:00
Seris02 18481ec253 more coat stuff yes yes 2019-12-22 12:19:58 +08:00
Putnam 33d182d49a made it nag you a bit, added logging 2019-12-21 19:53:48 -08:00
Trilbyspaceclone f5a55aaecf Nerfs fun 2019-12-21 21:09:22 -05:00
Putnam 9dce30a3a5 fixes 2019-12-21 16:24:41 -08:00
Lin 37a0f0d7e6 Merge pull request #10241 from Ghommie/Ghommie-cit482
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly
2019-12-21 22:44:09 +00:00
kevinz000 86074ae6b1 lowered to 10 after i struggled to open tickets panel 2019-12-21 14:33:02 -08:00
Ghom 31ba9fe4a8 Revert "Makes HE pipes realistically radiate away heat" 2019-12-21 22:43:26 +01:00
Putnam ecc34b1de1 make vote last longer, too 2019-12-21 13:24:13 -08:00
Putnam d42ed1ca49 Added extended, deobfuscated, made "how many to vote" bigger 2019-12-21 12:52:35 -08:00
r4d6 84d99c8fe8 Fix indentation 2019-12-21 15:00:53 -05:00
r4d6 383e09651f Suggestions 2019-12-21 14:55:37 -05:00