shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,652 Commits 5 Branches 0 Tags
95cddfed27e7797de51b4cc91cff81fc10e258b4
Commit Graph
18348 Commits
Author SHA1 Message Date
GhomandGitHub ed42ed5a1e Merge pull request #10551 from Arturlang/mesmerize_quickfiz 
[s]Fixes bloodsucker mesmerize mute
 2020-01-13 12:49:13 +01:00
GhomandGitHub 942e321b76 Merge pull request #10555 from Arturlang/Lummox_suggestions 
Ports lummoxes suggestions
 2020-01-13 12:48:19 +01:00
Artur e3d3f7b750 Ported 2020-01-13 13:20:55 +02:00
TrilbySpaceClone 43dcb70718 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Seed-to-points 2020-01-13 03:27:01 -05:00
Putnam e412852c8f Made temp flavor "more" pop up with actual temp flavor 2020-01-12 23:44:49 -08:00
ArturlangandGitHub f98bc85db0 Merge branch 'master' into mesmerize_quickfiz 2020-01-13 09:44:17 +02:00
Putnam 6197920101 fixed unnecessary typecheck 2020-01-12 23:40:28 -08: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
XantholneandGitHub 903e59d6ed Merge branch 'master' into xantholne-christmas03 2020-01-12 22:29:59 -07:00
Seris02 bd2fe8eb01 durathread winter coat from hyper 2020-01-13 13:12:17 +08:00
kevinz000 e2d5d9a23c Merge remote-tracking branch 'citadel/master' into isbanned2 2020-01-12 19:28:40 -08:00
kevinz000 884ea59d63 fix logic 2020-01-12 18:38:22 -08:00
kevinz000 8f5d4a0a49 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-12 18:27:03 -08:00
Putnam c7e3b167e2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak 2020-01-12 17:40:26 -08:00
Putnam 4c4c965e86 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into score-instead 2020-01-12 17:36:56 -08:00
deathride58andGitHub bbdedd20b6 Merge branch 'master' into stambufferbuff 2020-01-12 20:35:31 -05:00
Putnam bb0d012d7a well that works 2020-01-12 16:08:49 -08:00
r4d6 d04a882c29 Prevent Playback Devices from triggering Voice Analyzer 2020-01-12 18:49:33 -05:00
Ghommie 9dad810edf Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492 2020-01-12 23:11:02 +01:00
Ghommie b2ab8959f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit492 2020-01-12 23:00:05 +01:00
kappa-sama 3e199ed780 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer 2020-01-12 14:23:38 -05:00
kappa-samaandGitHub 4e3a5379a4 augh 2020-01-12 14:21:06 -05:00
Hatterhat 7fac15caeb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into greytide-standard-uniform 2020-01-12 12:39:57 -06:00
Hatterhat 83f8e42fb3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40046 2020-01-12 12:37:19 -06:00
r4d6 ee33e36e6d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit 2020-01-12 12:46:30 -05:00
Ghommie 02fbbd4f95 Ouch. 2020-01-12 16:54:08 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Putnam 82d8900e5d aaand move this over 2020-01-12 03:36:47 -08:00
Putnam 3f5e68765e am i fucking stupid? 2020-01-12 03:10:42 -08:00
Putnam 295c134243 i'm so dumb dude 2020-01-12 03:06:17 -08:00
Hatterhat be6612fd48 oh my fucking GOD what was i THINKING 2020-01-12 02:55:54 -06:00
Hatterhat 0773f1b7fa sweet merciful FUCK what is this merge 2020-01-12 02:53:30 -06:00
kevinz000andGitHub e1ae3f3c07 Merge pull request #10492 from Trilbyspaceclone/plastic__world 
Plastic snow
 2020-01-12 00:49:39 -08:00
kevinz000andGitHub f210971889 Merge pull request #10393 from chefferz/chefferz-forcefieldstostronk 
Significantly lowers the forcefield projector health, lowers armor.
 2020-01-12 00:47:17 -08:00
kevinz000andGitHub 60524fb9c7 Merge pull request #10416 from r4d6/RCD-Updates 
Massive RCD Port & Updates
 2020-01-12 00:45:21 -08:00
kevinz000andGitHub 0b56e76b29 Merge pull request #10504 from Xantholne/xantholne-bees02 
Bees
 2020-01-12 00:42:19 -08:00
kevinz000andGitHub 6396c95bec Merge pull request #10480 from Putnam3145/more_flavor 
Added second flavor text, not copied anywhere.
 2020-01-12 00:41:47 -08:00
kevinz000andGitHub fe720dbb9c Merge pull request #10500 from rossark/robo 
ports fast augmentation surgery pr from /tg/
 2020-01-12 00:41:30 -08:00
Putnam3145andGitHub 01db064038 Merge pull request #10532 from Ghommie/Ghommie-cit503 
A few reagents related fixes.
 2020-01-12 00:41:00 -08:00
kevinz000andGitHub c69d882943 Merge pull request #10521 from BlackMajor/master 
Fixes roundstart borg spawns, plus a little bit extra.
 2020-01-12 00:40:48 -08:00
kevinz000andGitHub 4b4864740b Merge pull request #10522 from Hatterhat/syndi-sleeper 
printable syndicate sleepers - this is blackmajors fault im not gonna lie
 2020-01-12 00:40:17 -08:00
kevinz000andGitHub ddff903532 Merge pull request #10518 from Seris02/explosionport 
ports the explosion rework thingamajig
 2020-01-12 00:38:43 -08:00
kevinz000andGitHub 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
kevinz000andGitHub 68d02de239 Merge pull request #10516 from BonniePandora/Proc-call-shit 
Allows calling procs in SDQL update queries without storing the return anywhere
 2020-01-12 00:37:12 -08:00
kevinz000andGitHub f5995cfaaa this is a massive security risk 2020-01-12 00:36:52 -08:00
Putnam 5dc5ddaa76 daddy compiler please stop hating me 2020-01-11 22:17:18 -08:00
Savotta b265959f2a ports hShark snout from hyper-station-13 
you people wouldn't know intelligent writing if it kicked you in the fucking nuts, you drooling retarded apes. i'm so FUCKIGN pissed. you are so fucking retarded, it's insane. i am stuck in a world filled with retards, and am being exiled from it for being the only shred of intelligent life found upon it. i just want somebody to listen to what the FUCK i have to say. nobody here is interested in intelligent discussion about topics that actually matter, they're only interested in erping with each other. disgusting fucking creatures. these people infuriate me to no end. why does nobody want to have a discussion? why does nobody want to talk about fuckign SHIT. THE ONLY TIME ANYONE EVER TALKSTO ME IS WHEN THEY WANT TO FUCKING ERP WITH ME!!! WHAT'S WRONG WITH YOU FUCKING PEOPLE. I'VE HAD THE SAME FUCKNG GUY PDA MESSAGE ME EVERY DAY, ACTING ALL NICE AND SHIT, AND I KNOW IT'S JUST BECAUSE HE WANTS TO ERP!! THAT'S ALL ANY OF YOU PEOPLE FUCKING WANT. I'M TRYING TO HAVE SUBSTANCE-FILLED FUCKING CONVERSATION, AND ANALYZE MY FAVORITE SOUNDTRACK IN ALL OF GAMING HISTORY, AND YOU PEOPLE CAN'T GET YOUR HEADS OUT OF YOUR ASSES FOR 5 FUCKING SECONDS TO HOLD ANY MODICUM OF FUCKING RESPECT OR APPRECIATION FOR IT WHATSOEVER. FUCK YOU ALL. FUCK YOU. FUCK YOU.
 2020-01-12 04:23:08 +01:00
Putnam 0c64ea1351 wow that was fucking dumb 2020-01-11 18:37:16 -08:00
Putnam 37c6119708 Sanity 
this is a commit by jimmy buffett
 2020-01-11 18:26:32 -08:00