Commit Graph

234 Commits

Author SHA1 Message Date
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
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 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
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 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
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
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
r4d6 1b08c541e2 Update wings.dm 2019-10-10 21:11:48 -04:00
r4d6 e85e499504 I forgot a part.
Copy-pasted the Angel's wings' bit of code to have something to show.
2019-10-10 20:45:38 -04:00
r4d6 2d84b541cf Update wings.dm 2019-10-10 20:32:15 -04:00
kevinz000 c4f8956985 Merge pull request #9433 from Poojawa/hoss-tails
Corrects a missing tail state
2019-10-10 02:10:31 -07:00
Poojawa 93ad7f1066 Corrects a missing tail state 2019-10-07 04:30:23 -05:00
Ghommie cac4157894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-05 22:03:37 +02:00
deathride58 d0296a5e81 fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks 2019-09-17 20:15:06 -04:00
Poojawa 6668630649 Merge branch 'master' into are-those-horns-are-are-you-just-retarded 2019-09-15 23:25:22 -05:00
Poojawa bf3d30c0e4 Seperates Insect fluff from wings
Fluff can be the new body markings I guess.
2019-09-14 04:27:38 -05:00
Poojawa 0ac3a2307d Update wings.dm 2019-09-11 17:48:57 -05:00
Poojawa 94afbbd560 Adding Horn colors, multiple-select legs, and species squash
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking.  Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
Poojawa 1ba9d374fe whatever, I guess 2019-08-25 01:19:16 -05:00
Ghommie 5d1cac62da Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-08-24 13:50:22 +02:00
Poojawa 9cbd8af5b9 Updates colors, fixes alignment issues. 2019-08-18 14:38:10 -05:00
Poojawa 2922f08ef6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-17 23:41:28 -05:00
BlackMajor 13f27c040e Merge pull request #8848 from Citadel-Station-13/trait_blacklisting
Trait blacklisting system: Blacklists Mute and Brain Tumor from ALL heads of staff. Blacklists pacifist + paraplegic from HoS. Blacklists Paraplegic/nolegs from CE. Blacklists phanosthing/no-recognize-faces from HoP
2019-08-18 15:33:08 +12:00
Poojawa d496e16dde Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-10 19:14:41 -05:00