shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,386 Commits 5 Branches 0 Tags
0643aa4fc005f2e60aa370cf5b73b1ffbb48582c
Commit Graph

10386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay
0643aa4fc0 Merge pull request #4399 from Citadel-Station-13/upstream-merge-33542 
[MIRROR] Fixes mecha drifting.
 2017-12-18 15:19:13 -06:00
LetterJay
5636d9dad3 Merge pull request #4397 from Citadel-Station-13/upstream-merge-33433 
[MIRROR] Adds two new Integrated Circuit components: hsv2hex converter and rgb2hex converter.
 2017-12-18 15:17:49 -06:00
CitadelStationBot
c12fdd08e2 Automatic changelog generation for PR #4377 [ci skip] 2017-12-17 21:26:10 -06:00
LetterJay
bd1c186111 Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181 
[MIRROR] All-In-One grinder results are now defined by type, not by huge lists
 2017-12-17 21:26:08 -06:00
CitadelStationBot
4aa7e2e30b Automatic changelog generation for PR #4389 [ci skip] 2017-12-17 21:25:44 -06:00
LetterJay
21a9b09bf5 Merge pull request #4389 from Michiyamenotehifunana/NEB-consolidation 
Consolidates NEB code into a modular package
 2017-12-17 21:25:42 -06:00
LetterJay
91a26e66cf Merge pull request #4396 from Citadel-Station-13/upstream-merge-33513 
[MIRROR] ahelp chat command is silent on success
 2017-12-17 21:24:24 -06:00
CitadelStationBot
39a4d4c24f Automatic changelog generation for PR #4394 [ci skip] 2017-12-17 21:24:14 -06:00
LetterJay
781f40926c Merge pull request #4394 from Citadel-Station-13/upstream-merge-33530 
[MIRROR] Fix shuttle autocalls when the round is already over
 2017-12-17 21:24:12 -06:00
LetterJay
cc3fddb0d7 Merge pull request #4393 from Citadel-Station-13/upstream-merge-33538 
[MIRROR] Further emphasises the importance of round ID in issue template
 2017-12-17 21:23:55 -06:00
LetterJay
78dcad12e4 Merge pull request #4391 from Citadel-Station-13/upstream-merge-33527 
[MIRROR] Adds some permission checks to admin/topic
 2017-12-17 21:23:42 -06:00
CitadelStationBot
77b792d69a Automatic changelog generation for PR #4390 [ci skip] 2017-12-17 20:37:41 -06:00
LetterJay
6aa1a86f88 Merge pull request #4390 from Citadel-Station-13/upstream-merge-33529 
[MIRROR] Removed drone light in favor of night vision
 2017-12-17 20:37:39 -06:00
LetterJay
f3390aee98 Merge branch 'master' into NEB-consolidation 2017-12-17 20:37:34 -06:00
LetterJay
52701ebfee Merge pull request #4388 from Citadel-Station-13/upstream-merge-33517 
[MIRROR] SSinput tweaks to address server side lag
 2017-12-17 20:37:17 -06:00
LetterJay
d0ddcbf66b Merge pull request #4387 from Citadel-Station-13/upstream-merge-33524 
[MIRROR] Fixes missing mining hammer back sprite
 2017-12-17 20:37:04 -06:00
LetterJay
1319ba6a21 Merge pull request #4386 from Citadel-Station-13/upstream-merge-33512 
[MIRROR] Fixes gateway ignoring exile implants in simple mobs
 2017-12-17 20:36:55 -06:00
CitadelStationBot
f235a4e391 Automatic changelog generation for PR #4384 [ci skip] 2017-12-17 20:36:19 -06:00
LetterJay
4fe21eb44d Merge pull request #4384 from EtheoBoxxman/Bhijnbutt 
Ash walker tendril no longer spawns chasm on death
 2017-12-17 20:36:17 -06:00
CitadelStationBot
2c9e7abb0f Automatic changelog generation for PR #4375 [ci skip] 2017-12-17 20:28:09 -06:00
LetterJay
3895eb9eac Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519 
[MIRROR] Finishes the forceMove port
 2017-12-17 20:28:07 -06:00
LetterJay
1c380e3ed4 Update verbs.dm 2017-12-17 17:50:05 -06:00
LetterJay
3c5632bad2 Update pill.dm 2017-12-17 17:38:51 -06:00
LetterJay
67e7f62416 Update shock_kit.dm 2017-12-17 17:38:17 -06:00
LetterJay
eb9260c8bf Update implantcase.dm 2017-12-17 17:38:09 -06:00
LetterJay
5c3b500ba9 Update camera.dm 2017-12-17 17:38:00 -06:00
LetterJay
8d6d561950 Update beebox.dm 2017-12-17 17:37:53 -06:00
CitadelStationBot
9a30c288f0 Automatic changelog generation for PR #4346 [ci skip] 2017-12-17 17:36:19 -06:00
LetterJay
aa09d859c7 Merge pull request #4346 from deathride58/oldpdarestoration 
Restores the PDA sprites by cecily and toriate (And modularizes it)
 2017-12-17 17:36:17 -06:00
LetterJay
220e1cd8cf Merge pull request #4400 from Citadel-Station-13/revert-4329-tgsync_1 
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
 2017-12-16 13:10:41 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
LetterJay
715960b324 Merge pull request #4329 from Citadel-Station-13/tgsync_1 
[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC
 2017-12-16 12:54:00 -06:00
CitadelStationBot
1936f6aabc Fixes mecha drifting. 2017-12-16 04:09:03 -06:00
AnturK
ce22210b47 Fixes mecha drifting. (#33542) 
* Fixes mecha drifting.
 2017-12-16 04:09:03 -06:00
deathride58
b1efb191bc fixes brain_damage_lines.json compile errors 2017-12-15 16:35:07 -08:00
CitadelStationBot
1265a67f03 Adds two new Integrated Circuit components: hsv2hex converter and rgb2hex converter. 2017-12-15 17:13:20 -06:00
KomradeSpectre
1cd746ba67 Adds two new Integrated Circuit components: hsv2hex converter and rgb2hex converter. (#33433) 
* Added two new components, HSV to Hex RGB and RGB to Hex RGB, along with icons.

* Added valid input ranges to the extended_desc of the new converter components.
 2017-12-15 17:13:20 -06:00
CitadelStationBot
e31d218ad4 ahelp chat command is silent on success 2017-12-15 17:00:58 -06:00
oranges
b1ca28ef3c Merge pull request #33513 from tgstation/Cyberboss-patch-2 
ahelp chat command is silent on success
 2017-12-15 17:00:58 -06:00
CitadelStationBot
f5b84e21a1 Fix shuttle autocalls when the round is already over 2017-12-15 14:53:30 -06:00
Jordan Brown
9adb77c5e3 Merge pull request #33530 from AutomaticFrenzy/patch/autocall 
Fix shuttle autocalls when the round is already over
 2017-12-15 14:53:30 -06:00
CitadelStationBot
a2dd4f0fdd Further emphasises the importance of round ID in issue template 2017-12-15 14:07:20 -06:00
Jordan Brown
533c716e56 Further emphasises the importance of round ID in issue template (#33538) 
* Further emphasises the importance of round ID in issue template

* Update statbus url. Add server note
 2017-12-15 14:07:20 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
CitadelStationBot
a4eb96b6ed Adds some permission checks to admin/topic 2017-12-15 03:27:46 -06:00
Kyle Spier-Swenson
2152bc7121 Adds some permission checks to admin/topic (#33527) 2017-12-15 03:27:46 -06:00
Trevor Serpas
f7a943575d Removed drone light in favor of night vision 2017-12-15 03:26:35 -06:00
Michiyamenotehifunana
e77c1a8a07 Consolidates NEB code into a modular package 2017-12-15 16:57:22 +08:00
oranges
05db439c1e SSinput tweaks to address server side lag 2017-12-14 23:11:52 -06:00
CitadelStationBot
9ef339e7ee Fixes missing mining hammer back sprite 2017-12-14 22:36:07 -06:00