Ghom
|
101640170b
|
Merge pull request #10954 from Citadel-Station-13/kevinz000-patch-9
repulse sanity
|
2020-02-09 21:09:00 +01:00 |
|
kevinz000
|
3264596bac
|
Merge pull request #10930 from r4d6/meteor-alt-2
Put the meteor timer to 3-5 minutes
|
2020-02-08 21:12:38 -07:00 |
|
r4d6
|
49f2993c59
|
Correct timer
|
2020-02-08 23:09:51 -05:00 |
|
Ghom
|
2a0ba12896
|
Merge pull request #10952 from Citadel-Station-13/kevinz000-patch-11
gun qdel fix
|
2020-02-09 02:53:38 +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
|
7c16830e91
|
ok
|
2020-02-07 23:31:38 -07: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 |
|
Lin
|
5717700146
|
Merge pull request #10925 from Ghommie/Ghommie-cit558
runtime is forever, errors are eternal.
|
2020-02-07 17:29:49 +00: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 |
|
kevinz000
|
0337a6402b
|
Update wizard.dm
|
2020-02-07 03:16:52 -07: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
|
4f2acb6298
|
Update gun.dm
|
2020-02-07 00:08:19 -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
|
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 |
|
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
|
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 |
|
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
|
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
|
cda01e10f6
|
Merge pull request #10885 from Ghommie/Ghommie-cit553
Removing a couple troublesome NSFW useless and unused preferences.
|
2020-02-05 23:45:30 -07:00 |
|
kevinz000
|
50cabc3c64
|
Merge pull request #10889 from Ghommie/Ghommie-cit555
runtime drifting
|
2020-02-05 23:44:52 -07:00 |
|
kevinz000
|
d0cd33a5ea
|
Merge pull request #10899 from Trilbyspaceclone/vender-hate
Almost all venders now can be restocked
|
2020-02-05 23:44:30 -07:00 |
|
kevinz000
|
27d3fcf5fd
|
Merge pull request #10900 from Putnam3145/port-atmos-fix
Ports atmos priority reaction mix from TG
|
2020-02-05 23:44:08 -07:00 |
|
kevinz000
|
5059c0fa8c
|
Merge pull request #10905 from Hatterhat/engishit
consoleless interfaces default, standard RCD ammo added to industrial engi
|
2020-02-05 23:43:54 -07:00 |
|
Ghom
|
181944bb36
|
Update admin_ranks.dm
|
2020-02-06 03:07:42 +01:00 |
|
r4d6
|
10490e1c15
|
3 minutes it is
|
2020-02-05 21:03:34 -05:00 |
|
r4d6
|
8430ee3684
|
Timer 2-5 minutes
|
2020-02-05 20:58:26 -05:00 |
|
Hatterhat
|
f100b6c5e4
|
multitools in basic tools, dumb headers
|
2020-02-05 19:47:20 -06:00 |
|
Ghommie
|
639ec8066d
|
Another typecheck
|
2020-02-06 02:19:14 +01:00 |
|
Ghommie
|
60b6d96f45
|
typecheck.
|
2020-02-06 02:17:51 +01:00 |
|
Ghommie
|
233ed5873f
|
race conditions and turfs beings special.
|
2020-02-06 01:13:28 +01:00 |
|
Ghommie
|
ab06c23a2b
|
runtime is forever, errors are eternal.
|
2020-02-05 23:48:17 +01:00 |
|
Arturlang
|
23834ce3f5
|
Parent call
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-05 22:54:01 +02:00 |
|
Ghommie
|
01d8086ebd
|
Lavaland's Herald speech fix.
|
2020-02-05 21:12:15 +01:00 |
|
Artur
|
5602289013
|
Parent call
Failed to get in the previous commit for some reason.
|
2020-02-05 20:25:04 +01:00 |
|
Artur
|
9951f291fd
|
Reviewer suggestions
|
2020-02-05 20:14:35 +01:00 |
|
Ghom
|
6d78d01612
|
Merge pull request #10903 from Hatterhat/tg-47770
fuck organ decay - tgstation#47770
|
2020-02-05 19:26:40 +01:00 |
|