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

1926 Commits

Author SHA1 Message Date
kappa-sama
b3e916cc68 e 2020-01-08 09:44:16 -05:00
Ghom
f263a3ea31 Merge pull request #10474 from Putnam3145/fix-traitor-again 
[s] Fixes traitors
 2020-01-08 13:48:12 +01:00
Putnam
a97fa8f81a also made objectives deletable 2020-01-07 18:01:24 -08:00
Lin
46420a693d Merge branch 'master' into Ghommie-cit425 2020-01-07 00:28:37 +00:00
Ghom
d07d436ba2 Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo 
cargo tweaks, new shit, why do digitigrade sprites exist
 2020-01-06 21:47:15 +01:00
Putnam3145
3b6cf8c952 Merge pull request #10401 from r4d6/SM 
Add three more Supermatter Engine variation for Box
 2020-01-05 23:08:49 -08:00
Lin
7ad6021472 Merge pull request #10437 from Ghommie/Ghommie-cit497 
Fixes roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!
 2020-01-06 03:49:52 +00:00
Ghom
e18244671f Merge pull request #10350 from Putnam3145/dojo-ghostrole 
Ghost cafe quality-of-life, plus making ghost role eligibility an element
 2020-01-05 23:05:13 +01:00
Ghommie
8c7b648a4f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit425 2020-01-05 17:42:54 +01:00
Ghom
ca8d93ad17 Merge branch 'master' into alcohol-intolerance 2020-01-04 23:17:55 +01:00
Ghom
7bebd13c54 Merge pull request #10412 from Linzolle/matchbox-cars 
matchbox runtime fix
 2020-01-04 22:30:13 +01:00
Ghommie
356304f68f Fixes roundstart mushpeople not having MUSH PUUUUUUUUUUUUNCH!! 2020-01-04 20:34:31 +01: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
Hatterhat
7c98656939 upstream merge 2020-01-04 01:48:50 -06:00
Hatterhat
186194418e tg 43454+43688 port, tweaks w/ trilby, db crate 2020-01-04 01:33:32 -06:00
Putnam
adf87c7595 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2020-01-02 22:52:24 -08:00
r4d6
25c92b0fd7 fix number. 2020-01-02 02:13:10 -05:00
r4d6
91a8a434f5 Fix a bug and allow for the three crystals to be hit. 2020-01-02 01:58:34 -05:00
r4d6
0fad4aff75 change a x of place to make more sense. 2020-01-02 01:34:17 -05:00
r4d6
4010d72b7a Add 3 SM Variations 2020-01-02 01:31:21 -05:00
Linzolle
74c308c16c runtime fix 2020-01-01 22:23:16 -06:00
Lin
c836889944 Merge pull request #10370 from Hatterhat/blood-drunk-cripple-bad 
blood drunk buff probably shouldnt cripple you
 2020-01-01 21:21:39 +00:00
kevinz000
094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
kevinz000
ec67a38093 Merge pull request #10330 from keronshb/keronnanite 
More nanites from /tg/station
 2019-12-31 19:32:05 -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
Hatterhat
76e789d3d1 getting limb crippled is a 4head bruh 2019-12-31 00:14:52 -06:00
Putnam
71fcd23f1f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2019-12-30 13:31:15 -08: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
Ghom
6e506c949e Merge pull request #10348 from Putnam3145/radiation 
fix divide by 0 runtime in new contam
 2019-12-30 11:08:52 +01:00
Ghom
a6e72c8cad ok 2019-12-30 11:00:21 +01:00
Putnam
418e4c21ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2019-12-30 01:56:59 -08:00
Putnam
6e9d13e48f Replace the cryopod with a simple ghost button. 2019-12-30 01:52:06 -08:00
Putnam
f2759abb4c fixed a runtime 2019-12-30 01:18:05 -08:00
Putnam
90ebbdfdb9 elements are so good. they're so good 2019-12-30 00:53:03 -08:00
kevinz000
d1434c767c Merge pull request #10335 from kappa-sama/patch-12 
mouth slice
 2019-12-30 00:11:38 -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
Putnam
1b7e9c6716 wow divide by 0 very cool 2019-12-29 22:03:23 -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
keronshb
baf8b28f3a Fixes Reduced Diagnostics and adds disks 
Fixes reduced diagnostics not working properly and adds program disks for each of the new nanites.
 2019-12-29 16:03:38 -05:00
Seris02
3d3407363c auto ooc 2019-12-29 18:48:00 +08:00
kappa-sama
3fad4edae0 mouth 2019-12-28 23:57:07 -05:00
keronshb
390cfd8b64 Nanite ports from /tg/ 
Ports a couple of the newer nanite features from /tg/
 2019-12-28 16:56:17 -05:00
Ghom
2ad4698225 Merge pull request #10217 from Putnam3145/radiation 
Nerfing radioactive contamination
 2019-12-28 17:21:25 +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
Ghom
93248336ea Merge pull request #10265 from Trilbyspaceclone/map_redo 
Cit-iftyed Box map as well as adding back blasters back to armory
 2019-12-27 22:54:35 +01:00
Putnam
88222c0901 uh, actually did that 2019-12-24 23:58:22 -08:00
Seris02
a106fde6cc a few fixes here and there and updating it 2019-12-24 23:38:27 +08:00
Seris02
85c5a5dfa1 Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass 2019-12-24 22:29:46 +08:00
Seris02
9e6f0762b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass 2019-12-24 22:27:41 +08:00