f98bc85db0
Merge branch 'master' into mesmerize_quickfiz
2020-01-13 09:44:17 +02:00
1b852b3a03
Fixes mesmerize
2020-01-13 09:34:40 +02:00
e3a33ad8c1
fixes status topic having a broken cooldown
2020-01-13 00:56:05 -05:00
903e59d6ed
Merge branch 'master' into xantholne-christmas03
2020-01-12 22:29:59 -07:00
bd2fe8eb01
durathread winter coat from hyper
2020-01-13 13:12:17 +08:00
e2d5d9a23c
Merge remote-tracking branch 'citadel/master' into isbanned2
2020-01-12 19:28:40 -08:00
884ea59d63
fix logic
2020-01-12 18:38:22 -08:00
8f5d4a0a49
Merge remote-tracking branch 'citadel/master' into nightshift_1
2020-01-12 18:27:03 -08:00
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
bbdedd20b6
Merge branch 'master' into stambufferbuff
2020-01-12 20:35:31 -05:00
d04a882c29
Prevent Playback Devices from triggering Voice Analyzer
2020-01-12 18:49:33 -05:00
9dad810edf
Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492
2020-01-12 23:11:02 +01:00
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
3e199ed780
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer
2020-01-12 14:23:38 -05:00
4e3a5379a4
augh
2020-01-12 14:21:06 -05:00
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
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
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
82d8900e5d
aaand move this over
2020-01-12 03:36:47 -08:00
3f5e68765e
am i fucking stupid?
2020-01-12 03:10:42 -08:00
295c134243
i'm so dumb dude
2020-01-12 03:06:17 -08:00
be6612fd48
oh my fucking GOD what was i THINKING
2020-01-12 02:55:54 -06:00
0773f1b7fa
sweet merciful FUCK what is this merge
2020-01-12 02:53:30 -06:00
e1ae3f3c07
Merge pull request #10492 from Trilbyspaceclone/plastic__world
...
Plastic snow
2020-01-12 00:49:39 -08:00
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
60524fb9c7
Merge pull request #10416 from r4d6/RCD-Updates
...
Massive RCD Port & Updates
2020-01-12 00:45:21 -08:00
0b56e76b29
Merge pull request #10504 from Xantholne/xantholne-bees02
...
Bees
2020-01-12 00:42:19 -08:00
6396c95bec
Merge pull request #10480 from Putnam3145/more_flavor
...
Added second flavor text, not copied anywhere.
2020-01-12 00:41:47 -08:00
fe720dbb9c
Merge pull request #10500 from rossark/robo
...
ports fast augmentation surgery pr from /tg/
2020-01-12 00:41:30 -08:00
01db064038
Merge pull request #10532 from Ghommie/Ghommie-cit503
...
A few reagents related fixes.
2020-01-12 00:41:00 -08:00
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
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
ddff903532
Merge pull request #10518 from Seris02/explosionport
...
ports the explosion rework thingamajig
2020-01-12 00:38:43 -08:00
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
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
f5995cfaaa
this is a massive security risk
2020-01-12 00:36:52 -08:00
5dc5ddaa76
daddy compiler please stop hating me
2020-01-11 22:17:18 -08:00
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
0c64ea1351
wow that was fucking dumb
2020-01-11 18:37:16 -08:00
37c6119708
Sanity
...
this is a commit by jimmy buffett
2020-01-11 18:26:32 -08:00
38dcb78625
chemistry fixes
2020-01-11 18:15:50 -08:00
d6b28c59d4
Merge pull request #10509 from Ghommie/Ghommie-cit502
...
Fixes reagent containers examine.
2020-01-11 22:16:27 +00:00
47fd3823e8
staff assistant jumpsuit gang
2020-01-11 15:58:24 -06:00
16db38a08f
Travis man good
2020-01-11 20:51:15 +01:00
29e7c49627
Pss got any of the good stuf Hydro?
2020-01-11 13:07:02 -05:00
c709a9e4a9
A few reagents related fixes.
2020-01-11 18:45:54 +01:00
5eb08e25c2
Merge pull request #32 from kappa-sama/moredular
...
i wanna kill myself
2020-01-11 12:35:59 -05:00
8a7e6d49a6
e
2020-01-11 12:35:49 -05:00
eb93e3d1d3
hi
2020-01-11 12:35:04 -05:00
108e585cf1
shit
2020-01-11 12:25:38 -05:00
Arturlang