shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,502 Commits 5 Branches 0 Tags
de4e65c4677e06ff6be76deb24449625c87de180
Commit Graph

11775 Commits

Author SHA1 Message Date
Putnam
de4e65c467 Savefile conversion for inesct 2020-01-15 20:13:09 -08:00
Putnam
d29603ad77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-15 15:57:32 -08:00
Ghommie
4b090f938c ok 2020-01-15 20:51:36 +01:00
Ghom
7b34daae48 Merge pull request #10563 from Trilbyspaceclone/patch-268 
Makes fragile suit less likely to brake from toys
 2020-01-15 15:51:15 +01:00
Ghom
5eb26682e2 Merge pull request #10557 from timothyteakettle/timothyteakettle-gene-modder-1 
remove trait genes without disks
 2020-01-15 14:54:11 +01:00
Hatterhat
7b322ff467 Merge branch 'master' into greytide-standard-uniform 2020-01-14 19:39:16 -06:00
Trilbyspaceclone
5351bc9f8a Update miscellaneous.dm 2020-01-14 19:15:35 -05:00
Ghom
8a06f2f45c Merge pull request #10499 from Hatterhat/tg-40046 
more /tg/station ports - tools! logging! some other fun stuff!
 2020-01-15 01:05:36 +01:00
Ghom
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
Ghommie
26d6e7f05c Work. 2020-01-14 22:04:38 +01:00
Ghommie
3984943b0d [s] makes master compile. 2020-01-14 20:02:26 +01:00
Ghom
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
Ghom
99a6214d22 Merge pull request #10538 from Putnam3145/chemistry-aaa 
Fixes to chemistry
 2020-01-14 13:52:10 +01:00
Ghom
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
Ghom
9189455fb1 Merge pull request #10549 from Seris02/durathread 
durathread winter coats from hyper
 2020-01-14 13:49:53 +01:00
Putnam
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
Hatterhat
464b893790 Merge branch 'master' into tg-40046 2020-01-13 23:06:48 -06:00
Seris02
d46f3232f9 tada 2020-01-14 10:57:32 +08:00
timothyteakettle
17ce27bd70 remove trait genes without disks 
botany fix that lets you remove trait genes without having to have a redundant disk inserted
 2020-01-13 23:23:49 +00:00
kappa-sama
3f57f30e14 Merge branch 'master' into modularer 2020-01-13 16:32:00 -05:00
Ghom
330d96d549 Merge pull request #10409 from kevinz000/isbanned2 
IT WORKED ON LOCAL
 2020-01-13 18:49:46 +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
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
Xantholne
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
r4d6
d04a882c29 Prevent Playback Devices from triggering Voice Analyzer 2020-01-12 18:49:33 -05: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
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
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00: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
kevinz000
e1ae3f3c07 Merge pull request #10492 from Trilbyspaceclone/plastic__world 
Plastic snow
 2020-01-12 00:49:39 -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
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
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
38dcb78625 chemistry fixes 2020-01-11 18:15:50 -08:00