Commit Graph

1855 Commits

Author SHA1 Message Date
silicons 57d85f7e86 okay 2020-12-27 05:20:29 -08:00
silicons 5266ae1437 okay 2020-12-26 22:28:41 -08:00
silicons 57065d995e fix 2020-12-26 22:20:04 -08:00
silicons 753c1389cc fix 2020-12-26 22:04:05 -08:00
silicons 46b58fa5ba file ops 2020-12-26 21:10:12 -08:00
silicons a6ae0fe5c2 ok 2020-12-26 20:56:48 -08:00
silicons bfb3d087c3 ok 2020-12-26 20:50:28 -08:00
silicons dafc6bf89f fix 2020-12-26 20:41:21 -08:00
silicons 3228435237 errors 2020-12-26 20:33:16 -08:00
silicons b7cd14b41e poggy? 2020-12-26 20:09:24 -08:00
silicons a5bcd0457e hoh boy 2020-12-26 12:48:10 -08:00
silicons 5c0b4f824f hoh boy 2020-12-26 12:42:03 -08:00
silicons 338869f6ad changes 2020-12-26 11:48:28 -08:00
silicons d474643deb changes 2020-12-26 11:41:25 -08:00
silicons 45af2360ad changes 2020-12-26 11:35:47 -08:00
silicons 5e66e4509f wew 2020-12-25 16:07:17 -08:00
silicons 999262665b map keys 2020-12-25 15:54:28 -08:00
silicons c05c57acf9 persistent module 2020-12-25 15:49:55 -08:00
DeltaFire d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
silicons 0e7a597a2b alright 2020-12-21 10:27:28 -07:00
silicons 7da6979b54 ok 2020-12-21 00:28:03 -07:00
silicons ce10278c5a changes 2020-12-20 19:25:49 -07:00
silicons db6f9349c5 Merge pull request #13785 from Putnam3145/fix-grab-bag
Makes grab bag ONLY make station antags; triples alien dynamic threat.
2020-12-20 15:42:04 -07:00
Putnam 4e6abdec74 i wish we both die 2020-12-19 20:51:58 -08:00
Putnam f9edd8e8ac Made the previous-round weight-adjust based on max instead of average. 2020-12-19 20:34:28 -08:00
Putnam c47761fa58 Added a DYNAMIC_THREAT_BASELINE config option.
why didn't i do this sooner
2020-12-19 19:30:16 -08:00
Putnam f209fec1ee oh, that's why extended is there 2020-12-18 22:19:40 -08:00
Putnam 5e8f76792e Readjusted weight; added min/max config options 2020-12-18 20:24:30 -08:00
Putnam e0d7699e27 Made vote only use runnable storytellers. 2020-12-15 18:48:59 -08:00
Lin c022956c75 Merge pull request #13725 from silicons/anti_collision_bindings
makes keybind system automatically generate anti-collision keybinds where necessary to avoid unintentional macro fires
2020-12-15 21:24:30 +00:00
silicons e87cc27803 modifications 2020-12-15 07:21:06 -07:00
silicons 5c830d4d44 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 02:34:57 -07:00
silicons a4688557d7 Cryo 2020-12-13 02:29:31 -07:00
Lin 0d95172bef Merge pull request #13749 from Citadel-Station-13/silicons-patch-7
fixes nonsensical verb
2020-12-12 20:00:41 +00:00
silicons 07d8e72125 fix 2020-12-12 11:19:45 -07:00
silicons 45a7c68da1 wow 2020-12-11 15:05:00 -07:00
silicons 8af8063e73 Update input.dm 2020-12-10 13:39:22 -07:00
Timothy Teakettle 132a3c9526 color non polychromic items 2020-12-08 19:29:34 +00:00
Timothy Teakettle ac9e383638 WOOPS ONE MORE DEBUG MESSAGE 2020-12-07 21:28:17 +00:00
timothyteakettle 61cc33d995 Merge remote-tracking branch 'upstream/master' into loadout-json 2020-12-06 17:26:04 +00:00
timothyteakettle 0f540884eb Merge branch 'master' into loadout-json 2020-12-06 17:24:24 +00:00
timothyteakettle 5566c00a69 fixes 2020-12-06 17:24:12 +00:00
timothyteakettle a478da678e bugfixes 2020-12-06 15:50:33 +00:00
timothyteakettle fa26f4c402 b 2020-12-06 00:02:14 +00:00
Timothy Teakettle afdbac31fa test 2020-12-05 22:35:27 +00:00
silicons 8d7f3aebc4 sigh 2020-12-02 09:20:23 -07:00
silicons 0f9734b1f7 Merge pull request #13698 from timothyteakettle/communication-hotkeys
ports rebindable communication hotkeys from tg
2020-11-28 09:12:40 -07:00
silicons a6d73e0344 fix 2020-11-27 04:25:22 -07:00
silicons 9f4e0ac4df woops 2020-11-26 23:38:39 -07:00
silicons 5e965d099f COME ON 2020-11-26 23:37:27 -07:00