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
9aedc62ddb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920
2020-01-12 12:39:17 -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
c14439494a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
ee33e36e6d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit
2020-01-12 12:46:30 -05:00
268146bb93
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit374
2020-01-12 17:19:57 +01:00
02fbbd4f95
Ouch.
2020-01-12 16:54:08 +01:00
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00: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
55c6e0d97e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920
2020-01-12 02:51:21 -06:00
2842434d00
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920
2020-01-12 02:49:58 -06: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
d5b227a0ca
adds the POOL to box station
...
F in chat for dorms 7.
2020-01-11 23:34:07 -06: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
b22ec2ffd8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into bowmanupgrade
2020-01-12 11:14:33 +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
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
218c6bdc8f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into bowmanupgrade
2020-01-11 17:35:46 +08:00
3ce8d2a61c
adds bopwmanizing
2020-01-11 17:33:44 +08: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
080cb74893
tgstation 40920 tweaked and tested for cit
2020-01-10 22:56:11 -06:00
3281db6000
scream
2020-01-10 22:39:13 -05:00
5857da02a5
cheeki breeki
2020-01-10 22:35:30 -05:00
93fc0b3716
xenos helmet
2020-01-10 22:34:26 -05:00
29b66db9e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport
2020-01-11 11:29:30 +08:00
0b0b80f174
explosions
2020-01-11 11:22:59 +08:00
bb26f21c71
I have no idea what I'm doing to be quite honest
2020-01-11 02:43:58 +00:00
Hatterhat