c0f8c1e68d
ok
2020-01-19 23:35:30 -07:00
89e204b980
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-19 23:12:17 -07:00
fce8e18ccc
fix
2020-01-19 22:58:20 -07:00
65eaf9787a
Merge pull request #10097 from Ghommie/Ghommie-cit444
...
Made traitor kevlar/armor padding accessories examine-proof.
2020-01-19 16:58:27 -07:00
f85527ab4b
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-19 16:18:12 -07:00
072eca6ec0
fixes and more PRs
2020-01-18 23:01:00 +01:00
224146ee1d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit444
2020-01-18 03:36:09 +01:00
9c0b78bc09
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-18 01:23:08 +01:00
aea0de30d1
Merge pull request #10125 from Ghommie/Ghommie-cit449
...
Ports a few projectile code updates by ke:b:inz.
2020-01-17 15:15:08 -07:00
e7b925e779
Merge pull request #10582 from Putnam3145/more_flavor
...
Made temp flavor "more" pop up with actual temp flavor
2020-01-17 14:44:04 +01:00
a4e2591223
typo
2020-01-16 21:22:07 -07:00
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
d7a8494d2d
fix
2020-01-16 21:03:28 -07:00
9ef4cbfa76
refactor tags
2020-01-16 20:58:00 -07:00
2ba226b912
aa
2020-01-16 20:57:02 -07:00
b505c1e087
WEH
2020-01-16 19:22:47 -07:00
14aaca8fa5
compile
2020-01-16 19:18:54 -07:00
d110d7bae9
Merge pull request #10347 from deathride58/stambufferbuff
...
[experimental] Buffs the stamina buffer by making it recharge for free.
2020-01-16 14:51:38 -07:00
b22e1a1cb4
compile
2020-01-16 02:27:35 -07:00
350c5aa060
compile
2020-01-16 00:18:40 -07:00
26525b8fa7
s
2020-01-16 00:14:03 -07:00
1acac87da3
compile
2020-01-15 23:54:30 -07:00
45c92bcb6f
s
2020-01-15 19:07:47 -07:00
ded4d1bed6
compile
2020-01-15 18:58:26 -07:00
02841f8e92
compile
2020-01-15 18:49:37 -07:00
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
1d948907f6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-13 23:26:21 +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
e412852c8f
Made temp flavor "more" pop up with actual temp flavor
2020-01-12 23:44:49 -08:00
bbdedd20b6
Merge branch 'master' into stambufferbuff
2020-01-12 20:35:31 -05:00
b341818f04
mobility flags
2020-01-12 11:00:12 -08: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
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
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
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
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
9fd9f60855
compile
2020-01-11 10:49:44 -08:00
30fc5b560b
Couple of lingering fixes
2020-01-11 17:57:18 +13: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
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
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
b6e14c6b86
compile
2020-01-10 14:30:20 -08:00
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
2c245a18fd
compile
2020-01-10 13:43:53 -08:00
c0274b1bc6
compile
2020-01-10 13:28:56 -08:00
f1a4956afc
easier for me to type
2020-01-10 13:26:34 -08:00
830054c106
sigh
2020-01-10 13:25:47 -08:00
kevinz000