shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,436 Commits 5 Branches 0 Tags
d04bbbdd677dbb18196718f5e140eca39fdd1b7a
Commit Graph
9436 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58andGitHub d04bbbdd67 Update step_triggers.dm 2017-11-24 17:59:18 -05:00
deathride58andGitHub 7b2a926235 Update bump_teleporter.dm 2017-11-24 17:58:29 -05:00
ShizCalevandCitadelStationBot 2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
CitadelStationBot 9f7b3a11c3 Automatic changelog generation for PR #4095 [ci skip] 2017-11-24 00:42:54 -06:00
deathride58andGitHub 470f4169df Merge pull request #4095 from Citadel-Station-13/upstream-merge-33018 
[MIRROR] Replaces "console screen" stock part with glass sheets
 2017-11-24 06:42:51 +00:00
deathride58andGitHub d5d89a57b4 Update stock_parts.dm 2017-11-23 23:50:25 -05:00
CitadelStationBot 876b3ebff0 Automatic changelog generation for PR #4084 [ci skip] 2017-11-23 22:41:57 -06:00
LetterJayandGitHub aade2d210a Merge pull request #4084 from deathride58/mapfixes11222017 
Fixes a couple of issues introduced in boxstation after recent sync, readds boxstation's secure cell in security
 2017-11-23 22:41:54 -06:00
deathride58andGitHub e60399e402 Merge pull request #4090 from Citadel-Station-13/upstream-merge-32997 
[MIRROR] Fixes strings runtime
 2017-11-24 02:30:47 +00:00
ACCountandCitadelStationBot 2147c60b7f Replaces "console screen" stock part with glass sheets 2017-11-23 18:53:47 -06:00
deathride58andGitHub 9a46efd304 Merge pull request #4094 from Citadel-Station-13/kevinz000-patch-1 
characters must now be 18+
 2017-11-24 00:47:12 +00:00
kevinz000andGitHub 399c2ebfcc Update _compile_options.dm 2017-11-23 16:37:49 -08:00
deathride58andGitHub 751b61a9ab Merge pull request #4065 from Poojawa/layering-memes 
Edited breast sprites
 2017-11-24 00:20:29 +00:00
deathride58andGitHub de27afbc61 Merge pull request #4093 from Citadel-Station-13/upstream-merge-33045 
[MIRROR] Fixes component runtimes
 2017-11-24 00:19:42 +00:00
deathride58andGitHub f83ce9cd11 Merge pull request #4073 from Citadel-Station-13/upstream-merge-32937 
[MIRROR] Simple wall turret buff
 2017-11-24 00:19:24 +00:00
deathride58andGitHub de9cfb2b7c Update brain_damage_lines.json 2017-11-23 19:14:21 -05:00
deathride58andGitHub 6d6afcd588 Merge pull request #4091 from Citadel-Station-13/upstream-merge-33041 
[MIRROR] Lowers the stress the dna console puts on the string tree
 2017-11-24 00:11:16 +00:00
deathride58andGitHub eb722bf59f Merge branch 'master' into upstream-merge-33045 2017-11-24 00:10:36 +00:00
deathride58andGitHub efe10a1ee7 Merge pull request #4089 from Citadel-Station-13/upstream-merge-32979 
[MIRROR] Adds some sanity checks to component creation
 2017-11-24 00:08:36 +00:00
deathride58andGitHub d912152d65 Merge pull request #4085 from Citadel-Station-13/upstream-merge-33010 
[MIRROR] Fixes deleted turfs
 2017-11-24 00:08:12 +00:00
Jordan BrownandCitadelStationBot b2bb942817 Fixes component runtimes 2017-11-23 13:12:38 -06:00
CitadelStationBot aaa83112e8 Lowers the stress the dna console puts on the string tree 2017-11-23 12:07:17 -06:00
Jordan BrownandCitadelStationBot 8943bf0184 Merge pull request #33041 from MrStonedOne/patch-452 
Lowers the stress the dna console puts on the string tree
 2017-11-23 12:07:17 -06:00
LeoandCitadelStationBot 67d495c053 Fixes strings runtime 2017-11-23 05:48:44 -06:00
CitadelStationBot 89b9ec51de Adds some sanity checks to component creation 2017-11-23 05:47:32 -06:00
LeoandCitadelStationBot 598f0dc580 Merge pull request #32979 from tgstation/Cyberboss-patch-4 
Adds some sanity checks to component creation
 2017-11-23 05:47:32 -06:00
deathride58 0ca050563f fixes merge conflicts 2017-11-22 23:43:03 -05:00
ShizCalevandCitadelStationBot 1b094a4374 Fixes deleted turfs 2017-11-22 22:01:05 -06:00
deathride58 c81ebbfc24 fixes boxstation issues, readds removed boxstation areas 2017-11-22 22:18:40 -05:00
deathride58andGitHub c76cacdf77 Merge pull request #4081 from Citadel-Station-13/upstream-merge-32914 
[MIRROR] [READY]NTnet refactor, assimilates exonet
 2017-11-23 01:40:54 +00:00
CitadelStationBot 3a79211614 Automatic changelog generation for PR #4080 [ci skip] 2017-11-22 19:15:06 -06:00
deathride58andGitHub abd432d289 Merge pull request #4080 from Citadel-Station-13/upstream-merge-32999 
[MIRROR] Specifies that MariaDB is required for sql in the project readme
 2017-11-23 01:15:04 +00:00
deathride58andGitHub 8c4f52c9b1 Update README.md 2017-11-22 20:14:50 -05:00
deathride58andGitHub d5a8e2f13b Update telecomms_designs.dm 2017-11-22 20:10:41 -05:00
deathride58andGitHub 435ac739fc Update machine_circuitboards.dm 2017-11-22 20:09:18 -05:00
deathride58andGitHub 5fb8856480 Update subsystems.dm 2017-11-22 20:07:57 -05:00
deathride58andGitHub cf01fa79db Merge pull request #4078 from Citadel-Station-13/upstream-merge-32801 
[MIRROR] Adds ip and cid to banning panel ban search
 2017-11-23 01:04:20 +00:00
CitadelStationBot ea577e2d9e Automatic changelog generation for PR #4075 [ci skip] 2017-11-22 19:03:41 -06:00
deathride58andGitHub ad3608caeb Merge pull request #4075 from Citadel-Station-13/upstream-merge-32699 
[MIRROR] Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale
 2017-11-23 01:03:38 +00:00
LetterJayandGitHub eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188 
[MIRROR] JSON feedback
 2017-11-22 18:42:34 -06:00
deathride58andGitHub c97e8805f6 Update hostile.dm 2017-11-22 17:53:36 -05:00
deathride58andGitHub eeaa90a897 Merge pull request #4079 from Citadel-Station-13/upstream-merge-32945 
[MIRROR] Fixes bad text2file call
 2017-11-22 22:41:28 +00:00
CitadelStationBot 87653021f6 Automatic changelog generation for PR #4077 [ci skip] 2017-11-22 16:40:57 -06:00
deathride58andGitHub 854a838c7d Merge pull request #4077 from Citadel-Station-13/upstream-merge-32943 
[MIRROR] Fixes aliums showing wrong sprite in softcrit
 2017-11-22 22:40:54 +00:00
orangesandCitadelStationBot c2c22d56c7 [READY]NTnet refactor, assimilates exonet 2017-11-22 15:52:54 -06:00
orangesandCitadelStationBot b9e37a74c7 Specifies that MariaDB is required for sql in the project readme 2017-11-22 15:40:28 -06:00
CitadelStationBot 23e3f7f877 Fixes bad text2file call 2017-11-22 15:39:16 -06:00
orangesandCitadelStationBot 2615ddd226 Merge pull request #32945 from tgstation/Cyberboss-patch-1 
Fixes bad text2file call
 2017-11-22 15:39:16 -06:00
CitadelStationBot 521f422f20 Adds ip and cid to banning panel ban search 2017-11-22 15:38:07 -06:00
JordieandCitadelStationBot 31b9828285 Adds ip and cid to banning panel ban search (#32801) 
For kevinz000 because he managed to lose a ban and couldn't find it with ckey or ackey somehow.

No indexes because ORDER BY indexing is too finicky and having something like 8 indexes just for this wouldn't be worth the slowdown.
 2017-11-22 15:38:07 -06:00