Commit Graph

251 Commits

Author SHA1 Message Date
Ghommie
f6adce72fb Something about missing private sprites and their bad code. 2020-02-09 06:51:57 +01:00
ancientpower
be0695e146 bunny ear style 2020-02-03 12:05:00 -06:00
CygnusB
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
Kraseo
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
Ghom
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
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
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
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00: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
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
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
Unknown
afc0ca44f2 Merge branch 'master' into xantholne-cowboy02 2020-01-08 20:35:36 -07:00
Unknown
4773a3e374 Fuggin Cowboy Clothes 2020-01-08 07:15:42 -07:00
Ghommie
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
CameronWoof
7e7a11a5c8 lizard tails for humans and anthromorphs 2020-01-02 13:07:05 -08:00
kevinz000
094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
nik707
8a4e44758f Merge pull request #10165 from Ghommie/Ghommie-cit456
Minor underwear fixes and tweaks.
2019-12-30 18:28:48 -06:00
Ghommie
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
kevinz000
24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
Ghommie
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
shellspeed1
1875ea3f58 new wings and fluff 2019-12-21 23:47:41 -08:00
Ghommie
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
Ghommie
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
kevinz000
586dcb6f81 welp i got lazy 2019-12-15 00:15:32 -07:00
Unknown
73abc2ae40 Merge branch 'master' into xantholne-christmas01 2019-12-14 17:15:00 -07:00
Ghommie
c098d497ad Minor underwear fixes and tweaks. 2019-12-13 06:50:14 +01:00
Ghommie
8ec4bdaef5 Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs. 2019-12-13 02:30:11 +01:00
Ghommie
3545f10137 Fixing character setup preview icons. 2019-12-12 17:04:14 +01:00
Ghommie
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
Unknown
33854e8fd8 Adds a huge amount of Christmas clothes 2019-11-27 20:07:39 -07:00
kevinz000
8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
Ghommie
6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
Ghommie
358db4f390 Dreamchecker compatibility changes, part 2. 2019-11-14 14:54:12 +01:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie
5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
kevinz000
969bc83179 Merge pull request #9586 from BlackMajor/Yeehaw
Adds posibrains to the spawners menu for ghosts.
2019-10-24 18:45:57 -07:00
Ghommie
2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
ItzGabby
25e426ddd0 Adds new parts for anthromorphs
Adds bat ears, bat marking, bat tails (Two variants and animation included), and new alternative snouts. Also cleans up the wing selection menu to be alphabetic, because, it was horrific to look at.
2019-10-23 07:26:01 -04:00
BlackMajor
8b61fe3d72 posibrains on spawn list 2019-10-23 22:46:10 +13:00
Linzolle
c0ae39fce1 remove unnecessary things 2019-10-18 12:43:05 -05:00
Linzolle
5ddd0484a8 colourable wings 2019-10-17 22:11:47 -05:00
kevinz000
6d1035e995 Merge pull request #9491 from Poojawa/wingfix
Fixes missing decorative wing states
2019-10-15 22:59:45 -07:00
deathride58
6245d5df30 Merge pull request #9471 from Citadel-Station-13/exploits
[s] fixes some exploits
2019-10-14 14:16:46 -04:00
Poojawa
fad517fccb oh let's unsnowflake this one too I guess 2019-10-13 19:06:46 -05:00
Poojawa
198f2b7add Fixes missing decorative wing states 2019-10-13 19:02:28 -05:00
kevinz000
48e4187cef Merge pull request #9461 from r4d6/master
Adding Decorative Wings
2019-10-13 14:00:07 -07:00
kevinz000
f393c7fff2 Update new_player.dm 2019-10-11 20:43:10 -07:00
r4d6
3e7131c7f6 Update wings.dm 2019-10-11 05:43:55 -04:00
JTGSZ
988a943f01 Try number 2 2019-10-11 02:36:10 -04:00