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
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
Ghom
984c43116c
Merge pull request #10539 from Savotta/cum
...
ports hShark snout from hyper-station-13
2020-01-13 16:07:28 +01:00
deathride58
bbdedd20b6
Merge branch 'master' into stambufferbuff
2020-01-12 20:35:31 -05:00
kevinz000
b341818f04
mobility flags
2020-01-12 11:00:12 -08: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
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
BlackMajor
30fc5b560b
Couple of lingering fixes
2020-01-11 17:57:18 +13: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
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
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
24c1baddd0
compile compile compile
2020-01-10 05:50:19 -08:00
Lin
e5e2e4f012
Merge pull request #10329 from Ghommie/Ghommie-cit490
...
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
Lin
c4cb06f8f0
Merge pull request #10112 from Ghommie/Ghommie-cit447
...
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
Ghommie
825b4f01c2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-10 02:26:19 +01:00
Unknown
e008388176
Bee models
2020-01-09 16:13:23 -07:00
Unknown
8a8d0bf6da
Merge branch 'master' into xantholne-cowboy02
2020-01-08 20:36:22 -07:00
Unknown
afc0ca44f2
Merge branch 'master' into xantholne-cowboy02
2020-01-08 20:35:36 -07:00
Seris02
c7790aba1a
moves observe to ghost tab
2020-01-09 10:46:18 +08:00
Putnam
244d46ee41
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
2020-01-08 17:08:01 -08:00
kevinz000
1e6d05dc59
Merge pull request #10470 from deathride58/deletesminers
...
[s] adds a cooldown to area creation attempts
2020-01-08 13:29:36 -08:00
Unknown
4773a3e374
Fuggin Cowboy Clothes
2020-01-08 07:15:42 -07:00
Putnam
12a04da2d2
Added second flavor text, not copied on save.
2020-01-08 00:57:42 -08:00
Putnam
cd35e516ac
back by popular demand: maso/nympho
2020-01-07 17:01:14 -08:00
Putnam3145
b09ef97ae3
Merge pull request #10305 from BlackMajor/Yeehaw
...
Various Mining borg changes. And some extras.
2020-01-07 16:50:21 -08:00
BlackMajor
05a644cc41
Revert "Merge branch 'master' into Yeehaw"
...
This reverts commit 972c03f79f8ebd698763
2020-01-08 12:26:45 +13:00
