kevinz000
f85527ab4b
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-19 16:18:12 -07:00
Ghommie
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
kevinz000 and GitHub
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
kevinz000
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
kevinz000
9ef4cbfa76
refactor tags
2020-01-16 20:58:00 -07:00
kevinz000 and GitHub
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
kevinz000
b22e1a1cb4
compile
2020-01-16 02:27:35 -07:00
kevinz000
1d184b8cad
s
2020-01-16 00:21:21 -07:00
kevinz000
350c5aa060
compile
2020-01-16 00:18:40 -07:00
kevinz000
1acac87da3
compile
2020-01-15 23:54:30 -07:00
Putnam
fa0080d8d6
made climax with partner require EXPLICIT consent
2020-01-15 20:55:39 -08:00
Putnam
253a3a44ba
moved "aphro" magic string to a define
2020-01-15 20:15:40 -08:00
Putnam
a1922a459e
Moved Arousal tab stuff to IC tab
2020-01-15 20:14:23 -08:00
kevinz000
02841f8e92
compile
2020-01-15 18:49:37 -07: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
Hatterhat and GitHub
7b322ff467
Merge branch 'master' into greytide-standard-uniform
2020-01-14 19:39:16 -06:00
Hatterhat
3622dd118b
forgive me, grey jumpsuit entry
2020-01-14 19:38:11 -06:00
Ghommie
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
kappa-sama and GitHub
3f57f30e14
Merge branch 'master' into modularer
2020-01-13 16:32:00 -05:00
Ghom and GitHub
984c43116c
Merge pull request #10539 from Savotta/cum
...
ports hShark snout from hyper-station-13
2020-01-13 16:07:28 +01:00
Xantholne and GitHub
903e59d6ed
Merge branch 'master' into xantholne-christmas03
2020-01-12 22:29:59 -07:00
deathride58 and GitHub
bbdedd20b6
Merge branch 'master' into stambufferbuff
2020-01-12 20:35:31 -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
kevinz000
b341818f04
mobility flags
2020-01-12 11:00:12 -08: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
Ghommie
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
Ghommie
02fbbd4f95
Ouch.
2020-01-12 16:54:08 +01:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
kevinz000 and GitHub
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
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
Hatterhat
7216ae545c
how the hell did that fall out
2020-01-11 16:08:51 -06:00
Hatterhat
47fd3823e8
staff assistant jumpsuit gang
2020-01-11 15:58:24 -06:00
Ghom and GitHub
c2b3e7b0ec
Merge pull request #10505 from LetterN/beep-boom
...
better electropack ui
2020-01-11 15:21:08 +01:00
BlackMajor
30fc5b560b
Couple of lingering fixes
2020-01-11 17:57:18 +13:00
kappa-sama and GitHub
ab5223cb20
this took longer than all the other items combined
2020-01-10 22:40:10 -05:00
kappa-sama and GitHub
0dbcf2085b
bye
2020-01-10 22:30:45 -05:00
kappa-sama and GitHub
9f95fb5d9b
cya
2020-01-10 22:29:02 -05:00
kappa-sama and GitHub
6abb7449c3
bye
2020-01-10 22:27:01 -05:00
kappa-sama and GitHub
861a3c7a11
zee
2020-01-10 22:25:16 -05:00
kappa-sama and GitHub
0f7b3f4ee8
death
2020-01-10 22:23:32 -05:00
kappa-sama and GitHub
4ebc80e137
bye bye
2020-01-10 22:21:45 -05:00
kappa-sama and GitHub
0079a5acad
byye
2020-01-10 22:19:13 -05:00
kappa-sama and GitHub
820eeceb12
bye
2020-01-10 22:18:03 -05: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 and GitHub
fb94bf5fa0
Merge pull request #10482 from kappa-sama/modularthing
...
modular citadel file destruction but only slightly
2020-01-11 00:30:58 +00:00
kevinz000
b6e14c6b86
compile
2020-01-10 14:30:20 -08:00
kevinz000 and GitHub
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
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
Letter N
6ec3fde836
better-signalers
2020-01-10 18:06:55 +08:00
kevinz000