shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,354 Commits 5 Branches 0 Tags
8a32b89f17cb019a2e6b48d6cc7a28301e71bfbf
Commit Graph

27354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghommie 8a32b89f17 Wait a minute... 2019-12-30 01:05:21 +01:00
Ghommie 55cb844bc2 chestbursters deleting brains fix. 2019-12-30 01:00:36 +01:00
CitadelStationBot c50c1ee4df Automatic changelog generation for PR #10282 [ci skip] 2019-12-24 15:07:44 -06:00
kevinz000 c022325159 Merge pull request #10282 from Putnam3145/fix-config 
Updating dynamic config, some balancing
 2019-12-24 13:07:40 -08:00
Putnam ca1f7839bb Updating dynamic config, some balancing 2019-12-24 10:10:24 -08:00
CitadelStationBot b48f18fbc6 Automatic changelog generation for PR #9751 [ci skip] 2019-12-24 09:57:13 -06:00
Ghom c38611afcd Merge pull request #9751 from Seris02/rising_bass 
RISING BASS, THE NEW MARTIAL ARTS
 2019-12-24 16:57:10 +01:00
Seris02 a106fde6cc a few fixes here and there and updating it 2019-12-24 23:38:27 +08:00
Seris02 85c5a5dfa1 Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass 2019-12-24 22:29:46 +08:00
Seris02 9e6f0762b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass 2019-12-24 22:27:41 +08:00
CitadelStationBot 6150dc5a15 Automatic changelog generation for PR #10269 [ci skip] 2019-12-23 18:56:10 -06:00
Lin a0b90158c4 Merge pull request #10269 from Ghommie/Ghommie-cit488 
Fix goose meat.
 2019-12-24 00:56:07 +00:00
CitadelStationBot 3f42677254 Automatic changelog generation for PR #10245 [ci skip] 2019-12-23 11:58:28 -06:00
Ghom 9a022f21eb Merge pull request #10245 from r4d6/substationV2 
Make Box's Engine be randomised between SM, Tesla and Singulo V2 [TEST-MERGE]
 2019-12-23 18:58:26 +01:00
r4d6 0a3e370a93 Move the config up to avoid conflict 2019-12-23 12:45:40 -05:00
r4d6 01a8fe1cd6 Add config options 2019-12-23 12:41:52 -05:00
r4d6 b909f54ba5 Revert "Revert "Add the option to restrict the Engine that spawn"" 
This reverts commit d851beea16.
 2019-12-23 10:25:37 -05:00
r4d6 d851beea16 Revert "Add the option to restrict the Engine that spawn" 
This reverts commit e3e1f91635.
 2019-12-23 10:23:55 -05:00
r4d6 e3e1f91635 Add the option to restrict the Engine that spawn 2019-12-23 10:06:35 -05:00
CitadelStationBot 069274ee33 Automatic changelog generation for PR #10274 [ci skip] 2019-12-23 06:41:13 -06:00
Ghom 37a6abd889 Merge pull request #10274 from kappa-sama/kappa-sama-patch-1 
no more 40% time dilation from broodmother
 2019-12-23 13:41:10 +01:00
CitadelStationBot 71a667ead0 Automatic changelog generation for PR #10218 [ci skip] 2019-12-23 02:45:25 -06:00
kevinz000 85ceda474e Merge pull request #10218 from GrayRachnid/ADDS-MINERS 
Adds gas miners to all maps.
 2019-12-23 00:45:22 -08:00
kevinz000 1b9b54b33d Merge pull request #10267 from Ghommie/Ghommie-cit486 
Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.
 2019-12-23 00:44:42 -08:00
Lin 9bdbb55b57 Merge pull request #10139 from Citadel-Station-13/donator 
Donator Item - Ready For Review
 2019-12-23 05:29:06 +00:00
deathride58 2eaffd57c3 Update custom_items.dm 2019-12-22 23:16:40 -05:00
CitadelStationBot e39f9732e0 Automatic changelog generation for PR #10246 [ci skip] 2019-12-22 20:25:29 -06:00
Ghom db2a108b4a Merge pull request #10246 from Citadel-Station-13/kevinz000-patch-129 
Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag
 2019-12-23 03:25:27 +01:00
CitadelStationBot dfc4656a6e Automatic changelog generation for PR #10210 [ci skip] 2019-12-22 20:13:33 -06:00
Ghom 3635525c56 Merge pull request #10210 from Citadel-Station-13/kevinz000-patch-127 
Cargo shuttle now silently leaves behind slaughter demons + revenants
 2019-12-23 03:13:31 +01:00
CitadelStationBot 7c0c4cc7cd Automatic changelog generation for PR #10093 [ci skip] 2019-12-22 19:31:53 -06:00
Ghom f3936f2c81 Merge pull request #10093 from Trilbyspaceclone/donut 
[Ready] Hey why dont I port that one donut pr? Ye just the one food related pr... Just the one... Oh no
 2019-12-23 02:31:50 +01:00
r4d6 f4b3fd7369 Also give Tesla's emitters R-floors 2019-12-22 17:09:39 -05:00
kevinz000 fcfdf5e253 Merge pull request #10240 from Ghommie/Ghommie-cit481 
Converts the main timsorts file from relative pathing to absolute pathing.
 2019-12-22 14:04:53 -08:00
r4d6 3524bc24ea Fix areas and tiles getting ripped off 2019-12-22 17:04:08 -05:00
CitadelStationBot 6eb62bb582 Automatic changelog generation for PR #10254 [ci skip] 2019-12-22 16:03:04 -06:00
kevinz000 6157cb0042 Merge pull request #10254 from r4d6/patch-1 
Fix the nose boop
 2019-12-22 14:03:02 -08:00
LetterJay 632e2cd8a1 Update custom_items.dm 2019-12-22 14:37:58 -06:00
LetterJay 98f9c9bf73 Update modular_citadel/code/modules/client/loadout/__donator.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-22 14:37:10 -06:00
LetterJay 28e909ad74 Update modular_citadel/code/modules/client/loadout/__donator.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-22 14:37:05 -06:00
LetterJay 1d933dd0f3 Update modular_citadel/code/modules/client/loadout/__donator.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-22 14:37:00 -06:00
LetterJay 4def28ddf9 Update __donator.dm 2019-12-22 14:16:40 -06:00
kappa-sama 994cd753d5 no more 40% time dilation 2019-12-22 14:39:36 -05:00
r4d6 b53c3869ca Connect the fuel pipe to somewhere 2019-12-22 08:19:23 -05:00
Ghommie 757af250cf Fix goose meat. 2019-12-22 12:21:11 +01:00
Ghommie 8bc277d38d Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf. 2019-12-22 11:40:25 +01:00
TrilbySpaceClone 784ea3f5e1 readds sprites 2019-12-22 03:06:04 -05:00
kevinz000 f39d12527d Update supply.dm 2019-12-21 23:50:59 -08:00
TrilbySpaceClone c7dbdd73df Merge branch 'master' into donut 2019-12-22 02:36:57 -05:00
r4d6 aa0507dc03 Forgot a button on the Tesla 2019-12-21 23:46:12 -05:00