shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,541 Commits 5 Branches 0 Tags
8bd2a0fd032ba57310c194831a8b7785d4dddcb6
Commit Graph

12541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay
8bd2a0fd03 Update jellypeople.dm 2018-01-24 13:59:02 -06:00
XDTM
3aa246d39b [Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common 2018-01-24 13:47:40 -06:00
LetterJay
f4a817be01 Merge pull request #5049 from Citadel-Station-13/upstream-merge-34820 
[MIRROR] Fixes disposal initialization
 2018-01-23 10:00:33 -06:00
LetterJay
0c3354cd16 Merge pull request #5047 from Citadel-Station-13/upstream-merge-34774 
[MIRROR] Corrects addtime stack_trace typo
 2018-01-23 10:00:19 -06:00
CitadelStationBot
3d01b6ed5a Automatic changelog generation for PR #5037 [ci skip] 2018-01-23 10:00:09 -06:00
LetterJay
f26f1b5370 Merge pull request #5037 from Citadel-Station-13/upstream-merge-34522 
[MIRROR] Adds ~70 more suicides
 2018-01-23 10:00:04 -06:00
CitadelStationBot
b81afc1b17 Automatic changelog generation for PR #5035 [ci skip] 2018-01-23 09:59:44 -06:00
LetterJay
4c2c14784b Merge pull request #5035 from Citadel-Station-13/upstream-merge-34560 
[MIRROR] Adds the Bluespace Drop Pod upgrade to the cargo express console
 2018-01-23 09:59:41 -06:00
LetterJay
e672ff43ea Update timer.dm 2018-01-23 08:49:47 -06:00
LetterJay
ab002f56be Merge pull request #5046 from Citadel-Station-13/upstream-merge-34778 
[MIRROR] Fixes invalid pollCandidatesForMob args
 2018-01-23 08:24:31 -06:00
LetterJay
30ae21043f Merge pull request #5045 from Citadel-Station-13/upstream-merge-34476 
[MIRROR] Simple rotation component.
 2018-01-23 08:24:19 -06:00
LetterJay
72812999f1 Merge pull request #5044 from Citadel-Station-13/upstream-merge-34465 
[MIRROR] Expands round end pop recording as json export
 2018-01-23 08:24:08 -06:00
LetterJay
65733375bd Merge pull request #5043 from Citadel-Station-13/upstream-merge-34804 
[MIRROR] Expands our worst rule
 2018-01-23 08:23:49 -06:00
LetterJay
9544de1693 Merge pull request #5042 from Citadel-Station-13/upstream-merge-34733 
[MIRROR] Fixes bot drop & bot assembly issues
 2018-01-23 08:23:29 -06:00
CitadelStationBot
82a726031c Automatic changelog generation for PR #5041 [ci skip] 2018-01-23 08:23:12 -06:00
LetterJay
b603bb9fbb Merge pull request #5041 from Citadel-Station-13/upstream-merge-34767 
[MIRROR] Fix replace_random_law runtime
 2018-01-23 08:23:10 -06:00
LetterJay
acb333d403 Merge pull request #5040 from Citadel-Station-13/upstream-merge-34765 
[MIRROR] Fixes APC controller runtime
 2018-01-23 08:22:56 -06:00
LetterJay
a7270f43cd Merge pull request #5039 from Citadel-Station-13/upstream-merge-34750 
[MIRROR] current sanity check in ark of the justicar
 2018-01-23 08:21:10 -06:00
LetterJay
6066ab31dd Update igniter.dm 2018-01-23 08:20:27 -06:00
LetterJay
888a132eff Update expressconsole.dm 2018-01-23 08:19:16 -06:00
CitadelStationBot
212688a279 Automatic changelog generation for PR #5034 [ci skip] 2018-01-23 08:18:40 -06:00
LetterJay
9f24bac5e6 Merge pull request #5034 from Citadel-Station-13/upstream-merge-34142 
[MIRROR] Refactors infrared beams to update faster
 2018-01-23 08:18:38 -06:00
LetterJay
ccf1f97478 Merge pull request #5033 from Citadel-Station-13/upstream-merge-34810 
[MIRROR] [s]Fixes being able to lower w_class of transfer valves
 2018-01-23 08:18:21 -06:00
LetterJay
221e51d105 Merge pull request #5032 from Citadel-Station-13/upstream-merge-34803 
[MIRROR] Adds the Wjohn as /icons folder codeowner
 2018-01-23 08:17:59 -06:00
LetterJay
abf98762c8 Update CODEOWNERS 2018-01-23 08:17:53 -06:00
LetterJay
54d4cdd8ab Merge pull request #5031 from Citadel-Station-13/upstream-merge-34725 
[MIRROR] Fixes portal storm event
 2018-01-23 08:17:33 -06:00
LetterJay
fa0823c27d Merge pull request #5030 from Citadel-Station-13/upstream-merge-34727 
[MIRROR] Stops simple_animals from attacking mobs in godmode
 2018-01-23 08:17:21 -06:00
CitadelStationBot
c8851c7074 Automatic changelog generation for PR #5029 [ci skip] 2018-01-23 08:17:11 -06:00
LetterJay
75af3bc248 Merge pull request #5029 from Citadel-Station-13/upstream-merge-34742 
[MIRROR] Removes pulling claw instant messageless stun
 2018-01-23 08:17:09 -06:00
CitadelStationBot
9a8f9bdc35 Automatic changelog generation for PR #5028 [ci skip] 2018-01-23 08:16:54 -06:00
LetterJay
8ad54530a1 Merge pull request #5028 from Citadel-Station-13/upstream-merge-34759 
[MIRROR] Consolidated t-ray scanner code
 2018-01-23 08:16:52 -06:00
LetterJay
0050a761cf Merge pull request #5027 from Citadel-Station-13/upstream-merge-34756 
[MIRROR] Adds transform helpers to atom vv
 2018-01-23 08:16:39 -06:00
CitadelStationBot
d72ee0f542 Fixes disposal initialization 2018-01-23 06:46:45 -06:00
AnturK
f70c357111 Fixes disposal initialization (#34820) 2018-01-23 06:46:45 -06:00
Leo
3a11b4f068 Corrects addtime stack_trace typo 2018-01-23 06:43:20 -06:00
CitadelStationBot
462472be03 Fixes invalid pollCandidatesForMob args 2018-01-23 06:42:08 -06:00
Leo
326228c43c Merge pull request #34778 from ShizCalev/pollCandidatesForMob 
Fixes invalid pollCandidatesForMob args
 2018-01-23 06:42:08 -06:00
CitadelStationBot
f5a60d5980 Simple rotation component. 2018-01-23 02:09:16 -06:00
AnturK
eb7974df7d Simple rotation component. (#34476) 
I'm going to port other rotations to it when i don't feel lazy.
Closes #34064
 2018-01-23 02:09:16 -06:00
CitadelStationBot
24c1812768 Expands round end pop recording as json export 2018-01-23 01:57:53 -06:00
Jordie
54466db36a Expands round end pop recording as json export (#34465) 
* expands round end pop recording as json export

* 511 compatibility and fix

* readds feedback for ned
 2018-01-23 01:57:53 -06:00
CitadelStationBot
be30750d1b Expands our worst rule 2018-01-23 01:52:27 -06:00
oranges
bf3e314092 Merge pull request #34804 from tgstation/KorPhaeron-patch-1 
Expands our worst rule
 2018-01-23 01:52:27 -06:00
CitadelStationBot
a3738e0f00 Fixes bot drop & bot assembly issues 2018-01-23 01:44:09 -06:00
oranges
1caf34f0df Merge pull request #34733 from ShizCalev/box-fixes 
Fixes bot drop & bot assembly issues
 2018-01-23 01:44:09 -06:00
CitadelStationBot
28f5c5bee4 Fix replace_random_law runtime 2018-01-23 01:43:00 -06:00
oranges
58855df5dd Merge pull request #34767 from AutomaticFrenzy/patch/replace-random-law 
Fix replace_random_law runtime
 2018-01-23 01:43:00 -06:00
CitadelStationBot
decb5098d6 Fixes APC controller runtime 2018-01-23 01:42:43 -06:00
oranges
4dac26d2da Merge pull request #34765 from ShizCalev/apc-controller-runtime 
Fixes APC controller runtime
 2018-01-23 01:42:43 -06:00
CitadelStationBot
aa305f97c0 current sanity check in ark of the justicar 2018-01-23 01:42:36 -06:00