cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,384 Commits 55 Branches 0 Tags
fce73c84c70c75eb37d108a4b3b6e3c12f01bc93
Commit Graph

18189 Commits

Author SHA1 Message Date
Detective-Google
fce73c84c7 Merge branch 'master' into the-p-o-o-l 2020-01-13 16:38:53 -06:00
Detective Google
2c4daf3a99 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-01-13 16:32:18 -06:00
Lin
623ab1c661 Merge pull request #10287 from Ghommie/Ghommie-cit492 
Minor captains closet cleanup.
 2020-01-13 21:15:42 +00:00
Ghom
330d96d549 Merge pull request #10409 from kevinz000/isbanned2 
IT WORKED ON LOCAL
 2020-01-13 18:49:46 +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
984c43116c Merge pull request #10539 from Savotta/cum 
ports hShark snout from hyper-station-13
 2020-01-13 16:07:28 +01:00
Ghom
e87a3d1074 Merge pull request #10507 from LetterN/banjo 
Ports banjo
 2020-01-13 14:44:46 +01:00
Letter N
6ace5fc4b3 ell eff 2020-01-13 21:19:21 +08:00
Letter N
450cb2b01a Merge branch 'master' into banjo 2020-01-13 20:53:30 +08: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
Ghom
00325e7de6 Merge pull request #10493 from Putnam3145/score-instead 
Makes the post-secret gamemode vote score-based instead of schulze-based
 2020-01-13 13:46:39 +01:00
Ghom
ed42ed5a1e Merge pull request #10551 from Arturlang/mesmerize_quickfiz 
[s]Fixes bloodsucker mesmerize mute
 2020-01-13 12:49:13 +01:00
Ghom
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
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
Xantholne
903e59d6ed Merge branch 'master' into xantholne-christmas03 2020-01-12 22:29:59 -07:00
kevinz000
e2d5d9a23c Merge remote-tracking branch 'citadel/master' into isbanned2 2020-01-12 19:28:40 -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
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
Detective Google
6589065c38 scream 2020-01-12 15:25:51 -06:00
Detective Google
97c26c704d Update Space_Station_13_areas.dm 2020-01-12 15:24:51 -06:00
Detective Google
81d3225819 ? 2020-01-12 15:23:45 -06:00
Detective Google
99ba77ce01 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 2020-01-12 15:23:05 -06:00
Detective Google
c7dcd0c8a3 grug hates merge conflicts 2020-01-12 15:19:44 -06:00
Detective Google
f6c5f81a83 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-01-12 15:16:17 -06:00
Detective Google
c88efe84de makes sharks drop fish meat 2020-01-12 15:14:34 -06: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
kevinz000
e1ae3f3c07 Merge pull request #10492 from Trilbyspaceclone/plastic__world 
Plastic snow
 2020-01-12 00:49:39 -08:00
kevinz000
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
kevinz000
60524fb9c7 Merge pull request #10416 from r4d6/RCD-Updates 
Massive RCD Port & Updates
 2020-01-12 00:45:21 -08:00
kevinz000
0b56e76b29 Merge pull request #10504 from Xantholne/xantholne-bees02 
Bees
 2020-01-12 00:42:19 -08:00
kevinz000
6396c95bec Merge pull request #10480 from Putnam3145/more_flavor 
Added second flavor text, not copied anywhere.
 2020-01-12 00:41:47 -08:00
kevinz000
fe720dbb9c Merge pull request #10500 from rossark/robo 
ports fast augmentation surgery pr from /tg/
 2020-01-12 00:41:30 -08:00
Putnam3145
01db064038 Merge pull request #10532 from Ghommie/Ghommie-cit503 
A few reagents related fixes.
 2020-01-12 00:41:00 -08:00
kevinz000
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
kevinz000
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
kevinz000
ddff903532 Merge pull request #10518 from Seris02/explosionport 
ports the explosion rework thingamajig
 2020-01-12 00:38:43 -08: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
kevinz000
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
kevinz000
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
Detective Google
d5b227a0ca adds the POOL to box station 
F in chat for dorms 7.
 2020-01-11 23:34:07 -06: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