b854cb5980
Merge pull request #11262 from YakumoChen/LMAO-2CAT!!1
...
Adds 2cat, again
2020-02-27 01:22:25 -07:00
f6c170d31b
Update tails.dm
2020-02-27 08:15:27 +00:00
e682845ebf
Update tails.dm
2020-02-27 08:09:34 +00:00
2cb95e200a
Update tails.dm
2020-02-27 08:04:32 +00:00
e0c7c98253
Update tails.dm
2020-02-27 08:01:13 +00:00
a8a8e242d8
Merge pull request #11219 from YakumoChen/LMAO-2CAT!!1
...
Adds 2cat (tail)
2020-02-27 00:54:47 -07:00
9355e9319b
Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
...
you kids like extend votes?
2020-02-24 16:39:16 +01:00
6385445fd5
ruining the joke
2020-02-24 10:31:47 +00:00
ff10b70ffe
2cat heating up
2020-02-24 10:20:47 +00:00
96bf8d6969
Update tails.dm
2020-02-24 09:55:39 +00:00
b89a2314a2
mmm that's compiling i don't like that
2020-02-22 16:17:51 -06:00
698f0b8177
Something about pAIs and silicon access priviledges.
2020-02-18 16:20:44 +01:00
7ee04aa608
Merge pull request #10998 from Ghommie/Ghommie-cit569
...
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
ee9b38017e
Merge pull request #10995 from Ghommie/Ghommie-cit568
...
Something about cryopods.
2020-02-15 12:17:02 -07:00
f79148d549
Merge pull request #10947 from Ghommie/Ghommie-cit563
...
Holopad static fix and a few other mistakes.
2020-02-15 12:16:23 -07:00
1e57664a99
Merge pull request #10934 from kevinz000/actual_ghost_newscasters
...
Ok that last merge was a complete mistake so I kind of redid the feature myself (book/newscaster ghost reading)
2020-02-14 19:21:48 +01:00
4e419eed03
Merge pull request #10987 from Ghommie/Ghommie-cit567
...
Something about missing privates sprites and bad code.
2020-02-12 23:56:53 -07:00
276f4b5fae
Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters
2020-02-10 04:32:01 -07:00
c9e5fd1c17
Merge pull request #10988 from YakumoChen/master
...
Reverts 10486 (Observe verb in the Ghost tab)
2020-02-10 04:14:33 -07:00
c34714cb90
Something about the in operator and spaceDMM version update.
2020-02-10 07:37:59 +01:00
d4c74c19de
Something about cryopods.
2020-02-10 04:26:50 +01:00
1c24797de1
revert 10486
2020-02-09 06:41:13 +00:00
f6adce72fb
Something about missing private sprites and their bad code.
2020-02-09 06:51:57 +01:00
eaa6bc2db5
fixing another issue with the hear comsig proc.
2020-02-08 19:37:18 +01:00
2d8f85d810
A few nuisances solved.
2020-02-07 02:59:59 +01:00
927b9d0622
Revert "Merge pull request #10883 from ancientpower/ghost-newscasters"
...
This reverts commit 3c5a3cb4d4109b15ebdd
2020-02-05 23:50:41 -07:00
3c5a3cb4d4
Merge pull request #10883 from ancientpower/ghost-newscasters
...
Allows ghosts to read newscasters and books
2020-02-05 23:46:04 -07:00
aaa45f102e
Merge pull request #10875 from ancientpower/m-bunny-ears
...
Adds bunny ear style for humans and anthromorphs
2020-02-05 06:50:10 +01:00
5aecdb6a4d
initial commit
2020-02-03 20:10:39 -06:00
be0695e146
bunny ear style
2020-02-03 12:05:00 -06:00
e7ddfdd8d8
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
188f726ffd
unicode support port wip
2020-01-31 05:32:00 +01:00
83ce84cdc4
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
675e6cb9a6
Reunites Shaggy (hair from virgo) with Scooby Terrowin
...
self-insert baby pr florida man tries to merge his hair back into citadel
2020-01-27 15:51:38 -03:00
e360ac1d36
Conflict fix
2020-01-24 23:06:32 +01:00
14b7711590
i will end whoever ported virgo hairs and thought it was fine to do it like that
2020-01-23 17:29:21 +01:00
bf62563507
Merge pull request #10410 from CameronWoof/free-the-lizard
...
Humans and anthromorphs can now use lizard tails.
2020-01-23 03:06:52 +01:00
255f2ce449
Testmerge Conflict fix?
2020-01-22 20:17:42 +01:00
7a3f0d140c
Merge pull request #10468 from Citadel-Station-13/stop-ghosting
...
ghosting no longer makes it so you don't count for abductors
2020-01-21 02:26:25 +01: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
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
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00: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
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
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
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
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
4773a3e374
Fuggin Cowboy Clothes
2020-01-08 07:15:42 -07:00
kevinz000