shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,194 Commits 5 Branches 0 Tags
614a462176f83de33db456cbce4251d45ea89627
Commit Graph

1719 Commits

Author SHA1 Message Date
Fermi
614a462176 Revert "Revert "Merge remote-tracking branch 'upstream/master'"" 
This reverts commit 1509d9d183.
 2019-11-24 03:33:02 +00:00
Fermi
ba4fa1ef67 Revert "PLASE" 
This reverts commit 8af225e6e3.
 2019-11-24 03:06:08 +00:00
Fermi
aeb8606ce0 Revert "Revert "PLASE"" 
This reverts commit 00601a0c87.
 2019-11-24 03:04:52 +00:00
Fermi
25fe5ec14b Revert "Revert "Alright"" 
This reverts commit 505e15a3e1.
 2019-11-24 03:04:37 +00:00
Fermi
1df097b8ed Revert "Revert "hark"" 
This reverts commit f4b54f15d2.
 2019-11-24 03:04:31 +00:00
Fermi
f03b90f2e2 Revert "Revert "I can't spell"" 
This reverts commit 3d713b6c96.
 2019-11-24 03:04:30 +00:00
Fermi
6729a62200 Revert "Revert "Well"" 
This reverts commit df5814c30e.
 2019-11-24 03:04:25 +00:00
Fermi
994c01c8ec Revert "Revert "Trust your insincts"" 
This reverts commit 82c3e3cd9d.
 2019-11-24 03:04:23 +00:00
Fermi
3155e3ffb3 Revert "Revert "Removes the random love"" 
This reverts commit ce7e9ac452.
 2019-11-24 03:04:20 +00:00
Fermi
1509d9d183 Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit 135608551f, reversing
changes made to ce7e9ac452.
 2019-11-24 03:04:13 +00:00
Fermi
c8b206a4cf Revert "pls" 
This reverts commit 8c97511871.
 2019-11-24 03:04:04 +00:00
Fermi
4c1c257035 Revert "Revert "pls"" 
This reverts commit b23f2a4460.
 2019-11-24 03:02:21 +00:00
Fermi
9eaed4ea8e Revert "pls2" 
This reverts commit 0eb635b908.
 2019-11-24 03:02:04 +00:00
Fermi
0eb635b908 pls2 
ugh
 2019-11-24 02:52:17 +00:00
Fermi
b23f2a4460 Revert "pls" 
This reverts commit 8c97511871.
 2019-11-24 02:49:20 +00:00
Fermi
8c97511871 pls 
ugh
 2019-11-24 02:47:52 +00:00
Fermi
135608551f Merge remote-tracking branch 'upstream/master' 2019-11-24 02:45:28 +00:00
Fermi
ce7e9ac452 Revert "Removes the random love" 
This reverts commit b056d91ea5.
 2019-11-24 02:45:06 +00:00
Fermi
82c3e3cd9d Revert "Trust your insincts" 
This reverts commit 7a605b4ba6.
 2019-11-24 02:44:52 +00:00
Fermi
df5814c30e Revert "Well" 
This reverts commit e44c8c0a4a.
 2019-11-24 02:44:36 +00:00
Fermi
3d713b6c96 Revert "I can't spell" 
This reverts commit 0fed6d49e4.
 2019-11-24 02:44:28 +00:00
Fermi
f4b54f15d2 Revert "hark" 
This reverts commit 89bcb00ef1.
 2019-11-24 02:44:19 +00:00
Fermi
505e15a3e1 Revert "Alright" 
This reverts commit b756f37ff6.
 2019-11-24 02:44:10 +00:00
Fermi
00601a0c87 Revert "PLASE" 
This reverts commit 8af225e6e3.
 2019-11-24 02:44:00 +00:00
Fermi
8af225e6e3 PLASE 2019-11-24 02:41:21 +00:00
Lin
e954cec58c Merge pull request #9898 from Ghommie/Ghommie-cit387 
Dreamchecker compatibility changes, part 3.
 2019-11-23 05:52:44 +00:00
Lin
028fa518e4 Merge pull request #9879 from Ghommie/Ghommie-cit383 
Unmodularize closets.
 2019-11-23 05:39:33 +00:00
Fermi
b756f37ff6 Alright 2019-11-23 01:05:42 +00:00
Fermi
89bcb00ef1 hark 2019-11-23 00:54:40 +00:00
Fermi
0fed6d49e4 I can't spell 2019-11-23 00:32:33 +00:00
Fermi
e44c8c0a4a Well 
I guess
 2019-11-23 00:18:45 +00:00
Fermi
7a605b4ba6 Trust your insincts 2019-11-23 00:16:34 +00:00
Fermi
b404e18b15 Merge branch 'master' into FERMICHEMCurTweaks 2019-11-23 00:10:33 +00:00
Fermi
b056d91ea5 Removes the random love 2019-11-22 23:48:21 +00:00
Ghommie
911a33bfd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit387 2019-11-21 06:36:59 +01:00
Ghommie
dccb3c2e22 part 3 2019-11-21 06:36:22 +01:00
kevinz000
8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353 
Dreamchecker compatibility changes, part 2.
 2019-11-20 21:49:58 -07:00
kevinz000
3efb104b4e Merge pull request #9876 from Ghommie/Ghommie-cit380 
Unmodularize tools and apc icons.
 2019-11-20 21:47:33 -07:00
Ghommie
10373c7c96 Unmodularize closets. 2019-11-20 06:41:59 +01:00
kevinz000
9e5f697838 Merge pull request #9842 from NopemanMcHalt/dab-op-plus 
Fixes D.A.B. loadout name
 2019-11-19 21:31:47 -07:00
Ghommie
411310b0c6 Unmodularize tools and apc icons. 2019-11-20 05:18:15 +01:00
kevinz000
40a01dedfe Merge pull request #9806 from BlackMajor/Yote 
Borg changes. Compresses Service/Janitor/Scrubpuppy borgs together. Removes borgi. Adds vore sleepers to service and engi dogborgs. Demodularizes some dogborg stuff too.
 2019-11-19 01:54:47 -07:00
Lin
c188c20f37 Merge pull request #9802 from Ghommie/Ghommie-cit349 
Unmodularize bikehorns and holy weapons.
 2019-11-19 03:24:38 +00:00
Anonymous
1bb8ff1c0c Fixes loadout name, adds DAB outfit crate to cargo 
For "recruitment" on-station.
 2019-11-17 15:08:30 +03:00
Ghommie
c20bc123ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336 2019-11-15 01:10:39 +01:00
Ghommie
5bb6247a6d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit349 2019-11-15 00:57:38 +01:00
kevinz000
02e8a73265 Merge pull request #9737 from Ghommie/Ghommie-cit326 
Ports techweb backend refactor & co.
 2019-11-14 16:45:09 -07:00
kevinz000
40523802f3 Merge pull request #9804 from Ghommie/Ghommie-cit351 
Unmodularize keybindings.
 2019-11-14 16:36:55 -07:00
kevinz000
d6f540faf7 Merge pull request #9796 from Ghommie/Ghommie-cit347 
Unmodularize airlocks.
 2019-11-14 16:24:56 -07:00
kevinz000
bd650e53da Merge pull request #9795 from Ghommie/Ghommie-cit346 
Unmodularize areas.
 2019-11-14 16:24:36 -07:00