shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,959 Commits 5 Branches 0 Tags
82eeec99bbd61b19236477fd6958450038711ade
Commit Graph

19282 Commits

Author SHA1 Message Date
kevinz000
88fa342c26 Merge pull request #10976 from Ghommie/Ghommie-cit565 
fixing another issue with the hear component signal.
 2020-02-10 04:09:19 -07:00
Ghom
0d37700836 Merge pull request #10926 from keronshb/PirateBombProof 
Buffs the Pirate Ship to be bomb resistant
 2020-02-10 08:40:10 +01:00
Ghom
bd5f2bd64d Update reinf_walls.dm 2020-02-10 07:41:36 +01:00
keronshb
023d49a207 30 removal 
Here it is
 2020-02-09 23:44:34 -05:00
Ghom
96a240bc11 Merge pull request #10984 from Trilbyspaceclone/patch-277 
Makes heads of staff no longer come to work as a gang leader
 2020-02-10 03:51:49 +01:00
keronshb
1492586f76 Fixes round 3? 4? 
Should fix the last round of requests?
 2020-02-09 18:18:55 -05:00
Ghom
33688dbe93 Merge pull request #10981 from IHOPMommyLich/AdrenalsChange 
Nerfing Stimulants
 2020-02-09 23:56:52 +01:00
keronshb
60a3b134a3 Should fix the rest of the requested changes 
Title
 2020-02-09 17:30:22 -05:00
Ghom
c7614958bc Merge pull request #10937 from Arturlang/debug_outfit_updates 
Updates the debug outfit
 2020-02-09 22:49:22 +01:00
Ghom
c2baad44d8 Merge pull request #10277 from kevinz000/god_wish_your_plushies_holy_shit 
ENDS THE PLUSHIE DRAMA
 2020-02-09 21:47:30 +01:00
Ghom
0f2f5ab639 Merge pull request #10936 from Citadel-Station-13/kevinz000-patch-7 
Cyborging someone will now be able to force-remove gang lead status, much like how it can force-deantag headrevs and bloodsuckers
 2020-02-09 21:38:50 +01:00
keronshb
9609eb64e0 Fixes some files and pathings for this 
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
 2020-02-09 15:18:15 -05:00
Ghom
101640170b Merge pull request #10954 from Citadel-Station-13/kevinz000-patch-9 
repulse sanity
 2020-02-09 21:09:00 +01:00
Ghom
d991fa1252 Merge pull request #10972 from Trilbyspaceclone/so-then-I-started-nerfing 
Removes bone armor and dagger from crafting menu
 2020-02-09 21:08:16 +01:00
Arturlang
29207b22fb Merge branch 'master' into debug_outfit_updates 2020-02-09 22:05:26 +02: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
506f1199ad I have a bad habit to edit people's (especially trilby) PRs out of the wild. Sorry 2020-02-09 02:56:17 +01: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
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
IHOPMommyLich
860c8136df Lowers the movespeed provided by Stimulants, weakening Stimpacks and Adrenals. 2020-02-08 17:01:12 -05:00
Ghommie
eaa6bc2db5 fixing another issue with the hear comsig proc. 2020-02-08 19:37:18 +01:00
Putnam
611c850639 all you need to understand is everything you know is wrong 2020-02-08 00:31:46 -08:00
TrilbySpaceClone
30c78c5be2 Let their be lists 2020-02-08 02:37:37 -05: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
kevinz000
0337a6402b Update wizard.dm 2020-02-07 03:16:52 -07: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
4f2acb6298 Update gun.dm 2020-02-07 00:08:19 -07: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