Putnam
a8569fa7e5
Makes it so that opting out of ass slapping is OPT OUT
2020-01-17 21:31:23 -08:00
Ghommie
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
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
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
Ghom
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
kevinz000
a4e2591223
typo
2020-01-16 21:22:07 -07:00
kevinz000
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
kevinz000
d7a8494d2d
fix
2020-01-16 21:03:28 -07:00
kevinz000
9ef4cbfa76
refactor tags
2020-01-16 20:58:00 -07:00
kevinz000
2ba226b912
aa
2020-01-16 20:57:02 -07:00
kevinz000
b505c1e087
WEH
2020-01-16 19:22:47 -07:00
kevinz000
14aaca8fa5
compile
2020-01-16 19:18:54 -07:00
kevinz000
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
350c5aa060
compile
2020-01-16 00:18:40 -07:00
kevinz000
26525b8fa7
s
2020-01-16 00:14:03 -07:00
kevinz000
1acac87da3
compile
2020-01-15 23:54:30 -07:00
Tupinambis
dd9e62c8bb
Sillycon law prevention clause removal.
2020-01-15 23:15:18 -06:00
kevinz000
45c92bcb6f
s
2020-01-15 19:07:47 -07:00
kevinz000
ded4d1bed6
compile
2020-01-15 18:58:26 -07: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
Artur
8b8a112d2c
Ohkay
2020-01-15 09:41:33 +02:00
kevinz000
97ded4b27b
ok
2020-01-14 18:09:12 -07:00
kevinz000
6ead30eab3
more shit
2020-01-14 17:22:54 -07:00
kevinz000
eff86a449f
wew
2020-01-14 16:45:22 -07:00
Seris02
cb3a4caa63
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-01-14 23:42:37 +08:00
Ghommie
a0f35f5cfc
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
2020-01-14 00:55:28 +01:00
Detective-Google
fce73c84c7
Merge branch 'master' into the-p-o-o-l
2020-01-13 16:38:53 -06:00
Detective Google
2c4daf3a99
Merge remote-tracking branch 'upstream/master' into the-p-o-o-l
2020-01-13 16:32:18 -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
Ghom
984c43116c
Merge pull request #10539 from Savotta/cum
...
ports hShark snout from hyper-station-13
2020-01-13 16:07:28 +01:00
Putnam
e412852c8f
Made temp flavor "more" pop up with actual temp flavor
2020-01-12 23:44:49 -08:00
Seris02
16b5c83a3a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-01-13 12:53:52 +08:00
deathride58
bbdedd20b6
Merge branch 'master' into stambufferbuff
2020-01-12 20:35:31 -05:00
Ghommie
f45f979c27
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
2020-01-12 23:21:03 +01:00
Detective Google
f6c5f81a83
Merge remote-tracking branch 'upstream/master' into the-p-o-o-l
2020-01-12 15:16:17 -06:00
Detective Google
c88efe84de
makes sharks drop fish meat
2020-01-12 15:14:34 -06:00
kevinz000
b341818f04
mobility flags
2020-01-12 11:00:12 -08: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
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
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
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
kevinz000
9fd9f60855
compile
2020-01-11 10:49:44 -08: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
BlackMajor
30fc5b560b
Couple of lingering fixes
2020-01-11 17:57:18 +13:00
