shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,520 Commits 5 Branches 0 Tags
2fcdb24fe3f5820a41afcf2afbb60dc20bce0efc
Commit Graph
26520 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fermi 79a64d9c63 Makes synthtissue a lil easier. 2019-11-25 03:36:39 +00:00
CitadelStationBot e4dce88761 Automatic changelog generation for PR #9922 [ci skip] 2019-11-24 17:31:17 -06:00
BlackMajorandGitHub 786d40032d Merge pull request #9922 from GrayRachnid/braintraumasport 
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
 2019-11-25 12:31:15 +13:00
GrayRachnid 0b60d5e6ef derp 2019-11-24 17:48:09 -05:00
CitadelStationBot 453bb6ca32 Automatic changelog generation for PR #9867 [ci skip] 2019-11-24 16:31:05 -06:00
BlackMajorandGitHub c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375 
Ports "examine-code refactor"
 2019-11-25 11:31:03 +13:00
CitadelStationBot 315082fc91 Automatic changelog generation for PR #9902 [ci skip] 2019-11-24 16:30:45 -06:00
BlackMajorandGitHub 6f98efb18e Merge pull request #9902 from Useroth/new-tg-plants 
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
 2019-11-25 11:30:43 +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
CitadelStationBot 18e7e85e87 Automatic changelog generation for PR #9907 [ci skip] 2019-11-24 14:01:39 -06:00
LinandGitHub 7481661182 Merge pull request #9907 from Putnam3145/midround-Vr-fix 
[DYNAMIC] Prevents VR mobs from being midround antags.
 2019-11-24 20:01:36 +00:00
Useroth 6a59cc1c99 Added missing jupitercup mycelium icon. Added a mutation path for galaxythistle. 2019-11-24 10:14:16 +01: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 2501b5c88c Revert "Revert "Okay"" 
This reverts commit fb2c29caff.
 2019-11-24 03:04:27 +00:00
FermiandFermi 6729a62200 Revert "Revert "Well"" 
This reverts commit df5814c30e.
 2019-11-24 03:04:25 +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 8ea6618f5d Revert "ARGH" 
This reverts commit f0f52ce3f8.
 2019-11-24 03:01:59 +00:00
FermiandFermi cb4bfa65d1 Revert "?" 
This reverts commit 05d18171e0.
 2019-11-24 03:01:55 +00:00
FermiandFermi 1f7e9d8ab5 Revert "please" 
This reverts commit ac53c26d87.
 2019-11-24 03:01:51 +00:00
FermiandFermi ac53c26d87 please 2019-11-24 02:58:15 +00:00
FermiandFermi 05d18171e0 ? 2019-11-24 02:57:46 +00:00
FermiandFermi f0f52ce3f8 ARGH 2019-11-24 02:55:50 +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 df5814c30e Revert "Well" 
This reverts commit e44c8c0a4a.
 2019-11-24 02:44:36 +00:00
FermiandFermi fb2c29caff Revert "Okay" 
This reverts commit 37ac0ccb66.
 2019-11-24 02:44:32 +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
Winter Flare fb4a47d310 Added more items to vendors. 
-Added stuff to the following:
clothing vendor
chef utensil vendor
snack vendors
kinkmate
 2019-11-23 15:58:04 -05:00
CitadelStationBot 63e96a1402 Automatic changelog generation for PR #9874 [ci skip] 2019-11-23 12:49:35 -06:00
kevinz000andGitHub f0996208a3 Merge pull request #9874 from Ghommie/Ghommie-cit379 
Honkbot slip and slide fun ride.
 2019-11-23 11:49:32 -07:00
CitadelStationBot 40d787133d Automatic changelog generation for PR #9891 [ci skip] 2019-11-23 12:46:30 -06:00