shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,209 Commits 5 Branches 0 Tags
820eeceb12052d14dcce7527d8599061dcf32cf7
Commit Graph

2187 Commits

Author SHA1 Message Date
kappa-sama 820eeceb12 bye 2020-01-10 22:18:03 -05:00
Lin fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing 
modular citadel file destruction but only slightly
 2020-01-11 00:30:58 +00:00
kevinz000 8f60099595 Merge pull request #10488 from Xantholne/xantholne-cowboy02 
Red Dead Redemption 2 but it's a crappy 2D space man game
 2020-01-10 14:01:06 -08:00
Lin e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490 
Ports reagents id removal and typepath usage.
 2020-01-10 01:34:39 +00:00
Lin c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447 
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
 2020-01-10 01:31:20 +00:00
Ghommie 825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
Unknown 6cc856d9af Loadout Menu 2020-01-08 22:44:04 -07:00
kappa-sama ff3370d382 bye 2020-01-08 16:50:49 -05:00
kappa-sama 87698297fb bye bye 2020-01-08 16:47:28 -05:00
kappa-sama a4da8a2dc4 bye 2020-01-08 16:37:38 -05:00
kappa-sama ba20618bd0 this file does literally nothing 2020-01-08 10:00:33 -05:00
kappa-sama d0cd6ae336 begone 2020-01-08 09:48:04 -05:00
kappa-sama 3dac4e568d begone 2020-01-08 09:45:49 -05:00
Putnam3145 b09ef97ae3 Merge pull request #10305 from BlackMajor/Yeehaw 
Various Mining borg changes. And some extras.
 2020-01-07 16:50:21 -08:00
BlackMajor 05a644cc41 Revert "Merge branch 'master' into Yeehaw" 
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
 2020-01-08 12:26:45 +13:00
BlackMajor 972c03f79f Merge branch 'master' into Yeehaw 2020-01-08 12:25:50 +13:00
BlackMajor b41c9cd844 Sync with master 2020-01-08 12:25:22 +13:00
BlackMajor 8ebd698763 Give my lad Blade mining borg a rest sprite 2020-01-07 23:14:07 +13:00
Lin 718d4a080d Merge pull request #9878 from Ghommie/Ghommie-cit382 
Unmodularize several machinery and structures
 2020-01-07 00:31:24 +00:00
Ghommie 592422ee70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-05 22:53:00 +01:00
Ghom 0e74c94d8c Merge pull request #10278 from Trilbyspaceclone/patch-248 
Fixes Fermi plushie reaction. Removes carbonation of caramel
 2020-01-05 15:17:14 +01:00
Trilbyspaceclone e0e3f1547c Update fermi.dm 2020-01-04 18:09:51 -05:00
Ghom 499907f9b7 Merge pull request #10191 from Citadel-Station-13/michael_labs 
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
 2020-01-04 14:07:25 +01:00
Ghom 3d8c329223 Kevinz, pls 2020-01-04 13:52:17 +01:00
Trilbyspaceclone f06e20234b Hey guess who looked all over and got told were these files are 2020-01-04 06:17:49 -05:00
Ghommie f5b251db66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-03 18:24:39 +01:00
Lin b1ccd512db Merge pull request #10215 from Ghommie/Ghommie-cit473 
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
 2020-01-03 00:00:51 +00:00
Ghommie 4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
BlackMajor 08d042901c thank you github 2020-01-02 22:16:47 +13:00
BlackMajor aabb39a364 Revert "Merge branch 'master' into Yeehaw" 
This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
 2020-01-02 22:06:31 +13:00
BlackMajor 30e3edaac1 Merge branch 'master' into Yeehaw 2020-01-02 22:03:58 +13:00
BlackMajor 3239acf74d Sync 2020-01-02 22:02:55 +13:00
kevinz000 094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
Lin b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
kevinz000 f920e7b73c changes 2019-12-31 10:08:14 -08:00
Ghommie 80e716eeaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-30 18:14:47 +01:00
Ghommie 62cf03272d work. 2019-12-30 16:22:05 +01:00
Ghommie 49f1176170 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-30 16:06:16 +01:00
Seris02 9653dc470b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc 2019-12-30 22:48:39 +08:00
kevinz000 24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
kevinz000 7e5729ffaf Merge pull request #10168 from Ghommie/Ghommie-cit459 
Allows ghost mentors to orbit around the target instead of setting their view to theirs.
 2019-12-30 00:17:46 -08:00
kevinz000 74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options 
Lewd chem sanity pass/"ERP preferences"
 2019-12-30 00:09:18 -08:00
kevinz000 3f4594d78e Merge pull request #10312 from Commandersand/prayfornoconflictslel 
ports rp dresses/pants/chaps, available through loadout or vendors(without breaking my github branch)
 2019-12-30 00:07:32 -08:00
Ghommie edd05cebea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-30 00:28:36 +01:00
BlackMajor b811d3e57e More work on it 2019-12-30 01:23:41 +13:00
Seris02 3d3407363c auto ooc 2019-12-29 18:48:00 +08:00
BlackMajor 375e59a77d Merge branch 'master' into Yeehaw 2019-12-29 22:12:40 +13:00
Ghommie 7837688426 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-28 23:41:10 +01:00
Ghommie 37441437d1 a 2019-12-28 23:02:28 +01:00
kevinz000 f14448109d Update sprint.dm 2019-12-28 01:34:29 -08:00