Commit Graph

26370 Commits

Author SHA1 Message Date
Letter N 05684e7196 no config filter thing yet, but the code for it is "ready" 2020-07-08 16:36:58 +08:00
Letter N f757e54db9 muh immursion 2020-07-08 15:59:44 +08:00
Letter N 45a3c47608 removes fun 2020-07-08 15:10:49 +08:00
Sneakyrat6 fa8ea6c430 Merge remote-tracking branch 'upstream/master' into hoodieFix 2020-07-07 23:48:59 -05:00
silicons 6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons 22c3d9fe3e ok 2020-07-07 21:07:13 -07:00
silicons bd8cc4791f whew 2020-07-07 21:02:23 -07:00
silicons 5246408622 fix 2020-07-07 20:51:34 -07:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Sneakyrat6 3569e8da1e Fixes hair falling out of hoodies 2020-07-07 22:31:00 -05:00
Timothy Teakettle f0935a784d two missing traits woops 2020-07-07 23:24:25 +01:00
Timothy Teakettle e07909ebe2 does it in a far superior way 2020-07-07 23:12:36 +01:00
Trilbyspaceclone 062d514ac2 Update legion.dm 2020-07-07 14:30:09 -04:00
Trilbyspaceclone b2dd2a1053 Update necropolis_chests.dm 2020-07-07 14:28:40 -04:00
Lin 33f56fd168 Merge pull request #12694 from Ghommie/Ghommie-cit833
mowing down experimental cloner copypasta.
2020-07-07 13:23:25 -05:00
Trilbyspaceclone 023dcc0019 Update spellcard.dm 2020-07-07 14:22:41 -04:00
Trilbyspaceclone ddeb564c80 Legion fix 2020-07-07 14:21:16 -04:00
Trilbyspaceclone f479a8622e Update spell_book.dm 2020-07-07 14:11:46 -04:00
Trilbyspaceclone c21011c64c Update spellcard.dm 2020-07-07 14:09:31 -04:00
Trilbyspaceclone f7dbce0cd0 Update spellcard.dm 2020-07-07 13:55:02 -04:00
Trilbyspaceclone dae3110100 Update wand.dm 2020-07-07 13:52:41 -04:00
Trilbyspaceclone 8aceeb0c43 Update spell_book.dm 2020-07-07 13:50:42 -04:00
Trilbyspaceclone 49b0d38112 Apply suggestions from code review
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-07-07 13:47:56 -04:00
Cirno 37f4022bfc Changed slime core to slime nucleus 2020-07-07 13:35:30 -03:00
Artur 280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Cirno fe45971e43 Added a slime core in the place of brains for jelly people 2020-07-07 12:05:06 -03:00
silicons 6634e43be4 fix 2020-07-07 07:41:33 -07:00
silicons cee15792b7 ok 2020-07-07 07:25:10 -07:00
silicons 9910867345 Update SDQL_2.dm 2020-07-07 06:19:17 -07:00
timothyteakettle ab5795b3d3 Update pet_carrier.dm 2020-07-07 03:03:09 +01:00
Timothy Teakettle 23d00ea671 stops double applied damage and stuns 2020-07-07 01:44:28 +01:00
silicons 5b09b68c6d Merge pull request #12702 from DeltaFire15/actually-kill-once
[s] Fixes the 'Kill once' objective
2020-07-06 17:38:24 -07:00
silicons 0c0bf46f7f Merge pull request #12696 from Chiirno/emichemmastertweak
increased the amount of stuff the chem master can dispense from 10 to 20
2020-07-06 17:34:50 -07:00
silicons 4fa7a461ef Merge pull request #12684 from Owai-Seek/foodport-p1-7/1/20
Food ports, tweaks, and fixes.
2020-07-06 17:19:07 -07:00
Ghom c2746c723e Merge pull request #12698 from Owai-Seek/beebalmfix-7-4-20
Fixes Bee Balm
2020-07-07 00:22:33 +02:00
DeltaFire eeadc9a0e7 fixes the kill once objective
the target being afk / disconnecting is now only accepted at roundend, and doesn't lead to it being regarded as permanently completed midround.
2020-07-06 23:00:36 +02:00
Ghom e7d19f512e Merge pull request #12397 from Rohesie/cooldown
Ports TGMC timer cooldowns
2020-07-06 22:54:58 +02:00
Ghom bc5e7d1513 Merge pull request #12688 from Weblure/small-strides-fix
[READY] Fixes Small Strides Formula
2020-07-06 22:48:09 +02:00
Ghommie afb5b5237c linter & stuff. 2020-07-06 22:42:32 +02:00
Keate Senior 4ee72305d0 Post This Justiciar
sprites and object
2020-07-06 06:34:38 -04:00
Artur 8cbe248465 Updates paper to TG 2020-07-06 13:09:02 +03:00
Artur 3154e8c596 Updates components to TG and fixes can 2020-07-06 10:58:48 +03:00
Winter Flare 482785d922 Fixes Bee Balm 2020-07-05 19:14:03 -04:00
Artur 7ebc785437 fIXES UPLINK 2020-07-05 21:52:24 +03:00
Cirno 45d97b2251 increased the amount of stuff the chem master can dispense from 10 to 20 2020-07-05 11:17:37 -03:00
Cirno 2553ef6dd8 Am I finally free? 2020-07-05 00:46:56 -03:00
Ghommie 562b57095d mowing down the experimental cloner copypasta. 2020-07-05 03:04:53 +02:00
Winter Flare 767290d8e9 Trashbag Whitelist Update
Trashbag can now hold:
All Organs
Most Shoes

Trashbags cannot hold:
Jackbooks
Workboots
Clown Shoes
Nuke Disk
Wallets (Nuke Disk Nesting)
Brains
2020-07-04 21:03:31 -04:00
Lin 703d03453b Merge pull request #12651 from Citadel-Station-13/silicons-patch-9
lowers shield blocking stamcost/second 3.5 to 2.5
2020-07-04 14:16:06 -05:00
Lin 4d29aa9148 Merge pull request #12650 from Citadel-Station-13/silicons-patch-7
adds a keybind to toggle active blocking instead of only press-hold
2020-07-04 14:13:18 -05:00