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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Ghom
|
7b23ca3827
|
Merge pull request #10951 from Citadel-Station-13/kevinz000-patch-10
fail2topic runtime fix
|
2020-02-07 10:34:55 +01: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 |
|
kevinz000
|
15a59dd729
|
Merge pull request #10921 from Ghommie/Ghommie-cit557
Lavaland's Herald speech fix.
|
2020-02-06 23:56:13 -07:00 |
|
kevinz000
|
de2a3c5502
|
Merge pull request #10787 from Seris02/snatchgloves
thief's gloves
|
2020-02-06 23:53:54 -07: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 |
|
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 |
|
kevinz000
|
ae199cee28
|
Update beam_rifle.dm
|
2020-02-06 23:49:36 -07:00 |
|
kevinz000
|
353c13631a
|
Update beam_rifle.dm
|
2020-02-06 23:34:33 -07:00 |
|
Ghom
|
cee2410091
|
Merge pull request #10922 from Citadel-Station-13/kevinz000-patch-5
renames the lawyer cartridge to something more accurate to its function
|
2020-02-07 05:53:09 +01:00 |
|
Putnam
|
0ebd2a814f
|
fixed spurious divide-by-zero
|
2020-02-06 16:11:14 -08:00 |
|
Putnam
|
edcdb531cc
|
kwargs
|
2020-02-06 15:57:42 -08:00 |
|
Putnam
|
e6d353dd01
|
that's not how switch works...
|
2020-02-06 15:56:58 -08:00 |
|
Putnam
|
d05c2426a8
|
Added a config for map voting types.
|
2020-02-06 15:47:04 -08:00 |
|
kevinz000
|
62b0e62952
|
Merge pull request #10623 from Putnam3145/antag-overhaul
Better antag objectives: for real this time
|
2020-02-06 16:25:22 -07:00 |
|
Ghom
|
ce6b37da1e
|
Merge pull request #10920 from Arturlang/debbuging
Adds vscode debbuging
|
2020-02-06 20:33:21 +01:00 |
|
Ghom
|
cd14f13d0d
|
Merge pull request #10917 from Arturlang/Hyposprays_QOL
Removes the hypospray verb for toggling spray/inject mode and makes it into an Alt click proc.
|
2020-02-06 20:31:46 +01:00 |
|
Arturlang
|
0353f1602d
|
Fixes ore boxes
|
2020-02-06 20:10:02 +01:00 |
|
kevinz000
|
7898dd089e
|
Merge pull request #10888 from Ghommie/Ghommie-cit554
Ports "Cleans up plante gene mutability."
|
2020-02-06 00:49:09 -07:00 |
|
kevinz000
|
fe2007d687
|
Merge pull request #10870 from Citadel-Station-13/Ghommie-patch-5
Fixed wheelchair-goers appearing as shoeless
|
2020-02-06 00:43:45 -07:00 |
|
kevinz000
|
75d3a8b35d
|
Merge pull request #10868 from Citadel-Station-13/Ghommie-patch-4
Holofans visual tweak.
|
2020-02-06 00:42:39 -07:00 |
|
kevinz000
|
542cae89d4
|
Merge pull request #10906 from Hatterhat/tg-48717-48726
husking is stupid - 5u rezadone/100u synthflesh heals husking, husking takes more burn
|
2020-02-06 00:42:05 -07:00 |
|
kevinz000
|
18910a23a2
|
Merge pull request #10881 from Ghommie/Ghommie-cit552
Refactoring mob holders into an element.
|
2020-02-06 00:41:28 -07:00 |
|
kevinz000
|
73aa761c69
|
Merge pull request #10700 from Ghommie/Ghommie-cit526
Anomalous honking crystal pet peeve & co.
|
2020-02-06 00:38:31 -07:00 |
|
kevinz000
|
1288a463cf
|
Merge pull request #10772 from Ghommie/Ghommie-cit537
Removing unused vore files and commented out code.
|
2020-02-06 00:37:52 -07:00 |
|
kevinz000
|
ead2be5116
|
Merge pull request #10919 from Ghommie/Ghommie-cit556
Fixing accidental nerfs to the magpistol.
|
2020-02-06 00:36:59 -07:00 |
|
kevinz000
|
3c5a3cb4d4
|
Merge pull request #10883 from ancientpower/ghost-newscasters
Allows ghosts to read newscasters and books
|
2020-02-05 23:46:04 -07:00 |
|
kevinz000
|
e0dd12ecbd
|
Merge pull request #10902 from Citadel-Station-13/Ghommie-patch-1
Fixes some mounted defibrillator issue.
|
2020-02-05 23:45:45 -07:00 |
|