Commit Graph

29949 Commits

Author SHA1 Message Date
Ghommie d4c74c19de Something about cryopods. 2020-02-10 04:26:50 +01:00
CitadelStationBot feadfae8f6 Automatic changelog generation for PR #10984 [ci skip] 2020-02-09 20:51:52 -06: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
CitadelStationBot caf229b354 Automatic changelog generation for PR #10981 [ci skip] 2020-02-09 16:56:55 -06:00
Ghom 33688dbe93 Merge pull request #10981 from IHOPMommyLich/AdrenalsChange
Nerfing Stimulants
2020-02-09 23:56:52 +01:00
CitadelStationBot 4bc5ea60b5 Automatic changelog generation for PR #10937 [ci skip] 2020-02-09 15:49:24 -06:00
Ghom c7614958bc Merge pull request #10937 from Arturlang/debug_outfit_updates
Updates the debug outfit
2020-02-09 22:49:22 +01:00
CitadelStationBot 4e4346b8d4 Automatic changelog generation for PR #10277 [ci skip] 2020-02-09 14:47:34 -06: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
CitadelStationBot 9ee5a84ad6 Automatic changelog generation for PR #10936 [ci skip] 2020-02-09 14:38:53 -06: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
Ghom 101640170b Merge pull request #10954 from Citadel-Station-13/kevinz000-patch-9
repulse sanity
2020-02-09 21:09:00 +01:00
CitadelStationBot 09501340ec Automatic changelog generation for PR #10972 [ci skip] 2020-02-09 14:08:18 -06: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
CitadelStationBot a840b16c87 Automatic changelog generation for PR #10930 [ci skip] 2020-02-08 22:12:40 -06: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
CitadelStationBot a3f1ef19c7 Automatic changelog generation for PR #10918 [ci skip] 2020-02-08 22:01:28 -06:00
kevinz000 1f959012c5 Merge pull request #10918 from r4d6/dwarf-config
Add dwarves as a round-start race
2020-02-08 21:01:26 -07: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
kevinz000 b8337a0523 Merge pull request #10959 from Arturlang/TGUI_Next_Autobuild
TGUI Next autobuilding
2020-02-08 18:47:20 -07:00
Trilbyspaceclone 90a1b249f1 Update gangs.dm 2020-02-08 20:39:45 -05:00
Ghom 865a17e8e4 Fallback for linter. 2020-02-09 02:39:21 +01:00
Arturlang 25848bf37e Merge pull request #4 from Ghommie/Ghommie-helpies
updating dependencies and tgstation PRs #48122, #48241, #48673
2020-02-09 03:29:28 +02:00
Ghommie 187d9fdb43 updating dependencies and #48122, #48241, #48673 2020-02-09 01:57:12 +01:00
Arturlang 4cce3785a5 Merge pull request #3 from Ghommie/Ghommie-helpies
More help
2020-02-09 02:06:16 +02:00
Ghommie 6152ac9235 tgstation PR #48090 2020-02-09 00:56:31 +01:00
Ghommie 9a2107bf1a This one too. 2020-02-09 00:48:14 +01:00
Arturlang 56bbf52f1e Merge pull request #2 from Ghommie/Ghommie-helpies
Adding execute file permissions to build_tgui.sh
2020-02-09 01:19:52 +02:00
Ghommie c665ed7e36 Cecilia need helpies in maint, nya 2020-02-09 00:05:17 +01:00
Ghommie 94e3b17faf Merge branch 'TGUI_Next_Autobuild' of https://github.com/Arturlang/Citadel-Station-13 into Ghommie-helpies 2020-02-09 00:03:39 +01: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
IHOPMommyLich 860c8136df Lowers the movespeed provided by Stimulants, weakening Stimpacks and Adrenals. 2020-02-08 17:01:12 -05:00
Artur 3fe246ad45 Redo 2020-02-08 13:47:25 +01:00
Artur 65d1552208 Lets see if this works 2020-02-08 13:46:58 +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
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
CitadelStationBot 72a285bb4d Automatic changelog generation for PR #10960 [ci skip] 2020-02-07 22:12:22 -06:00