shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,343 Commits 5 Branches 0 Tags
b715c088f60fa3d0d4089e3cc26411292fc582e4
Commit Graph
1461 Commits
Author SHA1 Message Date
Commandersand b715c088f6 add athletic shorts to loadout 2019-11-29 01:27:15 -06:00
Commandersand 57af7ba8af add plaid skirt,multipen,fountainpen to loadout 2019-11-29 01:24:24 -06:00
kevinz000andGitHub bcfa9c6c4d Merge pull request #9956 from Linzolle/duke-beret 
Donator item fix
 2019-11-28 23:12:35 -07:00
kevinz000andGitHub 7495ce602a Merge pull request #9693 from Ghommie/Ghommie-cit310 
Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing.
 2019-11-28 23:03:07 -07:00
Ghommie a5298dac7e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310 2019-11-27 21:44:56 +01:00
Ghommie d43d996c38 ouch 2019-11-27 06:19:17 +01:00
Ghommie c67f138d23 patching some combat mode edge cases and issues. 2019-11-27 06:10:08 +01:00
Linzolle cc5d54fe24 fix 2019-11-26 20:36:45 -06:00
kevinz000andGitHub 6b53845f06 Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks 
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
 2019-11-26 16:01:48 -07:00
BlackMajorandGitHub c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375 
Ports "examine-code refactor"
 2019-11-25 11:31:03 +13:00
BlackMajorandGitHub 47b5dbeaaa Merge pull request #9625 from Ghommie/Ghommie-cit277 
Unmodularize digi/muzzled clothing sprites.
 2019-11-25 11:30:31 +13:00
Fermi 99e9c606c0 I dunno what I did but it's fixed... somehow. 2019-11-24 04:03:51 +00:00
Fermi 614a462176 Revert "Revert "Merge remote-tracking branch 'upstream/master'"" 
This reverts commit 1509d9d183.
 2019-11-24 03:33:02 +00:00
FermiandFermi ba4fa1ef67 Revert "PLASE" 
This reverts commit 8af225e6e3.
 2019-11-24 03:06:08 +00:00
FermiandFermi aeb8606ce0 Revert "Revert "PLASE"" 
This reverts commit 00601a0c87.
 2019-11-24 03:04:52 +00:00
FermiandFermi 25fe5ec14b Revert "Revert "Alright"" 
This reverts commit 505e15a3e1.
 2019-11-24 03:04:37 +00:00
FermiandFermi 1df097b8ed Revert "Revert "hark"" 
This reverts commit f4b54f15d2.
 2019-11-24 03:04:31 +00:00
FermiandFermi f03b90f2e2 Revert "Revert "I can't spell"" 
This reverts commit 3d713b6c96.
 2019-11-24 03:04:30 +00:00
FermiandFermi 994c01c8ec Revert "Revert "Trust your insincts"" 
This reverts commit 82c3e3cd9d.
 2019-11-24 03:04:23 +00:00
FermiandFermi 3155e3ffb3 Revert "Revert "Removes the random love"" 
This reverts commit ce7e9ac452.
 2019-11-24 03:04:20 +00:00
FermiandFermi 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
FermiandFermi c8b206a4cf Revert "pls" 
This reverts commit 8c97511871.
 2019-11-24 03:04:04 +00:00
FermiandFermi 4c1c257035 Revert "Revert "pls"" 
This reverts commit b23f2a4460.
 2019-11-24 03:02:21 +00:00
FermiandFermi 9eaed4ea8e Revert "pls2" 
This reverts commit 0eb635b908.
 2019-11-24 03:02:04 +00:00
FermiandFermi 0eb635b908 pls2 
ugh
 2019-11-24 02:52:17 +00:00
FermiandFermi b23f2a4460 Revert "pls" 
This reverts commit 8c97511871.
 2019-11-24 02:49:20 +00:00
FermiandFermi 8c97511871 pls 
ugh
 2019-11-24 02:47:52 +00:00
FermiandFermi 135608551f Merge remote-tracking branch 'upstream/master' 2019-11-24 02:45:28 +00:00
FermiandFermi ce7e9ac452 Revert "Removes the random love" 
This reverts commit b056d91ea5.
 2019-11-24 02:45:06 +00:00
FermiandFermi 82c3e3cd9d Revert "Trust your insincts" 
This reverts commit 7a605b4ba6.
 2019-11-24 02:44:52 +00:00
FermiandFermi 3d713b6c96 Revert "I can't spell" 
This reverts commit 0fed6d49e4.
 2019-11-24 02:44:28 +00:00
FermiandFermi f4b54f15d2 Revert "hark" 
This reverts commit 89bcb00ef1.
 2019-11-24 02:44:19 +00:00
FermiandFermi 505e15a3e1 Revert "Alright" 
This reverts commit b756f37ff6.
 2019-11-24 02:44:10 +00:00
FermiandFermi 00601a0c87 Revert "PLASE" 
This reverts commit 8af225e6e3.
 2019-11-24 02:44:00 +00:00
FermiandFermi 8af225e6e3 PLASE 2019-11-24 02:41:21 +00:00
FermiandFermi b756f37ff6 Alright 2019-11-23 01:05:42 +00:00
FermiandFermi 89bcb00ef1 hark 2019-11-23 00:54:40 +00:00
FermiandFermi 0fed6d49e4 I can't spell 2019-11-23 00:32:33 +00:00
FermiandFermi 7a605b4ba6 Trust your insincts 2019-11-23 00:16:34 +00:00
FermiandFermi b404e18b15 Merge branch 'master' into FERMICHEMCurTweaks 2019-11-23 00:10:33 +00:00
FermiandFermi b056d91ea5 Removes the random love 2019-11-22 23:48:21 +00:00
Ghommie 7d3599b2f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277 2019-11-22 18:53:58 +01:00
Ghommie 66a97cb224 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310 2019-11-22 05:17:42 +01: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
kevinz000andGitHub 8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353 
Dreamchecker compatibility changes, part 2.
 2019-11-20 21:49:58 -07:00
kevinz000andGitHub 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 21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Ghommie dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
kevinz000andGitHub 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