e412852c8f
Made temp flavor "more" pop up with actual temp flavor
2020-01-12 23:44:49 -08:00
16b5c83a3a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-01-13 12:53:52 +08:00
bbdedd20b6
Merge branch 'master' into stambufferbuff
2020-01-12 20:35:31 -05:00
f45f979c27
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
2020-01-12 23:21:03 +01:00
f6c5f81a83
Merge remote-tracking branch 'upstream/master' into the-p-o-o-l
2020-01-12 15:16:17 -06:00
c88efe84de
makes sharks drop fish meat
2020-01-12 15:14:34 -06: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
d5b227a0ca
adds the POOL to box station
...
F in chat for dorms 7.
2020-01-11 23:34:07 -06: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
ac4489c6a8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-01-11 13:55:29 +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
24c1baddd0
compile compile compile
2020-01-10 05:50:19 -08:00
e5e2e4f012
Merge pull request #10329 from Ghommie/Ghommie-cit490
...
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
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
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
e008388176
Bee models
2020-01-09 16:13:23 -07:00
8a8d0bf6da
Merge branch 'master' into xantholne-cowboy02
2020-01-08 20:36:22 -07:00
afc0ca44f2
Merge branch 'master' into xantholne-cowboy02
2020-01-08 20:35:36 -07:00
c7790aba1a
moves observe to ghost tab
2020-01-09 10:46:18 +08:00
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
1e6d05dc59
Merge pull request #10470 from deathride58/deletesminers
...
[s] adds a cooldown to area creation attempts
2020-01-08 13:29:36 -08:00
4773a3e374
Fuggin Cowboy Clothes
2020-01-08 07:15:42 -07:00
12a04da2d2
Added second flavor text, not copied on save.
2020-01-08 00:57:42 -08:00
cd35e516ac
back by popular demand: maso/nympho
2020-01-07 17:01:14 -08:00
b09ef97ae3
Merge pull request #10305 from BlackMajor/Yeehaw
...
Various Mining borg changes. And some extras.
2020-01-07 16:50:21 -08:00
05a644cc41
Revert "Merge branch 'master' into Yeehaw"
...
This reverts commit 972c03f79f8ebd698763
2020-01-08 12:26:45 +13:00
972c03f79f
Merge branch 'master' into Yeehaw
2020-01-08 12:25:50 +13:00
b41c9cd844
Sync with master
2020-01-08 12:25:22 +13:00
5b2c4deaa0
lockcharge --> locked_down
2020-01-07 12:04:41 -08:00
e4cfb1fa39
more
2020-01-07 12:03:46 -08:00
2a304800df
more reformatting
2020-01-07 11:46:32 -08:00
6f2cf0b636
[s] adds a cooldown to area creation attempts
2020-01-07 10:04:09 -05:00
5f7f1b09f3
Update observer.dm
2020-01-07 02:41:05 -08:00
Putnam