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

1593 Commits

Author SHA1 Message Date
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
Unknown
6cc856d9af Loadout Menu 2020-01-08 22:44:04 -07:00
kappa-sama
d0cd6ae336 begone 2020-01-08 09:48:04 -05: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
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
Seris02
3d3407363c auto ooc 2019-12-29 18:48:00 +08: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
Lin
d562a5ba27 Merge pull request #10212 from Ghommie/Ghommie-cit471 
Ports some hud and update_icon code updates.
 2019-12-28 04:07:03 +00:00
Commandersand
60905cc09b loadout 2019-12-27 12:44:08 -06:00
Ghommie
21cfb2914b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-27 17:49:59 +01:00
Ghommie
b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
Ghom
5873ee8ea8 Merge pull request #10264 from Seris02/wintercoatsagain 
Makes cultist coats hold respective items, can actually make them and adds cosmetic versions to the loadout
 2019-12-27 13:27:04 +01:00
Ghom
05bde370ec Merge pull request #10250 from Michiyamenotehifunana/polyshorts-for-digis 
Gives Polychromic Shorts a Digitigrade Worn Icon State and Modernizes Polychromic Clothing Code
 2019-12-26 16:11:54 +01:00
Ghommie
57cecd2499 work 2019-12-25 06:54:44 +01:00
Hatterhat
f3fed71e08 ah, the wonders of atomization 2019-12-24 21:28:32 -06:00
Ghommie
53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
Hatterhat
681508482c magazine metal cost tweaks, speedloader in AIB 2019-12-24 04:15:25 -06:00
Ghommie
d571bbd292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-24 00:07:32 +01:00
Ghommie
e1949b0131 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-23 19:02:20 +01:00
Ghommie
f3e32641bf fukken donators 2019-12-23 14:45:00 +01:00
Ghommie
14c73b7d01 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 14:21:08 +01:00
Lin
9bdbb55b57 Merge pull request #10139 from Citadel-Station-13/donator 
Donator Item - Ready For Review
 2019-12-23 05:29:06 +00:00
deathride58
2eaffd57c3 Update custom_items.dm 2019-12-22 23:16:40 -05:00
Ghommie
b75349bebf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 04:32:09 +01:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
LetterJay
632e2cd8a1 Update custom_items.dm 2019-12-22 14:37:58 -06:00
LetterJay
98f9c9bf73 Update modular_citadel/code/modules/client/loadout/__donator.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-22 14:37:10 -06:00