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
5f7f1b09f3
Update observer.dm
2020-01-07 02:41:05 -08:00
b9260a62df
Update observer.dm
2020-01-07 02:16:52 -08:00
5975f4c17d
Update observer.dm
2020-01-07 02:12:47 -08:00
e18244671f
Merge pull request #10350 from Putnam3145/dojo-ghostrole
...
Ghost cafe quality-of-life, plus making ghost role eligibility an element
2020-01-05 23:05:13 +01:00
686a76dd1d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-04 13:35:05 +01:00
adf87c7595
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
2020-01-02 22:52:24 -08:00
094d225874
Merge remote-tracking branch 'citadel/master' into michael_labs
2019-12-31 19:54:01 -08:00
8a4e44758f
Merge pull request #10165 from Ghommie/Ghommie-cit456
...
Minor underwear fixes and tweaks.
2019-12-30 18:28:48 -06:00
71fcd23f1f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
2019-12-30 13:31:15 -08:00
80e716eeaf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
2019-12-30 18:14:47 +01:00
9653dc470b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc
2019-12-30 22:48:39 +08:00
90ebbdfdb9
elements are so good. they're so good
2019-12-30 00:53:03 -08:00
24e3b88a34
Merge remote-tracking branch 'citadel/master' into michael_labs
2019-12-30 00:32:25 -08:00
640419eed5
Merge pull request #10343 from Ghommie/Ghommie-cit494
...
[s] Fixes anti-ghost-role vars a little.
2019-12-29 20:54:55 -08:00
0ab817c208
[s] Fixes ghost anti-ghostrole timers a little.
2019-12-29 22:22:20 +01:00
3d3407363c
auto ooc
2019-12-29 18:48:00 +08:00
d562a5ba27
Merge pull request #10212 from Ghommie/Ghommie-cit471
...
Ports some hud and update_icon code updates.
2019-12-28 04:07:03 +00:00
b75349bebf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
2019-12-23 04:32:09 +01:00
1875ea3f58
new wings and fluff
2019-12-21 23:47:41 -08:00
395457f7ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471
2019-12-21 17:59:32 +01:00
9db79ff958
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-12-20 23:40:21 +01:00
ba851d55b6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit456
2019-12-18 19:42:41 +01:00
237fbaa02d
Merge pull request #10180 from Ghommie/Ghommie-cit462
...
[s] virtual reality component improvements, fixes and documentation.
2019-12-17 01:05:10 +00:00
80402a0d88
Ports some hud and update_icon code updates.
2019-12-16 23:29:20 +01:00
586dcb6f81
welp i got lazy
2019-12-15 00:15:32 -07:00
73abc2ae40
Merge branch 'master' into xantholne-christmas01
2019-12-14 17:15:00 -07:00
3891c91799
virtual reality component improvements, fixes and documentation.
2019-12-14 17:19:48 +01:00
c098d497ad
Minor underwear fixes and tweaks.
2019-12-13 06:50:14 +01:00
8ec4bdaef5
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2019-12-13 02:30:11 +01:00
3545f10137
Fixing character setup preview icons.
2019-12-12 17:04:14 +01:00
542c9007ee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-12-06 20:09:35 +01:00
33854e8fd8
Adds a huge amount of Christmas clothes
2019-11-27 20:07:39 -07:00
f9680130f9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
2019-11-27 18:48:20 +01:00
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
911a33bfd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit387
2019-11-21 06:36:59 +01:00
dccb3c2e22
part 3
2019-11-21 06:36:22 +01:00
8df8acb1b7
Merge pull request #9811 from Ghommie/Ghommie-cit353
...
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
dd101ef221
Part 2
2019-11-19 18:00:56 +01:00
Ghom