shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,734 Commits 5 Branches 0 Tags
bcf77458dd5639ba27f07dd4acb0a174aa562dbb
Commit Graph

13933 Commits

Author SHA1 Message Date
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
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
Seris02
b22ec2ffd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into bowmanupgrade 2020-01-12 11:14:33 +08:00
Putnam
38dcb78625 chemistry fixes 2020-01-11 18:15:50 -08:00
Lin
d6b28c59d4 Merge pull request #10509 from Ghommie/Ghommie-cit502 
Fixes reagent containers examine.
 2020-01-11 22:16:27 +00:00
Hatterhat
47fd3823e8 staff assistant jumpsuit gang 2020-01-11 15:58:24 -06:00
Ghommie
16db38a08f Travis man good 2020-01-11 20:51:15 +01:00
kevinz000
6e07a6d005 compile 2020-01-11 10:49:57 -08:00
kevinz000
9fd9f60855 compile 2020-01-11 10:49:44 -08:00
Ghommie
c709a9e4a9 A few reagents related fixes. 2020-01-11 18:45:54 +01:00
kappa-sama
5eb08e25c2 Merge pull request #32 from kappa-sama/moredular 
i wanna kill myself
 2020-01-11 12:35:59 -05:00
kevinz000
af562d1421 Update bloodsucker_life.dm 2020-01-11 06:54:29 -08:00
Ghom
34502cab1d Merge pull request #10247 from Seris02/atmosfirelock 
ATMOS Firelocks and more
 2020-01-11 15:29:25 +01:00
Ghom
7fa3289013 Merge pull request #10497 from Trilbyspaceclone/uplink_redo 
Cleans up uplink_items into each folder
 2020-01-11 15:28:04 +01:00
Ghom
894abc67c0 Merge pull request #10502 from Linzolle/big-boss 
[s] i'm trying to sneak around
 2020-01-11 15:24:21 +01:00
Ghom
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
Ghom
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
Seris02
218c6bdc8f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into bowmanupgrade 2020-01-11 17:35:46 +08:00
Seris02
3ce8d2a61c adds bopwmanizing 2020-01-11 17:33:44 +08:00
Hatterhat
2006ccf4ef nicc you buffoon you never adjusted the hood type 2020-01-11 00:12:52 -06:00
Seris02
ac4489c6a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-11 13:55:29 +08:00
Hatterhat
b5f8e46941 this is blackmajors fault im not gonna lie 2020-01-10 23:41:30 -06:00
BlackMajor
30fc5b560b Couple of lingering fixes 2020-01-11 17:57:18 +13:00
Hatterhat
080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06:00
kappa-sama
3281db6000 scream 2020-01-10 22:39:13 -05:00
kappa-sama
5857da02a5 cheeki breeki 2020-01-10 22:35:30 -05:00
kappa-sama
93fc0b3716 xenos helmet 2020-01-10 22:34:26 -05:00
Seris02
29b66db9e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport 2020-01-11 11:29:30 +08:00
Seris02
0b0b80f174 explosions 2020-01-11 11:22:59 +08:00
BonniePandora
bb26f21c71 I have no idea what I'm doing to be quite honest 2020-01-11 02:43:58 +00:00
Putnam
48fadffbfb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-10 17:57:03 -08:00
Lin
42263a435a Merge pull request #10489 from Seris02/chameleonthing 
Fixes and improvements for chameleon clothes
 2020-01-11 01:12:43 +00:00
Lin
fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing 
modular citadel file destruction but only slightly
 2020-01-11 00:30:58 +00:00
Lin
cd8e83e7c0 Merge pull request #10486 from Seris02/observe 
moves observe to ghost tab instead of sticking it in the ooc tab
 2020-01-10 23:56:46 +00:00
kevinz000
b6e14c6b86 compile 2020-01-10 14:30:20 -08:00
kevinz000
8f60099595 Merge pull request #10488 from Xantholne/xantholne-cowboy02 
Red Dead Redemption 2 but it's a crappy 2D space man game
 2020-01-10 14:01:06 -08:00
kevinz000
2c245a18fd compile 2020-01-10 13:43:53 -08:00
kevinz000
c0274b1bc6 compile 2020-01-10 13:28:56 -08:00
kevinz000
f1a4956afc easier for me to type 2020-01-10 13:26:34 -08:00
kevinz000
830054c106 sigh 2020-01-10 13:25:47 -08:00
kevinz000
8725ffe916 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-10 06:12:59 -08:00
kevinz000
24c1baddd0 compile compile compile 2020-01-10 05:50:19 -08:00
Ghommie
c9375a1288 Fixes reagent containers examination. 2020-01-10 14:19:22 +01:00
Putnam
c0be46e07f balancing/sanity checks 2020-01-10 04:23:43 -08:00
Putnam
e468fa3e71 Added a binary version and fixed up sprites 2020-01-10 01:26:09 -08:00
Linzolle
dc0fdebc21 hrmngh colonel 2020-01-09 22:46:43 -06:00
Linzolle
8d70181ecf uh oh stinky 2020-01-09 22:41:50 -06:00