Commit Graph

29893 Commits

Author SHA1 Message Date
Ghom ea9bdcd087 Update gangs.dm 2020-02-09 02:49:20 +01:00
Trilbyspaceclone 90a1b249f1 Update gangs.dm 2020-02-08 20:39:45 -05:00
CitadelStationBot 3a9ac36286 Automatic changelog generation for PR #10942 [ci skip] 2020-02-08 16:31:36 -06:00
Ghom f27ce86769 Merge pull request #10942 from Putnam3145/map-vote-options
Added a config for map voting types
2020-02-08 23:31:33 +01:00
Ghom 0bbf1efa67 Merge pull request #10762 from kevinz000/one_last_taser_attempt
One last attempt at balancing tasers (and some adv egun stuff)
2020-02-08 23:30:41 +01:00
CitadelStationBot 1f506e2f28 Automatic changelog generation for PR #10974 [ci skip] 2020-02-08 02:36:13 -06:00
kevinz000 682637ee67 Merge pull request #10974 from Putnam3145/antag-why-the-hell
Fixed antag quirk blacklisting
2020-02-08 01:36:11 -07:00
Putnam 611c850639 all you need to understand is everything you know is wrong 2020-02-08 00:31:46 -08:00
kevinz000 c6c1cc484c slight buff 2020-02-07 23:40:02 -07:00
kevinz000 826ed7d4f2 o k. 2020-02-07 23:39:09 -07:00
kevinz000 79a72fac24 fix 2020-02-07 23:32:36 -07:00
kevinz000 7c16830e91 ok 2020-02-07 23:31:38 -07:00
Putnam c45dab8ebd uhh? 2020-02-07 20:37:22 -08:00
CitadelStationBot 72a285bb4d Automatic changelog generation for PR #10960 [ci skip] 2020-02-07 22:12:22 -06:00
Ghom c6f9f7119e Merge pull request #10960 from kappa-sama/patch-11
lavaland plant disk techdisk actually works
2020-02-08 05:12:19 +01:00
CitadelStationBot c9852db022 Automatic changelog generation for PR #10966 [ci skip] 2020-02-07 22:06:25 -06:00
Ghom 278a9cf9ae Merge pull request #10966 from r4d6/mininge
Fix mining base having holes to space
2020-02-08 05:06:22 +01:00
r4d6 f4c148d44f Fix mining base having holes to space 2020-02-07 22:58:47 -05:00
Putnam 84a9f2f058 make the fallback majority judgement 2020-02-07 19:54:15 -08:00
kappa-sama 8c2019fcbf probably fixes plant disk techdisk 2020-02-07 17:58:36 -05:00
CitadelStationBot 853c66426b Automatic changelog generation for PR #10935 [ci skip] 2020-02-07 16:23:59 -06:00
Ghom 07535ff565 Merge pull request #10935 from KrabSpider/van-dyke
Returns the Van Dyke mustache to its former glory
2020-02-07 23:23:56 +01:00
CitadelStationBot 1200628e35 Automatic changelog generation for PR #10892 [ci skip] 2020-02-07 16:13:24 -06:00
Ghom 71f44a7085 Merge pull request #10892 from kevinz000/small_guncode_refactor
Small guncode refactor but it works
2020-02-07 23:13:21 +01:00
CitadelStationBot 6f3bec3ba3 Automatic changelog generation for PR #10774 [ci skip] 2020-02-07 15:44:22 -06:00
Ghom 9c14d03051 Merge pull request #10774 from Citadel-Station-13/kevinz000-patch-2
nuke explosion is 512 dev which is actually less laggy than heavy + light
2020-02-07 22:44:20 +01:00
CitadelStationBot ea096a79ee Automatic changelog generation for PR #10957 [ci skip] 2020-02-07 15:41:51 -06:00
Ghom 1dfba9f416 Merge pull request #10957 from Putnam3145/fix-occasional-dynamic-runtime
Fixes a spurious dynamic runtime if nobody votes
2020-02-07 22:41:48 +01:00
Lin 5717700146 Merge pull request #10925 from Ghommie/Ghommie-cit558
runtime is forever, errors are eternal.
2020-02-07 17:29:49 +00:00
Putnam b4faac50a9 yeah "null" is bad juju. why did i do that 2020-02-07 04:41:16 -08:00
Putnam 27efd54274 why was that else there. why 2020-02-07 04:38:39 -08:00
Putnam 7f0a369870 Also added options for custom votes 2020-02-07 04:29:53 -08:00
Ghom 0e778fc2be Merge pull request #10956 from Arturlang/bloodsucker_cloak_fix
[s]Fixes bloodsucker cloak
2020-02-07 13:29:21 +01:00
Artur 41eebc6e2b Fixes cloak 2020-02-07 13:42:56 +02:00
CitadelStationBot f87aac6060 Automatic changelog generation for PR #10951 [ci skip] 2020-02-07 03:34:58 -06:00
Ghom 7b23ca3827 Merge pull request #10951 from Citadel-Station-13/kevinz000-patch-10
fail2topic runtime fix
2020-02-07 10:34:55 +01:00
CitadelStationBot 4c645d4056 Automatic changelog generation for PR #10950 [ci skip] 2020-02-07 03:17:17 -06:00
Ghom 2ebf758347 Merge pull request #10950 from Citadel-Station-13/kevinz000-patch-9
beam rifle sanity update
2020-02-07 10:17:14 +01:00
kevinz000 e6f14a085d Update fail2topic.dm 2020-02-07 00:06:32 -07:00
kevinz000 ed2bfb66d8 Update fail2topic.dm 2020-02-07 00:05:21 -07:00
CitadelStationBot 34f43dccb4 Automatic changelog generation for PR #10924 [ci skip] 2020-02-07 00:56:35 -06:00
kevinz000 8107140aaf Merge pull request #10924 from Citadel-Station-13/Ghommie-patch-8
Fixing whitelisted/donor loadouts
2020-02-06 23:56:32 -07:00
CitadelStationBot e8236f504b Automatic changelog generation for PR #10921 [ci skip] 2020-02-07 00:56:16 -06:00
kevinz000 15a59dd729 Merge pull request #10921 from Ghommie/Ghommie-cit557
Lavaland's Herald speech fix.
2020-02-06 23:56:13 -07:00
CitadelStationBot d741fb0a1f Automatic changelog generation for PR #10787 [ci skip] 2020-02-07 00:53:57 -06:00
kevinz000 de2a3c5502 Merge pull request #10787 from Seris02/snatchgloves
thief's gloves
2020-02-06 23:53:54 -07:00
CitadelStationBot d70b290dce Automatic changelog generation for PR #10798 [ci skip] 2020-02-07 00:52:52 -06:00
kevinz000 3f5805a9e8 Merge pull request #10798 from necromanceranne/secmainsrejoice
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
2020-02-06 23:52:49 -07:00
CitadelStationBot 3b3be0a567 Automatic changelog generation for PR #10929 [ci skip] 2020-02-07 00:51:20 -06:00
kevinz000 4e2e411dd0 Merge pull request #10929 from Ghommie/Ghommie-cit559
Double-esword and hypereuplastic blade toys are now blunt.
2020-02-06 23:51:17 -07:00