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

1968 Commits

Author SHA1 Message Date
Putnam
d287835d14 Made quirk blacklisting antag-sided 2020-01-18 21:29:27 -08:00
Putnam
d29603ad77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-15 15:57:32 -08:00
Ghom
31c3b0f7bb Merge pull request #10415 from kevinz000/tg_update_1 
Small controller/backend updates from /tg/
 2020-01-15 15:23:09 +01:00
Ghom
3c4d36ddd3 Merge pull request #10478 from Seris02/gorillashuttlesstopping 
Makes the gorilla shuttle emag only
 2020-01-13 16:12:26 +01:00
Ghom
7af8579d17 Merge pull request #10550 from deathride58/fixestopicstatusproper 
fixes status topic having a broken cooldown
 2020-01-13 13:48:04 +01:00
Arturlang
f98bc85db0 Merge branch 'master' into mesmerize_quickfiz 2020-01-13 09:44:17 +02:00
Artur
1b852b3a03 Fixes mesmerize 2020-01-13 09:34:40 +02:00
deathride58
e3a33ad8c1 fixes status topic having a broken cooldown 2020-01-13 00:56:05 -05:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000
ce1dabb585 Merge pull request #10513 from r4d6/open-message 
Add a message when pulsing the open wire on airlocks
 2020-01-12 00:37:33 -08:00
Putnam
48fadffbfb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-10 17:57:03 -08: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
r4d6
96c75eb5ca Add a message when pulsing the open wire on airlocks 2020-01-10 17:01:46 -05:00
kevinz000
d4592449d2 Merge pull request #10484 from deathride58/topiccommandlimit 
[s] Caches the status topic to prevent low-effort DDoSes
 2020-01-10 14:00:43 -08: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
Putnam3145
3d4e68cf26 Merge branch 'master' into random-engine 2020-01-08 21:08:20 -08:00
deathride58
c39058379e Merge branch 'master' into topiccommandlimit 2020-01-08 22:19:56 -05:00
kevinz000
356286f0e5 Merge pull request #10473 from deathride58/serverhopsanity 
[s] adds a basic sanity check to server_hop
 2020-01-08 19:16:03 -08:00
Putnam
244d46ee41 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-08 17:08:01 -08:00
deathride58
580119f038 makes it account for key_valid 2020-01-08 19:17:09 -05:00
deathride58
33df154689 Caches the status topic to prevent low-effort DDoSes 2020-01-08 18:47:45 -05:00
kevinz000
2944a902c6 Merge pull request #10447 from Arturlang/Bloodsucker_tweaks 
[READY] Bloodsucker tweaks
 2020-01-08 13:36:24 -08:00
kevinz000
5360f85e21 Merge pull request #10459 from Putnam3145/cold-blooded 
Adds cold-blooded neutral quirk
 2020-01-08 13:34:27 -08:00
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
Seris02
83eff39063 nope 2020-01-08 17:20:58 +08:00
Putnam
a97fa8f81a also made objectives deletable 2020-01-07 18:01:24 -08:00
deathride58
89fcde9927 im like 3 iq dont bulli 2020-01-07 20:24:08 -05:00
deathride58
f0af57d7d6 wrong question mark place aaa 2020-01-07 20:22:06 -05:00
deathride58
633294c590 adds a basic sanity check to server_hop 2020-01-07 20:03:44 -05:00
Putnam
cd35e516ac back by popular demand: maso/nympho 2020-01-07 17:01:14 -08:00
Lin
46420a693d Merge branch 'master' into Ghommie-cit425 2020-01-07 00:28:37 +00:00
Putnam
f728c4746f Allowed random engines to be weighted. 2020-01-06 16:25:17 -08: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
Artur
b0cb6aab5c Final commit hopefully 2020-01-06 17:26:36 +01:00
Putnam
2859e6e5ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cold-blooded 2020-01-06 02:07:09 -08:00
Putnam
72dded26f2 cold-blooded trait 2020-01-06 02:06:19 -08: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
Putnam
fba7a8abb0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-05 19:12:28 -08:00
Putnam
d75a525b3c let's fix arousal huh 2020-01-05 19:10:48 -08: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
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
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