5dee355381
Merge pull request #10530 from kappa-sama/modularer
...
deletes modular items but this time i don't get cucked
2020-01-15 00:47:38 +01:00
26d6e7f05c
Work.
2020-01-14 22:04:38 +01:00
3984943b0d
[s] makes master compile.
2020-01-14 20:02:26 +01:00
03ebab6ec5
Merge pull request #10454 from Commandersand/clothsfix
...
fixes clothing directional sprites(i swear not all of them are my fault)
2020-01-14 18:24:50 +01:00
99a6214d22
Merge pull request #10538 from Putnam3145/chemistry-aaa
...
Fixes to chemistry
2020-01-14 13:52:10 +01:00
77bdc8ee58
Merge pull request #10558 from DeltaFire15/clockfixes
...
Slimepeople can no longer just chill on vitality matrixes
2020-01-14 13:51:03 +01:00
9189455fb1
Merge pull request #10549 from Seris02/durathread
...
durathread winter coats from hyper
2020-01-14 13:49:53 +01:00
21dde64da2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into chemistry-aaa
2020-01-14 03:27:03 -08:00
d46f3232f9
tada
2020-01-14 10:57:32 +08:00
3f57f30e14
Merge branch 'master' into modularer
2020-01-13 16:32:00 -05:00
330d96d549
Merge pull request #10409 from kevinz000/isbanned2
...
IT WORKED ON LOCAL
2020-01-13 18:49:46 +01:00
984c43116c
Merge pull request #10539 from Savotta/cum
...
ports hShark snout from hyper-station-13
2020-01-13 16:07:28 +01:00
ed42ed5a1e
Merge pull request #10551 from Arturlang/mesmerize_quickfiz
...
[s]Fixes bloodsucker mesmerize mute
2020-01-13 12:49:13 +01:00
942e321b76
Merge pull request #10555 from Arturlang/Lummox_suggestions
...
Ports lummoxes suggestions
2020-01-13 12:48:19 +01:00
e3d3f7b750
Ported
2020-01-13 13:20:55 +02:00
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
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
d04a882c29
Prevent Playback Devices from triggering Voice Analyzer
2020-01-12 18:49:33 -05: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
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
e1ae3f3c07
Merge pull request #10492 from Trilbyspaceclone/plastic__world
...
Plastic snow
2020-01-12 00:49:39 -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
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
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
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
16db38a08f
Travis man good
2020-01-11 20:51:15 +01: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
af562d1421
Update bloodsucker_life.dm
2020-01-11 06:54:29 -08:00
34502cab1d
Merge pull request #10247 from Seris02/atmosfirelock
...
ATMOS Firelocks and more
2020-01-11 15:29:25 +01:00
7fa3289013
Merge pull request #10497 from Trilbyspaceclone/uplink_redo
...
Cleans up uplink_items into each folder
2020-01-11 15:28:04 +01:00
894abc67c0
Merge pull request #10502 from Linzolle/big-boss
...
[s] i'm trying to sneak around
2020-01-11 15:24:21 +01:00
3a72d1f434
Merge pull request #10495 from Citadel-Station-13/kevinz000-patch-12
...
allow guests to use looc
2020-01-11 15:09:37 +01:00
e851939281
Merge pull request #10523 from Hatterhat/fuck-you-baltimore
...
you can finally put armor plating on your standard explorer suit hood again
2020-01-11 15:06:20 +01:00
2006ccf4ef
nicc you buffoon you never adjusted the hood type
2020-01-11 00:12:52 -06:00
b5f8e46941
this is blackmajors fault im not gonna lie
2020-01-10 23:41:30 -06:00
30fc5b560b
Couple of lingering fixes
2020-01-11 17:57:18 +13:00
3281db6000
scream
2020-01-10 22:39:13 -05:00
Ghom